diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index 847c290e9..000000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-processAlternate*
-processAdditional*
-
diff --git a/bin/config.php b/bin/config.php
deleted file mode 100644
index 05d1da552..000000000
--- a/bin/config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../../../../../www/config.php");
-
diff --git a/bin/fixreleasenames.php b/bin/fixreleasenames.php
deleted file mode 100644
index 105a8d91b..000000000
--- a/bin/fixreleasenames.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/config.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/groups.php");
-require_once(WWW_DIR.'/lib/nntp.php');
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("../lib/namefixer.php");
-require_once("../lib/Info.php");
-require_once("../lib/Pprocess.php");
-
-$c = new ColorCLI();
-if (!isset($argv[1])) {
-	exit($c->error("This script is not intended to be run manually, it is called from fixreleasenames_threaded.py."));
-} else if (isset($argv[1])) {
-	$db = new DB();
-	$namefixer = new Namefixer(true);
-	$pieces = explode(' ', $argv[1]);
-	if (isset($pieces[1]) && $pieces[0] == 'nfo') {
-		$release = $pieces[1];
-		if ($res = $db->queryOneRow(sprintf('SELECT rel.guid AS guid, nfo.releaseid AS nfoid, rel.groupid, rel.categoryid, rel.name, rel.searchname, uncompress(nfo) AS textstring, rel.id AS releaseid FROM releases rel INNER JOIN releasenfo nfo ON (nfo.releaseid = rel.id) WHERE rel.id = %d', $release))) {
-			//ignore encrypted nfos
-			if (preg_match('/^=newz\[NZB\]=\w+/', $res['textstring'])) {
-				$namefixer->done = $namefixer->matched = false;
-				$db->queryDirect(sprintf('UPDATE releases SET proc_nfo = 1 WHERE id = %d', $res['releaseid']));
-				$namefixer->checked++;
-				echo '.';
-			} else {
-				//echo $res['textstring']."\n";
-				$namefixer->done = $namefixer->matched = false;
-				if ($namefixer->checkName($res, true, 'NFO, ', 1, 1) !== true) {
-					echo '.';
-				}
-				$namefixer->checked++;
-			}
-		}
-	} else if (isset($pieces[1]) && $pieces[0] == 'filename') {
-		$release = $pieces[1];
-		if ($res = $db->queryOneRow(sprintf('SELECT relfiles.name AS textstring, rel.categoryid, rel.searchname, '
-				. 'rel.groupid, relfiles.releaseid AS fileid, rel.id AS releaseid, rel.name FROM releases rel '
-				. 'INNER JOIN releasefiles relfiles ON (relfiles.releaseid = rel.id) WHERE rel.id = %d', $release))) {
-			$namefixer->done = $namefixer->matched = false;
-			if ($namefixer->checkName($res, true, 'Filenames, ', 1, 1) !== true) {
-				echo '.';
-			}
-			$namefixer->checked++;
-		}
-	} else if (isset($pieces[1]) && $pieces[0] == 'md5') {
-		$release = $pieces[1];
-		if ($res = $db->queryOneRow(sprintf('SELECT r.id AS releaseid, r.name, r.searchname, r.categoryid, r.groupid, dehashstatus, rf.name AS filename FROM releases r LEFT JOIN releasefiles rf ON r.id = rf.releaseid WHERE r.id = %d', $release))) {
-			if (preg_match('/[a-fA-F0-9]{32,40}/i', $res['name'], $matches)) {
-				$namefixer->matchPredbHash($matches[0], $res, 1, 1, true, 1);
-			} else if (preg_match('/[a-fA-F0-9]{32,40}/i', $res['filename'], $matches)) {
-				$namefixer->matchPredbHash($matches[0], $res, 1, 1, true, 1);
-			} else {
-				$db->queryExec(sprintf("UPDATE releases SET dehashstatus = %d - 1 WHERE id = %d", $res['dehashstatus'], $res['releaseid']));
-				echo '.';
-			}
-		}
-	} else if (isset($pieces[1]) && $pieces[0] == 'par2') {
-		$nntp = new NNTP();
-		if ($nntp->doConnect() === false) {
-			exit($c->error("Unable to connect to usenet."));
-		}
-
-		$relID = $pieces[1];
-		$guid = $pieces[2];
-		$groupID = $pieces[3];
-		$nzbcontents = new NZBContents(array('echo' => true, 'nntp' => $nntp, 'nfo' => new Info(), 'db' => $db, 'pp' => new PProcess(true)));
-		$res = $nzbcontents->checkPAR2($guid, $relID, $groupID, 1, 1);
-		if ($res === false) {
-			echo '.';
-		}
-
-        $nntp->doQuit();
-
-	} else if (isset($pieces[1]) && $pieces[0] == 'predbft') {
-		$pre = $pieces[1];
-		if ($res = $db->queryOneRow(sprintf('SELECT id AS preid, title, source, searched FROM prehash '
-				. 'WHERE id = %d', $pre
-			)
-		)
-		) {
-			$namefixer->done = $namefixer->matched = false;
-			$ftmatched = $searched = 0;
-			$ftmatched = $namefixer->matchPredbFT($res, 1, 1, true, 1);
-			if ($ftmatched > 0) {
-				$searched = 1;
-			} elseif ($ftmatched < 0) {
-				$searched = -6;
-				echo "*";
-			} else {
-				$searched = $res['searched'] - 1;
-				echo ".";
-			}
-			$db->queryExec(sprintf("UPDATE prehash SET searched = %d WHERE id = %d", $searched, $res['preid']));
-			$namefixer->checked++;
-		}
-
-	}
-}
diff --git a/bin/groupfixrelnames.php b/bin/groupfixrelnames.php
deleted file mode 100644
index 5f198cbcf..000000000
--- a/bin/groupfixrelnames.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(dirname(__FILE__) . '/../lib/namefixer.php');
-require_once(dirname(__FILE__) . '/../lib/Info.php');
-require_once(dirname(__FILE__) . '/../lib/nzbcontents.php');
-require_once(dirname(__FILE__) . '/../lib/MiscSorter.php');
-
-$pdo = new DB();
-$s = new Sites();
-$site = $s->get();
-
-if (!isset($argv[1])) {
-	exit($pdo->log->error("This script is not intended to be run manually, it is called from groupfixrelnames_threaded.py."));
-} else if (isset($argv[1])) {
-	$namefixer = new \NameFixer(['Settings' => $pdo]);
-	$pieces = explode(' ', $argv[1]);
-	$guidChar = $pieces[1];
-	$maxperrun = $pieces[2];
-	$thread = $pieces[3];
-
-	switch (true) {
-		case $pieces[0] === 'nfo' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
-			$releases = $pdo->queryDirect(
-				sprintf('
-								SELECT r.id AS releaseid, r.guid, r.groupid, r.categoryid, r.name, r.searchname,
-									uncompress(nfo) AS textstring
-								FROM releases r
-								INNER JOIN releasenfo rn ON r.id = rn.releaseid
-								WHERE r.guid %s
-								AND r.nzbstatus = 1
-								AND r.proc_nfo = 0
-								AND r.nfostatus = 1
-								AND r.prehashid = 0
-								ORDER BY r.postdate DESC
-								LIMIT %s',
-					$pdo->likeString($guidChar, false, true),
-					$maxperrun
-				)
-			);
-
-			if ($releases instanceof Traversable) {
-				foreach ($releases as $release) {
-					if (preg_match('/^=newz\[NZB\]=\w+/', $release['textstring'])) {
-						$namefixer->done = $namefixer->matched = false;
-						$pdo->queryDirect(sprintf('UPDATE releases SET proc_nfo = 1 WHERE id = %d', $release['releaseid']));
-						$namefixer->checked++;
-						echo '.';
-					} else {
-						$namefixer->done = $namefixer->matched = false;
-						if ($namefixer->checkName($release, true, 'NFO, ', 1, 1) !== true) {
-							echo '.';
-						}
-						$namefixer->checked++;
-					}
-				}
-			}
-			break;
-		case $pieces[0] === 'filename' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
-			$releases = $pdo->queryDirect(
-				sprintf('
-								SELECT rf.name AS textstring, rf.releaseid AS fileid,
-									r.id AS releaseid, r.name, r.searchname, r.categoryid, r.groupid
-								FROM releases r
-								INNER JOIN releasefiles rf ON r.id = rf.releaseid
-								WHERE r.guid %s
-								AND r.nzbstatus = 1 AND r.proc_files = 0
-								AND r.prehashid = 0
-								ORDER BY r.postdate ASC
-								LIMIT %s',
-					$pdo->likeString($guidChar, false, true),
-					$maxperrun
-				)
-			);
-
-			if ($releases instanceof Traversable) {
-				foreach ($releases as $release) {
-					$namefixer->done = $namefixer->matched = false;
-					if ($namefixer->checkName($release, true, 'Filenames, ', 1, 1) !== true) {
-						echo '.';
-					}
-					$namefixer->checked++;
-				}
-			}
-			break;
-		case $pieces[0] === 'md5' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
-			$releases = $pdo->queryDirect(
-				sprintf('
-								SELECT DISTINCT r.id AS releaseid, r.name, r.searchname, r.categoryid, r.groupid, r.dehashstatus,
-									rf.name AS filename
-								FROM releases r
-								LEFT OUTER JOIN releasefiles rf ON r.id = rf.releaseid AND rf.ishashed = 1
-								WHERE r.guid %s
-								AND nzbstatus = 1 AND r.ishashed = 1
-								AND r.dehashstatus BETWEEN -6 AND 0
-								AND r.prehashid = 0
-								ORDER BY r.dehashstatus DESC, r.postdate ASC
-								LIMIT %s',
-					$pdo->likeString($guidChar, false, true),
-					$maxperrun
-				)
-			);
-
-			if ($releases instanceof Traversable) {
-				foreach ($releases as $release) {
-					if (preg_match('/[a-fA-F0-9]{32,40}/i', $release['name'], $matches)) {
-						$namefixer->matchPredbHash($matches[0], $release, 1, 1, true, 1);
-					} else if (preg_match('/[a-fA-F0-9]{32,40}/i', $release['filename'], $matches)) {
-						$namefixer->matchPredbHash($matches[0], $release, 1, 1, true, 1);
-					} else {
-						$pdo->queryExec(sprintf("UPDATE releases SET dehashstatus = %d - 1 WHERE id = %d", $release['dehashstatus'], $release['releaseid']));
-						echo '.';
-					}
-				}
-			}
-			break;
-		case $pieces[0] === 'par2' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
-			$releases = $pdo->queryDirect(
-				sprintf('
-								SELECT r.id AS releaseid, r.guid, r.groupid
-								FROM releases r
-								WHERE r.guid %s
-								AND r.nzbstatus = 1
-								AND r.proc_par2 = 0
-								AND r.prehashid = 0
-								ORDER BY r.postdate ASC
-								LIMIT %s',
-					$pdo->likeString($guidChar, false, true),
-					$maxperrun
-				)
-			);
-
-			if ($releases instanceof Traversable) {
-				$nntp = new NNTP(['Settings' => $pdo]);
-				if (($site->alternate_nntp == '1' ? $nntp->doConnect(true, true) : $nntp->doConnect()) !== true) {
-					exit($pdo->log->error("Unable to connect to usenet."));
-				}
-
-				$Nfo = new Info(['Settings' => $pdo, 'Echo' => true]);
-				$nzbcontents = new NZBContents(
-					array(
-						'Echo' => true, 'NNTP' => $nntp, 'Nfo' => $Nfo, 'Settings' => $pdo,
-						'PostProcess' => new PProcess(['Settings' => $pdo, 'Nfo' => $Nfo, 'NameFixer' => $namefixer])
-					)
-				);
-				foreach ($releases as $release) {
-					$res = $nzbcontents->checkPAR2($release['guid'], $release['releaseid'], $release['groupid'], 1, 1);
-					if ($res === false) {
-						echo '.';
-					}
-				}
-			}
-			break;
-		case $pieces[0] === 'miscsorter' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
-			$releases = $pdo->queryDirect(
-				sprintf('
-								SELECT r.id AS releaseid
-								FROM releases r
-								WHERE r.guid %s
-								AND r.nzbstatus = 1 AND r.nfostatus = 1
-								AND r.proc_sorter = 0 AND r.isrenamed = 0
-								AND r.prehashid = 0
-								ORDER BY r.postdate DESC
-								LIMIT %s',
-					$pdo->likeString($guidChar, false, true),
-					$maxperrun
-				)
-			);
-
-			if ($releases instanceof Traversable) {
-				$sorter = new MiscSorter(true, $pdo);
-				foreach ($releases as $release) {
-					$res = $sorter->nfosorter(null, $release['releaseid']);
-				}
-			}
-			break;
-		case $pieces[0] === 'predbft' && isset($maxperrun) && is_numeric($maxperrun) && isset($thread) && is_numeric($thread):
-			$pres = $pdo->queryDirect(
-				sprintf('
-							SELECT p.id AS prehashid, p.title, p.source, p.searched
-							FROM prehash p
-							WHERE LENGTH(title) >= 15 AND title NOT REGEXP "[\"\<\> ]"
-							AND searched = 0
-							AND DATEDIFF(NOW(), predate) > 1
-							ORDER BY predate ASC
-							LIMIT %s
-							OFFSET %s',
-					$maxperrun,
-					$thread * $maxperrun - $maxperrun
-				)
-			);
-
-			if ($pres instanceof Traversable) {
-				foreach ($pres as $pre) {
-					$namefixer->done = $namefixer->matched = false;
-					$ftmatched = $searched = 0;
-					$ftmatched = $namefixer->matchPredbFT($pre, 1, 1, true, 1);
-					if ($ftmatched > 0) {
-						$searched = 1;
-					} elseif ($ftmatched < 0) {
-						$searched = -6;
-						echo "*";
-					} else {
-						$searched = $pre['searched'] - 1;
-						echo ".";
-					}
-					$pdo->queryExec(sprintf("UPDATE prehash SET searched = %d WHERE id = %d", $searched, $pre['prehashid']));
-					$namefixer->checked++;
-				}
-			}
-	}
-}
\ No newline at end of file
diff --git a/bin/monitor.php b/bin/monitor.php
deleted file mode 100644
index 16eec9669..000000000
--- a/bin/monitor.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-require(dirname(__FILE__) . "/config.php");
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once(NN_LIB . 'TmuxRun.php');
-require_once(NN_LIB . 'TmuxOutput.php');
-
-
-$pdo = new DB();
-$tRun = new \TmuxRun($pdo);
-$tOut = new \TmuxOutput($pdo);
-
-$runVar['paths']['misc'] = NN_MISC;
-$runVar['paths']['lib'] = NN_LIB;
-$db_name = DB_NAME;
-$dbtype = DB_TYPE;
-$tmux = $tRun->get('niceness');
-
-$tmux_niceness = (isset($tmux->niceness) ? $tmux->niceness : 2);
-
-$runVar['constants'] = $pdo->queryOneRow($tRun->getConstantSettings());
-
-$PHP = ($tRun->command_exist("php5") ? 'php5' : 'php');
-$PYTHON = ($tRun->command_exist("python3") ? 'python3 -OOu' : 'python -OOu');
-
-//assign shell commands
-$show_time = (NN_DEBUG ? "/usr/bin/time" : "");
-$runVar['commands']['_php'] = $show_time . " nice -n{$tmux_niceness} $PHP";
-$runVar['commands']['_phpn'] = "nice -n{$tmux_niceness} $PHP";
-$runVar['commands']['_python'] = $show_time . " nice -n{$tmux_niceness} $PYTHON";
-$runVar['commands']['_sleep'] = "{$runVar['commands']['_phpn']} {$runVar['paths']['lib']}showsleep.php";
-
-//spawn IRCScraper as soon as possible
-$tRun->runPane('scraper', $runVar);
-
-//get list of panes by name
-$runVar['panes'] = $tRun->getListOfPanes($runVar['constants']);
-
-//totals per category in db, results by parentid
-$catcntqry = "SELECT c.parentid AS parentid, COUNT(r.id) AS count FROM category c, releases r WHERE r.categoryid = c.id GROUP BY c.parentid";
-
-//create timers and set to now
-$runVar['timers']['timer1'] = $runVar['timers']['timer2'] = $runVar['timers']['timer3'] =
-$runVar['timers']['timer4'] = $runVar['timers']['timer5'] = time();
-
-$runVar['timers']['query']['tmux_time'] = $runVar['timers']['query']['split_time'] = $runVar['timers']['query']['init_time'] = $runVar['timers']['query']['proc1_time'] =
-$runVar['timers']['query']['proc2_time'] = $runVar['timers']['query']['proc3_time'] = $runVar['timers']['query']['split1_time'] = $runVar['timers']['query']['init1_time'] =
-$runVar['timers']['query']['proc11_time'] = $runVar['timers']['query']['proc21_time'] = $runVar['timers']['query']['proc31_time'] = $runVar['timers']['query']['tpg_time'] =
-$runVar['timers']['query']['tpg1_time'] = 0;
-
-// Analyze tables
-printf($pdo->log->info("\nAnalyzing your tables to refresh your indexes."));
-$pdo->optimise(false, 'analyze', false, ['releases']);
-passthru('clear');
-
-$runVar['settings']['monitor'] = 0;
-$runVar['counts']['iterations'] = 1;
-$runVar['modsettings']['fc']['firstrun'] = true;
-$runVar['modsettings']['fc']['num'] = 0;
-
-while ($runVar['counts']['iterations'] > 0) {
-
-	//check the db connection
-	if ($pdo->ping(true) == false) {
-		unset($pdo);
-		$pdo = new DB();
-	}
-
-	$timer01 = time();
-	// These queries are very fast, run every loop -- tmux and site settings
-	$runVar['settings'] = $pdo->queryOneRow($tRun->getMonitorSettings(), false);
-	$runVar['timers']['query']['tmux_time'] = (time() - $timer01);
-
-	$runVar['settings']['book_reqids'] = (!empty($runVar['settings']['book_reqids'])
-		? $runVar['settings']['book_reqids'] : \Category::CAT_PARENT_BOOK);
-
-	//get usenet connection info
-	$runVar['connections'] = $tOut->getConnectionsInfo($runVar['constants']);
-
-	$runVar['modsettings']['clean'] = ($runVar['settings']['post_non'] == 2 ? ' clean ' : ' ');
-	$runVar['constants']['pre_lim'] = ($runVar['counts']['iterations'] > 1 ? '7' : '');
-
-	//assign scripts
-	$runVar['scripts']['releases'] = ($runVar['constants']['tablepergroup'] == 0
-		? "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/bin/update_releases.php 1 false"
-		: "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/releases.php"
-	);
-
-	switch((int) $runVar['settings']['binaries_run']) {
-		case 1:
-			$runVar['scripts']['binaries'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/binaries.php 0";
-			break;
-		case 2:
-			$runVar['scripts']['binaries'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/safe.php binaries";
-			break;
-		default:
-			$runVar['scripts']['binaries'] = 0;
-	}
-
-	switch ((int) $runVar['settings']['backfill']) {
-		case 1:
-			$runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/backfill.php";
-			break;
-		case 2:
-			$runVar['scripts']['backfill'] = "{$runVar['commands']['_python']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/python/backfill_threaded.py group";
-			break;
-		case 4:
-			$runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/safe.php backfill";
-	}
-
-	//get usenet connection counts
-	unset ($runVar['conncounts']);
-	$runVar['conncounts'] = $tOut->getUSPConnections('primary', $runVar['connections']);
-
-	if ($runVar['constants']['alternate_nntp'] == 1) {
-		$runVar['conncounts'] += $tOut->getUSPConnections('alternate', $runVar['connections']);
-	}
-
-	//run queries only after time exceeded, these queries can take awhile
-	if ($runVar['counts']['iterations'] == 1 || (time() - $runVar['timers']['timer2'] >= $runVar['settings']['monitor'] && $runVar['settings']['is_running'] == 1)) {
-
-		$runVar['counts']['proc1'] = $runVar['counts']['proc2'] = $runVar['counts']['proc3'] = $splitqry = $newOldqry = false;
-		$runVar['counts']['now']['total_work'] = 0;
-		$runVar['modsettings']['fix_crap'] = explode(', ', ($runVar['settings']['fix_crap']));
-
-		echo $pdo->log->info("\nThe numbers(queries) above are currently being refreshed. \nNo pane(script) can be (re)started until these have completed.\n");
-		$timer02 = time();
-
-		$splitqry = $newOldqry = '';
-
-		$splitqry = $tRun->proc_query(4, $runVar['settings']['book_reqids'], $runVar['settings']['request_hours'], $db_name);
-		$newOldqry = $tRun->proc_query(6, $runVar['settings']['book_reqids'], $runVar['settings']['request_hours'], $db_name);
-
-		$splitres = $pdo->queryOneRow($splitqry, false);
-		$runVar['timers']['newOld'] = $pdo->queryOneRow($newOldqry, false);
-
-		//assign split query results to main var
-		if (is_array($splitres)) {
-			foreach ($splitres AS $splitkey => $split) {
-				$runVar['counts']['now'][$splitkey] = $split;
-			}
-		}
-
-		$runVar['timers']['query']['split_time'] = (time() - $timer02);
-		$runVar['timers']['query']['split1_time'] = (time() - $timer01);
-
-		$timer03 = time();
-
-		//This is subpartition compatible -- loops through all partitions and adds their total row counts instead of doing a slow query count
-		$partitions = $pdo->queryDirect(
-			sprintf("
-				SELECT SUM(TABLE_ROWS) AS count, PARTITION_NAME AS category
-				FROM INFORMATION_SCHEMA.PARTITIONS
-				WHERE TABLE_NAME = 'releases'
-				AND TABLE_SCHEMA = %s
-				GROUP BY PARTITION_NAME",
-				$pdo->escapeString($db_name)
-			)
-		);
-		foreach ($partitions as $partition) {
-			$runVar['counts']['now'][$partition['category']] = $partition['count'];
-		}
-		unset($partitions);
-
-		$runVar['timers']['query']['init_time'] = (time() - $timer03);
-		$runVar['timers']['query']['init1_time'] = (time() - $timer01);
-
-		$timer04 = time();
-		$proc1qry = $tRun->proc_query(1, $runVar['settings']['book_reqids'], $runVar['settings']['request_hours'], $db_name);
-		$proc1res = $pdo->queryOneRow(($proc1qry !== false ? $proc1qry : ''), $tRun->rand_bool($runVar['counts']['iterations']));
-		$runVar['timers']['query']['proc1_time'] = (time() - $timer04);
-		$runVar['timers']['query']['proc11_time'] = (time() - $timer01);
-
-		$timer05 = time();
-		$proc2qry = $tRun->proc_query(2, $runVar['settings']['book_reqids'], $runVar['settings']['request_hours'], $db_name);
-		$proc2res = $pdo->queryOneRow(($proc2qry !== false ? $proc2qry : ''), $tRun->rand_bool($runVar['counts']['iterations']));
-		$runVar['timers']['query']['proc2_time'] = (time() - $timer05);
-		$runVar['timers']['query']['proc21_time'] = (time() - $timer01);
-
-		$timer06 = time();
-		$proc3qry = $tRun->proc_query(3, $runVar['settings']['book_reqids'], $runVar['settings']['request_hours'], $db_name);
-		$proc3res = $pdo->queryOneRow(($proc3qry !== false ? $proc3qry : ''), $tRun->rand_bool($runVar['counts']['iterations']));
-		$runVar['timers']['query']['proc3_time'] = (time() - $timer06);
-		$runVar['timers']['query']['proc31_time'] = (time() - $timer01);
-
-		$timer07 = time();
-		if ($runVar['constants']['tablepergroup'] == 1) {
-			$sql = 'SHOW TABLE STATUS';
-
-			$tables = $pdo->queryDirect($sql);
-			$age = time();
-
-			$runVar['counts']['now']['binaries_table'] = 0;
-			$runVar['counts']['now']['parts_table'] = $runVar['counts']['now']['parterpair_table'] = 0;
-
-			if ($tables instanceof \Traversable) {
-				foreach ($tables as $row) {
-					$cntsql = '';
-
-					$tbl = $row['name'];
-					$stamp = 'UNIX_TIMESTAMP(MIN(dateadded))';
-					$orderlim = '';
-					$cntsql = sprintf('
-							SELECT TABLE_ROWS AS count
-							FROM INFORMATION_SCHEMA.TABLES
-							WHERE TABLE_NAME = %s
-							AND TABLE_SCHEMA = %s',
-							$pdo->escapeString($tbl),
-							$pdo->escapeString($db_name)
-					);
-
-					if (strpos($tbl, 'binaries_') !== false) {
-						$run = $pdo->queryOneRow($cntsql, $tRun->rand_bool($runVar['counts']['iterations']));
-						if (isset($run['count']) && is_numeric($run['count'])) {
-							$runVar['counts']['now']['binaries_table'] += $run['count'];
-						}
-					} else if (strpos($tbl, 'parts_') !== false) {
-						$run = $pdo->queryOneRow($cntsql, $tRun->rand_bool($runVar['counts']['iterations']));
-						if (isset($run['count']) && is_numeric($run['count'])) {
-							$runVar['counts']['now']['parts_table'] += $run['count'];
-						}
-					} else if (strpos($tbl, 'partrepair_') !== false) {
-						$run = $pdo->queryOneRow($cntsql, $tRun->rand_bool($runVar['counts']['iterations']));
-						if (isset($run['count']) && is_numeric($run['count'])) {
-							$runVar['counts']['now']['partrepair_table'] += $run['count'];
-						}
-					}
-				}
-
-
-				//free up memory used by now stale data
-				unset($run, $run1, $tables);
-
-				$runVar['timers']['query']['tpg_time'] = (time() - $timer07);
-				$runVar['timers']['query']['tpg1_time'] = (time() - $timer01);
-			}
-		}
-		$runVar['timers']['timer2'] = time();
-
-		//assign postprocess values from $proc
-		if (is_array($proc1res)) {
-			foreach ($proc1res AS $proc1key => $proc1) {
-				$runVar['counts']['now'][$proc1key] = $proc1;
-			}
-		} else {
-			errorOnSQL($pdo);
-		}
-
-		if (is_array($proc2res)) {
-			foreach ($proc2res AS $proc2key => $proc2) {
-				$runVar['counts']['now'][$proc2key] = $proc2;
-			}
-		} else {
-			errorOnSQL($pdo);
-		}
-		if (is_array($proc3res)) {
-			foreach ($proc3res AS $proc3key => $proc3) {
-				$runVar['counts']['now'][$proc3key] = $proc3;
-			}
-		} else {
-			errorOnSQL($pdo);
-		}
-
-		// now that we have merged our query data we can unset these to free up memory
-		unset($proc1res, $proc2res, $proc3res, $splitres);
-
-		// Zero out any post proc counts when that type of pp has been turned off
-		foreach ($runVar['settings'] as $settingkey => $setting) {
-			if (strpos($settingkey, 'process') == 0 && $setting == 0) {
-				$runVar['counts']['now'][$settingkey] = $runVar['counts']['start'][$settingkey] = 0;
-			}
-		}
-
-		//set initial start postproc values from work queries -- this is used to determine diff variables
-		if ($runVar['counts']['iterations'] == 1) {
-			$runVar['counts']['start'] = $runVar['counts']['now'];
-		}
-
-		foreach ($runVar['counts']['now'] as $key => $proc) {
-
-			//if key is a process type, add it to total_work
-			if (strpos($key, 'process') === 0) {
-				$runVar['counts']['now']['total_work'] += $proc;
-			}
-
-			//calculate diffs
-			$runVar['counts']['diff'][$key] = number_format($proc - $runVar['counts']['start'][$key]);
-
-			//calculate percentages -- if user has no releases, set 0 for each key or this will fail on divide by zero
-			$runVar['counts']['percent'][$key] = ($runVar['counts']['now']['releases'] > 0
-				? sprintf("%02s", floor(($proc / $runVar['counts']['now']['releases']) * 100)) : 0);
-		}
-
-		$runVar['counts']['now']['total_work'] += $runVar['counts']['now']['work'];
-
-		// Set initial total work count for diff
-		if ($runVar['counts']['iterations'] == 1) {
-			$runVar['counts']['start']['total_work'] = $runVar['counts']['now']['total_work'];
-		}
-
-		// Set diff total work count
-		$runVar['counts']['diff']['total_work'] = number_format($runVar['counts']['now']['total_work'] - $runVar['counts']['start']['total_work']);
-	}
-
-	//set kill switches
-	$runVar['killswitch']['pp'] = (($runVar['settings']['postprocess_kill'] < $runVar['counts']['now']['total_work']) && ($runVar['settings']['postprocess_kill'] != 0)
-		? true
-		: false
-	);
-
-	$tOut->updateMonitorPane($runVar);
-
-	//begin pane run execution
-	if ($runVar['settings']['is_running'] === '1') {
-
-		//run main updating function(s)
-		$tRun->runPane('main', $runVar);
-
-		//run nzb-import
-		$tRun->runPane('import', $runVar);
-
-		//run postprocess_releases amazon
-		$tRun->runPane('amazon', $runVar);
-
-		//respawn IRCScraper if it has been killed
-		$tRun->runPane('scraper', $runVar);
-
-		//run sharing regardless of sequential setting
-		$tRun->runPane('sharing', $runVar);
-
-		//update tv and theaters
-		$tRun->runPane('updatetv', $runVar);
-
-		//run these if complete sequential not set
-		if ($runVar['constants']['sequential'] != 2) {
-
-			//fix names
-			$tRun->runPane('fixnames', $runVar);
-
-			//dehash releases
-			$tRun->runPane('dehash', $runVar);
-
-			// Remove crap releases.
-			$tRun->runPane('removecrap', $runVar);
-
-			//run postprocess_releases additional
-			$tRun->runPane('ppadditional', $runVar);
-
-			//run postprocess_releases non amazon
-			$tRun->runPane('nonamazon', $runVar);
-		}
-
-	} else  if ($runVar['settings']['is_running'] === '0') {
-		$tRun->runPane('notrunning', $runVar);
-	}
-
-	$runVar['counts']['iterations']++;
-	sleep(10);
-}
-
-function errorOnSQL($pdo)
-{
-	echo $pdo->log->error(PHP_EOL . "Monitor encountered severe errors retrieving process data from MySQL.  Please diagnose and try running again." . PHP_EOL);
-	exit;
-}
\ No newline at end of file
diff --git a/bin/postprocess.php b/bin/postprocess.php
deleted file mode 100644
index 8784f6bcd..000000000
--- a/bin/postprocess.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . '/config.php');
-require_once(WWW_DIR . '/lib/postprocess.php');
-require_once(WWW_DIR . '/lib/framework/db.php');
-require_once(WWW_DIR . '/lib/nntp.php');
-require_once(WWW_DIR . '/lib/site.php');
-require_once(WWW_DIR . '/lib/anidb.php');
-require_once(WWW_DIR . '/lib/thetvdb.php');
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(dirname(__FILE__) . '/../lib/TvAnger.php');
-require_once(dirname(__FILE__) . '/../lib/Pprocess.php');
-require_once(dirname(__FILE__) . '/../lib/Info.php');
-
-$pdo = new DB();
-$s = new Sites();
-$site = $s->get();
-/**
-Array with possible arguments for run and
-whether or not those methods of operation require NNTP
- **/
-
-$args = array(
-	'additional' => true,
-	'all'        => true,
-	'allinf'     => true,
-	'amazon'     => false,
-	'anime'      => false,
-	'book'       => false,
-	'console'    => false,
-	'games'      => false,
-	'movies'     => false,
-	'music'      => false,
-	'nfo'        => true,
-	'pre'        => true,
-	'sharing'    => true,
-	'spotnab'    => true,
-	'tv'         => false,
-	'tvdb'       => false,
-	'xxx'        => false,
-);
-
-$bool = array(
-	'true',
-	'false'
-);
-
-if (!isset($argv[1]) || !in_array($argv[1], $args) || !isset($argv[2]) || !in_array($argv[2], $bool)) {
-	exit(
-	$pdo->log->error(
-		"\nIncorrect arguments.\n"
-		. "The second argument (true/false) determines wether to echo or not.\n\n"
-		. "php postprocess.php all true         ...: Does all the types of post processing.\n"
-		. "php postprocess.php pre true         ...: Processes all Predb sites.\n"
-		. "php postprocess.php nfo true         ...: Processes NFO files.\n"
-		. "php postprocess.php movies true      ...: Processes movies.\n"
-		. "php postprocess.php music true       ...: Processes music.\n"
-		. "php postprocess.php console true     ...: Processes console games.\n"
-		. "php postprocess.php games true       ...: Processes games.\n"
-		. "php postprocess.php book true        ...: Processes books.\n"
-		. "php postprocess.php anime true       ...: Processes anime.\n"
-		. "php postprocess.php tv true          ...: Processes tv.\n"
-		. "php postprocess.php tvdb true        ...: Processes tvdb.\n"
-		. "php postprocess.php xxx true         ...: Processes xxx.\n"
-		. "php postprocess.php additional true  ...: Processes previews/mediainfo/etc...\n"
-		. "php postprocess.php sharing true     ...: Processes uploading/downloading comments.\n"
-		. "php postprocess.php spotnab true     ...: Processes uploading/downloading comments from spotnab.\n"
-		. "php postprocess.php allinf true      ...: Does all the types of post processing on a loop, sleeping 15 seconds between.\n"
-		. "php postprocess.php amazon true      ...: Does all the amazon (books/console/games/music/xxx).\n"
-	)
-	);
-}
-
-$nntp = null;
-if ($args[$argv[1]] === true) {
-	$nntp = new NNTP(['Settings' => $pdo]);
-	if (($site->alternate_nntp == 1 ? $nntp->doConnect(true, true) : $nntp->doConnect()) !== true) {
-		exit($pdo->log->error("Unable to connect to usenet." . PHP_EOL));
-	}
-}
-
-$postProcess = new PProcess(['Settings' => $pdo, 'Echo' => ($argv[2] === 'true' ? true : false)]);
-$pp = new PostProcess(true);
-
-$charArray = ['a','b','c','d','e','f','0','1','2','3','4','5','6','7','8','9'];
-
-switch ($argv[1]) {
-
-	case 'all':
-		$postProcess->processAll($nntp);
-		break;
-	case 'allinf':
-		$i = 1;
-		while ($i = 1) {
-			$postProcess->processAll($nntp);
-			sleep(15);
-		}
-		break;
-	case 'additional':
-		$postProcess->processAdditional($nntp, '', (isset($argv[3]) && in_array($argv[3], $charArray) ? $argv[3] : ''));
-		break;
-	case 'amazon':
-		$postProcess->processBooks();
-		$postProcess->processConsoles();
-		$postProcess->processGames();
-		$postProcess->processMusic();
-		$postProcess->processXXX();
-		break;
-	case 'anime':
-		$postProcess->processAnime();
-		break;
-	case 'book':
-		$postProcess->processBooks();
-		$pp->processBooks();
-		break;
-	case 'console':
-		$postProcess->processConsoles();
-		break;
-	case 'games':
-		$postProcess->processGames();
-		break;
-	case 'nfo':
-		$postProcess->processNfos($nntp, '', (isset($argv[3]) && in_array($argv[3], $charArray) ? $argv[3] : ''));
-		break;
-	case 'movies':
-		$postProcess->processMovies('', (isset($argv[3]) && in_array($argv[3], $charArray) ? $argv[3] : ''));
-		break;
-	case 'music':
-		$postProcess->processMusic();
-		$pp->processMusic();
-		break;
-	case 'pre':
-		break;
-	case 'sharing':
-		$postProcess->processSharing($nntp);
-		break;
-	case 'spotnab':
-		$postProcess->processSpotnab($nntp);
-		break;
-	case 'tv':
-		$postProcess->processTV('', (isset($argv[3]) && in_array($argv[3], $charArray) ? $argv[3] : ''));
-		break;
-	case 'tvdb':
-		$postProcess->processTvDB();
-		break;
-	case 'xxx':
-		$postProcess->processXXX();
-		break;
-	default:
-		exit;
-}
\ No newline at end of file
diff --git a/bin/postprocess_threaded.php b/bin/postprocess_threaded.php
deleted file mode 100644
index 19a711a76..000000000
--- a/bin/postprocess_threaded.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-require_once(dirname(__FILE__).'/config.php');
-require_once(WWW_DIR.'/lib/nntp.php');
-require_once(WWW_DIR.'/lib/site.php');
-require_once(WWW_DIR.'/lib/anidb.php');
-require_once(WWW_DIR.'/lib/tvrage.php');
-require_once(WWW_DIR.'/lib/thetvdb.php');
-require_once(WWW_DIR.'/lib/Tmux.php');
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(dirname(__FILE__) . '/../lib/Pprocess.php');
-
-
-$c = new ColorCLI();
-if (!isset($argv[1])) {
-	exit($c->error("This script is not intended to be run manually, it is called from postprocess_threaded.py."));
-}
-
-
-$tmux = new Tmux;
-$torun = $tmux->get()->post;
-
-$pieces = explode('           =+=            ', $argv[1]);
-
-$postprocess = new PProcess(['Echo' => true]);
-if (isset($pieces[6])) {
-	// Create the connection here and pass
-	$nntp = new NNTP();
-	if  ($nntp->doConnect() === false) {
-		exit($c->error("Unable to connect to usenet."));
-	}
-
-	$postprocess->processAdditional($nntp, $argv[1]);
-	$nntp->doQuit();
-} else if (isset($pieces[3])) {
-	// Create the connection here and pass
-	$nntp = new NNTP();
-	if ($nntp->doConnect() === false) {
-		exit($c->error("Unable to connect to usenet."));
-	}
-
-	$postprocess->processNfos($argv[1], $nntp);
-	$nntp->doQuit();
-
-} else if (isset($pieces[2])) {
-	$postprocess->processMovies($argv[1]);
-	echo '.';
-} else if (isset($pieces[1])) {
-	$postprocess->processTv($argv[1]);
-}
diff --git a/bin/tmux-mem-cpu-load b/bin/tmux-mem-cpu-load
deleted file mode 100755
index 348f64ec6..000000000
Binary files a/bin/tmux-mem-cpu-load and /dev/null differ
diff --git a/bin/tmux-mem-cpu-load-x32 b/bin/tmux-mem-cpu-load-x32
deleted file mode 100755
index e750ee63f..000000000
Binary files a/bin/tmux-mem-cpu-load-x32 and /dev/null differ
diff --git a/bin/update_binaries.php b/bin/update_binaries.php
deleted file mode 100644
index eb6091f4f..000000000
--- a/bin/update_binaries.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/config.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-$time = TIME();
-$c = new ColorCLI();
-
-if (isset($argv[1])) {
-	$group = $argv[1];
-	echo $c->header("Updating group {$group}");
-
-	$g = new Groups;
-	$group = $g->getByName($group);
-
-	$bin = new Binaries;
-	$bin->updateGroup($group);
-} else {
-	$binaries = new Binaries;
-	$binaries->updateAllGroups();
-}
-
-function relativeTime($_time)
-{
-	$d = array();
-	$d[0] = array(1, "sec");
-	$d[1] = array(60, "min");
-	$d[2] = array(3600, "hr");
-	$d[3] = array(86400, "day");
-	$d[4] = array(31104000, "yr");
-
-	$w = array();
-
-	$return = "";
-	$now = TIME();
-	$diff = ($now - $_time);
-	$secondsLeft = $diff;
-
-	for ($i = 4; $i > -1; $i--) {
-		$w[$i] = intval($secondsLeft / $d[$i][0]);
-		$secondsLeft -= ($w[$i] * $d[$i][0]);
-		if ($w[$i] != 0) {
-			//$return.= abs($w[$i]). " " . $d[$i][1] . (($w[$i]>1)?'s':'') ." ";
-			$return .= $w[$i] . " " . $d[$i][1] . (($w[$i] > 1) ? 's' : '') . " ";
-		}
-	}
-
-	//$return .= ($diff>0)?"ago":"left";
-	return $return;
-}
-
-echo $c->header("Group update process completed in: " . relativeTime($time) . "\n");
-
diff --git a/bin/update_groups.php b/bin/update_groups.php
deleted file mode 100644
index f299186fb..000000000
--- a/bin/update_groups.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__).'/config.php');
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR . '/lib/nntp.php');
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-
-
-$start = TIME();
-$c = new ColorCLI();
-$consoleTools = new ConsoleTools();
-$pdo = new DB();
-
-// Create the connection here and pass
-$nntp = new \NNTP(['Settings' => $pdo]);
-if ($nntp->doConnect() !== true) {
-	exit($pdo->log->error("Unable to connect to usenet."));
-}
-
-echo $pdo->log->header("Getting first/last for all your active groups.");
-$data = $nntp->getGroups();
-if ($nntp->isError($data)) {
-	exit($pdo->log->error("Failed to getGroups() from nntp server."));
-}
-
-echo $pdo->log->header("Inserting new values into shortgroups table.");
-
-$pdo->queryExec('TRUNCATE TABLE shortgroups');
-
-// Put into an array all active groups
-$res = $pdo->query('SELECT name FROM groups WHERE active = 1 OR backfill = 1');
-
-foreach ($data as $newgroup) {
-	if (myInArray($res, $newgroup['group'], 'name')) {
-		$pdo->queryInsert(sprintf('INSERT INTO shortgroups (name, first_record, last_record, updated) VALUES (%s, %s, %s, NOW())', $pdo->escapeString($newgroup['group']), $pdo->escapeString($newgroup['first']), $pdo->escapeString($newgroup['last'])));
-		echo $pdo->log->primary('Updated ' . $newgroup['group']);
-	}
-}
-echo $pdo->log->header('Running time: ' . $consoleTools->convertTimer(TIME() - $start));
-
-function myInArray($array, $value, $key)
-{
-	//loop through the array
-	foreach ($array as $val) {
-		//if $val is an array cal myInArray again with $val as array input
-		if (is_array($val)) {
-			if (myInArray($val, $value, $key)) {
-				return true;
-			}
-		} else {
-			//else check if the given key has $value as value
-			if ($array[$key] == $value) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
\ No newline at end of file
diff --git a/bin/update_releases.php b/bin/update_releases.php
deleted file mode 100644
index bfdf432f7..000000000
--- a/bin/update_releases.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-
-
-
-$s = new \Sites();
-$site = $s->get();
-$pdo = new DB();
-
-if (isset($argv[2]) && $argv[2] === 'true') {
-	// Create the connection here and pass
-	$nntp = new \NNTP(['Settings' => $pdo]);
-	if ($nntp->doConnect() !== true) {
-		exit($pdo->log->error("Unable to connect to usenet."));
-	}
-}
-if ($site->tablepergroup === 1) {
-	exit($pdo->log->error("You are using 'tablepergroup', you must use .../misc/update_scripts/nix_scripts/multiprocessing/releases.php"));
-}
-
-$groupName = isset($argv[3]) ? $argv[3] : '';
-if (isset($argv[1]) && isset($argv[2])) {
-	$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-	$releases = new Releases(['Settings' => $pdo, 'ConsoleTools' => $consoletools]);
-	if ($argv[1] == 1 && $argv[2] == 'true') {
-		$releases->processReleases(1, 1, $groupName, $nntp, true);
-	} else if ($argv[1] == 1 && $argv[2] == 'false') {
-		$releases->processReleases(1, 2, $groupName, $nntp, true);
-	} else if ($argv[1] == 2 && $argv[2] == 'true') {
-		$releases->processReleases(2, 1, $groupName, $nntp, true);
-	} else if ($argv[1] == 2 && $argv[2] == 'false') {
-		$releases->processReleases(2, 2, $groupName, $nntp, true);
-	} else if ($argv[1] == 4 && ($argv[2] == 'true' || $argv[2] == 'false')) {
-		echo $pdo->log->header("Moving all releases to other -> misc, this can take a while, be patient.");
-		$releases->resetCategorize();
-	} else if ($argv[1] == 5 && ($argv[2] == 'true' || $argv[2] == 'false')) {
-		echo $pdo->log->header("Categorizing all non-categorized releases in other->misc using usenet subject. This can take a while, be patient.");
-		$timestart = TIME();
-		$relcount = $releases->categorizeRelease('name', 'WHERE iscategorized = 0 AND categoryid = 8010');
-		$time = $consoletools->convertTime(TIME() - $timestart);
-		echo $pdo->log->primary("\n" . 'Finished categorizing ' . $relcount . ' releases in ' . $time . " seconds, using the usenet subject.");
-	} else if ($argv[1] == 6 && $argv[2] == 'true') {
-		echo $pdo->log->header("Categorizing releases in all sections using the searchname. This can take a while, be patient.");
-		$timestart = TIME();
-		$relcount = $releases->categorizeRelease('searchname', '');
-		$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-		$time = $consoletools->convertTime(TIME() - $timestart);
-		echo $pdo->log->primary("\n" . 'Finished categorizing ' . $relcount . ' releases in ' . $time . " seconds, using the search name.");
-	} else if ($argv[1] == 6 && $argv[2] == 'false') {
-		echo $pdo->log->header("Categorizing releases in misc sections using the searchname. This can take a while, be patient.");
-		$timestart = TIME();
-		$relcount = $releases->categorizeRelease('searchname', 'WHERE categoryid IN (1090, 2020, 3050, 5050, 6050, 8010)');
-		$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-		$time = $consoletools->convertTime(TIME() - $timestart);
-		echo $pdo->log->primary("\n" . 'Finished categorizing ' . $relcount . ' releases in ' . $time . " seconds, using the search name.");
-	} else {
-		exit($pdo->log->error("Wrong argument, type php update_releases.php to see a list of valid arguments."));
-	}
-} else {
-	exit($pdo->log->error("\nWrong set of arguments.\n"
-		. "php update_releases.php 1 true			...: Creates releases and attempts to categorize new releases\n"
-		. "php update_releases.php 2 true			...: Creates releases and leaves new releases in other -> misc\n"
-		. "\nYou must pass a second argument whether to post process or not, true or false\n"
-		. "You can pass a third optional argument, a group name (ex.: alt.binaries.multimedia).\n"
-		. "\nExtra commands::\n"
-		. "php update_releases.php 4 true			...: Puts all releases in other-> misc (also resets to look like they have never been categorized)\n"
-		. "php update_releases.php 5 true			...: Categorizes all releases in other-> misc (which have not been categorized already)\n"
-		. "php update_releases.php 6 false			...: Categorizes releases in misc sections using the search name\n"
-		. "php update_releases.php 6 true			...: Categorizes releases in all sections using the search name\n"));
-}
\ No newline at end of file
diff --git a/lib/DB/db.sql b/lib/DB/db.sql
deleted file mode 100644
index aa93c1375..000000000
--- a/lib/DB/db.sql
+++ /dev/null
@@ -1,1278 +0,0 @@
-ALTER TABLE `releases`
-ADD `dehashstatus` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `nfostatus` TINYINT NOT NULL DEFAULT 0,
-ADD `jpgstatus` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `audiostatus` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `videostatus` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `reqidstatus` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `prehashid` INT UNSIGNED NOT NULL DEFAULT 0,
-ADD `iscategorized` BIT NOT NULL DEFAULT 0,
-ADD `isrenamed` BIT NOT NULL DEFAULT 0,
-ADD `ishashed` BIT NOT NULL DEFAULT 0,
-ADD `isrequestid` BIT NOT NULL DEFAULT 0,
-ADD `proc_pp` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `proc_par2` BIT NOT NULL DEFAULT 0,
-ADD `proc_nfo` BIT NOT NULL DEFAULT 0,
-ADD `proc_files` BIT NOT NULL DEFAULT 0,
-ADD `gamesinfo_id` INT SIGNED NOT NULL DEFAULT '0',
-ADD `xxxinfo_id` INT SIGNED NOT NULL DEFAULT '0',
-ADD `nzbstatus` TINYINT(1) NOT NULL DEFAULT 0,
-ADD `proc_sorter` TINYINT(1) NOT NULL DEFAULT '0';
-CREATE INDEX `ix_releases_nfostatus` ON `releases` (`nfostatus` ASC) USING HASH;
-CREATE INDEX `ix_releases_reqidstatus` ON `releases` (`reqidstatus` ASC) USING HASH;
-CREATE INDEX `ix_releases_passwordstatus` ON `releases` (`passwordstatus`);
-CREATE INDEX `ix_releases_releasenfoID` ON `releases` (`releasenfoid`);
-CREATE INDEX `ix_releases_dehashstatus` ON `releases` (`dehashstatus`);
-CREATE INDEX `ix_releases_haspreview` ON `releases` (`haspreview` ASC) USING HASH;
-CREATE INDEX `ix_releases_postdate_name` ON `releases` (`postdate`, `name`);
-CREATE INDEX `ix_releases_prehashid_searchname` ON `releases` (`prehashid`, `searchname`);
-CREATE INDEX `ix_releases_gamesinfo_id` ON `releases` (`gamesinfo_id`);
-CREATE INDEX `ix_releases_xxxinfo_id` ON `releases` (`xxxinfo_id`);
-CREATE INDEX `ix_releases_status` ON `releases` (`nzbstatus`, `iscategorized`, `isrenamed`, `nfostatus`, `ishashed`, `passwordstatus`, `dehashstatus`, `releasenfoid`, `musicinfoid`, `consoleinfoid`, `bookinfoid`, `haspreview`, `categoryid`, `imdbid`, `rageid`);
-UPDATE releases SET `nzbstatus` = 1 WHERE `nzbstatus` = 0;
-
-ALTER TABLE users ADD COLUMN gameview INT AFTER consoleview;
-ALTER TABLE users ADD COLUMN xxxview INT AFTER consoleview;
-ALTER TABLE users ADD COLUMN cp_api  VARCHAR(255) NULL DEFAULT NULL;
-ALTER TABLE users ADD COLUMN cp_url  VARCHAR(255) NULL DEFAULT NULL;
-ALTER TABLE users ADD COLUMN queuetype TINYINT(1) NOT NULL DEFAULT 1;
-
-
-DROP TABLE IF EXISTS prehash;
-CREATE TABLE prehash (
-  id         INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  filename   VARCHAR(255)     NOT NULL DEFAULT '',
-  title      VARCHAR(255)     NOT NULL DEFAULT '',
-  nfo        VARCHAR(255)     NULL,
-  size       VARCHAR(50)      NULL,
-  category   VARCHAR(255)     NULL,
-  predate    DATETIME DEFAULT NULL,
-  source     VARCHAR(50)      NOT NULL DEFAULT '',
-  requestid  INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  groupid    INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  nuked      TINYINT(1)       NOT NULL DEFAULT '0',
-  nukereason VARCHAR(255)     NULL,
-  files      VARCHAR(50)      NULL,
-  searched   TINYINT(1)       NOT NULL DEFAULT '0',
-  PRIMARY KEY (id)
-)
-  ENGINE =INNODB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci
-  AUTO_INCREMENT =1;
-
-CREATE INDEX `ix_prehash_filename` ON `prehash` (`filename`);
-CREATE UNIQUE INDEX `ix_prehash_title` ON `prehash` (`title`);
-CREATE INDEX `ix_prehash_nfo` ON `prehash` (`nfo`);
-CREATE INDEX `ix_prehash_predate` ON `prehash` (`predate`);
-CREATE INDEX `ix_prehash_source` ON `prehash` (`source`);
-CREATE INDEX `ix_prehash_requestid` ON `prehash` (`requestid`, `groupid`);
-CREATE INDEX `ix_prehash_size` ON `prehash` (`size`);
-CREATE INDEX `ix_prehash_category` ON `prehash` (`category`);
-CREATE INDEX `ix_prehash_searched` ON `prehash` (`searched`);
-
-DROP TABLE IF EXISTS tmux;
-CREATE TABLE tmux (
-  id          INT(10) UNSIGNED        NOT NULL AUTO_INCREMENT,
-  setting     VARCHAR(64)
-              COLLATE utf8_unicode_ci NOT NULL,
-  value       VARCHAR(19000)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  updateddate TIMESTAMP               NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (id),
-  UNIQUE KEY setting (setting)
-)
-  ENGINE =INNODB
-  DEFAULT CHARSET =utf8
-  COLLATE =utf8_unicode_ci;
-
-INSERT INTO tmux (setting, value) VALUES ('defrag_cache', '900'),
-('monitor_delay', '30'),
-('tmux_session', 'newznab'),
-('niceness', '19'),
-('binaries', '0'),
-('maxbinaries', '10000'),
-('backfill', '0'),
-('import', '0'),
-('nzbs', '/path/to/nzbs'),
-('running', '0'),
-('sequential', '0'),
-('nfos', '0'),
-('post', '0'),
-('releases', '0'),
-('fix_names', '0'),
-('seq_timer', '30'),
-('bins_timer', '30'),
-('bins_kill_timer', '0'),
-('back_timer', '30'),
-('import_timer', '30'),
-('rel_timer', '30'),
-('fix_timer', '30'),
-('post_timer', '30'),
-('import_bulk', '0'),
-('backfill_qty', '100000'),
-('postprocess_kill', '0'),
-('crap_timer', '30'),
-('fix_crap', '0'),
-('tv_timer', '43200'),
-('update_tv', '0'),
-('htop', '0'),
-('nmon', '0'),
-('bwmng', '0'),
-('mytop', '0'),
-('console', '0'),
-('vnstat', '0'),
-('vnstat_args', NULL),
-('tcptrack', '0'),
-('tcptrack_args', '-i eth0 port 443'),
-('backfill_groups', '4'),
-('post_kill_timer', '300'),
-('monitor_path', NULL),
-('write_logs', '0'),
-('powerline', '0'),
-('patchdb', '0'),
-('patchdb_timer', '21600'),
-('progressive', '0'),
-('backfill_order', '2'),
-('backfill_days', '1'),
-('post_amazon', '0'),
-('amazonsleep', 1000),
-('post_non', '0'),
-('post_timer_amazon', '30'),
-('post_timer_non', '30'),
-('colors_start', '1'),
-('colors_end', '250'),
-('colors_exc', '4, 8, 9, 11, 15, 16, 17, 18, 19, 46, 47, 48, 49, 50, 51, 52, 53, 59, 60'),
-('monitor_path_a', NULL),
-('monitor_path_b', NULL),
-('showquery', '0'),
-('fix_crap_opt', 'Disabled'),
-('showprocesslist', '0'),
-('processupdate', '2'),
-('maxaddprocessed', 25),
-('maxnfoprocessed', 100),
-('maxrageprocessed', 75),
-('maximdbprocessed', 100),
-('maxanidbprocessed', 100),
-('maxmusicprocessed', 150),
-('maxgamesprocessed', 150),
-('maxbooksprocessed', 300),
-('maxnzbsprocessed', 1000),
-('maxpartrepair', 15000),
-('partrepair', 1),
-('binarythreads', 1),
-('backfillthreads', 1),
-('postthreads', 1),
-('releasethreads', 1),
-('nzbthreads', 1),
-('maxmssgs', 20000),
-('maxsizetopostprocess', 100),
-('postthreadsamazon', '1'),
-('postthreadsnon', '1'),
-('currentppticket', '0'),
-('nextppticket', '0'),
-('segmentstodownload', '2'),
-('passchkattempts', 1),
-('maxpartsprocessed', 3),
-('debuginfo', 0),
-('sphinx', '0'),
-('sphinx_timer', '600'),
-('movie_timer', '43200'),
-('fetch_movie', '0'),
-('unwanted', '0'),
-('others', '0'),
-('spotnab', '0'),
-('spotnab_timer', '600'),
-('predb', '0'),
-('predb_timer', '600'),
-('safebackfilldate', '2012-06-24'),
-('request_hours', '1'),
-('trakttvkey', ''),
-('fanarttvkey', ''),
-('lookuppar2', '0'),
-('addpar2', '0'),
-('fixnamethreads', '1'),
-('fixnamesperrun', '10'),
-('zippath', ''),
-('processjpg', 0),
-('scrape', 0),
-('lastpretime', '0'),
-('nntpretries', '10'),
-('run_sharing', '0'),
-  ('sharing_timer', '60'),
-  ('imdburl', '0'),
-  ('yydecoderpath', ''),
-  ('ffmpeg_duration', '5'),
-  ('ffmpeg_image_time', '5'),
-  ('processvideos', '0'),
-  ('sqlpatch', '73');
-
-DROP TABLE IF EXISTS releasesearch;
-CREATE TABLE releasesearch (
-  id         INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  releaseid  INT(11) UNSIGNED NOT NULL,
-  guid       VARCHAR(50)      NOT NULL,
-  name       VARCHAR(255)     NOT NULL DEFAULT '',
-  searchname VARCHAR(255)     NOT NULL DEFAULT '',
-  PRIMARY KEY (id)
-)
-  ENGINE =MYISAM
-  DEFAULT CHARSET =utf8
-  COLLATE =utf8_unicode_ci
-  AUTO_INCREMENT =1;
-
-CREATE FULLTEXT INDEX ix_releasesearch_name_searchname_ft ON releasesearch (name, searchname);
-CREATE INDEX ix_releasesearch_releaseid ON releasesearch (releaseid);
-CREATE INDEX ix_releasesearch_guid ON releasesearch (guid);
-
-DROP TABLE IF EXISTS country;
-CREATE TABLE country (
-  id   INT(11)      NOT NULL AUTO_INCREMENT,
-  name VARCHAR(255) NOT NULL DEFAULT "",
-  code CHAR(2)      NOT NULL DEFAULT "",
-  PRIMARY KEY (id)
-)
-  ENGINE =INNODB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci
-  AUTO_INCREMENT =1;
-
-CREATE INDEX ix_country_name ON country (name);
-
-INSERT INTO country (code, name) VALUES ('AF', 'Afghanistan'),
-('AX', 'Aland Islands'),
-('AL', 'Albania'),
-('DZ', 'Algeria'),
-('AS', 'American Samoa'),
-('AD', 'Andorra'),
-('AO', 'Angola'),
-('AI', 'Anguilla'),
-('AQ', 'Antarctica'),
-('AG', 'Antigua and Barbuda'),
-('AR', 'Argentina'),
-('AM', 'Armenia'),
-('AW', 'Aruba'),
-('AU', 'Australia'),
-('AT', 'Austria'),
-('AZ', 'Azerbaijan'),
-('BS', 'Bahamas'),
-('BH', 'Bahrain'),
-('BD', 'Bangladesh'),
-('BB', 'Barbados'),
-('BY', 'Belarus'),
-('BE', 'Belgium'),
-('BZ', 'Belize'),
-('BJ', 'Benin'),
-('BM', 'Bermuda'),
-('BT', 'Bhutan'),
-('BO', 'Bolivia'),
-('BA', 'Bosnia and Herzegovina'),
-('BW', 'Botswana'),
-('BV', 'Bouvetoya'),
-('BR', 'Brazil'),
-('VG', 'British Virgin Islands'),
-('BN', 'Brunei Darussalam'),
-('BG', 'Bulgaria'),
-('BF', 'Burkina Faso'),
-('BI', 'Burundi'),
-('KH', 'Cambodia'),
-('CM', 'Cameroon'),
-('CA', 'Canada'),
-('CV', 'Cape Verde'),
-('KY', 'Cayman Islands'),
-('CF', 'Central African Republic'),
-('TD', 'Chad'),
-('CL', 'Chile'),
-('CN', 'China'),
-('CX', 'Christmas Island'),
-('CC', 'Cocos (Keeling) Islands'),
-('CO', 'Colombia'),
-('KM', 'Comoros the'),
-('CD', 'Congo'),
-('CG', 'Congo the'),
-('CK', 'Cook Islands'),
-('CR', 'Costa Rica'),
-('CI', 'Cote d\'Ivoire'),
-('HR', 'Croatia'),
-('CU', 'Cuba'),
-('CY', 'Cyprus'),
-('CZ', 'Czech Republic'),
-('DK', 'Denmark'),
-('DJ', 'Djibouti'),
-('DM', 'Dominica'),
-('DO', 'Dominican Republic'),
-('EC', 'Ecuador'),
-('EG', 'Egypt'),
-('SV', 'El Salvador'),
-('GQ', 'Equatorial Guinea'),
-('ER', 'Eritrea'),
-('EE', 'Estonia'),
-('ET', 'Ethiopia'),
-('FO', 'Faroe Islands'),
-('FK', 'Falkland Islands'),
-('FJ', 'Fiji'),
-('FI', 'Finland'),
-('FR', 'France'),
-('GF', 'French Guiana'),
-('PF', 'French Polynesia'),
-('GA', 'Gabon'),
-('GM', 'Gambia'),
-('GE', 'Georgia'),
-('DE', 'Germany'),
-('GH', 'Ghana'),
-('GI', 'Gibraltar'),
-('GR', 'Greece'),
-('GL', 'Greenland'),
-('GD', 'Grenada'),
-('GP', 'Guadeloupe'),
-('GU', 'Guam'),
-('GT', 'Guatemala'),
-('GG', 'Guernsey'),
-('GN', 'Guinea'),
-('GW', 'Guinea-Bissau'),
-('GY', 'Guyana'),
-('HT', 'Haiti'),
-('HN', 'Honduras'),
-('HK', 'Hong Kong'),
-('HU', 'Hungary'),
-('IS', 'Iceland'),
-('IN', 'India'),
-('id', 'Indonesia'),
-('IR', 'Iran'),
-('IQ', 'Iraq'),
-('IE', 'Ireland'),
-('IM', 'Isle of Man'),
-('IL', 'Israel'),
-('IT', 'Italy'),
-('JM', 'Jamaica'),
-('JP', 'Japan'),
-('JE', 'Jersey'),
-('JO', 'Jordan'),
-('KZ', 'Kazakhstan'),
-('KE', 'Kenya'),
-('KI', 'Kiribati'),
-('KP', 'Korea'),
-('KR', 'Korea'),
-('KW', 'Kuwait'),
-('KG', 'Kyrgyz Republic'),
-('LA', 'Lao'),
-('LV', 'Latvia'),
-('LB', 'Lebanon'),
-('LS', 'Lesotho'),
-('LR', 'Liberia'),
-('LY', 'Libyan Arab Jamahiriya'),
-('LI', 'Liechtenstein'),
-('LT', 'Lithuania'),
-('LU', 'Luxembourg'),
-('MO', 'Macao'),
-('MK', 'Macedonia'),
-('MG', 'Madagascar'),
-('MW', 'Malawi'),
-('MY', 'Malaysia'),
-('MV', 'Maldives'),
-('ML', 'Mali'),
-('MT', 'Malta'),
-('MH', 'Marshall Islands'),
-('MQ', 'Martinique'),
-('MR', 'Mauritania'),
-('MU', 'Mauritius'),
-('YT', 'Mayotte'),
-('MX', 'Mexico'),
-('FM', 'Micronesia'),
-('MD', 'Moldova'),
-('MC', 'Monaco'),
-('MN', 'Mongolia'),
-('ME', 'Montenegro'),
-('MS', 'Montserrat'),
-('MA', 'Morocco'),
-('MZ', 'Mozambique'),
-('MM', 'Myanmar'),
-('NA', 'Namibia'),
-('NR', 'Nauru'),
-('NP', 'Nepal'),
-('AN', 'Netherlands Antilles'),
-('NL', 'Netherlands'),
-('NC', 'New Caledonia'),
-('NZ', 'New Zealand'),
-('NI', 'Nicaragua'),
-('NE', 'Niger'),
-('NG', 'Nigeria'),
-('NU', 'Niue'),
-('NF', 'Norfolk Island'),
-('MP', 'Northern Mariana Islands'),
-('NO', 'Norway'),
-('OM', 'Oman'),
-('PK', 'Pakistan'),
-('PW', 'Palau'),
-('PS', 'Palestinian Territory'),
-('PA', 'Panama'),
-('PG', 'Papua New Guinea'),
-('PY', 'Paraguay'),
-('PE', 'Peru'),
-('PH', 'Philippines'),
-('PN', 'Pitcairn Islands'),
-('PL', 'Poland'),
-('PT', 'Portugal'),
-('PR', 'Puerto Rico'),
-('QA', 'Qatar'),
-('RE', 'Reunion'),
-('RO', 'Romania'),
-('RU', 'Russian Federation'),
-('RW', 'Rwanda'),
-('BL', 'Saint Barthelemy'),
-('SH', 'Saint Helena'),
-('KN', 'Saint Kitts'),
-('LC', 'Saint Lucia'),
-('MF', 'Saint Martin'),
-('PM', 'Saint Pierre'),
-('VC', 'Saint Vincent'),
-('WS', 'Samoa'),
-('SM', 'San Marino'),
-('ST', 'Sao Tome'),
-('SA', 'Saudi Arabia'),
-('SN', 'Senegal'),
-('RS', 'Serbia'),
-('SC', 'Seychelles'),
-('SL', 'Sierra Leone'),
-('SG', 'Singapore'),
-('SK', 'Slovakia'),
-('SI', 'Slovenia'),
-('SB', 'Solomon Islands'),
-('SO', 'Somalia'),
-('ZA', 'South Africa'),
-('ES', 'Spain'),
-('LK', 'Sri Lanka'),
-('SD', 'Sudan'),
-('SR', 'Suriname'),
-('SZ', 'Swaziland'),
-('SE', 'Sweden'),
-('CH', 'Switzerland'),
-('SY', 'Syrian Arab Republic'),
-('TW', 'Taiwan'),
-('TJ', 'Tajikistan'),
-('TZ', 'Tanzania'),
-('TH', 'Thailand'),
-('TL', 'Timor-Leste'),
-('TG', 'Togo'),
-('TK', 'Tokelau'),
-('TO', 'Tonga'),
-('TT', 'Trinidad and Tobago'),
-('TN', 'Tunisia'),
-('TR', 'Turkey'),
-('TM', 'Turkmenistan'),
-('TV', 'Tuvalu'),
-('UG', 'Uganda'),
-('UA', 'Ukraine'),
-('AE', 'United Arab Emirates'),
-('GB', 'United Kingdom'),
-('US', 'United States'),
-('VI', 'United States Virgin Islands'),
-('UY', 'Uruguay'),
-('UZ', 'Uzbekistan'),
-('VU', 'Vanuatu'),
-  ('VE', 'Venezuela'),
-  ('VN', 'Vietnam'),
-  ('WF', 'Wallis and Futuna'),
-  ('EH', 'Western Sahara'),
-  ('YE', 'Yemen'),
-  ('ZM', 'Zambia'),
-  ('ZW', 'Zimbabwe');
-
-DROP TABLE IF EXISTS gamesinfo;
-CREATE TABLE         gamesinfo (
-  id          INT(10) UNSIGNED    NOT NULL AUTO_INCREMENT,
-  title       VARCHAR(255)        NOT NULL,
-  asin        VARCHAR(128)        DEFAULT NULL,
-  url         VARCHAR(1000)       DEFAULT NULL,
-  publisher   VARCHAR(255)        DEFAULT NULL,
-  genre_id     INT(10)             NULL DEFAULT NULL,
-  esrb        VARCHAR(255)        NULL DEFAULT NULL,
-  releasedate DATETIME            DEFAULT NULL,
-  review      VARCHAR(3000)       DEFAULT NULL,
-  cover       TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  backdrop    TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  trailer     VARCHAR(1000)       NOT NULL DEFAULT '',
-  classused   VARCHAR(10)         NOT NULL DEFAULT 'steam' ,
-  createddate DATETIME            NOT NULL,
-  updateddate DATETIME            NOT NULL,
-  PRIMARY KEY                    (id),
-  UNIQUE INDEX ix_gamesinfo_asin (asin)
-)
-  ENGINE          = InnoDB
-  DEFAULT CHARSET = utf8
-  COLLATE         = utf8_unicode_ci
-  AUTO_INCREMENT  = 1;
-
-DROP TABLE IF EXISTS xxxinfo;
-CREATE TABLE         xxxinfo (
-  id          INT(10) UNSIGNED               NOT NULL AUTO_INCREMENT,
-  title       VARCHAR(255)                   NOT NULL,
-  tagline     VARCHAR(1024)                  NOT NULL,
-  plot        BLOB                           NULL DEFAULT NULL,
-  genre       VARCHAR(64)                    NOT NULL,
-  director    VARCHAR(64)                    DEFAULT NULL,
-  actors      VARCHAR(2000)                  NOT NULL,
-  extras      TEXT                           DEFAULT NULL,
-  productinfo TEXT                           DEFAULT NULL,
-  trailers    TEXT                           DEFAULT NULL,
-  directurl   VARCHAR(2000)                  NOT NULL,
-  classused   VARCHAR(3)                     NOT NULL,
-  cover       TINYINT(1) UNSIGNED            NOT NULL DEFAULT '0',
-  backdrop    TINYINT(1) UNSIGNED            NOT NULL DEFAULT '0',
-  createddate DATETIME                       NOT NULL,
-  updateddate DATETIME                       NOT NULL,
-  PRIMARY KEY                      (id),
-  INDEX        ix_xxxinfo_title  (title)
-)
-  ENGINE          = InnoDB
-  DEFAULT CHARSET = utf8
-  COLLATE         = utf8_unicode_ci
-  AUTO_INCREMENT  = 1;
-
-DROP TABLE IF EXISTS `genres`;
-CREATE TABLE IF NOT EXISTS `genres` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `type` int(4) DEFAULT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC AUTO_INCREMENT=635;
-
-INSERT IGNORE INTO `genres` (`id`, `title`, `type`, `disabled`) VALUES
-  (150, 'Blues', 3000, 0),
-  (151, 'Classic Rock', 3000, 0),
-  (152, 'Country', 3000, 0),
-  (153, 'Dance', 3000, 0),
-  (154, 'Disco', 3000, 0),
-  (155, 'Funk', 3000, 0),
-  (156, 'Grunge', 3000, 0),
-  (157, 'Hip-Hop', 3000, 0),
-  (158, 'Jazz', 3000, 0),
-  (159, 'Metal', 3000, 0),
-  (160, 'New Age', 3000, 0),
-  (161, 'Oldies', 3000, 0),
-  (162, 'Other', 3000, 0),
-  (163, 'Pop', 3000, 0),
-  (164, 'R&B', 3000, 0),
-  (165, 'Rap', 3000, 0),
-  (166, 'Reggae', 3000, 0),
-  (167, 'Rock', 3000, 0),
-  (168, 'Techno', 3000, 0),
-  (169, 'Industrial', 3000, 0),
-  (170, 'Alternative', 3000, 0),
-  (171, 'Ska', 3000, 0),
-  (172, 'Death Metal', 3000, 0),
-  (173, 'Pranks', 3000, 0),
-  (174, 'Soundtrack', 3000, 0),
-  (175, 'Euro-Techno', 3000, 0),
-  (176, 'Ambient', 3000, 0),
-  (177, 'Trip-Hop', 3000, 0),
-  (178, 'Vocal', 3000, 0),
-  (179, 'Jazz+Funk', 3000, 0),
-  (180, 'Fusion', 3000, 0),
-  (181, 'Trance', 3000, 0),
-  (182, 'Classical', 3000, 0),
-  (183, 'Instrumental', 3000, 0),
-  (184, 'Acid', 3000, 0),
-  (185, 'House', 3000, 0),
-  (186, 'Game', 3000, 0),
-  (187, 'Sound Clip', 3000, 0),
-  (188, 'Gospel', 3000, 0),
-  (189, 'Noise', 3000, 0),
-  (190, 'Alternative Rock', 3000, 0),
-  (191, 'Bass', 3000, 0),
-  (192, 'Soul', 3000, 0),
-  (193, 'Punk', 3000, 0),
-  (194, 'Space', 3000, 0),
-  (195, 'Meditative', 3000, 0),
-  (196, 'Instrumental Pop', 3000, 0),
-  (197, 'Instrumental Rock', 3000, 0),
-  (198, 'Ethnic', 3000, 0),
-  (199, 'Gothic', 3000, 0),
-  (200, 'Darkwave', 3000, 0),
-  (201, 'Techno-Industrial', 3000, 0),
-  (202, 'Electronic', 3000, 0),
-  (203, 'Pop-Folk', 3000, 0),
-  (204, 'Eurodance', 3000, 0),
-  (205, 'Dream', 3000, 0),
-  (206, 'Southern Rock', 3000, 0),
-  (207, 'Comedy', 3000, 0),
-  (208, 'Cult', 3000, 0),
-  (209, 'Gangsta', 3000, 0),
-  (210, 'Top 40', 3000, 0),
-  (211, 'Christian Rap', 3000, 0),
-  (212, 'Pop/Funk', 3000, 0),
-  (213, 'Jungle', 3000, 0),
-  (214, 'Native US', 3000, 0),
-  (215, 'Cabaret', 3000, 0),
-  (216, 'New Wave', 3000, 0),
-  (217, 'Psychadelic', 3000, 0),
-  (218, 'Rave', 3000, 0),
-  (219, 'Showtunes', 3000, 0),
-  (220, 'Trailer', 3000, 0),
-  (221, 'Lo-Fi', 3000, 0),
-  (222, 'Tribal', 3000, 0),
-  (223, 'Acid Punk', 3000, 0),
-  (224, 'Acid Jazz', 3000, 0),
-  (225, 'Polka', 3000, 0),
-  (226, 'Retro', 3000, 0),
-  (227, 'Musical', 3000, 0),
-  (228, 'Rock & Roll', 3000, 0),
-  (229, 'Hard Rock', 3000, 0),
-  (230, 'Folk', 3000, 0),
-  (231, 'Folk-Rock', 3000, 0),
-  (232, 'National Folk', 3000, 0),
-  (233, 'Swing', 3000, 0),
-  (234, 'Fast Fusion', 3000, 0),
-  (235, 'Bebob', 3000, 0),
-  (236, 'Latin', 3000, 0),
-  (237, 'Revival', 3000, 0),
-  (238, 'Celtic', 3000, 0),
-  (239, 'Bluegrass', 3000, 0),
-  (240, 'Avantgarde', 3000, 0),
-  (241, 'Gothic Rock', 3000, 0),
-  (242, 'Progressive Rock', 3000, 0),
-  (243, 'Psychedelic Rock', 3000, 0),
-  (244, 'Symphonic Rock', 3000, 0),
-  (245, 'Slow Rock', 3000, 0),
-  (246, 'Big Band', 3000, 0),
-  (247, 'Chorus', 3000, 0),
-  (248, 'Easy Listening', 3000, 0),
-  (249, 'Acoustic', 3000, 0),
-  (250, 'Humour', 3000, 0),
-  (251, 'Speech', 3000, 0),
-  (252, 'Chanson', 3000, 0),
-  (253, 'Opera', 3000, 0),
-  (254, 'Chamber Music', 3000, 0),
-  (255, 'Sonata', 3000, 0),
-  (256, 'Symphony', 3000, 0),
-  (257, 'Booty Bass', 3000, 0),
-  (258, 'Primus', 3000, 0),
-  (259, 'Porn Groove', 3000, 0),
-  (260, 'Satire', 3000, 0),
-  (261, 'Slow Jam', 3000, 0),
-  (262, 'Club', 3000, 0),
-  (263, 'Tango', 3000, 0),
-  (264, 'Samba', 3000, 0),
-  (265, 'Folklore', 3000, 0),
-  (266, 'Ballad', 3000, 0),
-  (267, 'Power Ballad', 3000, 0),
-  (268, 'Rhytmic Soul', 3000, 0),
-  (269, 'Freestyle', 3000, 0),
-  (270, 'Duet', 3000, 0),
-  (271, 'Punk Rock', 3000, 0),
-  (272, 'Drum Solo', 3000, 0),
-  (273, 'Acapella', 3000, 0),
-  (274, 'Euro-House', 3000, 0),
-  (275, 'Dance Hall', 3000, 0),
-  (276, 'Goa', 3000, 0),
-  (277, 'Drum & Bass', 3000, 0),
-  (278, 'Club-House', 3000, 0),
-  (279, 'Hardcore', 3000, 0),
-  (280, 'Terror', 3000, 0),
-  (281, 'Indie', 3000, 0),
-  (282, 'BritPop', 3000, 0),
-  (283, 'Negerpunk', 3000, 0),
-  (284, 'Polsk Punk', 3000, 0),
-  (285, 'Beat', 3000, 0),
-  (286, 'Christian Gangsta', 3000, 0),
-  (287, 'Heavy Metal', 3000, 0),
-  (288, 'Black Metal', 3000, 0),
-  (289, 'Crossover', 3000, 0),
-  (290, 'Contemporary C', 3000, 0),
-  (291, 'Christian Rock', 3000, 0),
-  (292, 'Merengue', 3000, 0),
-  (293, 'Salsa', 3000, 0),
-  (294, 'Thrash Metal', 3000, 0),
-  (295, 'Anime', 3000, 0),
-  (296, 'JPop', 3000, 0),
-  (297, 'SynthPop', 3000, 0),
-  (298, 'Electronica', 3000, 0),
-  (299, 'World Music', 3000, 0),
-  (300, 'Miscellaneous', 3000, 0),
-  (301, 'Rap & Hip-Hop', 3000, 0),
-  (302, 'Dance & Electronic', 3000, 0),
-  (303, 'Adventure', 1000, 0),
-  (304, 'Hard Rock & Metal', 3000, 0),
-  (305, 'Broadway & Vocalists', 3000, 0),
-  (306, 'Unknown', 1000, 0),
-  (307, 'Christian & Gospel', 3000, 0),
-  (308, '', 3000, 0),
-  (309, 'Action', 1000, 0),
-  (310, 'Unknown', 4000, 0),
-  (311, 'Action', 4000, 0),
-  (312, 'Strategy', 4000, 0),
-  (313, 'Puzzle', 4000, 0),
-  (314, 'Adventure', 4000, 0),
-  (315, 'Sports', 4000, 0),
-  (316, 'Simulation', 4000, 0),
-  (317, 'Anal', 6000, 0),
-  (318, 'Big Butt', 6000, 0),
-  (319, 'Gonzo', 6000, 0),
-  (320, 'Oiled', 6000, 0),
-  (321, 'Widescreen', 6000, 0),
-  (322, '18+ Teens', 6000, 0),
-  (323, 'Big Cocks', 6000, 0),
-  (324, 'Blu-Ray', 6000, 0),
-  (325, 'Feature', 6000, 0),
-  (326, 'Prison', 6000, 0),
-  (327, 'All Sex', 6000, 0),
-  (328, 'Couples', 6000, 0),
-  (329, 'European', 6000, 0),
-  (330, 'Foreign', 6000, 0),
-  (331, 'Point Of View', 6000, 0),
-  (332, 'Threesomes', 6000, 0),
-  (333, 'College', 6000, 0),
-  (334, 'Teachers', 6000, 0),
-  (335, 'Older Men', 6000, 0),
-  (336, 'Rimming', 6000, 0),
-  (337, 'Glory Hole', 6000, 0),
-  (338, 'Blowjobs', 6000, 0),
-  (339, 'Big Budget', 6000, 0),
-  (340, 'Gaping', 6000, 0),
-  (341, 'Sex Toy Play', 6000, 0),
-  (342, 'Cumshots', 6000, 0),
-  (343, 'Gangbang', 6000, 0),
-  (344, 'Fetish', 6000, 0),
-  (345, 'Transsexual', 6000, 0),
-  (346, 'Big Boobs', 6000, 0),
-  (347, 'Mature', 6000, 0),
-  (348, 'MILF', 6000, 0),
-  (349, 'All Girl / Lesbian', 6000, 0),
-  (350, 'Interracial', 6000, 0),
-  (351, 'Orgy', 6000, 0),
-  (352, '18+ Teen Transsexuals', 6000, 0),
-  (353, 'Babysitter', 6000, 0),
-  (354, 'Amateur', 6000, 0),
-  (355, 'Public Sex', 6000, 0),
-  (356, 'Web-To-DVD', 6000, 0),
-  (357, 'Compilation', 6000, 0),
-  (358, 'Porn For Couples', 6000, 0),
-  (359, 'Romance', 6000, 0),
-  (360, 'Young (18+) Ladies', 6000, 0),
-  (361, 'Redheads', 6000, 0),
-  (362, 'Affairs/Love Triangles', 6000, 0),
-  (363, 'Women Directors', 6000, 0),
-  (364, 'Made For Women', 6000, 0),
-  (365, 'Pantyhose/Stocking', 6000, 0),
-  (366, 'Black', 6000, 0),
-  (367, 'Domination', 6000, 0),
-  (368, 'Face Sitting', 6000, 0),
-  (369, 'Female Domination', 6000, 0),
-  (370, 'Interactive', 6000, 0),
-  (371, 'Bi-Sexual', 6000, 0),
-  (372, 'Tit Fucking', 6000, 0),
-  (373, 'Anal Sex', 6000, 0),
-  (374, 'Big Pussies', 6000, 0),
-  (375, 'Cock & Ball Play', 6000, 0),
-  (376, 'Facials', 6000, 0),
-  (377, 'Finger Fucking', 6000, 0),
-  (378, 'Girl-Girl/Lesbian', 6000, 0),
-  (379, 'Nipple Play', 6000, 0),
-  (380, 'xtreme', 6000, 0),
-  (381, 'Canadian', 6000, 0),
-  (382, 'Black Hair', 6000, 0),
-  (383, 'Blondes', 6000, 0),
-  (384, 'Brunettes', 6000, 0),
-  (385, 'Cream Pie', 6000, 0),
-  (386, 'Latex/Rubber', 6000, 0),
-  (387, 'S&M', 6000, 0),
-  (388, 'Watersports', 6000, 0),
-  (389, 'BBW', 6000, 0),
-  (390, 'Prebooks', 6000, 0),
-  (391, 'Asian', 6000, 0),
-  (392, 'Massage', 6000, 0),
-  (393, 'Swallowing', 6000, 0),
-  (394, 'Small Tits', 6000, 0),
-  (395, 'Naturally Busty', 6000, 0),
-  (396, 'Affairs &amp; Love Triangles', 6000, 0),
-  (397, 'Wives', 6000, 0),
-  (398, 'Swingers', 6000, 0),
-  (399, 'Old &amp; Young Females (18+)', 6000, 0),
-  (400, 'Maid', 6000, 0),
-  (401, 'Pantyhose &amp; Stocking', 6000, 0),
-  (402, 'Masturbation', 6000, 0),
-  (403, 'Alt Girls', 6000, 0),
-  (404, 'Tattoo', 6000, 0),
-  (405, 'Exotic Workouts', 6000, 0),
-  (406, 'Athletes', 6000, 0),
-  (407, 'Deep Throat', 6000, 0),
-  (408, 'Wrestling &amp; Fighting', 6000, 0),
-  (409, 'Cheerleaders', 6000, 0),
-  (410, 'Home Made Movies', 6000, 0),
-  (411, 'Squirting', 6000, 0),
-  (412, 'Cuckolds', 6000, 0),
-  (413, 'Cougars', 6000, 0),
-  (414, 'Cosplay', 6000, 0),
-  (415, 'Bikini Babes', 6000, 0),
-  (416, 'Brazilian', 6000, 0),
-  (417, 'Grannies', 6000, 0),
-  (418, 'Erotic Vignette', 6000, 0),
-  (419, 'Water Play', 6000, 0),
-  (420, 'Hairy', 6000, 0),
-  (421, 'CFNM', 6000, 0),
-  (422, 'Stripping', 6000, 0),
-  (423, 'Double Penetration', 6000, 0),
-  (424, 'Lingerie', 6000, 0),
-  (425, 'Nurses &amp; Doctors', 6000, 0),
-  (426, 'British', 6000, 0),
-  (427, 'Fetish Wear', 6000, 0),
-  (428, 'Strap-Ons', 6000, 0),
-  (429, 'Indian', 6000, 0),
-  (430, 'Spoofs &amp; Parodies', 6000, 0),
-  (431, 'Pregnant', 6000, 0),
-  (432, 'Classic', 6000, 0),
-  (433, 'Jeans &amp; Denim', 6000, 0),
-  (434, 'Boxed Sets', 6000, 0),
-  (435, 'Mystery', 6000, 0),
-  (436, 'Girl on Guy Strap-Ons', 6000, 0),
-  (437, 'Celebrity', 6000, 0),
-  (438, 'Handjobs', 6000, 0),
-  (439, 'Shaved', 6000, 0),
-  (440, 'Vampires', 6000, 0),
-  (441, 'Panties &amp; Thongs', 6000, 0),
-  (442, 'Instructional (X-Rated)', 6000, 0),
-  (443, 'Fantasy', 6000, 0),
-  (444, 'Historical / Period Piece', 6000, 0),
-  (445, 'Western', 6000, 0),
-  (446, 'Midgets', 6000, 0),
-  (447, 'Oddities', 6000, 0),
-  (448, 'Foot Fetish', 6000, 0),
-  (449, 'Virgin', 6000, 0),
-  (450, 'Horror', 6000, 0),
-  (451, 'Streaming Video', 6000, 0),
-  (452, 'Solo Girls', 6000, 0),
-  (453, 'Solo Female', 6000, 0),
-  (454, 'Kinky', 6000, 0),
-  (455, 'By Women', 6000, 0),
-  (456, 'All Girl', 6000, 0),
-  (457, 'Exhibitionism', 6000, 0),
-  (458, 'College Co-Eds', 6000, 0),
-  (459, 'Pro-Am', 6000, 0),
-  (460, 'Parties / Clubs', 6000, 0),
-  (461, 'Sex', 6000, 0),
-  (462, 'Europe', 6000, 0),
-  (463, 'Germany', 6000, 0),
-  (464, 'Tantra / Spirituality', 6000, 0),
-  (465, 'Big Tits', 6000, 0),
-  (466, 'United Kingdom', 6000, 0),
-  (467, 'Female on Female', 6000, 0),
-  (468, 'Strapons', 6000, 0),
-  (469, 'Lesbian', 6000, 0),
-  (470, 'Potpourri', 6000, 0),
-  (471, 'Humor', 6000, 0),
-  (472, 'Spoofs / Parodies', 6000, 0),
-  (473, 'Gagging', 6000, 0),
-  (474, 'Family', 6000, 0),
-  (475, 'Vignettes', 6000, 0),
-  (476, 'Body', 6000, 0),
-  (477, 'Home Made', 6000, 0),
-  (478, 'POV', 6000, 0),
-  (479, 'M on F', 6000, 0),
-  (480, 'Gaper', 6000, 0),
-  (481, 'Latex & Rubber', 6000, 0),
-  (482, 'Foreign Kink', 6000, 0),
-  (483, 'Masks', 6000, 0),
-  (484, 'Group Sex', 6000, 0),
-  (485, 'Older Women', 6000, 0),
-  (486, 'Young Women / Teens', 6000, 0),
-  (487, 'Contemporary', 6000, 0),
-  (488, 'Features', 6000, 0),
-  (489, 'Biker Chicks', 6000, 0),
-  (490, 'Hetero Couples', 6000, 0),
-  (491, 'Caucasian Girls', 6000, 0),
-  (492, 'Modern', 6000, 0),
-  (493, '2011 AVN Award Nominees', 6000, 0),
-  (494, 'All Black', 6000, 0),
-  (495, 'Cumshots & Facials', 6000, 0),
-  (496, 'Outdoors', 6000, 0),
-  (497, 'Classics', 6000, 0),
-  (498, 'BDSM', 6000, 0),
-  (499, '90''s', 6000, 0),
-  (500, 'Oral', 6000, 0),
-  (501, 'Mixed Races', 6000, 0),
-  (502, 'Ebony Girls', 6000, 0),
-  (503, 'Black Women', 6000, 0),
-  (504, 'Striptease', 6000, 0),
-  (505, 'Dancers / Strippers', 6000, 0),
-  (506, '2013 AVN Award Nominees', 6000, 0),
-  (507, '2013 Sex Awards Nominees', 6000, 0),
-  (508, 'Cunnilingus', 6000, 0),
-  (509, 'Asian Girls', 6000, 0),
-  (510, 'Erotica', 6000, 0),
-  (511, 'Fantasies', 6000, 0),
-  (512, 'Black Men', 6000, 0),
-  (513, 'Latina', 6000, 0),
-  (514, 'Latina Girls', 6000, 0),
-  (515, 'Cuckold', 6000, 0),
-  (516, 'Natural Look', 6000, 0),
-  (517, 'Footjobs', 6000, 0),
-  (518, 'Feet', 6000, 0),
-  (519, 'Feet & Shoes', 6000, 0),
-  (520, 'Legs & Nylons', 6000, 0),
-  (521, 'Teen', 6000, 0),
-  (522, 'Russia', 6000, 0),
-  (523, 'Russian', 6000, 0),
-  (524, 'Schoolgirls', 6000, 0),
-  (525, 'Massage Parlor', 6000, 0),
-  (526, 'Virgins', 6000, 0),
-  (527, 'Beach', 6000, 0),
-  (528, '2008 AVN Award Nominees', 6000, 0),
-  (529, 'Czech', 6000, 0),
-  (530, 'Orgies', 6000, 0),
-  (531, 'Babysitters', 6000, 0),
-  (532, '2009 AVN Award Nominees', 6000, 0),
-  (533, 'Big Butts', 6000, 0),
-  (534, 'Handjob Female on Male', 6000, 0),
-  (535, 'Hidden Cam', 6000, 0),
-  (536, '2014 AVN Award Nominees', 6000, 0),
-  (537, 'XBIZ Awards', 6000, 0),
-  (538, 'Spain', 6000, 0),
-  (539, 'Spanish', 6000, 0),
-  (540, 'Feminist Porn Awards', 6000, 0),
-  (541, 'Sybian', 6000, 0),
-  (542, 'Instructional', 6000, 0),
-  (543, 'Female Ejaculation', 6000, 0),
-  (544, 'Dutch', 6000, 0),
-  (545, 'Maids', 6000, 0),
-  (546, 'Tattooed / Pierced', 6000, 0),
-  (547, 'Shower / Bathroom', 6000, 0),
-  (548, 'Cum-Swapping', 6000, 0),
-  (549, 'Girls Next Door', 6000, 0),
-  (550, 'Petite', 6000, 0),
-  (551, 'Gangbang - M on F', 6000, 0),
-  (552, 'Office', 6000, 0),
-  (553, 'Toys', 6000, 0),
-  (554, '2010 AVN Award Nominees', 6000, 0),
-  (555, 'International', 6000, 0),
-  (556, 'Student', 6000, 0),
-  (557, 'Deep Throating', 6000, 0),
-  (558, 'Boat', 6000, 0),
-  (559, 'Secretaries', 6000, 0),
-  (560, 'Reality', 6000, 0),
-  (561, 'Brazil', 6000, 0),
-  (562, 'Male on Female', 6000, 0),
-  (563, 'Nurses', 6000, 0),
-  (564, 'Interactive Sex', 6000, 0),
-  (565, 'Up & Coming', 6000, 0),
-  (566, 'Cum Swapping', 6000, 0),
-  (567, 'Multi-Angles', 6000, 0),
-  (568, 'Leather', 6000, 0),
-  (569, 'Pot Luck', 6000, 0),
-  (570, 'Cream Pies', 6000, 0),
-  (571, 'Behind The Scenes', 6000, 0),
-  (572, 'Auditions', 6000, 0),
-  (573, 'Pickup', 6000, 0),
-  (574, 'Sex Machines', 6000, 0),
-  (575, '2012 AVN Award Nominees', 6000, 0),
-  (576, 'Voyeurism', 6000, 0),
-  (577, 'Voyeur', 6000, 0),
-  (578, 'Bukkake', 6000, 0),
-  (579, 'Smoking', 6000, 0),
-  (580, 'Gangbang - F on F', 6000, 0),
-  (581, 'Italy', 6000, 0),
-  (582, 'Italian', 6000, 0),
-  (583, 'Portuguese', 6000, 0),
-  (584, 'Locale', 6000, 0),
-  (585, 'Secretaries/Office', 6000, 0),
-  (586, 'Sex at Work', 6000, 0),
-  (587, 'School Girls', 6000, 0),
-  (588, 'Felching', 6000, 0),
-  (589, 'Glasses', 6000, 0),
-  (590, 'Euro', 6000, 0),
-  (591, 'Pissing', 6000, 0),
-  (592, 'Shocking Penetration', 6000, 0),
-  (593, 'German Speaking', 6000, 0),
-  (594, 'Anilingus', 6000, 0),
-  (595, 'High Definition', 6000, 0),
-  (596, 'M.I.L.F.', 6000, 0),
-  (597, 'Cougar', 6000, 0),
-  (598, 'Big Dick', 6000, 0),
-  (599, 'Cumshot', 6000, 0),
-  (600, 'Pantyhose/Stockings', 6000, 0),
-  (601, 'Dancers/Models', 6000, 0),
-  (602, 'Submales', 6000, 0),
-  (603, 'Threeway', 6000, 0),
-  (604, 'Fresh Faces', 6000, 0),
-  (605, 'Natural Breasts', 6000, 0),
-  (606, 'German', 6000, 0),
-  (607, 'Blowjob', 6000, 0),
-  (608, 'Gloryhole', 6000, 0),
-  (609, 'Black Dicks/White Chicks', 6000, 0),
-  (610, 'P.O.V.', 6000, 0),
-  (611, 'Glamour', 6000, 0),
-  (612, 'Brides &amp; Weddings', 6000, 0),
-  (613, 'Exhibitionist', 6000, 0),
-  (614, 'Party Girls', 6000, 0),
-  (615, 'Reality Based', 6000, 0),
-  (616, 'Shemale', 6000, 0),
-  (617, 'Cheerleader', 6000, 0),
-  (618, 'Award Winning Movies', 6000, 0),
-  (619, 'New Release', 6000, 0),
-  (620, 'Foot', 6000, 0),
-  (621, 'Older / Younger', 6000, 0),
-  (622, 'Vintage', 6000, 0),
-  (623, 'Incest', 6000, 0),
-  (624, 'Femdom', 6000, 0),
-  (625, 'Strap-On', 6000, 0),
-  (626, 'Double Anal', 6000, 0),
-  (627, 'Costumes', 6000, 0),
-  (628, 'For Ladies', 6000, 0),
-  (629, 'Family Roleplay', 6000, 0),
-  (630, 'Girls With Toys', 6000, 0),
-  (631, 'Ass-to-mouth', 6000, 0),
-  (632, 'Parody', 6000, 0),
-  (633, 'Racing', 4000, 0),
-  (634, 'Double Penetration (Dp)', 6000, 0);
-
-DROP TABLE IF EXISTS shortgroups;
-CREATE TABLE shortgroups (
-  id           INT(11)         NOT NULL AUTO_INCREMENT,
-  name         VARCHAR(255)    NOT NULL DEFAULT "",
-  first_record BIGINT UNSIGNED NOT NULL DEFAULT "0",
-  last_record  BIGINT UNSIGNED NOT NULL DEFAULT "0",
-  updated      DATETIME DEFAULT NULL,
-  PRIMARY KEY (id)
-)
-  ENGINE =InnoDB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci
-  AUTO_INCREMENT =1;
-
-CREATE INDEX ix_shortgroups_id ON shortgroups (id);
-CREATE INDEX ix_shortgroups_name ON shortgroups (name);
-
-DROP TABLE IF EXISTS `category`;
-CREATE TABLE category
-(
-  `id`                   INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-  `title`                VARCHAR(255)    NOT NULL,
-  `parentid`             INT             NULL,
-  `status`               INT             NOT NULL DEFAULT '1',
-  `minsizetoformrelease` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-  `maxsizetoformrelease` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-  `description`          VARCHAR(255)    NULL,
-  `disablepreview`       TINYINT(1)      NOT NULL DEFAULT '0'
-)
-  ENGINE =INNODB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci
-  AUTO_INCREMENT =100000;
-
-INSERT INTO category (id, title) VALUES (1000, 'Console');
-INSERT INTO category (id, title) VALUES (2000, 'Movies');
-INSERT INTO category (id, title) VALUES (3000, 'Audio');
-INSERT INTO category (id, title) VALUES (4000, 'PC');
-INSERT INTO category (id, title) VALUES (5000, 'TV');
-INSERT INTO category (id, title) VALUES (6000, 'XXX');
-INSERT INTO category (id, title) VALUES (7000, 'Books');
-INSERT INTO category (id, title) VALUES (8000, 'Other');
-
-INSERT INTO category (id, title, parentid) VALUES (1010, 'NDS', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1020, 'PSP', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1030, 'Wii', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1040, 'Xbox', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1050, 'Xbox 360', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1060, 'WiiWare/VC', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1070, 'XBOX 360 DLC', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1080, 'PS3', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1090, 'Other', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1110, '3DS', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1120, 'PS Vita', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1130, 'WiiU', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1140, 'Xbox One', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1180, 'PS4', 1000);
-
-INSERT INTO category (id, title, parentid) VALUES (2010, 'Foreign', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2020, 'Other', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2030, 'SD', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2040, 'HD', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2050, '3D', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2060, 'BluRay', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2070, 'DVD', 2000);
-
-INSERT INTO category (id, title, parentid) VALUES (3010, 'MP3', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3020, 'Video', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3030, 'Audiobook', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3040, 'Lossless', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3050, 'Other', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3060, 'Foreign', 3000);
-
-INSERT INTO category (id, title, parentid) VALUES (4010, '0day', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4020, 'ISO', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4030, 'Mac', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4040, 'Mobile-Other', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4050, 'Games', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4060, 'Mobile-iOS', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4070, 'Mobile-Android', 4000);
-
-INSERT INTO category (id, title, parentid) VALUES (5010, 'WEB-DL', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5020, 'Foreign', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5030, 'SD', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5040, 'HD', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5050, 'Other', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5060, 'Sport', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5070, 'Anime', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5080, 'Documentary', 5000);
-
-INSERT INTO category (id, title, parentid) VALUES (6010, 'DVD', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6020, 'WMV', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6030, 'XviD', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6040, 'x264', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6050, 'Pack', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6060, 'ImgSet', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6070, 'Other', 6000);
-
-INSERT INTO category (id, title, parentid) VALUES (7010, 'Mags', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7020, 'Ebook', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7030, 'Comics', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7040, 'Technical', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7050, 'Other', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7060, 'Foreign', 7000);
-
-INSERT INTO category (id, title, parentid) VALUES (8010, 'Misc', 8000);
-INSERT INTO category (id, title, parentid) VALUES (8020, 'Hashed', 8000);
-
-DROP TABLE IF EXISTS sharing_sites;
-CREATE TABLE sharing_sites (
-  id         INT(11) UNSIGNED   NOT NULL AUTO_INCREMENT,
-  site_name  VARCHAR(255)       NOT NULL DEFAULT '',
-  site_guid  VARCHAR(40)        NOT NULL DEFAULT '',
-  last_time  DATETIME DEFAULT NULL,
-  first_time DATETIME DEFAULT NULL,
-  enabled    TINYINT(1)         NOT NULL DEFAULT '0',
-  comments   MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
-  PRIMARY KEY (id)
-)
-  ENGINE =InnoDB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci
-  AUTO_INCREMENT =1;
-
-DROP TABLE IF EXISTS sharing;
-CREATE TABLE sharing (
-  site_guid      VARCHAR(40)        NOT NULL DEFAULT '',
-  site_name      VARCHAR(255)       NOT NULL DEFAULT '',
-  enabled        TINYINT(1)         NOT NULL DEFAULT '0',
-  posting        TINYINT(1)         NOT NULL DEFAULT '0',
-  start_position TINYINT(1)         NOT NULL DEFAULT '0',
-  fetching       TINYINT(1)         NOT NULL DEFAULT '1',
-  auto_enable    TINYINT(1)         NOT NULL DEFAULT '1',
-  hide_users     TINYINT(1)         NOT NULL DEFAULT '1',
-  last_article   BIGINT UNSIGNED    NOT NULL DEFAULT '0',
-  max_push       MEDIUMINT UNSIGNED NOT NULL DEFAULT '40',
-  max_pull       MEDIUMINT UNSIGNED NOT NULL DEFAULT '20000',
-  max_download   MEDIUMINT UNSIGNED NOT NULL DEFAULT '150',
-  PRIMARY KEY (site_guid)
-)
-  ENGINE =InnoDB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci;
-
-ALTER TABLE releasecomment ADD COLUMN shared TINYINT(1) NOT NULL DEFAULT '1';
-ALTER TABLE releasecomment ADD COLUMN shareid VARCHAR(40) NOT NULL DEFAULT '';
-ALTER TABLE releasecomment ADD COLUMN siteid VARCHAR(40) NOT NULL DEFAULT '';
-ALTER TABLE releasecomment ADD COLUMN nzb_guid VARCHAR(32) NOT NULL DEFAULT '';
-ALTER TABLE releasecomment ADD COLUMN text_hash VARCHAR(32) NOT NULL DEFAULT '';
-
-UPDATE releasecomment
-SET text_hash = MD5(text);
-ALTER IGNORE TABLE releasecomment ADD UNIQUE INDEX ix_releasecomment_hash_gid (text_hash, gid);
-
-ALTER TABLE `releasefiles` ADD COLUMN `ishashed` TINYINT(1) NOT NULL DEFAULT '0'
-AFTER `size`;
-CREATE INDEX `ix_releasefiles_ishashed` ON `releasefiles` (`ishashed`);
-
-DROP TABLE IF EXISTS predbhash;
-CREATE TABLE predbhash (
-  pre_id INT(11) UNSIGNED NOT NULL DEFAULT 0,
-  hashes VARCHAR(512)     NOT NULL DEFAULT '',
-  PRIMARY KEY (pre_id)
-)
-  ENGINE =MYISAM
-  ROW_FORMAT = DYNAMIC
-  DEFAULT CHARSET =utf8mb4
-  COLLATE =utf8mb4_unicode_ci;
-
-INSERT INTO predbhash (pre_id, hashes) (SELECT
-                                          id,
-                                          CONCAT_WS(',', MD5(title), MD5(MD5(title)), SHA1(title))
-                                        FROM prehash);
-
-CREATE FULLTEXT INDEX ix_predbhash_hashes_ft ON predbhash (hashes);
-ALTER IGNORE TABLE predbhash ADD UNIQUE INDEX ix_predbhash_hashes (hashes(32));
-
-INSERT INTO menu (href, title, tooltip, role, ordinal)
-VALUES ('prehash', 'Prehash',
-        'Prehash', 1, 68);
-INSERT INTO menu (href, title, tooltip, role, ordinal ) VALUES ('newposterwall', 'New Releases', "Newest Releases Poster Wall", 1, 11);
-
-INSERT INTO `site` (`setting`, `value`) VALUES
-  ('categorizeforeign',	'1'),
-  ('catwebdl',	'0'),
-  ('giantbombkey', ''),
-  ('lookupxxx', 1),
-  ('maxxxxprocessed', 100),
-  ('rottentomatoquality', 'profile'),
-  ('anidbkey', '');
-
-ALTER TABLE animetitles CHANGE createddate unixtime INT(12) UNSIGNED NOT NULL;
-
-DROP TRIGGER IF EXISTS insert_hashes;
-
-DELIMITER $$
-CREATE TRIGGER insert_hashes AFTER INSERT ON prehash FOR EACH ROW BEGIN INSERT INTO predbhash (pre_id, hashes) VALUES (NEW.id, CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)));END;
-$$
-DELIMITER ;
-
-DROP TRIGGER IF EXISTS update_hashes;
-
-DELIMITER $$
-CREATE TRIGGER update_hashes AFTER UPDATE ON prehash FOR EACH ROW BEGIN IF NEW.title != OLD.title THEN UPDATE predbhash SET hashes = CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)) WHERE pre_id = OLD.id; END IF;
-END;
-$$
-DELIMITER ;
-
-DROP TRIGGER IF EXISTS delete_hashes;
-
-DELIMITER $$
-CREATE TRIGGER delete_hashes AFTER DELETE ON prehash FOR EACH ROW BEGIN DELETE FROM predbhash WHERE pre_id = OLD.id; END;
-$$
-DELIMITER ;
-
-DROP TRIGGER IF EXISTS check_rfinsert;
-DROP TRIGGER IF EXISTS check_rfupdate;
-
-DELIMITER $$
-CREATE TRIGGER check_rfinsert BEFORE INSERT ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}'
-THEN SET NEW.ishashed = 1; END IF;
-END;
-$$
-CREATE TRIGGER check_rfupdate BEFORE UPDATE ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1; END IF; END;
-$$
-DELIMITER ;
-
-DROP TRIGGER IF EXISTS check_insert;
-DROP TRIGGER IF EXISTS check_update;
-
-DELIMITER $$
-CREATE TRIGGER check_insert BEFORE INSERT ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;
-ELSEIF NEW.name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1; END IF; END;
-$$
-CREATE TRIGGER check_update BEFORE UPDATE ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;
-ELSEIF NEW.name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1;END IF;
-END;
-$$
-CREATE TRIGGER insert_search AFTER INSERT ON releases FOR EACH ROW BEGIN INSERT INTO releasesearch (releaseid, guid, name, searchname) VALUES (NEW.id, NEW.guid, NEW.name, NEW.searchname);
-END;
-$$
-CREATE TRIGGER update_search AFTER UPDATE ON releases FOR EACH ROW BEGIN IF NEW.guid != OLD.guid THEN UPDATE releasesearch SET guid = NEW.guid WHERE releaseid = OLD.id; END IF;
-IF NEW.name != OLD.name THEN UPDATE releasesearch SET name = NEW.name WHERE releaseid = OLD.id; END IF; IF NEW.searchname != OLD.searchname THEN UPDATE releasesearch SET searchname = NEW.searchname WHERE releaseid = OLD.id; END IF;
-END;
-$$
-CREATE TRIGGER delete_search AFTER DELETE ON releases FOR EACH ROW BEGIN DELETE FROM releasesearch WHERE releaseid = OLD.id; END;
-$$
-DELIMITER ;
-
-DROP TRIGGER IF EXISTS insert_MD5;
-CREATE TRIGGER insert_MD5 BEFORE INSERT ON releasecomment FOR EACH ROW SET NEW.text_hash = MD5(NEW.text);
\ No newline at end of file
diff --git a/lib/DB/mysqldump_tables.php b/lib/DB/mysqldump_tables.php
deleted file mode 100644
index b90073d6d..000000000
--- a/lib/DB/mysqldump_tables.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-
-//	This script can dump all tables or just binaries/parts/partrepair/groups.
-
-$pdo = new DB();
-
-$exportopts = "";
-
-//determine mysql platform Percona or Other
-$mysqlplatform = exec('mysqladmin version | grep "Percona"');
-if (strlen($mysqlplatform) > 0) {
-	//Percona only has --innodb-optimize-keys
-	$exportopts = "--opt --innodb-optimize-keys --complete-insert --skip-quick";
-} else {
-	//generic (or unknown) instance of MySQL
-	$exportopts = "--opt --complete-insert --skip-quick";
-}
-
-
-function newname($filename)
-{
-	rename($filename, dirname($filename)."/".basename($filename,".gz")."_".date("Y_m_d_His", filemtime($filename)).".gz");
-}
-
-function builddefaultsfile()
-{
-	//generate file contents
-	$filetext = "[mysqldump]"
-		."\n"
-		."user = " . DB_USER
-		."\n"
-		."password = " . DB_PASSWORD
-		."\n[mysql]"
-		."\n"
-		."user = " . DB_USER
-		."\n"
-		."password = " . DB_PASSWORD;
-
-	$filehandle = fopen("mysql-defaults.txt", "w+");
-	if(!$filehandle) {
-		exit("Unable to write mysql defaults file! Exiting");
-	} else {
-		fwrite($filehandle, $filetext);
-		fclose($filehandle);
-		chmod("mysql-defaults.txt", 0600);
-	}
-}
-
-$dbhost = DB_HOST;
-$dbport = DB_PORT;
-$dbsocket = DB_SOCKET;
-$dbuser = DB_USER;
-$dbpass = DB_PASSWORD;
-$dbname = DB_NAME;
-
-if (DB_SOCKET != '') {
-	$use = "-S $dbsocket";
-} else {
-	$use = "-P$dbport";
-}
-
-//generate defaults file used to store database login information so it is not in cleartext in ps command for mysqldump
-builddefaultsfile();
-
-if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "dump") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$filename = $argv[3]."/".$dbname.".gz";
-	echo $pdo->log->header("Dumping $dbname.");
-	if (file_exists($filename)) {
-		newname($filename);
-	}
-	$command = "mysqldump --defaults-file=mysql-defaults.txt $exportopts -h$dbhost $use "."$dbname | gzip -9 > $filename";
-	system($command);
-} else if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "restore") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$filename = $argv[3]."/".$dbname.".gz";
-	if (file_exists($filename)) {
-		echo $pdo->log->header("Restoring $dbname.");
-		$command = "zcat < $filename | mysql --defaults-file=mysql-defaults.txt -h$dbhost $use $dbname";
-		$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-		system($command);
-		$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-	}
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "dump") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	foreach($tables as $row) {
-		$tbl = $row['tables_in_'.DB_NAME];
-		$filename = $argv[3]."/".$tbl.".gz";
-		echo $pdo->log->header("Dumping $tbl.");
-		if (file_exists($filename)) {
-			newname($filename);
-		}
-		$command = "mysqldump --defaults-file=mysql-defaults.txt $exportopts -h$dbhost $use "."$dbname $tbl | gzip -9 > $filename";
-		system($command);
-	}
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "restore") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-	foreach($tables as $row) {
-		$tbl = $row['tables_in_'.DB_NAME];
-		$filename = $argv[3]."/".$tbl.".gz";
-		if (file_exists($filename)) {
-			echo $pdo->log->header("Restoring $tbl.");
-			$command = "zcat < $filename | mysql --defaults-file=mysql-defaults.txt -h$dbhost $use $dbname";
-			system($command);
-		}
-	}
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-} else if((isset($argv[1]) && $argv[1] == "test") && (isset($argv[2]) && $argv[2] == "dump") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$arr = array("parts", "binaries", "partrepair", "groups");
-	foreach ($arr as &$tbl) {
-		$filename = $argv[3]."/".$tbl.".gz";
-		echo $pdo->log->header("Dumping $tbl..");
-		if (file_exists($filename)) {
-			newname($filename);
-		}
-		$command = "mysqldump --defaults-file=mysql-defaults.txt $exportopts -h$dbhost $use "."$dbname $tbl | gzip -9 > $filename";
-		system($command);
-	}
-} else if((isset($argv[1]) && $argv[1] == "test") && (isset($argv[2]) && $argv[2] == "restore") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$arr = array("parts", "binaries", "partrepair", "groups");
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-	foreach ($arr as &$tbl) {
-		$filename = $argv[3]."/".$tbl.".gz";
-		if (file_exists($filename)) {
-			echo $pdo->log->header("Restoring $tbl.");
-			$command = "zcat < $filename | mysql --defaults-file=mysql-defaults.txt -h$dbhost $use $dbname";
-			system($command);
-		}
-	}
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "outfile") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	foreach($tables as $row) {
-		$tbl = $row['tables_in_'.DB_NAME];
-		$filename = $argv[3].$tbl.".csv";
-		echo $pdo->log->header("Dumping $tbl.");
-		if (file_exists($filename)) {
-			newname($filename);
-		}
-		$pdo->queryDirect(sprintf("SELECT * INTO OUTFILE %s FROM %s", $pdo->escapeString($filename), $tbl));
-	}
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "infile") && (isset($argv[3]) && is_dir($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-	foreach($tables as $row) {
-		$tbl = $row['tables_in_'.DB_NAME];
-		$filename = $argv[3].$tbl.".csv";
-		if (file_exists($filename)) {
-			echo $pdo->log->header("Restoring $tbl.");
-			$pdo->queryExec(sprintf("LOAD DATA INFILE %s INTO TABLE %s", $pdo->escapeString($filename), $tbl));
-		}
-	}
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-} else {
-	passthru("clear");
-	echo $pdo->log->error("\nThis script can dump/restore all tables, compressed or OUTFILE/INFILE, or just collections/binaries/parts.\n\n"
-		. "**Single File\n"
-		. "php $argv[0] db dump /path/to/save/to              ...: To dump the database.\n"
-		. "php $argv[0] db restore /path/to/restore/from      ...: To restore the database.\n\n"
-		. "**Individual Table Files\n"
-		. "php $argv[0] all dump /path/to/save/to             ...: To dump all tables.\n"
-		. "php $argv[0] all restore /path/to/restore/from     ...: To restore all tables.\n\n"
-		. "**Two Tables (binaries, parts)\n"
-		. "php $argv[0] test dump /path/to/save/to            ...: To dump binaries, parts tables.\n"
-		. "php $argv[0] test restore /path/to/restore/from    ...: To restore binaries, parts tables.\n\n"
-		. "**Individal Files - OUTFILE/INFILE - No schema\n"
-		. "**MySQL MUST have write permissions to this path\n"
-		. "php $argv[0] all outfile /path/to/save/to          ...: To dump all tables, using OUTFILE.\n"
-		. "php $argv[0] all infile /path/to/restore/from      ...: To restore all tables, using INFILE.\n\n");
-}
-
-if(file_exists("mysql-defaults.txt")) {
-	@unlink("mysql-defaults.txt");
-}
\ No newline at end of file
diff --git a/lib/DB/patchDB.php b/lib/DB/patchDB.php
deleted file mode 100644
index aa625e9b7..000000000
--- a/lib/DB/patchDB.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/../../bin/config.php");
-require_once (WWW_DIR.'/lib/site.php');
-require_once (WWW_DIR.'/lib/util.php');
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR.'/lib/Tmux.php');
-require_once(WWW_DIR.'/lib/smarty/Smarty.class.php');
-
-// Function inspired by : http://stackoverflow.com/questions/1883079/best-practice-import-mysql-file-in-php-split-queries/2011454#2011454
-function SplitSQL($file, $delimiter = ';')
-{
-	set_time_limit(0);
-
-	if (is_file($file) === true) {
-		$file = fopen($file, 'r');
-
-		if (is_resource($file) === true) {
-			$query = array();
-			$db = new DB();
-			$dbsys = DB_TYPE;
-			$c = new ColorCLI();
-
-			while (feof($file) === false) {
-				$query[] = fgets($file);
-				if (preg_match('~' . preg_quote($delimiter, '~') . '\s*$~iS', end($query)) === 1) {
-					$query = trim(implode('', $query));
-
-					if ($dbsys == "pgsql") {
-						$query = str_replace(array("`", chr(96)), '', $query);
-					}
-					try {
-						$qry = $db->prepare($query);
-						$qry->execute();
-						echo $c->alternateOver('SUCCESS: ') . $c->primary($query);
-					} catch (PDOException $e) {
-						if ($e->errorInfo[1] == 1091 || $e->errorInfo[1] == 1060 || $e->errorInfo[1] == 1054 || $e->errorInfo[1] == 1061 || $e->errorInfo[1] == 1062 || $e->errorInfo[1] == 1071 || $e->errorInfo[1] == 1072 || $e->errorInfo[1] == 1146 || $e->errorInfo[0] == 23505 || $e->errorInfo[0] == 42701 || $e->errorInfo[0] == 42703 || $e->errorInfo[0] == '42P07' || $e->errorInfo[0] == '42P16') {
-							if ($e->errorInfo[1] == 1060) {
-								echo $c->error($query . " The column already exists - Not Fatal {" . $e->errorInfo[1] . "}.\n");
-							} else {
-								echo $c->error($query . " Skipped - Not Fatal {" . $e->errorInfo[1] . "}.\n");
-							}
-						} else {
-							if (preg_match('/ALTER IGNORE/i', $query)) {
-								$db->queryExec("SET SESSION old_alter_table = 1");
-								try {
-									$qry = $db->prepare($query);
-									$qry->execute();
-									echo $c->alternateOver('SUCCESS: ') . $c->primary($query);
-								} catch (PDOException $e) {
-									exit($c->error($query . " Failed {" . $e->errorInfo[1] . "}\n\t" . $e->errorInfo[2]));
-								}
-							} else {
-								exit($c->error($query . " Failed {" . $e->errorInfo[1] . "}\n\t" . $e->errorInfo[2]));
-							}
-						}
-					}
-
-					while (ob_get_level() > 0) {
-						ob_end_flush();
-					}
-					flush();
-				}
-
-				if (is_string($query) === true) {
-					$query = array();
-				}
-			}
-			return fclose($file);
-		} else {
-			return false;
-		}
-	} else {
-		return false;
-	}
-}
-
-function BackupDatabase()
-{
-	$db = new DB();
-	$c = new ColorCLI();
-	$DIR = dirname (__FILE__);
-
-	if (Utility::hasCommand("php5")) {
-		$PHP = "php5";
-	} else {
-		$PHP = "php";
-	}
-
-	//Backup based on database system
-	if ($db->dbSystem() == "mysql") {
-		system("$PHP ${DIR}mysqldump_tables.php db dump ../../");
-	} else if ($db->dbSystem() == "pgsql") {
-		exit($c->error("Currently not supported on this platform."));
-	}
-}
-
-$os = (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? "windows" : "unix";
-
-if (isset($argv[1]) && $argv[1] == "safe") {
-	$safeupgrade = true;
-} else {
-	$safeupgrade = false;
-}
-
-if (isset($os) && $os == "unix") {
-	$t = new Tmux();
-	$tmux = $t->get();
-	$currentversion = $tmux->sqlpatch;
-	$patched = 0;
-	$patches = array();
-	$db = new DB();
-	$backedup = false;
-	$c = new ColorCLI();
-    $DIR = dirname (__FILE__);
-    $path = $DIR.'/patches/';
-
-
-	// Open the patch folder.
-	if ($handle = @opendir($path)) {
-		while (false !== ($patch = readdir($handle))) {
-			$patches[] = $patch;
-		}
-		closedir($handle);
-	} else {
-		exit($c->error("\nHave you changed the path to the patches folder, or do you have the right permissions?\n"));
-	}
-
-	/* 	if ($db->dbSystem() == "mysql")
-	  $patchpath = preg_replace('/\/misc\/testing\/DB/i', '/db/patches/mysql/',
-	NN_ROOT);
-	  else if ($db->dbSystem() == "pgsql")
-	  $patchpath = preg_replace('/\/misc\/testing\/DB/i', '/db/patches/pgsql/', nZEDb_ROOT);
-	 */ sort($patches);
-
-	foreach ($patches as $patch) {
-		if (preg_match('/\.sql$/i', $patch)) {
-			$filepath = $path . $patch;
-			$file = fopen($filepath, "r");
-			$patch = fread($file, filesize($filepath));
-			if (preg_match('/UPDATE `?tmux`? SET `?value`? = \'?(\d{1,})\'? WHERE `?setting`? = \'sqlpatch\'/i', $patch, $patchnumber)) {
-				if ($patchnumber['1'] > $currentversion) {
-					if ($safeupgrade == true && $backedup == false) {
-						BackupDatabase();
-						$backedup = true;
-					}
-					SplitSQL($filepath);
-					$patched++;
-				}
-			}
-		}
-	}
-} else if (isset($os) && $os == "windows") {
-	$t = new Tmux();
-	$tmux = $t->get();
-	$currentversion = $tmux->sqlpatch;
-	$patched = 0;
-	$patches = array();
-
-	// Open the patch folder.
-	if (!isset($argv[1])) {
-		exit($c->error("\nYou must supply the directory to the patches.\n"));
-	}
-	if ($handle = @opendir($argv[1])) {
-		while (false !== ($patch = readdir($handle))) {
-			$patches[] = $patch;
-		}
-		closedir($handle);
-	} else {
-		exit($c->error("\nHave you changed the path to the patches folder, or do you have the right permissions?\n"));
-	}
-
-	sort($patches);
-	foreach ($patches as $patch) {
-		if (preg_match('/\.sql$/i', $patch)) {
-			$filepath = $argv[1] . $patch;
-			$file = fopen($filepath, "r");
-			$patch = fread($file, filesize($filepath));
-			if (preg_match('/UPDATE `?tmux`? SET `?value`? = \'?(\d{1,})\'? WHERE `?setting`? = \'sqlpatch\'/i', $patch, $patchnumber)) {
-				if ($patchnumber['1'] > $currentversion) {
-					if ($safeupgrade == true && $backedup == false) {
-						BackupDatabase();
-						$backedup = true;
-					}
-					SplitSQL($filepath);
-					$patched++;
-				}
-			}
-		}
-	}
-} else {
-	exit($c->error("\nUnable to determine OS.\n"));
-}
-
-if ($patched == 0) {
-	exit($c->info("Nothing to patch, you are already on patch version " . $currentversion));
-}
-if ($patched > 0) {
-	echo $c->header($patched . " patch(es) applied.");
-}
\ No newline at end of file
diff --git a/lib/DB/patches/0001_tmux.sql b/lib/DB/patches/0001_tmux.sql
deleted file mode 100644
index 8de0a3a0f..000000000
--- a/lib/DB/patches/0001_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'releases_threaded';
-
-UPDATE `tmux` set `value` = '1' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0002_tmux.sql b/lib/DB/patches/0002_tmux.sql
deleted file mode 100644
index 4a02cf8c8..000000000
--- a/lib/DB/patches/0002_tmux.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'collections_kill';
-DELETE FROM `tmux` WHERE `setting` = 'sorter';
-DELETE FROM `tmux` WHERE `setting` = 'sorter_timer';
-DELETE FROM `tmux` WHERE `setting` = 'optimize';
-DELETE FROM `tmux` WHERE `setting` = 'optimize_timer';
-INSERT IGNORE INTO `tmux` (`setting`, `value`) VALUES ('sphinx', '0'),
-    ('sphinx_timer', '600'),
-    ('delete_parts', '0'),
-    ('delete_timer', '43200');
-
-UPDATE `tmux` set `value` = '2' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0004_tmux.sql b/lib/DB/patches/0004_tmux.sql
deleted file mode 100644
index 42b29a7e1..000000000
--- a/lib/DB/patches/0004_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO `tmux` (`setting`, `value`) VALUES ('partrepair', 1);
-
-UPDATE `tmux` set `value` = '4' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0005_releases.sql b/lib/DB/patches/0005_releases.sql
deleted file mode 100644
index 39a2cb88c..000000000
--- a/lib/DB/patches/0005_releases.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `releases` DROP COLUMN `nzbstatus`;
-
-UPDATE `tmux` set `value` = '5' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0006_tmux.sql b/lib/DB/patches/0006_tmux.sql
deleted file mode 100644
index 5e6d12b05..000000000
--- a/lib/DB/patches/0006_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO `tmux` (`setting`, `value`) VALUES  ('zippath', '');
-
-UPDATE `tmux` set `value` = '6' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0007_releases_tmux.sql b/lib/DB/patches/0007_releases_tmux.sql
deleted file mode 100644
index 9866eb087..000000000
--- a/lib/DB/patches/0007_releases_tmux.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `releases` ADD `jpgstatus` TINYINT(1) NOT NULL DEFAULT 0;
-INSERT IGNORE INTO `tmux` (`setting`, `value`) VALUES ('processjpg', 0);
-
-UPDATE `tmux` set `value` = '7' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0008_releases.sql b/lib/DB/patches/0008_releases.sql
deleted file mode 100644
index df3af6e57..000000000
--- a/lib/DB/patches/0008_releases.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `releases` ADD `prehashid` INT(12) NULL DEFAULT NULL;
-
-UPDATE `tmux` set `value` = '8' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0009_releases.sql b/lib/DB/patches/0009_releases.sql
deleted file mode 100644
index 912b67608..000000000
--- a/lib/DB/patches/0009_releases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `releases` CHANGE COLUMN `prehashid` `prehashid` INT UNSIGNED NOT NULL DEFAULT '0';
-UPDATE `tmux` set `value` = '9' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0010_releases.sql b/lib/DB/patches/0010_releases.sql
deleted file mode 100644
index a342cca19..000000000
--- a/lib/DB/patches/0010_releases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `releases` ADD INDEX `ix_releases_prehashid_searchname` (`prehashid`, `searchname`);
-UPDATE `tmux` set `value` = '10' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0011_prehash.sql b/lib/DB/patches/0011_prehash.sql
deleted file mode 100644
index d3b69d8e1..000000000
--- a/lib/DB/patches/0011_prehash.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `prehash` ADD INDEX `ix_prehash_size` (`size`);
-ALTER TABLE `prehash` ADD INDEX `ix_prehash_category` (`category`);
-UPDATE `tmux` set `value` = '11' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0012_prehash.sql b/lib/DB/patches/0012_prehash.sql
deleted file mode 100644
index 777c03ccb..000000000
--- a/lib/DB/patches/0012_prehash.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Is this pre nuked? 0 no 1 yes 2 un nuked 3 mod nuked */
-ALTER TABLE prehash ADD COLUMN nuked TINYINT(1) NOT NULL DEFAULT '0';
-
-/* If this pre is nuked, what is the reason? */
-ALTER TABLE prehash ADD COLUMN nukereason VARCHAR(255) NULL;
-
-/* How many files does this pre have ? */
-ALTER TABLE prehash ADD COLUMN files VARCHAR(50) NULL;
-
-UPDATE tmux SET value = '12' WHERE setting = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0013_tmux.sql b/lib/DB/patches/0013_tmux.sql
deleted file mode 100644
index 3a88e5f8f..000000000
--- a/lib/DB/patches/0013_tmux.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('scrape_cz', 0);
-INSERT IGNORE INTO tmux (setting, value) VALUE ('scrape_efnet', 0);
-
-UPDATE tmux SET value = '13' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0014_prehash.sql b/lib/DB/patches/0014_prehash.sql
deleted file mode 100644
index 1ab9336ba..000000000
--- a/lib/DB/patches/0014_prehash.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Drop the adddate index */
-ALTER TABLE prehash DROP INDEX ix_prehash_adddate;
-
-/* Drop the adddate column */
-ALTER TABLE prehash DROP COLUMN adddate;
-
-/* Use tmux table to keep the last pre time (unixtime) */
-INSERT INTO tmux (setting, value) VALUES ('lastpretime', '0');
-
-UPDATE tmux SET value = '14' WHERE setting = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0015_sharing.sql b/lib/DB/patches/0015_sharing.sql
deleted file mode 100644
index beffbb203..000000000
--- a/lib/DB/patches/0015_sharing.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-DROP TABLE IF EXISTS sharing_sites;
-CREATE TABLE sharing_sites (
-	id             INT(11) UNSIGNED   NOT NULL AUTO_INCREMENT,
-	site_name      VARCHAR(255)       NOT NULL DEFAULT '',
-	site_guid      VARCHAR(40)        NOT NULL DEFAULT '',
-	last_time      DATETIME           DEFAULT NULL,
-	first_time     DATETIME           DEFAULT NULL,
-	enabled        TINYINT(1)         NOT NULL DEFAULT '0',
-	comments       MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
-	PRIMARY KEY    (id)
-) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci AUTO_INCREMENT=1 ;
-
-DROP TABLE IF EXISTS sharing;
-CREATE TABLE sharing (
-	site_guid      VARCHAR(40)        NOT NULL DEFAULT '',
-	site_name      VARCHAR(255)       NOT NULL DEFAULT '',
-	enabled        TINYINT(1)         NOT NULL DEFAULT '0',
-	posting        TINYINT(1)         NOT NULL DEFAULT '0',
-    start_position TINYINT(1)         NOT NULL DEFAULT '0',
-	fetching       TINYINT(1)         NOT NULL DEFAULT '1',
-	auto_enable    TINYINT(1)         NOT NULL DEFAULT '1',
-	hide_users     TINYINT(1)         NOT NULL DEFAULT '1',
-	last_article   BIGINT UNSIGNED    NOT NULL DEFAULT '0',
-	max_push       MEDIUMINT UNSIGNED NOT NULL DEFAULT '40',
-	max_pull       INT UNSIGNED       NOT NULL DEFAULT '200',
-	PRIMARY KEY    (site_guid)
-) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-
-ALTER TABLE releasecomment ADD COLUMN shared   TINYINT(1)  NOT NULL DEFAULT '1';
-ALTER TABLE releasecomment ADD COLUMN shareid  VARCHAR(40) NOT NULL DEFAULT '';
-ALTER TABLE releasecomment ADD COLUMN siteid   VARCHAR(40) NOT NULL DEFAULT '';
-ALTER TABLE releasecomment ADD COLUMN nzb_guid VARCHAR(32) NOT NULL DEFAULT '';
-
-UPDATE tmux SET value = '15' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0016_tmux.sql b/lib/DB/patches/0016_tmux.sql
deleted file mode 100644
index 309827d83..000000000
--- a/lib/DB/patches/0016_tmux.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('nntpretries', '10');
-INSERT IGNORE INTO tmux (setting, value) VALUE ('alternate_nntp', '0');
-
-UPDATE tmux SET value = '16' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0017_tmux.sql b/lib/DB/patches/0017_tmux.sql
deleted file mode 100644
index d8a05e83a..000000000
--- a/lib/DB/patches/0017_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('sharing_timer', '60');
-
-UPDATE tmux SET value = '17' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0018_sharing.sql b/lib/DB/patches/0018_sharing.sql
deleted file mode 100644
index 4987d9178..000000000
--- a/lib/DB/patches/0018_sharing.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE sharing ADD COLUMN max_download MEDIUMINT UNSIGNED NOT NULL DEFAULT '150';
-
-UPDATE sharing SET max_pull = 20000;
-
-UPDATE tmux SET value = '18' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0019_sharing.sql b/lib/DB/patches/0019_sharing.sql
deleted file mode 100644
index 31bbd6f19..000000000
--- a/lib/DB/patches/0019_sharing.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE releasecomment SET username = (SELECT username FROM users WHERE users.id = releasecomment.userid);
-
-DELETE FROM users WHERE email = 'sharing@nZEDb.com' AND role = 0;
-
-UPDATE tmux SET value = '19' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0020_tmux.sql b/lib/DB/patches/0020_tmux.sql
deleted file mode 100644
index d5ef2b670..000000000
--- a/lib/DB/patches/0020_tmux.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'delete_parts';
-DELETE FROM `tmux` WHERE `setting` = 'delete_timer';
-
-
-
-UPDATE `tmux` set `value` = '20' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0021_tmux.sql b/lib/DB/patches/0021_tmux.sql
deleted file mode 100644
index e85265b97..000000000
--- a/lib/DB/patches/0021_tmux.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'alternate_nntp';
-
-
-
-UPDATE `tmux` set `value` = '21' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0022_releases.sql b/lib/DB/patches/0022_releases.sql
deleted file mode 100644
index 83a028d39..000000000
--- a/lib/DB/patches/0022_releases.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `releases` ADD INDEX `ix_releases_releasenfoID` (`releasenfoid`);
-
-UPDATE `tmux` set `value` = '22' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0023_tmux.sql b/lib/DB/patches/0023_tmux.sql
deleted file mode 100644
index 9e1d36d31..000000000
--- a/lib/DB/patches/0023_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('fanarttvkey', '');
-
-UPDATE tmux SET value = '23' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0024_tmux.sql b/lib/DB/patches/0024_tmux.sql
deleted file mode 100644
index f93fc6039..000000000
--- a/lib/DB/patches/0024_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('imdburl', '0');
-
-UPDATE tmux SET value = '24' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0025_tmux.sql b/lib/DB/patches/0025_tmux.sql
deleted file mode 100644
index 175d3c8ca..000000000
--- a/lib/DB/patches/0025_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('yydecoderpath', '');
-
-UPDATE tmux SET value = '25' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0026_tmux.sql b/lib/DB/patches/0026_tmux.sql
deleted file mode 100644
index aa39cae34..000000000
--- a/lib/DB/patches/0026_tmux.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('ffmpeg_duration', '5');
-INSERT IGNORE INTO tmux (setting, VALUE) VALUE ('ffmpeg_image_time', '5');
-INSERT IGNORE INTO tmux (setting, value) VALUE ('processvideos', '0');
-
-ALTER TABLE `releases` ADD `proc_pp` TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE `releases` ADD `videostatus` TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE `releases` ADD `audiostatus` TINYINT(1) NOT NULL DEFAULT 0;
-
-UPDATE tmux SET value = '26' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0027_prehash.sql b/lib/DB/patches/0027_prehash.sql
deleted file mode 100644
index 6e0a1ab49..000000000
--- a/lib/DB/patches/0027_prehash.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-DELETE FROM prehash
-WHERE MD5(title) != MD5;
-ALTER TABLE prehash ADD COLUMN sha1 VARCHAR(40) NOT NULL DEFAULT '';
-ALTER TABLE prehash MODIFY COLUMN md5 VARCHAR(32) NOT NULL DEFAULT '';
-
-UPDATE prehash SET sha1 = sha1(title);
-CREATE UNIQUE INDEX ix_prehash_sha1 ON prehash(sha1);
-
-UPDATE tmux SET value = '27' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0028_tmux.sql b/lib/DB/patches/0028_tmux.sql
deleted file mode 100644
index acc51a8ee..000000000
--- a/lib/DB/patches/0028_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('bins_kill_timer', '0');
-
-UPDATE tmux SET value = '28' WHERE setting = 'sqlpatch';
diff --git a/lib/DB/patches/0029_releases.sql b/lib/DB/patches/0029_releases.sql
deleted file mode 100644
index b7cb1a3fe..000000000
--- a/lib/DB/patches/0029_releases.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE `releases` ADD COLUMN `nzbstatus` TINYINT(1) NOT NULL DEFAULT 1;
-ALTER TABLE `releases` ADD COLUMN `nzb_guid` VARCHAR(50) NULL;
-ALTER TABLE `releases` DROP INDEX `ix_releases_status`;
-ALTER TABLE `releases` ADD INDEX `ix_releases_status` (`nzbstatus`, `iscategorized`, `isrenamed`, `nfostatus`, `ishashed`, `passwordstatus`, `dehashstatus`, `releasenfoid`, `musicinfoid`, `consoleinfoid`, `bookinfoid`, `haspreview`, `categoryid`, `imdbid`, `rageid`);
-CREATE INDEX `ix_releases_nzb_guid` ON `releases` (`nzb_guid`);
-
-UPDATE `releases` SET nzbstatus = 1 WHERE nzbstatus = 0;
-
-
-
-UPDATE `tmux` set `value` = '29' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0030_tmux.sql b/lib/DB/patches/0030_tmux.sql
deleted file mode 100644
index 5dd7ee9b3..000000000
--- a/lib/DB/patches/0030_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `tmux` SET VALUE = 'http://reqid.nzedb.com/index.php?reqid=[REQUEST_ID]&group=[GROUP_NM]' WHERE `setting` = 'request_url';
-
-UPDATE `tmux` set `value` = '30' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0031_releases.sql b/lib/DB/patches/0031_releases.sql
deleted file mode 100644
index e6480beca..000000000
--- a/lib/DB/patches/0031_releases.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE `releases` DROP COLUMN `nzb_guid`;
-ALTER TABLE `releases` DROP INDEX `ix_releases_nzb_guid`;
-
-UPDATE `tmux` set `value` = '31' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0032_releases.sql b/lib/DB/patches/0032_releases.sql
deleted file mode 100644
index 366a02603..000000000
--- a/lib/DB/patches/0032_releases.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-DROP TRIGGER IF EXISTS check_insert;
-DROP TRIGGER IF EXISTS check_update;
-
-
-CREATE TRIGGER check_insert BEFORE INSERT ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;ELSEIF NEW.name REGEXP '^\[ ?([[:digit:]]{4,6}) ?\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1;ELSEIF NEW.releasenfoid = 0 THEN SET NEW.nfostatus = -1; END IF; END;
-CREATE TRIGGER check_update BEFORE UPDATE ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;ELSEIF NEW.name REGEXP '^\[ ?([[:digit:]]{4,6}) ?\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1;ELSEIF NEW.releasenfoid = 0 THEN SET NEW.nfostatus = -1; END IF; END;
-
-
-UPDATE `tmux` set `value` = '32' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0033_releases.sql b/lib/DB/patches/0033_releases.sql
deleted file mode 100644
index e984cbf24..000000000
--- a/lib/DB/patches/0033_releases.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP TRIGGER IF EXISTS check_insert;
-DROP TRIGGER IF EXISTS check_update;
-
-CREATE TRIGGER check_insert BEFORE INSERT ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;ELSEIF NEW.name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1;ELSEIF NEW.releasenfoid = 0 THEN SET NEW.nfostatus = -1; END IF; END;
-CREATE TRIGGER check_update BEFORE UPDATE ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;ELSEIF NEW.name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1;ELSEIF NEW.releasenfoid = 0 THEN SET NEW.nfostatus = -1; END IF; END;
-
-UPDATE releases set isrequestid = 1
-WHERE name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\['
-AND isrequestid = 0;
-
-UPDATE `tmux` set `value` = '33' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0034_tmux.sql b/lib/DB/patches/0034_tmux.sql
deleted file mode 100644
index 5f95fbfa8..000000000
--- a/lib/DB/patches/0034_tmux.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'scrape_cz';
-DELETE FROM `tmux` WHERE `setting` = 'scrape_efnet';
-INSERT IGNORE INTO `tmux` (setting, value) VALUE ('scrape', '0');
-
-UPDATE `tmux` SET value = '34' WHERE `setting` = 'sqlpatch';
diff --git a/lib/DB/patches/0035_prehash.sql b/lib/DB/patches/0035_prehash.sql
deleted file mode 100644
index 42595436b..000000000
--- a/lib/DB/patches/0035_prehash.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-ALTER TABLE `prehash` ADD COLUMN `filename` varchar(255) NOT NULL DEFAULT '';
-ALTER TABLE `prehash` ADD INDEX `ix_prehash_filename` (`filename`);
-ALTER TABLE `releasefiles` ADD COLUMN `ishashed` tinyint(1) NOT NULL DEFAULT '0' AFTER `size`;
-ALTER TABLE `releasefiles` ADD INDEX `ix_releasefiles_ishashed` (`ishashed`);
-
-DROP TRIGGER IF EXISTS check_rfinsert;
-DROP TRIGGER IF EXISTS check_rfupdate;
-
-
-CREATE TRIGGER check_rfinsert BEFORE INSERT ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1; END IF; END;
-CREATE TRIGGER check_rfupdate BEFORE UPDATE ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1; END IF; END;
-
-
-UPDATE `releasefiles` SET ishashed = 1 WHERE name REGEXP '[a-fA-F0-9]{32}';
-
-UPDATE `tmux` SET value = '35' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0036_tmux.sql b/lib/DB/patches/0036_tmux.sql
deleted file mode 100644
index ccfc891fe..000000000
--- a/lib/DB/patches/0036_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'colors';
-
-UPDATE `tmux` SET value = '36' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0037_tmux.sql b/lib/DB/patches/0037_tmux.sql
deleted file mode 100644
index b0d053408..000000000
--- a/lib/DB/patches/0037_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('run_sharing', '0');
-
-UPDATE `tmux` SET value = '37' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0038_releasesearch.sql b/lib/DB/patches/0038_releasesearch.sql
deleted file mode 100644
index 945470adf..000000000
--- a/lib/DB/patches/0038_releasesearch.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-DROP TABLE IF EXISTS releasesearch;
-CREATE TABLE releasesearch (
-  id         INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  releaseid  INT(11) UNSIGNED NOT NULL,
-  guid       VARCHAR(50)      NOT NULL,
-  name       VARCHAR(255)     NOT NULL DEFAULT '',
-  searchname VARCHAR(255)     NOT NULL DEFAULT '',
-  PRIMARY KEY (id)
-) ENGINE =MyISAM DEFAULT CHARSET =utf8 COLLATE =utf8_unicode_ci AUTO_INCREMENT =1;
-
-CREATE FULLTEXT INDEX ix_releasesearch_name_searchname_ft ON releasesearch (name, searchname);
-CREATE INDEX ix_releasesearch_releaseid ON releasesearch (releaseid);
-CREATE INDEX ix_releasesearch_guid ON releasesearch (guid);
-
-ALTER TABLE `releases`
-ADD `proc_filenames` BIT NOT NULL DEFAULT 0;
-
-
-CREATE TRIGGER insert_search AFTER INSERT ON releases FOR EACH ROW BEGIN INSERT INTO releasesearch (releaseid, guid, name, searchname) VALUES (NEW.id, NEW.guid, NEW.name, NEW.searchname);END;
-CREATE TRIGGER update_search AFTER UPDATE ON releases FOR EACH ROW BEGIN IF NEW.guid != OLD.guid THEN UPDATE releasesearch SET guid = NEW.guid WHERE releaseid = OLD.id; END IF; IF NEW.name != OLD.name THEN UPDATE releasesearch SET name = NEW.name WHERE releaseid = OLD.id; END IF; IF NEW.searchname != OLD.searchname THEN UPDATE releasesearch SET searchname = NEW.searchname WHERE releaseid = OLD.id; END IF;END;
-CREATE TRIGGER delete_search AFTER DELETE ON releases FOR EACH ROW BEGIN DELETE FROM releasesearch WHERE releaseid = OLD.id;END;
-
-
-UPDATE `tmux` SET value = '38' WHERE `setting` = 'sqlpatch';
-
diff --git a/lib/DB/patches/0039_prehash.sql b/lib/DB/patches/0039_prehash.sql
deleted file mode 100644
index 99a472b83..000000000
--- a/lib/DB/patches/0039_prehash.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE prehash ADD COLUMN searched tinyint(1) NOT NULL DEFAULT 0;
-ALTER TABLE prehash ADD INDEX ix_prehash_searched (searched);
-ALTER TABLE releases DROP COLUMN proc_filenames;
-
-UPDATE `tmux` SET value = '39' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0040_tmux.sql b/lib/DB/patches/0040_tmux.sql
deleted file mode 100644
index 612bcc906..000000000
--- a/lib/DB/patches/0040_tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('lastpretime', '0');
-
-UPDATE `tmux` SET value = '40' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0041_predbhash.sql b/lib/DB/patches/0041_predbhash.sql
deleted file mode 100644
index 12bb9c006..000000000
--- a/lib/DB/patches/0041_predbhash.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-DROP TABLE IF EXISTS predbhash;
-CREATE TABLE predbhash (
-  pre_id INT(11) UNSIGNED NOT NULL DEFAULT 0,
-  hashes VARCHAR(512)     NOT NULL DEFAULT '',
-  PRIMARY KEY (pre_id)
-)
-  ENGINE =MYISAM
-  ROW_FORMAT = DYNAMIC
-  DEFAULT CHARSET =utf8mb4
-  COLLATE =utf8mb4_unicode_ci;
-
-INSERT INTO predbhash (pre_id, hashes) (SELECT
-                                          id,
-                                          CONCAT_WS(',', MD5(title), MD5(MD5(title)), SHA1(title))
-                                        FROM prehash);
-
-CREATE FULLTEXT INDEX ix_predbhash_hashes_ft ON predbhash (hashes);
-ALTER IGNORE TABLE predbhash ADD UNIQUE INDEX ix_predbhash_hashes (hashes(32));
-
-DROP TRIGGER IF EXISTS insert_hashes;
-
-
-CREATE TRIGGER insert_hashes AFTER INSERT ON prehash FOR EACH ROW BEGIN INSERT INTO predbhash (pre_id, hashes)
-VALUES (NEW.id, CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)));
-END;
-
-
-
-DROP TRIGGER IF EXISTS update_hashes;
-
-
-CREATE TRIGGER update_hashes AFTER UPDATE ON prehash FOR EACH ROW BEGIN IF NEW.title != OLD.title
-THEN UPDATE predbhash
-SET hashes = CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)); END IF;
-END;
-
-DROP TRIGGER IF EXISTS delete_hashes;
-
-
-CREATE TRIGGER delete_hashes AFTER DELETE ON prehash FOR EACH ROW BEGIN DELETE FROM predbhash
-WHERE pre_id = OLD.id;
-END;
-
-
-UPDATE `tmux` SET value = '41' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0042_predbhash.sql b/lib/DB/patches/0042_predbhash.sql
deleted file mode 100644
index 08aab0dc7..000000000
--- a/lib/DB/patches/0042_predbhash.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DROP TRIGGER IF EXISTS update_hashes;
-
-CREATE TRIGGER update_hashes AFTER UPDATE ON prehash FOR EACH ROW BEGIN IF NEW.title != OLD.title THEN UPDATE predbhash SET hashes = CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)) WHERE pre_id = OLD.id;END IF;END;
-UPDATE `tmux` SET value = '42' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0043_prehash.sql b/lib/DB/patches/0043_prehash.sql
deleted file mode 100644
index 98c0d8486..000000000
--- a/lib/DB/patches/0043_prehash.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE prehash DROP md5;
-ALTER TABLE prehash DROP sha1;
-UPDATE `tmux` SET value = '43' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0044_releasecomment.sql b/lib/DB/patches/0044_releasecomment.sql
deleted file mode 100644
index aa4733108..000000000
--- a/lib/DB/patches/0044_releasecomment.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE releasecomment MODIFY text varchar(255);
-DROP INDEX ix_releasecomment_text_releaseID ON releasecomment;
-CREATE UNIQUE INDEX ix_releasecomment_text_releaseID ON releasecomment (text, releaseid);
-UPDATE `tmux` SET value = '44' WHERE `setting` = 'sqlpatch';
-
diff --git a/lib/DB/patches/0045_prehash.sql b/lib/DB/patches/0045_prehash.sql
deleted file mode 100644
index 4137cfa0b..000000000
--- a/lib/DB/patches/0045_prehash.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE prehash DROP INDEX ix_prehash_title;
-ALTER IGNORE TABLE prehash ADD UNIQUE INDEX ix_prehash_title (title);
-UPDATE `tmux` SET value = '45' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0046_releasecomment.sql b/lib/DB/patches/0046_releasecomment.sql
deleted file mode 100644
index 881821860..000000000
--- a/lib/DB/patches/0046_releasecomment.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE releasecomment ADD COLUMN text_hash VARCHAR(32) NOT NULL DEFAULT '';
-DROP TRIGGER IF EXISTS insert_MD5;
-CREATE TRIGGER insert_MD5 BEFORE INSERT ON releasecomment FOR EACH ROW SET NEW.text_hash = MD5(NEW.text);
-UPDATE releasecomment
-SET text_hash = MD5(text);
-ALTER IGNORE TABLE releasecomment ADD UNIQUE INDEX ix_releasecomment_hash_releaseID (text_hash, releaseid);
-UPDATE `tmux` SET `value` = '46' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0047_users.sql b/lib/DB/patches/0047_users.sql
deleted file mode 100644
index 6a45ae026..000000000
--- a/lib/DB/patches/0047_users.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE users ADD COLUMN queuetype TINYINT(1) NOT NULL DEFAULT 1;
-/* Add a column to pick between Sab and NZBGet. */
-
-
-UPDATE `tmux` SET `value` = '47' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0049_site.sql b/lib/DB/patches/0049_site.sql
deleted file mode 100644
index e728599ae..000000000
--- a/lib/DB/patches/0049_site.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `site` (`setting`, `value`) VALUES ('categorizeforeign',	'1');
-INSERT INTO `site` (`setting`, `value`) VALUES ('catwebdl',	'0');
-UPDATE `tmux` SET `value` = '49' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0050_category.sql b/lib/DB/patches/0050_category.sql
deleted file mode 100644
index 4575ba3ad..000000000
--- a/lib/DB/patches/0050_category.sql
+++ /dev/null
@@ -1,93 +0,0 @@
-DROP TABLE IF EXISTS `category`;
-CREATE TABLE category
-(
-  `id`                   INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-  `title`                VARCHAR(255)    NOT NULL,
-  `parentid`             INT             NULL,
-  `status`               INT             NOT NULL DEFAULT '1',
-  `minsizetoformrelease` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-  `maxsizetoformrelease` BIGINT UNSIGNED NOT NULL DEFAULT '0',
-  `description`          VARCHAR(255)    NULL,
-  `disablepreview`       TINYINT(1)      NOT NULL DEFAULT '0'
-)
-  ENGINE =INNODB
-  DEFAULT CHARACTER SET utf8
-  COLLATE utf8_unicode_ci
-  AUTO_INCREMENT =100000;
-
-INSERT INTO category (id, title) VALUES (1000, 'Console');
-INSERT INTO category (id, title) VALUES (2000, 'Movies');
-INSERT INTO category (id, title) VALUES (3000, 'Audio');
-INSERT INTO category (id, title) VALUES (4000, 'PC');
-INSERT INTO category (id, title) VALUES (5000, 'TV');
-INSERT INTO category (id, title) VALUES (6000, 'XXX');
-INSERT INTO category (id, title) VALUES (7000, 'Books');
-INSERT INTO category (id, title) VALUES (8000, 'Other');
-
-INSERT INTO category (id, title, parentid) VALUES (1010, 'NDS', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1020, 'PSP', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1030, 'Wii', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1040, 'Xbox', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1050, 'Xbox 360', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1060, 'WiiWare/VC', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1070, 'XBOX 360 DLC', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1080, 'PS3', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1090, 'Other', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1110, '3DS', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1120, 'PS Vita', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1130, 'WiiU', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1140, 'Xbox One', 1000);
-INSERT INTO category (id, title, parentid) VALUES (1180, 'PS4', 1000);
-
-INSERT INTO category (id, title, parentid) VALUES (2010, 'Foreign', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2020, 'Other', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2030, 'SD', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2040, 'HD', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2050, '3D', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2060, 'BluRay', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2070, 'DVD', 2000);
-INSERT INTO category (id, title, parentid) VALUES (2080, 'WEB-DL', 2000);
-
-INSERT INTO category (id, title, parentid) VALUES (3010, 'MP3', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3020, 'Video', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3030, 'Audiobook', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3040, 'Lossless', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3050, 'Other', 3000);
-INSERT INTO category (id, title, parentid) VALUES (3060, 'Foreign', 3000);
-
-INSERT INTO category (id, title, parentid) VALUES (4010, '0day', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4020, 'ISO', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4030, 'Mac', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4040, 'Mobile-Other', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4050, 'Games', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4060, 'Mobile-iOS', 4000);
-INSERT INTO category (id, title, parentid) VALUES (4070, 'Mobile-Android', 4000);
-
-INSERT INTO category (id, title, parentid) VALUES (5010, 'WEB-DL', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5020, 'Foreign', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5030, 'SD', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5040, 'HD', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5050, 'Other', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5060, 'Sport', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5070, 'Anime', 5000);
-INSERT INTO category (id, title, parentid) VALUES (5080, 'Documentary', 5000);
-
-INSERT INTO category (id, title, parentid) VALUES (6010, 'DVD', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6020, 'WMV', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6030, 'XviD', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6040, 'x264', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6050, 'Pack', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6060, 'ImgSet', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6070, 'Other', 6000);
-
-INSERT INTO category (id, title, parentid) VALUES (7010, 'Mags', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7020, 'Ebook', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7030, 'Comics', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7040, 'Technical', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7050, 'Other', 7000);
-INSERT INTO category (id, title, parentid) VALUES (7060, 'Foreign', 7000);
-
-INSERT INTO category (id, title, parentid) VALUES (8010, 'Misc', 8000);
-INSERT INTO category (id, title, parentid) VALUES (8020, 'Hashed', 8000);
-
-UPDATE `tmux` SET `value` = '50' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0051_tmux.sql b/lib/DB/patches/0051_tmux.sql
deleted file mode 100644
index 286977e73..000000000
--- a/lib/DB/patches/0051_tmux.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUE ('minsizetopostprocess', '1');
-UPDATE `tmux` SET `value` = '51' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0052~gamesinfo.sql b/lib/DB/patches/0052~gamesinfo.sql
deleted file mode 100644
index 78da0f2df..000000000
--- a/lib/DB/patches/0052~gamesinfo.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-DROP TABLE IF EXISTS gamesinfo;
-CREATE TABLE         gamesinfo (
-  id          INT(10) UNSIGNED    NOT NULL AUTO_INCREMENT,
-  title       VARCHAR(255)        NOT NULL,
-  asin        VARCHAR(128)        DEFAULT NULL,
-  url         VARCHAR(1000)       DEFAULT NULL,
-  platform    VARCHAR(255)        DEFAULT NULL,
-  publisher   VARCHAR(255)        DEFAULT NULL,
-  genre_id     INT(10)            NULL DEFAULT NULL,
-  esrb        VARCHAR(255)        NULL DEFAULT NULL,
-  releasedate DATETIME            DEFAULT NULL,
-  review      VARCHAR(3000)       DEFAULT NULL,
-  cover       TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
-  createddate DATETIME            NOT NULL,
-  updateddate DATETIME            NOT NULL,
-  PRIMARY KEY                    (id),
-  UNIQUE INDEX ix_gamesinfo_asin (asin)
-)
-  ENGINE          = InnoDB
-  DEFAULT CHARSET = utf8
-  COLLATE         = utf8_unicode_ci
-  AUTO_INCREMENT  = 1;
-
-  UPDATE `tmux` SET `value` = '52' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0053~site.sql b/lib/DB/patches/0053~site.sql
deleted file mode 100644
index cbd08d8a3..000000000
--- a/lib/DB/patches/0053~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `site` (`setting`, `value`) VALUES ('giantbombkey', '');
-UPDATE `tmux` SET `value` = '53' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0054~releases.sql b/lib/DB/patches/0054~releases.sql
deleted file mode 100644
index 948ea1e66..000000000
--- a/lib/DB/patches/0054~releases.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE releases ADD COLUMN gamesinfo_id INT AFTER consoleinfoid;
-CREATE INDEX ix_releases_gamesinfo_id ON releases (gamesinfo_id);
-UPDATE `tmux` SET `value` = '54' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0055~users.sql b/lib/DB/patches/0055~users.sql
deleted file mode 100644
index 3856ff3b1..000000000
--- a/lib/DB/patches/0055~users.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE users ADD COLUMN gameview INT AFTER consoleview;
-UPDATE `tmux` SET `value` = '55' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0056~menu.sql b/lib/DB/patches/0056~menu.sql
deleted file mode 100644
index 267d4f9ed..000000000
--- a/lib/DB/patches/0056~menu.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO menu (href, title, tooltip, role, ordinal ) VALUES ('newposterwall', 'New Releases', "Newest Releases Poster Wall", 1, 11);
-UPDATE `tmux` SET `value` = '56' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0057~releases.sql b/lib/DB/patches/0057~releases.sql
deleted file mode 100644
index 32db0690f..000000000
--- a/lib/DB/patches/0057~releases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE releases ADD COLUMN proc_sorter TINYINT(1) NOT NULL DEFAULT '0';
-UPDATE `tmux` SET `value` = '57' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0058~tmux.sql b/lib/DB/patches/0058~tmux.sql
deleted file mode 100644
index 3643d61ea..000000000
--- a/lib/DB/patches/0058~tmux.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'dehash';
-DELETE FROM `tmux` WHERE `setting` = 'dehash_timer';
-DELETE FROM `tmux` WHERE `setting` = 'lookup_reqids';
-DELETE FROM `tmux` WHERE `setting` = 'lookup_reqids_timer';
-DELETE FROM `tmux` WHERE `setting` = 'request_url';
-UPDATE `tmux` set `value` = '58' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0059~users.sql b/lib/DB/patches/0059~users.sql
deleted file mode 100644
index b305d7cec..000000000
--- a/lib/DB/patches/0059~users.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE users ADD COLUMN xxxview INT AFTER gameview;
-UPDATE `tmux` set `value` = '59' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0060~xxxinfo.sql b/lib/DB/patches/0060~xxxinfo.sql
deleted file mode 100644
index d5e26e114..000000000
--- a/lib/DB/patches/0060~xxxinfo.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-DROP TABLE IF EXISTS xxxinfo;
-CREATE TABLE         xxxinfo (
-  id          INT(10) UNSIGNED               NOT NULL AUTO_INCREMENT,
-  title       VARCHAR(255)                   NOT NULL,
-  tagline     VARCHAR(1024)                  NOT NULL,
-  plot        BLOB                           NULL DEFAULT NULL,
-  genre       VARCHAR(64)                    NOT NULL,
-  director    VARCHAR(64)                    DEFAULT NULL,
-  actors      VARCHAR(2000)                  NOT NULL,
-  extras      TEXT                           DEFAULT NULL,
-  productinfo TEXT                           DEFAULT NULL,
-  trailers    TEXT                           DEFAULT NULL,
-  directurl   VARCHAR(2000)                  NOT NULL,
-  classused   VARCHAR(3)                     NOT NULL,
-  cover       TINYINT(1) UNSIGNED            NOT NULL DEFAULT '0',
-  backdrop    TINYINT(1) UNSIGNED            NOT NULL DEFAULT '0',
-  createddate DATETIME                       NOT NULL,
-  updateddate DATETIME                       NOT NULL,
-  PRIMARY KEY                      (id),
-  INDEX        ix_xxxinfo_title  (title)
-)
-  ENGINE          = InnoDB
-  DEFAULT CHARSET = utf8
-  COLLATE         = utf8_unicode_ci
-  AUTO_INCREMENT  = 1;
-
-UPDATE `tmux` SET `value` = '60' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0061~releases.sql b/lib/DB/patches/0061~releases.sql
deleted file mode 100644
index 264095ede..000000000
--- a/lib/DB/patches/0061~releases.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE releases ADD COLUMN xxxinfo_id INT AFTER imdbid;
-CREATE INDEX ix_releases_xxxinfo_id ON releases (xxxinfo_id);
-UPDATE `tmux` SET `value` = '61' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0062~releases.sql b/lib/DB/patches/0062~releases.sql
deleted file mode 100644
index e56e93e72..000000000
--- a/lib/DB/patches/0062~releases.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE releases SET gamesinfo_id = 0 WHERE gamesinfo_id IS NULL;
-ALTER TABLE releases MODIFY COLUMN gamesinfo_id INT(10) SIGNED NOT NULL DEFAULT '0';
-UPDATE releases SET xxxinfo_id = 0 WHERE xxxinfo_id IS NULL;
-ALTER TABLE releases MODIFY COLUMN xxxinfo_id INT(10) SIGNED NOT NULL DEFAULT '0';
-UPDATE `tmux` SET `value` = '62' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0063~site.sql b/lib/DB/patches/0063~site.sql
deleted file mode 100644
index af3fe2313..000000000
--- a/lib/DB/patches/0063~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `site` (`setting`, `value`) VALUES ('lookupxxx', 1);
-UPDATE `tmux` SET `value` = '63' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0064~site.sql b/lib/DB/patches/0064~site.sql
deleted file mode 100644
index abdc614f4..000000000
--- a/lib/DB/patches/0064~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `site` (`setting`, `value`) VALUES ('maxxxxprocessed', 100);
-UPDATE `tmux` SET `value` = '64' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0065~users.sql b/lib/DB/patches/0065~users.sql
deleted file mode 100644
index d7f9cb618..000000000
--- a/lib/DB/patches/0065~users.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-
-ALTER TABLE users ADD COLUMN cp_api  VARCHAR(255) NULL DEFAULT NULL;
-ALTER TABLE users ADD COLUMN cp_url  VARCHAR(255) NULL DEFAULT NULL;
-UPDATE `tmux` SET `value` = '65' WHERE `setting` = 'sqlpatch';
diff --git a/lib/DB/patches/0066~genres.sql b/lib/DB/patches/0066~genres.sql
deleted file mode 100644
index ad313c0a4..000000000
--- a/lib/DB/patches/0066~genres.sql
+++ /dev/null
@@ -1,497 +0,0 @@
-DROP TABLE IF EXISTS `genres`;
-CREATE TABLE IF NOT EXISTS `genres` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `type` int(4) DEFAULT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC AUTO_INCREMENT=635;
-
-INSERT IGNORE INTO `genres` (`id`, `title`, `type`, `disabled`) VALUES
-(150, 'Blues', 3000, 0),
-(151, 'Classic Rock', 3000, 0),
-(152, 'Country', 3000, 0),
-(153, 'Dance', 3000, 0),
-(154, 'Disco', 3000, 0),
-(155, 'Funk', 3000, 0),
-(156, 'Grunge', 3000, 0),
-(157, 'Hip-Hop', 3000, 0),
-(158, 'Jazz', 3000, 0),
-(159, 'Metal', 3000, 0),
-(160, 'New Age', 3000, 0),
-(161, 'Oldies', 3000, 0),
-(162, 'Other', 3000, 0),
-(163, 'Pop', 3000, 0),
-(164, 'R&B', 3000, 0),
-(165, 'Rap', 3000, 0),
-(166, 'Reggae', 3000, 0),
-(167, 'Rock', 3000, 0),
-(168, 'Techno', 3000, 0),
-(169, 'Industrial', 3000, 0),
-(170, 'Alternative', 3000, 0),
-(171, 'Ska', 3000, 0),
-(172, 'Death Metal', 3000, 0),
-(173, 'Pranks', 3000, 0),
-(174, 'Soundtrack', 3000, 0),
-(175, 'Euro-Techno', 3000, 0),
-(176, 'Ambient', 3000, 0),
-(177, 'Trip-Hop', 3000, 0),
-(178, 'Vocal', 3000, 0),
-(179, 'Jazz+Funk', 3000, 0),
-(180, 'Fusion', 3000, 0),
-(181, 'Trance', 3000, 0),
-(182, 'Classical', 3000, 0),
-(183, 'Instrumental', 3000, 0),
-(184, 'Acid', 3000, 0),
-(185, 'House', 3000, 0),
-(186, 'Game', 3000, 0),
-(187, 'Sound Clip', 3000, 0),
-(188, 'Gospel', 3000, 0),
-(189, 'Noise', 3000, 0),
-(190, 'Alternative Rock', 3000, 0),
-(191, 'Bass', 3000, 0),
-(192, 'Soul', 3000, 0),
-(193, 'Punk', 3000, 0),
-(194, 'Space', 3000, 0),
-(195, 'Meditative', 3000, 0),
-(196, 'Instrumental Pop', 3000, 0),
-(197, 'Instrumental Rock', 3000, 0),
-(198, 'Ethnic', 3000, 0),
-(199, 'Gothic', 3000, 0),
-(200, 'Darkwave', 3000, 0),
-(201, 'Techno-Industrial', 3000, 0),
-(202, 'Electronic', 3000, 0),
-(203, 'Pop-Folk', 3000, 0),
-(204, 'Eurodance', 3000, 0),
-(205, 'Dream', 3000, 0),
-(206, 'Southern Rock', 3000, 0),
-(207, 'Comedy', 3000, 0),
-(208, 'Cult', 3000, 0),
-(209, 'Gangsta', 3000, 0),
-(210, 'Top 40', 3000, 0),
-(211, 'Christian Rap', 3000, 0),
-(212, 'Pop/Funk', 3000, 0),
-(213, 'Jungle', 3000, 0),
-(214, 'Native US', 3000, 0),
-(215, 'Cabaret', 3000, 0),
-(216, 'New Wave', 3000, 0),
-(217, 'Psychadelic', 3000, 0),
-(218, 'Rave', 3000, 0),
-(219, 'Showtunes', 3000, 0),
-(220, 'Trailer', 3000, 0),
-(221, 'Lo-Fi', 3000, 0),
-(222, 'Tribal', 3000, 0),
-(223, 'Acid Punk', 3000, 0),
-(224, 'Acid Jazz', 3000, 0),
-(225, 'Polka', 3000, 0),
-(226, 'Retro', 3000, 0),
-(227, 'Musical', 3000, 0),
-(228, 'Rock & Roll', 3000, 0),
-(229, 'Hard Rock', 3000, 0),
-(230, 'Folk', 3000, 0),
-(231, 'Folk-Rock', 3000, 0),
-(232, 'National Folk', 3000, 0),
-(233, 'Swing', 3000, 0),
-(234, 'Fast Fusion', 3000, 0),
-(235, 'Bebob', 3000, 0),
-(236, 'Latin', 3000, 0),
-(237, 'Revival', 3000, 0),
-(238, 'Celtic', 3000, 0),
-(239, 'Bluegrass', 3000, 0),
-(240, 'Avantgarde', 3000, 0),
-(241, 'Gothic Rock', 3000, 0),
-(242, 'Progressive Rock', 3000, 0),
-(243, 'Psychedelic Rock', 3000, 0),
-(244, 'Symphonic Rock', 3000, 0),
-(245, 'Slow Rock', 3000, 0),
-(246, 'Big Band', 3000, 0),
-(247, 'Chorus', 3000, 0),
-(248, 'Easy Listening', 3000, 0),
-(249, 'Acoustic', 3000, 0),
-(250, 'Humour', 3000, 0),
-(251, 'Speech', 3000, 0),
-(252, 'Chanson', 3000, 0),
-(253, 'Opera', 3000, 0),
-(254, 'Chamber Music', 3000, 0),
-(255, 'Sonata', 3000, 0),
-(256, 'Symphony', 3000, 0),
-(257, 'Booty Bass', 3000, 0),
-(258, 'Primus', 3000, 0),
-(259, 'Porn Groove', 3000, 0),
-(260, 'Satire', 3000, 0),
-(261, 'Slow Jam', 3000, 0),
-(262, 'Club', 3000, 0),
-(263, 'Tango', 3000, 0),
-(264, 'Samba', 3000, 0),
-(265, 'Folklore', 3000, 0),
-(266, 'Ballad', 3000, 0),
-(267, 'Power Ballad', 3000, 0),
-(268, 'Rhytmic Soul', 3000, 0),
-(269, 'Freestyle', 3000, 0),
-(270, 'Duet', 3000, 0),
-(271, 'Punk Rock', 3000, 0),
-(272, 'Drum Solo', 3000, 0),
-(273, 'Acapella', 3000, 0),
-(274, 'Euro-House', 3000, 0),
-(275, 'Dance Hall', 3000, 0),
-(276, 'Goa', 3000, 0),
-(277, 'Drum & Bass', 3000, 0),
-(278, 'Club-House', 3000, 0),
-(279, 'Hardcore', 3000, 0),
-(280, 'Terror', 3000, 0),
-(281, 'Indie', 3000, 0),
-(282, 'BritPop', 3000, 0),
-(283, 'Negerpunk', 3000, 0),
-(284, 'Polsk Punk', 3000, 0),
-(285, 'Beat', 3000, 0),
-(286, 'Christian Gangsta', 3000, 0),
-(287, 'Heavy Metal', 3000, 0),
-(288, 'Black Metal', 3000, 0),
-(289, 'Crossover', 3000, 0),
-(290, 'Contemporary C', 3000, 0),
-(291, 'Christian Rock', 3000, 0),
-(292, 'Merengue', 3000, 0),
-(293, 'Salsa', 3000, 0),
-(294, 'Thrash Metal', 3000, 0),
-(295, 'Anime', 3000, 0),
-(296, 'JPop', 3000, 0),
-(297, 'SynthPop', 3000, 0),
-(298, 'Electronica', 3000, 0),
-(299, 'World Music', 3000, 0),
-(300, 'Miscellaneous', 3000, 0),
-(301, 'Rap & Hip-Hop', 3000, 0),
-(302, 'Dance & Electronic', 3000, 0),
-(303, 'Adventure', 1000, 0),
-(304, 'Hard Rock & Metal', 3000, 0),
-(305, 'Broadway & Vocalists', 3000, 0),
-(306, 'Unknown', 1000, 0),
-(307, 'Christian & Gospel', 3000, 0),
-(308, '', 3000, 0),
-(309, 'Action', 1000, 0),
-(310, 'Unknown', 4000, 0),
-(311, 'Action', 4000, 0),
-(312, 'Strategy', 4000, 0),
-(313, 'Puzzle', 4000, 0),
-(314, 'Adventure', 4000, 0),
-(315, 'Sports', 4000, 0),
-(316, 'Simulation', 4000, 0),
-(317, 'Anal', 6000, 0),
-(318, 'Big Butt', 6000, 0),
-(319, 'Gonzo', 6000, 0),
-(320, 'Oiled', 6000, 0),
-(321, 'Widescreen', 6000, 0),
-(322, '18+ Teens', 6000, 0),
-(323, 'Big Cocks', 6000, 0),
-(324, 'Blu-Ray', 6000, 0),
-(325, 'Feature', 6000, 0),
-(326, 'Prison', 6000, 0),
-(327, 'All Sex', 6000, 0),
-(328, 'Couples', 6000, 0),
-(329, 'European', 6000, 0),
-(330, 'Foreign', 6000, 0),
-(331, 'Point Of View', 6000, 0),
-(332, 'Threesomes', 6000, 0),
-(333, 'College', 6000, 0),
-(334, 'Teachers', 6000, 0),
-(335, 'Older Men', 6000, 0),
-(336, 'Rimming', 6000, 0),
-(337, 'Glory Hole', 6000, 0),
-(338, 'Blowjobs', 6000, 0),
-(339, 'Big Budget', 6000, 0),
-(340, 'Gaping', 6000, 0),
-(341, 'Sex Toy Play', 6000, 0),
-(342, 'Cumshots', 6000, 0),
-(343, 'Gangbang', 6000, 0),
-(344, 'Fetish', 6000, 0),
-(345, 'Transsexual', 6000, 0),
-(346, 'Big Boobs', 6000, 0),
-(347, 'Mature', 6000, 0),
-(348, 'MILF', 6000, 0),
-(349, 'All Girl / Lesbian', 6000, 0),
-(350, 'Interracial', 6000, 0),
-(351, 'Orgy', 6000, 0),
-(352, '18+ Teen Transsexuals', 6000, 0),
-(353, 'Babysitter', 6000, 0),
-(354, 'Amateur', 6000, 0),
-(355, 'Public Sex', 6000, 0),
-(356, 'Web-To-DVD', 6000, 0),
-(357, 'Compilation', 6000, 0),
-(358, 'Porn For Couples', 6000, 0),
-(359, 'Romance', 6000, 0),
-(360, 'Young (18+) Ladies', 6000, 0),
-(361, 'Redheads', 6000, 0),
-(362, 'Affairs/Love Triangles', 6000, 0),
-(363, 'Women Directors', 6000, 0),
-(364, 'Made For Women', 6000, 0),
-(365, 'Pantyhose/Stocking', 6000, 0),
-(366, 'Black', 6000, 0),
-(367, 'Domination', 6000, 0),
-(368, 'Face Sitting', 6000, 0),
-(369, 'Female Domination', 6000, 0),
-(370, 'Interactive', 6000, 0),
-(371, 'Bi-Sexual', 6000, 0),
-(372, 'Tit Fucking', 6000, 0),
-(373, 'Anal Sex', 6000, 0),
-(374, 'Big Pussies', 6000, 0),
-(375, 'Cock & Ball Play', 6000, 0),
-(376, 'Facials', 6000, 0),
-(377, 'Finger Fucking', 6000, 0),
-(378, 'Girl-Girl/Lesbian', 6000, 0),
-(379, 'Nipple Play', 6000, 0),
-(380, 'xtreme', 6000, 0),
-(381, 'Canadian', 6000, 0),
-(382, 'Black Hair', 6000, 0),
-(383, 'Blondes', 6000, 0),
-(384, 'Brunettes', 6000, 0),
-(385, 'Cream Pie', 6000, 0),
-(386, 'Latex/Rubber', 6000, 0),
-(387, 'S&M', 6000, 0),
-(388, 'Watersports', 6000, 0),
-(389, 'BBW', 6000, 0),
-(390, 'Prebooks', 6000, 0),
-(391, 'Asian', 6000, 0),
-(392, 'Massage', 6000, 0),
-(393, 'Swallowing', 6000, 0),
-(394, 'Small Tits', 6000, 0),
-(395, 'Naturally Busty', 6000, 0),
-(396, 'Affairs &amp; Love Triangles', 6000, 0),
-(397, 'Wives', 6000, 0),
-(398, 'Swingers', 6000, 0),
-(399, 'Old &amp; Young Females (18+)', 6000, 0),
-(400, 'Maid', 6000, 0),
-(401, 'Pantyhose &amp; Stocking', 6000, 0),
-(402, 'Masturbation', 6000, 0),
-(403, 'Alt Girls', 6000, 0),
-(404, 'Tattoo', 6000, 0),
-(405, 'Exotic Workouts', 6000, 0),
-(406, 'Athletes', 6000, 0),
-(407, 'Deep Throat', 6000, 0),
-(408, 'Wrestling &amp; Fighting', 6000, 0),
-(409, 'Cheerleaders', 6000, 0),
-(410, 'Home Made Movies', 6000, 0),
-(411, 'Squirting', 6000, 0),
-(412, 'Cuckolds', 6000, 0),
-(413, 'Cougars', 6000, 0),
-(414, 'Cosplay', 6000, 0),
-(415, 'Bikini Babes', 6000, 0),
-(416, 'Brazilian', 6000, 0),
-(417, 'Grannies', 6000, 0),
-(418, 'Erotic Vignette', 6000, 0),
-(419, 'Water Play', 6000, 0),
-(420, 'Hairy', 6000, 0),
-(421, 'CFNM', 6000, 0),
-(422, 'Stripping', 6000, 0),
-(423, 'Double Penetration', 6000, 0),
-(424, 'Lingerie', 6000, 0),
-(425, 'Nurses &amp; Doctors', 6000, 0),
-(426, 'British', 6000, 0),
-(427, 'Fetish Wear', 6000, 0),
-(428, 'Strap-Ons', 6000, 0),
-(429, 'Indian', 6000, 0),
-(430, 'Spoofs &amp; Parodies', 6000, 0),
-(431, 'Pregnant', 6000, 0),
-(432, 'Classic', 6000, 0),
-(433, 'Jeans &amp; Denim', 6000, 0),
-(434, 'Boxed Sets', 6000, 0),
-(435, 'Mystery', 6000, 0),
-(436, 'Girl on Guy Strap-Ons', 6000, 0),
-(437, 'Celebrity', 6000, 0),
-(438, 'Handjobs', 6000, 0),
-(439, 'Shaved', 6000, 0),
-(440, 'Vampires', 6000, 0),
-(441, 'Panties &amp; Thongs', 6000, 0),
-(442, 'Instructional (X-Rated)', 6000, 0),
-(443, 'Fantasy', 6000, 0),
-(444, 'Historical / Period Piece', 6000, 0),
-(445, 'Western', 6000, 0),
-(446, 'Midgets', 6000, 0),
-(447, 'Oddities', 6000, 0),
-(448, 'Foot Fetish', 6000, 0),
-(449, 'Virgin', 6000, 0),
-(450, 'Horror', 6000, 0),
-(451, 'Streaming Video', 6000, 0),
-(452, 'Solo Girls', 6000, 0),
-(453, 'Solo Female', 6000, 0),
-(454, 'Kinky', 6000, 0),
-(455, 'By Women', 6000, 0),
-(456, 'All Girl', 6000, 0),
-(457, 'Exhibitionism', 6000, 0),
-(458, 'College Co-Eds', 6000, 0),
-(459, 'Pro-Am', 6000, 0),
-(460, 'Parties / Clubs', 6000, 0),
-(461, 'Sex', 6000, 0),
-(462, 'Europe', 6000, 0),
-(463, 'Germany', 6000, 0),
-(464, 'Tantra / Spirituality', 6000, 0),
-(465, 'Big Tits', 6000, 0),
-(466, 'United Kingdom', 6000, 0),
-(467, 'Female on Female', 6000, 0),
-(468, 'Strapons', 6000, 0),
-(469, 'Lesbian', 6000, 0),
-(470, 'Potpourri', 6000, 0),
-(471, 'Humor', 6000, 0),
-(472, 'Spoofs / Parodies', 6000, 0),
-(473, 'Gagging', 6000, 0),
-(474, 'Family', 6000, 0),
-(475, 'Vignettes', 6000, 0),
-(476, 'Body', 6000, 0),
-(477, 'Home Made', 6000, 0),
-(478, 'POV', 6000, 0),
-(479, 'M on F', 6000, 0),
-(480, 'Gaper', 6000, 0),
-(481, 'Latex & Rubber', 6000, 0),
-(482, 'Foreign Kink', 6000, 0),
-(483, 'Masks', 6000, 0),
-(484, 'Group Sex', 6000, 0),
-(485, 'Older Women', 6000, 0),
-(486, 'Young Women / Teens', 6000, 0),
-(487, 'Contemporary', 6000, 0),
-(488, 'Features', 6000, 0),
-(489, 'Biker Chicks', 6000, 0),
-(490, 'Hetero Couples', 6000, 0),
-(491, 'Caucasian Girls', 6000, 0),
-(492, 'Modern', 6000, 0),
-(493, '2011 AVN Award Nominees', 6000, 0),
-(494, 'All Black', 6000, 0),
-(495, 'Cumshots & Facials', 6000, 0),
-(496, 'Outdoors', 6000, 0),
-(497, 'Classics', 6000, 0),
-(498, 'BDSM', 6000, 0),
-(499, '90''s', 6000, 0),
-(500, 'Oral', 6000, 0),
-(501, 'Mixed Races', 6000, 0),
-(502, 'Ebony Girls', 6000, 0),
-(503, 'Black Women', 6000, 0),
-(504, 'Striptease', 6000, 0),
-(505, 'Dancers / Strippers', 6000, 0),
-(506, '2013 AVN Award Nominees', 6000, 0),
-(507, '2013 Sex Awards Nominees', 6000, 0),
-(508, 'Cunnilingus', 6000, 0),
-(509, 'Asian Girls', 6000, 0),
-(510, 'Erotica', 6000, 0),
-(511, 'Fantasies', 6000, 0),
-(512, 'Black Men', 6000, 0),
-(513, 'Latina', 6000, 0),
-(514, 'Latina Girls', 6000, 0),
-(515, 'Cuckold', 6000, 0),
-(516, 'Natural Look', 6000, 0),
-(517, 'Footjobs', 6000, 0),
-(518, 'Feet', 6000, 0),
-(519, 'Feet & Shoes', 6000, 0),
-(520, 'Legs & Nylons', 6000, 0),
-(521, 'Teen', 6000, 0),
-(522, 'Russia', 6000, 0),
-(523, 'Russian', 6000, 0),
-(524, 'Schoolgirls', 6000, 0),
-(525, 'Massage Parlor', 6000, 0),
-(526, 'Virgins', 6000, 0),
-(527, 'Beach', 6000, 0),
-(528, '2008 AVN Award Nominees', 6000, 0),
-(529, 'Czech', 6000, 0),
-(530, 'Orgies', 6000, 0),
-(531, 'Babysitters', 6000, 0),
-(532, '2009 AVN Award Nominees', 6000, 0),
-(533, 'Big Butts', 6000, 0),
-(534, 'Handjob Female on Male', 6000, 0),
-(535, 'Hidden Cam', 6000, 0),
-(536, '2014 AVN Award Nominees', 6000, 0),
-(537, 'XBIZ Awards', 6000, 0),
-(538, 'Spain', 6000, 0),
-(539, 'Spanish', 6000, 0),
-(540, 'Feminist Porn Awards', 6000, 0),
-(541, 'Sybian', 6000, 0),
-(542, 'Instructional', 6000, 0),
-(543, 'Female Ejaculation', 6000, 0),
-(544, 'Dutch', 6000, 0),
-(545, 'Maids', 6000, 0),
-(546, 'Tattooed / Pierced', 6000, 0),
-(547, 'Shower / Bathroom', 6000, 0),
-(548, 'Cum-Swapping', 6000, 0),
-(549, 'Girls Next Door', 6000, 0),
-(550, 'Petite', 6000, 0),
-(551, 'Gangbang - M on F', 6000, 0),
-(552, 'Office', 6000, 0),
-(553, 'Toys', 6000, 0),
-(554, '2010 AVN Award Nominees', 6000, 0),
-(555, 'International', 6000, 0),
-(556, 'Student', 6000, 0),
-(557, 'Deep Throating', 6000, 0),
-(558, 'Boat', 6000, 0),
-(559, 'Secretaries', 6000, 0),
-(560, 'Reality', 6000, 0),
-(561, 'Brazil', 6000, 0),
-(562, 'Male on Female', 6000, 0),
-(563, 'Nurses', 6000, 0),
-(564, 'Interactive Sex', 6000, 0),
-(565, 'Up & Coming', 6000, 0),
-(566, 'Cum Swapping', 6000, 0),
-(567, 'Multi-Angles', 6000, 0),
-(568, 'Leather', 6000, 0),
-(569, 'Pot Luck', 6000, 0),
-(570, 'Cream Pies', 6000, 0),
-(571, 'Behind The Scenes', 6000, 0),
-(572, 'Auditions', 6000, 0),
-(573, 'Pickup', 6000, 0),
-(574, 'Sex Machines', 6000, 0),
-(575, '2012 AVN Award Nominees', 6000, 0),
-(576, 'Voyeurism', 6000, 0),
-(577, 'Voyeur', 6000, 0),
-(578, 'Bukkake', 6000, 0),
-(579, 'Smoking', 6000, 0),
-(580, 'Gangbang - F on F', 6000, 0),
-(581, 'Italy', 6000, 0),
-(582, 'Italian', 6000, 0),
-(583, 'Portuguese', 6000, 0),
-(584, 'Locale', 6000, 0),
-(585, 'Secretaries/Office', 6000, 0),
-(586, 'Sex at Work', 6000, 0),
-(587, 'School Girls', 6000, 0),
-(588, 'Felching', 6000, 0),
-(589, 'Glasses', 6000, 0),
-(590, 'Euro', 6000, 0),
-(591, 'Pissing', 6000, 0),
-(592, 'Shocking Penetration', 6000, 0),
-(593, 'German Speaking', 6000, 0),
-(594, 'Anilingus', 6000, 0),
-(595, 'High Definition', 6000, 0),
-(596, 'M.I.L.F.', 6000, 0),
-(597, 'Cougar', 6000, 0),
-(598, 'Big Dick', 6000, 0),
-(599, 'Cumshot', 6000, 0),
-(600, 'Pantyhose/Stockings', 6000, 0),
-(601, 'Dancers/Models', 6000, 0),
-(602, 'Submales', 6000, 0),
-(603, 'Threeway', 6000, 0),
-(604, 'Fresh Faces', 6000, 0),
-(605, 'Natural Breasts', 6000, 0),
-(606, 'German', 6000, 0),
-(607, 'Blowjob', 6000, 0),
-(608, 'Gloryhole', 6000, 0),
-(609, 'Black Dicks/White Chicks', 6000, 0),
-(610, 'P.O.V.', 6000, 0),
-(611, 'Glamour', 6000, 0),
-(612, 'Brides &amp; Weddings', 6000, 0),
-(613, 'Exhibitionist', 6000, 0),
-(614, 'Party Girls', 6000, 0),
-(615, 'Reality Based', 6000, 0),
-(616, 'Shemale', 6000, 0),
-(617, 'Cheerleader', 6000, 0),
-(618, 'Award Winning Movies', 6000, 0),
-(619, 'New Release', 6000, 0),
-(620, 'Foot', 6000, 0),
-(621, 'Older / Younger', 6000, 0),
-(622, 'Vintage', 6000, 0),
-(623, 'Incest', 6000, 0),
-(624, 'Femdom', 6000, 0),
-(625, 'Strap-On', 6000, 0),
-(626, 'Double Anal', 6000, 0),
-(627, 'Costumes', 6000, 0),
-(628, 'For Ladies', 6000, 0),
-(629, 'Family Roleplay', 6000, 0),
-(630, 'Girls With Toys', 6000, 0),
-(631, 'Ass-to-mouth', 6000, 0),
-(632, 'Parody', 6000, 0),
-(633, 'Racing', 4000, 0),
-(634, 'Double Penetration (Dp)', 6000, 0);
-
-UPDATE `tmux` SET `value` = '66' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0067~gamesinfo.sql b/lib/DB/patches/0067~gamesinfo.sql
deleted file mode 100644
index b92ea7bfd..000000000
--- a/lib/DB/patches/0067~gamesinfo.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE gamesinfo ADD COLUMN backdrop TINYINT(1) DEFAULT 0 AFTER cover;
-ALTER TABLE gamesinfo ADD COLUMN trailer VARCHAR(1000) DEFAULT '' AFTER backdrop;
-ALTER TABLE gamesinfo ADD COLUMN classused VARCHAR(10) DEFAULT 'steam' AFTER trailer;
-UPDATE gamesinfo SET classused = 'gb';
-UPDATE `tmux` SET `value` = '67' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0068~xxxinfo.sql b/lib/DB/patches/0068~xxxinfo.sql
deleted file mode 100644
index 129bdf346..000000000
--- a/lib/DB/patches/0068~xxxinfo.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE xxxinfo MODIFY COLUMN classused varchar(4) DEFAULT 'ade';
-UPDATE xxxinfo SET classused = 'aebn' WHERE classused = 'aeb';
-UPDATE `tmux` SET `value` = '68' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0069~site.sql b/lib/DB/patches/0069~site.sql
deleted file mode 100644
index 7535bb2be..000000000
--- a/lib/DB/patches/0069~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `site` (`setting`, `value`) VALUES ('anidbkey', '');
-UPDATE `tmux` SET `value` = '69' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0070~animetitles.sql b/lib/DB/patches/0070~animetitles.sql
deleted file mode 100644
index f33f54c93..000000000
--- a/lib/DB/patches/0070~animetitles.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE animetitles CHANGE createddate unixtime INT(12) UNSIGNED NOT NULL;
-UPDATE `tmux` SET `value` = '70' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0071~site.sql b/lib/DB/patches/0071~site.sql
deleted file mode 100644
index f73998a23..000000000
--- a/lib/DB/patches/0071~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO site (setting, value) VALUES ('rottentomatoquality', 'profile');
-UPDATE `tmux` SET `value` = '71' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0072~site.sql b/lib/DB/patches/0072~site.sql
deleted file mode 100644
index 9044d821a..000000000
--- a/lib/DB/patches/0072~site.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-DROP TRIGGER IF EXISTS insert_hashes;
-DROP TRIGGER IF EXISTS update_hashes;
-DROP TRIGGER IF EXISTS delete_hashes;
-DROP TRIGGER IF EXISTS check_rfinsert;
-DROP TRIGGER IF EXISTS check_rfupdate;
-DROP TRIGGER IF EXISTS check_insert;
-DROP TRIGGER IF EXISTS check_update;
-DROP TRIGGER IF EXISTS insert_MD5;
-
-
-CREATE TRIGGER insert_hashes AFTER INSERT ON prehash FOR EACH ROW BEGIN INSERT INTO predbhash (pre_id, hashes) VALUES (NEW.id, CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)));END;
-CREATE TRIGGER update_hashes AFTER UPDATE ON prehash FOR EACH ROW BEGIN IF NEW.title != OLD.title THEN UPDATE predbhash SET hashes = CONCAT_WS(',', MD5(NEW.title), MD5(MD5(NEW.title)), SHA1(NEW.title)) WHERE pre_id = OLD.id; END IF;END;
-CREATE TRIGGER delete_hashes AFTER DELETE ON prehash FOR EACH ROW BEGIN DELETE FROM predbhash WHERE pre_id = OLD.id; END;
-CREATE TRIGGER check_rfinsert BEFORE INSERT ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}'THEN SET NEW.ishashed = 1; END IF;END;
-CREATE TRIGGER check_rfupdate BEFORE UPDATE ON releasefiles FOR EACH ROW BEGIN IF NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1; END IF; END;
-CREATE TRIGGER check_insert BEFORE INSERT ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;ELSEIF NEW.name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1; END IF; END;
-CREATE TRIGGER check_update BEFORE UPDATE ON releases FOR EACH ROW BEGIN IF NEW.searchname REGEXP '[a-fA-F0-9]{32}' OR NEW.name REGEXP '[a-fA-F0-9]{32}' THEN SET NEW.ishashed = 1;ELSEIF NEW.name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' THEN SET NEW.isrequestid = 1;END IF;END;
-CREATE TRIGGER insert_search AFTER INSERT ON releases FOR EACH ROW BEGIN INSERT INTO releasesearch (releaseid, guid, name, searchname) VALUES (NEW.id, NEW.guid, NEW.name, NEW.searchname);END;
-CREATE TRIGGER update_search AFTER UPDATE ON releases FOR EACH ROW BEGIN IF NEW.guid != OLD.guid THEN UPDATE releasesearch SET guid = NEW.guid WHERE releaseid = OLD.id; END IF;IF NEW.name != OLD.name THEN UPDATE releasesearch SET name = NEW.name WHERE releaseid = OLD.id; END IF; IF NEW.searchname != OLD.searchname THEN UPDATE releasesearch SET searchname = NEW.searchname WHERE releaseid = OLD.id; END IF;END;
-CREATE TRIGGER delete_search AFTER DELETE ON releases FOR EACH ROW BEGIN DELETE FROM releasesearch WHERE releaseid = OLD.id; END;
-CREATE TRIGGER insert_MD5 BEFORE INSERT ON releasecomment FOR EACH ROW SET NEW.text_hash = MD5(NEW.text);
-
-
-UPDATE `tmux` SET `value` = '72' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0073~releases.sql b/lib/DB/patches/0073~releases.sql
deleted file mode 100644
index b9ede6073..000000000
--- a/lib/DB/patches/0073~releases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE INDEX `ix_releases_xxxinfo_id` ON `releases` (`xxxinfo_id`);
-UPDATE `tmux` SET `value` = '73' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0074~releases.sql b/lib/DB/patches/0074~releases.sql
deleted file mode 100644
index 9133e61d6..000000000
--- a/lib/DB/patches/0074~releases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE  `releases` CHANGE  `nzbstatus`  `nzbstatus` TINYINT( 1 ) NOT NULL DEFAULT  '0';
-UPDATE `tmux` SET `value` = '74' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0075~site.sql b/lib/DB/patches/0075~site.sql
deleted file mode 100644
index 739c7dd73..000000000
--- a/lib/DB/patches/0075~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUE ('alternate_nntp', '0');
-UPDATE `tmux` SET `value` = '75' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0078~site.sql b/lib/DB/patches/0078~site.sql
deleted file mode 100644
index 2399a7c47..000000000
--- a/lib/DB/patches/0078~site.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-INSERT INTO `site` (`setting`, `value`) VALUES
-('amazonsleep', '1000'),
-('maxaddprocessed', '25'),
-('maxnfoprocessed', '100'),
-('maxrageprocessed', '75'),
-('maximdbprocessed', '100'),
-('maxanidbprocessed', '100'),
-('maxmusicprocessed', '150'),
-('maxgamesprocessed', '150'),
-('maxbooksprocessed', '300'),
-('maxnzbsprocessed', '1000'),
-('maxpartrepair', '15000'),
-('partrepair', '1'),
-('binarythreads', '1'),
-  ('backfillthreads', '1'),
-  ('safebackfilldate', '2012-06-24'),
-('postthreads', '1'),
-('releasethreads', '1'),
-('nzbthreads', '1'),
-('maxsizetopostprocess', '100'),
-('minsizetopostprocess', '1'),
-('postthreadsamazon', '1'),
-('postthreadsnon', '1'),
-('segmentstodownload', '2'),
-('passchkattempts', '1'),
-('maxpartsprocessed', '3'),
-('trakttvkey', ''),
-('fanarttvkey', ''),
-('lookuppar2', '1'),
-('addpar2', '1'),
-('fixnamethreads', '1'),
-('fixnamesperrun', '1'),
-('zippath', ''),
-('processjpg', '1'),
-('scrape', '1'),
-('nntpretries', '10'),
-('imdburl', '0'),
-('yydecoderpath', ''),
-('ffmpeg_duration', '5'),
-('ffmpeg_image_time', '5'),
-('processvideos', '0'),
-('maxsizetoprocessnfo', '100'),
-('minsizetoprocessnfo', '1'),
-('nfothreads', '1'),
-('extractusingrarinfo', '0'),
-('maxnestedlevels', '3'),
-('innerfileblacklist', ''),
-  ('miscotherretentionhours',	'0'),
-  ('mischashedretentionhours',	'0');
-
-UPDATE `tmux` SET `value` = '78' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0079~site.sql b/lib/DB/patches/0079~site.sql
deleted file mode 100644
index 83ae30623..000000000
--- a/lib/DB/patches/0079~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUE ('maxnforetries', '5');
-UPDATE `tmux` SET `value` = '79' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0080~site.sql b/lib/DB/patches/0080~site.sql
deleted file mode 100644
index 2cf8072ce..000000000
--- a/lib/DB/patches/0080~site.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
- ('timeoutpath', ''),
- ('timeoutseconds', '0');
-UPDATE `tmux` SET `value` = '80' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0081~movieinfo.sql b/lib/DB/patches/0081~movieinfo.sql
deleted file mode 100644
index f7d68a24d..000000000
--- a/lib/DB/patches/0081~movieinfo.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE  `movieinfo` ADD  `type` VARCHAR( 32 ) NOT NULL AFTER  `genre` ;
-UPDATE `tmux` SET `value` = '81' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0082~tvrageepisodes.sql b/lib/DB/patches/0082~tvrageepisodes.sql
deleted file mode 100644
index 105bac6bd..000000000
--- a/lib/DB/patches/0082~tvrageepisodes.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-DROP TABLE IF EXISTS tvrageepisodes;
-CREATE TABLE         tvrageepisodes (
-  id        INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  rageid    INT(11) UNSIGNED NOT NULL,
-  showtitle VARCHAR(255)     DEFAULT NULL,
-  airdate   DATETIME         NOT NULL,
-  link      VARCHAR(255)     DEFAULT NULL,
-  fullep    VARCHAR(20)      NOT NULL,
-  eptitle   VARCHAR(255)     DEFAULT NULL,
-  PRIMARY KEY                           (id),
-  UNIQUE INDEX ix_tvrageepisodes_rageid (rageid, fullep)
-)
-  ENGINE          = INNODB
-  DEFAULT CHARSET = utf8
-  COLLATE         = utf8_unicode_ci
-  AUTO_INCREMENT  = 1;
-UPDATE `tmux` SET `value` = '82' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0083~site.sql b/lib/DB/patches/0083~site.sql
deleted file mode 100644
index c93de7984..000000000
--- a/lib/DB/patches/0083~site.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
- ('lookup_reqids',	'1'),
- ('reqidthreads', '1'),
-('request_hours', '1'),
-('request_url',	'http://reqid.nzedb.com/index.php');
-UPDATE `tmux` SET `value` = '83' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0084~groups.sql b/lib/DB/patches/0084~groups.sql
deleted file mode 100644
index 2d14de519..000000000
--- a/lib/DB/patches/0084~groups.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE  `groups` ADD  `backfill` TINYINT(1) NOT NULL DEFAULT '0' AFTER  `active` ;
-
-UPDATE `tmux` set `value` = '84' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0085~site.sql b/lib/DB/patches/0085~site.sql
deleted file mode 100644
index 72968c22c..000000000
--- a/lib/DB/patches/0085~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUE  ('safebackfilldate', '2012-06-24');
-UPDATE `tmux` SET `value` = '85' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0086~category.sql b/lib/DB/patches/0086~category.sql
deleted file mode 100644
index cf4b5f42b..000000000
--- a/lib/DB/patches/0086~category.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO category (id, title, parentid) VALUES (2080, 'WEB-DL', 2000);
-UPDATE `tmux` SET `value` = '86' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0087~site.sql b/lib/DB/patches/0087~site.sql
deleted file mode 100644
index a146c1938..000000000
--- a/lib/DB/patches/0087~site.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
-  ('safepartrepair','0'),
-  ('maxpartrepair', '15000'),
-  ('partrepairmaxtries', '3'),
-  ('tablepergroup', '0');
-UPDATE `tmux` SET `value` = '87' WHERE `setting` = 'sqlpatch';
diff --git a/lib/DB/patches/0088~site.sql b/lib/DB/patches/0088~site.sql
deleted file mode 100644
index 1374b6131..000000000
--- a/lib/DB/patches/0088~site.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUE
-  ('nntpproxy','0');
-UPDATE `tmux` SET `value` = '88' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0089~site.sql b/lib/DB/patches/0089~site.sql
deleted file mode 100644
index d86ca3404..000000000
--- a/lib/DB/patches/0089~site.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUE ('book_reqids','7010');
-UPDATE `tmux` SET `value` = '89' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0090~bookinfo.sql b/lib/DB/patches/0090~bookinfo.sql
deleted file mode 100644
index eefd31066..000000000
--- a/lib/DB/patches/0090~bookinfo.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `bookinfo` ADD  `salesrank` INT(10) UNSIGNED DEFAULT NULL;
-UPDATE `tmux` SET `value` = '90' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0091~releasesearch.sql b/lib/DB/patches/0091~releasesearch.sql
deleted file mode 100644
index cd4b0ac74..000000000
--- a/lib/DB/patches/0091~releasesearch.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-ALTER TABLE releasesearch ADD COLUMN fromname VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL;
-UPDATE releasesearch rs INNER JOIN releases r ON rs.releaseid = r.id SET rs.fromname = r.fromname;
-
-ALTER TABLE releasesearch DROP INDEX ix_releasesearch_name_searchname_ft;
-ALTER TABLE releasesearch ADD FULLTEXT INDEX ix_releasesearch_name_ft (name);
-ALTER TABLE releasesearch ADD FULLTEXT INDEX ix_releasesearch_searchname_ft (searchname);
-ALTER TABLE releasesearch ADD FULLTEXT INDEX ix_releasesearch_fromname_ft (fromname);
-
-DROP TRIGGER IF EXISTS insert_search;
-DROP TRIGGER IF EXISTS update_search;
-
-CREATE TRIGGER insert_search AFTER INSERT ON releases FOR EACH ROW BEGIN INSERT INTO releasesearch (releaseid, guid, name, searchname, fromname) VALUES (NEW.id, NEW.guid, NEW.name, NEW.searchname, NEW.fromname); END;
-CREATE TRIGGER update_search AFTER UPDATE ON releases FOR EACH ROW BEGIN IF NEW.guid != OLD.guid THEN UPDATE releasesearch SET guid = NEW.guid WHERE releaseid = OLD.id; END IF; IF NEW.name != OLD.name THEN UPDATE releasesearch SET name = NEW.name WHERE releaseid = OLD.id; END IF; IF NEW.searchname != OLD.searchname THEN UPDATE releasesearch SET searchname = NEW.searchname WHERE releaseid = OLD.id; END IF; IF NEW.fromname != OLD.fromname THEN UPDATE releasesearch SET fromname = NEW.fromname WHERE releaseid = OLD.id; END IF; END;
-
-UPDATE `tmux` SET `value` = '91' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0092~bookinfo.sql b/lib/DB/patches/0092~bookinfo.sql
deleted file mode 100644
index 754386b96..000000000
--- a/lib/DB/patches/0092~bookinfo.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE `bookinfo` ADD  `overview` VARCHAR(3000) DEFAULT NULL;
-ALTER TABLE `bookinfo` ADD  `genre` VARCHAR(255) NOT NULL;
-UPDATE `tmux` SET `value` = '92' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0093~anidb.sql b/lib/DB/patches/0093~anidb.sql
deleted file mode 100644
index 1b69be901..000000000
--- a/lib/DB/patches/0093~anidb.sql
+++ /dev/null
@@ -1,70 +0,0 @@
-DROP TABLE IF EXISTS anidb_episodes;
-CREATE TABLE anidb_episodes (
-  anidbid       INT(10) UNSIGNED        NOT NULL
-  COMMENT 'id of title from AniDB',
-  episodeid     INT(10) UNSIGNED        NOT NULL DEFAULT '0'
-  COMMENT 'anidb id for this episode',
-  episode_no    SMALLINT(5) UNSIGNED    NOT NULL
-  COMMENT 'Numeric version of episode (leave 0 for combined episodes).',
-  episode_title VARCHAR(255)
-                COLLATE utf8_unicode_ci NOT NULL
-  COMMENT 'Title of the episode (en, x-jat)',
-  airdate       DATE                    NOT NULL,
-  PRIMARY KEY (anidbid, episodeid)
-)
-  ENGINE = InnoDB
-  DEFAULT CHARSET =utf8
-  COLLATE =utf8_unicode_ci;
-
-
-DROP TABLE IF EXISTS anidb_info;
-CREATE TABLE anidb_info (
-  anidbid     INT(10) UNSIGNED NOT NULL
-  COMMENT 'id of title from AniDB',
-  type        VARCHAR(32)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  startdate   DATE                    DEFAULT NULL,
-  enddate     DATE                    DEFAULT NULL,
-  updated     TIMESTAMP               DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  related     VARCHAR(1024)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  similar     VARCHAR(1024)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  creators    VARCHAR(1024)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  description TEXT
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  rating      VARCHAR(5)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  picture     VARCHAR(255)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  categories  VARCHAR(1024)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  characters  VARCHAR(1024)
-              COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (anidbid),
-  KEY ix_anidb_info_datetime (startdate, enddate, updated)
-)
-  ENGINE = InnoDB
-  DEFAULT CHARSET =utf8
-  COLLATE =utf8_unicode_ci;
-
-
-DROP TABLE IF EXISTS anidb_titles;
-CREATE TABLE anidb_titles (
-  anidbid INT(10) UNSIGNED        NOT NULL
-  COMMENT 'id of title from AniDB',
-  type    VARCHAR(25)
-          COLLATE utf8_unicode_ci NOT NULL
-  COMMENT 'type of title.',
-  lang    VARCHAR(25)
-          COLLATE utf8_unicode_ci NOT NULL,
-  title   VARCHAR(255)
-          COLLATE utf8_unicode_ci NOT NULL,
-  PRIMARY KEY (anidbid, type, lang, title)
-)
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  COLLATE = utf8_unicode_ci;
-
-UPDATE `tmux` SET `value` = '93' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0094~site.sql b/lib/DB/patches/0094~site.sql
deleted file mode 100644
index 89e215cf8..000000000
--- a/lib/DB/patches/0094~site.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
-  ('intanidbupdate','7'),
-  ('lastanidbupdate','0'),
-  ('banned','0');
-UPDATE `tmux` SET `value` = '94' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0095~releases.sql b/lib/DB/patches/0095~releases.sql
deleted file mode 100644
index 816755638..000000000
--- a/lib/DB/patches/0095~releases.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-ALTER TABLE releases CHANGE COLUMN nzbstatus nzbstatus TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN iscategorized iscategorized TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN isrenamed isrenamed TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN ishashed ishashed TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN isrequestid isrequestid TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN jpgstatus jpgstatus TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN videostatus videostatus TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN audiostatus audiostatus TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN proc_pp proc_pp TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN proc_sorter proc_sorter TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN proc_par2 proc_par2 TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN proc_nfo proc_nfo TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE releases CHANGE COLUMN proc_files proc_files TINYINT(1) NOT NULL DEFAULT 0;
-
-UPDATE releases set isrequestid = 1 WHERE name REGEXP '^\\[ ?([[:digit:]]{4,6}) ?\\]|^REQ\s*([[:digit:]]{4,6})|^([[:digit:]]{4,6})-[[:digit:]]{1}\\[' AND isrequestid = 0;
-UPDATE `tmux` SET `value` = '95' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0096~site.sql b/lib/DB/patches/0096~site.sql
deleted file mode 100644
index f68adb36e..000000000
--- a/lib/DB/patches/0096~site.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
-  ('grabstatus', 1),
-  ('crossposttime',	2),
-  ('deletepossiblerelease', 0),
-  ('grabstatus', 0),
-  ('nzbsplitlevel', 1),
-  ('maxsizetoformrelease', 0);
-
-UPDATE `tmux` set `value` = '96' where `setting` = 'sqlpatch';
diff --git a/lib/DB/patches/0097~releases.sql b/lib/DB/patches/0097~releases.sql
deleted file mode 100644
index ffebbecac..000000000
--- a/lib/DB/patches/0097~releases.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE releases ADD COLUMN nzb_guid VARCHAR(50) NULL;
-ALTER TABLE releases ADD INDEX ix_releases_nzb_guid (nzb_guid);
-UPDATE `tmux` set `value` = '97' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0098~tmux.sql b/lib/DB/patches/0098~tmux.sql
deleted file mode 100644
index 4db4ea6ea..000000000
--- a/lib/DB/patches/0098~tmux.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO tmux (setting, value) VALUES
-  ('dehash', '0'),
-  ('dehash_timer', '30');
-UPDATE `tmux` set `value` = '98' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0099~releases.sql b/lib/DB/patches/0099~releases.sql
deleted file mode 100644
index 5531fdd92..000000000
--- a/lib/DB/patches/0099~releases.sql
+++ /dev/null
@@ -1,60 +0,0 @@
-DROP INDEX ix_releases_name_searchname_ft ON releases;
-DROP INDEX ix_releases_guid ON releases;
-DROP INDEX ix_releases_adddate ON releases;
-DROP INDEX ix_releases_categoryid ON releases;
-DROP INDEX ix_releases_rageid ON releases;
-DROP INDEX ix_releases_imdbid ON releases;
-DROP INDEX ix_releases_name ON releases;
-DROP INDEX ix_releases_searchname ON releases;
-DROP INDEX ix_releases_groupid ON releases;
-DROP INDEX ix_releases_dehashstatus ON releases;
-DROP INDEX ix_releases_prehashid ON releases;
-DROP INDEX ix_releases_passwordstatus ON releases;
-DROP INDEX ix_releases_reqidstatus ON releases;
-DROP INDEX ix_releases_nfostatus ON releases;
-DROP INDEX ix_releases_musicinfoid ON releases;
-DROP INDEX ix_releases_consoleinfoid ON releases;
-DROP INDEX ix_releases_bookinfoid ON releases;
-DROP INDEX ix_releases_haspreview ON releases;
-DROP INDEX ix_releases_status ON releases;
-DROP INDEX ix_releases_postdate_searchname ON releases;
-DROP INDEX ix_releases_postdate_name ON releases;
-DROP INDEX ix_releases_nzb_guid ON releases;
-DROP INDEX ix_releases_prehashid_searchname ON releases;
-DROP INDEX idx_releases_multi_name_fromname_size ON releases;
-
-ALTER TABLE releases MODIFY id INT(11) UNSIGNED NOT NULL;
-ALTER TABLE releases DROP PRIMARY KEY;
-ALTER TABLE releases ADD PRIMARY KEY (id, categoryid);
-ALTER TABLE releases MODIFY id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT;
-
-ALTER TABLE releases PARTITION BY RANGE (categoryid) (
-PARTITION unused VALUES LESS THAN (1000),
-PARTITION console VALUES LESS THAN (2000),
-PARTITION movies VALUES LESS THAN (3000),
-PARTITION audio VALUES LESS THAN (4000),
-PARTITION pc VALUES LESS THAN (5000),
-PARTITION tv VALUES LESS THAN (6000),
-PARTITION xxx VALUES LESS THAN (7000),
-PARTITION books VALUES LESS THAN (8000),
-PARTITION misc VALUES LESS THAN (9000) );
-
-ALTER TABLE releases ADD INDEX ix_releases_adddate (adddate);
-ALTER TABLE releases ADD INDEX ix_releases_rageid (rageid);
-ALTER TABLE releases ADD INDEX ix_releases_imdbid (imdbid);
-ALTER TABLE releases ADD INDEX ix_releases_guid (guid);
-ALTER TABLE releases ADD INDEX ix_releases_name (name);
-ALTER TABLE releases ADD INDEX ix_releases_groupid (groupid);
-ALTER TABLE releases ADD INDEX ix_releases_dehashstatus (dehashstatus);
-ALTER TABLE releases ADD INDEX ix_releases_reqidstatus (reqidstatus);
-ALTER TABLE releases ADD INDEX ix_releases_nfostatus (nfostatus);
-ALTER TABLE releases ADD INDEX ix_releases_musicinfoid (musicinfoid);
-ALTER TABLE releases ADD INDEX ix_releases_consoleinfoid (consoleinfoid);
-ALTER TABLE releases ADD INDEX ix_releases_bookinfoid (bookinfoid);
-ALTER TABLE releases ADD INDEX ix_releases_haspreview_passwordstatus (haspreview, passwordstatus);
-ALTER TABLE releases ADD INDEX ix_releases_status (nzbstatus, iscategorized, isrenamed, nfostatus, ishashed, isrequestid, passwordstatus, dehashstatus, reqidstatus, musicinfoid, consoleinfoid, bookinfoid, haspreview, categoryid, imdbid, rageid);
-ALTER TABLE releases ADD INDEX ix_releases_postdate_searchname (postdate, searchname);
-ALTER TABLE releases ADD INDEX ix_releases_nzb_guid (nzb_guid);
-ALTER TABLE releases ADD INDEX ix_releases_prehash_searchname (prehashid, searchname);
-
-UPDATE tmux set value = '99' where setting = 'sqlpatch';
diff --git a/lib/DB/patches/0100~binaries.sql b/lib/DB/patches/0100~binaries.sql
deleted file mode 100644
index 7e3ed464a..000000000
--- a/lib/DB/patches/0100~binaries.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP TRIGGER IF EXISTS delete_binaries;
-
-CREATE TRIGGER delete_binaries BEFORE DELETE ON binaries FOR EACH ROW BEGIN DELETE FROM parts WHERE binaryid = OLD.id; END;
-
-UPDATE tmux set value = '100' where setting = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0101~tmux.sql b/lib/DB/patches/0101~tmux.sql
deleted file mode 100644
index 18b5d9789..000000000
--- a/lib/DB/patches/0101~tmux.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO `tmux` (`setting`, `value`) VALUES
-  ('optimize', '0'),
-  ('optimize_timer', '86400');
-UPDATE tmux set value = '101' where setting = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0102~predb.sql b/lib/DB/patches/0102~predb.sql
deleted file mode 100644
index 9f009997b..000000000
--- a/lib/DB/patches/0102~predb.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `predb` drop `MD5`;
-UPDATE tmux set value = '102' where setting = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0103~site.sql b/lib/DB/patches/0103~site.sql
deleted file mode 100644
index 6347448b3..000000000
--- a/lib/DB/patches/0103~site.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
-  ('intanidbupdate', 7),
-  ('lastanidbupdate',	0),
-  ('timeoutpath',	''),
-  ('timeoutseconds', 0);
-
-UPDATE `tmux` set `value` = '103' where `setting` = 'sqlpatch';
diff --git a/lib/DB/patches/0104~releasecomment.sql b/lib/DB/patches/0104~releasecomment.sql
deleted file mode 100644
index 1b54065b9..000000000
--- a/lib/DB/patches/0104~releasecomment.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE releasecomment DROP INDEX ix_releasecomment_hash_releaseID;
-ALTER TABLE releasecomment DROP INDEX ix_releasecomment_hash_gid_sourceid;
-ALTER IGNORE TABLE releasecomment ADD UNIQUE INDEX ix_releasecomment_hash_gid (text_hash, gid);
-UPDATE `tmux` set `value` = '104' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0105~site.sql b/lib/DB/patches/0105~site.sql
deleted file mode 100644
index 50f984b50..000000000
--- a/lib/DB/patches/0105~site.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
-  ('magic_file_path', '');
-UPDATE `tmux` set `value` = '105' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0106~category.sql b/lib/DB/patches/0106~category.sql
deleted file mode 100644
index 593c4e8d0..000000000
--- a/lib/DB/patches/0106~category.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO category (id, title, parentid) VALUES (6080, 'SD', 6000);
-UPDATE `tmux` SET `value` = '106' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0107~prehash.sql b/lib/DB/patches/0107~prehash.sql
deleted file mode 100644
index 937a83ad0..000000000
--- a/lib/DB/patches/0107~prehash.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `prehash` SET `predate` = CONCAT('2014', substr(predate, 5)) WHERE `predate` LIKE '%2015-12%';
-UPDATE `prehash` SET `predate` = CONCAT('2015', substr(predate, 5)) WHERE `predate` LIKE '%2016-01%';
-UPDATE `tmux` SET `value` = '107' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0108~category.sql b/lib/DB/patches/0108~category.sql
deleted file mode 100644
index a366bc6b7..000000000
--- a/lib/DB/patches/0108~category.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO category (id, title, parentid) VALUES (6041, 'HD Clips', 6000);
-INSERT INTO category (id, title, parentid) VALUES (6042, 'SD Clips', 6000);
-UPDATE `tmux` SET `value` = '108' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0109~category.sql b/lib/DB/patches/0109~category.sql
deleted file mode 100644
index a02e80520..000000000
--- a/lib/DB/patches/0109~category.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO category (id, title, parentid) VALUES (6090, 'WEB-DL', 6000);
-UPDATE `tmux` SET `value` = '109' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0110~releases.sql b/lib/DB/patches/0110~releases.sql
deleted file mode 100644
index c9702fe2f..000000000
--- a/lib/DB/patches/0110~releases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE releases ADD INDEX ix_releases_preid_searchname (preid, searchname);
-UPDATE `tmux` SET `value` = '110' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0111~tmux.sql b/lib/DB/patches/0111~tmux.sql
deleted file mode 100644
index 0142588da..000000000
--- a/lib/DB/patches/0111~tmux.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT IGNORE INTO `tmux` (`setting`, `value`) VALUES ('import_count','50000');
-UPDATE `tmux` SET `value` = '111' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0112~tmux.sql b/lib/DB/patches/0112~tmux.sql
deleted file mode 100644
index a39a00c99..000000000
--- a/lib/DB/patches/0112~tmux.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `tmux` WHERE `setting` = 'max_load';
-DELETE FROM `tmux` WHERE `setting` = 'max_load_releases';
-UPDATE `tmux` set `value` = '112' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0113~general.sql b/lib/DB/patches/0113~general.sql
deleted file mode 100644
index c71de0668..000000000
--- a/lib/DB/patches/0113~general.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-DROP PROCEDURE IF EXISTS alter_tables;
-/* Create the stored procedure to alter tables -- change to myisam if version < 5.6 */
-CREATE PROCEDURE alter_tables() BEGIN SELECT version() regexp '^[0-5]\.[0-5]' into @version; IF @version = 1 THEN ALTER TABLE bookinfo engine=myisam; ALTER TABLE consoleinfo engine=myisam; ALTER TABLE musicinfo engine=myisam; END IF; END;
-/* Execute the stored procedures */
-CALL alter_tables();
-/* Don't forget to drop the stored procedure when you're done! */
-DROP PROCEDURE IF EXISTS alter_tables;
-
-ALTER TABLE musicinfo ADD FULLTEXT INDEX ix_musicinfo_artist_title_ft (artist, title);
-ALTER TABLE bookinfo ADD FULLTEXT INDEX ix_bookinfo_author_title_ft (author, title);
-ALTER TABLE consoleinfo ADD FULLTEXT INDEX ix_consoleinfo_title_platform_ft (title, platform);
-UPDATE `tmux` set `value` = '113' where `setting` = 'sqlpatch';
diff --git a/lib/DB/patches/0114~movieinfo.sql b/lib/DB/patches/0114~movieinfo.sql
deleted file mode 100644
index ddc1b16e0..000000000
--- a/lib/DB/patches/0114~movieinfo.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE movieinfo ADD COLUMN banner TINYINT(1) UNSIGNED NOT NULL DEFAULT '0';
-UPDATE `tmux` set `value` = '114' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0115~dnzb_downloads.sql b/lib/DB/patches/0115~dnzb_downloads.sql
deleted file mode 100644
index 8a553dd44..000000000
--- a/lib/DB/patches/0115~dnzb_downloads.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-DROP TABLE IF EXISTS dnzb_failures;
-CREATE TABLE dnzb_failures (
-  id          INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-  userid      INT(11) UNSIGNED NOT NULL,
-  guid        VARCHAR(50)      NOT NULL,
-  PRIMARY KEY (id)
-)
-  ENGINE =MYISAM
-  DEFAULT CHARSET =utf8
-  COLLATE =utf8_unicode_ci
-  AUTO_INCREMENT =1;
-  CREATE UNIQUE INDEX ux_dnzb_failures ON dnzb_failures (userid, guid);
-  UPDATE `tmux` set `value` = '115' where `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/DB/patches/0116~site.sql b/lib/DB/patches/0116~site.sql
deleted file mode 100644
index df4f824f3..000000000
--- a/lib/DB/patches/0116~site.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT IGNORE INTO `site` (`setting`, `value`) VALUES
-('request_url',	'http://reqid.newznab-tmux.pw/');
-UPDATE `tmux` SET `value` = '127' WHERE `setting` = 'sqlpatch';
\ No newline at end of file
diff --git a/lib/Enzebe.php b/lib/Enzebe.php
deleted file mode 100644
index 294464afc..000000000
--- a/lib/Enzebe.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/category.php");
-
-/**
- * Class for reading and writing NZB files on the hard disk,
- * building folder paths to store the NZB files.
- */
-class Enzebe
-{
-	/**
-	 * Determines if the site setting table per group is enabled.
-	 * @var bool
-	 * @access private
-	 */
-	private $tablePerGroup;
-
-	/**
-	 * Levels deep to store NZB files.
-	 * @var int
-	 */
-	private $nzbSplitLevel;
-
-	/**
-	 * Path to store NZB files.
-	 * @var string
-	 */
-	private $siteNzbPath;
-
-	/**
-	 * Group id when writing NZBs.
-	 * @var int
-	 * @access protected
-	 */
-	protected $groupID;
-
-	/**
-	 * Instance of class db.
-	 * @var \DB
-	 * @access public
-	 */
-	public $pdo;
-
-	/**
-	 * Current newznab version.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_newznabVersion;
-
-	/**
-	 * Base query for selecting binary data for writing NZB files.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_binariesQuery;
-
-	/**
-	 * Base query for selecting parts data for writing NZB files.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_partsQuery;
-
-	/**
-	 * String used for head in NZB XML file.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_nzbHeadString;
-
-	const NZB_NONE  = 0; // Release has no NZB file yet.
-	const NZB_ADDED = 1; // Release had an NZB file created.
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param \DB $pdo
-	 *
-	 * @access public
-	 */
-	public function __construct(&$pdo = null)
-	{
-		$this->pdo = ($pdo instanceof \DB ? $pdo : new \DB());
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->tablePerGroup = ($this->site->tablepergroup == 0 ? false : true);
-		$nzbSplitLevel = $this->site->nzbsplitlevel;
-		$this->nzbSplitLevel = (empty($nzbSplitLevel) ? 1 : $nzbSplitLevel);
-		$this->siteNzbPath = (string)$this->site->nzbpath;
-		if (substr($this->siteNzbPath, -1) !== DS) {
-			$this->siteNzbPath .= DS;
-		}
-	}
-
-	/**
-	 * Initiate class vars when writing NZB's.
-	 *
-	 * @param int $groupID
-	 *
-	 * @access public
-	 */
-	public function initiateForWrite($groupID)
-	{
-		$this->groupID = $groupID;
-		$site = new Sites();
-		// Set table names
-		if ($this->tablePerGroup === true) {
-			if ($this->groupID == '') {
-				exit("$this->groupID is missing\n");
-			}
-			$bName = 'binaries_' . $this->groupID;
-			$pName = 'parts_' . $this->groupID;
-		} else {
-			$bName = 'binaries';
-			$pName = 'parts';
-		}
-
-		$this->_binariesQuery = sprintf(
-			'SELECT %s.*, UNIX_TIMESTAMP(%s.date) AS udate, groups.name AS groupname
-			FROM %s
-			INNER JOIN groups ON %s.groupid = groups.id
-			WHERE %s.releaseid = ',
-			$bName,
-			$bName,
-			$bName,
-			$bName,
-			$bName
-		);
-		$this->_partsQuery = (
-			'SELECT DISTINCT(messageid), size, partnumber FROM ' . $pName . ' WHERE binaryid = %d ORDER BY partnumber'
-		);
-
-		$this->_nzbHeadString = (
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE nzb PUBLIC \"-//newzBin//DTD NZB 1.1//EN\" \"http://www.newzbin.com/DTD/nzb/nzb-1.1.dtd\">\n<!-- NZB Generated by: newznab " .
-			$site->version() . ' ' . htmlspecialchars(date('F j, Y, g:i a O'), ENT_QUOTES, 'utf-8') .
-			" -->\n<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\n<head>\n <meta type=\"category\">%s</meta>\n <meta type=\"name\">%s</meta>\n</head>\n\n"
-		);
-	}
-
-	/**
-	 * Write an NZB to the hard drive for a single release.
-	 *
-	 * @param int    $relID   The id of the release in the DB.
-	 * @param string $relGuid The guid of the release.
-	 * @param string $name    The name of the release.
-	 * @param string $cTitle  The name of the category this release is in.
-	 *
-	 * @return bool Have we successfully written the NZB to the hard drive?
-	 *
-	 * @access public
-	 */
-	public function writeNZBforReleaseId($relID, $relGuid, $name, $cTitle)
-	{
-		$path = ($this->buildNZBPath($relGuid, $this->nzbSplitLevel, true) . $relGuid . '.nzb.gz');
-		$fp = gzopen($path, 'wb7');
-		if ($fp) {
-			$nzb_guid = '';
-			gzwrite(
-				$fp,
-				sprintf(
-					$this->_nzbHeadString,
-					htmlspecialchars($cTitle, ENT_QUOTES, 'utf-8'),
-					htmlspecialchars($name, ENT_QUOTES, 'utf-8')
-				)
-			);
-
-			$binaries = $this->pdo->queryDirect($this->_binariesQuery. $relID . ' ORDER BY name');
-
-			if ($binaries instanceof \Traversable) {
-
-				foreach ($binaries as $binary) {
-					$poster = htmlspecialchars($binary['fromname'], ENT_QUOTES, 'utf-8');
-
-					if ($binary instanceof \Traversable) {
-
-						foreach ($binary as $bin) {
-
-							// Buffer segment writes, increases performance.
-							$string = '';
-
-							$parts = $this->pdo->queryDirect(sprintf($this->_partsQuery, $bin['id']));
-
-							if ($parts instanceof \Traversable) {
-
-								foreach ($parts as $part) {
-									if ($nzb_guid === '') {
-										$nzb_guid = $part['messageid'];
-									}
-
-									$string .= (
-										'  <segment bytes="' . $part['size']
-										. '" number="' . $part['partnumber'] . '">'
-										. htmlspecialchars($part['messageid'], ENT_QUOTES, 'utf-8')
-										. "</segment>\n"
-									);
-								}
-							}
-
-							gzwrite($fp,
-								'<file poster="' . $poster .
-								'" date="' . $bin['udate'] .
-								'" subject="' . htmlspecialchars($bin['name'], ENT_QUOTES, 'utf-8') .
-								' (1/' . $bin['totalparts'] . ")\">\n <groups>\n  <group>" . $bin['groupname'] .
-								"</group>\n </groups>\n <segments>\n" . $string . " </segments>\n</file>\n"
-							);
-						}
-					}
-				}
-			}
-
-			gzwrite($fp, '</nzb>');
-			gzclose($fp);
-
-			if (is_file($path)) {
-				$this->pdo->queryExec(
-					sprintf('
-						UPDATE releases SET nzbstatus = %d %s WHERE id = %d',
-						\Enzebe::NZB_ADDED,
-						($nzb_guid === '' ? '' : ', nzb_guid = ' . $this->pdo->escapestring(md5($nzb_guid))),
-						$relID
-					)
-				);
-
-				// Chmod to fix issues some users have with file permissions.
-				chmod($path, 0777);
-				return true;
-			} else {
-				echo "ERROR: $path does not exist.\n";
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Build a folder path on the hard drive where the NZB file will be stored.
-	 *
-	 * @param string $releaseGuid         The guid of the release.
-	 * @param int    $levelsToSplit       How many sub-paths the folder will be in.
-	 * @param bool   $createIfNotExist Create the folder if it doesn't exist.
-	 *
-	 * @return string $nzbpath The path to store the NZB file.
-	 *
-	 * @access public
-	 */
-	private function buildNZBPath($releaseGuid, $levelsToSplit, $createIfNotExist)
-	{
-		$nzbPath = '';
-
-		for ($i = 0; $i < $levelsToSplit && $i < 32; $i++) {
-			$nzbPath .= substr($releaseGuid, $i, 1) . DS;
-		}
-
-		$nzbPath = $this->siteNzbPath . $nzbPath;
-
-		if ($createIfNotExist === true && !is_dir($nzbPath)) {
-			mkdir($nzbPath, 0777, true);
-		}
-
-		return $nzbPath;
-	}
-
-	/**
-	 * Retrieve path + filename of the NZB to be stored.
-	 *
-	 * @param string $releaseGuid         The guid of the release.
-	 * @param int    $levelsToSplit       How many sub-paths the folder will be in. (optional)
-	 * @param bool   $createIfNotExist Create the folder if it doesn't exist. (optional)
-	 *
-	 * @return string Path+filename.
-	 *
-	 * @access public
-	 */
-	public function getNZBPath($releaseGuid, $levelsToSplit = 0, $createIfNotExist = false)
-	{
-		if ($levelsToSplit === 0) {
-			$levelsToSplit = $this->nzbSplitLevel;
-		}
-
-		return ($this->buildNZBPath($releaseGuid, $levelsToSplit, $createIfNotExist) . $releaseGuid . '.nzb.gz');
-	}
-
-	/**
-	 * Determine is an NZB exists, returning the path+filename, if not return false.
-	 *
-	 * @param  string $releaseGuid              The guid of the release.
-	 *
-	 * @return bool|string On success: (string) Path+file name of the nzb.
-	 *                     On failure: (bool)   False.
-	 *
-	 * @access public
-	 */
-	public function NZBPath($releaseGuid)
-	{
-		$nzbFile = $this->getNZBPath($releaseGuid);
-		return (is_file($nzbFile) ? $nzbFile : false);
-	}
-
-	/**
-	 * Retrieve various information on a NZB file (the subject, # of pars,
-	 * file extensions, file sizes, file completion, group names, # of parts).
-	 *
-	 * @param string $nzb The NZB contents in a string.
-	 *
-	 * @return array $result Empty if not an NZB or the contents of the NZB.
-	 *
-	 * @access public
-	 */
-	public function nzbFileList($nzb)
-	{
-		$num_pars = $i = 0;
-		$result = array();
-
-		if (!$nzb) {
-			return $result;
-		}
-
-		$xml = @simplexml_load_string(str_replace("\x0F", '', $nzb));
-		if (!$xml || strtolower($xml->getName()) !== 'nzb') {
-			return $result;
-		}
-
-		foreach ($xml->file as $file) {
-			// Subject.
-			$title = (string)$file->attributes()->subject;
-
-			// Amount of pars.
-			if (stripos($title, '.par2')) {
-				$num_pars++;
-			}
-
-			$result[$i]['title'] = $title;
-
-			// Extensions.
-			if (preg_match(
-				'/\.(\d{2,3}|7z|ace|ai7|srr|srt|sub|aiff|asc|avi|audio|bin|bz2|'
-				. 'c|cfc|cfm|chm|class|conf|cpp|cs|css|csv|cue|deb|divx|doc|dot|'
-				. 'eml|enc|exe|file|gif|gz|hlp|htm|html|image|iso|jar|java|jpeg|'
-				. 'jpg|js|lua|m|m3u|mkv|mm|mov|mp3|mp4|mpg|nfo|nzb|odc|odf|odg|odi|odp|'
-				. 'ods|odt|ogg|par2|parity|pdf|pgp|php|pl|png|ppt|ps|py|r\d{2,3}|'
-				. 'ram|rar|rb|rm|rpm|rtf|sfv|sig|sql|srs|swf|sxc|sxd|sxi|sxw|tar|'
-				. 'tex|tgz|txt|vcf|video|vsd|wav|wma|wmv|xls|xml|xpi|xvid|zip7|zip)'
-				. '[" ](?!(\)|\-))/i',
-				$title, $ext
-			)
-			) {
-
-				if (preg_match('/\.r\d{2,3}/i', $ext[0])) {
-					$ext[1] = 'rar';
-				}
-				$result[$i]['ext'] = strtolower($ext[1]);
-			} else {
-				$result[$i]['ext'] = '';
-			}
-
-			$fileSize = $numSegments = 0;
-
-			// Parts.
-			if (!isset($result[$i]['segments'])) {
-				$result[$i]['segments'] = array();
-			}
-
-			// File size.
-			foreach ($file->segments->segment as $segment) {
-				array_push($result[$i]['segments'], (string) $segment);
-				$fileSize += $segment->attributes()->bytes;
-				$numSegments++;
-			}
-			$result[$i]['size'] = $fileSize;
-
-			// File completion.
-			if (preg_match('/(\d+)\)$/', $title, $parts)) {
-				$result[$i]['partstotal'] = $parts[1];
-			}
-			$result[$i]['partsactual'] = $numSegments;
-
-			// Groups.
-			if (!isset($result[$i]['groups'])) {
-				$result[$i]['groups'] = array();
-			}
-			foreach ($file->groups->group as $g) {
-				array_push($result[$i]['groups'], (string) $g);
-			}
-
-			unset($result[$i]['segments']['@attributes']);
-			$i++;
-		}
-		return $result;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/Film.php b/lib/Film.php
deleted file mode 100644
index ee8778545..000000000
--- a/lib/Film.php
+++ /dev/null
@@ -1,1477 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../bin/config.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/TMDb.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-require_once(WWW_DIR."/lib/rottentomato.php");
-require_once(WWW_DIR."/lib/Logger.php");
-require_once(WWW_DIR."/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("TraktTv.php");
-
-/**
- * Class Film
- */
-class Film
-{
-
-	const SRC_BOXOFFICE = 1;
-	const SRC_INTHEATRE = 2;
-	const SRC_OPENING = 3;
-	const SRC_UPCOMING = 4;
-	const SRC_DVD = 5;
-
-	public $pdo;
-
-	/**
-	 * Current title being passed through various sites/api's.
-	 * @var string
-	 */
-	protected $currentTitle = '';
-
-	/**
-	 * Current year of parsed search name.
-	 * @var string
-	 */
-	protected $currentYear  = '';
-
-	/**
-	 * Current release id of parsed search name.
-	 *
-	 * @var string
-	 */
-	protected $currentRelID = '';
-
-	/**
-	 * @var Logger
-	 */
-	protected $debugging;
-
-	/**
-	 * @var bool
-	 */
-	protected $debug;
-
-	/**
-	 * Use search engines to find IMDB id's.
-	 * @var bool
-	 */
-	protected $searchEngines;
-
-	/**
-	 * How many times have we hit google this session.
-	 * @var int
-	 */
-	protected $googleLimit = 0;
-
-	/**
-	 * If we are temp banned from google, set time we were banned here, try again after 10 minutes.
-	 * @var int
-	 */
-	protected $googleBan = 0;
-
-	/**
-	 * How many times have we hit bing this session.
-	 *
-	 * @var int
-	 */
-	protected $bingLimit = 0;
-
-	/**
-	 * How many times have we hit yahoo this session.
-	 *
-	 * @var int
-	 */
-	protected $yahooLimit = 0;
-
-	/**
-	 * @var int
-	 */
-	protected $showPasswords;
-
-	/**
-	 * @var ReleaseImage
-	 */
-	protected $releaseImage;
-
-	/**
-	 * @var TMDb
-	 */
-	protected $tmdb;
-
-	/**
-	 * Language to fetch from IMDB.
-	 * @var string
-	 */
-	protected $lookuplanguage;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $fanartapikey;
-
-	/**
-	 * @var bool
-	 */
-	public $imdburl;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $movieqty;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var string
-	 */
-	public $service;
-
-	/**
-	 * @param array $options Class instances / Echo to CLI.
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'         => false,
-			'Logger'    => null,
-			'ReleaseImage' => null,
-			'Settings'     => null,
-			'TMDb'         => null,
-		];
-		$options += $defaults;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->releaseImage = ($options['ReleaseImage'] instanceof \ReleaseImage ? $options['ReleaseImage'] : new \ReleaseImage($this->pdo));
-
-		$this->lookuplanguage = ($this->site->lookuplanguage != '') ? (string)$this->site->lookuplanguage : 'en';
-
-		$this->tmdb = ($options['TMDb'] instanceof \TMDb ? $options['TMDb'] : new \TMDb($this->site->tmdbkey, $this->lookuplanguage));
-
-		$this->fanartapikey = $this->site->fanarttvkey;
-		$this->imdburl = ($this->site->imdburl == 0 ? false : true);
-		$this->movieqty = ($this->site->maximdbprocessed != '') ? $this->site->maximdbprocessed : 100;
-		$this->searchEngines = true;
-		$this->showPasswords = ($this->site->showpasswordedrelease != '') ? $this->site->showpasswordedrelease : 0;
-
-		$this->debug = NN_DEBUG;
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI && $this->pdo->cli);
-		$this->imgSavePath = NN_COVERS . 'movies' . DS;
-		$this->service = '';
-		$this->utility = new Utility();
-
-		if (NN_DEBUG || NN_LOGGING) {
-			$this->debug = true;
-			try {
-				$this->debugging = new \Logger();
-			} catch (\LoggerException $error) {
-				$this->_debug = false;
-			}
-		}
-	}
-
-	/**
-	 * Get info for a IMDB id.
-	 *
-	 * @param int $imdbId
-	 *
-	 * @return array|bool
-	 */
-	public function getMovieInfo($imdbId)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM movieinfo WHERE imdbid = %d", $imdbId));
-	}
-
-	/**
-	 * Get info for multiple IMDB id's.
-	 *
-	 * @param array $imdbIDs
-	 *
-	 * @return array
-	 */
-	public function getMovieInfoMultiImdb($imdbIDs)
-	{
-		return $this->pdo->query(
-			sprintf("
-				SELECT DISTINCT movieinfo.*, releases.imdbid AS relimdb
-				FROM movieinfo
-				LEFT OUTER JOIN releases ON releases.imdbid = movieinfo.imdbid
-				WHERE movieinfo.imdbid IN (%s)",
-				str_replace(
-					',,',
-					',',
-					str_replace(
-						array('(,', ' ,', ', )', ',)'),
-						'',
-						implode(',', $imdbIDs)
-					)
-				)
-			)
-		);
-	}
-
-	/**
-	 * Get movies for movie-list admin page.
-	 *
-	 * @param int $start
-	 * @param int $num
-	 *
-	 * @return array
-	 */
-	public function getRange($start, $num)
-	{
-		return $this->pdo->query(
-			sprintf('
-				SELECT *
-				FROM movieinfo
-				ORDER BY createddate DESC %s',
-				($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
-			)
-		);
-	}
-
-	/**
-	 * Get count of movies for movie-list admin page.
-	 *
-	 * @return int
-	 */
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow('SELECT COUNT(id) AS num FROM movieinfo');
-		return ($res === false ? 0 : $res['num']);
-	}
-
-	/**
-	 * Get count of movies for movies browse page.
-	 *
-	 * @param       $cat
-	 * @param       $maxAge
-	 * @param array $excludedCats
-	 *
-	 * @return int
-	 */
-	public function getMovieCount($cat, $maxAge = -1, $excludedCats = [])
-	{
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$res = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT COUNT(DISTINCT r.imdbid) AS num
-				FROM releases r
-				INNER JOIN movieinfo m ON m.imdbid = r.imdbid
-				WHERE r.nzbstatus = 1
-				AND r.imdbid != '0000000'
-				AND m.cover = 1
-				AND m.title != ''
-				AND r.passwordstatus <= %d
-				AND %s %s %s %s ",
-				$this->showPasswords,
-				$this->getBrowseBy(),
-				$catsrch,
-				($maxAge > 0 ? 'AND r.postdate > NOW() - INTERVAL ' . $maxAge . ' DAY' : ''),
-				(count($excludedCats) > 0 ? ' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')' : '')
-			)
-		);
-
-		return ($res === false ? 0 : $res['num']);
-	}
-
-	/**
-	 * Get movie releases with covers for movie browse page.
-	 *
-	 * @param       $cat
-	 * @param       $start
-	 * @param       $num
-	 * @param       $orderBy
-	 * @param       $maxAge
-	 * @param array $excludedCats
-	 *
-	 * @return bool|PDOStatement
-	 */
-	public function getMovieRange($cat, $start, $num, $orderBy, $maxAge = -1, $excludedCats = [])
-	{
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$order = $this->getMovieOrder($orderBy);
-		$sql = sprintf("
-			SELECT
-			GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id,
-			GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount,
-			GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview,
-			GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password,
-			GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid,
-			GROUP_CONCAT(rn.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid,
-			GROUP_CONCAT(groups.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname,
-			GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name,
-			GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate,
-			GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size,
-			GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts,
-			GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments,
-			GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs,
-			m.*, groups.name AS group_name, rn.id as nfoid FROM releases r
-			LEFT OUTER JOIN groups ON groups.id = r.groupid
-			LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id
-			INNER JOIN movieinfo m ON m.imdbid = r.imdbid
-			WHERE r.nzbstatus = 1 AND r.imdbid != '0000000'
-			AND m.title != ''
-			AND r.passwordstatus <= %d AND %s %s %s %s
-			GROUP BY m.imdbid ORDER BY %s %s %s",
-			$this->showPasswords,
-			$this->getBrowseBy(),
-			$catsrch,
-			($maxAge > 0
-				? 'AND r.postdate > NOW() - INTERVAL ' . $maxAge . 'DAY '
-				: ''
-			),
-			(count($excludedCats) > 0 ? ' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')' : ''),
-			$order[0],
-			$order[1],
-			($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
-		);
-		return $this->pdo->queryDirect($sql);
-	}
-
-	/**
-	 * Get the order type the user requested on the movies page.
-	 *
-	 * @param $orderBy
-	 *
-	 * @return array
-	 */
-	protected function getMovieOrder($orderBy)
-	{
-		$orderArr = explode('_', (($orderBy == '') ? 'MAX(r.postdate)' : $orderBy));
-		switch ($orderArr[0]) {
-			case 'title':
-				$orderField = 'm.title';
-				break;
-			case 'year':
-				$orderField = 'm.year';
-				break;
-			case 'rating':
-				$orderField = 'm.rating';
-				break;
-			case 'posted':
-			default:
-				$orderField = 'MAX(r.postdate)';
-				break;
-		}
-
-		return array($orderField, ((isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc'));
-	}
-
-	/**
-	 * Order types for movies page.
-	 *
-	 * @return array
-	 */
-	public function getMovieOrdering()
-	{
-		return array('title_asc', 'title_desc', 'year_asc', 'year_desc', 'rating_asc', 'rating_desc');
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getBrowseBy()
-	{
-		$browseBy = ' ';
-		$browseByArr = array('title', 'director', 'actors', 'genre', 'rating', 'year', 'imdb');
-		foreach ($browseByArr as $bb) {
-			if (isset($_REQUEST[$bb]) && !empty($_REQUEST[$bb])) {
-				$bbv = stripslashes($_REQUEST[$bb]);
-				if ($bb === 'rating') {
-					$bbv .= '.';
-				}
-				if ($bb === 'imdb') {
-					$browseBy .= 'm.' . $bb . 'id = ' . $bbv . ' AND ';
-				} else {
-					$browseBy .= 'm.' . $bb . ' ' . $this->pdo->likeString($bbv, true, true) . ' AND ';
-				}
-			}
-		}
-		return $browseBy;
-	}
-
-	/**
-	 * Create click-able links to IMDB actors/genres/directors/etc..
-	 *
-	 * @param $data
-	 * @param $field
-	 *
-	 * @return string
-	 */
-	public function makeFieldLinks($data, $field)
-	{
-		if (!isset($data[$field]) || $data[$field] == '') {
-			return '';
-		}
-
-		$tmpArr = explode(', ', $data[$field]);
-		$newArr = [];
-		$i = 0;
-		foreach ($tmpArr as $ta) {
-			if ($i > 5) {
-				break;
-			} //only use first 6
-			$newArr[] = '<a href="' . WWW_TOP . '/movies?' . $field . '=' . urlencode($ta) . '" title="' . $ta . '">' . $ta . '</a>';
-			$i++;
-		}
-		return implode(', ', $newArr);
-	}
-
-	/**
-	 * Update movie on movie-edit page.
-	 *
-	 * @param $id
-	 * @param $title
-	 * @param $tagLine
-	 * @param $plot
-	 * @param $year
-	 * @param $rating
-	 * @param $genre
-	 * @param $director
-	 * @param $actors
-	 * @param $language
-	 * @param $cover
-	 * @param $backdrop
-	 */
-	public function update(
-		$id = '', $title = '', $tagLine = '', $plot = '', $year = '', $rating = '', $genre = '', $director = '',
-		$actors = '', $language = '', $cover = '', $backdrop = ''
-	)
-	{
-		if (!empty($id)) {
-
-			$this->pdo->queryExec(
-				sprintf("
-					UPDATE movieinfo
-					SET %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, %d, updateddate = NOW()
-					WHERE imdbid = %d",
-					(empty($title)    ? '' : 'title = '    . $this->pdo->escapeString($title)),
-					(empty($tagLine)  ? '' : 'tagline = '  . $this->pdo->escapeString($tagLine)),
-					(empty($plot)     ? '' : 'plot = '     . $this->pdo->escapeString($plot)),
-					(empty($year)     ? '' : 'year = '     . $this->pdo->escapeString($year)),
-					(empty($rating)   ? '' : 'rating = '   . $this->pdo->escapeString($rating)),
-					(empty($genre)    ? '' : 'genre = '    . $this->pdo->escapeString($genre)),
-					(empty($director) ? '' : 'director = ' . $this->pdo->escapeString($director)),
-					(empty($actors)   ? '' : 'actors = '   . $this->pdo->escapeString($actors)),
-					(empty($language) ? '' : 'language = ' . $this->pdo->escapeString($language)),
-					(empty($cover)    ? '' : 'cover = '    . $cover),
-					(empty($backdrop) ? '' : 'backdrop = ' . $backdrop),
-					$id
-				)
-			);
-		}
-	}
-
-	/**
-	 * Check if a variable is set and not a empty string.
-	 *
-	 * @param $variable
-	 *
-	 * @return string
-	 */
-	protected function checkVariable(&$variable)
-	{
-		if (isset($variable) && $variable != '') {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns a tmdb or imdb variable, the one that is set. Empty string if both not set.
-	 *
-	 * @param string $variable1
-	 * @param string $variable2
-	 *
-	 * @return string
-	 */
-	protected function  setTmdbImdbVar(&$variable1, &$variable2)
-	{
-		if ($this->checkVariable($variable1)) {
-			return $variable1;
-		} elseif ($this->checkVariable($variable2)) {
-			return $variable2;
-		}
-		return '';
-	}
-
-	/**
-	 * Fetch IMDB/TMDB info for the movie.
-	 *
-	 * @param $imdbId
-	 *
-	 * @return bool
-	 */
-	public function updateMovieInfo($imdbId)
-	{
-		if ($this->echooutput && $this->service !== '') {
-			$this->pdo->log->doEcho($this->pdo->log->primary("Fetching IMDB info from TMDB using IMDB id: " . $imdbId));
-		}
-
-		// Check TMDB for IMDB info.
-		$tmdb = $this->fetchTMDBProperties($imdbId);
-
-		// Check IMDB for movie info.
-		$imdb = $this->fetchIMDBProperties($imdbId);
-		if (!$imdb && !$tmdb) {
-			return false;
-		}
-
-		// Check FanArt.tv for background images.
-		$fanart = $this->fetchFanartTVProperties($imdbId);
-
-		$mov = [];
-
-		$mov['cover'] = $mov['backdrop'] = $mov['banner'] = $movieID = 0;
-		$mov['type'] = $mov['director'] = $mov['actors'] = $mov['language'] = '';
-
-		$mov['imdbid'] = $imdbId;
-		$mov['tmdbid'] = (!isset($tmdb['tmdbid']) || $tmdb['tmdbid'] == '') ? 'NULL' : $tmdb['tmdbid'];
-
-		// Prefer FanArt.tv cover over TMDB. And TMDB over IMDB.
-		if ($this->checkVariable($fanart['cover'])) {
-			$mov['cover'] = $this->releaseImage->saveImage($imdbId . '-cover', $fanart['cover'], $this->imgSavePath);
-		} else if ($this->checkVariable($tmdb['cover'])) {
-			$mov['cover'] = $this->releaseImage->saveImage($imdbId . '-cover', $tmdb['cover'], $this->imgSavePath);
-		} else if ($this->checkVariable($imdb['cover'])) {
-			$mov['cover'] = $this->releaseImage->saveImage($imdbId . '-cover', $imdb['cover'], $this->imgSavePath);
-		}
-
-		// Backdrops.
-		if ($this->checkVariable($fanart['backdrop'])) {
-			$mov['backdrop'] = $this->releaseImage->saveImage($imdbId . '-backdrop', $fanart['backdrop'], $this->imgSavePath, 1920, 1024);
-		} else if ($this->checkVariable($tmdb['backdrop'])) {
-			$mov['backdrop'] = $this->releaseImage->saveImage($imdbId . '-backdrop', $tmdb['backdrop'], $this->imgSavePath, 1920, 1024);
-		}
-
-		// Banner
-		if ($this->checkVariable($fanart['banner'])) {
-			$mov['banner'] = $this->releaseImage->saveImage($imdbId . '-banner', $fanart['banner'], $this->imgSavePath);
-		}
-
-		$mov['title']   = $this->setTmdbImdbVar($imdb['title']  , $tmdb['title']);
-		$mov['rating']  = $this->setTmdbImdbVar($imdb['rating'] , $tmdb['rating']);
-		$mov['plot']    = $this->setTmdbImdbVar($imdb['plot']   , $tmdb['plot']);
-		$mov['tagline'] = $this->setTmdbImdbVar($imdb['tagline'], $tmdb['tagline']);
-		$mov['year']    = $this->setTmdbImdbVar($imdb['year']   , $tmdb['year']);
-		$mov['genre']   = $this->setTmdbImdbVar($imdb['genre']  , $tmdb['genre']);
-
-		if ($this->checkVariable($imdb['type'])) {
-			$mov['type'] = $imdb['type'];
-		}
-
-		if ($this->checkVariable($imdb['director'])) {
-			$mov['director'] = (is_array($imdb['director'])) ? implode(', ', array_unique($imdb['director'])) : $imdb['director'];
-		}
-
-		if ($this->checkVariable($imdb['actors'])) {
-			$mov['actors'] = (is_array($imdb['actors'])) ? implode(', ', array_unique($imdb['actors'])) : $imdb['actors'];
-		}
-
-		if ($this->checkVariable($imdb['language'])) {
-			$mov['language'] = (is_array($imdb['language'])) ? implode(', ', array_unique($imdb['language'])) : $imdb['language'];
-		}
-
-		if (is_array($mov['genre'])) {
-			$mov['genre'] = implode(', ', array_unique($mov['genre']));
-		}
-
-		if (is_array($mov['type'])) {
-			$mov['type'] = implode(', ', array_unique($mov['type']));
-		}
-
-		$mov['title']    = html_entity_decode($mov['title']   , ENT_QUOTES, 'UTF-8');
-		$mov['plot']     = html_entity_decode(preg_replace('/\s+See full summary »/', ' ', $mov['plot']), ENT_QUOTES, 'UTF-8');
-		$mov['tagline']  = html_entity_decode($mov['tagline'] , ENT_QUOTES, 'UTF-8');
-		$mov['genre']    = html_entity_decode($mov['genre']   , ENT_QUOTES, 'UTF-8');
-		$mov['director'] = html_entity_decode($mov['director'], ENT_QUOTES, 'UTF-8');
-		$mov['actors']   = html_entity_decode($mov['actors']  , ENT_QUOTES, 'UTF-8');
-		$mov['language'] = html_entity_decode($mov['language'], ENT_QUOTES, 'UTF-8');
-
-		$mov['type']    = html_entity_decode(ucwords(preg_replace('/[\.\_]/', ' ', $mov['type'])), ENT_QUOTES, 'UTF-8');
-
-		$mov['title'] = str_replace(array('/', '\\'), '', $mov['title']);
-		$movieID = $this->pdo->queryInsert(
-			sprintf("
-				INSERT INTO movieinfo
-					(imdbid, tmdbID, title, rating, tagline, plot, year, genre, type,
-					director, actors, language, cover, backdrop, banner, createddate, updateddate)
-				VALUES
-					(%d, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, %d, %d, NOW(), NOW())
-				ON DUPLICATE KEY UPDATE
-					imdbid = %d, tmdbID = %s, title = %s, rating = %s, tagline = %s, plot = %s, year = %s, genre = %s,
-					type = %s, director = %s, actors = %s, language = %s, cover = %d, backdrop = %d, banner = %d, updateddate = NOW()",
-				$mov['imdbid'],
-				$mov['tmdbid'],
-				$this->pdo->escapeString($mov['title']),
-				$this->pdo->escapeString($mov['rating']),
-				$this->pdo->escapeString($mov['tagline']),
-				$this->pdo->escapeString($mov['plot']),
-				$this->pdo->escapeString($mov['year']),
-				$this->pdo->escapeString(substr($mov['genre'], 0, 64)),
-				$this->pdo->escapeString($mov['type']),
-				$this->pdo->escapeString($mov['director']),
-				$this->pdo->escapeString($mov['actors']),
-				$this->pdo->escapeString(substr($mov['language'], 0, 64)),
-				$mov['cover'],
-				$mov['backdrop'],
-				$mov['banner'],
-				$mov['imdbid'],
-				$mov['tmdbid'],
-				$this->pdo->escapeString($mov['title']),
-				$this->pdo->escapeString($mov['rating']),
-				$this->pdo->escapeString($mov['tagline']),
-				$this->pdo->escapeString($mov['plot']),
-				$this->pdo->escapeString($mov['year']),
-				$this->pdo->escapeString(substr($mov['genre'], 0, 64)),
-				$this->pdo->escapeString($mov['type']),
-				$this->pdo->escapeString($mov['director']),
-				$this->pdo->escapeString($mov['actors']),
-				$this->pdo->escapeString(substr($mov['language'], 0, 64)),
-				$mov['cover'],
-				$mov['backdrop'],
-				$mov['banner']
-			)
-		);
-
-		if ($this->echooutput && $this->service !== '') {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->headerOver(($movieID !== 0 ? 'Added/updated movie: ' : 'Nothing to update for movie: ')) .
-				$this->pdo->log->primary($mov['title'] .
-					' (' .
-					$mov['year'] .
-					') - ' .
-					$mov['imdbid']
-				)
-			);
-		}
-
-		return ($movieID === 0 ? false : true);
-	}
-
-	/**
-	 * Fetch FanArt.tv backdrop / cover / title.
-	 *
-	 * @param $imdbId
-	 *
-	 * @return bool|array
-	 */
-	protected function fetchFanartTVProperties($imdbId)
-	{
-		if ($this->fanartapikey != '')
-		{
-			$buffer = Utility::getUrl(['url' => 'https://webservice.fanart.tv/v3/movies/' . 'tt' . $imdbId . '?api_key=' . $this->fanartapikey , 'verifycert' => false]);
-			if ($buffer !== false) {
-				$art = json_decode($buffer, true);
-				if (isset($art['status']) && $art['status'] === 'error') {
-					return false;
-				}
-				$ret = [];
-				if (isset($art['moviebackground'][0]['url'])) {
-					$ret['backdrop'] = $art['moviebackground'][0]['url'];
-				} else if (isset($art['moviethumb'][0]['url'])) {
-					$ret['backdrop'] = $art['moviethumb'][0]['url'];
-				}
-				if (isset($art['movieposter'][0]['url'])) {
-					$ret['cover'] = $art['movieposter'][0]['url'];
-				}
-				if (isset($art['moviebanner'][0]['url'])) {
-					$ret['banner'] = $art['moviebanner'][0]['url'];
-				}
-
-				if (isset($ret['backdrop']) && isset($ret['cover'])) {
-					$ret['title'] = $imdbId;
-					if (isset($art['name'])) {
-						$ret['title'] = $art['name'];
-					}
-					if ($this->echooutput) {
-						$this->pdo->log->doEcho($this->pdo->log->alternateOver("Fanart Found ") . $this->pdo->log->headerOver($ret['title']));
-					}
-					return $ret;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Fetch info for IMDB id from TMDB.
-	 *
-	 * @param      $imdbId
-	 * @param bool $text
-	 *
-	 * @return array|bool
-	 */
-	public function fetchTMDBProperties($imdbId, $text = false)
-	{
-		$lookupId = ($text === false ? 'tt' . $imdbId : $imdbId);
-
-		try {
-			$tmdbLookup = $this->tmdb->getMovie($lookupId);
-		} catch (exception $e) {
-			return false;
-		}
-
-		if (!$tmdbLookup || (isset($tmdbLookup['status_code']) && $tmdbLookup['status_code'] !== 1)) {
-			return false;
-		}
-
-		$ret = [];
-		$ret['title'] = $tmdbLookup['title'];
-
-		if ($this->currentTitle !== '') {
-			// Check the similarity.
-			similar_text($this->currentTitle, $ret['title'], $percent);
-			if ($percent < 40) {
-				if ($this->debug) {
-					$this->debugging->log(
-						'Film',
-						'fetchTmdbProperties',
-						'Found (' .
-						$ret['title'] .
-						') from TMDB, but it\'s only ' .
-						$percent .
-						'% similar to (' .
-						$this->currentTitle . ')',
-						\Logger::LOG_INFO
-					);
-				}
-				return false;
-			}
-		}
-
-		$ret['tmdbid'] = $tmdbLookup['id'];
-		$ImdbID = str_replace('tt', '', $tmdbLookup['imdb_id']);
-		$ret['imdb_id'] = $ImdbID;
-		if (isset($tmdbLookup['vote_average'])) {
-			$ret['rating'] = ($tmdbLookup['vote_average'] == 0) ? '' : $tmdbLookup['vote_average'];
-		}
-		if (isset($tmdbLookup['overview'])) {
-			$ret['plot'] = $tmdbLookup['overview'];
-		}
-		if (isset($tmdbLookup['tagline'])) {
-			$ret['tagline'] = $tmdbLookup['tagline'];
-		}
-		if (isset($tmdbLookup['release_date'])) {
-			$ret['year'] = date("Y", strtotime($tmdbLookup['release_date']));
-		}
-		if (isset($tmdbLookup['genres']) && sizeof($tmdbLookup['genres']) > 0) {
-			$genres = [];
-			foreach ($tmdbLookup['genres'] as $genre) {
-				$genres[] = $genre['name'];
-			}
-			$ret['genre'] = $genres;
-		}
-		if (isset($tmdbLookup['poster_path']) && sizeof($tmdbLookup['poster_path']) > 0) {
-			$ret['cover'] = "http://image.tmdb.org/t/p/w185" . $tmdbLookup['poster_path'];
-		}
-		if (isset($tmdbLookup['backdrop_path']) && sizeof($tmdbLookup['backdrop_path']) > 0) {
-			$ret['backdrop'] = "http://image.tmdb.org/t/p/original" . $tmdbLookup['backdrop_path'];
-		}
-		if ($this->echooutput) {
-			$this->pdo->log->doEcho($this->pdo->log->primaryOver("TMDb Found ") . $this->pdo->log->headerOver($ret['title']), true);
-		}
-		return $ret;
-	}
-
-	/**
-	 * @param $imdbId
-	 *
-	 * @return array|bool
-	 */
-	protected function fetchIMDBProperties($imdbId)
-	{
-		$imdb_regex = array(
-			'title' => '/<title>(.*?)\s?\(.*?<\/title>/i',
-			'tagline' => '/taglines:<\/h4>\s([^<]+)/i',
-			'plot' => '/<p itemprop="description">\s*?(.*?)\s*?<\/p>/i',
-			'rating' => '/"ratingValue">([\d.]+)<\/span>/i',
-			'year' => '/<title>.*?\(.*?(\d{4}).*?<\/title>/i',
-			'cover' => '/<link rel=\'image_src\' href="(http:\/\/ia\.media-imdb\.com.+\.jpg)">/'
-		);
-
-		$imdb_regex_multi = array(
-			'genre' => '/href="\/genre\/(.*?)\?/i',
-			'language' => '/<a href="\/language\/.+?\'url\'>(.+?)<\/a>/s',
-			'type' => '/<meta property=\'og\:type\' content=\"(.+)\" \/>/i'
-		);
-
-		$buffer =
-			Utility::getUrl([
-					'url' => 'http://' . ($this->imdburl === false ? 'www' : 'akas') . '.imdb.com/title/tt' . $imdbId . '/',
-					'language' => (($this->site->lookuplanguage != '') ? $this->site->lookuplanguage : 'en'),
-					'useragent' => 'Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) ' .
-						'Version/4.0.4 Mobile/7B334b Safari/531.21.102011-10-16 20:23:10', 'foo=bar'
-				]
-			);
-
-		if ($buffer !== false) {
-			$ret = [];
-			foreach ($imdb_regex as $field => $regex) {
-				if (preg_match($regex, $buffer, $matches)) {
-					$match = $matches[1];
-					$match1 = strip_tags(trim(rtrim($match)));
-					$ret[$field] = $match1;
-				}
-			}
-
-			$matches = [];
-			foreach ($imdb_regex_multi as $field => $regex) {
-				if (preg_match_all($regex, $buffer, $matches)) {
-					$match2 = $matches[1];
-					$match3 = array_map("trim", $match2);
-					$ret[$field] = $match3;
-				}
-			}
-
-			if ($this->currentTitle !== '' && isset($ret['title'])) {
-				// Check the similarity.
-				similar_text($this->currentTitle, $ret['title'], $percent);
-				if ($percent < 40) {
-					if ($this->debug) {
-						$this->debugging->log(
-							'Film',
-							'fetchImdbProperties',
-							'Found (' .
-							$ret['title'] .
-							') from IMDB, but it\'s only ' .
-							$percent .
-							'% similar to (' .
-							$this->currentTitle . ')',
-							\Logger::LOG_INFO
-						);
-					}
-					return false;
-				}
-			}
-
-			// Actors.
-			if (preg_match('/<table class="cast_list">(.+?)<\/table>/s', $buffer, $hit)) {
-				if (preg_match_all('/<span class="itemprop" itemprop="name">\s*(.+?)\s*<\/span>/i', $hit[0], $results, PREG_PATTERN_ORDER)) {
-					$ret['actors'] = $results[1];
-				}
-			}
-
-			// Directors.
-			if (preg_match('/itemprop="directors?".+?<\/div>/s', $buffer, $hit)) {
-				if (preg_match_all('/"name">(.*?)<\/span>/is', $hit[0], $results, PREG_PATTERN_ORDER)) {
-					$ret['director'] = $results[1];
-				}
-			}
-			if ($this->echooutput && isset($ret['title'])) {
-				$this->pdo->log->doEcho($this->pdo->log->headerOver("IMDb Found ") . $this->pdo->log->primaryOver($ret['title']), true);
-			}
-			return $ret;
-		}
-		return false;
-	}
-
-	/**
-	 * Update a release with a IMDB id.
-	 *
-	 * @param string $buffer       Data to parse a IMDB id from.
-	 * @param string $service      Method that called this method.
-	 * @param int    $id           id of the release.
-	 * @param int    $processImdb  To get IMDB info on this IMDB id or not.
-	 *
-	 * @return string
-	 */
-	public function doMovieUpdate($buffer, $service, $id, $processImdb = 1)
-	{
-		$imdbID = false;
-		if (preg_match('/(?:imdb.*?)?(?:tt|Title\?)(?P<imdbid>\d{5,7})/i', $buffer, $matches)) {
-			$imdbID = $matches['imdbid'];
-		}
-
-		if ($imdbID !== false) {
-			$this->service = $service;
-			if ($this->echooutput && $this->service !== '') {
-				$this->pdo->log->doEcho($this->pdo->log->headerOver($service . ' found IMDBid: ') . $this->pdo->log->primary('tt' . $imdbID));
-			}
-
-			$this->pdo->queryExec(sprintf('UPDATE releases SET imdbid = %s WHERE id = %d', $this->pdo->escapeString($imdbID), $id));
-
-			// If set, scan for imdb info.
-			if ($processImdb == 1) {
-				$movCheck = $this->getMovieInfo($imdbID);
-				if ($movCheck === false || (isset($movCheck['updateddate']) && (time() - strtotime($movCheck['updateddate'])) > 2592000)) {
-					if ($this->updateMovieInfo($imdbID) === false) {
-						$this->pdo->queryExec(sprintf('UPDATE releases SET imdbid = %s WHERE id = %d', 0000000, $id));
-					}
-				}
-			}
-		}
-		return $imdbID;
-	}
-
-	/**
-	 * Process releases with no IMDB id's.
-	 *
-	 * @param string $groupID    (Optional) id of a group to work on.
-	 * @param string $guidChar   (Optional) First letter of a release GUID to use to get work.
-	 * @param int    $lookupIMDB (Optional) 0 Don't lookup IMDB, 1 lookup IMDB, 2 lookup IMDB on releases that were renamed.
-	 */
-	public function processMovieReleases($groupID = '', $guidChar = '', $lookupIMDB = 1)
-	{
-		if ($lookupIMDB == 0) {
-			return;
-		}
-		$trakTv = new \TraktTv(['Settings' => $this->pdo]);
-
-		// Get all releases without an IMDB id.
-		$res = $this->pdo->query(
-			sprintf("
-				SELECT r.searchname, r.id
-				FROM releases r
-				WHERE r.imdbid IS NULL
-				AND r.nzbstatus = 1
-				AND r.categoryid BETWEEN 2000 AND 2999
-				%s %s %s
-				LIMIT %d",
-				($groupID === '' ? '' : ('AND r.groupid = ' . $groupID)),
-				($guidChar === '' ? '' : ('AND r.guid ' . $this->pdo->likeString($guidChar, false, true))),
-				($lookupIMDB == 2 ? 'AND r.isrenamed = 1' : ''),
-				$this->movieqty
-			)
-		);
-		$movieCount = count($res);
-
-		if ($movieCount > 0) {
-			if ($this->echooutput && $movieCount > 1) {
-				$this->pdo->log->doEcho($this->pdo->log->header("Processing " . $movieCount . " movie releases."));
-			}
-
-			// Loop over releases.
-			foreach ($res as $arr) {
-				// Try to get a name/year.
-				if ($this->parseMovieSearchName($arr['searchname']) === false) {
-					//We didn't find a name, so set to all 0's so we don't parse again.
-					$this->pdo->queryExec(sprintf("UPDATE releases SET imdbid = 0000000 WHERE id = %d", $arr["id"]));
-					continue;
-
-				} else {
-					$this->currentRelID = $arr['id'];
-
-					$movieName = $this->currentTitle;
-					if ($this->currentYear !== false) {
-						$movieName .= ' (' . $this->currentYear . ')';
-					}
-
-					if ($this->echooutput) {
-						$this->pdo->log->doEcho($this->pdo->log->primaryOver("Looking up: ") . $this->pdo->log->headerOver($movieName), true);
-					}
-
-					// Check local DB.
-					$getIMDBid = $this->localIMDBsearch();
-
-					if ($getIMDBid !== false) {
-						$imdbID = $this->doMovieUpdate('tt' . $getIMDBid, 'Local DB', $arr['id']);
-						if ($imdbID !== false) {
-							continue;
-						}
-					}
-
-					// Check OMDB api.
-					$buffer =
-						Utility::getUrl([
-								'url' => 'http://www.omdbapi.com/?t=' .
-									urlencode($this->currentTitle) .
-									($this->currentYear !== false ? ('&y=' . $this->currentYear) : '') .
-									'&r=json'
-							]
-						);
-
-					if ($buffer !== false) {
-						$getIMDBid = json_decode($buffer);
-
-						if (isset($getIMDBid->imdbid)) {
-							$imdbID = $this->doMovieUpdate($getIMDBid->imdbid, 'OMDbAPI', $arr['id']);
-							if ($imdbID !== false) {
-								continue;
-							}
-						}
-					}
-
-					// Check on trakt.
-					$getIMDBid = $trakTv->traktMoviesummary($movieName);
-					if ($getIMDBid !== false) {
-						$imdbID = $this->doMovieUpdate($getIMDBid, 'Trakt', $arr['id']);
-						if ($imdbID !== false) {
-							continue;
-						}
-					}
-
-					// Try on search engines.
-					if ($this->searchEngines && $this->currentYear !== false) {
-						if ($this->imdbIDFromEngines() === true) {
-							continue;
-						}
-					}
-
-					// We failed to get an IMDB id from all sources.
-					$this->pdo->queryExec(sprintf("UPDATE releases SET imdbid = 0000000 WHERE id = %d", $arr["id"]));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Try to fetch an IMDB id locally.
-	 *
-	 * @return int|bool   Int, the imdbid when true, Bool when false.
-	 */
-	protected function localIMDBsearch()
-	{
-		$query = 'SELECT imdbid FROM movieinfo';
-		$andYearIn = '';
-
-		//If we found a year, try looking in a 4 year range.
-		if ($this->currentYear !== false) {
-			$start = (int) $this->currentYear - 2;
-			$end   = (int) $this->currentYear + 2;
-			$andYearIn = 'AND year IN (';
-			while ($start < $end) {
-				$andYearIn .= $start . ',';
-				$start++;
-			}
-			$andYearIn .= $end . ')';
-		}
-		$IMDBCheck = $this->pdo->queryOneRow(
-			sprintf('%s WHERE title %s %s', $query, $this->pdo->likeString($this->currentTitle), $andYearIn));
-
-		// Look by %word%word%word% etc..
-		if ($IMDBCheck === false) {
-			$pieces = explode(' ', $this->currentTitle);
-			$tempTitle = '%';
-			foreach ($pieces as $piece) {
-				$tempTitle .= str_replace(array("'", "!", '"'), '', $piece) . '%';
-			}
-			$IMDBCheck = $this->pdo->queryOneRow(
-				sprintf("%s WHERE replace(replace(title, \"'\", ''), '!', '') %s %s",
-					$query, $this->pdo->likeString($tempTitle), $andYearIn
-				)
-			);
-		}
-
-		// Try replacing er with re ?
-		if ($IMDBCheck === false) {
-			$tempTitle = str_replace('er', 're', $this->currentTitle);
-			if ($tempTitle !== $this->currentTitle) {
-				$IMDBCheck = $this->pdo->queryOneRow(
-					sprintf('%s WHERE title %s %s',
-						$query, $this->pdo->likeString($tempTitle), $andYearIn
-					)
-				);
-
-				// Final check if everything else failed.
-				if ($IMDBCheck === false) {
-					$pieces = explode(' ', $tempTitle);
-					$tempTitle = '%';
-					foreach ($pieces as $piece) {
-						$tempTitle .= str_replace(array("'", "!", '"'), "", $piece) . '%';
-					}
-					$IMDBCheck = $this->pdo->queryOneRow(
-						sprintf("%s WHERE replace(replace(replace(title, \"'\", ''), '!', ''), '\"', '') %s %s",
-							$query, $this->pdo->likeString($tempTitle), $andYearIn
-						)
-					);
-				}
-			}
-		}
-
-		return (
-		($IMDBCheck === false
-			? false
-			: (is_numeric($IMDBCheck['imdbid'])
-				? (int)$IMDBCheck['imdbid']
-				: false
-			)
-		)
-		);
-	}
-
-	/**
-	 * Try to get an IMDB id from search engines.
-	 *
-	 * @return bool
-	 */
-	protected function imdbIDFromEngines()
-	{
-		if ($this->googleLimit < 41 && (time() - $this->googleBan) > 600) {
-			if ($this->googleSearch() === true) {
-				return true;
-			}
-		}
-
-		if ($this->yahooLimit < 41) {
-			if ($this->yahooSearch() === true) {
-				return true;
-			}
-		}
-
-		// Not using this right now because bing's advanced search is not good enough.
-		/*if ($this->bingLimit < 41) {
-			if ($this->bingSearch() === true) {
-				return true;
-			}
-		}*/
-
-		return false;
-	}
-
-	/**
-	 * Try to find a IMDB id on google.com
-	 *
-	 * @return bool
-	 */
-	protected function googleSearch()
-	{
-		$buffer =Utility::getUrl([
-				'url' =>
-					'https://www.google.com/search?hl=en&as_q=&as_epq=' .
-					urlencode(
-						$this->currentTitle .
-						' ' .
-						$this->currentYear
-					) .
-					'&as_oq=&as_eq=&as_nlo=&as_nhi=&lr=&cr=&as_qdr=all&as_sitesearch=' .
-					urlencode('www.imdb.com/title/') .
-					'&as_occt=title&safe=images&tbs=&as_filetype=&as_rights='
-			]
-		);
-
-		// Make sure we got some data.
-		if ($buffer !== false) {
-			$this->googleLimit++;
-
-			if (preg_match('/(To continue, please type the characters below)|(- did not match any documents\.)/i', $buffer, $matches)) {
-				if (!empty($matches[1])) {
-					$this->googleBan = time();
-				}
-			} else if ($this->doMovieUpdate($buffer, 'Google.com', $this->currentRelID) !== false) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Try to find a IMDB id on bing.com
-	 *
-	 * @return bool
-	 */
-	protected function bingSearch()
-	{
-		$buffer = Utility::getUrl([
-				'url' =>
-					"http://www.bing.com/search?q=" .
-					urlencode(
-						'("' .
-						$this->currentTitle .
-						'" and "' .
-						$this->currentYear .
-						'") site:www.imdb.com/title/'
-					) .
-					'&qs=n&form=QBLH&filt=all'
-			]
-		);
-
-		if ($buffer !== false) {
-			$this->bingLimit++;
-
-			if ($this->doMovieUpdate($buffer, 'Bing.com', $this->currentRelID) !== false) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Try to find a IMDB id on yahoo.com
-	 *
-	 * @return bool
-	 */
-	protected function yahooSearch()
-	{
-		$buffer = Utility::getUrl([
-				'url' =>
-					"http://search.yahoo.com/search?n=10&ei=UTF-8&va_vt=title&vo_vt=any&ve_vt=any&vp_vt=any&vf=all&vm=p&fl=0&fr=fp-top&p=intitle:" .
-					urlencode(
-						'intitle:' .
-						implode(' intitle:',
-							explode(
-								' ',
-								preg_replace(
-									'/\s+/',
-									' ',
-									preg_replace(
-										'/\W/',
-										' ',
-										$this->currentTitle
-									)
-								)
-							)
-						) .
-						' intitle:' .
-						$this->currentYear
-					) .
-					'&vs=' .
-					urlencode('www.imdb.com/title/')
-			]
-		);
-
-		if ($buffer !== false) {
-			$this->yahooLimit++;
-
-			if ($this->doMovieUpdate($buffer, 'Yahoo.com', $this->currentRelID) !== false) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Parse a movie name from a release search name.
-	 *
-	 * @param string $releaseName
-	 *
-	 * @return bool
-	 */
-	protected function parseMovieSearchName($releaseName)
-	{
-		$name = $year = '';
-		$followingList = '[^\w]((1080|480|720)p|AC3D|Directors([^\w]CUT)?|DD5\.1|(DVD|BD|BR)(Rip)?|BluRay|divx|HDTV|iNTERNAL|LiMiTED|(Real\.)?Proper|RE(pack|Rip)|Sub\.?(fix|pack)|Unrated|WEB-DL|(x|H)[-._ ]?264|xvid)[^\w]';
-
-		/* Initial scan of getting a year/name.
-		 * [\w. -]+ Gets 0-9a-z. - characters, most scene movie titles contain these chars.
-		 * ie: [61420]-[FULL]-[a.b.foreignEFNet]-[ Coraline.2009.DUTCH.INTERNAL.1080p.BluRay.x264-VeDeTT ]-[21/85] - "vedett-coralien-1080p.r04" yEnc
-		 * Then we look up the year, (19|20)\d\d, so $matches[1] would be Coraline $matches[2] 2009
-		 */
-		if (preg_match('/(?P<name>[\w. -]+)[^\w](?P<year>(19|20)\d\d)/i', $releaseName, $matches)) {
-			$name = $matches['name'];
-			$year = $matches['year'];
-
-			/* If we didn't find a year, try to get a name anyways.
-			 * Try to look for a title before the $followingList and after anything but a-z0-9 two times or more (-[ for example)
-			 */
-		} else if (preg_match('/([^\w]{2,})?(?P<name>[\w .-]+?)' . $followingList . '/i', $releaseName, $matches)) {
-			$name = $matches['name'];
-		}
-
-		// Check if we got something.
-		if ($name !== '') {
-
-			// If we still have any of the words in $followingList, remove them.
-			$name = preg_replace('/' . $followingList . '/i', ' ', $name);
-			// Remove periods, underscored, anything between parenthesis.
-			$name = preg_replace('/\(.*?\)|[._]/i', ' ', $name);
-			// Finally remove multiple spaces and trim leading spaces.
-			$name = trim(preg_replace('/\s{2,}/', ' ', $name));
-			// Check if the name is long enough and not just numbers.
-			if (strlen($name) > 4 && !preg_match('/^\d+$/', $name)) {
-				if ($this->debug && $this->echooutput) {
-					$this->pdo->log->doEcho("DB name: {$releaseName}", true);
-				}
-				$this->currentTitle = $name;
-				$this->currentYear  = ($year === '' ? false : $year);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get upcoming movies.
-	 *
-	 * @param        $type
-	 * @param string $source
-	 *
-	 * @return array|bool
-	 */
-	public function getUpcoming($type, $source = 'rottentomato')
-	{
-		$list = $this->pdo->queryOneRow(
-			sprintf('SELECT * FROM upcoming WHERE source = %s AND typeID = %d', $this->pdo->escapeString($source), $type)
-		);
-		if ($list === false) {
-			$this->updateUpcoming();
-			$list = $this->pdo->queryOneRow(
-				sprintf('SELECT * FROM upcoming WHERE source = %s AND typeID = %d', $this->pdo->escapeString($source), $type)
-			);
-		}
-		return $list;
-	}
-
-	/**
-	 * Update upcoming movies.
-	 */
-	public function updateUpcoming()
-	{
-		if ($this->echooutput) {
-						$this->pdo->log->doEcho($this->pdo->log->header('Updating movie schedule using rotten tomatoes.'));
-					}
-
-		$rt = new \RottenTomato($this->site->rottentomatokey);
-
-		if ($rt instanceof \RottenTomato) {
-
-			$this->_getRTData('boxoffice', $rt);
-			$this->_getRTData('theaters', $rt);
-			$this->_getRTData('opening', $rt);
-			$this->_getRTData('upcoming', $rt);
-			$this->_getRTData('dvd', $rt);
-
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header("Updated successfully."));
-			}
-
-		} else if ($this->echooutput) {
-			$this->pdo->log->doEcho($this->pdo->log->header("Error retrieving your RottenTomato API Key. Exiting..." . PHP_EOL));
-		}
-	}
-
-	protected function _getRTData($operation = '', $rt)
-	{
-		$count = 0;
-		$check = false;
-
-		do {
-			$count++;
-
-			switch ($operation) {
-				case 'boxoffice':
-					$data = $rt->getBoxOffice();
-					$update = \Film::SRC_BOXOFFICE;
-					break;
-				case 'theaters':
-					$data = $rt->getInTheaters();
-					$update = \Film::SRC_INTHEATRE;
-					break;
-				case 'opening':
-					$data = $rt->getOpening();
-					$update = \Film::SRC_OPENING;
-					break;
-				case 'upcoming':
-					$data = $rt->getUpcoming();
-					$update = \Film::SRC_UPCOMING;
-					break;
-				case 'dvd':
-					$data = $rt->getDVDReleases();
-					$update = \Film::SRC_DVD;
-					break;
-				default:
-					$data = false;
-					$update = 0;
-			}
-
-			if ($data !== false && $data !== '') {
-				$test = @json_decode($data);
-				if (isset($test)) {
-					$count = 2;
-					$check = true;
-				}
-			}
-
-		} while ($count < 2);
-
-		if ($check === true) {
-
-			$success = $this->updateInsUpcoming('rottentomato', $update, $data);
-
-			if ($this->echooutput) {
-				if ($success !== false) {
-					$this->pdo->log->doEcho($this->pdo->log->header(sprintf("Added/updated movies to the %s list.", $operation)));
-				} else {
-					$this->pdo->log->doEcho($this->pdo->log->primary(sprintf("No new updates for %s list.", $operation)));
-				}
-			}
-
-		} else {
-			exit(PHP_EOL . $this->pdo->log->error("Unable to fetch from Rotten Tomatoes, verify your API Key." . PHP_EOL));
-		}
-	}
-
-	/**
-	 * Update upcoming table.
-	 *
-	 * @param $source
-	 * @param $type
-	 * @param $info
-	 *
-	 * @return bool|int
-	 */
-	protected function updateInsUpcoming($source, $type, $info)
-	{
-		return $this->pdo->queryExec(
-			sprintf("
-				INSERT INTO upcoming (source, typeID, info, updateddate)
-				VALUES (%s, %d, %s, NOW())
-				ON DUPLICATE KEY UPDATE info = %s",
-				$this->pdo->escapeString($source),
-				$type,
-				$this->pdo->escapeString($info),
-				$this->pdo->escapeString($info)
-			)
-		);
-	}
-
-	/**
-	 * Get IMDB genres.
-	 *
-	 * @return array
-	 */
-	public function getGenres()
-	{
-		return array(
-			'Action',
-			'Adventure',
-			'Animation',
-			'Biography',
-			'Comedy',
-			'Crime',
-			'Documentary',
-			'Drama',
-			'Family',
-			'Fantasy',
-			'Film-Noir',
-			'Game-Show',
-			'History',
-			'Horror',
-			'Music',
-			'Musical',
-			'Mystery',
-			'News',
-			'Reality-TV',
-			'Romance',
-			'Sci-Fi',
-			'Sport',
-			'Talk-Show',
-			'Thriller',
-			'War',
-			'Western'
-		);
-	}
-
-}
\ No newline at end of file
diff --git a/lib/IRCClient.php b/lib/IRCClient.php
deleted file mode 100644
index 535680a0d..000000000
--- a/lib/IRCClient.php
+++ /dev/null
@@ -1,722 +0,0 @@
-<?php
-
-/**
- * Basic IRC client for fetching IRCScraper.
- *
- * Class IRCClient
- */
-class IRCClient
-{
-	/**
-	 * Hostname IRC server used when connecting.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_remote_host = '';
-
-	/**
-	 * Port number IRC server.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_remote_port = 6667;
-
-	/**
-	 * Socket transport type for the IRC server.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_remote_transport = 'tcp';
-
-
-	/**
-	 * Hostname the IRC server sent us back.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_remote_host_received = '';
-
-	/**
-	 * String used when creating the stream socket.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_remote_socket_string = '';
-
-	/**
-	 * Are we using tls/ssl?
-	 *
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_remote_tls = false;
-
-	/**
-	 * Time in seconds to timeout on connect.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_remote_connection_timeout = 30;
-
-	/**
-	 * Time in seconds before we timeout when sending/receiving a command.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_socket_timeout = 180;
-
-	/**
-	 * How many times to retry when connecting to IRC.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_reconnectRetries = 3;
-
-	/**
-	 * Seconds to delay when reconnecting fails.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_reconnectDelay = 5;
-
-	/**
-	 * Stream socket client.
-	 *
-	 * @var resource
-	 * @access protected
-	 */
-	protected $_socket = null;
-
-	/**
-	 * Buffer contents.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_buffer = null;
-
-	/**
-	 * When someone types something into a channel, buffer it.
-	 * array(
-	 *     'nickname' => string(The nick name of the person who posted.),
-	 *     'channel'  => string(The channel name.),
-	 *     'message'  => string(The message the person posted.)
-	 * );
-	 *
-	 * @note   Used with the processChannelMessages() function.
-	 * @var array
-	 * @access protected
-	 */
-	protected $_channelData = array();
-
-	/**
-	 * Nick name when we log in.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_nickName;
-
-	/**
-	 * User name when we log in.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_userName;
-
-	/**
-	 * "Real" name when we log in.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_realName;
-
-	/**
-	 * Password when we log in.
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $_password;
-
-	/**
-	 * List of channels and passwords to join.
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected $_channels;
-
-	/**
-	 * Last time we received a ping or sent a ping to the server.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_lastPing;
-
-	/**
-	 * How many times we've tried to reconnect to IRC.
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $_currentRetries = 0;
-
-	/**
-	 * Turns on or off debugging.
-	 *
-	 * @var bool
-	 */
-	protected $_debug = true;
-
-	/**
-	 * Are we already logged in to IRC?
-	 *
-	 * @var bool
-	 */
-	protected $_alreadyLoggedIn = false;
-
-	/**
-	 * Disconnect from IRC.
-	 *
-	 * @access public
-	 */
-	public function __destruct()
-	{
-		$this->quit();
-	}
-
-	/**
-	 * Time before giving up when trying to read or write to the IRC server.
-	 * The default is fine, it will ping the server if the server does not ping us
-	 * within this time to keep the connection alive.
-	 *
-	 * @param int $timeout Seconds.
-	 *
-	 * @access public
-	 */
-	public function setSocketTimeout($timeout)
-	{
-		if (!is_numeric($timeout)) {
-			echo 'ERROR: IRC socket timeout must be a number!' . PHP_EOL;
-		} else {
-			$this->_socket_timeout = $timeout;
-		}
-	}
-
-	/**
-	 * Amount of time to wait before giving up when connecting.
-	 *
-	 * @param int $timeout Seconds.
-	 *
-	 * @access public
-	 */
-	public function setConnectionTimeout($timeout)
-	{
-		if (!is_numeric($timeout)) {
-			echo 'ERROR: IRC connection timeout must be a number!' . PHP_EOL;
-		} else {
-			$this->_remote_connection_timeout = $timeout;
-		}
-	}
-
-	/**
-	 * Amount of times to retry before giving up when connecting.
-	 *
-	 * @param int $retries
-	 *
-	 * @access public
-	 */
-	public function setConnectionRetries($retries)
-	{
-		if (!is_numeric($retries)) {
-			echo 'ERROR: IRC connection retries must be a number!' . PHP_EOL;
-		} else {
-			$this->_reconnectRetries = $retries;
-		}
-	}
-
-	/**
-	 * Amount of time to wait between failed connects.
-	 *
-	 * @param int $delay Seconds.
-	 *
-	 * @access public
-	 */
-	public function setReConnectDelay($delay)
-	{
-		if (!is_numeric($delay)) {
-			echo 'ERROR: IRC reconnect delay must be a number!' . PHP_EOL;
-		} else {
-			$this->_reconnectDelay = $delay;
-		}
-	}
-
-	/**
-	 * Connect to a IRC server.
-	 *
-	 * @param string $hostname Host name of the IRC server (can be a IP or a name).
-	 * @param int    $port     Port number of the IRC server.
-	 * @param bool   $tls      Use encryption for the socket transport? (make sure the port is right).
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function connect($hostname, $port = 6667, $tls = false)
-	{
-		$this->_alreadyLoggedIn = false;
-		$transport = ($tls === true ? 'tls' : 'tcp');
-
-		$socket_string = $transport . '://' . $hostname . ':' . $port;
-		if ($socket_string !== $this->_remote_socket_string || !$this->_connected()) {
-			if (!is_string($hostname) || $hostname == '') {
-				echo 'ERROR: IRC host name must not be empty!' . PHP_EOL;
-
-				return false;
-			}
-
-			if (!is_numeric($port)) {
-				echo 'ERROR: IRC port must be a number!' . PHP_EOL;
-
-				return false;
-			}
-
-			$this->_remote_host = $hostname;
-			$this->_remote_port = $port;
-			$this->_remote_transport = $transport;
-			$this->_remote_tls = $tls;
-			$this->_remote_socket_string = $socket_string;
-
-			// Try to connect until we run out of retries.
-			while ($this->_reconnectRetries >= $this->_currentRetries++) {
-				$this->_initiateStream();
-				if ($this->_connected()) {
-					break;
-				} else {
-					// Sleep between retries.
-					sleep($this->_reconnectDelay);
-				}
-			}
-		} else {
-			$this->_alreadyLoggedIn = true;
-		}
-
-		// Set last ping time to now.
-		$this->_lastPing = time();
-		// Reset retries.
-		$this->_currentRetries = $this->_reconnectRetries;
-
-		return $this->_connected();
-	}
-
-	/**
-	 * Log in to a IRC server.
-	 *
-	 * @param string $nickName The nick name - visible in the channel.
-	 * @param string $userName The user name - visible in the host name.
-	 * @param string $realName The real name - visible in the WhoIs.
-	 * @param null   $password The password  - some servers require a password.
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function login($nickName, $userName, $realName, $password = null)
-	{
-		if (!$this->_connected()) {
-			echo 'ERROR: You must connect to IRC first!' . PHP_EOL;
-
-			return false;
-		}
-
-		if (empty($nickName) || empty($userName) || empty($realName)) {
-			echo 'ERROR: nick/user/real name must not be empty!' . PHP_EOL;
-
-			return false;
-		}
-
-		$this->_nickName = $nickName;
-		$this->_userName = $userName;
-		$this->_realName = $realName;
-		$this->_password = $password;
-
-		if (($password !== null && !empty($password)) && !$this->_writeSocket('PASSWORD ' . $password)) {
-			return false;
-		}
-
-		if (!$this->_writeSocket('NICK ' . $nickName)) {
-			return false;
-		}
-
-		if (!$this->_writeSocket('USER ' . $userName . ' 0 * :' . $realName)) {
-			return false;
-		}
-
-		// Loop over socket buffer until we find "001".
-		while (true) {
-			$this->_readSocket();
-
-			// We got pinged, reply with a pong.
-			if (preg_match('/^PING\s*:(.+?)$/', $this->_buffer, $matches)) {
-				$this->_pong($matches[1]);
-
-			} else if (preg_match('/^:(.*?)\s+(\d+).*?(:.+?)?$/', $this->_buffer, $matches)) {
-				// We found 001, which means we are logged in.
-				if ($matches[2] == 001) {
-					$this->_remote_host_received = $matches[1];
-					break;
-
-					// We got 464, which means we need to send a password.
-				} else if ($matches[2] == 464) {
-					// Before the lower check, set the password : username:password
-					$tempPass = $userName . ':' . $password;
-
-					// Check if the user has his password in this format: username/server:password
-					if (preg_match('/^.+?\/.+?:.+?$/', $password)) {
-						$tempPass = $password;
-					}
-
-					if ($password !== null && !$this->_writeSocket('PASS ' . $tempPass)) {
-						return false;
-					} else if (isset($matches[3]) && strpos(strtolower($matches[3]), 'invalid password')) {
-						echo 'Invalid password or username for (' . $this->_remote_host . ').';
-
-						return false;
-					}
-				}
-				//ERROR :Closing Link: kevin123[100.100.100.100] (This server is full.)
-			} else if (preg_match('/^ERROR\s*:/', $this->_buffer)) {
-				echo $this->_buffer . PHP_EOL;
-
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Quit from IRC.
-	 *
-	 * @param string $message Optional disconnect message.
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function quit($message = null)
-	{
-		if ($this->_connected()) {
-			$this->_writeSocket('QUIT' . ($message === null ? '' : ' :' . $message));
-		}
-		$this->_closeStream();
-
-		return $this->_connected();
-	}
-
-	/**
-	 * Read the incoming buffer in a loop.
-	 *
-	 * @access public
-	 */
-	public function readIncoming()
-	{
-		while (true) {
-
-			$this->_readSocket();
-
-			// If the server pings us, return it a pong.
-			if (preg_match('/^PING\s*:(.+?)$/', $this->_buffer, $matches)) {
-				if ($matches[1] === $this->_remote_host_received) {
-					$this->_pong($matches[1]);
-				}
-
-				// Check for a channel message.
-			} else if (preg_match('/^:(?P<nickname>.+?)\!.+?\s+PRIVMSG\s+(?P<channel>#.+?)\s+:\s*(?P<message>.+?)\s*$/',
-				$this->_stripControlCharacters($this->_buffer),
-				$matches
-			)
-			) {
-
-				$this->_channelData =
-					array(
-						'nickname' => $matches['nickname'],
-						'channel'  => $matches['channel'],
-						'message'  => $matches['message']
-					);
-
-				$this->processChannelMessages();
-			}
-
-			// Ping the server if it has not sent us a ping in a while.
-			if ((time() - $this->_lastPing) > ($this->_socket_timeout / 2)) {
-				$this->_ping($this->_remote_host_received);
-			}
-		}
-	}
-
-	/**
-	 * Join a channel or multiple channels.
-	 *
-	 * @param array $channels Array of channels with their passwords (null if the channel doesn't need a password).
-	 *                        array( '#exampleChannel' => 'thePassword', '#exampleChan2' => null );
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function joinChannels($channels = array())
-	{
-		$this->_channels = $channels;
-
-		if (!$this->_connected()) {
-			echo 'ERROR: You must connect to IRC first!' . PHP_EOL;
-
-			return false;
-		}
-
-		if (!empty($channels)) {
-			foreach ($channels as $channel => $password) {
-				$this->_joinChannel($channel, $password);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Implementation.
-	 * Extended classes will use this function to parse the messages in the channel using $this->_channelData.
-	 *
-	 * @access protected
-	 */
-	protected function processChannelMessages()
-	{
-	}
-
-	/**
-	 * Join a channel.
-	 *
-	 * @param string $channel
-	 * @param string $password
-	 *
-	 * @access protected.
-	 */
-	protected function _joinChannel($channel, $password)
-	{
-		$this->_writeSocket('JOIN ' . $channel . ($password === null ? '' : ' ' . $password));
-	}
-
-	/**
-	 * Send PONG to a host.
-	 *
-	 * @param string $host
-	 *
-	 * @access protected
-	 */
-	protected function _pong($host)
-	{
-		if ($this->_writeSocket('PONG ' . $host) === false) {
-			$this->_reconnect();
-		}
-
-		// If we got a ping from the IRC server, set the last ping time to now.
-		if ($host === $this->_remote_host_received) {
-			$this->_lastPing = time();
-		}
-	}
-
-	/**
-	 * Send PING to a host.
-	 *
-	 * @param string $host
-	 *
-	 * @access protected
-	 */
-	protected function _ping($host)
-	{
-		$pong = $this->_writeSocket('PING ' . $host);
-
-		// Check if there's a connection error.
-		if ($pong === false || ((time() - $this->_lastPing) > ($this->_socket_timeout / 2) && !preg_match('/^PONG/', $this->_buffer))) {
-			$this->_reconnect();
-		}
-
-		// If sent a ping from the IRC server, set the last ping time to now.
-		if ($host === $this->_remote_host_received) {
-			$this->_lastPing = time();
-		}
-	}
-
-	/**
-	 * Attempt to reconnect to IRC.
-	 *
-	 * @access protected
-	 */
-	protected function _reconnect()
-	{
-		if (!$this->connect($this->_remote_host, $this->_remote_port, $this->_remote_tls)) {
-			exit('FATAL: Could not reconnect to (' . $this->_remote_host . ') after (' . $this->_reconnectRetries . ') tries.' . PHP_EOL);
-		}
-
-		if ($this->_alreadyLoggedIn === false) {
-			if (!$this->login($this->_nickName, $this->_userName, $this->_realName, $this->_password)) {
-				exit('FATAL: Could not log in to (' . $this->_remote_host . ')!' . PHP_EOL);
-			}
-
-			$this->joinChannels($this->_channels);
-		}
-	}
-
-	/**
-	 * Read response from the IRC server.
-	 *
-	 * @access protected
-	 */
-	protected function _readSocket()
-	{
-		$buffer = '';
-		do {
-			stream_set_timeout($this->_socket, $this->_socket_timeout);
-			$buffer .= fgets($this->_socket, 1024);
-		} while (!empty($buffer) && !preg_match('/\v+$/', $buffer));
-		$this->_buffer = trim($buffer);
-
-		if ($this->_debug && $this->_buffer !== '') {
-			echo 'RECV ' . $this->_buffer . PHP_EOL;
-		}
-	}
-
-	/**
-	 * Send a command to the IRC server.
-	 *
-	 * @param string $command
-	 *
-	 * @return bool
-	 *
-	 * @access protected
-	 */
-	protected function _writeSocket($command)
-	{
-		$command .= "\r\n";
-		for ($written = 0; $written < strlen($command); $written += $fWrite) {
-			stream_set_timeout($this->_socket, $this->_socket_timeout);
-			$fWrite = $this->_writeSocketChar(substr($command, $written));
-
-			// http://www.php.net/manual/en/function.fwrite.php#96951 | fwrite can return 0 causing an infinite loop.
-			if ($fWrite === false || $fWrite <= 0) {
-
-				// If it failed, try a second time.
-				$fWrite = $this->_writeSocketChar(substr($command, $written));
-				if ($fWrite === false || $fWrite <= 0) {
-					echo 'ERROR: Could no write to socket! (the IRC server might have closed the connection)' . PHP_EOL;
-
-					return false;
-				}
-			}
-		}
-
-		if ($this->_debug) {
-			echo 'SEND :' . $command;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Write a single character to the socket.
-	 *
-	 * @param string (char) $character A single character.
-	 *
-	 * @return int|bool Number of bytes written or false.
-	 */
-	protected function _writeSocketChar($character)
-	{
-		return @fwrite($this->_socket, $character);
-	}
-
-	/**
-	 * Initiate stream socket to IRC server.
-	 *
-	 * @access protected
-	 */
-	protected function _initiateStream()
-	{
-		$this->_closeStream();
-
-		$socket = stream_socket_client(
-			$this->_remote_socket_string,
-			$error_number,
-			$error_string,
-			$this->_remote_connection_timeout
-		);
-
-		if ($socket === false) {
-			echo 'ERROR: ' . $error_string . ' (' . $error_number . ')' . PHP_EOL;
-		} else {
-			$this->_socket = $socket;
-		}
-	}
-
-	/**
-	 * Close the socket.
-	 *
-	 * @access protected
-	 */
-	protected function _closeStream()
-	{
-		if (!is_null($this->_socket)) {
-			$this->_socket = null;
-		}
-	}
-
-	/**
-	 * Check if we are connected to the IRC server.
-	 *
-	 * @return bool
-	 *
-	 * @access protected
-	 */
-	protected function _connected()
-	{
-		return (is_resource($this->_socket) && !feof($this->_socket));
-	}
-
-	/**
-	 * Strips control characters from a IRC message.
-	 *
-	 * @param string $text
-	 *
-	 * @return string
-	 *
-	 * @access protected
-	 */
-	protected function _stripControlCharacters($text)
-	{
-		return preg_replace(
-			array(
-				'/(\x03(?:\d{1,2}(?:,\d{1,2})?)?)/', // Color code
-				'/\x02/', // Bold
-				'/\x0F/', // Escaped
-				'/\x16/', // Italic
-				'/\x1F/', // Underline
-				'/\x12/' // Device control 2
-			),
-			'',
-			$text
-		);
-	}
-}
\ No newline at end of file
diff --git a/lib/IRCScraper.php b/lib/IRCScraper.php
deleted file mode 100644
index abbe7dac1..000000000
--- a/lib/IRCScraper.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once("prehash.php");
-require_once("IRCClient.php");
-
-/**
- * Class IRCScraper
- */
-class IRCScraper extends IRCClient
-{
-	/**
-	 * Regex to ignore categories.
-	 * @var string|bool
-	 */
-	protected $_categoryIgnoreRegex;
-
-	/**
-	 * Array of current pre info.
-	 * @var array
-	 * @access protected
-	 */
-	protected $_curPre;
-
-	/**
-	 * List of groups and their id's
-	 * @var array
-	 * @access protected
-	 */
-	protected $_groupList;
-
-	/**
-	 * Array of ignored channels.
-	 * @var array
-	 */
-	protected $_ignoredChannels;
-
-	/**
-	 * Is this pre nuked or un nuked?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_nuked;
-
-	/**
-	 * Array of old pre info.
-	 * @var array|bool
-	 * @access protected
-	 */
-	protected $_oldPre;
-
-	/**
-	 * @var DB
-	 * @access protected
-	 */
-	protected $_pdo;
-
-	/**
-	 * Run this in silent mode (no text output).
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_silent;
-
-	/**
-	 * Regex to ignore PRE titles.
-	 * @var string|bool
-	 */
-	protected $_titleIgnoreRegex;
-
-	/**
-	 * Construct
-	 *
-	 * @param bool $silent Run this in silent mode (no text output).
-	 * @param bool $debug  Turn on debug? Shows sent/received socket buffer messages.
-	 *
-	 * @access public
-	 */
-	public function __construct(&$silent = false, &$debug = false)
-	{
-		if (defined('SCRAPE_IRC_SOURCE_IGNORE')) {
-			$this->_ignoredChannels = unserialize(SCRAPE_IRC_SOURCE_IGNORE);
-		} else {
-			$this->_ignoredChannels = array(
-				'#a.b.cd.image'               => false,
-				'#a.b.console.ps3'            => false,
-				'#a.b.dvd'                    => false,
-				'#a.b.erotica'                => false,
-				'#a.b.flac'                   => false,
-				'#a.b.foreign'                => false,
-				'#a.b.games.nintendods'       => false,
-				'#a.b.inner-sanctum'          => false,
-				'#a.b.moovee'                 => false,
-				'#a.b.movies.divx'            => false,
-				'#a.b.sony.psp'               => false,
-				'#a.b.sounds.mp3.complete_cd' => false,
-				'#a.b.teevee'                 => false,
-				'#a.b.games.wii'              => false,
-				'#a.b.warez'                  => false,
-				'#a.b.games.xbox360'          => false,
-				'#pre@corrupt'                => false,
-				'#scnzb'                      => false,
-				'#tvnzb'                      => false,
-				'omgwtfnzbs'                  => false,
-				'orlydb'                      => false,
-				'prelist'                     => false,
-				'srrdb'                       => false,
-				'u4all.eu'                    => false,
-				'zenet'                       => false
-			);
-		}
-
-		$this->_categoryIgnoreRegex = false;
-		if (defined('SCRAPE_IRC_CATEGORY_IGNORE') && SCRAPE_IRC_CATEGORY_IGNORE !== '') {
-			$this->_categoryIgnoreRegex = SCRAPE_IRC_CATEGORY_IGNORE;
-		}
-
-		$this->_titleIgnoreRegex = false;
-		if (defined('SCRAPE_IRC_TITLE_IGNORE') && SCRAPE_IRC_TITLE_IGNORE !== '') {
-			$this->_titleIgnoreRegex = SCRAPE_IRC_TITLE_IGNORE;
-		}
-
-		$this->_pdo = new DB();
-		$this->_groupList = array();
-		$this->_silent = $silent;
-		$this->_debug = $debug;
-		$this->_resetPreVariables();
-		$this->_startScraping();
-	}
-
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-	/**
-	 * Main method for scraping.
-	 *
-	 * @access protected
-	 */
-	protected function _startScraping()
-	{
-
-		// Connect to IRC.
-		if ($this->connect(SCRAPE_IRC_SERVER, SCRAPE_IRC_PORT, SCRAPE_IRC_TLS) === false) {
-			exit (
-				'Error connecting to (' .
-				SCRAPE_IRC_SERVER .
-				':' .
-				SCRAPE_IRC_PORT .
-				'). Please verify your server information and try again.' .
-				PHP_EOL
-			);
-		}
-
-		// Login to IRC.
-		if ($this->login(SCRAPE_IRC_NICKNAME, SCRAPE_IRC_REALNAME, SCRAPE_IRC_USERNAME, SCRAPE_IRC_PASSWORD) === false) {
-			exit('Error logging in to: (' .
-				SCRAPE_IRC_SERVER . ':' . SCRAPE_IRC_PORT . ') nickname: (' . SCRAPE_IRC_NICKNAME .
-				'). Verify your connection information, you might also be banned from this server or there might have been a connection issue.' .
-				PHP_EOL
-			);
-		}
-
-		// Join channels.
-		$this->joinChannels(array('#PreNNTmux' => null));
-
-		if (!$this->_silent) {
-			echo
-				'[' .
-				date('r') .
-				'] [Scraping of IRC channels for (' .
-				SCRAPE_IRC_SERVER .
-				':' .
-				SCRAPE_IRC_PORT .
-				') (' .
-				SCRAPE_IRC_NICKNAME .
-				') started.]' .
-				PHP_EOL;
-		}
-
-		// Scan incoming IRC messages.
-		$this->readIncoming();
-	}
-
-	/**
-	 * Process bot messages, insert/update PREs.
-	 *
-	 * @access protected
-	 */
-	protected function processChannelMessages()
-	{
-		if (preg_match(
-			'/^(NEW|UPD|NUK): \[DT: (?P<time>.+?)\]\s?\[TT: (?P<title>.+?)\]\s?\[SC: (?P<source>.+?)\]\s?\[CT: (?P<category>.+?)\]\s?\[RQ: (?P<req>.+?)\]' .
-			'\s?\[SZ: (?P<size>.+?)\]\s?\[FL: (?P<files>.+?)\]\s?(\[FN: (?P<filename>.+?)\]\s?)?(\[(?P<nuked>(UN|MOD|RE|OLD)?NUKED?): (?P<reason>.+?)\])?$/i',
-			$this->_channelData['message'], $matches)) {
-
-			if (isset($this->_ignoredChannels[$matches['source']]) && $this->_ignoredChannels[$matches['source']] === true) {
-				return;
-			}
-
-			if ($this->_categoryIgnoreRegex !== false && preg_match((string)$this->_categoryIgnoreRegex, $matches['category'])) {
-				return;
-			}
-
-			if ($this->_titleIgnoreRegex !== false && preg_match((string)$this->_titleIgnoreRegex, $matches['title'])) {
-				return;
-			}
-
-			$this->_curPre['predate'] = $this->_pdo->from_unixtime(strtotime($matches['time'] . ' UTC'));
-			$this->_curPre['title'] = $matches['title'];
-			$this->_curPre['source'] = $matches['source'];
-			if ($matches['category'] !== 'N/A') {
-				$this->_curPre['category'] = $matches['category'];
-			}
-			if ($matches['req'] !== 'N/A' && preg_match('/^(?P<req>\d+):(?P<group>.+)$/i', $matches['req'], $matches2)) {
-				$this->_curPre['reqid'] = $matches2['req'];
-				$this->_curPre['group_id']  = $this->_getGroupID($matches2['group']);
-			}
-			if ($matches['size'] !== 'N/A') {
-				$this->_curPre['size'] = $matches['size'];
-			}
-			if ($matches['files'] !== 'N/A') {
-				$this->_curPre['files'] = substr($matches['files'], 0, 50);
-			}
-
-			if (isset($matches['filename']) && $matches['filename'] !== 'N/A') {
-				$this->_curPre['filename'] = $matches['filename'];
-			}
-
-			if (isset($matches['nuked'])) {
-				switch ($matches['nuked']) {
-					case 'NUKED':
-						$this->_curPre['nuked'] = PreHash::PRE_NUKED;
-						break;
-					case 'UNNUKED':
-						$this->_curPre['nuked'] = PreHash::PRE_UNNUKED;
-						break;
-					case 'MODNUKED':
-						$this->_curPre['nuked'] = PreHash::PRE_MODNUKE;
-						break;
-					case 'RENUKED':
-						$this->_curPre['nuked'] = PreHash::PRE_RENUKED;
-						break;
-					case 'OLDNUKE':
-						$this->_curPre['nuked'] = PreHash::PRE_OLDNUKE;
-						break;
-				}
-				$this->_curPre['reason'] = (isset($matches['reason']) ? substr($matches['reason'], 0, 255) : '');
-			}
-			$this->_checkForDupe();
-		}
-	}
-
-	/**
-	 * Check if we already have the PRE, update if we have it, insert if not.
-	 *
-	 * @access protected
-	 */
-	protected function _checkForDupe()
-	{
-		$this->_oldPre = $this->_pdo->queryOneRow(sprintf('SELECT category, size FROM prehash WHERE title = %s', $this->_pdo->escapeString($this->_curPre['title'])));
-		if ($this->_oldPre === false) {
-			$this->_insertNewPre();
-		} else {
-			$this->_updatePre();
-		}
-		$this->_resetPreVariables();
-	}
-
-	/**
-	 * Insert new PRE into the DB.
-	 *
-	 * @access protected
-	 */
-	protected function _insertNewPre()
-	{
-		if (empty($this->_curPre['title'])) {
-			return;
-		}
-
-		$query = 'INSERT INTO prehash (';
-
-		$query .= (!empty($this->_curPre['size'])     ? 'size, '       : '');
-		$query .= (!empty($this->_curPre['category']) ? 'category, '   : '');
-		$query .= (!empty($this->_curPre['source'])   ? 'source, '     : '');
-		$query .= (!empty($this->_curPre['reason'])   ? 'nukereason, ' : '');
-		$query .= (!empty($this->_curPre['files'])    ? 'files, '      : '');
-		$query .= (!empty($this->_curPre['reqid'])    ? 'requestid, '  : '');
-		$query .= (!empty($this->_curPre['group_id'])  ? 'groupid, '    : '');
-		$query .= (!empty($this->_curPre['nuked'])    ? 'nuked, '      : '');
-		$query .= (!empty($this->_curPre['filename']) ? 'filename, '   : '');
-
-		$query .= 'predate, title) VALUES (';
-
-		$query .= (!empty($this->_curPre['size'])     ? $this->_pdo->escapeString($this->_curPre['size'])     . ', '   : '');
-		$query .= (!empty($this->_curPre['category']) ? $this->_pdo->escapeString($this->_curPre['category']) . ', '   : '');
-		$query .= (!empty($this->_curPre['source'])   ? $this->_pdo->escapeString($this->_curPre['source'])   . ', '   : '');
-		$query .= (!empty($this->_curPre['reason'])   ? $this->_pdo->escapeString($this->_curPre['reason'])   . ', '   : '');
-		$query .= (!empty($this->_curPre['files'])    ? $this->_pdo->escapeString($this->_curPre['files'])    . ', '   : '');
-		$query .= (!empty($this->_curPre['reqid'])    ? $this->_curPre['reqid']                             . ', '   : '');
-		$query .= (!empty($this->_curPre['group_id'])  ? $this->_curPre['group_id']                           . ', '   : '');
-		$query .= (!empty($this->_curPre['nuked'])    ? $this->_curPre['nuked']                             . ', '   : '');
-		$query .= (!empty($this->_curPre['filename']) ? $this->_pdo->escapeString($this->_curPre['filename']) . ', '   : '');
-		$query .= (!empty($this->_curPre['predate'])  ? $this->_curPre['predate']                           . ', '   : 'NOW(), ');
-
-		$query .= '%s)';
-
-		$this->_pdo->ping(true);
-
-		$this->_pdo->queryExec(
-			sprintf(
-				$query,
-				$this->_pdo->escapeString($this->_curPre['title'])
-			)
-		);
-
-		$this->_doEcho(true);
-	}
-
-	/**
-	 * Updates PRE data in the DB.
-	 *
-	 * @access protected
-	 */
-	protected function _updatePre()
-	{
-		if (empty($this->_curPre['title'])) {
-			return;
-		}
-
-		$query = 'UPDATE prehash SET ';
-
-		$query .= (!empty($this->_curPre['size'])     ? 'size = '       . $this->_pdo->escapeString($this->_curPre['size'])     . ', ' : '');
-		$query .= (!empty($this->_curPre['source'])   ? 'source = '     . $this->_pdo->escapeString($this->_curPre['source'])   . ', ' : '');
-		$query .= (!empty($this->_curPre['files'])    ? 'files = '      . $this->_pdo->escapeString($this->_curPre['files'])    . ', ' : '');
-		$query .= (!empty($this->_curPre['reason'])   ? 'nukereason = ' . $this->_pdo->escapeString($this->_curPre['reason'])   . ', ' : '');
-		$query .= (!empty($this->_curPre['reqid'])    ? 'requestid = '  . $this->_curPre['reqid']                             . ', ' : '');
-		$query .= (!empty($this->_curPre['group_id'])  ? 'groupid = '    . $this->_curPre['group_id']                           . ', ' : '');
-		$query .= (!empty($this->_curPre['predate'])  ? 'predate = '    . $this->_curPre['predate']                           . ', ' : '');
-		$query .= (!empty($this->_curPre['nuked'])    ? 'nuked = '      . $this->_curPre['nuked']                             . ', ' : '');
-		$query .= (!empty($this->_curPre['filename']) ? 'filename = '   . $this->_pdo->escapeString($this->_curPre['filename']) . ', ' : '');
-		$query .= (
-		(empty($this->_oldPre['category']) && !empty($this->_curPre['category']))
-			? 'category = ' . $this->_pdo->escapeString($this->_curPre['category']) . ', '
-			: ''
-		);
-
-		if ($query === 'UPDATE prehash SET '){
-			return;
-		}
-
-		$query .= 'title = '      . $this->_pdo->escapeString($this->_curPre['title']);
-		$query .= ' WHERE title = ' . $this->_pdo->escapeString($this->_curPre['title']);
-
-		$this->_pdo->ping(true);
-
-		$this->_pdo->queryExec($query);
-
-		$this->_doEcho(false);
-	}
-
-	/**
-	 * Echo new or update pre to CLI.
-	 *
-	 * @param bool $new
-	 *
-	 * @access protected
-	 */
-	protected function _doEcho($new = true)
-	{
-		if (!$this->_silent) {
-
-			$nukeString = '';
-			if ($this->_nuked !== false) {
-				switch((int)$this->_curPre['nuked']) {
-					case PreHash::PRE_NUKED:
-						$nukeString = '[ NUKED ] ';
-						break;
-					case PreHash::PRE_UNNUKED:
-						$nukeString = '[UNNUKED] ';
-						break;
-					case PreHash::PRE_MODNUKE:
-						$nukeString = '[MODNUKE] ';
-						break;
-					case PreHash::PRE_OLDNUKE:
-						$nukeString = '[OLDNUKE] ';
-						break;
-					case PreHash::PRE_RENUKED:
-						$nukeString = '[RENUKED] ';
-						break;
-					default:
-						break;
-				}
-				$nukeString .= '[' . $this->_curPre['reason'] . '] ';
-			}
-
-			echo
-				'[' .
-				date('r') .
-				($new ? '] [ Added Pre ] [' : '] [Updated Pre] [') .
-				$this->_curPre['source'] .
-				'] ' .
-				$nukeString .
-				'[' .
-				$this->_curPre['title'] .
-				']' .
-				(!empty($this->_curPre['category'])
-					? ' [' . $this->_curPre['category'] . ']'
-					: (!empty($this->_oldPre['category'])
-						? ' [' . $this->_oldPre['category'] . ']'
-						: ''
-					)
-				) .
-				(!empty($this->_curPre['size']) ? ' [' . $this->_curPre['size'] . ']' : '') .
-				PHP_EOL;
-		}
-	}
-
-	/**
-	 * Get a group id for a group name.
-	 *
-	 * @param string $groupName
-	 *
-	 * @return mixed
-	 *
-	 * @access protected
-	 */
-	protected function _getGroupID($groupName)
-	{
-		if (!isset($this->_groupList[$groupName])) {
-			$group = $this->_pdo->queryOneRow(sprintf('SELECT id FROM groups WHERE name = %s', $this->_pdo->escapeString($groupName)));
-			$this->_groupList[$groupName] = $group['id'];
-		}
-		return $this->_groupList[$groupName];
-	}
-
-	/**
-	 * After updating or inserting new PRE, reset these.
-	 *
-	 * @access protected
-	 */
-	protected function _resetPreVariables()
-	{
-		$this->_nuked = false;
-		$this->_oldPre = array();
-		$this->_curPre =
-			array(
-				'title'    => '',
-				'size'     => '',
-				'predate'  => '',
-				'category' => '',
-				'source'   => '',
-				'group_id'  => '',
-				'reqid'    => '',
-				'nuked'    => '',
-				'reason'   => '',
-				'files'    => '',
-				'filename' => ''
-			);
-	}
-}
\ No newline at end of file
diff --git a/lib/IRCScraper/.gitignore b/lib/IRCScraper/.gitignore
deleted file mode 100644
index 9f37e3549..000000000
--- a/lib/IRCScraper/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/settings.php
diff --git a/lib/IRCScraper/README.txt b/lib/IRCScraper/README.txt
deleted file mode 100644
index d5cf7bd54..000000000
--- a/lib/IRCScraper/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-These scripts run IRC bots to get PRE information.
-
-You must first copy settings_example.php to settings.php and change the settings in the file (settings.php).
-
-Next you can run scrape.php, it will tell you all the options.
-
-scrape.sh runs the bots with text output, if you cancel the script, one of the bots will still run, you must kill it manually.
-
-scrape_daemon.sh runs the bots with no text output and lets go of the terminal lock (if you want to restart the script later, you MUST kill the bots first).
\ No newline at end of file
diff --git a/lib/IRCScraper/scrape.php b/lib/IRCScraper/scrape.php
deleted file mode 100644
index 33af0b2ad..000000000
--- a/lib/IRCScraper/scrape.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../../bin/config.php");
-require_once(dirname(__FILE__) . "/../IRCScraper.php");
-
-if (!is_file(NN_TMUX . 'lib' . DS . 'IRCScraper' .DS . 'settings.php')) {
-	exit('Copy settings_example.php to settings.php and change the settings.' . PHP_EOL);
-}
-
-if (!isset($argv[1]) || $argv[1] !== 'true') {
-	exit(
-		'Argument 1: false|true             ; false prints this help screen, true runs the scraper.' . PHP_EOL .
-		'Argument 2: (optional) false|true  ; true runs in silent mode (no text output)' . PHP_EOL .
-		'Argument 3: (optional) false|true  ; true turns on debug (shows sent/received messages from the socket)' . PHP_EOL .
-		'examples:' . PHP_EOL .
-		'php ' . $argv[0] . ' true                        ; Scrapes PRE with text output.' . PHP_EOL .
-		'php ' . $argv[0] . ' true true > /dev/null 2>&1  ; (unix) Scrapes PRE with no text output, in the background (you can close your terminal window).' . PHP_EOL .
-		'php ' . $argv[0] . ' true false true             ; Scrapes PRE with text output and debug output.' . PHP_EOL .
-		'php ' . $argv[0] . ' true true true              ; Scrapes PRE with debug but no text output.' . PHP_EOL
-	);
-}
-
-require_once (NN_TMUX . 'lib' . DS . 'IRCScraper' .DS . 'settings.php');
-
-if (!defined('SCRAPE_IRC_NICKNAME')) {
-	exit('ERROR! You must update settings.php using settings_example.php.');
-}
-
-if (SCRAPE_IRC_NICKNAME == '') {
-	exit("ERROR! You must put a username in settings.php" . PHP_EOL);
-}
-
-$silent = ((isset($argv[2]) && $argv[2] === 'true') ? true : false);
-$debug = ((isset($argv[3]) && $argv[3] === 'true') ? true : false);
-
-// Start scraping.
-new IRCScraper($silent, $debug);
\ No newline at end of file
diff --git a/lib/IRCScraper/scrape.sh b/lib/IRCScraper/scrape.sh
deleted file mode 100644
index 2ef2d1d1a..000000000
--- a/lib/IRCScraper/scrape.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-cmd1="/usr/bin/php scrape.php corrupt";
-cmd2="/usr/bin/php scrape.php efnet";
-
-# Kill corrupt if it's already open.
-`ps -ef | grep "php corrupt" | awk '{print $2}' | xargs kill`
-sleep 2
-
-# Run corrupt in the background.
-$cmd1 &
-sleep 3
-echo ""
-echo "This started scrapeCorrupt in the background, if you cancel this script, it will still run, so you must kill it manually."
-echo "scrapeEfnet, will close however, since it was not started in the background."
-echo ""
-echo `ps aux | grep 'php corrupt' | awk '{print $2}'`
-echo "To kill it, in the message above, you see a number, in a command line, type kill theNumber  (theNumber, is the number over this line, the one to the left)"
-echo ""
-sleep 3
-$cmd2
\ No newline at end of file
diff --git a/lib/IRCScraper/scrape_daemon.sh b/lib/IRCScraper/scrape_daemon.sh
deleted file mode 100644
index 3761c783d..000000000
--- a/lib/IRCScraper/scrape_daemon.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# This runs IRCScraper silently in the background.
-
-cmd1="/usr/bin/php scrape.php corrupt true";
-cmd2="/usr/bin/php scrape.php efnet true";
-
-echo "Started IRCScraping in daemon mode."
-
-# Kill corrupt if it's already open.
-`ps -ef | grep "php corrupt" | awk '{print $2}' | xargs kill`
-sleep 2
-# Kill efnet if it's already open.
-`ps -ef | grep "php efnet" | awk '{print $2}' | xargs kill`
-sleep 2
-
-# Run corrupt
-$cmd1 &
-sleep 3
-# Run efnet
-$cmd2 &
\ No newline at end of file
diff --git a/lib/IRCScraper/settings_example.php b/lib/IRCScraper/settings_example.php
deleted file mode 100644
index d2ec5e963..000000000
--- a/lib/IRCScraper/settings_example.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-// If lazy set all usernames/nicknames/names here.
-// MAKE SURE THIS IS UNIQUE, IF SOMEONE HAS THE USERNAME ALREADY YOU WILL GET A BUNCH OF ERRORS, YOU HAVE BEEN WARNED.
-$username = '';
-
-// https://www.synirc.net/servers Try another server if you have issues.
-define('SCRAPE_IRC_SERVER', 'contego.ny.us.synirc.net');
-// Use Port 6697 or 7001 and set SCRAPE_IRC_TLS to true for encryption.
-define('SCRAPE_IRC_PORT', '6667');
-define('SCRAPE_IRC_TLS', false);
-define('SCRAPE_IRC_NICKNAME', "$username");
-define('SCRAPE_IRC_REALNAME', "$username");
-define('SCRAPE_IRC_USERNAME', "$username");
-// Set to false if you need no password. Use a string (quoted text) if you need a password.
-define('SCRAPE_IRC_PASSWORD', false);
-// Regex to ignore categories. Leave empty ('') to not exclude any category.
-// Case sensitive example: '/^(XXX|PDA|EBOOK|MP3)$/'
-// Case insensitive (note the i): '/^(X264|TV)$/i'
-define('SCRAPE_IRC_CATEGORY_IGNORE', '');
-// Set to true to ignore a source.
-define('SCRAPE_IRC_SOURCE_IGNORE',
-serialize(
-	array(
-		'#a.b.cd.image'               => false,
-		'#a.b.console.ps3'            => false,
-		'#a.b.dvd'                    => false,
-		'#a.b.erotica'                => false,
-		'#a.b.flac'                   => false,
-		'#a.b.foreign'                => false,
-		'#a.b.games.nintendods'       => false,
-		'#a.b.inner-sanctum'          => false,
-		'#a.b.moovee'                 => false,
-		'#a.b.movies.divx'            => false,
-		'#a.b.sony.psp'               => false,
-		'#a.b.sounds.mp3.complete_cd' => false,
-		'#a.b.teevee'                 => false,
-		'#a.b.games.wii'              => false,
-		'#a.b.warez'                  => false,
-		'#a.b.games.xbox360'          => false,
-		'#pre@corrupt'                => false,
-		'#scnzb'                      => false,
-		'#tvnzb'                      => false,
-		'omgwtfnzbs' => false,
-		'orlydb'     => false,
-		'prelist'    => false,
-		'srrdb'      => false,
-		'u4all.eu'   => false,
-		'zenet'      => false
-	)
-)
-);
\ No newline at end of file
diff --git a/lib/Info.php b/lib/Info.php
deleted file mode 100644
index 22ba1d6be..000000000
--- a/lib/Info.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/rarinfo/par2info.php");
-require_once(WWW_DIR . "/lib/rarinfo/sfvinfo.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("Pprocess.php");
-require_once("Film.php");
-require_once("TvAnger.php");
-require_once("getid3/getid3/getid3.php");
-
-/**
- * Class Nfo
- * Class for handling fetching/storing of NFO files.
- */
-class Info
-{
-	/**
-	 * Instance of class DB
-	 * @var Settings
-	 * @access private
-	 */
-	public $pdo;
-
-	/**
-	 * How many nfo's to process per run.
-	 * @var int
-	 * @access private
-	 */
-	private $nzbs;
-
-	/**
-	 * Max NFO size to process.
-	 * @var string|int
-	 * @access private
-	 */
-	private $maxsize;
-
-	/**
-	 * Max amount of times to retry to download a Nfo.
-	 * @var string|int
-	 * @access private
-	 */
-	private $maxRetries;
-
-	/**
-	 * Min NFO size to process.
-	 * @var string|int
-	 * @access private
-	 */
-	private $minsize;
-
-	/**
-	 * Path to temporarily store files.
-	 * @var string
-	 * @access private
-	 */
-	private $tmpPath;
-
-	/**
-	 * Echo to cli?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $echo;
-
-	const NFO_FAILED = -9; // We failed to get a NFO after admin set max retries.
-	const NFO_UNPROC = -1; // Release has not been processed yet.
-	const NFO_NONFO  =  0; // Release has no NFO.
-	const NFO_FOUND  =  1; // Release has an NFO.
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param array $options Class instance / echo to cli.
-	 *
-	 * @access public
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->echo = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->nzbs = ($this->site->maxnfoprocessed != '') ? (int)$this->site->maxnfoprocessed : 100;
-		$this->maxsize = ($this->site->maxsizetoprocessnfo != '') ? (int)$this->site->maxsizetoprocessnfo : 100;
-		$this->maxsize = ($this->maxsize > 0 ? ('AND size < ' . ($this->maxsize * 1073741824)) : '');
-		$this->minsize = ($this->site->minsizetoprocessnfo != '') ? (int)$this->site->minsizetoprocessnfo : 100;
-		$this->minsize = ($this->minsize > 0 ? ('AND size > ' . ($this->minsize * 1048576)) : '');
-		$this->maxRetries = (int)($this->site->maxnforetries >= 0 ? -((int)$this->site->maxnforetries + 1) : self::NFO_UNPROC);
-		$this->maxRetries = ($this->maxRetries < -8 ? -8 : $this->maxRetries);
-		$this->tmpPath = (string)$this->site->tmpunrarpath;
-		if (!preg_match('/[\/\\\\]$/', $this->tmpPath)) {
-			$this->tmpPath .= DS;
-		}
-	}
-
-	/**
-	 * Look for a TvRage id in a string.
-	 *
-	 * @param string  $str   The string with a TvRage id.
-	 * @return string The TVRage id on success.
-	 *
-	 * @return bool   False on failure.
-	 *
-	 * @access public
-	 */
-	public function parseRageId($str) {
-		if (preg_match('/tvrage\.com\/shows\/id-(\d{1,6})/i', $str, $matches)) {
-			return trim($matches[1]);
-		}
-		return false;
-	}
-
-	/**
-	 * Confirm this is an NFO file.
-	 *
-	 * @param string $possibleNFO The nfo.
-	 * @param string $guid        The guid of the release.
-	 *
-	 * @return bool               True on success, False on failure.
-	 *
-	 * @access public
-	 */
-	public function isNFO(&$possibleNFO, $guid) {
-		if ($possibleNFO === false) {
-			return false;
-		}
-
-		// Make sure it's not too big or small, size needs to be at least 12 bytes for header checking. Ignore common file types.
-		$size = strlen($possibleNFO);
-		if ($size < 65535 &&
-			$size > 11 &&
-			!preg_match(
-				'/\A(\s*<\?xml|=newz\[NZB\]=|RIFF|\s*[RP]AR|.{0,10}(JFIF|matroska|ftyp|ID3))|;\s*Generated\s*by.*SF\w/i'
-				, $possibleNFO))
-		{
-			// File/GetId3 work with files, so save to disk.
-			$tmpPath = $this->tmpPath . $guid . '.nfo';
-			file_put_contents($tmpPath, $possibleNFO);
-
-			// Linux boxes have 'file' (so should Macs), Windows *can* have it too: see GNUWIN.txt in docs.
-			$result = Utility::fileInfo($tmpPath);
-			if (!empty($result)) {
-
-				// Check if it's text.
-				if (preg_match('/(ASCII|ISO-8859|UTF-(8|16|32).*?)\s*text/', $result)) {
-					@unlink($tmpPath);
-					return true;
-
-					// Or binary.
-				} else if (preg_match('/^(JPE?G|Parity|PNG|RAR|XML|(7-)?[Zz]ip)/', $result) ||
-					preg_match('/[\x00-\x08\x12-\x1F\x0B\x0E\x0F]/', $possibleNFO))
-				{
-					@unlink($tmpPath);
-					return false;
-				}
-			}
-
-			// If above checks couldn't  make a categorical identification, Use GetId3 to check if it's an image/video/rar/zip etc..
-			$getid3 = new getid3();
-			$check = $getid3->analyze($tmpPath);
-			@unlink($tmpPath);
-			if (isset($check['error'])) {
-
-				// Check if it's a par2.
-				$par2info = new Par2Info();
-				$par2info->setData($possibleNFO);
-				if ($par2info->error) {
-
-					// Check if it's an SFV.
-					$sfv = new SfvInfo();
-					$sfv->setData($possibleNFO);
-					if ($sfv->error) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Add an NFO from alternate sources. ex.: PreDB, rar, zip, etc...
-	 *
-	 * @param string $nfo     The nfo.
-	 * @param array  $release The SQL row for this release.
-	 * @param object $nntp    Instance of class NNTP.
-	 *
-	 * @return bool           True on success, False on failure.
-	 *
-	 * @access public
-	 */
-	public function addAlternateNfo(&$nfo, $release, $nntp)
-	{
-		if ($release['id'] > 0 && $this->isNFO($nfo, $release['guid'])) {
-
-			$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM releasenfo WHERE releaseid = %d', $release['id']));
-
-			if ($check === false) {
-				$this->pdo->queryInsert(
-					sprintf('INSERT INTO releasenfo (nfo, releaseid) VALUES (compress(%s), %d)',
-						$this->pdo->escapeString($nfo),
-						$release['id']
-					)
-				);
-			}
-
-			$this->pdo->queryExec(sprintf('UPDATE releases SET nfostatus = %d WHERE id = %d', self::NFO_FOUND, $release['id']));
-
-			if (!isset($release['completion'])) {
-				$release['completion'] = 0;
-			}
-
-			if ($release['completion'] == 0) {
-				$nzbContents = new NZBContents(
-					[
-						'Echo' => $this->echo,
-						'NNTP' => $nntp,
-						'Nfo'  => $this,
-						'Settings'   => $this->pdo,
-						'PostProcess'   => new PProcess(['Echo' => $this->echo, 'Settings' => $this->pdo, 'Nfo' => $this])
-					]
-				);
-				$nzbContents->parseNZB($release['guid'], $release['id'], $release['groupid']);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Get a string like this:
-	 * "AND r.nzbstatus = 1 AND r.nfostatus BETWEEN -8 AND -1 AND r.size < 1073741824 AND r.size > 1048576"
-	 * To use in a query.
-	 *
-	 * @param DB $pdo
-	 *
-	 * @return string
-	 * @access public
-	 * @static
-	 */
-	static public function NfoQueryString(DB &$pdo)
-	{
-		$s = new Sites();
-		$site = $s->get();
-		$maxSize = $site->maxsizetoprocessnfo;
-		$minSize = $site->minsizetoprocessnfo;
-		$maxRetries = (int)($site->maxnforetries >= 0 ? -((int)$site->maxnforetries + 1) : self::NFO_UNPROC);
-		return (
-		sprintf(
-			'AND r.nzbstatus = %d AND r.nfostatus BETWEEN %d AND %d %s %s',
-			Enzebe::NZB_ADDED,
-			($maxRetries < -8 ? -8 : $maxRetries),
-			self::NFO_UNPROC,
-			(($maxSize != '' && $maxSize > 0) ? ('AND r.size < ' . ($maxSize * 1073741824)) : ''),
-			(($minSize != '' && $minSize > 0) ? ('AND r.size > ' . ($minSize * 1048576)) : '')
-		)
-		);
-	}
-
-	/**
-	 * Attempt to find NFO files inside the NZB's of releases.
-	 *
-	 * @param object $nntp           Instance of class NNTP.
-	 * @param string $groupID        (optional) Group id.
-	 * @param string $guidChar       (optional) First character of the release GUID (used for multi-processing).
-	 * @param int    $processImdb    (optional) Attempt to find IMDB id's in the NZB?
-	 * @param int    $processTvrage  (optional) Attempt to find TvRage id's in the NZB?
-	 *
-	 * @return int                   How many NFO's were processed?
-	 *
-	 * @access public
-	 */
-	public function processNfoFiles($nntp, $groupID = '', $guidChar = '', $processImdb = 1, $processTvrage = 1)
-	{
-		$ret = 0;
-		$guidCharQuery = ($guidChar === '' ? '' : 'AND r.guid ' . $this->pdo->likeString($guidChar, false, true));
-		$groupIDQuery = ($groupID === '' ? '' : 'AND r.groupid = ' . $groupID);
-		$optionsQuery = self::NfoQueryString($this->pdo);
-
-		$res = $this->pdo->query(
-			sprintf('
-				SELECT r.id, r.guid, r.groupid, r.name
-				FROM releases r
-				WHERE 1=1 %s %s %s
-				ORDER BY r.nfostatus ASC, r.postdate DESC
-				LIMIT %d',
-				$optionsQuery,
-				$guidCharQuery,
-				$groupIDQuery,
-				$this->nzbs
-			)
-		);
-		$nfoCount = count($res);
-
-		if ($nfoCount > 0) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					PHP_EOL .
-					($guidChar === '' ? '' : '[' . $guidChar . '] ') .
-					($groupID === '' ? '' : '[' . $groupID . '] ') .
-					'Processing ' . $nfoCount .
-					' NFO(s), starting at ' . $this->nzbs .
-					' * = hidden NFO, + = NFO, - = no NFO, f = download failed.'
-				)
-			);
-
-			if ($this->echo) {
-				// Get count of releases per nfo status
-				$nfoStats = $this->pdo->queryDirect(
-					sprintf('
-						SELECT r.nfostatus AS status, COUNT(*) AS count
-						FROM releases r
-						WHERE 1=1 %s %s %s
-						GROUP BY r.nfostatus
-						ORDER BY r.nfostatus ASC',
-						$optionsQuery,
-						$guidCharQuery,
-						$groupIDQuery
-					)
-				);
-				if ($nfoStats instanceof Traversable) {
-					$outString = PHP_EOL . 'Available to process';
-					foreach ($nfoStats as $row) {
-						$outString .= ', ' . $row['status'] . ' = ' . number_format($row['count']);
-					}
-					$this->pdo->log->doEcho($this->pdo->log->header($outString . '.'));
-				}
-			}
-
-			$groups = new Groups(['Settings' => $this->pdo]);
-			$nzbContents = new NZBContents(
-				[
-					'Echo' => $this->echo,
-					'NNTP' => $nntp,
-					'Nfo' => $this,
-					'Settings' => $this->pdo,
-					'PostProcess' => new PProcess(['Echo' => $this->echo, 'Nfo' => $this, 'Settings' => $this->pdo])
-				]
-			);
-			$movie = new Film(['Echo' => $this->echo, 'Settings' => $this->pdo]);
-			$tvRage = new TvAnger(['Echo' => $this->echo, 'Settings' => $this->pdo]);
-
-			foreach ($res as $arr) {
-				$fetchedBinary = $nzbContents->getNFOfromNZB($arr['guid'], $arr['id'], $arr['groupid'], $groups->getByNameByID($arr['groupid']));
-				if ($fetchedBinary !== false) {
-					// Insert nfo into database.
-					$cp = 'COMPRESS(%s)';
-					$nc = $this->pdo->escapeString($fetchedBinary);
-
-					$ckreleaseid = $this->pdo->queryOneRow(sprintf('SELECT id FROM releasenfo WHERE releaseid = %d', $arr['id']));
-					if (!isset($ckreleaseid['id'])) {
-						$this->pdo->queryInsert(sprintf('INSERT INTO releasenfo (nfo, releaseid) VALUES (' . $cp . ', %d)', $nc, $arr['id']));
-					}
-					$this->pdo->queryExec(sprintf('UPDATE releases SET nfostatus = %d WHERE id = %d', self::NFO_FOUND, $arr['id']));
-					$ret++;
-					$movie->doMovieUpdate($fetchedBinary, 'nfo', $arr['id'], $processImdb);
-
-					// If set scan for tvrage info.
-					if ($processTvrage == 1) {
-						$rageId = $this->parseRageId($fetchedBinary);
-						if ($rageId !== false) {
-							$show = $tvRage->parseNameEpSeason($arr['name']);
-							if (is_array($show) && $show['name'] != '') {
-								// Update release with season, ep, and air date info (if available) from release title.
-								$tvRage->updateEpInfo($show, $arr['id']);
-
-								$rid = $tvRage->getByRageID($rageId);
-								if (!$rid) {
-									$tvrShow = $tvRage->getRageInfoFromService($rageId);
-									$tvRage->updateRageInfo($rageId, $show, $tvrShow, $arr['id']);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		// Remove nfo that we cant fetch after 5 attempts.
-		$releases = $this->pdo->queryDirect(
-			sprintf(
-				'SELECT r.id
-				FROM releases r
-				WHERE r.nzbstatus = %d
-				AND r.nfostatus < %d %s %s',
-				Enzebe::NZB_ADDED,
-				$this->maxRetries,
-				$groupIDQuery,
-				$guidCharQuery
-			)
-		);
-
-		if ($releases instanceof Traversable) {
-			foreach ($releases as $release) {
-				$this->pdo->queryExec(
-					sprintf('DELETE FROM releasenfo WHERE nfo IS NULL AND releaseid = %d', $release['id'])
-				);
-			}
-		}
-
-		// Set releases with no NFO.
-		$this->pdo->queryExec(
-			sprintf('
-				UPDATE releases r
-				SET r.nfostatus = %d
-				WHERE r.nzbstatus = %d
-				AND r.nfostatus < %d %s %s',
-				self::NFO_FAILED,
-				Enzebe::NZB_ADDED,
-				$this->maxRetries,
-				$groupIDQuery,
-				$guidCharQuery
-			)
-		);
-
-		if ($this->echo) {
-			if ($nfoCount > 0) {
-				echo PHP_EOL;
-			}
-			if ($ret > 0) {
-				$this->pdo->log->doEcho($ret . ' NFO file(s) found/processed.', true);
-			}
-		}
-		return $ret;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/Konsole.php b/lib/Konsole.php
deleted file mode 100644
index bd1359b00..000000000
--- a/lib/Konsole.php
+++ /dev/null
@@ -1,972 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/amazon.php");
-require_once(WWW_DIR."lib/site.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/genres.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-require_once(WWW_DIR."lib/Tmux.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("Enzebe.php");
-
-
-class Konsole
-{
-	const CONS_UPROC = 0; // Release has not been processed.
-	const CONS_NTFND = -2;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $pubkey;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $privkey;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $asstag;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $gameqty;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $sleeptime;
-
-	/**
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var string
-	 */
-	public $renamed;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->pubkey = $this->site->amazonpubkey;
-		$this->privkey = $this->site->amazonprivkey;
-		$this->asstag = $this->site->amazonassociatetag;
-		$this->gameqty = ($this->site->maxgamesprocessed != '') ? $this->site->maxgamesprocessed : 150;
-		$this->sleeptime = ($this->site->amazonsleep != '') ? $this->site->amazonsleep : 1000;
-		$this->imgSavePath = NN_COVERS . 'console' . DS;
-		$this->renamed = '';
-		if ($this->site->lookupgames == 2) {
-			$this->renamed = 'AND isrenamed = 1';
-		}
-		//$this->cleanconsole = ($this->pdo->getSetting('lookupgames') == 2) ? 'AND isrenamed = 1' : '';
-	}
-
-	public function getConsoleInfo($id)
-	{
-		return $this->pdo->queryOneRow(
-			sprintf(
-				"SELECT consoleinfo.*, genres.title AS genres FROM consoleinfo LEFT OUTER JOIN genres ON genres.id = consoleinfo.genreid WHERE consoleinfo.id = %d ",
-				$id
-			)
-		);
-	}
-
-	public function getConsoleInfoByName($title, $platform)
-	{
-		//only used to get a count of words
-		$searchwords = $searchsql = '';
-		$ft = $this->pdo->queryDirect("SHOW INDEX FROM consoleinfo WHERE key_name = 'ix_consoleinfo_title_platform_ft'");
-		if ($ft->rowCount() !== 2) {
-			$searchsql .= sprintf(" title %s AND platform %s'", $this->pdo->likeString($title, true, true), $this->pdo->likeString($platform, true, true));
-		} else {
-			$title = preg_replace('/( - | -|\(.+\)|\(|\))/', ' ', $title);
-			$title = preg_replace('/[^\w ]+/', '', $title);
-			$title = trim(preg_replace('/\s\s+/i', ' ', $title));
-			$title = trim($title);
-			$words = explode(' ', $title);
-
-			foreach ($words as $word) {
-				$word = trim(rtrim(trim($word), '-'));
-				if ($word !== '' && $word !== '-') {
-					$word = '+' . $word;
-					$searchwords .= sprintf('%s ', $word);
-				}
-			}
-			$searchwords = trim($searchwords);
-			$searchsql .= sprintf(" MATCH(title, platform) AGAINST(%s IN BOOLEAN MODE)", $this->pdo->escapeString($searchwords));
-		}
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM consoleinfo WHERE %s", $searchsql));
-	}
-
-	public function getRange($start, $num)
-	{
-		return $this->pdo->query(
-			sprintf(
-				"SELECT * FROM consoleinfo ORDER BY createddate DESC %s",
-				($start === false ? '' : ('LIMIT ' . $num . ' OFFSET ' . $start))
-			)
-		);
-	}
-
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow("SELECT COUNT(id) AS num FROM consoleinfo");
-		return ($res === false ? 0 : $res['num']);
-	}
-
-	public function getConsoleCount($cat, $maxage = -1, $excludedcats = array())
-	{
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$res = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT COUNT(DISTINCT r.consoleinfoid) AS num
-				FROM releases r
-				INNER JOIN consoleinfo con ON con.id = r.consoleinfoid AND con.title != '' AND con.cover = 1
-				WHERE r.nzbstatus = 1
-				AND r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease')
-				AND %s %s %s %s",
-				$this->getBrowseBy(),
-				$catsrch,
-				($maxage > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxage) : ''),
-				(count($excludedcats) > 0 ? (' AND r.categoryid NOT IN (' . implode(',', $excludedcats) . ')') : '')
-			)
-		);
-		return ($res === false ? 0 : $res["num"]);
-	}
-
-	public function getConsoleRange($cat, $start, $num, $orderby, $excludedcats = array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false) {
-			$limit = "";
-		} else {
-			$limit = " LIMIT " . $num . " OFFSET " . $start;
-		}
-
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0) {
-			$exccatlist = " AND r.categoryid NOT IN (" . implode(",", $excludedcats) . ")";
-		}
-
-		$order = $this->getConsoleOrder($orderby);
-		return $this->pdo->query(
-			sprintf(
-				"SELECT GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, "
-				. "GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, "
-				. "GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, "
-				. "GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, "
-				. "GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, "
-				. "GROUP_CONCAT(rn.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, "
-				. "GROUP_CONCAT(groups.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, "
-				. "GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, "
-				. "GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, "
-				. "GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, "
-				. "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, "
-				. "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, "
-				. "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, "
-				. "con.*, r.consoleinfoid, groups.name AS group_name, rn.id as nfoid FROM releases r "
-				. "LEFT OUTER JOIN groups ON groups.id = r.groupid "
-				. "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id "
-				. "INNER JOIN consoleinfo con ON con.id = r.consoleinfoid "
-				. "INNER JOIN genres ON con.genreid = genres.id "
-				. "WHERE r.nzbstatus = 1 AND con.title != '' AND "
-				. "r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') AND %s %s
-				%s "
-				. "GROUP BY con.id ORDER BY %s %s" . $limit, $browseby, $catsrch, $exccatlist, $order[0], $order[1]
-			)
-		);
-	}
-
-	public function getConsoleOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode("_", $order);
-		switch ($orderArr[0]) {
-			case 'title':
-				$orderfield = 'con.title';
-				break;
-			case 'platform':
-				$orderfield = 'con.platform';
-				break;
-			case 'releasedate':
-				$orderfield = 'con.releasedate';
-				break;
-			case 'genre':
-				$orderfield = 'con.genreid';
-				break;
-			case 'size':
-				$orderfield = 'r.size';
-				break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	public function getConsoleOrdering()
-	{
-		return array('title_asc', 'title_desc', 'posted_asc', 'posted_desc', 'size_asc', 'size_desc', 'files_asc', 'files_desc', 'stats_asc', 'stats_desc', 'platform_asc', 'platform_desc', 'releasedate_asc', 'releasedate_desc', 'genre_asc', 'genre_desc');
-	}
-
-	public function getBrowseByOptions()
-	{
-		return array('platform' => 'platform', 'title' => 'title', 'genre' => 'genreid');
-	}
-
-	public function getBrowseBy()
-	{
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		$like = 'LIKE';
-		foreach ($browsebyArr as $bbk => $bbv) {
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk])) {
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				$browseby .= 'con.' . $bbv . ' ' . $like . ' (' . $this->pdo->escapeString('%' . $bbs . '%') . ') AND ';
-			}
-		}
-		return $browseby;
-	}
-
-	public function makeFieldLinks($data, $field)
-	{
-		$tmpArr = explode(', ', $data[$field]);
-		$newArr = array();
-		$i = 0;
-		foreach ($tmpArr as $ta) {
-			// Only use first 6.
-			if ($i > 5) {
-				break;
-			}
-			$newArr[] = '<a href="' . WWW_TOP . '/console?' . $field . '=' . urlencode($ta) . '" title="' . $ta . '">' . $ta . '</a>';
-			$i++;
-		}
-		return implode(', ', $newArr);
-	}
-
-	public function update($id, $title, $asin, $url, $salesrank, $platform, $publisher, $releasedate, $esrb, $cover, $genreID, $review = 'review')
-	{
-		$this->pdo->queryExec(
-			sprintf("
-				UPDATE consoleinfo
-				SET
-					title = %s, asin = %s, url = %s, salesrank = %s, platform = %s, publisher = %s,
-					releasedate= %s, esrb = %s, cover = %d, genreid = %d, review = %s, updateddate = NOW()
-				WHERE id = %d",
-				$this->pdo->escapeString($title),
-				$this->pdo->escapeString($asin),
-				$this->pdo->escapeString($url),
-				$salesrank,
-				$this->pdo->escapeString($platform),
-				$this->pdo->escapeString($publisher),
-				$this->pdo->escapeString($releasedate),
-				$this->pdo->escapeString($esrb),
-				$cover,
-				$genreID,
-				($review == 'review' ? $review : $this->pdo->escapeString(substr($review, 0, 3000))),
-				$id
-			)
-		);
-	}
-
-	public function updateConsoleInfo($gameInfo)
-	{
-		$consoleId = self::CONS_NTFND;
-
-		$amaz = $this->fetchAmazonProperties($gameInfo['title'], $gameInfo['node']);
-
-		if ($amaz) {
-
-			$gameInfo['platform'] = $this->_replacePlatform($gameInfo['platform']);
-
-			$con = $this->_setConBeforeMatch($amaz, $gameInfo);
-
-			// Basically the XBLA names contain crap, this is to reduce the title down far enough to be usable.
-			if (stripos('xbla', $gameInfo['platform']) !== false) {
-				$gameInfo['title'] = substr($gameInfo['title'], 0, 10);
-				$con['substr'] = $gameInfo['title'];
-			}
-
-			if ($this->_matchConToGameInfo($gameInfo, $con) === true) {
-
-				$con += $this->_setConAfterMatch($amaz);
-				$con += $this->_matchGenre($amaz);
-
-				// Set covers properties
-				$con['coverurl'] = (string)$amaz->Items->Item->LargeImage->URL;
-
-				if ($con['coverurl'] != "") {
-					$con['cover'] = 1;
-				} else {
-					$con['cover'] = 0;
-				}
-
-				$consoleId = $this->_updateConsoleTable($con);
-
-				if ($this->echooutput) {
-					if ($consoleId !== -2) {
-						$this->pdo->log->doEcho(
-							$this->pdo->log->header("Added/updated game: ") .
-							$this->pdo->log->alternateOver("   Title:    ") .
-							$this->pdo->log->primary($con['title']) .
-							$this->pdo->log->alternateOver("   Platform: ") .
-							$this->pdo->log->primary($con['platform']) .
-							$this->pdo->log->alternateOver("   Genre: ") .
-							$this->pdo->log->primary($con['consolegenre'])
-						);
-					}
-				}
-			}
-		}
-		return $consoleId;
-	}
-
-	protected function _matchConToGameInfo($gameInfo = array(), $con = array())
-	{
-		$matched = false;
-
-		// This actual compares the two strings and outputs a percentage value.
-		$titlepercent = $platformpercent = '';
-
-		//Remove import tags from console title for match
-		$con['title'] = trim(preg_replace('/(\[|\().{2,} import(\]|\))$/i', '', $con['title']));
-
-		similar_text(strtolower($gameInfo['title']), strtolower($con['title']), $titlepercent);
-		similar_text(strtolower($gameInfo['platform']), strtolower($con['platform']), $platformpercent);
-
-		if (NN_DEBUG) {
-			echo(PHP_EOL ."Matched: Title Percentage 1: $titlepercent% between " . $gameInfo['title'] . " and " . $con['title'] . PHP_EOL);
-		}
-
-		// Since Wii Ware games and XBLA have inconsistent original platforms, as long as title is 50% its ok.
-		if (preg_match('/wiiware|xbla/i', trim($gameInfo['platform'])) && $titlepercent >= 50) {
-			$titlepercent = 100;
-			$platformpercent = 100;
-		}
-
-		// If the release is DLC matching will be difficult, so assume anything over 50% is legit.
-		if (isset($gameInfo['dlc']) && $gameInfo['dlc'] == 1 && $titlepercent >= 50) {
-			$titlepercent = 100;
-			$platformpercent = 100;
-		}
-
-		if ($titlepercent < 70) {
-			$gameInfo['title'] .= ' - ' . $gameInfo['platform'];
-			similar_text(strtolower($gameInfo['title']), strtolower($con['title']), $titlepercent);
-		}
-
-		if (NN_DEBUG) {
-			echo("Matched: Title Percentage 2: $titlepercent% between " . $gameInfo['title'] . " and " . $con['title'] . PHP_EOL);
-			echo("Matched: Platform Percentage: $platformpercent% between " . $gameInfo['platform'] . " and " . $con['platform'] . PHP_EOL);
-		}
-
-		// Platform must equal 100%.
-		if ($platformpercent == 100 && $titlepercent >= 70) {
-			$matched = true;
-		}
-
-		return $matched;
-	}
-
-	protected function _setConBeforeMatch($amaz, $gameInfo)
-	{
-		$con = array();
-		$con['platform'] = (string)$amaz->Items->Item->ItemAttributes->Platform;
-		if (empty($con['platform'])) {
-			$con['platform'] = $gameInfo['platform'];
-		}
-
-		if (stripos('Super', $con['platform']) !== false) {
-			$con['platform'] = 'SNES';
-		}
-
-		$con['title'] = (string)$amaz->Items->Item->ItemAttributes->Title;
-		if (empty($con['title'])) {
-			$con['title'] = $gameInfo['title'];
-		}
-
-		// Remove Download strings
-		$dlStrings = array(' [Online Game Code]', ' [Download]', ' [Digital Code]', ' [Digital Download]');
-		$con['title'] = str_ireplace($dlStrings, '', $con['title']);
-		return $con;
-	}
-
-	protected function _setConAfterMatch($amaz = array())
-	{
-		$con = array();
-		$con['asin'] = (string)$amaz->Items->Item->ASIN;
-
-		$con['url'] = (string)$amaz->Items->Item->DetailPageURL;
-		$con['url'] = str_replace("%26tag%3Dws", "%26tag%3Dopensourceins%2D21", $con['url']);
-
-		$con['salesrank'] = (string)$amaz->Items->Item->SalesRank;
-		if ($con['salesrank'] == "") {
-			$con['salesrank'] = "null";
-		}
-
-		$con['publisher'] = (string)$amaz->Items->Item->ItemAttributes->Publisher;
-		$con['esrb'] = (string)$amaz->Items->Item->ItemAttributes->ESRBAgeRating;
-		$con['releasedate'] = (string)$amaz->Items->Item->ItemAttributes->ReleaseDate;
-
-		if(!isset($con['releasedate'])){
-			$con['releasedate'] = "";
-		}
-
-		if ($con['releasedate'] == "''") {
-			$con['releasedate'] = "";
-		}
-
-		$con['review'] = "";
-		if (isset($amaz->Items->Item->EditorialReviews)) {
-			$con['review'] = trim(strip_tags((string)$amaz->Items->Item->EditorialReviews->EditorialReview->Content));
-		}
-		return $con;
-	}
-
-	protected function _matchGenre($amaz = array())
-	{
-
-		$genreName = '';
-
-		if (isset($amaz->Items->Item->BrowseNodes)) {
-			//had issues getting this out of the browsenodes obj
-			//workaround is to get the xml and load that into its own obj
-			$amazGenresXml = $amaz->Items->Item->BrowseNodes->asXml();
-			$amazGenresObj = simplexml_load_string($amazGenresXml);
-			$amazGenres = $amazGenresObj->xpath("//Name");
-
-			foreach ($amazGenres as $amazGenre) {
-				$currName = trim($amazGenre[0]);
-				if (empty($genreName)) {
-					$genreMatch = $this->matchBrowseNode($currName);
-					if ($genreMatch !== false) {
-						$genreName = $genreMatch;
-						break;
-					}
-				}
-			}
-		}
-
-		if ($genreName == '' && isset($amaz->Items->Item->ItemAttributes->Genre)) {
-			$a = (string)$amaz->Items->Item->ItemAttributes->Genre;
-			$b = str_replace('-', ' ', $a);
-			$tmpGenre = explode(' ', $b);
-
-			foreach ($tmpGenre as $tg) {
-				$genreMatch = $this->matchBrowseNode(ucwords($tg));
-				if ($genreMatch !== false) {
-					$genreName = $genreMatch;
-					break;
-				}
-			}
-		}
-
-		if (empty($genreName)) {
-			$genreName = 'Unknown';
-		}
-
-		$genreKey = $this->_getGenreKey($genreName);
-
-		return array('consolegenre' => $genreName, 'consolegenreid' => $genreKey);
-	}
-
-	protected function _getGenreKey($genreName)
-	{
-		$genreassoc = $this->_loadGenres();
-
-		if (in_array(strtolower($genreName), $genreassoc)) {
-			$genreKey = array_search(strtolower($genreName), $genreassoc);
-		} else {
-			$genreKey = $this->pdo->queryInsert(
-				sprintf("
-									INSERT INTO genres (title, type)
-									VALUES (%s, %d)",
-					$this->pdo->escapeString($genreName),
-					\Genres::CONSOLE_TYPE
-				)
-			);
-		}
-		return $genreKey;
-	}
-
-	protected function _loadGenres()
-	{
-		$gen = new \Genres(['Settings' => $this->pdo]);
-
-		$defaultGenres = $gen->getGenres(\Genres::CONSOLE_TYPE);
-		$genreassoc = array();
-		foreach ($defaultGenres as $dg) {
-			$genreassoc[$dg['id']] = strtolower($dg['title']);
-		}
-		return $genreassoc;
-	}
-
-	/** This function sets the platform retrieved
-	 *  from the release to the Amazon equivalent
-	 *
-	 * @param string $platform
-	 *
-	 **/
-	protected function _replacePlatform($platform)
-	{
-		switch (strtoupper($platform)) {
-
-			case 'X360':
-			case 'XBOX360':
-				$platform = 'Xbox 360';
-				break;
-			case 'XBOXONE':
-				$platform = 'Xbox One';
-				break;
-			case 'DSi':
-			case 'NDS':
-				$platform = 'Nintendo DS';
-				break;
-			case '3DS':
-				$platform = 'Nintendo 3DS';
-				break;
-			case 'PS2':
-				$platform = 'PlayStation2';
-				break;
-			case 'PS3':
-				$platform = 'PlayStation 3';
-				break;
-			case 'PS4':
-				$platform = 'PlayStation 4';
-				break;
-			case 'PSP':
-				$platform = 'Sony PSP';
-				break;
-			case 'PSVITA':
-				$platform = 'PlayStation Vita';
-				break;
-			case 'PSX':
-			case 'PSX2PSP':
-				$platform = 'PlayStation';
-				break;
-			case 'WIIU':
-				$platform = 'Nintendo Wii U';
-				break;
-			case 'WII':
-				$platform = 'Nintendo Wii';
-				break;
-			case 'NGC':
-				$platform = 'GameCube';
-				break;
-			case 'N64':
-				$platform = 'Nintendo 64';
-				break;
-			case 'NES':
-				$platform = 'Nintendo NES';
-				break;
-			case 'SUPER NINTENDO':
-			case 'NINTENDO SUPER NES':
-			case 'SNES':
-				$platform = 'SNES';
-				break;
-		}
-		return $platform;
-	}
-
-	protected function _updateConsoleTable($con = array())
-	{
-		$ri = new \ReleaseImage($this->pdo);
-
-		$check = $this->pdo->queryOneRow(
-			sprintf('
-							SELECT id
-							FROM consoleinfo
-							WHERE asin = %s',
-				$this->pdo->escapeString($con['asin'])
-			)
-		);
-
-		if ($check === false) {
-			$consoleId = $this->pdo->queryInsert(
-				sprintf(
-					"INSERT INTO consoleinfo (title, asin, url, salesrank, platform, publisher, genreid, esrb, releasedate, review, cover, createddate, updateddate)
-					VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, NOW(), NOW())",
-					$this->pdo->escapeString($con['title']),
-					$this->pdo->escapeString($con['asin']),
-					$this->pdo->escapeString($con['url']),
-					$con['salesrank'],
-					$this->pdo->escapeString($con['platform']),
-					$this->pdo->escapeString($con['publisher']),
-					($con['consolegenreid'] == -1 ? "null" : $con['consolegenreid']),
-					$this->pdo->escapeString($con['esrb']),
-					($con['releasedate'] != "" ? $this->pdo->escapeString($con['releasedate']) : "null"),
-					$this->pdo->escapeString(substr($con['review'], 0, 3000)),
-					$con['cover']
-				)
-			);
-			if($con['cover'] === 1){
-				$con['cover'] = $ri->saveImage($consoleId, $con['coverurl'], $this->imgSavePath, 250, 250);
-			}
-		} else {
-			$consoleId = $check['id'];
-
-			if($con['cover'] === 1){
-				$con['cover'] = $ri->saveImage($consoleId, $con['coverurl'], $this->imgSavePath, 250, 250);
-			}
-
-			$this->update(
-				$consoleId, $con['title'], $con['asin'], $con['url'], $con['salesrank'],
-				$con['platform'], $con['publisher'], (isset($con['releasedate']) ? $con['releasedate']: null), $con['esrb'],
-				$con['cover'], $con['consolegenreid'], (isset($con['review']) ? $con['review'] : null)
-			);
-		}
-		return $consoleId;
-	}
-
-	public function fetchAmazonProperties($title, $node)
-	{
-		$obj = new \AmazonProductAPI($this->pubkey, $this->privkey, $this->asstag);
-		try {
-			$result = $obj->searchProducts($title, \AmazonProductAPI::GAMES, "NODE", $node);
-		} catch (Exception $e) {
-			$result = false;
-		}
-		return $result;
-	}
-
-	public function processConsoleReleases()
-	{
-		$res = $this->pdo->queryDirect(
-			sprintf('
-							SELECT searchname, id
-							FROM releases
-							WHERE nzbstatus = %d %s
-							AND consoleinfoid IS NULL
-							AND categoryid BETWEEN 1000 AND 1999
-							ORDER BY postdate DESC
-							LIMIT %d',
-				\Enzebe::NZB_ADDED,
-				$this->renamed,
-				$this->gameqty
-			)
-		);
-
-		if ($res instanceof \Traversable && $res->rowCount() > 0) {
-
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header("Processing " . $res->rowCount() . ' console release(s).'));
-			}
-
-			foreach ($res as $arr) {
-				$startTime = microtime(true);
-				$usedAmazon = false;
-				$gameId = self::CONS_NTFND;
-				$gameInfo = $this->parseTitle($arr['searchname']);
-
-				if ($gameInfo !== false) {
-					if ($this->echooutput) {
-						$this->pdo->log->doEcho(
-							$this->pdo->log->headerOver('Looking up: ') .
-							$this->pdo->log->primary(
-								$gameInfo['title'] .
-								' (' .
-								$gameInfo['platform'] . ')'
-							)
-						);
-					}
-
-					// Check for existing console entry.
-					$gameCheck = $this->getConsoleInfoByName($gameInfo['title'], $gameInfo['platform']);
-
-					if ($gameCheck === false) {
-						$gameId = $this->updateConsoleInfo($gameInfo);
-						$usedAmazon = true;
-					} else {
-						if ($this->echooutput) {
-							$this->pdo->log->doEcho(
-								$this->pdo->log->headerOver("Found Local: ") .
-								$this->pdo->log->primary("{$gameCheck['title']} - {$gameCheck['platform']}") .
-								PHP_EOL
-							);
-						}
-						$gameId = $gameCheck['id'];
-					}
-
-				} elseif ($this->echooutput) {
-					echo '.';
-				}
-
-				// Update release.
-				$this->pdo->queryExec(
-					sprintf('
-								UPDATE releases
-								SET consoleinfoid = %d
-								WHERE id = %d',
-						$gameId,
-						$arr['id']
-					)
-				);
-
-				// Sleep to not flood amazon.
-				$diff = floor((microtime(true) - $startTime) * 1000000);
-				if ($this->sleeptime * 1000 - $diff > 0 && $usedAmazon === true) {
-					usleep($this->sleeptime * 1000 - $diff);
-				}
-			}
-
-		} else if ($this->echooutput) {
-			$this->pdo->log->doEcho($this->pdo->log->header('No console releases to process.'));
-		}
-	}
-
-	function parseTitle($releasename)
-	{
-		$releasename = preg_replace('/\sMulti\d?\s/i', '', $releasename);
-		$result = array();
-
-		// Get name of the game from name of release.
-		if (preg_match('/^(.+((abgx360EFNet|EFNet\sFULL|FULL\sabgxEFNet|abgx\sFULL|abgxbox360EFNet)\s|illuminatenboard\sorg|Place2(hom|us)e.net|united-forums? co uk|\(\d+\)))?(?P<title>.*?)[\.\-_ ](v\.?\d\.\d|PAL|NTSC|EUR|USA|JP|ASIA|JAP|JPN|AUS|MULTI(\.?\d{1,2})?|PATCHED|FULLDVD|DVD5|DVD9|DVDRIP|PROPER|REPACK|RETAIL|DEMO|DISTRIBUTION|REGIONFREE|[\. ]RF[\. ]?|READ\.?NFO|NFOFIX|PSX(2PSP)?|PS[2-4]|PSP|PSVITA|WIIU|WII|X\-?BOX|XBLA|X360|3DS|NDS|N64|NGC)/i', $releasename, $matches)) {
-			$title = $matches['title'];
-
-			// Replace dots, underscores, or brackets with spaces.
-			$result['title'] = str_replace(['.','_','%20', '[', ']'], ' ', $title);
-			$result['title'] = str_replace([' RF ', '.RF.', '-RF-', '_RF_'], ' ', $result['title']);
-			//Remove format tags from release title for match
-			$result['title'] = trim(preg_replace('/PAL|MULTI(\d)?|NTSC-?J?|\(JAPAN\)/i', '', $result['title']));
-			//Remove disc tags from release title for match
-			$result['title'] = trim(preg_replace('/Dis[ck] \d.*$/i', '', $result['title']));
-
-			// Needed to add code to handle DLC Properly.
-			if (stripos('dlc', $result['title']) !== false) {
-				$result['dlc'] = '1';
-				if (stripos('Rock Band Network', $result['title']) !== false) {
-					$result['title'] = 'Rock Band';
-				} else if (strpos('-', $result['title']) !== false) {
-					$dlc = explode("-", $result['title']);
-					$result['title'] = $dlc[0];
-				} else if (preg_match('/(.*? .*?) /i', $result['title'], $dlc)) {
-					$result['title'] = $dlc[0];
-				}
-			}
-
-		} else {
-			$title = '';
-		}
-
-		// Get the platform of the release.
-		if (preg_match('/[\.\-_ ](?P<platform>XBLA|WiiWARE|N64|SNES|NES|PS[2-4]|PS 3|PSX(2PSP)?|PSP|WIIU|WII|XBOX360|XBOXONE|X\-?BOX|X360|3DS|NDS|N?GC)/i', $releasename, $matches)) {
-			$platform = $matches['platform'];
-
-			if (preg_match('/^N?GC$/i', $platform)) {
-				$platform = 'NGC';
-			}
-
-			if (stripos('PSX2PSP', $platform) === 0) {
-				$platform = 'PSX';
-			}
-
-			if (!empty($title) && stripos('XBLA', $platform) === 0) {
-				if (stripos('dlc', $title) !== false) {
-					$platform = 'XBOX360';
-				}
-			}
-
-			$browseNode = $this->getBrowseNode($platform);
-			$result['platform'] = $platform;
-			$result['node'] = $browseNode;
-		}
-		$result['release'] = $releasename;
-		array_map("trim", $result);
-
-		/* Make sure we got a title and platform otherwise the resulting lookup will probably be shit.
-		   Other option is to pass the $release->categoryid here if we don't find a platform but that
-		   would require an extra lookup to determine the name. In either case we should have a title at the minimum. */
-
-		return (isset($result['title']) && !empty($result['title']) && isset($result['platform'])) ? $result : false;
-	}
-
-	function getBrowseNode($platform)
-	{
-		switch ($platform) {
-			case 'PS2':
-				$nodeId = '301712';
-				break;
-			case 'PS3':
-				$nodeId = '14210751';
-				break;
-			case 'PS4':
-				$nodeId = '6427814011';
-				break;
-			case 'PSP':
-				$nodeId = '11075221';
-				break;
-			case 'PSVITA':
-				$nodeId = '3010556011';
-				break;
-			case 'PSX':
-				$nodeId = '294940';
-				break;
-			case 'WII':
-			case 'Wii':
-				$nodeId = '14218901';
-				break;
-			case 'WIIU':
-			case 'WiiU':
-				$nodeId = '3075112011';
-				break;
-			case 'XBOX360':
-			case 'X360':
-				$nodeId = '14220161';
-				break;
-			case 'XBOXONE':
-				$nodeId = '6469269011';
-				break;
-			case 'XBOX':
-			case 'X-BOX':
-				$nodeId = '537504';
-				break;
-			case 'NDS':
-				$nodeId = '11075831';
-				break;
-			case '3DS':
-				$nodeId = '2622269011';
-				break;
-			case 'GC':
-			case 'NGC':
-				$nodeId = '541022';
-				break;
-			case 'N64':
-				$nodeId = '229763';
-				break;
-			case 'SNES':
-				$nodeId = '294945';
-				break;
-			case 'NES':
-				$nodeId = '566458';
-				break;
-			default:
-				$nodeId = '468642';
-				break;
-		}
-
-		return $nodeId;
-	}
-
-	public function matchBrowseNode($nodeName)
-	{
-		$str = '';
-
-		//music nodes above mp3 download nodes
-		switch ($nodeName) {
-			case 'Action_shooter':
-			case 'Action_Games':
-			case 'Action_games':
-				$str = 'Action';
-				break;
-			case 'Action/Adventure':
-			case 'Action\Adventure':
-			case 'Adventure_games':
-				$str = 'Adventure';
-				break;
-			case 'Boxing_games':
-			case 'Sports_games':
-				$str = 'Sports';
-				break;
-			case 'Fantasy_action_games':
-				$str = 'Fantasy';
-				break;
-			case 'Fighting_action_games':
-				$str = 'Fighting';
-				break;
-			case 'Flying_simulation_games':
-				$str = 'Flying';
-				break;
-			case 'Horror_action_games':
-				$str = 'Horror';
-				break;
-			case 'Kids & Family':
-				$str = 'Family';
-				break;
-			case 'Role_playing_games':
-				$str = 'Role-Playing';
-				break;
-			case 'Shooter_action_games':
-				$str = 'Shooter';
-				break;
-			case 'Singing_games':
-				$str = 'Music';
-				break;
-			case 'Action':
-			case 'Adventure':
-			case 'Arcade':
-			case 'Board Games':
-			case 'Cards':
-			case 'Casino':
-			case 'Collections':
-			case 'Family':
-			case 'Fantasy':
-			case 'Fighting':
-			case 'Flying':
-			case 'Horror':
-			case 'Music':
-			case 'Puzzle':
-			case 'Racing':
-			case 'Rhythm':
-			case 'Role-Playing':
-			case 'Simulation':
-			case 'Shooter':
-			case 'Shooting':
-			case 'Sports':
-			case 'Strategy':
-			case 'Trivia':
-				$str = $nodeName;
-				break;
-		}
-
-		return ($str != '') ? $str : false;
-	}
-
-
-}
\ No newline at end of file
diff --git a/lib/MiscSorter.php b/lib/MiscSorter.php
deleted file mode 100644
index 73a1acbf6..000000000
--- a/lib/MiscSorter.php
+++ /dev/null
@@ -1,705 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/amazon.php");
-require_once(WWW_DIR . "/lib/Categorize.php");
-require_once(WWW_DIR . "/lib/book.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/music.php");
-require_once(WWW_DIR . "/lib/Musik.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("Info.php");
-require_once("Film.php");
-require_once("Enzebe.php");
-require_once("namefixer.php");
-require_once("Konsole.php");
-require_once("ReleaseCleaner.php");
-
-
-/**
- * Class MiscSorter
- */
-class MiscSorter
-{
-
-	const PROC_SORTER_NONE = 0; //Release has not been run through MiscSorter before
-	const PROC_SORTER_DONE = 1; //Release has been processed by MiscSorter
-
-	private $qty;
-	private $echooutput;
-	private $pdo;
-	private $category;
-	private $movie;
-	private $nfolib;
-
-	/**
-	 * @param bool $echooutput
-	 * @param object $pdo
-	 */
-	public function __construct($echooutput = false, &$pdo = null)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$this->qty = 100;
-
-		$this->pdo = ($pdo instanceof DB ? $pdo : new DB());
-
-		$this->category = new Categorize();
-		$this->movie = new Film();
-		$this->namefixer = new NameFixer();
-		$this->music = new Musik();
-		$this->console = new Konsole();
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->book = new Book();
-		$this->c = new ColorCLI();
-	}
-
-	// Main function that determines which operation(s) should be run based on the releases NFO file
-	public function nfosorter($category = 0, $id = 0)
-	{
-		$idarr = ($id != 0 ? sprintf('AND r.id = %d', $id) : '');
-		$cat = ($category = 0 ? sprintf('AND r.categoryid = %d', Category::CAT_MISC) : sprintf('AND r.categoryid = %d', $category));
-
-		$res = $this->pdo->queryDirect(
-			sprintf("
-							SELECT UNCOMPRESS(rn.nfo) AS nfo,
-								r.id, r.name, r.searchname
-							FROM releasenfo rn
-							INNER JOIN releases r ON rn.releaseid = r.id
-							INNER JOIN groups g ON r.groupid = g.id
-							WHERE rn.nfo IS NOT NULL
-							AND r.proc_sorter = %d
-							AND r.prehashid = 0 %s",
-				self::PROC_SORTER_NONE,
-				($idarr = '' ? $cat : $idarr)
-			)
-		);
-
-		if ($res !== false && $res instanceof Traversable) {
-
-			foreach ($res as $row) {
-
-				if (strlen($row['nfo']) > 100) {
-
-					$nfo = utf8_decode($row['nfo']);
-
-					unset($row['nfo']);
-					$matches = $this->_sortTypeFromNFO($nfo);
-
-					array_shift($matches);
-					$matches = $this->doarray($matches);
-
-					foreach ($matches as $m) {
-
-						$case = (isset($m) ? str_replace(' ', '', $m) : '');
-
-						if (in_array($m, ['os', 'platform', 'console']) && preg_match('/(?:\bos\b(?: type)??|platform|console)[ \.\:\}]+(\w+?).??(\w*?)/iU', $nfo, $set)) {
-							if (is_array($set)) {
-								if (isset($set[1])) {
-									$case = strtolower($set[1]);
-								} else if (isset($set[2]) && strlen($set[2]) > 0 && (stripos($set[2], 'mac') !== false || stripos($set[2], 'osx') !== false)) {
-									$case = strtolower($set[2]);
-								} else {
-									$case = str_replace(' ', '', $m);
-								}
-							}
-						}
-
-						$pos = $this->nfopos($this->_cleanStrForPos($nfo), $this->_cleanStrForPos($m));
-						if ($pos !== false && $pos > 0.55 && $case !== 'imdb') {
-							break;
-						} else if ($ret = $this->matchnfo($case, $nfo, $row)) {
-							return $ret;
-						}
-					}
-				}
-			}
-		}
-		$this->_setProcSorter(self::PROC_SORTER_DONE, $id);
-		echo ".";
-
-		return false;
-	}
-
-	private function _sortTypeFromNFO($nfo = '')
-	{
-		$pattern = '/.+(\.rar|\.001) [0-9a-f]{6,10}?|(imdb)\.[a-z0-9\.\_\-\/]+?(?:tt|\?)\d+?\/?|(tvrage)\.com\/|(\bASIN)|' .
-			'(isbn)|(UPC\b)|(comic book)|(comix)|(tv series)|(\bos\b)|(documentaries)|(documentary)|(doku)|(macintosh)|' .
-			'(dmg)|(mac[ _\.\-]??os[ _\.\-]??x??)|(\bos\b\s??x??)|(\bosx\b)|(\bios\b)|(iphone)|(ipad)|(ipod)|(pdtv)|' .
-			'(hdtv)|(video streams)|(movie)|(audiobook)|(audible)|(recorded books)|(spoken book)|(speech)|(read by)\:?|' .
-			'(narrator)\:?|(narrated by)|(dvd)|(ntsc)|(m4v)|(mov\b)|(avi\b)|(xvid)|(divx)|(mkv)|(amazon\.)[a-z]{2,3}.*\/dp\/|' .
-			'(anidb.net).*aid=|(\blame\b)|(\btrack)|(trax)|(t r a c k)|(music)|(44.1kHz)|video (game)|type:(game)|(game) Type|' .
-			'(game)[ \.]+|(platform)|(console)|\b(win(?:dows|all|xp)\b)|(\bwin\b)|(m3u)|(flac\b)|(?<!writing )(application)(?! util)|' .
-			'(plugin)|(\bcrack\b)|(install\b)|(setup)|(magazin)|(x264)|(h264)|(itunes\.apple\.com\/)|(sport)|(deportes)|(nhl)|' .
-			'(nfl)|(\bnba)|(ncaa)|(album)|(\bepub\b)|(mobi)|format\W+?[^\r]*(pdf)/iU';
-
-		return preg_split($pattern, $nfo, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-	}
-
-	private function doarray($matches)
-	{
-		$r = array();
-		$i = 0;
-
-		$matches = array_count_values($matches);
-		$matches = array_change_key_case($matches, CASE_LOWER);
-
-		foreach ($matches as $m => $v) {
-			$x = -1;
-
-			if (strlen($m) < 50) {
-				$str = preg_replace("/\s/iU", "", $m);
-
-				$m = strtolower($str);
-
-				$x = 0;
-
-				if ($m == 'imdb') {
-					$x = -11;
-				} else if ($m == 'anidb.net') {
-					$x = -10;
-				} else if ($m == 'upc') {
-					$x = -9;
-				} else if ($m == 'amazon.') {
-					$x = -8;
-				} else if ($m == 'asin' || $m == 'isbn') {
-					$x = -7;
-				} else if ($m == 'tvrage') {
-					$x = -6;
-				} else if ($m == 'audiobook') {
-					$x = -5;
-				} else if ($m == 'os') {
-					$x = -4;
-				} else if (in_array($m, ['mac', 'macintosh', 'dmg', 'macos', 'macosx', 'osx'])) {
-					$x = -3;
-				} else if ($m == 'itunes.apple.com/') {
-					$x = -2;
-				} else if (in_array($m, ['documentaries', 'documentary', 'doku'])) {
-					$x = -1;
-				} else if (preg_match('/sport|deportes|nhl|nfl|\bnba/i', $m)) {
-					$x = 1000;
-				} else if (preg_match('/avi|xvid|divx|mkv/i', $m)) {
-					$x = 1001;
-				} else if (preg_match('/\.(?:rar|001)/i', $m)) {
-					$x = 1002;
-				} else if (preg_match('/pdf/i', $m)) {
-					$x = 1003;
-				}
-			}
-
-			if ($x != -1) {
-				if ($x == 0) {
-					$r[$i++] = $m;
-				} else if (isset($r[$x])) {
-					$r[$x + mt_rand(0, 100) / 100] = $m;
-				} else {
-					$r[$x] = $m;
-				}
-			}
-		}
-		ksort($r);
-		$r = array_values($r);
-		return $r;
-	}
-
-	private function nfopos($nfo, $str)
-	{
-		$pos = stripos($nfo, $str);
-		if ($pos !== false) {
-			return $pos / strlen($nfo);
-		} else {
-			return false;
-		}
-	}
-
-	private function _cleanStrForPos($str)
-	{
-		$str = str_replace(array(' ', '\t', '_', '.', '?'), " ", $str);
-		$str = str_replace('  ', " ", $str);
-		$str = preg_replace('/^\s+?/Umi', "", $str);
-
-		return $str;
-	}
-
-	private function matchnfo($case, $nfo, $row)
-	{
-		$ok = false;
-
-		switch (strtolower($case)) {
-			case 't r a c k':
-			case 'track':
-			case 'trax':
-			case 'lame':
-			case 'album':
-			case 'music':
-			case '44.1kHz':
-			case 'm3u':
-			case 'flac':
-				$ok = $this->_matchNfoAudio($nfo, $row);
-				break;
-			case 'dmg':
-			case 'mac':
-			case 'macintosh':
-			case 'macos':
-			case 'macosx':
-			case 'osx':
-			case 'windows':
-			case 'win':
-			case 'winall':
-			case 'winxp':
-			case 'plugin':
-			case 'crack':
-			case 'linux':
-			case 'install':
-			case 'application':
-			case 'android':
-			case 'ios':
-			case 'iphone':
-			case 'ipad':
-			case 'ipod':
-				$ok = $this->doOS($nfo, $row['id']);
-				break;
-			case 'game':
-				$set = preg_split('/\>(.*)\</Ui', $nfo, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-				if (isset($set[1])) {
-					$ok = $this->dodbupdate($row['id'], $this->cleanname($set[1]));
-				} else {
-					$ok = $this->doOS($nfo, $row['id']);
-				}
-				break;
-			case 'imdb':
-				$ok = $this->_matchNfoImdb($nfo, $row);
-				break;
-			case 'audiobook':
-			case 'audible':
-			case 'recordedbooks':
-			case 'spokenbook':
-			case 'readby':
-			case 'narratedby':
-			case 'narrator':
-			case 'speech':
-				$ok = $this->_matchNfoBook($nfo, $row);
-				break;
-			case 'comicbook':
-			case 'comix':
-				$ok = $this->dodbupdate($row['id'], $this->cleanname($row['searchname']));
-				break;
-			case "asin":
-			case "isbn":
-				if (preg_match('/(?:isbn|asin)[ \:\.=]*? *?([a-zA-Z0-9\-\.]{8,20}?)/iU', $nfo, $set)) {
-					$set[1] = str_replace(['-', '.'], '', $set[1]);
-
-					if (strlen($set[1]) <= 13) {
-						$set[2] = $set[1];
-						$set[1] = "com";
-						$ok = $this->doAmazon($row['name'], $row['id'], $nfo, $set[2], $set[1], $case, $row);
-					}
-				}
-				break;
-			case "amazon.":
-				if (preg_match('/amazon\.([a-z]*?\.?[a-z]{2,3}?)\/.*\/dp\/([a-zA-Z0-9]{8,10}?)/iU', $nfo, $set)) {
-					$ok = $this->doAmazon($row['name'], $row['id'], $nfo, $set[2], $set[1], 'asin', $row);
-				}
-				break;
-			case "upc":
-				if (preg_match('/UPC\:?? *?([a-zA-Z0-9]*?)/iU', $nfo, $set)) {
-					$set[2] = $set[1];
-					$set[1] = "All";
-					$ok = $this->doAmazon($row['name'], $row['id'], $nfo, $set[2], $set[1], $case, $row);
-				}
-				break;
-		}
-
-		return $ok;
-	}
-
-	private function _matchNfoAudio($nfo, $row)
-	{
-		if (preg_match('/(a\s?r\s?t\s?i\s?s\s?t|l\s?a\s?b\s?e\s?l|mp3|e\s?n\s?c\s?o\s?d\s?e\s?r|rip|stereo|mono|single charts)/i', $nfo)
-			&& !preg_match('/(\bavi\b|x\.?264|divx|mvk|xvid|install(?!ation)|Setup\.exe|unzip|unrar)/i', $nfo)
-		) {
-			$artist = preg_split('/(?:a\s?r\s?t\s?i\s?s\s?ts?\b[^ \.\:]*) *?(?!(?:[^\s\.\:\}\]\*\xb0-\x{3000}\?] ?){2,}?\b)(?:[\*\?\-\=\|\;\:\.\[\}\]\(\s\xb0-\x{3000}\?]+?)[\s\.\>\:\(\)\xb0-\x{3000}\?]((?!\:) ?[a-z0-9\&].+)(?:\s\s\s|$|\.\.\.)/Uuim', $nfo, 0, PREG_SPLIT_DELIM_CAPTURE);
-			$title = preg_split('/(?:t+\s?i+\s?t+\s?l+\s?e+\b|a\s?l\s?b\s?u\s?m\b) *?(?!(?:[^\s\.\:\}\]\*\xb0-\x{3000}\?] ?){2,}?\b)(?:[\*\?\-\=\|\;\:\.\[\}\]\(\s\xb0-\x{3000}\?]+?)[\s\.\>\:\(\)\xb0-\x{3000}\?]((?!\:) ?[a-z0-9\&].+)(?:\s\s\s|$|\.\.\.)/Uuim', $nfo, 0, PREG_SPLIT_DELIM_CAPTURE);
-
-			if (!isset($title[1]) || !isset($artist[1])) {
-				if (preg_match('/presents[\W\. \xb0-\x{3000}]+? ([^\-]+?) \- ([a-z0-9]?(?!\:).+(?:\s\s\s))/iuUm', $nfo, $matches)) {
-					$artist[1] = $matches[1];
-					$title[1] = $matches[2];
-				}
-				if (!isset($matches[2]) && preg_match('/[\h\_\.\:\xb0-\x{3000}]{2,}?([a-z].+) \- (.+?)(?:[\?\s\_\.\:\xb0-\x{3000}]{2,}|$)/Uiu', $nfo, $matches)) {
-					$pos = $this->nfopos($this->_cleanStrForPos($nfo), $this->_cleanStrForPos($matches[1] . " - " . $matches[2]));
-					if ($pos !== false && $pos < 0.45 && !preg_match('/\:\d\d$/', $matches[2]) && strlen($matches[1]) < 48 && strlen($matches[2]) < 64
-						&& strpos('title', $matches[1]) === false && strpos('title', $matches[2]) === false
-					) {
-						$artist[1] = $matches[1];
-						$title[1] = $matches[2];
-					}
-				}
-			}
-			if (isset($artist[1]) && $artist[1] == " ") {
-				$artist[1] = $artist[3];
-			}
-			if (isset($title[1]) && isset($artist[1])) {
-				return $this->dodbupdate($row['id'], $this->cleanname($artist[1] . " - " . $title[1]), null, 'audioNFO');
-			}
-		}
-
-		return false;
-	}
-
-	private function dodbupdate($id = 0, $name = '', $typeid = 0, $type = '')
-	{
-		$nameChanged = false;
-
-		$release = $this->pdo->queryOneRow(
-			sprintf("
-							SELECT r.id AS releaseid, r.searchname AS searchname,
-								r.name AS name, r.categoryid, r.groupid
-							FROM releases r
-							WHERE r.id = %d",
-				$id
-			)
-		);
-
-		if ($release !== false && is_array($release) && $name !== '' && $name !== $release['searchname'] && strlen($name) >= 10) {
-			$this->namefixer->updateRelease($release, $name, $type, 1, "sorter ", 1, 1);
-			$nameChanged = true;
-		} else {
-			$this->_setProcSorter(self::PROC_SORTER_DONE, $id);
-		}
-
-		if ($type !== '' && in_array($type, ['bookinfoid', 'consoleinfoid', 'imdbid', 'musicinfoid'])) {
-			$this->pdo->queryExec(
-				sprintf('
-								UPDATE releases
-								SET %s = %d
-								WHERE id = %d',
-					$type,
-					$typeid,
-					$id
-				)
-			);
-		}
-
-		return $nameChanged;
-	}
-
-	private function _setProcSorter($status = 0, $id = 0)
-	{
-		$this->pdo->queryExec(
-			sprintf('
-						UPDATE releases
-						SET proc_sorter = %d
-						WHERE id = %d',
-				$status,
-				$id
-			)
-		);
-	}
-
-	/**
-	 * This function cleans the release name before updating
-	 *
-	 * @param string $name
-	 *
-	 * @return string $name
-	 */
-	private function cleanname($name)
-	{
-		do {
-			$original = $name;
-			$name = preg_replace("/[\{\[\(]\d+[ \.\-\/]+\d+[\]\}\)]/iU", " ", $name);
-			$name = preg_replace("/[\x01-\x1f\!\?\[\{\}\]\/\:\|]+/iU", " ", $name);
-			$name = str_replace("  ", " ", $name);
-			$name = preg_replace("/^[\s\.]+|[\s\.]{2,}$/iU", "", $name);
-			$name = str_replace(" - - ", " - ", $name);
-			$name = preg_replace("/^[\s\-\_\.]/iU", "", $name);
-			$name = trim($name);
-		} while ($original != $name);
-
-		return mb_strimwidth($name, 0, 255);
-	}
-
-	private function doOS($nfo = '', $id = 0)
-	{
-		$ok = false;
-		$tmp = array();
-
-		$nfo = preg_replace("/[^\x09-\x80]|\?/", "", $nfo);
-		$nfo = preg_replace("/[\x01-\x09\x0e-\x20]/", " ", $nfo);
-
-		$cleanNfo = $this->_cleanStrForPos($nfo);
-
-		$pattern = '/(?<!fine[ \-\.])(?:\btitle|\bname|release)\b(?![ \-\.]type|[ \-\.]info(?:rmation)?|[ \-\.]date|[ \-\.]name|[ \-\.]notes)(?:[\-\:\.\}\[\s]+?) ?([a-z0-9\.\- \(\)\']+?)/Ui';
-		$set = $this->_doOSpregSplit($pattern, $cleanNfo);
-
-		if (!isset($set[1]) || strlen($set[1]) < 3) {
-			$pattern = '/(?:(?:presents?|p +r +e +s +e +n +t +s)(?:[^a-z0-9]+?))([a-z0-9 \.\-\_\']+?)/Ui';
-			$set = $this->_doOSpregSplit($pattern, $cleanNfo);
-		}
-
-		if (isset($set[1])) {
-			if (preg_match('/^(.+)(\(c\)|\xA9)/i', $set[1], $tmp)) {
-				$set[1] = $tmp[1];
-			}
-			if (strlen($set[1]) < 128 && !preg_match('/(another)? *(fine)? *release/i', $set[1])) {
-				$ok = $this->dodbupdate($id, $this->cleanname($set[1]), null, "app");
-			}
-		}
-
-		return $ok;
-	}
-
-	private function _doOSpregSplit($pattern = '', $nfo = '')
-	{
-		return preg_split($pattern, $nfo, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-	}
-
-	private function _matchNfoImdb($nfo, $row)
-	{
-		$imdb = $this->movie->doMovieUpdate($nfo, "sorter", $row['id']);
-		if (isset($imdb) && $imdb > 0) {
-			return $this->dodbupdate($row['id'], $this->moviename($row['id'], $row['searchname']), $imdb, 'imdbid');
-		}
-
-		return false;
-	}
-
-	private function moviename($nfo = '', $imdb = 0, $name = '')
-	{
-		$qual = '';
-		$tmp = array();
-
-		$qual = $this->_getVideoQuality($nfo);
-
-		//Clean up the name
-		$name = preg_replace("/[a-f0-9]{10,}/i", " ", $name);
-		$name = str_replace("\\", " ", $name);
-
-		$name1 = str_replace(["  ", "--", "\_\_"], " ", trim($name));
-
-		if ($imdb > 0) {
-			$movie = $this->movie->getMovieInfo($imdb);
-			if ($movie !== false) {
-				$name2 = '';
-				$word = "/" . $movie['title'] . " " . $movie['year'] . "/i";
-				$tmp[] = preg_split($word, $name1);
-				if ($tmp instanceof Traversable) {
-					foreach ($tmp as $t) {
-						$name2 .= " " . $t[1];
-					}
-				}
-				$name1 = $name2;
-			}
-		}
-
-		$retName = (isset($movie) && $qual !== false ? $movie['title'] . "." . $movie['year'] . "." . $name1 . "." . $qual : $name1);
-
-		return trim($retName);
-	}
-
-	private function _getVideoQuality($nfo = '')
-	{
-		$qualities = array('(:?..)?tv', '480[ip]?', '640[ip]?', '720[ip]?', '1080[ip]?', 'ac3', 'audio_ts', 'avi', 'bd[\- ]?rip', 'bd25', 'bd50',
-						   'bdmv', 'blu ?ray', 'br[\- ]?disk', 'br[\- ]?rip', 'cam', 'cam[\- ]?rip', 'dc', 'directors.?cut', 'divx\d?', 'dts', 'dvd', 'dvd[\- ]?r',
-						   'dvd[\- ]?rip', 'dvd[\- ]?scr', 'extended', 'hd', 'hd[\- ]?tv', 'h264', 'hd[\- ]?cam', 'hd[\- ]?ts', 'iso', 'm2ts', 'mkv', 'mpeg(:?\-\d)?',
-						   'mpg', 'ntsc', 'pal', 'proper', 'ppv', 'ppv[\- ]?rip', 'r\d{1}', 'repack', 'repacked', 'scr', 'screener', 'tc', 'telecine', 'telesync', 'ts',
-						   'tv[\- ]?rip', 'unrated', 'vhs( ?rip)?', 'video_ts', 'video ts', 'x264', 'xvid', 'web[\- ]?rip'
-		);
-
-		foreach ($qualities as $quality) {
-			if (stripos($nfo, $quality) !== false) {
-				return $quality;
-			}
-		}
-
-		return false;
-	}
-
-	private function _matchNfoBook($nfo, $row)
-	{
-		$author = preg_split('/(?:a\s?u\s?t\s?h\s?o\s?r\b)+? *?(?!(?:[^\s\.\:\}\]\*\xb0-\x{3000}\?] ?){2,}?\b)(?:[\*\?\-\=\|\;\:\.\[\}\]\(\s\xb0-\x{3000}\?]+?)[\s\.\>\:\(\)]((?!\:) ?[a-z0-9\&].+)(?:\s\s\s|$|\.\.\.)/Uuim', $nfo, 0, PREG_SPLIT_DELIM_CAPTURE);
-		$title = preg_split('/(?:t\s?i\s?t\s?l\s?e\b|b\s?o\s?o\s?k\b)+? *?(?!(?:[^\s\.\:\}\]\*\xb0-\x{3000}\?] ?){2,}?\b)(?:[\*\?\-\=\|\;\:\.\[\}\]\(\s\xb0-\x{3000}\?]+?)[\s\.\>\:\(\)]((?!\:) ?[a-z0-9\&].+)(?:\s\s\s|$|\.\.\.)/Uuim', $nfo, 0, PREG_SPLIT_DELIM_CAPTURE);
-
-		if (isset($author[1]) && isset($title[1])) {
-			return $this->dodbupdate($row['id'], Category::CAT_MUSIC_AUDIOBOOK, $this->cleanname($author[1] . " - " . $title[1]));
-		} else if (preg_match('/[\h\_\.\:\xb0-\x{3000}]{2,}?([a-z].+) \- (.+)(?:[\s\_\.\:\xb0-\x{3000}]{2,}|$)/iu', $nfo, $matches)) {
-			$pos = $this->nfopos($this->_cleanStrForPos($nfo), $this->_cleanStrForPos($matches[1] . " - " . $matches[2]));
-			if ($pos !== false && $pos < 0.4 && !preg_match('/\:\d\d$/', $matches[2]) && strlen($matches[1]) < 48 && strlen($matches[2]) < 48
-				&& strpos('title', $matches[1]) === false && strpos('title', $matches[2]) === false
-			) {
-				return $this->dodbupdate($row['id'], $this->cleanname($matches[1] . " - " . $matches[2]), null, 'bookNFO');
-			}
-		}
-
-		return false;
-	}
-
-	private function doAmazon($name = '', $id = 0, $nfo = "", $q, $region = 'com', $case = false, $row = '')
-	{
-		$amazon = new AmazonProductAPI($this->site->amazonpubkey, $this->site->amazonprivkey, $this->site->amazonassociatetag);
-		$ok = false;
-
-		try {
-			switch ($case) {
-				case 'upc':
-					$amaz = $amazon->getItemByUpc(trim($q), $region);
-					break;
-				case 'asin':
-					$amaz = $amazon->getItemByAsin(trim($q), $region);
-					break;
-				case 'isbn':
-					$amaz = $amazon->searchProducts(trim($q), '', "ISBN");
-					break;
-				default:
-					$amaz = false;
-			}
-
-		} catch (Exception $e) {
-			echo 'Caught exception: ', $e->getMessage() . PHP_EOL;
-			unset($s, $amaz, $amazon);
-		}
-
-		if (isset($amaz) && isset($amaz->Items->Item)) {
-			$type = $amaz->Items->Item->ItemAttributes->ProductGroup;
-			switch ($type) {
-				case 'Audible':
-				case 'Book':
-				case 'eBooks':
-					$ok = $this->_doAmazonBooks($amaz, $id);
-					break;
-				case 'Digital Music Track':
-				case 'Digital Music Album':
-				case 'Music':
-					$ok = $this->_doAmazonMusic($amaz, $id);
-					break;
-				case 'Bluray':
-				case 'Movies':
-				case 'DVD':
-				case 'DVD & Bluray':
-					$ok = $this->_doAmazonMovies($amaz, $id, $nfo);
-					break;
-				case 'Video Games':
-					$ok = $this->_doAmazonVG($amaz, $id);
-					break;
-				default:
-					echo PHP_EOL . $this->c->error("Amazon category $type could not be parsed for " . $name) . PHP_EOL;
-			}
-		}
-
-		return $ok;
-	}
-
-	// Main switch for determining operation type after parsing the NFO file
-
-	private function _doAmazonBooks($amaz = array(), $id = 0)
-	{
-		$audiobook = false;
-		$v = (string)$amaz->Items->Item->ItemAttributes->Format;
-		if (stripos($v, "audiobook") !== false) {
-			$audiobook = true;
-		}
-		$new = (string)$amaz->Items->Item->ItemAttributes->Author;
-		$name = $new . " - " . (string)$amaz->Items->Item->ItemAttributes->Title;
-
-		$rel = $this->_doAmazonLocal('bookinfo', (string)$amaz->Items->Item->ASIN);
-
-		if (count($rel) == 0) {
-			$bookId = $this->book->updateBookInfo('', $amaz);
-			unset($book);
-		} else {
-			$bookId = $rel['id'];
-		}
-
-		if ($audiobook) {
-			$ok = $this->dodbupdate($id, $name, $bookId, 'bookinfoid');
-		} else {
-			$ok = $this->dodbupdate($id, $name, $bookId, 'bookinfoid');
-		}
-
-		return $ok;
-	}
-
-	// tries to derive artist and title of album/song from release NFO
-
-	private function _doAmazonLocal($table = '', $asin = '')
-	{
-		return $this->pdo->queryOneRow(
-			sprintf('
-						SELECT id
-						FROM %s
-						WHERE asin = %s',
-				$table,
-				$this->pdo->escapeString($asin)
-			)
-		);
-	}
-
-	// tries to derive the IMDB id from release NFO
-
-	private function _doAmazonMusic($amaz = array(), $id = 0)
-	{
-		$new = (string)$amaz->Items->Item->ItemAttributes->Artist;
-		if ($new != '') {
-			$new .= " - ";
-		}
-		$name = $new . (string)$amaz->Items->Item->ItemAttributes->Title;
-
-		$rel = $this->_doAmazonLocal('musicinfo', (string)$amaz->Items->Item->ASIN);
-
-		if ($rel !== false) {
-			$ok = $this->dodbupdate($id, $name, $rel['id'], 'musicinfoid');
-		} else {
-			$musicId = $this->music->updateMusicInfo('', '', $amaz);
-			$ok = $this->dodbupdate($id, $name, $musicId, 'musicinfoid');
-		}
-
-		return $ok;
-	}
-
-	// tries to derive author and title of book from release NFO
-
-	private function _doAmazonMovies($amaz = array(), $id = 0, $nfo)
-	{
-		$new = (string)$amaz->Items->Item->ItemAttributes->Title;
-		$new = $new . " (" . substr((string)$amaz->Items->Item->ItemAttributes->ReleaseDate, 0, 4) . ")";
-		$name = $this->moviename($nfo, 0, $new);
-
-		return $this->dodbupdate($id, $name, null, 'amazonMov');
-	}
-
-	// Sets the release to its proper status in the database
-
-	private function _doAmazonVG($amaz = array(), $id = 0)
-	{
-		$name = (string)$amaz->Items->Item->ItemAttributes->Title;
-		$name .= "." . (string)$amaz->Items->Item->ItemAttributes->Region . ".";
-		$name .= "-" . (string)$amaz->Items->Item->ItemAttributes->Platform;
-
-		$rel = $this->_doAmazonLocal('consoleinfo', (string)$amaz->Items->Item->ASIN);
-
-		if ($rel !== false) {
-			$ok = $this->dodbupdate($id, $name, $rel['id'], 'consoleinfoid');
-		} else {
-			$consoleId = $this->console->
-				updateConsoleInfo([
-						'title'    => (string)$amaz->Items->Item->Title,
-						'node'     => (int)$amaz->Items->Item->BrowseNodes->BrowseNodeId,
-						'platform' => (string)$amaz->Items->Item->ItemAttributes->Platform
-					]
-				);
-			$ok = $this->dodbupdate($id, $name, $consoleId, 'consoleinfoid');
-		}
-
-		return $ok;
-	}
-
-	//derives type of processing to do by preg_splitting NFO file
-	//and returning the results of the split
-
-	private function _doOSsplitPos($split = array(), $nfo = '')
-	{
-		return (isset($split[1]) ? $this->nfopos($nfo, $this->_cleanStrForPos($split[1])) : false);
-	}
-}
\ No newline at end of file
diff --git a/lib/NZBGet.php b/lib/NZBGet.php
deleted file mode 100644
index e089477b7..000000000
--- a/lib/NZBGet.php
+++ /dev/null
@@ -1,452 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../bin/config.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-/**
- * Class NZBGet
- *
- * Transfers data between an NZBGet server and a newznab website.
- *
- * @package nzedb
- */
-class NZBGet
-{
-	/**
-	 * NZBGet username.
-	 * @var string
-	 * @access public
-	 */
-	public $userName = '';
-
-	/**
-	 * NZBGet password.
-	 * @var string
-	 * @access public
-	 */
-	public $password = '';
-
-	/**
-	 * NZBGet URL.
-	 * @var string
-	 * @access public
-	 */
-	public $url = '';
-
-	/**
-	 * Full URL (containing password/username/etc).
-	 * @var string|bool
-	 * @access protected
-	 */
-	protected $fullURL = '';
-
-	/**
-	 * User id.
-	 * @var int
-	 * @access protected
-	 */
-	protected $uid = 0;
-
-	/**
-	 * The users RSS token.
-	 * @var string
-	 * @access protected
-	 */
-	protected $rsstoken = '';
-
-	/**
-	 * URL to your nZEDb site.
-	 * @var string
-	 * @access protected
-	 */
-	protected $serverurl = '';
-
-	/**
-	 * @var Releases
-	 * @access protected
-	 */
-	protected $Releases;
-
-	/**
-	 * @var NZB
-	 * @access protected
-	 */
-	protected $NZB;
-
-	/**
-	 * Construct.
-	 * Set up full URL.
-	 *
-	 * @var BasePage $page
-	 *
-	 * @access public
-	 */
-	public function __construct(&$page)
-	{
-		$this->serverurl = $page->serverurl;
-		$this->uid = $page->userdata['id'];
-		$this->rsstoken = $page->userdata['rsstoken'];
-
-		if (!empty($page->userdata['nzbgeturl'])) {
-			$this->url  = $page->userdata['nzbgeturl'];
-			$this->userName = (empty($page->userdata['nzbgetusername']) ? '' : $page->userdata['nzbgetusername']);
-			$this->password = (empty($page->userdata['nzbgetpassword']) ? '' : $page->userdata['nzbgetpassword']);
-		}
-
-		$this->fullURL = $this->verifyURL($this->url);
-		$this->Releases = new \Releases();
-		$this->NZB = new \NZB();
-	}
-
-	/**
-	 * Send a NZB to NZBGet.
-	 *
-	 * @param string $guid Release identifier.
-	 *
-	 * @return bool|mixed
-	 *
-	 * @access public
-	 */
-	public function sendNZBToNZBGet($guid)
-	{
-		$relData = $this->Releases->getByGuid($guid);
-
-		$string = Utility::unzipGzipFile($this->NZB->getNZBPath($guid));
-		$string = ($string === false ? '' : $string);
-
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>append</methodName>
-				<params>
-					<param>
-						<value><string>' . $relData['searchname'] . '</string></value>
-					</param>
-					<param>
-						<value><string>' . $relData['category_name'] . '</string></value>
-					</param>
-					<param>
-						<value><i4>0</i4></value>
-					</param>
-					<param>
-						<value><boolean>>False</boolean></value>
-					</param>
-					<param>
-						<value>
-							<string>' .
-			base64_encode($string) .
-			'</string>
-						</value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'append', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Send a NZB URL to NZBGet.
-	 *
-	 * @param string $guid Release identifier.
-	 *
-	 * @return bool|mixed
-	 *
-	 * @access public
-	 */
-	public function sendURLToNZBGet($guid)
-	{
-		$reldata = $this->Releases->getByGuid($guid);
-
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>appendurl</methodName>
-				<params>
-					<param>
-						<value><string>' . $reldata['searchname'] . '.nzb' . '</string></value>
-					</param>
-					<param>
-						<value><string>' . $reldata['category_name'] . '</string></value>
-					</param>
-					<param>
-						<value><i4>0</i4></value>
-					</param>
-					<param>
-						<value><boolean>>False</boolean></value>
-					</param>
-					<param>
-						<value>
-							<string>' .
-			$this->serverurl .
-			'getnzb/' .
-			$guid .
-			'%26i%3D' .
-			$this->uid .
-			'%26r%3D' .
-			$this->rsstoken
-			.
-			'</string>
-						</value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'appendurl', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Pause download queue on server. This method is equivalent for command "nzbget -P".
-	 *
-	 * @return void
-	 *
-	 * @access public
-	 */
-	public function pauseAll()
-	{
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>pausedownload2</methodName>
-				<params>
-					<param>
-						<value><boolean>1</boolean></value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'pausedownload2', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Resume (previously paused) download queue on server. This method is equivalent for command "nzbget -U".
-	 *
-	 * @return void
-	 *
-	 * @access public
-	 */
-	public function resumeAll()
-	{
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>resumedownload2</methodName>
-				<params>
-					<param>
-						<value><boolean>1</boolean></value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'resumedownload2', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Pause a single NZB from the queue.
-	 *
-	 * @param string $id
-	 *
-	 * @access public
-	 */
-	public function pauseFromQueue($id)
-	{
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>editqueue</methodName>
-				<params>
-					<param>
-						<value><string>GroupPause</string></value>
-					</param>
-					<param>
-						<value><i4>0</i4></value>
-					</param>
-					<param>
-						<value><string>""</string></value>
-					</param>
-					<param>
-						<value>
-							<array>
-								<value><i4>' . $id . '</i4></value>
-							</array>
-						</value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'editqueue', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Resume a single NZB from the queue.
-	 *
-	 * @param string $id
-	 *
-	 * @access public
-	 */
-	public function resumeFromQueue($id)
-	{
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>editqueue</methodName>
-				<params>
-					<param>
-						<value><string>GroupResume</string></value>
-					</param>
-					<param>
-						<value><i4>0</i4></value>
-					</param>
-					<param>
-						<value><string>""</string></value>
-					</param>
-					<param>
-						<value>
-							<array>
-								<value><i4>' . $id . '</i4></value>
-							</array>
-						</value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'editqueue', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Delete a single NZB from the queue.
-	 *
-	 * @param string $id
-	 *
-	 * @access public
-	 */
-	public function delFromQueue($id)
-	{
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>editqueue</methodName>
-				<params>
-					<param>
-						<value><string>GroupDelete</string></value>
-					</param>
-					<param>
-						<value><i4>0</i4></value>
-					</param>
-					<param>
-						<value><string>""</string></value>
-					</param>
-					<param>
-						<value>
-							<array>
-								<value><i4>' . $id . '</i4></value>
-							</array>
-						</value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'editqueue', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Set download speed limit. This method is equivalent for command "nzbget -R <Limit>".
-	 *
-	 * @param int $limit The speed to limit it to.
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function rate($limit)
-	{
-		$header =
-			'<?xml version="1.0"?>
-			<methodCall>
-				<methodName>rate</methodName>
-				<params>
-					<param>
-						<value><i4>' . $limit . '</i4></value>
-					</param>
-				</params>
-			</methodCall>';
-		Utility::getUrl(['url' => $this->fullURL . 'rate', 'method' => 'post', 'postdata' => $header, 'verifycert' => false]);
-	}
-
-	/**
-	 * Get all items in download queue.
-	 *
-	 * @return array|bool
-	 *
-	 * @access public
-	 */
-	public function getQueue()
-	{
-		$data = Utility::getUrl(['url' => $this->fullURL . 'listgroups', 'verifycert' => false]);
-		$retVal = false;
-		if ($data) {
-			$xml = simplexml_load_string($data);
-			if ($xml) {
-				$retVal = [];
-				$i = 0;
-				foreach($xml->params->param->value->array->data->value as $value) {
-					foreach ($value->struct->member as $member) {
-						$value = (array)$member->value;
-						$value = array_shift($value);
-						if (!is_object($value)) {
-							$retVal[$i][(string)$member->name] = $value;
-						}
-					}
-					$i++;
-				}
-			}
-		}
-		return $retVal;
-	}
-
-	/**
-	 * Request for current status (summary) information. Parts of informations returned by this method can be printed by command "nzbget -L".
-	 *
-	 * @return array The status.
-	 *
-	 * @access public
-	 */
-	public function status()
-	{
-		$data = Utility::getUrl(['url' => $this->fullURL . 'status', 'verifycert' => false]);
-		$retVal = false;
-		if ($data) {
-			$xml = simplexml_load_string($data);
-			if ($xml) {
-				foreach($xml->params->param->value->struct->member as $member) {
-					$value = (array)$member->value;
-					$value = array_shift($value);
-					if (!is_object($value)) {
-						$retVal[(string)$member->name] = $value;
-					}
-
-				}
-			}
-		}
-		return $retVal;
-	}
-
-	/**
-	 * Verify if the NZBGet URL is correct.
-	 *
-	 * @param string $url NZBGet URL to verify.
-	 *
-	 * @return bool|string
-	 *
-	 * @access public
-	 */
-	public function verifyURL ($url)
-	{
-		if (preg_match('/(?P<protocol>https?):\/\/(?P<url>.+?)(:(?P<port>\d+\/)|\/)$/i', $url, $matches)) {
-			return
-				$matches['protocol'] .
-				'://' .
-				$this->userName .
-				':' .
-				$this->password .
-				'@' .
-				$matches['url'] .
-				(isset($matches['port']) ? ':' . $matches['port'] : (substr($matches['url'], -1) === '/' ? '' : '/')) .
-				'xmlrpc/';
-		} else {
-			return false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/PHPMailer/PHPMailerAutoload.php b/lib/PHPMailer/PHPMailerAutoload.php
deleted file mode 100644
index eaa2e3034..000000000
--- a/lib/PHPMailer/PHPMailerAutoload.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * PHPMailer SPL autoloader.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer SPL autoloader.
- * @param string $classname The name of the class to load
- */
-function PHPMailerAutoload($classname)
-{
-    //Can't use __DIR__ as it's only in PHP 5.3+
-    $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
-    if (is_readable($filename)) {
-        require $filename;
-    }
-}
-
-if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
-    //SPL autoloading was introduced in PHP 5.1.2
-    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-        spl_autoload_register('PHPMailerAutoload', true, true);
-    } else {
-        spl_autoload_register('PHPMailerAutoload');
-    }
-} else {
-    /**
-     * Fall back to traditional autoload for old PHP versions
-     * @param string $classname The name of the class to load
-     */
-    function __autoload($classname)
-    {
-        PHPMailerAutoload($classname);
-    }
-}
diff --git a/lib/PHPMailer/VERSION b/lib/PHPMailer/VERSION
deleted file mode 100644
index 485d792a3..000000000
--- a/lib/PHPMailer/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-5.2.9
\ No newline at end of file
diff --git a/lib/PHPMailer/class.phpmailer.php b/lib/PHPMailer/class.phpmailer.php
deleted file mode 100644
index 8d6c291fe..000000000
--- a/lib/PHPMailer/class.phpmailer.php
+++ /dev/null
@@ -1,3458 +0,0 @@
-<?php
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * @package PHPMailer
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- */
-class PHPMailer
-{
-    /**
-     * The PHPMailer Version number.
-     * @type string
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * Email priority.
-     * Options: 1 = High, 3 = Normal, 5 = low.
-     * @type integer
-     */
-    public $Priority = 3;
-
-    /**
-     * The character set of the message.
-     * @type string
-     */
-    public $CharSet = 'iso-8859-1';
-
-    /**
-     * The MIME Content-type of the message.
-     * @type string
-     */
-    public $ContentType = 'text/plain';
-
-    /**
-     * The message encoding.
-     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
-     * @type string
-     */
-    public $Encoding = '8bit';
-
-    /**
-     * Holds the most recent mailer error message.
-     * @type string
-     */
-    public $ErrorInfo = '';
-
-    /**
-     * The From email address for the message.
-     * @type string
-     */
-    public $From = 'root@localhost';
-
-    /**
-     * The From name of the message.
-     * @type string
-     */
-    public $FromName = 'Root User';
-
-    /**
-     * The Sender email (Return-Path) of the message.
-     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-     * @type string
-     */
-    public $Sender = '';
-
-    /**
-     * The Return-Path of the message.
-     * If empty, it will be set to either From or Sender.
-     * @type string
-     * @deprecated Email senders should never set a return-path header;
-     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
-     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
-     */
-    public $ReturnPath = '';
-
-    /**
-     * The Subject of the message.
-     * @type string
-     */
-    public $Subject = '';
-
-    /**
-     * An HTML or plain text message body.
-     * If HTML then call isHTML(true).
-     * @type string
-     */
-    public $Body = '';
-
-    /**
-     * The plain-text message body.
-     * This body can be read by mail clients that do not have HTML email
-     * capability such as mutt & Eudora.
-     * Clients that can read HTML will view the normal Body.
-     * @type string
-     */
-    public $AltBody = '';
-
-    /**
-     * An iCal message part body.
-     * Only supported in simple alt or alt_inline message types
-     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
-     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @link http://kigkonsult.se/iCalcreator/
-     * @type string
-     */
-    public $Ical = '';
-
-    /**
-     * The complete compiled MIME message body.
-     * @access protected
-     * @type string
-     */
-    protected $MIMEBody = '';
-
-    /**
-     * The complete compiled MIME message headers.
-     * @type string
-     * @access protected
-     */
-    protected $MIMEHeader = '';
-
-    /**
-     * Extra headers that createHeader() doesn't fold in.
-     * @type string
-     * @access protected
-     */
-    protected $mailHeader = '';
-
-    /**
-     * Word-wrap the message body to this number of chars.
-     * @type integer
-     */
-    public $WordWrap = 0;
-
-    /**
-     * Which method to use to send mail.
-     * Options: "mail", "sendmail", or "smtp".
-     * @type string
-     */
-    public $Mailer = 'mail';
-
-    /**
-     * The path to the sendmail program.
-     * @type string
-     */
-    public $Sendmail = '/usr/sbin/sendmail';
-
-    /**
-     * Whether mail() uses a fully sendmail-compatible MTA.
-     * One which supports sendmail's "-oi -f" options.
-     * @type boolean
-     */
-    public $UseSendmailOptions = true;
-
-    /**
-     * Path to PHPMailer plugins.
-     * Useful if the SMTP class is not in the PHP include path.
-     * @type string
-     * @deprecated Should not be needed now there is an autoloader.
-     */
-    public $PluginDir = '';
-
-    /**
-     * The email address that a reading confirmation should be sent to.
-     * @type string
-     */
-    public $ConfirmReadingTo = '';
-
-    /**
-     * The hostname to use in Message-Id and Received headers
-     * and as default HELO string.
-     * If empty, the value returned
-     * by SERVER_NAME is used or 'localhost.localdomain'.
-     * @type string
-     */
-    public $Hostname = '';
-
-    /**
-     * An ID to be used in the Message-Id header.
-     * If empty, a unique id will be generated.
-     * @type string
-     */
-    public $MessageID = '';
-
-    /**
-     * The message Date to be used in the Date header.
-     * If empty, the current date will be added.
-     * @type string
-     */
-    public $MessageDate = '';
-
-    /**
-     * SMTP hosts.
-     * Either a single hostname or multiple semicolon-delimited hostnames.
-     * You can also specify a different port
-     * for each host by using this format: [hostname:port]
-     * (e.g. "smtp1.example.com:25;smtp2.example.com").
-     * You can also specify encryption type, for example:
-     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
-     * Hosts will be tried in order.
-     * @type string
-     */
-    public $Host = 'localhost';
-
-    /**
-     * The default SMTP server port.
-     * @type integer
-     * @TODO Why is this needed when the SMTP class takes care of it?
-     */
-    public $Port = 25;
-
-    /**
-     * The SMTP HELO of the message.
-     * Default is $Hostname.
-     * @type string
-     * @see PHPMailer::$Hostname
-     */
-    public $Helo = '';
-
-    /**
-     * The secure connection prefix.
-     * Options: "", "ssl" or "tls"
-     * @type string
-     */
-    public $SMTPSecure = '';
-
-    /**
-     * Whether to use SMTP authentication.
-     * Uses the Username and Password properties.
-     * @type boolean
-     * @see PHPMailer::$Username
-     * @see PHPMailer::$Password
-     */
-    public $SMTPAuth = false;
-
-    /**
-     * SMTP username.
-     * @type string
-     */
-    public $Username = '';
-
-    /**
-     * SMTP password.
-     * @type string
-     */
-    public $Password = '';
-
-    /**
-     * SMTP auth type.
-     * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
-     * @type string
-     */
-    public $AuthType = '';
-
-    /**
-     * SMTP realm.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Realm = '';
-
-    /**
-     * SMTP workstation.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Workstation = '';
-
-    /**
-     * The SMTP server timeout in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * SMTP class debug output mode.
-     * Debug output level.
-     * Options:
-     * * `0` No output
-     * * `1` Commands
-     * * `2` Data and commands
-     * * `3` As 2 plus connection status
-     * * `4` Low-level data output
-     * @type integer
-     * @see SMTP::$do_debug
-     */
-    public $SMTPDebug = 0;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
-     * @see SMTP::$Debugoutput
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to keep SMTP connection open after each message.
-     * If this is set to true then to close the connection
-     * requires an explicit call to smtpClose().
-     * @type boolean
-     */
-    public $SMTPKeepAlive = false;
-
-    /**
-     * Whether to split multiple to addresses into multiple messages
-     * or send them all in one message.
-     * @type boolean
-     */
-    public $SingleTo = false;
-
-    /**
-     * Storage for addresses when SingleTo is enabled.
-     * @type array
-     * @TODO This should really not be public
-     */
-    public $SingleToArray = array();
-
-    /**
-     * Whether to generate VERP addresses on send.
-     * Only applicable when sending via SMTP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * Whether to allow sending messages with an empty body.
-     * @type boolean
-     */
-    public $AllowEmpty = false;
-
-    /**
-     * The default line ending.
-     * @note The default remains "\n". We force CRLF where we know
-     *        it must be used via self::CRLF.
-     * @type string
-     */
-    public $LE = "\n";
-
-    /**
-     * DKIM selector.
-     * @type string
-     */
-    public $DKIM_selector = '';
-
-    /**
-     * DKIM Identity.
-     * Usually the email address used as the source of the email
-     * @type string
-     */
-    public $DKIM_identity = '';
-
-    /**
-     * DKIM passphrase.
-     * Used if your key is encrypted.
-     * @type string
-     */
-    public $DKIM_passphrase = '';
-
-    /**
-     * DKIM signing domain name.
-     * @example 'example.com'
-     * @type string
-     */
-    public $DKIM_domain = '';
-
-    /**
-     * DKIM private key file path.
-     * @type string
-     */
-    public $DKIM_private = '';
-
-    /**
-     * Callback Action function name.
-     *
-     * The function that handles the result of the send email action.
-     * It is called out by send() for each email sent.
-     *
-     * Value can be any php callable: http://www.php.net/is_callable
-     *
-     * Parameters:
-     *   boolean $result        result of the send action
-     *   string  $to            email address of the recipient
-     *   string  $cc            cc email addresses
-     *   string  $bcc           bcc email addresses
-     *   string  $subject       the subject
-     *   string  $body          the email body
-     *   string  $from          email address of sender
-     * @type string
-     */
-    public $action_function = '';
-
-    /**
-     * What to use in the X-Mailer header.
-     * Options: null for default, whitespace for none, or a string to use
-     * @type string
-     */
-    public $XMailer = '';
-
-    /**
-     * An instance of the SMTP sender class.
-     * @type SMTP
-     * @access protected
-     */
-    protected $smtp = null;
-
-    /**
-     * The array of 'to' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $to = array();
-
-    /**
-     * The array of 'cc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $cc = array();
-
-    /**
-     * The array of 'bcc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $bcc = array();
-
-    /**
-     * The array of reply-to names and addresses.
-     * @type array
-     * @access protected
-     */
-    protected $ReplyTo = array();
-
-    /**
-     * An array of all kinds of addresses.
-     * Includes all of $to, $cc, $bcc, $replyto
-     * @type array
-     * @access protected
-     */
-    protected $all_recipients = array();
-
-    /**
-     * The array of attachments.
-     * @type array
-     * @access protected
-     */
-    protected $attachment = array();
-
-    /**
-     * The array of custom headers.
-     * @type array
-     * @access protected
-     */
-    protected $CustomHeader = array();
-
-    /**
-     * The most recent Message-ID (including angular brackets).
-     * @type string
-     * @access protected
-     */
-    protected $lastMessageID = '';
-
-    /**
-     * The message's MIME type.
-     * @type string
-     * @access protected
-     */
-    protected $message_type = '';
-
-    /**
-     * The array of MIME boundary strings.
-     * @type array
-     * @access protected
-     */
-    protected $boundary = array();
-
-    /**
-     * The array of available languages.
-     * @type array
-     * @access protected
-     */
-    protected $language = array();
-
-    /**
-     * The number of errors encountered.
-     * @type integer
-     * @access protected
-     */
-    protected $error_count = 0;
-
-    /**
-     * The S/MIME certificate file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_cert_file = '';
-
-    /**
-     * The S/MIME key file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_file = '';
-
-    /**
-     * The S/MIME password for the key.
-     * Used only if the key is encrypted.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_pass = '';
-
-    /**
-     * Whether to throw exceptions for errors.
-     * @type boolean
-     * @access protected
-     */
-    protected $exceptions = false;
-
-    /**
-     * Error severity: message only, continue processing.
-     */
-    const STOP_MESSAGE = 0;
-
-    /**
-     * Error severity: message, likely ok to continue processing.
-     */
-    const STOP_CONTINUE = 1;
-
-    /**
-     * Error severity: message, plus full stop, critical error reached.
-     */
-    const STOP_CRITICAL = 2;
-
-    /**
-     * SMTP RFC standard line ending.
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * Constructor.
-     * @param boolean $exceptions Should we throw external exceptions?
-     */
-    public function __construct($exceptions = false)
-    {
-        $this->exceptions = (boolean)$exceptions;
-    }
-
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        if ($this->Mailer == 'smtp') { //close any open SMTP connection nicely
-            $this->smtpClose();
-        }
-    }
-
-    /**
-     * Call mail() in a safe_mode-aware fashion.
-     * Also, unless sendmail_path points to sendmail (or something that
-     * claims to be sendmail), don't pass params (not a perfect fix,
-     * but it will do)
-     * @param string $to To
-     * @param string $subject Subject
-     * @param string $body Message Body
-     * @param string $header Additional Header(s)
-     * @param string $params Params
-     * @access private
-     * @return boolean
-     */
-    private function mailPassthru($to, $subject, $body, $header, $params)
-    {
-        //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
-            $subject = $this->secureHeader($subject);
-        } else {
-            $subject = $this->encodeHeader($this->secureHeader($subject));
-        }
-        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
-            $result = @mail($to, $subject, $body, $header);
-        } else {
-            $result = @mail($to, $subject, $body, $header, $params);
-        }
-        return $result;
-    }
-
-    /**
-     * Output debugging info via user-defined method.
-     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
-     * @see PHPMailer::$Debugoutput
-     * @see PHPMailer::$SMTPDebug
-     * @param string $str
-     */
-    protected function edebug($str)
-    {
-        if ($this->SMTPDebug <= 0) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                ) . "\n";
-        }
-    }
-
-    /**
-     * Sets message type to HTML or plain.
-     * @param boolean $isHtml True for HTML mode.
-     * @return void
-     */
-    public function isHTML($isHtml = true)
-    {
-        if ($isHtml) {
-            $this->ContentType = 'text/html';
-        } else {
-            $this->ContentType = 'text/plain';
-        }
-    }
-
-    /**
-     * Send messages using SMTP.
-     * @return void
-     */
-    public function isSMTP()
-    {
-        $this->Mailer = 'smtp';
-    }
-
-    /**
-     * Send messages using PHP's mail() function.
-     * @return void
-     */
-    public function isMail()
-    {
-        $this->Mailer = 'mail';
-    }
-
-    /**
-     * Send messages using $Sendmail.
-     * @return void
-     */
-    public function isSendmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'sendmail')) {
-            $this->Sendmail = '/usr/sbin/sendmail';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'sendmail';
-    }
-
-    /**
-     * Send messages using qmail.
-     * @return void
-     */
-    public function isQmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'qmail')) {
-            $this->Sendmail = '/var/qmail/bin/qmail-inject';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'qmail';
-    }
-
-    /**
-     * Add a "To" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addAddress($address, $name = '')
-    {
-        return $this->addAnAddress('to', $address, $name);
-    }
-
-    /**
-     * Add a "CC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addCC($address, $name = '')
-    {
-        return $this->addAnAddress('cc', $address, $name);
-    }
-
-    /**
-     * Add a "BCC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addBCC($address, $name = '')
-    {
-        return $this->addAnAddress('bcc', $address, $name);
-    }
-
-    /**
-     * Add a "Reply-to" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean
-     */
-    public function addReplyTo($address, $name = '')
-    {
-        return $this->addAnAddress('Reply-To', $address, $name);
-    }
-
-    /**
-     * Add an address to one of the recipient arrays.
-     * Addresses that have been added already return false, but do not throw exceptions
-     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-     * @param string $address The email address to send to
-     * @param string $name
-     * @throws phpmailerException
-     * @return boolean true on success, false if address already used or invalid in some way
-     * @access protected
-     */
-    protected function addAnAddress($kind, $address, $name = '')
-    {
-        if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
-            $this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
-            $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
-            if ($this->exceptions) {
-                throw new phpmailerException('Invalid recipient array: ' . $kind);
-            }
-            return false;
-        }
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        if ($kind != 'Reply-To') {
-            if (!isset($this->all_recipients[strtolower($address)])) {
-                array_push($this->$kind, array($address, $name));
-                $this->all_recipients[strtolower($address)] = true;
-                return true;
-            }
-        } else {
-            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-                $this->ReplyTo[strtolower($address)] = array($address, $name);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set the From and FromName properties.
-     * @param string $address
-     * @param string $name
-     * @param boolean $auto Whether to also set the Sender address, defaults to true
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function setFrom($address, $name = '', $auto = true)
-    {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        $this->From = $address;
-        $this->FromName = $name;
-        if ($auto) {
-            if (empty($this->Sender)) {
-                $this->Sender = $address;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return the Message-ID header of the last email.
-     * Technically this is the value from the last time the headers were created,
-     * but it's also the message ID of the last sent message except in
-     * pathological cases.
-     * @return string
-     */
-    public function getLastMessageID()
-    {
-        return $this->lastMessageID;
-    }
-
-    /**
-     * Check that a string looks like an email address.
-     * @param string $address The email address to check
-     * @param string $patternselect A selector for the validation pattern to use :
-     * * `auto` Pick strictest one automatically;
-     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
-     * * `pcre` Use old PCRE implementation;
-     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains;
-     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
-     * * `noregex` Don't use a regex: super fast, really dumb.
-     * @return boolean
-     * @static
-     * @access public
-     */
-    public static function validateAddress($address, $patternselect = 'auto')
-    {
-        if (!$patternselect or $patternselect == 'auto') {
-            //Check this constant first so it works when extension_loaded() is disabled by safe mode
-            //Constant was added in PHP 5.2.4
-            if (defined('PCRE_VERSION')) {
-                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
-                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
-                    $patternselect = 'pcre8';
-                } else {
-                    $patternselect = 'pcre';
-                }
-            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
-                //Fall back to older PCRE
-                $patternselect = 'pcre';
-            } else {
-                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
-                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-                    $patternselect = 'php';
-                } else {
-                    $patternselect = 'noregex';
-                }
-            }
-        }
-        switch ($patternselect) {
-            case 'pcre8':
-                /**
-                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
-                 * @link http://squiloople.com/2009/12/20/email-address-validation/
-                 * @copyright 2009-2010 Michael Rushton
-                 * Feel free to use and redistribute this code. But please keep this copyright notice.
-                 */
-                return (boolean)preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
-                    $address
-                );
-            case 'pcre':
-                //An older regex that doesn't need a recent PCRE
-                return (boolean)preg_match(
-                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
-                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
-                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
-                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
-                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
-                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
-                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
-                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
-                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
-                    $address
-                );
-            case 'html5':
-                /**
-                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
-                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
-                 */
-                return (boolean)preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
-                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
-                    $address
-                );
-            case 'noregex':
-                //No PCRE! Do something _very_ approximate!
-                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
-                return (strlen($address) >= 3
-                    and strpos($address, '@') >= 1
-                    and strpos($address, '@') != strlen($address) - 1);
-            case 'php':
-            default:
-                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
-        }
-    }
-
-    /**
-     * Create a message and send it.
-     * Uses the sending method specified by $Mailer.
-     * @throws phpmailerException
-     * @return boolean false on error - See the ErrorInfo property for details of the error.
-     */
-    public function send()
-    {
-        try {
-            if (!$this->preSend()) {
-                return false;
-            }
-            return $this->postSend();
-        } catch (phpmailerException $exc) {
-            $this->mailHeader = '';
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Prepare a message for sending.
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function preSend()
-    {
-        try {
-            $this->mailHeader = '';
-            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
-            }
-
-            // Set whether the message is multipart/alternative
-            if (!empty($this->AltBody)) {
-                $this->ContentType = 'multipart/alternative';
-            }
-
-            $this->error_count = 0; // reset errors
-            $this->setMessageType();
-            // Refuse to send an empty message unless we are specifically allowing it
-            if (!$this->AllowEmpty and empty($this->Body)) {
-                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
-            }
-
-            $this->MIMEHeader = $this->createHeader();
-            $this->MIMEBody = $this->createBody();
-
-            // To capture the complete message when using mail(), create
-            // an extra header list which createHeader() doesn't fold in
-            if ($this->Mailer == 'mail') {
-                if (count($this->to) > 0) {
-                    $this->mailHeader .= $this->addrAppend('To', $this->to);
-                } else {
-                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
-                }
-                $this->mailHeader .= $this->headerLine(
-                    'Subject',
-                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
-                );
-            }
-
-            // Sign with DKIM if enabled
-            if (!empty($this->DKIM_domain)
-                && !empty($this->DKIM_private)
-                && !empty($this->DKIM_selector)
-                && !empty($this->DKIM_domain)
-                && file_exists($this->DKIM_private)) {
-                $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
-                    $this->encodeHeader($this->secureHeader($this->Subject)),
-                    $this->MIMEBody
-                );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
-                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
-            }
-            return true;
-
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Actually send a message.
-     * Send the email via the selected mechanism
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function postSend()
-    {
-        try {
-            // Choose the mailer and send through it
-            switch ($this->Mailer) {
-                case 'sendmail':
-                case 'qmail':
-                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
-                case 'smtp':
-                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
-                case 'mail':
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-                default:
-                    $sendMethod = $this->Mailer.'Send';
-                    if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
-                    }
-
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-            }
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Send mail using the $Sendmail program.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @see PHPMailer::$Sendmail
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function sendmailSend($header, $body)
-    {
-        if ($this->Sender != '') {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            } else {
-                $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            }
-        } else {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
-            } else {
-                $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
-            }
-        }
-        if ($this->SingleTo) {
-            foreach ($this->SingleToArray as $toAddr) {
-                if (!@$mail = popen($sendmail, 'w')) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-                fputs($mail, 'To: ' . $toAddr . "\n");
-                fputs($mail, $header);
-                fputs($mail, $body);
-                $result = pclose($mail);
-                $this->doCallback(
-                    ($result == 0),
-                    array($toAddr),
-                    $this->cc,
-                    $this->bcc,
-                    $this->Subject,
-                    $body,
-                    $this->From
-                );
-                if ($result != 0) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-            }
-        } else {
-            if (!@$mail = popen($sendmail, 'w')) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-            fputs($mail, $header);
-            fputs($mail, $body);
-            $result = pclose($mail);
-            $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            if ($result != 0) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send mail using the PHP mail() function.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @link http://www.php.net/manual/en/book.mail.php
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function mailSend($header, $body)
-    {
-        $toArr = array();
-        foreach ($this->to as $toaddr) {
-            $toArr[] = $this->addrFormat($toaddr);
-        }
-        $to = implode(', ', $toArr);
-
-        if (empty($this->Sender)) {
-            $params = ' ';
-        } else {
-            $params = sprintf('-f%s', $this->Sender);
-        }
-        if ($this->Sender != '' and !ini_get('safe_mode')) {
-            $old_from = ini_get('sendmail_from');
-            ini_set('sendmail_from', $this->Sender);
-        }
-        $result = false;
-        if ($this->SingleTo && count($toArr) > 1) {
-            foreach ($toArr as $toAddr) {
-                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            }
-        } else {
-            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
-            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-        }
-        if (isset($old_from)) {
-            ini_set('sendmail_from', $old_from);
-        }
-        if (!$result) {
-            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
-        }
-        return true;
-    }
-
-    /**
-     * Get an instance to use for SMTP operations.
-     * Override this function to load your own SMTP implementation
-     * @return SMTP
-     */
-    public function getSMTPInstance()
-    {
-        if (!is_object($this->smtp)) {
-            $this->smtp = new SMTP;
-        }
-        return $this->smtp;
-    }
-
-    /**
-     * Send mail via SMTP.
-     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-     * Uses the PHPMailerSMTP class by default.
-     * @see PHPMailer::getSMTPInstance() to use a different class.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @throws phpmailerException
-     * @uses SMTP
-     * @access protected
-     * @return boolean
-     */
-    protected function smtpSend($header, $body)
-    {
-        $bad_rcpt = array();
-
-        if (!$this->smtpConnect()) {
-            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
-        }
-        $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-        if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
-            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
-        }
-
-        // Attempt to send to all recipients
-        foreach ($this->to as $to) {
-            if (!$this->smtp->recipient($to[0])) {
-                $bad_rcpt[] = $to[0];
-                $isSent = false;
-            } else {
-                $isSent = true;
-            }
-            $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
-        }
-        foreach ($this->cc as $cc) {
-            if (!$this->smtp->recipient($cc[0])) {
-                $bad_rcpt[] = $cc[0];
-                $isSent = false;
-            } else {
-                $isSent = true;
-            }
-            $this->doCallback($isSent, array(), array($cc[0]), array(), $this->Subject, $body, $this->From);
-        }
-        foreach ($this->bcc as $bcc) {
-            if (!$this->smtp->recipient($bcc[0])) {
-                $bad_rcpt[] = $bcc[0];
-                $isSent = false;
-            } else {
-                $isSent = true;
-            }
-            $this->doCallback($isSent, array(), array(), array($bcc[0]), $this->Subject, $body, $this->From);
-        }
-
-        // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
-            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
-        }
-        if ($this->SMTPKeepAlive) {
-            $this->smtp->reset();
-        } else {
-            $this->smtp->quit();
-            $this->smtp->close();
-        }
-        if (count($bad_rcpt) > 0) { // Create error message for any bad addresses
-            throw new phpmailerException(
-                $this->lang('recipients_failed') . implode(', ', $bad_rcpt),
-                self::STOP_CONTINUE
-            );
-        }
-        return true;
-    }
-
-    /**
-     * Initiate a connection to an SMTP server.
-     * Returns false if the operation failed.
-     * @param array $options An array of options compatible with stream_context_create()
-     * @uses SMTP
-     * @access public
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function smtpConnect($options = array())
-    {
-        if (is_null($this->smtp)) {
-            $this->smtp = $this->getSMTPInstance();
-        }
-
-        // Already connected?
-        if ($this->smtp->connected()) {
-            return true;
-        }
-
-        $this->smtp->setTimeout($this->Timeout);
-        $this->smtp->setDebugLevel($this->SMTPDebug);
-        $this->smtp->setDebugOutput($this->Debugoutput);
-        $this->smtp->setVerp($this->do_verp);
-        $hosts = explode(';', $this->Host);
-        $lastexception = null;
-
-        foreach ($hosts as $hostentry) {
-            $hostinfo = array();
-            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
-                // Not a valid host entry
-                continue;
-            }
-            // $hostinfo[2]: optional ssl or tls prefix
-            // $hostinfo[3]: the hostname
-            // $hostinfo[4]: optional port number
-            // The host string prefix can temporarily override the current setting for SMTPSecure
-            // If it's not specified, the default value is used
-            $prefix = '';
-            $tls = ($this->SMTPSecure == 'tls');
-            if ($hostinfo[2] == 'ssl' or ($hostinfo[2] == '' and $this->SMTPSecure == 'ssl')) {
-                $prefix = 'ssl://';
-                $tls = false; // Can't have SSL and TLS at once
-            } elseif ($hostinfo[2] == 'tls') {
-                $tls = true;
-                // tls doesn't use a prefix
-            }
-            $host = $hostinfo[3];
-            $port = $this->Port;
-            $tport = (integer)$hostinfo[4];
-            if ($tport > 0 and $tport < 65536) {
-                $port = $tport;
-            }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
-                try {
-                    if ($this->Helo) {
-                        $hello = $this->Helo;
-                    } else {
-                        $hello = $this->serverHostname();
-                    }
-                    $this->smtp->hello($hello);
-
-                    if ($tls) {
-                        if (!$this->smtp->startTLS()) {
-                            throw new phpmailerException($this->lang('connect_host'));
-                        }
-                        // We must resend HELO after tls negotiation
-                        $this->smtp->hello($hello);
-                    }
-                    if ($this->SMTPAuth) {
-                        if (!$this->smtp->authenticate(
-                            $this->Username,
-                            $this->Password,
-                            $this->AuthType,
-                            $this->Realm,
-                            $this->Workstation
-                        )
-                        ) {
-                            throw new phpmailerException($this->lang('authenticate'));
-                        }
-                    }
-                    return true;
-                } catch (phpmailerException $exc) {
-                    $lastexception = $exc;
-                    // We must have connected, but then failed TLS or Auth, so close connection nicely
-                    $this->smtp->quit();
-                }
-            }
-        }
-        // If we get here, all connection attempts have failed, so close connection hard
-        $this->smtp->close();
-        // As we've caught all exceptions, just report whatever the last one was
-        if ($this->exceptions and !is_null($lastexception)) {
-            throw $lastexception;
-        }
-        return false;
-    }
-
-    /**
-     * Close the active SMTP session if one exists.
-     * @return void
-     */
-    public function smtpClose()
-    {
-        if ($this->smtp !== null) {
-            if ($this->smtp->connected()) {
-                $this->smtp->quit();
-                $this->smtp->close();
-            }
-        }
-    }
-
-    /**
-     * Set the language for error messages.
-     * Returns false if it cannot load the language file.
-     * The default language is English.
-     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
-     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
-     * @return boolean
-     * @access public
-     */
-    public function setLanguage($langcode = 'en', $lang_path = '')
-    {
-        // Define full set of translatable strings in English
-        $PHPMAILER_LANG = array(
-            'authenticate' => 'SMTP Error: Could not authenticate.',
-            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-            'data_not_accepted' => 'SMTP Error: data not accepted.',
-            'empty_message' => 'Message body empty',
-            'encoding' => 'Unknown encoding: ',
-            'execute' => 'Could not execute: ',
-            'file_access' => 'Could not access file: ',
-            'file_open' => 'File Error: Could not open file: ',
-            'from_failed' => 'The following From address failed: ',
-            'instantiate' => 'Could not instantiate mail function.',
-            'invalid_address' => 'Invalid address',
-            'mailer_not_supported' => ' mailer is not supported.',
-            'provide_address' => 'You must provide at least one recipient email address.',
-            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-            'signing' => 'Signing Error: ',
-            'smtp_connect_failed' => 'SMTP connect() failed.',
-            'smtp_error' => 'SMTP server error: ',
-            'variable_set' => 'Cannot set or reset variable: '
-        );
-        if (empty($lang_path)) {
-            // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
-        }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
-        if ($langcode != 'en') { // There is no English translation file
-            // Make sure language file path is readable
-            if (!is_readable($lang_file)) {
-                $foundlang = false;
-            } else {
-                // Overwrite language-specific strings.
-                // This way we'll never have missing translations.
-                $foundlang = include $lang_file;
-            }
-        }
-        $this->language = $PHPMAILER_LANG;
-        return (boolean)$foundlang; // Returns false if language not found
-    }
-
-    /**
-     * Get the array of strings for the current language.
-     * @return array
-     */
-    public function getTranslations()
-    {
-        return $this->language;
-    }
-
-    /**
-     * Create recipient headers.
-     * @access public
-     * @param string $type
-     * @param array $addr An array of recipient,
-     * where each recipient is a 2-element indexed array with element 0 containing an address
-     * and element 1 containing a name, like:
-     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
-     * @return string
-     */
-    public function addrAppend($type, $addr)
-    {
-        $addresses = array();
-        foreach ($addr as $address) {
-            $addresses[] = $this->addrFormat($address);
-        }
-        return $type . ': ' . implode(', ', $addresses) . $this->LE;
-    }
-
-    /**
-     * Format an address for use in a message header.
-     * @access public
-     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
-     *      like array('joe@example.com', 'Joe User')
-     * @return string
-     */
-    public function addrFormat($addr)
-    {
-        if (empty($addr[1])) { // No name provided
-            return $this->secureHeader($addr[0]);
-        } else {
-            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
-                $addr[0]
-            ) . '>';
-        }
-    }
-
-    /**
-     * Word-wrap message.
-     * For use with mailers that do not automatically perform wrapping
-     * and for quoted-printable encoded messages.
-     * Original written by philippe.
-     * @param string $message The message to wrap
-     * @param integer $length The line length to wrap to
-     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-     * @access public
-     * @return string
-     */
-    public function wrapText($message, $length, $qp_mode = false)
-    {
-        $soft_break = ($qp_mode) ? sprintf(' =%s', $this->LE) : $this->LE;
-        // If utf-8 encoding is used, we will need to make sure we don't
-        // split multibyte characters when we wrap
-        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
-        $lelen = strlen($this->LE);
-        $crlflen = strlen(self::CRLF);
-
-        $message = $this->fixEOL($message);
-        if (substr($message, -$lelen) == $this->LE) {
-            $message = substr($message, 0, -$lelen);
-        }
-
-        $line = explode($this->LE, $message); // Magic. We know fixEOL uses $LE
-        $message = '';
-        for ($i = 0; $i < count($line); $i++) {
-            $line_part = explode(' ', $line[$i]);
-            $buf = '';
-            for ($e = 0; $e < count($line_part); $e++) {
-                $word = $line_part[$e];
-                if ($qp_mode and (strlen($word) > $length)) {
-                    $space_left = $length - strlen($buf) - $crlflen;
-                    if ($e != 0) {
-                        if ($space_left > 20) {
-                            $len = $space_left;
-                            if ($is_utf8) {
-                                $len = $this->utf8CharBoundary($word, $len);
-                            } elseif (substr($word, $len - 1, 1) == '=') {
-                                $len--;
-                            } elseif (substr($word, $len - 2, 1) == '=') {
-                                $len -= 2;
-                            }
-                            $part = substr($word, 0, $len);
-                            $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', self::CRLF);
-                        } else {
-                            $message .= $buf . $soft_break;
-                        }
-                        $buf = '';
-                    }
-                    while (strlen($word) > 0) {
-                        if ($length <= 0) {
-                            break;
-                        }
-                        $len = $length;
-                        if ($is_utf8) {
-                            $len = $this->utf8CharBoundary($word, $len);
-                        } elseif (substr($word, $len - 1, 1) == '=') {
-                            $len--;
-                        } elseif (substr($word, $len - 2, 1) == '=') {
-                            $len -= 2;
-                        }
-                        $part = substr($word, 0, $len);
-                        $word = substr($word, $len);
-
-                        if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', self::CRLF);
-                        } else {
-                            $buf = $part;
-                        }
-                    }
-                } else {
-                    $buf_o = $buf;
-                    $buf .= ($e == 0) ? $word : (' ' . $word);
-
-                    if (strlen($buf) > $length and $buf_o != '') {
-                        $message .= $buf_o . $soft_break;
-                        $buf = $word;
-                    }
-                }
-            }
-            $message .= $buf . self::CRLF;
-        }
-
-        return $message;
-    }
-
-    /**
-     * Find the last character boundary prior to $maxLength in a utf-8
-     * quoted (printable) encoded string.
-     * Original written by Colin Brown.
-     * @access public
-     * @param string $encodedText utf-8 QP text
-     * @param integer $maxLength   find last character boundary prior to this length
-     * @return integer
-     */
-    public function utf8CharBoundary($encodedText, $maxLength)
-    {
-        $foundSplitPos = false;
-        $lookBack = 3;
-        while (!$foundSplitPos) {
-            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-            $encodedCharPos = strpos($lastChunk, '=');
-            if (false !== $encodedCharPos) {
-                // Found start of encoded character byte within $lookBack block.
-                // Check the encoded byte value (the 2 chars after the '=')
-                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-                $dec = hexdec($hex);
-                if ($dec < 128) { // Single byte character.
-                    // If the encoded char was found at pos 0, it will fit
-                    // otherwise reduce maxLength to start of the encoded char
-                    $maxLength = ($encodedCharPos == 0) ? $maxLength :
-                        $maxLength - ($lookBack - $encodedCharPos);
-                    $foundSplitPos = true;
-                } elseif ($dec >= 192) { // First byte of a multi byte character
-                    // Reduce maxLength to split at start of character
-                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-                    $foundSplitPos = true;
-                } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-                    $lookBack += 3;
-                }
-            } else {
-                // No encoded character found
-                $foundSplitPos = true;
-            }
-        }
-        return $maxLength;
-    }
-
-    /**
-     * Set the body wrapping.
-     * @access public
-     * @return void
-     */
-    public function setWordWrap()
-    {
-        if ($this->WordWrap < 1) {
-            return;
-        }
-
-        switch ($this->message_type) {
-            case 'alt':
-            case 'alt_inline':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
-                break;
-            default:
-                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
-                break;
-        }
-    }
-
-    /**
-     * Assemble message headers.
-     * @access public
-     * @return string The assembled headers
-     */
-    public function createHeader()
-    {
-        $result = '';
-
-        // Set the boundaries
-        $uniq_id = md5(uniqid(time()));
-        $this->boundary[1] = 'b1_' . $uniq_id;
-        $this->boundary[2] = 'b2_' . $uniq_id;
-        $this->boundary[3] = 'b3_' . $uniq_id;
-
-        if ($this->MessageDate == '') {
-            $this->MessageDate = self::rfcDate();
-        }
-        $result .= $this->headerLine('Date', $this->MessageDate);
-
-
-        // To be created automatically by mail()
-        if ($this->SingleTo) {
-            if ($this->Mailer != 'mail') {
-                foreach ($this->to as $toaddr) {
-                    $this->SingleToArray[] = $this->addrFormat($toaddr);
-                }
-            }
-        } else {
-            if (count($this->to) > 0) {
-                if ($this->Mailer != 'mail') {
-                    $result .= $this->addrAppend('To', $this->to);
-                }
-            } elseif (count($this->cc) == 0) {
-                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
-            }
-        }
-
-        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
-
-        // sendmail and mail() extract Cc from the header before sending
-        if (count($this->cc) > 0) {
-            $result .= $this->addrAppend('Cc', $this->cc);
-        }
-
-        // sendmail and mail() extract Bcc from the header before sending
-        if ((
-                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
-            )
-            and count($this->bcc) > 0
-        ) {
-            $result .= $this->addrAppend('Bcc', $this->bcc);
-        }
-
-        if (count($this->ReplyTo) > 0) {
-            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
-        }
-
-        // mail() sets the subject itself
-        if ($this->Mailer != 'mail') {
-            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
-        }
-
-        if ($this->MessageID != '') {
-            $this->lastMessageID = $this->MessageID;
-        } else {
-            $this->lastMessageID = sprintf('<%s@%s>', $uniq_id, $this->ServerHostname());
-        }
-        $result .= $this->HeaderLine('Message-ID', $this->lastMessageID);
-        $result .= $this->headerLine('X-Priority', $this->Priority);
-        if ($this->XMailer == '') {
-            $result .= $this->headerLine(
-                'X-Mailer',
-                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
-            );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
-
-        if ($this->ConfirmReadingTo != '') {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-        }
-
-        // Add custom headers
-        for ($index = 0; $index < count($this->CustomHeader); $index++) {
-            $result .= $this->headerLine(
-                trim($this->CustomHeader[$index][0]),
-                $this->encodeHeader(trim($this->CustomHeader[$index][1]))
-            );
-        }
-        if (!$this->sign_key_file) {
-            $result .= $this->headerLine('MIME-Version', '1.0');
-            $result .= $this->getMailMIME();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get the message MIME type headers.
-     * @access public
-     * @return string
-     */
-    public function getMailMIME()
-    {
-        $result = '';
-        $ismultipart = true;
-        switch ($this->message_type) {
-            case 'inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/related;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'attach':
-            case 'inline_attach':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'alt':
-            case 'alt_inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            default:
-                // Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
-                $ismultipart = false;
-                break;
-        }
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($this->Encoding != '7bit') {
-            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
-            if ($ismultipart) {
-                if ($this->Encoding == '8bit') {
-                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
-                }
-                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
-            } else {
-                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
-            }
-        }
-
-        if ($this->Mailer != 'mail') {
-            $result .= $this->LE;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the whole MIME message.
-     * Includes complete headers and body.
-     * Only valid post preSend().
-     * @see PHPMailer::preSend()
-     * @access public
-     * @return string
-     */
-    public function getSentMIMEMessage()
-    {
-        return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
-    }
-
-
-    /**
-     * Assemble the message body.
-     * Returns an empty string on failure.
-     * @access public
-     * @throws phpmailerException
-     * @return string The assembled message body
-     */
-    public function createBody()
-    {
-        $body = '';
-
-        if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . $this->LE;
-        }
-
-        $this->setWordWrap();
-
-        $bodyEncoding = $this->Encoding;
-        $bodyCharSet = $this->CharSet;
-        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
-            $bodyEncoding = '7bit';
-            $bodyCharSet = 'us-ascii';
-        }
-        $altBodyEncoding = $this->Encoding;
-        $altBodyCharSet = $this->CharSet;
-        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
-            $altBodyEncoding = '7bit';
-            $altBodyCharSet = 'us-ascii';
-        }
-        switch ($this->message_type) {
-            case 'inline':
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[1]);
-                break;
-            case 'attach':
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'inline_attach':
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt':
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                if (!empty($this->Ical)) {
-                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
-                    $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= $this->LE . $this->LE;
-                }
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_inline':
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_attach':
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt_inline_attach':
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[3]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            default:
-                // catch case 'plain' and case ''
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                break;
-        }
-
-        if ($this->isError()) {
-            $body = '';
-        } elseif ($this->sign_key_file) {
-            try {
-                if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
-                }
-                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
-                $file = tempnam(sys_get_temp_dir(), 'mail');
-                if (false === file_put_contents($file, $body)) {
-                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
-                }
-                $signed = tempnam(sys_get_temp_dir(), 'signed');
-                if (@openssl_pkcs7_sign(
-                    $file,
-                    $signed,
-                    'file://' . realpath($this->sign_cert_file),
-                    array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
-                    null
-                )
-                ) {
-                    @unlink($file);
-                    $body = file_get_contents($signed);
-                    @unlink($signed);
-                } else {
-                    @unlink($file);
-                    @unlink($signed);
-                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
-                }
-            } catch (phpmailerException $exc) {
-                $body = '';
-                if ($this->exceptions) {
-                    throw $exc;
-                }
-            }
-        }
-        return $body;
-    }
-
-    /**
-     * Return the start of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @param string $charSet
-     * @param string $contentType
-     * @param string $encoding
-     * @return string
-     */
-    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
-    {
-        $result = '';
-        if ($charSet == '') {
-            $charSet = $this->CharSet;
-        }
-        if ($contentType == '') {
-            $contentType = $this->ContentType;
-        }
-        if ($encoding == '') {
-            $encoding = $this->Encoding;
-        }
-        $result .= $this->textLine('--' . $boundary);
-        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
-        $result .= $this->LE;
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($encoding != '7bit') {
-            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
-        }
-        $result .= $this->LE;
-
-        return $result;
-    }
-
-    /**
-     * Return the end of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @return string
-     */
-    protected function endBoundary($boundary)
-    {
-        return $this->LE . '--' . $boundary . '--' . $this->LE;
-    }
-
-    /**
-     * Set the message type.
-     * PHPMailer only supports some preset message types,
-     * not arbitrary MIME structures.
-     * @access protected
-     * @return void
-     */
-    protected function setMessageType()
-    {
-        $type = array();
-        if ($this->alternativeExists()) {
-            $type[] = 'alt';
-        }
-        if ($this->inlineImageExists()) {
-            $type[] = 'inline';
-        }
-        if ($this->attachmentExists()) {
-            $type[] = 'attach';
-        }
-        $this->message_type = implode('_', $type);
-        if ($this->message_type == '') {
-            $this->message_type = 'plain';
-        }
-    }
-
-    /**
-     * Format a header line.
-     * @access public
-     * @param string $name
-     * @param string $value
-     * @return string
-     */
-    public function headerLine($name, $value)
-    {
-        return $name . ': ' . $value . $this->LE;
-    }
-
-    /**
-     * Return a formatted mail line.
-     * @access public
-     * @param string $value
-     * @return string
-     */
-    public function textLine($value)
-    {
-        return $value . $this->LE;
-    }
-
-    /**
-     * Add an attachment from a path on the filesystem.
-     * Returns false if the file could not be found or read.
-     * @param string $path Path to the attachment.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
-    {
-        try {
-            if (!@is_file($path)) {
-                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
-            }
-
-            // If a MIME type is not specified, try to work it out from the file name
-            if ($type == '') {
-                $type = self::filenameToType($path);
-            }
-
-            $filename = basename($path);
-            if ($name == '') {
-                $name = $filename;
-            }
-
-            $this->attachment[] = array(
-                0 => $path,
-                1 => $filename,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => false, // isStringAttachment
-                6 => $disposition,
-                7 => 0
-            );
-
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return the array of attachments.
-     * @return array
-     */
-    public function getAttachments()
-    {
-        return $this->attachment;
-    }
-
-    /**
-     * Attach all file, string, and binary attachments to the message.
-     * Returns an empty string on failure.
-     * @access protected
-     * @param string $disposition_type
-     * @param string $boundary
-     * @return string
-     */
-    protected function attachAll($disposition_type, $boundary)
-    {
-        // Return text of body
-        $mime = array();
-        $cidUniq = array();
-        $incl = array();
-
-        // Add all attachments
-        foreach ($this->attachment as $attachment) {
-            // Check if it is a valid disposition_filter
-            if ($attachment[6] == $disposition_type) {
-                // Check for string attachment
-                $string = '';
-                $path = '';
-                $bString = $attachment[5];
-                if ($bString) {
-                    $string = $attachment[0];
-                } else {
-                    $path = $attachment[0];
-                }
-
-                $inclhash = md5(serialize($attachment));
-                if (in_array($inclhash, $incl)) {
-                    continue;
-                }
-                $incl[] = $inclhash;
-                $name = $attachment[2];
-                $encoding = $attachment[3];
-                $type = $attachment[4];
-                $disposition = $attachment[6];
-                $cid = $attachment[7];
-                if ($disposition == 'inline' && isset($cidUniq[$cid])) {
-                    continue;
-                }
-                $cidUniq[$cid] = true;
-
-                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
-                $mime[] = sprintf(
-                    'Content-Type: %s; name="%s"%s',
-                    $type,
-                    $this->encodeHeader($this->secureHeader($name)),
-                    $this->LE
-                );
-                // RFC1341 part 5 says 7bit is assumed if not specified
-                if ($encoding != '7bit') {
-                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
-                }
-
-                if ($disposition == 'inline') {
-                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
-                }
-
-                // If a filename contains any of these chars, it should be quoted,
-                // but not otherwise: RFC2183 & RFC2045 5.1
-                // Fixes a warning in IETF's msglint MIME checker
-                // Allow for bypassing the Content-Disposition header totally
-                if (!(empty($disposition))) {
-                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
-                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename="%s"%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    } else {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename=%s%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    }
-                } else {
-                    $mime[] = $this->LE;
-                }
-
-                // Encode as string attachment
-                if ($bString) {
-                    $mime[] = $this->encodeString($string, $encoding);
-                    if ($this->isError()) {
-                        return '';
-                    }
-                    $mime[] = $this->LE . $this->LE;
-                } else {
-                    $mime[] = $this->encodeFile($path, $encoding);
-                    if ($this->isError()) {
-                        return '';
-                    }
-                    $mime[] = $this->LE . $this->LE;
-                }
-            }
-        }
-
-        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
-
-        return implode('', $mime);
-    }
-
-    /**
-     * Encode a file attachment in requested format.
-     * Returns an empty string on failure.
-     * @param string $path The full path to the file
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @throws phpmailerException
-     * @see EncodeFile(encodeFile
-     * @access protected
-     * @return string
-     */
-    protected function encodeFile($path, $encoding = 'base64')
-    {
-        try {
-            if (!is_readable($path)) {
-                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
-            }
-            $magic_quotes = get_magic_quotes_runtime();
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime(false);
-                } else {
-                    //Doesn't exist in PHP 5.4, but we don't need to check because
-                    //get_magic_quotes_runtime always returns false in 5.4+
-                    //so it will never get here
-                    ini_set('magic_quotes_runtime', 0);
-                }
-            }
-            $file_buffer = file_get_contents($path);
-            $file_buffer = $this->encodeString($file_buffer, $encoding);
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime($magic_quotes);
-                } else {
-                    ini_set('magic_quotes_runtime', ($magic_quotes?'1':'0'));
-                }
-            }
-            return $file_buffer;
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            return '';
-        }
-    }
-
-    /**
-     * Encode a string in requested format.
-     * Returns an empty string on failure.
-     * @param string $str The text to encode
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @access public
-     * @return string
-     */
-    public function encodeString($str, $encoding = 'base64')
-    {
-        $encoded = '';
-        switch (strtolower($encoding)) {
-            case 'base64':
-                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-                break;
-            case '7bit':
-            case '8bit':
-                $encoded = $this->fixEOL($str);
-                // Make sure it ends with a line break
-                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
-                    $encoded .= $this->LE;
-                }
-                break;
-            case 'binary':
-                $encoded = $str;
-                break;
-            case 'quoted-printable':
-                $encoded = $this->encodeQP($str);
-                break;
-            default:
-                $this->setError($this->lang('encoding') . $encoding);
-                break;
-        }
-        return $encoded;
-    }
-
-    /**
-     * Encode a header string optimally.
-     * Picks shortest of Q, B, quoted-printable or none.
-     * @access public
-     * @param string $str
-     * @param string $position
-     * @return string
-     */
-    public function encodeHeader($str, $position = 'text')
-    {
-        $matchcount = 0;
-        switch (strtolower($position)) {
-            case 'phrase':
-                if (!preg_match('/[\200-\377]/', $str)) {
-                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
-                    $encoded = addcslashes($str, "\0..\37\177\\\"");
-                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-                        return ($encoded);
-                    } else {
-                        return ("\"$encoded\"");
-                    }
-                }
-                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                $matchcount = preg_match_all('/[()"]/', $str, $matches);
-                // Intentional fall-through
-            case 'text':
-            default:
-                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-                break;
-        }
-
-        if ($matchcount == 0) { // There are no chars that need encoding
-            return ($str);
-        }
-
-        $maxlen = 75 - 7 - strlen($this->CharSet);
-        // Try to select the encoding which should produce the shortest output
-        if ($matchcount > strlen($str) / 3) {
-            // More than a third of the content will need encoding, so B encoding will be most efficient
-            $encoding = 'B';
-            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
-                // Use a custom function which correctly encodes and wraps long
-                // multibyte strings without breaking lines within a character
-                $encoded = $this->base64EncodeWrapMB($str, "\n");
-            } else {
-                $encoded = base64_encode($str);
-                $maxlen -= $maxlen % 4;
-                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-            }
-        } else {
-            $encoding = 'Q';
-            $encoded = $this->encodeQ($str, $position);
-            $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
-        }
-
-        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
-        $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-        return $encoded;
-    }
-
-    /**
-     * Check if a string contains multi-byte characters.
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @return boolean
-     */
-    public function hasMultiBytes($str)
-    {
-        if (function_exists('mb_strlen')) {
-            return (strlen($str) > mb_strlen($str, $this->CharSet));
-        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-            return false;
-        }
-    }
-
-    /**
-     * Does a string contain any 8-bit chars (in any charset)?
-     * @param string $text
-     * @return boolean
-     */
-    public function has8bitChars($text)
-    {
-        return (boolean)preg_match('/[\x80-\xFF]/', $text);
-    }
-
-    /**
-     * Encode and wrap long multibyte strings for mail headers
-     * without breaking lines within a character.
-     * Adapted from a function by paravoid
-     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @param string $linebreak string to use as linefeed/end-of-line
-     * @return string
-     */
-    public function base64EncodeWrapMB($str, $linebreak = null)
-    {
-        $start = '=?' . $this->CharSet . '?B?';
-        $end = '?=';
-        $encoded = '';
-        if ($linebreak === null) {
-            $linebreak = $this->LE;
-        }
-
-        $mb_length = mb_strlen($str, $this->CharSet);
-        // Each line must have length <= 75, including $start and $end
-        $length = 75 - strlen($start) - strlen($end);
-        // Average multi-byte ratio
-        $ratio = $mb_length / strlen($str);
-        // Base64 has a 4:3 ratio
-        $avgLength = floor($length * $ratio * .75);
-
-        for ($i = 0; $i < $mb_length; $i += $offset) {
-            $lookBack = 0;
-            do {
-                $offset = $avgLength - $lookBack;
-                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-                $chunk = base64_encode($chunk);
-                $lookBack++;
-            } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
-        }
-
-        // Chomp the last linefeed
-        $encoded = substr($encoded, 0, -strlen($linebreak));
-        return $encoded;
-    }
-
-    /**
-     * Encode a string in quoted-printable format.
-     * According to RFC2045 section 6.7.
-     * @access public
-     * @param string $string The text to encode
-     * @param integer $line_max Number of chars allowed on a line before wrapping
-     * @return string
-     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
-     */
-    public function encodeQP($string, $line_max = 76)
-    {
-        if (function_exists('quoted_printable_encode')) { // Use native function if it's available (>= PHP5.3)
-            return $this->fixEOL(quoted_printable_encode($string));
-        }
-        // Fall back to a pure PHP implementation
-        $string = str_replace(
-            array('%20', '%0D%0A.', '%0D%0A', '%'),
-            array(' ', "\r\n=2E", "\r\n", '='),
-            rawurlencode($string)
-        );
-        $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
-        return $this->fixEOL($string);
-    }
-
-    /**
-     * Backward compatibility wrapper for an old QP encoding function that was removed.
-     * @see PHPMailer::encodeQP()
-     * @access public
-     * @param string $string
-     * @param integer $line_max
-     * @param boolean $space_conv
-     * @return string
-     * @deprecated Use encodeQP instead.
-     */
-    public function encodeQPphp(
-        $string,
-        $line_max = 76,
-        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
-    ) {
-        return $this->encodeQP($string, $line_max);
-    }
-
-    /**
-     * Encode a string using Q encoding.
-     * @link http://tools.ietf.org/html/rfc2047
-     * @param string $str the text to encode
-     * @param string $position Where the text is going to be used, see the RFC for what that means
-     * @access public
-     * @return string
-     */
-    public function encodeQ($str, $position = 'text')
-    {
-        // There should not be any EOL in the string
-        $pattern = '';
-        $encoded = str_replace(array("\r", "\n"), '', $str);
-        switch (strtolower($position)) {
-            case 'phrase':
-                // RFC 2047 section 5.3
-                $pattern = '^A-Za-z0-9!*+\/ -';
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                // RFC 2047 section 5.2
-                $pattern = '\(\)"';
-                // intentional fall-through
-                // for this reason we build the $pattern without including delimiters and []
-            case 'text':
-            default:
-                // RFC 2047 section 5.1
-                // Replace every high ascii, control, =, ? and _ characters
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
-                break;
-        }
-        $matches = array();
-        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-            // If the string contains an '=', make sure it's the first thing we replace
-            // so as to avoid double-encoding
-            $eqkey = array_search('=', $matches[0]);
-            if (false !== $eqkey) {
-                unset($matches[0][$eqkey]);
-                array_unshift($matches[0], '=');
-            }
-            foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
-            }
-        }
-        // Replace every spaces to _ (more readable than =20)
-        return str_replace(' ', '_', $encoded);
-    }
-
-
-    /**
-     * Add a string or binary attachment (non-filesystem).
-     * This method can be used to attach ascii or binary data,
-     * such as a BLOB record from a database.
-     * @param string $string String attachment data.
-     * @param string $filename Name of the attachment.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @return void
-     */
-    public function addStringAttachment(
-        $string,
-        $filename,
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'attachment'
-    ) {
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($filename);
-        }
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $filename,
-            2 => basename($filename),
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => 0
-        );
-    }
-
-    /**
-     * Add an embedded (inline) attachment from a file.
-     * This can include images, sounds, and just about any other document type.
-     * These differ from 'regular' attachments in that they are intended to be
-     * displayed inline with the message, not just attached for download.
-     * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
-     * @param string $path Path to the attachment.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
-    {
-        if (!@is_file($path)) {
-            $this->setError($this->lang('file_access') . $path);
-            return false;
-        }
-
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($path);
-        }
-
-        $filename = basename($path);
-        if ($name == '') {
-            $name = $filename;
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $path,
-            1 => $filename,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => false, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Add an embedded stringified attachment.
-     * This can include images, sounds, and just about any other document type.
-     * Be sure to set the $type to an image type for images:
-     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
-     * @param string $string The attachment binary data.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addStringEmbeddedImage(
-        $string,
-        $cid,
-        $name = '',
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'inline'
-    ) {
-        // If a MIME type is not specified, try to work it out from the name
-        if ($type == '') {
-            $type = self::filenameToType($name);
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $name,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Check if an inline attachment is present.
-     * @access public
-     * @return boolean
-     */
-    public function inlineImageExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'inline') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if an attachment (non-inline) is present.
-     * @return boolean
-     */
-    public function attachmentExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'attachment') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if this message has an alternative body set.
-     * @return boolean
-     */
-    public function alternativeExists()
-    {
-        return !empty($this->AltBody);
-    }
-
-    /**
-     * Clear all To recipients.
-     * @return void
-     */
-    public function clearAddresses()
-    {
-        foreach ($this->to as $to) {
-            unset($this->all_recipients[strtolower($to[0])]);
-        }
-        $this->to = array();
-    }
-
-    /**
-     * Clear all CC recipients.
-     * @return void
-     */
-    public function clearCCs()
-    {
-        foreach ($this->cc as $cc) {
-            unset($this->all_recipients[strtolower($cc[0])]);
-        }
-        $this->cc = array();
-    }
-
-    /**
-     * Clear all BCC recipients.
-     * @return void
-     */
-    public function clearBCCs()
-    {
-        foreach ($this->bcc as $bcc) {
-            unset($this->all_recipients[strtolower($bcc[0])]);
-        }
-        $this->bcc = array();
-    }
-
-    /**
-     * Clear all ReplyTo recipients.
-     * @return void
-     */
-    public function clearReplyTos()
-    {
-        $this->ReplyTo = array();
-    }
-
-    /**
-     * Clear all recipient types.
-     * @return void
-     */
-    public function clearAllRecipients()
-    {
-        $this->to = array();
-        $this->cc = array();
-        $this->bcc = array();
-        $this->all_recipients = array();
-    }
-
-    /**
-     * Clear all filesystem, string, and binary attachments.
-     * @return void
-     */
-    public function clearAttachments()
-    {
-        $this->attachment = array();
-    }
-
-    /**
-     * Clear all custom headers.
-     * @return void
-     */
-    public function clearCustomHeaders()
-    {
-        $this->CustomHeader = array();
-    }
-
-    /**
-     * Add an error message to the error container.
-     * @access protected
-     * @param string $msg
-     * @return void
-     */
-    protected function setError($msg)
-    {
-        $this->error_count++;
-        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-            $lasterror = $this->smtp->getError();
-            if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-                $msg .= '<p>' . $this->lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-            }
-        }
-        $this->ErrorInfo = $msg;
-    }
-
-    /**
-     * Return an RFC 822 formatted date.
-     * @access public
-     * @return string
-     * @static
-     */
-    public static function rfcDate()
-    {
-        // Set the time zone to whatever the default is to avoid 500 errors
-        // Will default to UTC if it's not set properly in php.ini
-        date_default_timezone_set(@date_default_timezone_get());
-        return date('D, j M Y H:i:s O');
-    }
-
-    /**
-     * Get the server hostname.
-     * Returns 'localhost.localdomain' if unknown.
-     * @access protected
-     * @return string
-     */
-    protected function serverHostname()
-    {
-        $result = 'localhost.localdomain';
-        if (!empty($this->Hostname)) {
-            $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
-            $result = $_SERVER['SERVER_NAME'];
-        } elseif (function_exists('gethostname') && gethostname() !== false) {
-            $result = gethostname();
-        } elseif (php_uname('n') !== false) {
-            $result = php_uname('n');
-        }
-        return $result;
-    }
-
-    /**
-     * Get an error message in the current language.
-     * @access protected
-     * @param string $key
-     * @return string
-     */
-    protected function lang($key)
-    {
-        if (count($this->language) < 1) {
-            $this->setLanguage('en'); // set the default language
-        }
-
-        if (isset($this->language[$key])) {
-            return $this->language[$key];
-        } else {
-            return 'Language string failed to load: ' . $key;
-        }
-    }
-
-    /**
-     * Check if an error occurred.
-     * @access public
-     * @return boolean True if an error did occur.
-     */
-    public function isError()
-    {
-        return ($this->error_count > 0);
-    }
-
-    /**
-     * Ensure consistent line endings in a string.
-     * Changes every end of line from CRLF, CR or LF to $this->LE.
-     * @access public
-     * @param string $str String to fixEOL
-     * @return string
-     */
-    public function fixEOL($str)
-    {
-        // Normalise to \n
-        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
-        // Now convert LE as needed
-        if ($this->LE !== "\n") {
-            $nstr = str_replace("\n", $this->LE, $nstr);
-        }
-        return $nstr;
-    }
-
-    /**
-     * Add a custom header.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value)
-     * @access public
-     * @param string $name Custom header name
-     * @param string $value Header value
-     * @return void
-     */
-    public function addCustomHeader($name, $value = null)
-    {
-        if ($value === null) {
-            // Value passed in as name:value
-            $this->CustomHeader[] = explode(':', $name, 2);
-        } else {
-            $this->CustomHeader[] = array($name, $value);
-        }
-    }
-
-    /**
-     * Create a message from an HTML string.
-     * Automatically makes modifications for inline images and backgrounds
-     * and creates a plain-text version by converting the HTML.
-     * Overwrites any existing values in $this->Body and $this->AltBody
-     * @access public
-     * @param string $message HTML message string
-     * @param string $basedir baseline directory for path
-     * @param boolean $advanced Whether to use the advanced HTML to text converter
-     * @return string $message
-     */
-    public function msgHTML($message, $basedir = '', $advanced = false)
-    {
-        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
-        if (isset($images[2])) {
-            foreach ($images[2] as $imgindex => $url) {
-                // Convert data URIs into embedded images
-                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
-                    $data = substr($url, strpos($url, ','));
-                    if ($match[2]) {
-                        $data = base64_decode($data);
-                    } else {
-                        $data = rawurldecode($data);
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
-                        $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                } elseif (!preg_match('#^[A-z]+://#', $url)) {
-                    // Do not change urls for absolute images (thanks to corvuscorax)
-                    $filename = basename($url);
-                    $directory = dirname($url);
-                    if ($directory == '.') {
-                        $directory = '';
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
-                        $basedir .= '/';
-                    }
-                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
-                        $directory .= '/';
-                    }
-                    if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
-                        $cid,
-                        $filename,
-                        'base64',
-                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
-                    )
-                    ) {
-                        $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                }
-            }
-        }
-        $this->isHTML(true);
-        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
-        $this->Body = $this->normalizeBreaks($message);
-        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
-        if (empty($this->AltBody)) {
-            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
-                self::CRLF . self::CRLF;
-        }
-        return $this->Body;
-    }
-
-    /**
-     * Convert an HTML string into plain text.
-     * @param string $html The HTML text to convert
-     * @param boolean $advanced Should this use the more complex html2text converter or just a simple one?
-     * @return string
-     */
-    public function html2text($html, $advanced = false)
-    {
-        if ($advanced) {
-            require_once 'extras/class.html2text.php';
-            $htmlconverter = new html2text($html);
-            return $htmlconverter->get_text();
-        }
-        return html_entity_decode(
-            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
-            ENT_QUOTES,
-            $this->CharSet
-        );
-    }
-
-    /**
-     * Get the MIME type for a file extension.
-     * @param string $ext File extension
-     * @access public
-     * @return string MIME type of file.
-     * @static
-     */
-    public static function _mime_types($ext = '')
-    {
-        $mimes = array(
-            'xl'    => 'application/excel',
-            'js'    => 'application/javascript',
-            'hqx'   => 'application/mac-binhex40',
-            'cpt'   => 'application/mac-compactpro',
-            'bin'   => 'application/macbinary',
-            'doc'   => 'application/msword',
-            'word'  => 'application/msword',
-            'class' => 'application/octet-stream',
-            'dll'   => 'application/octet-stream',
-            'dms'   => 'application/octet-stream',
-            'exe'   => 'application/octet-stream',
-            'lha'   => 'application/octet-stream',
-            'lzh'   => 'application/octet-stream',
-            'psd'   => 'application/octet-stream',
-            'sea'   => 'application/octet-stream',
-            'so'    => 'application/octet-stream',
-            'oda'   => 'application/oda',
-            'pdf'   => 'application/pdf',
-            'ai'    => 'application/postscript',
-            'eps'   => 'application/postscript',
-            'ps'    => 'application/postscript',
-            'smi'   => 'application/smil',
-            'smil'  => 'application/smil',
-            'mif'   => 'application/vnd.mif',
-            'xls'   => 'application/vnd.ms-excel',
-            'ppt'   => 'application/vnd.ms-powerpoint',
-            'wbxml' => 'application/vnd.wap.wbxml',
-            'wmlc'  => 'application/vnd.wap.wmlc',
-            'dcr'   => 'application/x-director',
-            'dir'   => 'application/x-director',
-            'dxr'   => 'application/x-director',
-            'dvi'   => 'application/x-dvi',
-            'gtar'  => 'application/x-gtar',
-            'php3'  => 'application/x-httpd-php',
-            'php4'  => 'application/x-httpd-php',
-            'php'   => 'application/x-httpd-php',
-            'phtml' => 'application/x-httpd-php',
-            'phps'  => 'application/x-httpd-php-source',
-            'swf'   => 'application/x-shockwave-flash',
-            'sit'   => 'application/x-stuffit',
-            'tar'   => 'application/x-tar',
-            'tgz'   => 'application/x-tar',
-            'xht'   => 'application/xhtml+xml',
-            'xhtml' => 'application/xhtml+xml',
-            'zip'   => 'application/zip',
-            'mid'   => 'audio/midi',
-            'midi'  => 'audio/midi',
-            'mp2'   => 'audio/mpeg',
-            'mp3'   => 'audio/mpeg',
-            'mpga'  => 'audio/mpeg',
-            'aif'   => 'audio/x-aiff',
-            'aifc'  => 'audio/x-aiff',
-            'aiff'  => 'audio/x-aiff',
-            'ram'   => 'audio/x-pn-realaudio',
-            'rm'    => 'audio/x-pn-realaudio',
-            'rpm'   => 'audio/x-pn-realaudio-plugin',
-            'ra'    => 'audio/x-realaudio',
-            'wav'   => 'audio/x-wav',
-            'bmp'   => 'image/bmp',
-            'gif'   => 'image/gif',
-            'jpeg'  => 'image/jpeg',
-            'jpe'   => 'image/jpeg',
-            'jpg'   => 'image/jpeg',
-            'png'   => 'image/png',
-            'tiff'  => 'image/tiff',
-            'tif'   => 'image/tiff',
-            'eml'   => 'message/rfc822',
-            'css'   => 'text/css',
-            'html'  => 'text/html',
-            'htm'   => 'text/html',
-            'shtml' => 'text/html',
-            'log'   => 'text/plain',
-            'text'  => 'text/plain',
-            'txt'   => 'text/plain',
-            'rtx'   => 'text/richtext',
-            'rtf'   => 'text/rtf',
-            'vcf'   => 'text/vcard',
-            'vcard' => 'text/vcard',
-            'xml'   => 'text/xml',
-            'xsl'   => 'text/xml',
-            'mpeg'  => 'video/mpeg',
-            'mpe'   => 'video/mpeg',
-            'mpg'   => 'video/mpeg',
-            'mov'   => 'video/quicktime',
-            'qt'    => 'video/quicktime',
-            'rv'    => 'video/vnd.rn-realvideo',
-            'avi'   => 'video/x-msvideo',
-            'movie' => 'video/x-sgi-movie'
-        );
-        return (array_key_exists(strtolower($ext), $mimes) ? $mimes[strtolower($ext)]: 'application/octet-stream');
-    }
-
-    /**
-     * Map a file name to a MIME type.
-     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
-     * @param string $filename A file name or full path, does not need to exist as a file
-     * @return string
-     * @static
-     */
-    public static function filenameToType($filename)
-    {
-        // In case the path is a URL, strip any query string before getting extension
-        $qpos = strpos($filename, '?');
-        if (false !== $qpos) {
-            $filename = substr($filename, 0, $qpos);
-        }
-        $pathinfo = self::mb_pathinfo($filename);
-        return self::_mime_types($pathinfo['extension']);
-    }
-
-    /**
-     * Multi-byte-safe pathinfo replacement.
-     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
-     * Works similarly to the one in PHP >= 5.2.0
-     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
-     * @param string $path A filename or path, does not need to exist as a file
-     * @param integer|string $options Either a PATHINFO_* constant,
-     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
-     * @return string|array
-     * @static
-     */
-    public static function mb_pathinfo($path, $options = null)
-    {
-        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
-        $pathinfo = array();
-        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
-            if (array_key_exists(1, $pathinfo)) {
-                $ret['dirname'] = $pathinfo[1];
-            }
-            if (array_key_exists(2, $pathinfo)) {
-                $ret['basename'] = $pathinfo[2];
-            }
-            if (array_key_exists(5, $pathinfo)) {
-                $ret['extension'] = $pathinfo[5];
-            }
-            if (array_key_exists(3, $pathinfo)) {
-                $ret['filename'] = $pathinfo[3];
-            }
-        }
-        switch ($options) {
-            case PATHINFO_DIRNAME:
-            case 'dirname':
-                return $ret['dirname'];
-            case PATHINFO_BASENAME:
-            case 'basename':
-                return $ret['basename'];
-            case PATHINFO_EXTENSION:
-            case 'extension':
-                return $ret['extension'];
-            case PATHINFO_FILENAME:
-            case 'filename':
-                return $ret['filename'];
-            default:
-                return $ret;
-        }
-    }
-
-    /**
-     * Set or reset instance properties.
-     *
-     * Usage Example:
-     * $page->set('X-Priority', '3');
-     *
-     * @access public
-     * @param string $name
-     * @param mixed $value
-     * NOTE: will not work with arrays, there are no arrays to set/reset
-     * @throws phpmailerException
-     * @return boolean
-     * @TODO Should this not be using __set() magic function?
-     */
-    public function set($name, $value = '')
-    {
-        try {
-            if (isset($this->$name)) {
-                $this->$name = $value;
-            } else {
-                throw new phpmailerException($this->lang('variable_set') . $name, self::STOP_CRITICAL);
-            }
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            if ($exc->getCode() == self::STOP_CRITICAL) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Strip newlines to prevent header injection.
-     * @access public
-     * @param string $str
-     * @return string
-     */
-    public function secureHeader($str)
-    {
-        return trim(str_replace(array("\r", "\n"), '', $str));
-    }
-
-    /**
-     * Normalize line breaks in a string.
-     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
-     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
-     * @param string $text
-     * @param string $breaktype What kind of line break to use, defaults to CRLF
-     * @return string
-     * @access public
-     * @static
-     */
-    public static function normalizeBreaks($text, $breaktype = "\r\n")
-    {
-        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
-    }
-
-
-    /**
-     * Set the public and private key files and password for S/MIME signing.
-     * @access public
-     * @param string $cert_filename
-     * @param string $key_filename
-     * @param string $key_pass Password for private key
-     */
-    public function sign($cert_filename, $key_filename, $key_pass)
-    {
-        $this->sign_cert_file = $cert_filename;
-        $this->sign_key_file = $key_filename;
-        $this->sign_key_pass = $key_pass;
-    }
-
-    /**
-     * Quoted-Printable-encode a DKIM header.
-     * @access public
-     * @param string $txt
-     * @return string
-     */
-    public function DKIM_QP($txt)
-    {
-        $line = '';
-        for ($i = 0; $i < strlen($txt); $i++) {
-            $ord = ord($txt[$i]);
-            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
-                $line .= $txt[$i];
-            } else {
-                $line .= '=' . sprintf('%02X', $ord);
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Generate a DKIM signature.
-     * @access public
-     * @param string $signHeader
-     * @throws phpmailerException
-     * @return string
-     */
-    public function DKIM_Sign($signHeader)
-    {
-        if (!defined('PKCS7_TEXT')) {
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
-            }
-            return '';
-        }
-        $privKeyStr = file_get_contents($this->DKIM_private);
-        if ($this->DKIM_passphrase != '') {
-            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
-        } else {
-            $privKey = $privKeyStr;
-        }
-        if (openssl_sign($signHeader, $signature, $privKey)) {
-            return base64_encode($signature);
-        }
-        return '';
-    }
-
-    /**
-     * Generate a DKIM canonicalization header.
-     * @access public
-     * @param string $signHeader Header
-     * @return string
-     */
-    public function DKIM_HeaderC($signHeader)
-    {
-        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
-        $lines = explode("\r\n", $signHeader);
-        foreach ($lines as $key => $line) {
-            list($heading, $value) = explode(':', $line, 2);
-            $heading = strtolower($heading);
-            $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces
-            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
-        }
-        $signHeader = implode("\r\n", $lines);
-        return $signHeader;
-    }
-
-    /**
-     * Generate a DKIM canonicalization body.
-     * @access public
-     * @param string $body Message Body
-     * @return string
-     */
-    public function DKIM_BodyC($body)
-    {
-        if ($body == '') {
-            return "\r\n";
-        }
-        // stabilize line endings
-        $body = str_replace("\r\n", "\n", $body);
-        $body = str_replace("\n", "\r\n", $body);
-        // END stabilize line endings
-        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
-            $body = substr($body, 0, strlen($body) - 2);
-        }
-        return $body;
-    }
-
-    /**
-     * Create the DKIM header and body in a new message header.
-     * @access public
-     * @param string $headers_line Header lines
-     * @param string $subject Subject
-     * @param string $body Body
-     * @return string
-     */
-    public function DKIM_Add($headers_line, $subject, $body)
-    {
-        $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
-        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-        $DKIMquery = 'dns/txt'; // Query method
-        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-        $subject_header = "Subject: $subject";
-        $headers = explode($this->LE, $headers_line);
-        $from_header = '';
-        $to_header = '';
-        $current = '';
-        foreach ($headers as $header) {
-            if (strpos($header, 'From:') === 0) {
-                $from_header = $header;
-                $current = 'from_header';
-            } elseif (strpos($header, 'To:') === 0) {
-                $to_header = $header;
-                $current = 'to_header';
-            } else {
-                if ($current && strpos($header, ' =?') === 0) {
-                    $current .= $header;
-                } else {
-                    $current = '';
-                }
-            }
-        }
-        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
-        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
-        $subject = str_replace(
-            '|',
-            '=7C',
-            $this->DKIM_QP($subject_header)
-        ); // Copied header fields (dkim-quoted-printable)
-        $body = $this->DKIM_BodyC($body);
-        $DKIMlen = strlen($body); // Length of body
-        $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body
-        $ident = ($this->DKIM_identity == '') ? '' : ' i=' . $this->DKIM_identity . ';';
-        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
-            $DKIMsignatureType . '; q=' .
-            $DKIMquery . '; l=' .
-            $DKIMlen . '; s=' .
-            $this->DKIM_selector .
-            ";\r\n" .
-            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
-            "\th=From:To:Subject;\r\n" .
-            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
-            "\tz=$from\r\n" .
-            "\t|$to\r\n" .
-            "\t|$subject;\r\n" .
-            "\tbh=" . $DKIMb64 . ";\r\n" .
-            "\tb=";
-        $toSign = $this->DKIM_HeaderC(
-            $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs
-        );
-        $signed = $this->DKIM_Sign($toSign);
-        return $dkimhdrs . $signed . "\r\n";
-    }
-
-    /**
-     * Allows for public read access to 'to' property.
-     * @access public
-     * @return array
-     */
-    public function getToAddresses()
-    {
-        return $this->to;
-    }
-
-    /**
-     * Allows for public read access to 'cc' property.
-     * @access public
-     * @return array
-     */
-    public function getCcAddresses()
-    {
-        return $this->cc;
-    }
-
-    /**
-     * Allows for public read access to 'bcc' property.
-     * @access public
-     * @return array
-     */
-    public function getBccAddresses()
-    {
-        return $this->bcc;
-    }
-
-    /**
-     * Allows for public read access to 'ReplyTo' property.
-     * @access public
-     * @return array
-     */
-    public function getReplyToAddresses()
-    {
-        return $this->ReplyTo;
-    }
-
-    /**
-     * Allows for public read access to 'all_recipients' property.
-     * @access public
-     * @return array
-     */
-    public function getAllRecipientAddresses()
-    {
-        return $this->all_recipients;
-    }
-
-    /**
-     * Perform a callback.
-     * @param boolean $isSent
-     * @param array $to
-     * @param array $cc
-     * @param array $bcc
-     * @param string $subject
-     * @param string $body
-     * @param string $from
-     */
-    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
-    {
-        if (!empty($this->action_function) && is_callable($this->action_function)) {
-            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
-            call_user_func_array($this->action_function, $params);
-        }
-    }
-}
-
-/**
- * PHPMailer exception handler
- * @package PHPMailer
- */
-class phpmailerException extends Exception
-{
-    /**
-     * Prettify error message output
-     * @return string
-     */
-    public function errorMessage()
-    {
-        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-        return $errorMsg;
-    }
-}
diff --git a/lib/PHPMailer/class.pop3.php b/lib/PHPMailer/class.pop3.php
deleted file mode 100644
index 984885ff0..000000000
--- a/lib/PHPMailer/class.pop3.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/**
- * PHPMailer POP-Before-SMTP Authentication Class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer POP-Before-SMTP Authentication Class.
- * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
- * Does not support APOP.
- * @package PHPMailer
- * @author Richard Davey (original author) <rich@corephp.co.uk>
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- */
-class POP3
-{
-    /**
-     * The POP3 PHPMailer Version number.
-     * @type string
-     * @access public
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * Default POP3 port number.
-     * @type integer
-     * @access public
-     */
-    public $POP3_PORT = 110;
-
-    /**
-     * Default timeout in seconds.
-     * @type integer
-     * @access public
-     */
-    public $POP3_TIMEOUT = 30;
-
-    /**
-     * POP3 Carriage Return + Line Feed.
-     * @type string
-     * @access public
-     * @deprecated Use the constant instead
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug display level.
-     * Options: 0 = no, 1+ = yes
-     * @type integer
-     * @access public
-     */
-    public $do_debug = 0;
-
-    /**
-     * POP3 mail server hostname.
-     * @type string
-     * @access public
-     */
-    public $host;
-
-    /**
-     * POP3 port number.
-     * @type integer
-     * @access public
-     */
-    public $port;
-
-    /**
-     * POP3 Timeout Value in seconds.
-     * @type integer
-     * @access public
-     */
-    public $tval;
-
-    /**
-     * POP3 username
-     * @type string
-     * @access public
-     */
-    public $username;
-
-    /**
-     * POP3 password.
-     * @type string
-     * @access public
-     */
-    public $password;
-
-    /**
-     * Resource handle for the POP3 connection socket.
-     * @type resource
-     * @access private
-     */
-    private $pop_conn;
-
-    /**
-     * Are we connected?
-     * @type boolean
-     * @access private
-     */
-    private $connected = false;
-
-    /**
-     * Error container.
-     * @type array
-     * @access private
-     */
-    private $errors = array();
-
-    /**
-     * Line break constant
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * Simple static wrapper for all-in-one POP before SMTP
-     * @param $host
-     * @param boolean $port
-     * @param boolean $tval
-     * @param string $username
-     * @param string $password
-     * @param integer $debug_level
-     * @return boolean
-     */
-    public static function popBeforeSmtp(
-        $host,
-        $port = false,
-        $tval = false,
-        $username = '',
-        $password = '',
-        $debug_level = 0
-    ) {
-        $pop = new POP3;
-        return $pop->authorise($host, $port, $tval, $username, $password, $debug_level);
-    }
-
-    /**
-     * Authenticate with a POP3 server.
-     * A connect, login, disconnect sequence
-     * appropriate for POP-before SMTP authorisation.
-     * @access public
-     * @param string $host The hostname to connect to
-     * @param integer|boolean $port The port number to connect to
-     * @param integer|boolean $timeout The timeout value
-     * @param string $username
-     * @param string $password
-     * @param integer $debug_level
-     * @return boolean
-     */
-    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
-    {
-        $this->host = $host;
-        // If no port value provided, use default
-        if (false === $port) {
-            $this->port = $this->POP3_PORT;
-        } else {
-            $this->port = (integer)$port;
-        }
-        // If no timeout value provided, use default
-        if (false === $timeout) {
-            $this->tval = $this->POP3_TIMEOUT;
-        } else {
-            $this->tval = (integer)$timeout;
-        }
-        $this->do_debug = $debug_level;
-        $this->username = $username;
-        $this->password = $password;
-        //  Reset the error log
-        $this->errors = array();
-        //  connect
-        $result = $this->connect($this->host, $this->port, $this->tval);
-        if ($result) {
-            $login_result = $this->login($this->username, $this->password);
-            if ($login_result) {
-                $this->disconnect();
-                return true;
-            }
-        }
-        // We need to disconnect regardless of whether the login succeeded
-        $this->disconnect();
-        return false;
-    }
-
-    /**
-     * Connect to a POP3 server.
-     * @access public
-     * @param string $host
-     * @param integer|boolean $port
-     * @param integer $tval
-     * @return boolean
-     */
-    public function connect($host, $port = false, $tval = 30)
-    {
-        //  Are we already connected?
-        if ($this->connected) {
-            return true;
-        }
-
-        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
-        //Rather than suppress it with @fsockopen, capture it cleanly instead
-        set_error_handler(array($this, 'catchWarning'));
-
-        if (false === $port) {
-            $port = $this->POP3_PORT;
-        }
-
-        //  connect to the POP3 server
-        $this->pop_conn = fsockopen(
-            $host, //  POP3 Host
-            $port, //  Port #
-            $errno, //  Error Number
-            $errstr, //  Error Message
-            $tval
-        ); //  Timeout (seconds)
-        //  Restore the error handler
-        restore_error_handler();
-
-        //  Did we connect?
-        if (false === $this->pop_conn) {
-            //  It would appear not...
-            $this->setError(array(
-                'error' => "Failed to connect to server $host on port $port",
-                'errno' => $errno,
-                'errstr' => $errstr
-            ));
-            return false;
-        }
-
-        //  Increase the stream time-out
-        stream_set_timeout($this->pop_conn, $tval, 0);
-
-        //  Get the POP3 server response
-        $pop3_response = $this->getResponse();
-        //  Check for the +OK
-        if ($this->checkResponse($pop3_response)) {
-            //  The connection is established and the POP3 server is talking
-            $this->connected = true;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Log in to the POP3 server.
-     * Does not support APOP (RFC 2828, 4949).
-     * @access public
-     * @param string $username
-     * @param string $password
-     * @return boolean
-     */
-    public function login($username = '', $password = '')
-    {
-        if (!$this->connected) {
-            $this->setError('Not connected to POP3 server');
-        }
-        if (empty($username)) {
-            $username = $this->username;
-        }
-        if (empty($password)) {
-            $password = $this->password;
-        }
-
-        // Send the Username
-        $this->sendString("USER $username" . self::CRLF);
-        $pop3_response = $this->getResponse();
-        if ($this->checkResponse($pop3_response)) {
-            // Send the Password
-            $this->sendString("PASS $password" . self::CRLF);
-            $pop3_response = $this->getResponse();
-            if ($this->checkResponse($pop3_response)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Disconnect from the POP3 server.
-     * @access public
-     */
-    public function disconnect()
-    {
-        $this->sendString('QUIT');
-        //The QUIT command may cause the daemon to exit, which will kill our connection
-        //So ignore errors here
-        try {
-            @fclose($this->pop_conn);
-        } catch (Exception $e) {
-            //Do nothing
-        };
-    }
-
-    /**
-     * Get a response from the POP3 server.
-     * $size is the maximum number of bytes to retrieve
-     * @param integer $size
-     * @return string
-     * @access private
-     */
-    private function getResponse($size = 128)
-    {
-        $response = fgets($this->pop_conn, $size);
-        if ($this->do_debug >= 1) {
-            echo "Server -> Client: $response";
-        }
-        return $response;
-    }
-
-    /**
-     * Send raw data to the POP3 server.
-     * @param string $string
-     * @return integer
-     * @access private
-     */
-    private function sendString($string)
-    {
-        if ($this->pop_conn) {
-            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
-                echo "Client -> Server: $string";
-            }
-            return fwrite($this->pop_conn, $string, strlen($string));
-        }
-        return 0;
-    }
-
-    /**
-     * Checks the POP3 server response.
-     * Looks for for +OK or -ERR.
-     * @param string $string
-     * @return boolean
-     * @access private
-     */
-    private function checkResponse($string)
-    {
-        if (substr($string, 0, 3) !== '+OK') {
-            $this->setError(array(
-                'error' => "Server reported an error: $string",
-                'errno' => 0,
-                'errstr' => ''
-            ));
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Add an error to the internal error store.
-     * Also display debug output if it's enabled.
-     * @param $error
-     */
-    private function setError($error)
-    {
-        $this->errors[] = $error;
-        if ($this->do_debug >= 1) {
-            echo '<pre>';
-            foreach ($this->errors as $error) {
-                print_r($error);
-            }
-            echo '</pre>';
-        }
-    }
-
-    /**
-     * POP3 connection error handler.
-     * @param integer $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param integer $errline
-     * @access private
-     */
-    private function catchWarning($errno, $errstr, $errfile, $errline)
-    {
-        $this->setError(array(
-            'error' => "Connecting to the POP3 server raised a PHP warning: ",
-            'errno' => $errno,
-            'errstr' => $errstr,
-            'errfile' => $errfile,
-            'errline' => $errline
-        ));
-    }
-}
diff --git a/lib/PHPMailer/class.smtp.php b/lib/PHPMailer/class.smtp.php
deleted file mode 100644
index 2e6003131..000000000
--- a/lib/PHPMailer/class.smtp.php
+++ /dev/null
@@ -1,974 +0,0 @@
-<?php
-/**
- * PHPMailer RFC821 SMTP email transport class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer RFC821 SMTP email transport class.
- * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
- * @package PHPMailer
- * @author Chris Ryan <unknown@example.com>
- * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
- */
-class SMTP
-{
-    /**
-     * The PHPMailer SMTP version number.
-     * @type string
-     */
-    const VERSION = '5.2.9';
-
-    /**
-     * SMTP line break constant.
-     * @type string
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The SMTP port to use if one is not specified.
-     * @type integer
-     */
-    const DEFAULT_SMTP_PORT = 25;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type integer
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * Debug level for no output
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show client -> server messages
-     */
-    const DEBUG_CLIENT = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages
-     */
-    const DEBUG_SERVER = 2;
-
-    /**
-     * Debug level to show connection status, client -> server and server -> client messages
-     */
-    const DEBUG_CONNECTION = 3;
-
-    /**
-     * Debug level to show all messages
-     */
-    const DEBUG_LOWLEVEL = 4;
-
-    /**
-     * The PHPMailer SMTP Version number.
-     * @type string
-     * @deprecated Use the `VERSION` constant instead
-     * @see SMTP::VERSION
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * SMTP server port number.
-     * @type integer
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
-     * @see SMTP::DEFAULT_SMTP_PORT
-     */
-    public $SMTP_PORT = 25;
-
-    /**
-     * SMTP reply line ending.
-     * @type string
-     * @deprecated Use the `CRLF` constant instead
-     * @see SMTP::CRLF
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug output level.
-     * Options:
-     * * self::DEBUG_OFF (`0`) No debug output, default
-     * * self::DEBUG_CLIENT (`1`) Client commands
-     * * self::DEBUG_SERVER (`2`) Client commands and server responses
-     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
-     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
-     * @type integer
-     */
-    public $do_debug = self::DEBUG_OFF;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to use VERP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Info on VERP
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * The timeout value for connection, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
-     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * How long to wait for commands to complete, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timelimit = 300;
-
-    /**
-     * The socket for the server connection.
-     * @type resource
-     */
-    protected $smtp_conn;
-
-    /**
-     * Error message, if any, for the last call.
-     * @type array
-     */
-    protected $error = array();
-
-    /**
-     * The reply the server sent to us for HELO.
-     * If null, no HELO string has yet been received.
-     * @type string|null
-     */
-    protected $helo_rply = null;
-
-    /**
-     * The most recent reply received from the server.
-     * @type string
-     */
-    protected $last_reply = '';
-
-    /**
-     * Output debugging info via a user-selected method.
-     * @see SMTP::$Debugoutput
-     * @see SMTP::$do_debug
-     * @param string $str Debug string to output
-     * @param integer $level The debug level of this message; see DEBUG_* constants
-     * @return void
-     */
-    protected function edebug($str, $level = 0)
-    {
-        if ($level > $this->do_debug) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->do_debug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                )."\n";
-        }
-    }
-
-    /**
-     * Connect to an SMTP server.
-     * @param string $host SMTP server IP or host name
-     * @param integer $port The port number to connect to
-     * @param integer $timeout How long to wait for the connection to open
-     * @param array $options An array of options for stream_context_create()
-     * @access public
-     * @return boolean
-     */
-    public function connect($host, $port = null, $timeout = 30, $options = array())
-    {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (is_null($streamok)) {
-            $streamok = function_exists('stream_socket_client');
-        }
-        // Clear errors to avoid confusion
-        $this->error = array();
-        // Make sure we are __not__ connected
-        if ($this->connected()) {
-            // Already connected, generate error
-            $this->error = array('error' => 'Already connected to a server');
-            return false;
-        }
-        if (empty($port)) {
-            $port = self::DEFAULT_SMTP_PORT;
-        }
-        // Connect to the SMTP server
-        $this->edebug(
-            "Connection: opening to $host:$port, t=$timeout, opt=".var_export($options, true),
-            self::DEBUG_CONNECTION
-        );
-        $errno = 0;
-        $errstr = '';
-        if ($streamok) {
-            $socket_context = stream_context_create($options);
-            //Suppress errors; connection failures are handled at a higher level
-            $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
-                $errno,
-                $errstr,
-                $timeout,
-                STREAM_CLIENT_CONNECT,
-                $socket_context
-            );
-        } else {
-            //Fall back to fsockopen which should work in more places, but is missing some features
-            $this->edebug(
-                "Connection: stream_socket_client not available, falling back to fsockopen",
-                self::DEBUG_CONNECTION
-            );
-            $this->smtp_conn = fsockopen(
-                $host,
-                $port,
-                $errno,
-                $errstr,
-                $timeout
-            );
-        }
-        // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
-            $this->error = array(
-                'error' => 'Failed to connect to server',
-                'errno' => $errno,
-                'errstr' => $errstr
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
-                . ": $errstr ($errno)",
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-        // SMTP server can take longer to respond, give longer timeout for first read
-        // Windows does not have support for this timeout function
-        if (substr(PHP_OS, 0, 3) != 'WIN') {
-            $max = ini_get('max_execution_time');
-            if ($max != 0 && $timeout > $max) { // Don't bother if unlimited
-                @set_time_limit($timeout);
-            }
-            stream_set_timeout($this->smtp_conn, $timeout, 0);
-        }
-        // Get any announcement
-        $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
-        return true;
-    }
-
-    /**
-     * Initiate a TLS (encrypted) session.
-     * @access public
-     * @return boolean
-     */
-    public function startTLS()
-    {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
-            return false;
-        }
-        // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
-            $this->smtp_conn,
-            true,
-            STREAM_CRYPTO_METHOD_TLS_CLIENT
-        )) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Perform SMTP authentication.
-     * Must be run after hello().
-     * @see hello()
-     * @param string $username    The user name
-     * @param string $password    The password
-     * @param string $authtype    The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5)
-     * @param string $realm       The auth realm for NTLM
-     * @param string $workstation The auth workstation for NTLM
-     * @access public
-     * @return boolean True if successfully authenticated.
-     */
-    public function authenticate(
-        $username,
-        $password,
-        $authtype = 'LOGIN',
-        $realm = '',
-        $workstation = ''
-    ) {
-        if (empty($authtype)) {
-            $authtype = 'LOGIN';
-        }
-        switch ($authtype) {
-            case 'PLAIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
-                    return false;
-                }
-                // Send encoded username and password
-                if (!$this->sendCommand(
-                    'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
-                    235
-                )
-                ) {
-                    return false;
-                }
-                break;
-            case 'LOGIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
-                    return false;
-                }
-                break;
-            case 'NTLM':
-                /*
-                 * ntlm_sasl_client.php
-                 * Bundled with Permission
-                 *
-                 * How to telnet in windows:
-                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
-                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
-                 */
-                require_once 'extras/ntlm_sasl_client.php';
-                $temp = new stdClass();
-                $ntlm_client = new ntlm_sasl_client_class;
-                //Check that functions are available
-                if (!$ntlm_client->Initialize($temp)) {
-                    $this->error = array('error' => $temp->error);
-                    $this->edebug(
-                        'You need to enable some modules in your php.ini file: '
-                        . $this->error['error'],
-                        self::DEBUG_CLIENT
-                    );
-                    return false;
-                }
-                //msg1
-                $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
-
-                if (!$this->sendCommand(
-                    'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
-                    334
-                )
-                ) {
-                    return false;
-                }
-                //Though 0 based, there is a white space after the 3 digit number
-                //msg2
-                $challenge = substr($this->last_reply, 3);
-                $challenge = base64_decode($challenge);
-                $ntlm_res = $ntlm_client->NTLMResponse(
-                    substr($challenge, 24, 8),
-                    $password
-                );
-                //msg3
-                $msg3 = $ntlm_client->TypeMsg3(
-                    $ntlm_res,
-                    $username,
-                    $realm,
-                    $workstation
-                );
-                // send encoded username
-                return $this->sendCommand('Username', base64_encode($msg3), 235);
-            case 'CRAM-MD5':
-                // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
-                    return false;
-                }
-                // Get the challenge
-                $challenge = base64_decode(substr($this->last_reply, 4));
-
-                // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
-
-                // send encoded credentials
-                return $this->sendCommand('Username', base64_encode($response), 235);
-        }
-        return true;
-    }
-
-    /**
-     * Calculate an MD5 HMAC hash.
-     * Works like hash_hmac('md5', $data, $key)
-     * in case that function is not available
-     * @param string $data The data to hash
-     * @param string $key  The key to hash with
-     * @access protected
-     * @return string
-     */
-    protected function hmac($data, $key)
-    {
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('md5', $data, $key);
-        }
-
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
-
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
-
-        $bytelen = 64; // byte length for md5
-        if (strlen($key) > $bytelen) {
-            $key = pack('H*', md5($key));
-        }
-        $key = str_pad($key, $bytelen, chr(0x00));
-        $ipad = str_pad('', $bytelen, chr(0x36));
-        $opad = str_pad('', $bytelen, chr(0x5c));
-        $k_ipad = $key ^ $ipad;
-        $k_opad = $key ^ $opad;
-
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
-    }
-
-    /**
-     * Check connection state.
-     * @access public
-     * @return boolean True if connected.
-     */
-    public function connected()
-    {
-        if (is_resource($this->smtp_conn)) {
-            $sock_status = stream_get_meta_data($this->smtp_conn);
-            if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
-                $this->edebug(
-                    'SMTP NOTICE: EOF caught while checking if connected',
-                    self::DEBUG_CLIENT
-                );
-                $this->close();
-                return false;
-            }
-            return true; // everything looks good
-        }
-        return false;
-    }
-
-    /**
-     * Close the socket and clean up the state of the class.
-     * Don't use this function without first trying to use QUIT.
-     * @see quit()
-     * @access public
-     * @return void
-     */
-    public function close()
-    {
-        $this->error = array();
-        $this->helo_rply = null;
-        if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
-            fclose($this->smtp_conn);
-            $this->smtp_conn = null; //Makes for cleaner serialization
-            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
-        }
-    }
-
-    /**
-     * Send an SMTP DATA command.
-     * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
-     * and the message body being separated by and additional <CRLF>.
-     * Implements rfc 821: DATA <CRLF>
-     * @param string $msg_data Message data to send
-     * @access public
-     * @return boolean
-     */
-    public function data($msg_data)
-    {
-        //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
-            return false;
-        }
-
-        /* The server is ready to accept data!
-         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
-         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
-         * smaller lines to fit within the limit.
-         * We will also look for lines that start with a '.' and prepend an additional '.'.
-         * NOTE: this does not count towards line-length limit.
-         */
-
-        // Normalize line breaks before exploding
-        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
-
-        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
-         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
-         * process all lines before a blank line as headers.
-         */
-
-        $field = substr($lines[0], 0, strpos($lines[0], ':'));
-        $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
-            $in_headers = true;
-        }
-
-        foreach ($lines as $line) {
-            $lines_out = array();
-            if ($in_headers and $line == '') {
-                $in_headers = false;
-            }
-            //We need to break this line up into several smaller lines
-            //This is a small micro-optimisation: isset($str[$len]) is equivalent to (strlen($str) > $len)
-            while (isset($line[self::MAX_LINE_LENGTH])) {
-                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
-                //so as to avoid breaking in the middle of a word
-                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
-                if (!$pos) { //Deliberately matches both false and 0
-                    //No nice break found, add a hard break
-                    $pos = self::MAX_LINE_LENGTH - 1;
-                    $lines_out[] = substr($line, 0, $pos);
-                    $line = substr($line, $pos);
-                } else {
-                    //Break at the found point
-                    $lines_out[] = substr($line, 0, $pos);
-                    //Move along by the amount we dealt with
-                    $line = substr($line, $pos + 1);
-                }
-                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
-                if ($in_headers) {
-                    $line = "\t" . $line;
-                }
-            }
-            $lines_out[] = $line;
-
-            //Send the lines to the server
-            foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
-                }
-                $this->client_send($line_out . self::CRLF);
-            }
-        }
-
-        //Message data has been sent, complete the command
-        //Increase timelimit for end of DATA command
-        $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
-        $result = $this->sendCommand('DATA END', '.', 250);
-        //Restore timelimit
-        $this->Timelimit = $savetimelimit;
-        return $result;
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Used to identify the sending server to the receiving server.
-     * This makes sure that client and server are in a known state.
-     * Implements RFC 821: HELO <SP> <domain> <CRLF>
-     * and RFC 2821 EHLO.
-     * @param string $host The host name or IP to connect to
-     * @access public
-     * @return boolean
-     */
-    public function hello($host = '')
-    {
-        //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Low-level implementation used by hello()
-     * @see hello()
-     * @param string $hello The HELO string
-     * @param string $host The hostname to say we are
-     * @access protected
-     * @return boolean
-     */
-    protected function sendHello($hello, $host)
-    {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
-        $this->helo_rply = $this->last_reply;
-        return $noerror;
-    }
-
-    /**
-     * Send an SMTP MAIL command.
-     * Starts a mail transaction from the email address specified in
-     * $from. Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command.
-     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from Source address of this message
-     * @access public
-     * @return boolean
-     */
-    public function mail($from)
-    {
-        $useVerp = ($this->do_verp ? ' XVERP' : '');
-        return $this->sendCommand(
-            'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
-            250
-        );
-    }
-
-    /**
-     * Send an SMTP QUIT command.
-     * Closes the socket if there is no error or the $close_on_error argument is true.
-     * Implements from rfc 821: QUIT <CRLF>
-     * @param boolean $close_on_error Should the connection close if an error occurs?
-     * @access public
-     * @return boolean
-     */
-    public function quit($close_on_error = true)
-    {
-        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
-        $err = $this->error; //Save any error
-        if ($noerror or $close_on_error) {
-            $this->close();
-            $this->error = $err; //Restore any error from the quit command
-        }
-        return $noerror;
-    }
-
-    /**
-     * Send an SMTP RCPT command.
-     * Sets the TO argument to $toaddr.
-     * Returns true if the recipient was accepted false if it was rejected.
-     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-     * @param string $toaddr The address the message is being sent to
-     * @access public
-     * @return boolean
-     */
-    public function recipient($toaddr)
-    {
-        return $this->sendCommand(
-            'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
-            array(250, 251)
-        );
-    }
-
-    /**
-     * Send an SMTP RSET command.
-     * Abort any transaction that is currently in progress.
-     * Implements rfc 821: RSET <CRLF>
-     * @access public
-     * @return boolean True on success.
-     */
-    public function reset()
-    {
-        return $this->sendCommand('RSET', 'RSET', 250);
-    }
-
-    /**
-     * Send a command to an SMTP server and check its return code.
-     * @param string $command       The command name - not sent to the server
-     * @param string $commandstring The actual command to send
-     * @param integer|array $expect     One or more expected integer success codes
-     * @access protected
-     * @return boolean True on success.
-     */
-    protected function sendCommand($command, $commandstring, $expect)
-    {
-        if (!$this->connected()) {
-            $this->error = array(
-                'error' => "Called $command without being connected"
-            );
-            return false;
-        }
-        $this->client_send($commandstring . self::CRLF);
-
-        $this->last_reply = $this->get_lines();
-        $code = substr($this->last_reply, 0, 3);
-
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-
-        if (!in_array($code, (array)$expect)) {
-            $this->error = array(
-                'error' => "$command command failed",
-                'smtp_code' => $code,
-                'detail' => substr($this->last_reply, 4)
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-
-        $this->error = array();
-        return true;
-    }
-
-    /**
-     * Send an SMTP SAML command.
-     * Starts a mail transaction from the email address specified in $from.
-     * Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command. This command
-     * will send the message to the users terminal if they are logged
-     * in and send them an email.
-     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from The address the message is from
-     * @access public
-     * @return boolean
-     */
-    public function sendAndMail($from)
-    {
-        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
-    }
-
-    /**
-     * Send an SMTP VRFY command.
-     * @param string $name The name to verify
-     * @access public
-     * @return boolean
-     */
-    public function verify($name)
-    {
-        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
-    }
-
-    /**
-     * Send an SMTP NOOP command.
-     * Used to keep keep-alives alive, doesn't actually do anything
-     * @access public
-     * @return boolean
-     */
-    public function noop()
-    {
-        return $this->sendCommand('NOOP', 'NOOP', 250);
-    }
-
-    /**
-     * Send an SMTP TURN command.
-     * This is an optional command for SMTP that this class does not support.
-     * This method is here to make the RFC821 Definition complete for this class
-     * and _may_ be implemented in future
-     * Implements from rfc 821: TURN <CRLF>
-     * @access public
-     * @return boolean
-     */
-    public function turn()
-    {
-        $this->error = array(
-            'error' => 'The SMTP TURN command is not implemented'
-        );
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
-        return false;
-    }
-
-    /**
-     * Send raw data to the server.
-     * @param string $data The data to send
-     * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
-     */
-    public function client_send($data)
-    {
-        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
-        return fwrite($this->smtp_conn, $data);
-    }
-
-    /**
-     * Get the latest error.
-     * @access public
-     * @return array
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Get the last reply from the server.
-     * @access public
-     * @return string
-     */
-    public function getLastReply()
-    {
-        return $this->last_reply;
-    }
-
-    /**
-     * Read the SMTP server's response.
-     * Either before eof or socket timeout occurs on the operation.
-     * With SMTP we can tell if we have more lines to read if the
-     * 4th character is '-' symbol. If it is a space then we don't
-     * need to read anything else.
-     * @access protected
-     * @return string
-     */
-    protected function get_lines()
-    {
-        // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
-            return '';
-        }
-        $data = '';
-        $endtime = 0;
-        stream_set_timeout($this->smtp_conn, $this->Timeout);
-        if ($this->Timelimit > 0) {
-            $endtime = time() + $this->Timelimit;
-        }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
-            $str = @fgets($this->smtp_conn, 515);
-            $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
-            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
-            $data .= $str;
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
-            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
-                break;
-            }
-            // Timed-out? Log and break
-            $info = stream_get_meta_data($this->smtp_conn);
-            if ($info['timed_out']) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-            // Now check if reads took too long
-            if ($endtime and time() > $endtime) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Enable or disable VERP address generation.
-     * @param boolean $enabled
-     */
-    public function setVerp($enabled = false)
-    {
-        $this->do_verp = $enabled;
-    }
-
-    /**
-     * Get VERP address generation mode.
-     * @return boolean
-     */
-    public function getVerp()
-    {
-        return $this->do_verp;
-    }
-
-    /**
-     * Set debug output method.
-     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
-     */
-    public function setDebugOutput($method = 'echo')
-    {
-        $this->Debugoutput = $method;
-    }
-
-    /**
-     * Get debug output method.
-     * @return string
-     */
-    public function getDebugOutput()
-    {
-        return $this->Debugoutput;
-    }
-
-    /**
-     * Set debug output level.
-     * @param integer $level
-     */
-    public function setDebugLevel($level = 0)
-    {
-        $this->do_debug = $level;
-    }
-
-    /**
-     * Get debug output level.
-     * @return integer
-     */
-    public function getDebugLevel()
-    {
-        return $this->do_debug;
-    }
-
-    /**
-     * Set SMTP timeout.
-     * @param integer $timeout
-     */
-    public function setTimeout($timeout = 0)
-    {
-        $this->Timeout = $timeout;
-    }
-
-    /**
-     * Get SMTP timeout.
-     * @return integer
-     */
-    public function getTimeout()
-    {
-        return $this->Timeout;
-    }
-}
diff --git a/lib/PHPMailer/extras/EasyPeasyICS.php b/lib/PHPMailer/extras/EasyPeasyICS.php
deleted file mode 100644
index 3057c114c..000000000
--- a/lib/PHPMailer/extras/EasyPeasyICS.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/* ------------------------------------------------------------------------ */
-/* EasyPeasyICS
-/* ------------------------------------------------------------------------ */
-/* Manuel Reinhard, manu@sprain.ch
-/* Twitter: @sprain
-/* Web: www.sprain.ch
-/*
-/* Built with inspiration by
-/" http://stackoverflow.com/questions/1463480/how-can-i-use-php-to-dynamically-publish-an-ical-file-to-be-read-by-google-calend/1464355#1464355
-/* ------------------------------------------------------------------------ */
-/* History:
-/* 2010/12/17 - Manuel Reinhard - when it all started
-/* ------------------------------------------------------------------------ */
-
-class EasyPeasyICS {
-
-	protected $calendarName;
-	protected $events = array();
-
-
-	/**
-	 * Constructor
-	 * @param string $calendarName
-	 */
-	public function __construct($calendarName=""){
-		$this->calendarName = $calendarName;
-	}//function
-
-
-	/**
-	 * Add event to calendar
-	 * @param string $calendarName
-	 */
-	public function addEvent($start, $end, $summary="", $description="", $url=""){
-		$this->events[] = array(
-			"start" => $start,
-			"end"   => $end,
-			"summary" => $summary,
-			"description" => $description,
-			"url" => $url
-		);
-	}//function
-
-
-	public function render($output = true){
-
-		//start Variable
-		$ics = "";
-
-		//Add header
-		$ics .= "BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-X-WR-CALNAME:".$this->calendarName."
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN";
-
-		//Add events
-		foreach($this->events as $event){
-			$ics .= "
-BEGIN:VEVENT
-UID:". md5(uniqid(mt_rand(), true)) ."@EasyPeasyICS.php
-DTSTAMP:" . gmdate('Ymd').'T'. gmdate('His') . "Z
-DTSTART:".gmdate('Ymd', $event["start"])."T".gmdate('His', $event["start"])."Z
-DTEND:".gmdate('Ymd', $event["end"])."T".gmdate('His', $event["end"])."Z
-SUMMARY:".str_replace("\n", "\\n", $event['summary'])."
-DESCRIPTION:".str_replace("\n", "\\n", $event['description'])."
-URL;VALUE=URI:".$event['url']."
-END:VEVENT";
-		}//foreach
-
-
-		//Footer
-		$ics .= "
-END:VCALENDAR";
-
-
-		if ($output) {
-			//Output
-			header('Content-type: text/calendar; charset=utf-8');
-			header('Content-Disposition: inline; filename='.$this->calendarName.'.ics');
-			echo $ics;
-		} else {
-			return $ics;
-		}
-
-	}//function
-
-}//class
diff --git a/lib/PHPMailer/extras/README.md b/lib/PHPMailer/extras/README.md
deleted file mode 100644
index c6654b244..000000000
--- a/lib/PHPMailer/extras/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-#PHPMailer Extras
-
-These classes provide optional additional functions to PHPMailer.
-
-These are not loaded by the PHPMailer autoloader, so in some cases you may need to `require` them yourself before using them.
-
-##HTML2Text
-
-This class was written by Jon Abernathy and provides a simple conversion of HTML to plain-text, while attempting to preserve some aspects of the formatting. It is used in PHPMailer if you set the `advanced` parameter to `true` in either the `msgHTML()` or `html2text` methods of PHPMailer.
-
-##EasyPeasyICS
-
-This class was originally written by Manuel Reinhard and provides a simple means of generating ICS/vCal files that are used in sending calendar events. PHPMailer does not use it directly, but you can use it to generate content appropriate for placing in the `Ical` property of PHPMailer. The PHPMailer project is now its official home as Manuel has given permission for that and is no longer maintaining it himself.
-
-##htmlfilter
-
-This class by Konstantin Riabitsev and Jim Jagielski implements HTML filtering to remove potentially malicious tags, such as `<script>` or `onclick=` attributes that can result in XSS attacks. This is a simple filter and is not as comprehensive as [HTMLawed](http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/) or [HTMLPurifier](http://htmlpurifier.org), but it's easier to use and considerably better than nothing! PHPMailer does not use it directly, but you may want to apply it to user-supplied HTML before using it as a message body.
-
-##NTLM_SASL_client
-
-This class by Manuel Lemos (bundled with permission) adds the ability to authenticate with Microsoft Windows mail servers that use NTLM-based authentication. It is used by PHPMailer if you send via SMTP and set the `AuthType` property to `NTLM`; you will also need to use the `Realm` and `Workstation` properties. The original source is [here](http://www.phpclasses.org/browse/file/7495.html).
diff --git a/lib/PHPMailer/extras/class.html2text.php b/lib/PHPMailer/extras/class.html2text.php
deleted file mode 100644
index 20609919b..000000000
--- a/lib/PHPMailer/extras/class.html2text.php
+++ /dev/null
@@ -1,677 +0,0 @@
-<?php
-/*************************************************************************
- *                                                                       *
- * Converts HTML to formatted plain text                                 *
- *                                                                       *
- * Portions Copyright (c) 2005-2007 Jon Abernathy <jon@chuggnutt.com>    *
- *                                                                       *
- * This script 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.                                   *
- *                                                                       *
- * The GNU General Public License can be found at                        *
- * http://www.gnu.org/copyleft/gpl.html.                                 *
- *                                                                       *
- * This script 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.                          *
- *                                                                       *
- *************************************************************************/
-
-/**
- * Converts HTML to formatted plain text
- */
-class Html2Text
-{
-    /**
-     * Contains the HTML content to convert.
-     *
-     * @type string
-     */
-    protected $html;
-
-    /**
-     * Contains the converted, formatted text.
-     *
-     * @type string
-     */
-    protected $text;
-
-    /**
-     * Maximum width of the formatted text, in columns.
-     *
-     * Set this value to 0 (or less) to ignore word wrapping
-     * and not constrain text to a fixed-width column.
-     *
-     * @type integer
-     */
-    protected $width = 70;
-
-    /**
-     * List of preg* regular expression patterns to search for,
-     * used in conjunction with $replace.
-     *
-     * @type array
-     * @see $replace
-     */
-    protected $search = array(
-        "/\r/",                                  // Non-legal carriage return
-        "/[\n\t]+/",                             // Newlines and tabs
-        '/<head[^>]*>.*?<\/head>/i',             // <head>
-        '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
-        '/<style[^>]*>.*?<\/style>/i',           // <style>s -- which strip_tags supposedly has problems with
-        '/<p[^>]*>/i',                           // <P>
-        '/<br[^>]*>/i',                          // <br>
-        '/<i[^>]*>(.*?)<\/i>/i',                 // <i>
-        '/<em[^>]*>(.*?)<\/em>/i',               // <em>
-        '/(<ul[^>]*>|<\/ul>)/i',                 // <ul> and </ul>
-        '/(<ol[^>]*>|<\/ol>)/i',                 // <ol> and </ol>
-        '/(<dl[^>]*>|<\/dl>)/i',                 // <dl> and </dl>
-        '/<li[^>]*>(.*?)<\/li>/i',               // <li> and </li>
-        '/<dd[^>]*>(.*?)<\/dd>/i',               // <dd> and </dd>
-        '/<dt[^>]*>(.*?)<\/dt>/i',               // <dt> and </dt>
-        '/<li[^>]*>/i',                          // <li>
-        '/<hr[^>]*>/i',                          // <hr>
-        '/<div[^>]*>/i',                         // <div>
-        '/(<table[^>]*>|<\/table>)/i',           // <table> and </table>
-        '/(<tr[^>]*>|<\/tr>)/i',                 // <tr> and </tr>
-        '/<td[^>]*>(.*?)<\/td>/i',               // <td> and </td>
-        '/<span class="_html2text_ignore">.+?<\/span>/i'  // <span class="_html2text_ignore">...</span>
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched.
-     *
-     * @type array
-     * @see $search
-     */
-    protected $replace = array(
-        '',                                     // Non-legal carriage return
-        ' ',                                    // Newlines and tabs
-        '',                                     // <head>
-        '',                                     // <script>s -- which strip_tags supposedly has problems with
-        '',                                     // <style>s -- which strip_tags supposedly has problems with
-        "\n\n",                                 // <P>
-        "\n",                                   // <br>
-        '_\\1_',                                // <i>
-        '_\\1_',                                // <em>
-        "\n\n",                                 // <ul> and </ul>
-        "\n\n",                                 // <ol> and </ol>
-        "\n\n",                                 // <dl> and </dl>
-        "\t* \\1\n",                            // <li> and </li>
-        " \\1\n",                               // <dd> and </dd>
-        "\t* \\1",                              // <dt> and </dt>
-        "\n\t* ",                               // <li>
-        "\n-------------------------\n",        // <hr>
-        "<div>\n",                              // <div>
-        "\n\n",                                 // <table> and </table>
-        "\n",                                   // <tr> and </tr>
-        "\t\t\\1\n",                            // <td> and </td>
-        ""                                      // <span class="_html2text_ignore">...</span>
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for,
-     * used in conjunction with $ent_replace.
-     *
-     * @type array
-     * @see $ent_replace
-     */
-    protected $ent_search = array(
-        '/&(nbsp|#160);/i',                      // Non-breaking space
-        '/&(quot|rdquo|ldquo|#8220|#8221|#147|#148);/i',
-        // Double quotes
-        '/&(apos|rsquo|lsquo|#8216|#8217);/i',   // Single quotes
-        '/&gt;/i',                               // Greater-than
-        '/&lt;/i',                               // Less-than
-        '/&(copy|#169);/i',                      // Copyright
-        '/&(trade|#8482|#153);/i',               // Trademark
-        '/&(reg|#174);/i',                       // Registered
-        '/&(mdash|#151|#8212);/i',               // mdash
-        '/&(ndash|minus|#8211|#8722);/i',        // ndash
-        '/&(bull|#149|#8226);/i',                // Bullet
-        '/&(pound|#163);/i',                     // Pound sign
-        '/&(euro|#8364);/i',                     // Euro sign
-        '/&(amp|#38);/i',                        // Ampersand: see _converter()
-        '/[ ]{2,}/',                             // Runs of spaces, post-handling
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched.
-     *
-     * @type array
-     * @see $ent_search
-     */
-    protected $ent_replace = array(
-        ' ',                                    // Non-breaking space
-        '"',                                    // Double quotes
-        "'",                                    // Single quotes
-        '>',
-        '<',
-        '(c)',
-        '(tm)',
-        '(R)',
-        '--',
-        '-',
-        '*',
-        '£',
-        'EUR',                                  // Euro sign. € ?
-        '|+|amp|+|',                            // Ampersand: see _converter()
-        ' ',                                    // Runs of spaces, post-handling
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for
-     * and replace using callback function.
-     *
-     * @type array
-     */
-    protected $callback_search = array(
-        '/<(a) [^>]*href=("|\')([^"\']+)\2([^>]*)>(.*?)<\/a>/i', // <a href="">
-        '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',           // h1 - h6
-        '/<(b)( [^>]*)?>(.*?)<\/b>/i',                           // <b>
-        '/<(strong)( [^>]*)?>(.*?)<\/strong>/i',                 // <strong>
-        '/<(th)( [^>]*)?>(.*?)<\/th>/i',                         // <th> and </th>
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for in PRE body,
-     * used in conjunction with $pre_replace.
-     *
-     * @type array
-     * @see $pre_replace
-     */
-    protected $pre_search = array(
-        "/\n/",
-        "/\t/",
-        '/ /',
-        '/<pre[^>]*>/',
-        '/<\/pre>/'
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched for PRE body.
-     *
-     * @type array
-     * @see $pre_search
-     */
-    protected $pre_replace = array(
-        '<br>',
-        '&nbsp;&nbsp;&nbsp;&nbsp;',
-        '&nbsp;',
-        '',
-        ''
-    );
-
-    /**
-     * Temporary workspace used during PRE processing.
-     *
-     * @type string
-     */
-    protected $pre_content = '';
-
-    /**
-     * Contains a list of HTML tags to allow in the resulting text.
-     *
-     * @type string
-     * @see set_allowed_tags()
-     */
-    protected $allowed_tags = '';
-
-    /**
-     * Contains the base URL that relative links should resolve to.
-     *
-     * @type string
-     */
-    protected $url;
-
-    /**
-     * Indicates whether content in the $html variable has been converted yet.
-     *
-     * @type boolean
-     * @see $html, $text
-     */
-    protected $_converted = false;
-
-    /**
-     * Contains URL addresses from links to be rendered in plain text.
-     *
-     * @type array
-     * @see _build_link_list()
-     */
-    protected $_link_list = array();
-
-    /**
-     * Various configuration options (able to be set in the constructor)
-     *
-     * @type array
-     */
-    protected $_options = array(
-        // 'none'
-        // 'inline' (show links inline)
-        // 'nextline' (show links on the next line)
-        // 'table' (if a table of link URLs should be listed after the text.
-        'do_links' => 'inline',
-        //  Maximum width of the formatted text, in columns.
-        //  Set this value to 0 (or less) to ignore word wrapping
-        //  and not constrain text to a fixed-width column.
-        'width' => 70,
-    );
-
-    /**
-     * Constructor.
-     *
-     * If the HTML source string (or file) is supplied, the class
-     * will instantiate with that source propagated, all that has
-     * to be done it to call get_text().
-     *
-     * @param string $source HTML content
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     * @param array $options Set configuration options
-     */
-    public function __construct($source = '', $from_file = false, $options = array())
-    {
-        $this->_options = array_merge($this->_options, $options);
-
-        if (!empty($source)) {
-            $this->set_html($source, $from_file);
-        }
-
-        $this->set_base_url();
-    }
-
-    /**
-     * Loads source HTML into memory, either from $source string or a file.
-     *
-     * @param string $source HTML content
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     */
-    public function set_html($source, $from_file = false)
-    {
-        if ($from_file && file_exists($source)) {
-            $this->html = file_get_contents($source);
-        } else {
-            $this->html = $source;
-        }
-
-        $this->_converted = false;
-    }
-
-    /**
-     * Returns the text, converted from HTML.
-     *
-     * @return string
-     */
-    public function get_text()
-    {
-        if (!$this->_converted) {
-            $this->_convert();
-        }
-
-        return $this->text;
-    }
-
-    /**
-     * Prints the text, converted from HTML.
-     */
-    public function print_text()
-    {
-        print $this->get_text();
-    }
-
-    /**
-     * Alias to print_text(), operates identically.
-     *
-     * @see print_text()
-     */
-    public function p()
-    {
-        print $this->get_text();
-    }
-
-    /**
-     * Sets the allowed HTML tags to pass through to the resulting text.
-     *
-     * Tags should be in the form "<p>", with no corresponding closing tag.
-     * @param string $allowed_tags
-     */
-    public function set_allowed_tags($allowed_tags = '')
-    {
-        if (!empty($allowed_tags)) {
-            $this->allowed_tags = $allowed_tags;
-        }
-    }
-
-    /**
-     * Sets a base URL to handle relative links.
-     *
-     * @param string $url
-     */
-    public function set_base_url($url = '')
-    {
-        if (empty($url)) {
-            if (!empty($_SERVER['HTTP_HOST'])) {
-                $this->url = 'http://' . $_SERVER['HTTP_HOST'];
-            } else {
-                $this->url = '';
-            }
-        } else {
-            // Strip any trailing slashes for consistency (relative
-            // URLs may already start with a slash like "/file.html")
-            if (substr($url, -1) == '/') {
-                $url = substr($url, 0, -1);
-            }
-            $this->url = $url;
-        }
-    }
-
-    /**
-     * Workhorse function that does actual conversion (calls _converter() method).
-     */
-    protected function _convert()
-    {
-        // Variables used for building the link list
-        $this->_link_list = array();
-
-        $text = trim(stripslashes($this->html));
-
-        // Convert HTML to TXT
-        $this->_converter($text);
-
-        // Add link list
-        if (!empty($this->_link_list)) {
-            $text .= "\n\nLinks:\n------\n";
-            foreach ($this->_link_list as $idx => $url) {
-                $text .= '[' . ($idx + 1) . '] ' . $url . "\n";
-            }
-        }
-
-        $this->text = $text;
-
-        $this->_converted = true;
-    }
-
-    /**
-     * Workhorse function that does actual conversion.
-     *
-     * First performs custom tag replacement specified by $search and
-     * $replace arrays. Then strips any remaining HTML tags, reduces whitespace
-     * and newlines to a readable format, and word wraps the text to
-     * $this->_options['width'] characters.
-     *
-     * @param string $text Reference to HTML content string
-     */
-    protected function _converter(&$text)
-    {
-        // Convert <BLOCKQUOTE> (before PRE!)
-        $this->_convert_blockquotes($text);
-
-        // Convert <PRE>
-        $this->_convert_pre($text);
-
-        // Run our defined tags search-and-replace
-        $text = preg_replace($this->search, $this->replace, $text);
-
-        // Run our defined tags search-and-replace with callback
-        $text = preg_replace_callback($this->callback_search, array($this, '_preg_callback'), $text);
-
-        // Strip any other HTML tags
-        $text = strip_tags($text, $this->allowed_tags);
-
-        // Run our defined entities/characters search-and-replace
-        $text = preg_replace($this->ent_search, $this->ent_replace, $text);
-
-        // Replace known html entities
-        $text = html_entity_decode($text, ENT_QUOTES);
-
-        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
-        $text = preg_replace('/&([a-zA-Z0-9]{2,6}|#[0-9]{2,4});/', '', $text);
-
-        // Convert "|+|amp|+|" into "&", need to be done after handling of unknown entities
-        // This properly handles situation of "&amp;quot;" in input string
-        $text = str_replace('|+|amp|+|', '&', $text);
-
-        // Bring down number of empty lines to 2 max
-        $text = preg_replace("/\n\s+\n/", "\n\n", $text);
-        $text = preg_replace("/[\n]{3,}/", "\n\n", $text);
-
-        // remove leading empty lines (can be produced by eg. P tag on the beginning)
-        $text = ltrim($text, "\n");
-
-        // Wrap the text to a readable format
-        // for PHP versions >= 4.0.2. Default width is 75
-        // If width is 0 or less, don't wrap the text.
-        if ($this->_options['width'] > 0) {
-            $text = wordwrap($text, $this->_options['width']);
-        }
-    }
-
-    /**
-     * Helper function called by preg_replace() on link replacement.
-     *
-     * Maintains an internal list of links to be displayed at the end of the
-     * text, with numeric indices to the original point in the text they
-     * appeared. Also makes an effort at identifying and handling absolute
-     * and relative links.
-     *
-     * @param string $link URL of the link
-     * @param string $display Part of the text to associate number with
-     * @param null $link_override
-     * @return string
-     */
-    protected function _build_link_list($link, $display, $link_override = null)
-    {
-        $link_method = ($link_override) ? $link_override : $this->_options['do_links'];
-        if ($link_method == 'none') {
-            return $display;
-        }
-
-
-        // Ignored link types
-        if (preg_match('!^(javascript:|mailto:|#)!i', $link)) {
-            return $display;
-        }
-
-        if (preg_match('!^([a-z][a-z0-9.+-]+:)!i', $link)) {
-            $url = $link;
-        } else {
-            $url = $this->url;
-            if (substr($link, 0, 1) != '/') {
-                $url .= '/';
-            }
-            $url .= "$link";
-        }
-
-        if ($link_method == 'table') {
-            if (($index = array_search($url, $this->_link_list)) === false) {
-                $index = count($this->_link_list);
-                $this->_link_list[] = $url;
-            }
-
-            return $display . ' [' . ($index + 1) . ']';
-        } elseif ($link_method == 'nextline') {
-            return $display . "\n[" . $url . ']';
-        } else { // link_method defaults to inline
-
-            return $display . ' [' . $url . ']';
-        }
-    }
-
-    /**
-     * Helper function for PRE body conversion.
-     *
-     * @param string $text HTML content
-     */
-    protected function _convert_pre(&$text)
-    {
-        // get the content of PRE element
-        while (preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
-            $this->pre_content = $matches[1];
-
-            // Run our defined tags search-and-replace with callback
-            $this->pre_content = preg_replace_callback(
-                $this->callback_search,
-                array($this, '_preg_callback'),
-                $this->pre_content
-            );
-
-            // convert the content
-            $this->pre_content = sprintf(
-                '<div><br>%s<br></div>',
-                preg_replace($this->pre_search, $this->pre_replace, $this->pre_content)
-            );
-
-            // replace the content (use callback because content can contain $0 variable)
-            $text = preg_replace_callback(
-                '/<pre[^>]*>.*<\/pre>/ismU',
-                array($this, '_preg_pre_callback'),
-                $text,
-                1
-            );
-
-            // free memory
-            $this->pre_content = '';
-        }
-    }
-
-    /**
-     * Helper function for BLOCKQUOTE body conversion.
-     *
-     * @param string $text HTML content
-     */
-    protected function _convert_blockquotes(&$text)
-    {
-        if (preg_match_all('/<\/*blockquote[^>]*>/i', $text, $matches, PREG_OFFSET_CAPTURE)) {
-            $start = 0;
-            $taglen = 0;
-            $level = 0;
-            $diff = 0;
-            foreach ($matches[0] as $m) {
-                if ($m[0][0] == '<' && $m[0][1] == '/') {
-                    $level--;
-                    if ($level < 0) {
-                        $level = 0; // malformed HTML: go to next blockquote
-                    } elseif ($level > 0) {
-                        // skip inner blockquote
-                    } else {
-                        $end = $m[1];
-                        $len = $end - $taglen - $start;
-                        // Get blockquote content
-                        $body = substr($text, $start + $taglen - $diff, $len);
-
-                        // Set text width
-                        $p_width = $this->_options['width'];
-                        if ($this->_options['width'] > 0) $this->_options['width'] -= 2;
-                        // Convert blockquote content
-                        $body = trim($body);
-                        $this->_converter($body);
-                        // Add citation markers and create PRE block
-                        $body = preg_replace('/((^|\n)>*)/', '\\1> ', trim($body));
-                        $body = '<pre>' . htmlspecialchars($body) . '</pre>';
-                        // Re-set text width
-                        $this->_options['width'] = $p_width;
-                        // Replace content
-                        $text = substr($text, 0, $start - $diff)
-                            . $body . substr($text, $end + strlen($m[0]) - $diff);
-
-                        $diff = $len + $taglen + strlen($m[0]) - strlen($body);
-                        unset($body);
-                    }
-                } else {
-                    if ($level == 0) {
-                        $start = $m[1];
-                        $taglen = strlen($m[0]);
-                    }
-                    $level++;
-                }
-            }
-        }
-    }
-
-    /**
-     * Callback function for preg_replace_callback use.
-     *
-     * @param array $matches PREG matches
-     * @return string
-     */
-    protected function _preg_callback($matches)
-    {
-        switch (strtolower($matches[1])) {
-            case 'b':
-            case 'strong':
-                return $this->_toupper($matches[3]);
-            case 'th':
-                return $this->_toupper("\t\t" . $matches[3] . "\n");
-            case 'h':
-                return $this->_toupper("\n\n" . $matches[3] . "\n\n");
-            case 'a':
-                // override the link method
-                $link_override = null;
-                if (preg_match('/_html2text_link_(\w+)/', $matches[4], $link_override_match)) {
-                    $link_override = $link_override_match[1];
-                }
-                // Remove spaces in URL (#1487805)
-                $url = str_replace(' ', '', $matches[3]);
-
-                return $this->_build_link_list($url, $matches[5], $link_override);
-        }
-        return '';
-    }
-
-    /**
-     * Callback function for preg_replace_callback use in PRE content handler.
-     *
-     * @param array $matches PREG matches
-     * @return string
-     */
-    protected function _preg_pre_callback(
-        /** @noinspection PhpUnusedParameterInspection */
-        $matches)
-    {
-        return $this->pre_content;
-    }
-
-    /**
-     * Strtoupper function with HTML tags and entities handling.
-     *
-     * @param string $str Text to convert
-     * @return string Converted text
-     */
-    private function _toupper($str)
-    {
-        // string can contain HTML tags
-        $chunks = preg_split('/(<[^>]*>)/', $str, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-
-        // convert toupper only the text between HTML tags
-        foreach ($chunks as $idx => $chunk) {
-            if ($chunk[0] != '<') {
-                $chunks[$idx] = $this->_strtoupper($chunk);
-            }
-        }
-
-        return implode($chunks);
-    }
-
-    /**
-     * Strtoupper multibyte wrapper function with HTML entities handling.
-     * Forces mb_strtoupper-call to UTF-8.
-     *
-     * @param string $str Text to convert
-     * @return string Converted text
-     */
-    private function _strtoupper($str)
-    {
-        $str = html_entity_decode($str, ENT_COMPAT);
-
-        if (function_exists('mb_strtoupper'))
-            $str = mb_strtoupper($str, 'UTF-8');
-        else
-            $str = strtoupper($str);
-
-        $str = htmlspecialchars($str, ENT_COMPAT);
-
-        return $str;
-    }
-}
diff --git a/lib/PHPMailer/extras/htmlfilter.php b/lib/PHPMailer/extras/htmlfilter.php
deleted file mode 100644
index 0e6770d2d..000000000
--- a/lib/PHPMailer/extras/htmlfilter.php
+++ /dev/null
@@ -1,874 +0,0 @@
-<?php
-/**
- * htmlfilter.inc
- * ---------------
- * This set of functions allows you to filter html in order to remove
- * any malicious tags from it. Useful in cases when you need to filter
- * user input for any cross-site-scripting attempts.
- *
- * Copyright (C) 2002-2004 by Duke University
- *
- * 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 (at your option) any later version.
- *
- * 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.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301  USA
- *
- * @Author    Konstantin Riabitsev <icon@linux.duke.edu>
- * @Author  Jim Jagielski <jim@jaguNET.com / jimjag@gmail.com>
- */
-
-/**
- * This function returns the final tag out of the tag name, an array
- * of attributes, and the type of the tag. This function is called by
- * tln_sanitize internally.
- *
- * @param string $tagname the name of the tag.
- * @param array $attary the array of attributes and their values
- * @param integer $tagtype The type of the tag (see in comments).
- * @return string A string with the final tag representation.
- */
-function tln_tagprint($tagname, $attary, $tagtype)
-{
-    if ($tagtype == 2) {
-        $fulltag = '</' . $tagname . '>';
-    } else {
-        $fulltag = '<' . $tagname;
-        if (is_array($attary) && sizeof($attary)) {
-            $atts = array();
-            while (list($attname, $attvalue) = each($attary)) {
-                array_push($atts, "$attname=$attvalue");
-            }
-            $fulltag .= ' ' . join(' ', $atts);
-        }
-        if ($tagtype == 3) {
-            $fulltag .= ' /';
-        }
-        $fulltag .= '>';
-    }
-    return $fulltag;
-}
-
-/**
- * A small helper function to use with array_walk. Modifies a by-ref
- * value and makes it lowercase.
- *
- * @param string $val a value passed by-ref.
- * @return        void since it modifies a by-ref value.
- */
-function tln_casenormalize(&$val)
-{
-    $val = strtolower($val);
-}
-
-/**
- * This function skips any whitespace from the current position within
- * a string and to the next non-whitespace value.
- *
- * @param string $body the string
- * @param integer $offset the offset within the string where we should start
- *                   looking for the next non-whitespace character.
- * @return integer          the location within the $body where the next
- *                   non-whitespace char is located.
- */
-function tln_skipspace($body, $offset)
-{
-    preg_match('/^(\s*)/s', substr($body, $offset), $matches);
-    if (sizeof($matches[1])) {
-        $count = strlen($matches[1]);
-        $offset += $count;
-    }
-    return $offset;
-}
-
-/**
- * This function looks for the next character within a string.    It's
- * really just a glorified "strpos", except it catches the failures
- * nicely.
- *
- * @param string $body   The string to look for needle in.
- * @param integer $offset Start looking from this position.
- * @param string $needle The character/string to look for.
- * @return integer           location of the next occurrence of the needle, or
- *                   strlen($body) if needle wasn't found.
- */
-function tln_findnxstr($body, $offset, $needle)
-{
-    $pos = strpos($body, $needle, $offset);
-    if ($pos === false) {
-        $pos = strlen($body);
-    }
-    return $pos;
-}
-
-/**
- * This function takes a PCRE-style regexp and tries to match it
- * within the string.
- *
- * @param string $body   The string to look for needle in.
- * @param integer $offset Start looking from here.
- * @param string $reg       A PCRE-style regex to match.
- * @return array|boolean  Returns a false if no matches found, or an array
- *                   with the following members:
- *                   - integer with the location of the match within $body
- *                   - string with whatever content between offset and the match
- *                   - string with whatever it is we matched
- */
-function tln_findnxreg($body, $offset, $reg)
-{
-    $matches = array();
-    $retarr = array();
-    $preg_rule = '%^(.*?)(' . $reg . ')%s';
-    preg_match($preg_rule, substr($body, $offset), $matches);
-    if (!isset($matches[0])) {
-        $retarr = false;
-    } else {
-        $retarr[0] = $offset + strlen($matches[1]);
-        $retarr[1] = $matches[1];
-        $retarr[2] = $matches[2];
-    }
-    return $retarr;
-}
-
-/**
- * This function looks for the next tag.
- *
- * @param string $body   String where to look for the next tag.
- * @param integer $offset Start looking from here.
- * @return array|boolean false if no more tags exist in the body, or
- *                   an array with the following members:
- *                   - string with the name of the tag
- *                   - array with attributes and their values
- *                   - integer with tag type (1, 2, or 3)
- *                   - integer where the tag starts (starting "<")
- *                   - integer where the tag ends (ending ">")
- *                   first three members will be false, if the tag is invalid.
- */
-function tln_getnxtag($body, $offset)
-{
-    if ($offset > strlen($body)) {
-        return false;
-    }
-    $lt = tln_findnxstr($body, $offset, '<');
-    if ($lt == strlen($body)) {
-        return false;
-    }
-    /**
-     * We are here:
-     * blah blah <tag attribute="value">
-     * \---------^
-     */
-    $pos = tln_skipspace($body, $lt + 1);
-    if ($pos >= strlen($body)) {
-        return array(false, false, false, $lt, strlen($body));
-    }
-    /**
-     * There are 3 kinds of tags:
-     * 1. Opening tag, e.g.:
-     *      <a href="blah">
-     * 2. Closing tag, e.g.:
-     *      </a>
-     * 3. XHTML-style content-less tag, e.g.:
-     *      <img src="blah"/>
-     */
-    switch (substr($body, $pos, 1)) {
-        case '/':
-            $tagtype = 2;
-            $pos++;
-            break;
-        case '!':
-            /**
-             * A comment or an SGML declaration.
-             */
-            if (substr($body, $pos + 1, 2) == '--') {
-                $gt = strpos($body, '-->', $pos);
-                if ($gt === false) {
-                    $gt = strlen($body);
-                } else {
-                    $gt += 2;
-                }
-                return array(false, false, false, $lt, $gt);
-            } else {
-                $gt = tln_findnxstr($body, $pos, '>');
-                return array(false, false, false, $lt, $gt);
-            }
-            break;
-        default:
-            /**
-             * Assume tagtype 1 for now. If it's type 3, we'll switch values
-             * later.
-             */
-            $tagtype = 1;
-            break;
-    }
-
-    /**
-     * Look for next [\W-_], which will indicate the end of the tag name.
-     */
-    $regary = tln_findnxreg($body, $pos, '[^\w\-_]');
-    if ($regary == false) {
-        return array(false, false, false, $lt, strlen($body));
-    }
-    list($pos, $tagname, $match) = $regary;
-    $tagname = strtolower($tagname);
-
-    /**
-     * $match can be either of these:
-     * '>'    indicating the end of the tag entirely.
-     * '\s' indicating the end of the tag name.
-     * '/'    indicating that this is type-3 xhtml tag.
-     *
-     * Whatever else we find there indicates an invalid tag.
-     */
-    switch ($match) {
-        case '/':
-            /**
-             * This is an xhtml-style tag with a closing / at the
-             * end, like so: <img src="blah"/>. Check if it's followed
-             * by the closing bracket. If not, then this tag is invalid
-             */
-            if (substr($body, $pos, 2) == '/>') {
-                $pos++;
-                $tagtype = 3;
-            } else {
-                $gt = tln_findnxstr($body, $pos, '>');
-                $retary = array(false, false, false, $lt, $gt);
-                return $retary;
-            }
-            //intentional fall-through
-        case '>':
-            return array($tagname, false, $tagtype, $lt, $pos);
-            break;
-        default:
-            /**
-             * Check if it's whitespace
-             */
-            if (preg_match('/\s/', $match)) {
-            } else {
-                /**
-                 * This is an invalid tag! Look for the next closing ">".
-                 */
-                $gt = tln_findnxstr($body, $lt, '>');
-                return array(false, false, false, $lt, $gt);
-            }
-    }
-
-    /**
-     * At this point we're here:
-     * <tagname     attribute='blah'>
-     * \-------^
-     *
-     * At this point we loop in order to find all attributes.
-     */
-    $attary = array();
-
-    while ($pos <= strlen($body)) {
-        $pos = tln_skipspace($body, $pos);
-        if ($pos == strlen($body)) {
-            /**
-             * Non-closed tag.
-             */
-            return array(false, false, false, $lt, $pos);
-        }
-        /**
-         * See if we arrived at a ">" or "/>", which means that we reached
-         * the end of the tag.
-         */
-        $matches = array();
-        preg_match('%^(\s*)(>|/>)%s', substr($body, $pos), $matches);
-        if (isset($matches[0]) && $matches[0]) {
-            /**
-             * Yep. So we did.
-             */
-            $pos += strlen($matches[1]);
-            if ($matches[2] == '/>') {
-                $tagtype = 3;
-                $pos++;
-            }
-            return array($tagname, $attary, $tagtype, $lt, $pos);
-        }
-
-        /**
-         * There are several types of attributes, with optional
-         * [:space:] between members.
-         * Type 1:
-         *     attrname[:space:]=[:space:]'CDATA'
-         * Type 2:
-         *     attrname[:space:]=[:space:]"CDATA"
-         * Type 3:
-         *     attr[:space:]=[:space:]CDATA
-         * Type 4:
-         *     attrname
-         *
-         * We leave types 1 and 2 the same, type 3 we check for
-         * '"' and convert to "&quot" if needed, then wrap in
-         * double quotes. Type 4 we convert into:
-         * attrname="yes".
-         */
-        $regary = tln_findnxreg($body, $pos, '[^\w\-_]');
-        if ($regary == false) {
-            /**
-             * Looks like body ended before the end of tag.
-             */
-            return array(false, false, false, $lt, strlen($body));
-        }
-        list($pos, $attname, $match) = $regary;
-        $attname = strtolower($attname);
-        /**
-         * We arrived at the end of attribute name. Several things possible
-         * here:
-         * '>'    means the end of the tag and this is attribute type 4
-         * '/'    if followed by '>' means the same thing as above
-         * '\s' means a lot of things -- look what it's followed by.
-         *        anything else means the attribute is invalid.
-         */
-        switch ($match) {
-            case '/':
-                /**
-                 * This is an xhtml-style tag with a closing / at the
-                 * end, like so: <img src="blah"/>. Check if it's followed
-                 * by the closing bracket. If not, then this tag is invalid
-                 */
-                if (substr($body, $pos, 2) == '/>') {
-                    $pos++;
-                    $tagtype = 3;
-                } else {
-                    $gt = tln_findnxstr($body, $pos, '>');
-                    $retary = array(false, false, false, $lt, $gt);
-                    return $retary;
-                }
-                //intentional fall-through
-            case '>':
-                $attary{$attname} = '"yes"';
-                return array($tagname, $attary, $tagtype, $lt, $pos);
-                break;
-            default:
-                /**
-                 * Skip whitespace and see what we arrive at.
-                 */
-                $pos = tln_skipspace($body, $pos);
-                $char = substr($body, $pos, 1);
-                /**
-                 * Two things are valid here:
-                 * '=' means this is attribute type 1 2 or 3.
-                 * \w means this was attribute type 4.
-                 * anything else we ignore and re-loop. End of tag and
-                 * invalid stuff will be caught by our checks at the beginning
-                 * of the loop.
-                 */
-                if ($char == '=') {
-                    $pos++;
-                    $pos = tln_skipspace($body, $pos);
-                    /**
-                     * Here are 3 possibilities:
-                     * "'"    attribute type 1
-                     * '"'    attribute type 2
-                     * everything else is the content of tag type 3
-                     */
-                    $quot = substr($body, $pos, 1);
-                    if ($quot == '\'') {
-                        $regary = tln_findnxreg($body, $pos + 1, '\'');
-                        if ($regary == false) {
-                            return array(false, false, false, $lt, strlen($body));
-                        }
-                        list($pos, $attval, $match) = $regary;
-                        $pos++;
-                        $attary{$attname} = '\'' . $attval . '\'';
-                    } else {
-                        if ($quot == '"') {
-                            $regary = tln_findnxreg($body, $pos + 1, '\"');
-                            if ($regary == false) {
-                                return array(false, false, false, $lt, strlen($body));
-                            }
-                            list($pos, $attval, $match) = $regary;
-                            $pos++;
-                            $attary{$attname} = '"' . $attval . '"';
-                        } else {
-                            /**
-                             * These are hateful. Look for \s, or >.
-                             */
-                            $regary = tln_findnxreg($body, $pos, '[\s>]');
-                            if ($regary == false) {
-                                return array(false, false, false, $lt, strlen($body));
-                            }
-                            list($pos, $attval, $match) = $regary;
-                            /**
-                             * If it's ">" it will be caught at the top.
-                             */
-                            $attval = preg_replace('/\"/s', '&quot;', $attval);
-                            $attary{$attname} = '"' . $attval . '"';
-                        }
-                    }
-                } else {
-                    if (preg_match('|[\w/>]|', $char)) {
-                        /**
-                         * That was attribute type 4.
-                         */
-                        $attary{$attname} = '"yes"';
-                    } else {
-                        /**
-                         * An illegal character. Find next '>' and return.
-                         */
-                        $gt = tln_findnxstr($body, $pos, '>');
-                        return array(false, false, false, $lt, $gt);
-                    }
-                }
-        }
-    }
-    /**
-     * The fact that we got here indicates that the tag end was never
-     * found. Return invalid tag indication so it gets stripped.
-     */
-    return array(false, false, false, $lt, strlen($body));
-}
-
-/**
- * Translates entities into literal values so they can be checked.
- *
- * @param string $attvalue the by-ref value to check.
- * @param string $regex    the regular expression to check against.
- * @param boolean $hex        whether the entites are hexadecimal.
- * @return boolean            True or False depending on whether there were matches.
- */
-function tln_deent(&$attvalue, $regex, $hex = false)
-{
-    preg_match_all($regex, $attvalue, $matches);
-    if (is_array($matches) && sizeof($matches[0]) > 0) {
-        $repl = array();
-        for ($i = 0; $i < sizeof($matches[0]); $i++) {
-            $numval = $matches[1][$i];
-            if ($hex) {
-                $numval = hexdec($numval);
-            }
-            $repl{$matches[0][$i]} = chr($numval);
-        }
-        $attvalue = strtr($attvalue, $repl);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-/**
- * This function checks attribute values for entity-encoded values
- * and returns them translated into 8-bit strings so we can run
- * checks on them.
- *
- * @param string $attvalue A string to run entity check against.
- * @return             Void, modifies a reference value.
- */
-function tln_defang(&$attvalue)
-{
-    /**
-     * Skip this if there aren't ampersands or backslashes.
-     */
-    if (strpos($attvalue, '&') === false
-        && strpos($attvalue, '\\') === false
-    ) {
-        return;
-    }
-    do {
-        $m = false;
-        $m = $m || tln_deent($attvalue, '/\&#0*(\d+);*/s');
-        $m = $m || tln_deent($attvalue, '/\&#x0*((\d|[a-f])+);*/si', true);
-        $m = $m || tln_deent($attvalue, '/\\\\(\d+)/s', true);
-    } while ($m == true);
-    $attvalue = stripslashes($attvalue);
-}
-
-/**
- * Kill any tabs, newlines, or carriage returns. Our friends the
- * makers of the browser with 95% market value decided that it'd
- * be funny to make "java[tab]script" be just as good as "javascript".
- *
- * @param string $attvalue     The attribute value before extraneous spaces removed.
- * @return     Void, modifies a reference value.
- */
-function tln_unspace(&$attvalue)
-{
-    if (strcspn($attvalue, "\t\r\n\0 ") != strlen($attvalue)) {
-        $attvalue = str_replace(
-            array("\t", "\r", "\n", "\0", " "),
-            array('', '', '', '', ''),
-            $attvalue
-        );
-    }
-}
-
-/**
- * This function runs various checks against the attributes.
- *
- * @param string $tagname            String with the name of the tag.
- * @param array $attary            Array with all tag attributes.
- * @param array $rm_attnames        See description for tln_sanitize
- * @param array $bad_attvals        See description for tln_sanitize
- * @param array $add_attr_to_tag See description for tln_sanitize
- * @return                    Array with modified attributes.
- */
-function tln_fixatts(
-    $tagname,
-    $attary,
-    $rm_attnames,
-    $bad_attvals,
-    $add_attr_to_tag
-) {
-    while (list($attname, $attvalue) = each($attary)) {
-        /**
-         * See if this attribute should be removed.
-         */
-        foreach ($rm_attnames as $matchtag => $matchattrs) {
-            if (preg_match($matchtag, $tagname)) {
-                foreach ($matchattrs as $matchattr) {
-                    if (preg_match($matchattr, $attname)) {
-                        unset($attary{$attname});
-                        continue;
-                    }
-                }
-            }
-        }
-        /**
-         * Remove any backslashes, entities, or extraneous whitespace.
-         */
-        tln_defang($attvalue);
-        tln_unspace($attvalue);
-
-        /**
-         * Now let's run checks on the attvalues.
-         * I don't expect anyone to comprehend this. If you do,
-         * get in touch with me so I can drive to where you live and
-         * shake your hand personally. :)
-         */
-        foreach ($bad_attvals as $matchtag => $matchattrs) {
-            if (preg_match($matchtag, $tagname)) {
-                foreach ($matchattrs as $matchattr => $valary) {
-                    if (preg_match($matchattr, $attname)) {
-                        /**
-                         * There are two arrays in valary.
-                         * First is matches.
-                         * Second one is replacements
-                         */
-                        list($valmatch, $valrepl) = $valary;
-                        $newvalue = preg_replace($valmatch, $valrepl, $attvalue);
-                        if ($newvalue != $attvalue) {
-                            $attary{$attname} = $newvalue;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    /**
-     * See if we need to append any attributes to this tag.
-     */
-    foreach ($add_attr_to_tag as $matchtag => $addattary) {
-        if (preg_match($matchtag, $tagname)) {
-            $attary = array_merge($attary, $addattary);
-        }
-    }
-    return $attary;
-}
-
-/**
- *
- * @param string $body                    The HTML you wish to filter
- * @param array $tag_list                see description above
- * @param array $rm_tags_with_content see description above
- * @param array $self_closing_tags    see description above
- * @param boolean $force_tag_closing    see description above
- * @param array $rm_attnames            see description above
- * @param array $bad_attvals            see description above
- * @param array $add_attr_to_tag        see description above
- * @return string                       Sanitized html safe to show on your pages.
- */
-function tln_sanitize(
-    $body,
-    $tag_list,
-    $rm_tags_with_content,
-    $self_closing_tags,
-    $force_tag_closing,
-    $rm_attnames,
-    $bad_attvals,
-    $add_attr_to_tag
-) {
-    /**
-     * Normalize rm_tags and rm_tags_with_content.
-     */
-    $rm_tags = array_shift($tag_list);
-    @array_walk($tag_list, 'tln_casenormalize');
-    @array_walk($rm_tags_with_content, 'tln_casenormalize');
-    @array_walk($self_closing_tags, 'tln_casenormalize');
-    /**
-     * See if tag_list is of tags to remove or tags to allow.
-     * false  means remove these tags
-     * true      means allow these tags
-     */
-    $curpos = 0;
-    $open_tags = array();
-    $trusted = "<!-- begin tln_sanitized html -->\n";
-    $skip_content = false;
-    /**
-     * Take care of netscape's stupid javascript entities like
-     * &{alert('boo')};
-     */
-    $body = preg_replace('/&(\{.*?\};)/si', '&amp;\\1', $body);
-    while (($curtag = tln_getnxtag($body, $curpos)) != false) {
-        list($tagname, $attary, $tagtype, $lt, $gt) = $curtag;
-        $free_content = substr($body, $curpos, $lt - $curpos);
-        if ($skip_content == false) {
-            $trusted .= $free_content;
-        } else {
-        }
-        if ($tagname != false) {
-            if ($tagtype == 2) {
-                if ($skip_content == $tagname) {
-                    /**
-                     * Got to the end of tag we needed to remove.
-                     */
-                    $tagname = false;
-                    $skip_content = false;
-                } else {
-                    if ($skip_content == false) {
-                        if (isset($open_tags{$tagname}) &&
-                            $open_tags{$tagname} > 0
-                        ) {
-                            $open_tags{$tagname}--;
-                        } else {
-                            $tagname = false;
-                        }
-                    } else {
-                    }
-                }
-            } else {
-                /**
-                 * $rm_tags_with_content
-                 */
-                if ($skip_content == false) {
-                    /**
-                     * See if this is a self-closing type and change
-                     * tagtype appropriately.
-                     */
-                    if ($tagtype == 1
-                        && in_array($tagname, $self_closing_tags)
-                    ) {
-                        $tagtype = 3;
-                    }
-                    /**
-                     * See if we should skip this tag and any content
-                     * inside it.
-                     */
-                    if ($tagtype == 1
-                        && in_array($tagname, $rm_tags_with_content)
-                    ) {
-                        $skip_content = $tagname;
-                    } else {
-                        if (($rm_tags == false
-                                && in_array($tagname, $tag_list)) ||
-                            ($rm_tags == true
-                                && !in_array($tagname, $tag_list))
-                        ) {
-                            $tagname = false;
-                        } else {
-                            if ($tagtype == 1) {
-                                if (isset($open_tags{$tagname})) {
-                                    $open_tags{$tagname}++;
-                                } else {
-                                    $open_tags{$tagname} = 1;
-                                }
-                            }
-                            /**
-                             * This is where we run other checks.
-                             */
-                            if (is_array($attary) && sizeof($attary) > 0) {
-                                $attary = tln_fixatts(
-                                    $tagname,
-                                    $attary,
-                                    $rm_attnames,
-                                    $bad_attvals,
-                                    $add_attr_to_tag
-                                );
-                            }
-                        }
-                    }
-                } else {
-                }
-            }
-            if ($tagname != false && $skip_content == false) {
-                $trusted .= tln_tagprint($tagname, $attary, $tagtype);
-            }
-        } else {
-        }
-        $curpos = $gt + 1;
-    }
-    $trusted .= substr($body, $curpos, strlen($body) - $curpos);
-    if ($force_tag_closing == true) {
-        foreach ($open_tags as $tagname => $opentimes) {
-            while ($opentimes > 0) {
-                $trusted .= '</' . $tagname . '>';
-                $opentimes--;
-            }
-        }
-        $trusted .= "\n";
-    }
-    $trusted .= "<!-- end tln_sanitized html -->\n";
-    return $trusted;
-}
-
-//
-// Use the nifty htmlfilter library
-//
-
-
-function HTMLFilter($body, $trans_image_path, $block_external_images = false)
-{
-
-    $tag_list = array(
-        false,
-        "object",
-        "meta",
-        "html",
-        "head",
-        "base",
-        "link",
-        "frame",
-        "iframe",
-        "plaintext",
-        "marquee"
-    );
-
-    $rm_tags_with_content = array(
-        "script",
-        "applet",
-        "embed",
-        "title",
-        "frameset",
-        "xmp",
-        "xml"
-    );
-
-    $self_closing_tags = array(
-        "img",
-        "br",
-        "hr",
-        "input",
-        "outbind"
-    );
-
-    $force_tag_closing = true;
-
-    $rm_attnames = array(
-        "/.*/" =>
-            array(
-                // "/target/i",
-                "/^on.*/i",
-                "/^dynsrc/i",
-                "/^data.*/i",
-                "/^lowsrc.*/i"
-            )
-    );
-
-    $bad_attvals = array(
-        "/.*/" =>
-            array(
-                "/^src|background/i" =>
-                    array(
-                        array(
-                            '/^([\'"])\s*\S+script\s*:.*([\'"])/si',
-                            '/^([\'"])\s*mocha\s*:*.*([\'"])/si',
-                            '/^([\'"])\s*about\s*:.*([\'"])/si'
-                        ),
-                        array(
-                            "\\1$trans_image_path\\2",
-                            "\\1$trans_image_path\\2",
-                            "\\1$trans_image_path\\2",
-                            "\\1$trans_image_path\\2"
-                        )
-                    ),
-                "/^href|action/i" =>
-                    array(
-                        array(
-                            '/^([\'"])\s*\S+script\s*:.*([\'"])/si',
-                            '/^([\'"])\s*mocha\s*:*.*([\'"])/si',
-                            '/^([\'"])\s*about\s*:.*([\'"])/si'
-                        ),
-                        array(
-                            "\\1#\\1",
-                            "\\1#\\1",
-                            "\\1#\\1",
-                            "\\1#\\1"
-                        )
-                    ),
-                "/^style/i" =>
-                    array(
-                        array(
-                            "/expression/i",
-                            "/binding/i",
-                            "/behaviou*r/i",
-                            "/include-source/i",
-                            '/position\s*:\s*absolute/i',
-                            '/url\s*\(\s*([\'"])\s*\S+script\s*:.*([\'"])\s*\)/si',
-                            '/url\s*\(\s*([\'"])\s*mocha\s*:.*([\'"])\s*\)/si',
-                            '/url\s*\(\s*([\'"])\s*about\s*:.*([\'"])\s*\)/si',
-                            '/(.*)\s*:\s*url\s*\(\s*([\'"]*)\s*\S+script\s*:.*([\'"]*)\s*\)/si'
-                        ),
-                        array(
-                            "idiocy",
-                            "idiocy",
-                            "idiocy",
-                            "idiocy",
-                            "",
-                            "url(\\1#\\1)",
-                            "url(\\1#\\1)",
-                            "url(\\1#\\1)",
-                            "url(\\1#\\1)",
-                            "url(\\1#\\1)",
-                            "\\1:url(\\2#\\3)"
-                        )
-                    )
-            )
-    );
-
-    if ($block_external_images) {
-        array_push(
-            $bad_attvals{'/.*/'}{'/^src|background/i'}[0],
-            '/^([\'\"])\s*https*:.*([\'\"])/si'
-        );
-        array_push(
-            $bad_attvals{'/.*/'}{'/^src|background/i'}[1],
-            "\\1$trans_image_path\\1"
-        );
-        array_push(
-            $bad_attvals{'/.*/'}{'/^style/i'}[0],
-            '/url\(([\'\"])\s*https*:.*([\'\"])\)/si'
-        );
-        array_push(
-            $bad_attvals{'/.*/'}{'/^style/i'}[1],
-            "url(\\1$trans_image_path\\1)"
-        );
-    }
-
-    $add_attr_to_tag = array(
-        "/^a$/i" =>
-            array('target' => '"_blank"')
-    );
-
-    $trusted = tln_sanitize(
-        $body,
-        $tag_list,
-        $rm_tags_with_content,
-        $self_closing_tags,
-        $force_tag_closing,
-        $rm_attnames,
-        $bad_attvals,
-        $add_attr_to_tag
-    );
-    return $trusted;
-}
diff --git a/lib/PHPMailer/extras/ntlm_sasl_client.php b/lib/PHPMailer/extras/ntlm_sasl_client.php
deleted file mode 100644
index b21ccce0e..000000000
--- a/lib/PHPMailer/extras/ntlm_sasl_client.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/*
- * ntlm_sasl_client.php
- *
- * @(#) $Id: ntlm_sasl_client.php,v 1.3 2004/11/17 08:00:37 mlemos Exp $
- *
- **
- ** Source: http://www.phpclasses.org/browse/file/7495.html
- ** License: BSD (http://www.phpclasses.org/package/1888-PHP-Single-API-for-standard-authentication-mechanisms.html)
- ** Bundled with Permission
- **
- */
-
-define("SASL_NTLM_STATE_START",             0);
-define("SASL_NTLM_STATE_IDENTIFY_DOMAIN",   1);
-define("SASL_NTLM_STATE_RESPOND_CHALLENGE", 2);
-define("SASL_NTLM_STATE_DONE",              3);
-
-class ntlm_sasl_client_class
-{
-	var $credentials=array();
-	var $state=SASL_NTLM_STATE_START;
-
-	Function Initialize(&$client)
-	{
-		if(!function_exists($function="mcrypt_encrypt")
-		|| !function_exists($function="mhash"))
-		{
-			$extensions=array(
-				"mcrypt_encrypt"=>"mcrypt",
-				"mhash"=>"mhash"
-			);
-			$client->error="the extension ".$extensions[$function]." required by the NTLM SASL client class is not available in this PHP configuration";
-			return(0);
-		}
-		return(1);
-	}
-
-	Function ASCIIToUnicode($ascii)
-	{
-		for($unicode="",$a=0;$a<strlen($ascii);$a++)
-			$unicode.=substr($ascii,$a,1).chr(0);
-		return($unicode);
-	}
-
-	Function TypeMsg1($domain,$workstation)
-	{
-		$domain_length=strlen($domain);
-		$workstation_length=strlen($workstation);
-		$workstation_offset=32;
-		$domain_offset=$workstation_offset+$workstation_length;
-		return(
-			"NTLMSSP\0".
-			"\x01\x00\x00\x00".
-			"\x07\x32\x00\x00".
-			pack("v",$domain_length).
-			pack("v",$domain_length).
-			pack("V",$domain_offset).
-			pack("v",$workstation_length).
-			pack("v",$workstation_length).
-			pack("V",$workstation_offset).
-			$workstation.
-			$domain
-		);
-	}
-
-	Function NTLMResponse($challenge,$password)
-	{
-		$unicode=$this->ASCIIToUnicode($password);
-		$md4=mhash(MHASH_MD4,$unicode);
-		$padded=$md4.str_repeat(chr(0),21-strlen($md4));
-		$iv_size=mcrypt_get_iv_size(MCRYPT_DES,MCRYPT_MODE_ECB);
-		$iv=mcrypt_create_iv($iv_size,MCRYPT_RAND);
-		for($response="",$third=0;$third<21;$third+=7)
-		{
-			for($packed="",$p=$third;$p<$third+7;$p++)
-				$packed.=str_pad(decbin(ord(substr($padded,$p,1))),8,"0",STR_PAD_LEFT);
-			for($key="",$p=0;$p<strlen($packed);$p+=7)
-			{
-				$s=substr($packed,$p,7);
-				$b=$s.((substr_count($s,"1") % 2) ? "0" : "1");
-				$key.=chr(bindec($b));
-			}
-			$ciphertext=mcrypt_encrypt(MCRYPT_DES,$key,$challenge,MCRYPT_MODE_ECB,$iv);
-			$response.=$ciphertext;
-		}
-		return $response;
-	}
-
-	Function TypeMsg3($ntlm_response,$user,$domain,$workstation)
-	{
-		$domain_unicode=$this->ASCIIToUnicode($domain);
-		$domain_length=strlen($domain_unicode);
-		$domain_offset=64;
-		$user_unicode=$this->ASCIIToUnicode($user);
-		$user_length=strlen($user_unicode);
-		$user_offset=$domain_offset+$domain_length;
-		$workstation_unicode=$this->ASCIIToUnicode($workstation);
-		$workstation_length=strlen($workstation_unicode);
-		$workstation_offset=$user_offset+$user_length;
-		$lm="";
-		$lm_length=strlen($lm);
-		$lm_offset=$workstation_offset+$workstation_length;
-		$ntlm=$ntlm_response;
-		$ntlm_length=strlen($ntlm);
-		$ntlm_offset=$lm_offset+$lm_length;
-		$session="";
-		$session_length=strlen($session);
-		$session_offset=$ntlm_offset+$ntlm_length;
-		return(
-			"NTLMSSP\0".
-			"\x03\x00\x00\x00".
-			pack("v",$lm_length).
-			pack("v",$lm_length).
-			pack("V",$lm_offset).
-			pack("v",$ntlm_length).
-			pack("v",$ntlm_length).
-			pack("V",$ntlm_offset).
-			pack("v",$domain_length).
-			pack("v",$domain_length).
-			pack("V",$domain_offset).
-			pack("v",$user_length).
-			pack("v",$user_length).
-			pack("V",$user_offset).
-			pack("v",$workstation_length).
-			pack("v",$workstation_length).
-			pack("V",$workstation_offset).
-			pack("v",$session_length).
-			pack("v",$session_length).
-			pack("V",$session_offset).
-			"\x01\x02\x00\x00".
-			$domain_unicode.
-			$user_unicode.
-			$workstation_unicode.
-			$lm.
-			$ntlm
-		);
-	}
-
-	Function Start(&$client, &$message, &$interactions)
-	{
-		if($this->state!=SASL_NTLM_STATE_START)
-		{
-			$client->error="NTLM authentication state is not at the start";
-			return(SASL_FAIL);
-		}
-		$this->credentials=array(
-			"user"=>"",
-			"password"=>"",
-			"realm"=>"",
-			"workstation"=>""
-		);
-		$defaults=array();
-		$status=$client->GetCredentials($this->credentials,$defaults,$interactions);
-		if($status==SASL_CONTINUE)
-			$this->state=SASL_NTLM_STATE_IDENTIFY_DOMAIN;
-		Unset($message);
-		return($status);
-	}
-
-	Function Step(&$client, $response, &$message, &$interactions)
-	{
-		switch($this->state)
-		{
-			case SASL_NTLM_STATE_IDENTIFY_DOMAIN:
-				$message=$this->TypeMsg1($this->credentials["realm"],$this->credentials["workstation"]);
-				$this->state=SASL_NTLM_STATE_RESPOND_CHALLENGE;
-				break;
-			case SASL_NTLM_STATE_RESPOND_CHALLENGE:
-				$ntlm_response=$this->NTLMResponse(substr($response,24,8),$this->credentials["password"]);
-				$message=$this->TypeMsg3($ntlm_response,$this->credentials["user"],$this->credentials["realm"],$this->credentials["workstation"]);
-				$this->state=SASL_NTLM_STATE_DONE;
-				break;
-			case SASL_NTLM_STATE_DONE:
-				$client->error="NTLM authentication was finished without success";
-				return(SASL_FAIL);
-			default:
-				$client->error="invalid NTLM authentication step state";
-				return(SASL_FAIL);
-		}
-		return(SASL_CONTINUE);
-	}
-};
-
-?>
\ No newline at end of file
diff --git a/lib/Pprocess.php b/lib/Pprocess.php
deleted file mode 100644
index f1fd24411..000000000
--- a/lib/Pprocess.php
+++ /dev/null
@@ -1,476 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/rarinfo/par2info.php");
-require_once(WWW_DIR . "lib/rarinfo/archiveinfo.php");
-require_once(WWW_DIR . "lib/rarinfo/zipinfo.php");
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR . "lib/category.php");
-require_once(WWW_DIR . "lib/releases.php");
-require_once(WWW_DIR . "lib/releaseimage.php");
-require_once(WWW_DIR . "lib/releaseextra.php");
-require_once(WWW_DIR . "lib/groups.php");
-require_once(WWW_DIR . 'lib/nntp.php');
-require_once(WWW_DIR . 'lib/music.php');
-require_once(WWW_DIR . 'lib/Musik.php');
-require_once(WWW_DIR . "lib/site.php");
-require_once(WWW_DIR . "lib/Tmux.php");
-require_once(WWW_DIR . "lib/amazon.php");
-require_once(WWW_DIR . "lib/genres.php");
-require_once(WWW_DIR . "lib/anidb.php");
-require_once(WWW_DIR . "lib/book.php");
-require_once(WWW_DIR.  "lib/Books.php");
-require_once(WWW_DIR . "lib/Games.php");
-require_once(WWW_DIR . "lib/spotnab.php");
-require_once(WWW_DIR . "lib/thetvdb.php");
-require_once(WWW_DIR . "lib/XXX.php");
-require_once(WWW_DIR . "lib/Logger.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/post/AniDB.php");
-require_once("nzbcontents.php");
-require_once("namefixer.php");
-require_once("Info.php");
-require_once("prehash.php");
-require_once("Sharing.php");
-require_once("TraktTv.php");
-require_once("Film.php");
-require_once("TvAnger.php");
-require_once("Konsole.php");
-require_once("ProcessAdditional.php");
-
-class PProcess
-{
-	/**
-	 * @var Settings
-	 */
-	public $pdo;
-
-	/**
-	 * Class instance of debugging.
-	 *
-	 * @var Logger
-	 */
-	protected $debugging;
-
-	/**
-	 * Instance of NameFixer.
-	 * @var NameFixer
-	 */
-	protected $nameFixer;
-
-	/**
-	 * @var Par2Info
-	 */
-	protected $_par2Info;
-
-	/**
-	 * Use alternate NNTP provider when download fails?
-	 * @var bool
-	 */
-	private $alternateNNTP;
-
-	/**
-	 * Add par2 info to rar list?
-	 * @var bool
-	 */
-	private $addpar2;
-
-	/**
-	 * Should we echo to CLI?
-	 * @var bool
-	 */
-	private $echooutput;
-
-	/**
-	 * @var Groups
-	 */
-	private $groups;
-
-	/**
-	 * @var Nfo
-	 */
-	private $Nfo;
-
-	/**
-	 * @var ReleaseFiles
-	 */
-	private $releaseFiles;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param array $options Pass in class instances.
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'         => true,
-			'Logger'       => null,
-			'Groups'       => null,
-			'NameFixer'    => null,
-			'Nfo'          => null,
-			'ReleaseFiles' => null,
-			'Settings'     => null,
-		];
-		$options += $defaults;
-
-		//\\ Various.
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		//\\
-		$s = new Sites();
-		$this->site = $s->get();
-		//\\ Class instances.
-		$this->pdo = (($options['Settings'] instanceof DB) ? $options['Settings'] : new DB());
-		$this->groups = (($options['Groups'] instanceof Groups) ? $options['Groups'] : new Groups());
-		$this->_par2Info = new Par2Info();
-		$this->debugging = ($options['Logger'] instanceof Logger ? $options['Logger'] : new Logger(['ColorCLI' => $this->pdo->log]));
-		$this->nameFixer = (($options['NameFixer'] instanceof NameFixer) ? $options['NameFixer'] : new NameFixer(['Echo' => $this->echooutput, 'Settings' => $this->pdo, 'Groups' => $this->groups]));
-		$this->Nfo = (($options['Nfo'] instanceof Info ) ? $options['Nfo'] : new Info(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
-		$this->releaseFiles = (($options['ReleaseFiles'] instanceof ReleaseFiles) ? $options['ReleaseFiles'] : new ReleaseFiles($this->pdo));
-		//\\
-
-		//\\ Site settings.
-		$this->addpar2 = ($this->site->addpar2 == 0) ? false : true;
-		$this->alternateNNTP = ($this->site->alternate_nntp == 1 ? true : false);
-		//\\
-	}
-
-	/**
-	 * Go through every type of post proc.
-	 *
-	 * @param $nntp
-	 *
-	 * @return void
-	 */
-	public function processAll($nntp)
-	{
-		$this->processAdditional($nntp);
-		$this->processNfos($nntp);
-		$this->processSpotnab($nntp);
-		$this->processSharing($nntp);
-		$this->processMovies();
-		$this->processMusic();
-		$this->processConsoles();
-		$this->processGames();
-		$this->processAnime();
-		$this->processTv();
-		$this->processTvDB();
-		$this->processXXX();
-		$this->processBooks();
-	}
-
-	/**
-	 * Lookup anidb if enabled - always run before tvrage.
-	 *
-	 * @return void
-	 */
-	public function processAnime()
-	{
-		if ($this->site->lookupanidb != 0) {
-			(new \PostAniDB(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processAnimeReleases();
-		}
-	}
-
-	/**
-	 * Process books using amazon.com.
-	 *
-	 * @return void
-	 */
-	public function processBooks()
-	{
-		if ($this->site->lookupbooks != 0) {
-			(new \Books(['Echo' => $this->echooutput, 'Settings' => $this->pdo, ]))->processBookReleases();
-		}
-	}
-
-	/**
-	 * Lookup console games if enabled.
-	 *
-	 * @return void
-	 */
-	public function processConsoles()
-	{
-		if ($this->site->lookupgames != 0) {
-			(new \Konsole(['Settings' => $this->pdo, 'Echo' => $this->echooutput]))->processConsoleReleases();
-		}
-	}
-
-	/**
-	 * Lookup games if enabled.
-	 *
-	 * @return void
-	 */
-	public function processGames()
-	{
-		if ($this->site->lookupgames != 0) {
-			(new Games(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processGamesReleases();
-		}
-	}
-
-	/**
-	 * Lookup imdb if enabled.
-	 *
-	 * @param string     $groupID       (Optional) id of a group to work on.
-	 * @param string     $guidChar      (Optional) First letter of a release GUID to use to get work.
-	 * @param int|string $processMovies (Optional) 0 Don't process, 1 process all releases,
-	 *                                             2 process renamed releases only, '' check site setting
-	 *
-	 * @return void
-	 */
-	public function processMovies($groupID = '', $guidChar = '', $processMovies = '')
-	{
-		$processMovies = (is_numeric($processMovies) ? $processMovies : $this->site->lookupimdb);
-		if ($processMovies > 0) {
-			(new Film(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processMovieReleases($groupID, $guidChar, $processMovies);
-		}
-	}
-
-	/**
-	 * Lookup music if enabled.
-	 *
-	 * @return void
-	 */
-	public function processMusic()
-	{
-		if ($this->site->lookupmusic != 0) {
-			(new \Musik(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processMusicReleases();
-		}
-	}
-
-	/**
-	 * Process nfo files.
-	 *
-	 * @param NNTP   $nntp
-	 * @param string $groupID  (Optional) id of a group to work on.
-	 * @param string $guidChar (Optional) First letter of a release GUID to use to get work.
-	 *
-	 * @return void
-	 */
-	public function processNfos(&$nntp, $groupID = '', $guidChar = '')
-	{
-		if ($this->site->lookupnfo == 1) {
-			$this->Nfo->processNfoFiles($nntp, $groupID, $guidChar, (int)$this->site->lookupimdb, (int)$this->site->lookuptvrage);
-		}
-	}
-
-	/**
-	 * Process Global IDs
-	 */
-	public function processSpotnab(&$nntp)
-	{
-		$spotnab = new SpotNab();
-		$processed = $spotnab->processGID(500);
-		if ($processed > 0) {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->primary('Updating GID in releases table ' . $processed . ' release(s) updated')
-				);
-			}
-		}
-		$spotnab->auto_post_discovery();
-		$spotnab->fetch_discovery();
-		$spotnab->fetch();
-		$spotnab->post();
-		$spotnab->auto_clean();
-	}
-
-	/**
-	 * Process comments.
-	 *
-	 * @param NNTP $nntp
-	 */
-	public function processSharing(&$nntp)
-	{
-		(new Sharing())->start();
-	}
-
-	/**
-	 * Process all TV related releases which will assign their series/episode/rage data.
-	 *
-	 * @param string     $groupID   (Optional) id of a group to work on.
-	 * @param string     $guidChar  (Optional) First letter of a release GUID to use to get work.
-	 * @param string|int $processTV (Optional) 0 Don't process, 1 process all releases,
-	 *                                         2 process renamed releases only, '' check site setting
-	 *
-	 * @return void
-	 */
-	public function processTv($groupID = '', $guidChar = '', $processTV = '')
-	{
-		$processTV = (is_numeric($processTV) ? $processTV : $this->site->lookuptvrage);
-		if ($processTV > 0) {
-			(new TvAnger(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processTvReleases($groupID, $guidChar, $processTV);
-		}
-	}
-
-	public function processTvDB()
-	{
-		if ($this->site->lookupthetvdb == 1)
-		{
-			$thetvdb = new TheTVDB($this->echooutput);
-			$thetvdb->processReleases();
-		}
-	}
-
-	/**
-	 * Lookup xxx if enabled.
-	 */
-	public function processXXX()
-	{
-		if ($this->site->lookupxxx == 1) {
-			(new XXX(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processXXXReleases();
-		}
-	}
-
-	/**
-	 * Check for passworded releases, RAR/ZIP contents and Sample/Media info.
-	 *
-	 * @note Called externally by tmux/bin/update_per_group and update/postprocess.php
-	 *
-	 * @param NNTP       $nntp    Class NNTP
-	 * @param int|string $groupID  (Optional) id of a group to work on.
-	 * @param string     $guidChar (Optional) First char of release GUID, can be used to select work.
-	 *
-	 * @return void
-	 */
-	public function processAdditional(&$nntp, $groupID = '', $guidChar = '')
-	{
-		(new ProcessAdditional(['Echo' => $this->echooutput, 'NNTP' => $nntp, 'Settings' => $this->pdo, 'Groups' => $this->groups, 'NameFixer' => $this->nameFixer, 'Nfo' => $this->Nfo, 'ReleaseFiles' => $this->releaseFiles]))->start($groupID, $guidChar);
-	}
-
-	/**
-	 * Attempt to get a better name from a par2 file and categorize the release.
-	 *
-	 * @note Called from NZBContents.php
-	 *
-	 * @param string $messageID MessageID from NZB file.
-	 * @param int    $relID     id of the release.
-	 * @param int    $groupID   Group id of the release.
-	 * @param NNTP   $nntp      Class NNTP
-	 * @param int    $show      Only show result or apply iy.
-	 *
-	 * @return bool
-	 */
-	public function parsePAR2($messageID, $relID, $groupID, &$nntp, $show)
-	{
-		if ($messageID === '') {
-			return false;
-		}
-
-		$query = $this->pdo->queryOneRow(
-			sprintf('
-				SELECT id, groupid, categoryid, name, searchname, UNIX_TIMESTAMP(postdate) AS post_date, id AS releaseid
-				FROM releases
-				WHERE isrenamed = 0
-				AND id = %d',
-				$relID
-			)
-		);
-
-		if ($query === false) {
-			return false;
-		}
-
-		// Only get a new name if the category is OTHER.
-		$foundName = true;
-		if (!in_array(
-			(int)$query['categoryid'],
-			array(
-				Category::CAT_BOOK_OTHER,
-				Category::CAT_GAME_OTHER,
-				Category::CAT_MOVIE_OTHER,
-				Category::CAT_MUSIC_OTHER,
-				Category::CAT_PC_MOBILEOTHER,
-				Category::CAT_TV_OTHER,
-				Category::CAT_MISC_HASHED,
-				Category::CAT_XXX_OTHER,
-				Category::CAT_MISC_OTHER
-			)
-		)
-		) {
-			$foundName = false;
-		}
-
-		// Get the PAR2 file.
-		$par2 = $nntp->getMessages($this->groups->getByNameByID($groupID), $messageID, $this->alternateNNTP);
-		if ($nntp->isError($par2)) {
-			return false;
-		}
-
-		// Put the PAR2 into Par2Info, check if there's an error.
-		$this->_par2Info->setData($par2);
-		if ($this->_par2Info->error) {
-			return false;
-		}
-
-		// Get the file list from Par2Info.
-		$files = $this->_par2Info->getFileList();
-		if ($files !== false && count($files) > 0) {
-
-			$filesAdded = 0;
-
-			// Loop through the files.
-			foreach ($files as $file) {
-
-				if (!isset($file['name'])) {
-					continue;
-				}
-
-				// If we found a name and added 10 files, stop.
-				if ($foundName === true && $filesAdded > 10) {
-					break;
-				}
-
-				if ($this->addpar2) {
-					// Add to release files.
-					if ($filesAdded < 11 &&
-						$this->pdo->queryOneRow(
-							sprintf('
-								SELECT id
-								FROM releasefiles
-								WHERE releaseid = %d
-								AND name = %s',
-								$relID,
-								$this->pdo->escapeString($file['name'])
-							)
-						) === false
-					) {
-
-						// Try to add the files to the DB.
-						if ($this->releaseFiles->add($relID, $file['name'], $file['size'], $query['post_date'], 0)) {
-							$filesAdded++;
-						}
-					}
-				} else {
-					$filesAdded++;
-				}
-
-				// Try to get a new name.
-				if ($foundName === false) {
-					$query['textstring'] = $file['name'];
-					if ($this->nameFixer->checkName($query, 1, 'PAR2, ', 1, $show) === true) {
-						$foundName = true;
-					}
-				}
-			}
-
-			// If we found some files.
-			if ($filesAdded > 0) {
-				$this->debugging->log('PostProcess', 'parsePAR2', 'Added ' . $filesAdded . ' releasefiles from PAR2 for ' . $query['searchname'], \Logger::LOG_INFO);
-
-				// Update the file count with the new file count + old file count.
-				$this->pdo->queryExec(
-					sprintf('
-						UPDATE releases
-						SET rarinnerfilecount = rarinnerfilecount + %d
-						WHERE id = %d',
-						$filesAdded,
-						$relID
-					)
-				);
-			}
-			if ($foundName === true) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/lib/ProcessAdditional.php b/lib/ProcessAdditional.php
deleted file mode 100644
index 4037e2ff7..000000000
--- a/lib/ProcessAdditional.php
+++ /dev/null
@@ -1,2563 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/rarinfo/par2info.php");
-require_once(WWW_DIR . "/lib/rarinfo/archiveinfo.php");
-require_once(WWW_DIR . "/lib/rarinfo/zipinfo.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/releaseextra.php");
-require_once(WWW_DIR . "/lib/releasefiles.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . '/lib/nntp.php');
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/amazon.php");
-require_once(WWW_DIR . "/lib/genres.php");
-require_once(WWW_DIR . "/lib/anidb.php");
-require_once(WWW_DIR . "/lib/book.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/SphinxSearch.php");
-require_once("nzbcontents.php");
-require_once("namefixer.php");
-require_once("Info.php");
-require_once("prehash.php");
-require_once("Sharing.php");
-require_once("TraktTv.php");
-require_once("Film.php");
-require_once("TvAnger.php");
-require_once("Konsole.php");
-require_once("Enzebe.php");
-
-Class ProcessAdditional
-{
-	/**
-	 * How many compressed (rar/zip) files to check.
-	 * @int
-	 * @default 20
-	 */
-	const maxCompressedFilesToCheck = 20;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	protected $_echoDebug;
-
-	/**
-	 * Releases to work on.
-	 * @var Array
-	 */
-	protected $_releases;
-
-	/**
-	 * Count of releases to work on.
-	 * @var int
-	 */
-	protected $_totalReleases;
-
-	/**
-	 * Current release we are working on.
-	 * @var Array
-	 */
-	protected $_release;
-
-	/**
-	 * @var NZB
-	 */
-	protected $_nzb;
-
-	/**
-	 * List of files with sizes/etc contained in the NZB.
-	 * @var array
-	 */
-	protected $_nzbContents;
-
-	/**
-	 * @var Groups
-	 */
-	protected $_groups;
-
-	/**
-	 * @var Par2Info
-	 */
-	protected $_par2Info;
-
-	/**
-	 * @var ArchiveInfo
-	 */
-	protected $_archiveInfo;
-
-	/**
-	 * @var array|bool|string
-	 */
-	protected $_innerFileBlacklist;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	protected $_maxNestedLevels;
-
-	/**
-	 * @var array|bool|string
-	 */
-	protected $_7zipPath;
-
-	/**
-	 * @var array|bool|string
-	 */
-	protected $_unrarPath;
-
-	/**
-	 * @var bool
-	 */
-	protected $_hasGNUFile;
-
-	/**
-	 * @var string
-	 */
-	protected $_killString;
-
-	/**
-	 * @var bool|string
-	 */
-	protected $_showCLIReleaseID;
-
-	/**
-	 * @var int
-	 */
-	protected $_queryLimit;
-
-	/**
-	 * @var int
-	 */
-	protected $_segmentsToDownload;
-
-	/**
-	 * @var int
-	 */
-	protected $_maximumRarSegments;
-
-	/**
-	 * @var int
-	 */
-	protected $_maximumRarPasswordChecks;
-
-	/**
-	 * @var string
-	 */
-	protected $_maxSize;
-
-	/**
-	 * @var string
-	 */
-	protected $_minSize;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processSample;
-
-	/**
-	 * @var string
-	 */
-	protected $_audioSavePath;
-
-	/**
-	 * @var string
-	 */
-	protected $_supportFileRegex;
-
-	/**
-	 * @var bool
-	 */
-	protected $_echoCLI;
-
-	/**
-	 * @var NNTP
-	 */
-	protected $_nntp;
-
-	/**
-	 * @var ReleaseFiles
-	 */
-	protected $_releaseFiles;
-
-	/**
-	 * @var Categorize
-	 */
-	protected $_categorize;
-
-	/**
-	 * @var NameFixer
-	 */
-	protected $_nameFixer;
-
-	/**
-	 * @var ReleaseExtra
-	 */
-	protected $_releaseExtra;
-
-	/**
-	 * @var ReleaseImage
-	 */
-	protected $_releaseImage;
-
-	/**
-	 * @var Nfo
-	 */
-	protected $_nfo;
-
-	/**
-	 * @var bool
-	 */
-	protected $_extractUsingRarInfo;
-
-	/**
-	 * @var bool
-	 */
-	protected $_alternateNNTP;
-
-	/**
-	 * @var int
-	 */
-	protected $_ffMPEGDuration;
-
-	/**
-	 * @var bool
-	 */
-	protected $_addPAR2Files;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processVideo;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processJPGSample;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processAudioSample;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processMediaInfo;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processAudioInfo;
-
-	/**
-	 * @var bool
-	 */
-	protected $_processPasswords;
-
-	/**
-	 * @var string
-	 */
-	protected $_audioFileRegex;
-
-	/**
-	 * @var string
-	 */
-	protected $_ignoreBookRegex;
-
-	/**
-	 * @var string
-	 */
-	protected $_videoFileRegex;
-
-	/**
-	 * @param array $options Class instances / echo to cli.
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'         => false,
-			'Categorize'   => null,
-			'Groups'       => null,
-			'NameFixer'    => null,
-			'Nfo'          => null,
-			'NNTP'         => null,
-			'NZB'          => null,
-			'ReleaseExtra' => null,
-			'ReleaseFiles' => null,
-			'ReleaseImage' => null,
-			'Settings'     => null,
-			'SphinxSearch' => null,
-		];
-		$options += $defaults;
-
-		$this->_echoCLI = ($options['Echo'] && NN_ECHOCLI && (strtolower(PHP_SAPI) === 'cli'));
-		$this->_echoDebug = NN_DEBUG;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->_nntp = ($options['NNTP'] instanceof NNTP ? $options['NNTP'] : new NNTP(['Echo' => $this->_echoCLI, 'Settings' => $this->pdo]));
-
-		$this->_nzb = ($options['NZB'] instanceof Enzebe ? $options['NZB'] : new Enzebe($this->pdo));
-		$this->_groups = ($options['Groups'] instanceof Groups ? $options['Groups'] : new Groups(['Settings' => $this->pdo]));
-		$this->_archiveInfo = new ArchiveInfo();
-		$this->_releaseFiles = ($options['ReleaseFiles'] instanceof ReleaseFiles ? $options['ReleaseFiles'] : new ReleaseFiles($this->pdo));
-		$this->_categorize = ($options['Categorize'] instanceof Categorize ? $options['Categorize'] : new Categorize(['Settings' => $this->pdo]));
-		$this->_nameFixer = ($options['NameFixer'] instanceof NameFixer ? $options['NameFixer'] : new NameFixer(['Echo' =>$this->_echoCLI, 'Groups' => $this->_groups, 'Settings' => $this->pdo, 'Categorize' => $this->_categorize]));
-		$this->_releaseExtra = ($options['ReleaseExtra'] instanceof ReleaseExtra ? $options['ReleaseExtra'] : new ReleaseExtra($this->pdo));
-		$this->_releaseImage = ($options['ReleaseImage'] instanceof ReleaseImage ? $options['ReleaseImage'] : new ReleaseImage($this->pdo));
-		$this->_par2Info = new Par2Info();
-		$this->_nfo = ($options['Nfo'] instanceof Info ? $options['Nfo'] : new Info(['Echo' => $this->_echoCLI, 'Settings' => $this->pdo]));
-		$this->sphinx = ($options['SphinxSearch'] instanceof \SphinxSearch ? $options['SphinxSearch'] : new \SphinxSearch());
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->nnnzb = new NZB();
-
-		$this->_innerFileBlacklist = ($this->site->innerfileblacklist == '' ? false : $this->site->innerfileblacklist);
-		$this->_maxNestedLevels = ($this->site->maxnestedlevels == 0 ? 3 : $this->site->maxnestedlevels);
-		$this->_extractUsingRarInfo = ($this->site->extractusingrarinfo == 0 ? false : true);
-
-		$this->_7zipPath = false;
-		$this->_unrarPath = false;
-
-		// Pass the binary extractors to ArchiveInfo.
-		$clients = array();
-		if ($this->site->unrarpath != '') {
-			$clients += array(ArchiveInfo::TYPE_RAR => $this->site->unrarpath);
-			$this->_unrarPath = $this->site->unrarpath;
-		}
-		if ($this->site->zippath != '') {
-			$clients += array(ArchiveInfo::TYPE_ZIP => $this->site->zippath);
-			$this->_7zipPath = $this->site->zippath;
-		}
-		$this->_archiveInfo->setExternalClients($clients);
-
-		$this->_hasGNUFile = (Utility::hasCommand('file') === true ? true : false);
-
-		$this->_killString = '"';
-		if ($this->site->timeoutpath != '' && $this->site->timeoutseconds > 0) {
-			$this->_killString = (
-				'"' . $this->site->timeoutpath .
-				'" --foreground --signal=KILL ' .
-				$this->site->timeoutseconds . ' "'
-			);
-		}
-
-		$this->_showCLIReleaseID = (PHP_BINARY . ' ' . __DIR__ . DS .  'ProcessAdditional.php ReleaseID: ');
-
-		// Maximum amount of releases to fetch per run.
-		$this->_queryLimit =
-			($this->site->maxaddprocessed != '') ? (int)$this->site->maxaddprocessed : 25;
-
-		// Maximum message ID's to download per file type in the NZB (video, jpg, etc).
-		$this->_segmentsToDownload =
-			($this->site->segmentstodownload != '') ? (int)$this->site->segmentstodownload : 2;
-
-		// Maximum message ID's to download for a RAR file.
-		$this->_maximumRarSegments =
-			($this->site->maxpartsprocessed != '') ? (int)$this->site->maxpartsprocessed : 3;
-
-		// Maximum RAR files to check for a password before stopping.
-		$this->_maximumRarPasswordChecks =
-			($this->site->passchkattempts != '') ? (int)$this->site->passchkattempts : 1;
-
-		$this->_maximumRarPasswordChecks = ($this->_maximumRarPasswordChecks < 1 ? 1 : $this->_maximumRarPasswordChecks);
-
-		// Maximum size of releases in GB.
-		$this->_maxSize =
-			(string)($this->site->maxsizetopostprocess != '') ? $this->site->maxsizetopostprocess : 100;
-		$this->_maxSize = ($this->_maxSize === 0 ? '' : 'AND r.size < ' . ($this->_maxSize * 1073741824));
-
-		// Minimum size of releases in MB.
-		$this->_minSize =
-			(string)($this->site->minsizetopostprocess != '') ? $this->site->minsizetopostprocess : 1;
-		$this->_minSize = ($this->_minSize === 0 ? '' : 'AND r.size > ' . ($this->_minSize * 1048576));
-
-		// Use the alternate NNTP provider for downloading Message-ID's ?
-		$this->_alternateNNTP = ($this->site->alternate_nntp == 1 ? true : false);
-
-		$this->_ffMPEGDuration = ($this->site->ffmpeg_duration != '') ? (int)$this->site->ffmpeg_duration : 5;
-
-		$this->_addPAR2Files = ($this->site->addpar2 === '0') ? false : true;
-
-		$this->_processSample = ($this->site->ffmpegpath == '' ? false : true);
-		$this->_processVideo = ($this->site->processvideos == 0) ? false : true;
-		$this->_processJPGSample = ($this->site->processjpg == 0) ? false : true;
-		$this->_processAudioSample = ($this->site->saveaudiopreview == 0) ? false : true;
-		$this->_processMediaInfo = ($this->site->mediainfopath == '') ? false : true;
-		$this->_processAudioInfo = $this->_processMediaInfo;
-		$this->_processPasswords = (
-			((($this->site->checkpasswordedrar == 0) ? false : true)) &&
-			(($this->site->unrarpath == '') ? false : true)
-		);
-
-		$this->_audioSavePath = NN_COVERS . 'audiosample' . DS;
-
-		$this->_audioFileRegex = '\.(AAC|AIFF|APE|AC3|ASF|DTS|FLAC|MKA|MKS|MP2|MP3|RA|OGG|OGM|W64|WAV|WMA)';
-		$this->_ignoreBookRegex = '/\b(epub|lit|mobi|pdf|sipdf|html)\b.*\.rar(?!.{20,})/i';
-		$this->_supportFileRegex = '/\.(vol\d{1,3}\+\d{1,3}|par2|srs|sfv|nzb';
-		$this->_videoFileRegex = '\.(AVI|F4V|IFO|M1V|M2V|M4V|MKV|MOV|MP4|MPEG|MPG|MPGV|MPV|OGV|OGG|QT|RM|RMVB|TS|VOB|WMV)';
-	}
-
-	/**
-	 * Clear out the main temp path when done.
-	 */
-	public function __destruct()
-	{
-		$this->_clearMainTmpPath();
-	}
-
-	/**
-	 * Main method.
-	 *
-	 * @param int|string $groupID  (Optional) ID of a group to work on.
-	 * @param string     $guidChar (Optional) First char of release GUID, can be used to select work.
-	 *
-	 * @void
-	 */
-	public function start($groupID = '', $guidChar = '')
-	{
-		$this->_setMainTempPath($groupID, $guidChar);
-
-		// Fetch all the releases to work on.
-		$this->_fetchReleases($groupID, $guidChar);
-
-		// Check if we have releases to work on.
-		if ($this->_totalReleases > 0) {
-			// Echo start time and process description.
-			$this->_echoDescription();
-
-			$this->_processReleases();
-		}
-	}
-
-	/**
-	 * @var string Main temp path to work on.
-	 */
-	protected $_mainTmpPath;
-
-	/**
-	 * @var string Temp path for current release.
-	 */
-	protected $tmpPath;
-
-	/**
-	 * Set up the path to the folder we will work in.
-	 *
-	 * @param string|int $groupID
-	 * @param string     $guidChar
-	 *
-	 * @throws ProcessAdditionalException
-	 */
-	protected function _setMainTempPath(&$groupID = '', &$guidChar)
-	{
-		// Set up the temporary files folder location.
-		$this->_mainTmpPath = (string)$this->site->tmpunrarpath;
-
-		// Check if it ends with a dir separator.
-		if (!preg_match('/[\/\\\\]$/', $this->_mainTmpPath)) {
-			$this->_mainTmpPath .= DS;
-		}
-
-		// If we are doing per group, use the groupid has a inner path, so other scripts don't delete the files we are working on.
-		if ($groupID !== '') {
-			$this->_mainTmpPath .= ($groupID . DS);
-		} else if ($guidChar !== '') {
-			$this->_mainTmpPath .= ($guidChar . DS);
-		}
-
-		if (!is_dir($this->_mainTmpPath)) {
-			$old = umask(0777);
-			@mkdir($this->_mainTmpPath, 0777, true);
-			@chmod($this->_mainTmpPath, 0777);
-			@umask($old);
-		}
-
-		if (!is_dir($this->_mainTmpPath)) {
-			throw new ProcessAdditionalException('Could create the tmpunrar folder (' . $this->_mainTmpPath . ')');
-		}
-
-		$this->_clearMainTmpPath();
-
-		$this->tmpPath = $this->_mainTmpPath;
-	}
-
-	/**
-	 * Clear out old folders/files from the main temp folder.
-	 */
-	protected function _clearMainTmpPath()
-	{
-		if ($this->_mainTmpPath != '') {
-			$this->_recursivePathDelete(
-				$this->_mainTmpPath,
-				// These are folders we don't want to delete.
-				array(
-					// This is the actual temp folder.
-					$this->_mainTmpPath,
-					// This folder is used by misc/testing/Dev/rename_u4e.php
-					$this->_mainTmpPath . 'u4e'
-				)
-			);
-		}
-	}
-
-	/**
-	 * Get all releases that need to be processed.
-	 *
-	 * @param int|string $groupID
-	 * @param string     $guidChar
-	 *
-	 * @void
-	 */
-	protected function _fetchReleases($groupID, &$guidChar)
-	{
-		$this->_releases = $this->pdo->query(
-			sprintf(
-				'
-				SELECT r.id, r.guid, r.name, c.disablepreview, r.size, r.groupid, r.nfostatus, r.completion, r.categoryid, r.searchname, r.prehashid
-				FROM releases r
-				LEFT JOIN category c ON c.id = r.categoryid
-				WHERE r.nzbstatus = 1
-				%s %s %s %s
-				AND r.passwordstatus BETWEEN -6 AND -1
-				AND r.haspreview = -1
-				AND c.disablepreview = 0
-				ORDER BY r.passwordstatus ASC, r.postdate DESC
-				LIMIT %d',
-				$this->_maxSize,
-				$this->_minSize,
-				($groupID === '' ? '' : 'AND r.groupid = ' . $groupID),
-				($guidChar === '' ? '' : 'AND r.guid ' . $this->pdo->likeString($guidChar, false, true)),
-				$this->_queryLimit
-			)
-		);
-
-		if (is_array($this->_releases)) {
-			$this->_totalReleases = count($this->_releases);
-		} else {
-			$this->_releases = array();
-			$this->_totalReleases = 0;
-		}
-	}
-
-	/**
-	 * Output the description and start time.
-	 *
-	 * @void
-	 */
-	protected function _echoDescription()
-	{
-		if ($this->_totalReleases > 1 && $this->_echoCLI) {
-			$this->_echo(
-				PHP_EOL .
-				'Additional post-processing, started at: ' .
-				date('D M d, Y G:i a') .
-				PHP_EOL .
-				'Downloaded: (xB) = yEnc article, f= Failed ;Processing: z = ZIP file, r = RAR file' .
-				PHP_EOL .
-				'Added: s = Sample image, j = JPEG image, A = Audio sample, a = Audio MediaInfo, v = Video sample' .
-				PHP_EOL .
-				'Added: m = Video MediaInfo, n = NFO, ^ = File details from inside the RAR/ZIP'
-				, 'header');
-		}
-	}
-
-	/**
-	 * Loop through the releases, processing them 1 at a time.
-	 */
-	protected function _processReleases()
-	{
-		foreach ($this->_releases as $this->_release) {
-			$this->_echo(
-				PHP_EOL . '[' . $this->_release['id'] . '][' .
-				$this->_readableBytesString($this->_release['size']) . ']',
-				'primaryOver',
-				false
-			);
-
-			if ($this->_showCLIReleaseID) {
-				cli_set_process_title($this->_showCLIReleaseID . $this->_release['id']);
-			}
-
-			// Create folder to store temporary files.
-			if ($this->_createTempFolder() === false) {
-				continue;
-			}
-
-			// Get NZB contents.
-			if ($this->_getNZBContents() === false) {
-				continue;
-			}
-
-			// Reset the current release variables.
-			$this->_resetReleaseStatus();
-
-			// Go through the files in the NZB, get the amount of book files.
-			$totalBooks = $this->_processNZBContents();
-
-			// Check if this NZB is a large collection of books.
-			$bookFlood = false;
-			if ($totalBooks > 80 && ($totalBooks * 2) >= count($this->_nzbContents)) {
-				$bookFlood = true;
-			}
-
-			if ($this->_processPasswords === true ||
-				$this->_processSample === true ||
-				$this->_processMediaInfo === true ||
-				$this->_processAudioInfo === true ||
-				$this->_processVideo === true
-			) {
-
-				// Process usenet Message-ID downloads.
-				$this->_processMessageIDDownloads();
-
-				// Process compressed (RAR/ZIP) files inside the NZB.
-				if ($bookFlood === false && $this->_NZBHasCompressedFile) {
-					// Download the RARs/ZIPs, extract the files inside them and insert the file info into the DB.
-					$this->_processNZBCompressedFiles();
-
-					if ($this->_releaseHasPassword === false) {
-						// Process the extracted files to get video/audio samples/etc.
-						$this->_processExtractedFiles();
-					}
-				}
-			}
-
-			// Update the release to say we processed it.
-			$this->_finalizeRelease();
-
-			// Delete all files / folders for this release.
-			$this->_recursivePathDelete($this->tmpPath);
-		}
-		if ($this->_echoCLI) {
-			echo PHP_EOL;
-		}
-	}
-
-	/**
-	 * Deletes files and folders recursively.
-	 *
-	 * @param string $path           Path to a folder or file.
-	 * @param array  $ignoredFolders Array with paths to folders to ignore.
-	 *
-	 * @void
-	 * @access protected
-	 */
-	protected function _recursivePathDelete($path, $ignoredFolders = array())
-	{
-		if (is_dir($path)) {
-
-			$files = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
-
-			foreach ($files as $file) {
-				$this->_recursivePathDelete($file, $ignoredFolders);
-			}
-
-			if (in_array($path, $ignoredFolders)) {
-				return;
-			}
-
-			@rmdir($path);
-
-		} else if (is_file($path)) {
-			@unlink($path);
-		}
-	}
-
-	/**
-	 * Create a temporary storage folder for the current release.
-	 *
-	 * @return bool
-	 */
-	protected function _createTempFolder()
-	{
-		// Per release defaults.
-		$this->tmpPath = $this->_mainTmpPath . $this->_release['guid'] . DS;
-		if (!is_dir($this->tmpPath)) {
-			$old = umask(0777);
-			@mkdir($this->tmpPath, 0777, true);
-			@chmod($this->tmpPath, 0777);
-			@umask($old);
-
-			if (!is_dir($this->tmpPath)) {
-
-				$this->_echo('Unable to create directory: ' . $this->tmpPath, 'warning');
-				return $this->_decrementPasswordStatus();
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Get list of contents inside a release's NZB file.
-	 *
-	 * @return bool
-	 */
-	protected function _getNZBContents()
-	{
-		$nzbPath = $this->nnnzb->getNZBPath($this->_release['guid']);
-		if ($nzbPath === false) {
-
-			$this->_echo('NZB not found for GUID: ' . $this->_release['guid'], 'warning');
-			return $this->_decrementPasswordStatus();
-		}
-
-		$nzbContents = Utility::unzipGzipFile($nzbPath);
-		if (!$nzbContents) {
-			$this->_echo('NZB is empty or broken for GUID: ' . $this->_release['guid'], 'warning');
-			return $this->_decrementPasswordStatus();
-		}
-
-		// Get a list of files in the nzb.
-		$this->_nzbContents = $this->_nzb->nzbFileList($nzbContents);
-		if (count($this->_nzbContents) === 0) {
-
-			$this->_echo('NZB is potentially broken for GUID: ' . $this->_release['guid'], 'warning');
-			return $this->_decrementPasswordStatus();
-		}
-
-		// Sort the files inside the NZB.
-		usort($this->_nzbContents, ['ProcessAdditional', '_sortNZB']);
-
-		return true;
-	}
-
-	/**
-	 * Decrement password status for the current release.
-	 *
-	 * @param bool $return Return value.
-	 *
-	 * @return bool
-	 */
-	protected function _decrementPasswordStatus($return = false)
-	{
-		$this->pdo->queryExec(
-			sprintf(
-				'UPDATE releases SET passwordstatus = passwordstatus - 1 WHERE id = %d',
-				$this->_release['id']
-			)
-		);
-		return $return;
-	}
-
-	/**
-	 * Current file we are working on inside a NZB.
-	 * @var array
-	 */
-	protected $_currentNZBFile;
-
-	/**
-	 * Does the current NZB contain a compressed (RAR/ZIP) file?
-	 * @var bool
-	 */
-	protected $_NZBHasCompressedFile;
-
-	/**
-	 * Process the files inside the NZB, find Message-ID's to download.
-	 * If we find files with book extensions, return the amount.
-	 *
-	 * @return int
-	 */
-	protected function _processNZBContents()
-	{
-		$totalBookFiles = 0;
-		foreach ($this->_nzbContents as $this->_currentNZBFile) {
-
-			// Check if it's not a nfo, nzb, par2 etc...
-			if (preg_match($this->_supportFileRegex . '|nfo\b|inf\b|ofn\b)($|[ ")\]-])(?!.{20,})/i', $this->_currentNZBFile['title'])) {
-				continue;
-			}
-
-			// Check if it's a rar/zip.
-			if ($this->_NZBHasCompressedFile === false &&
-				preg_match(
-					'/\.(part0*1|part0+|r0+|r0*1|rar|0+|0*10?|zip)(\s*\.rar)*($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i',
-					$this->_currentNZBFile['title']
-				)
-			) {
-				$this->_NZBHasCompressedFile = true;
-			}
-
-			// Look for a video sample, make sure it's not an image.
-			if ($this->_processSample === true &&
-				empty($this->_sampleMessageIDs) &&
-				preg_match('/sample/i', $this->_currentNZBFile['title']) &&
-				!preg_match('/\.jpe?g/i', $this->_currentNZBFile['title'])
-			) {
-
-				if (isset($this->_currentNZBFile['segments'])) {
-					// Get the amount of segments for this file.
-					$segCount = (count($this->_currentNZBFile['segments']) - 1);
-					// If it's more than 1 try to get up to the site specified value of segments.
-					for ($i = 0; $i < $this->_segmentsToDownload; $i++) {
-						if ($i > $segCount) {
-							break;
-						}
-						$this->_sampleMessageIDs[] = (string)$this->_currentNZBFile['segments'][$i];
-					}
-				}
-			}
-
-			// Look for a JPG picture, make sure it's not a CD cover.
-			if ($this->_processJPGSample === true &&
-				empty($this->_JPGMessageIDs) &&
-				!preg_match('/flac|lossless|mp3|music|inner-sanctum|sound/i', $this->_releaseGroupName) &&
-				preg_match('/\.jpe?g[. ")\]]/i', $this->_currentNZBFile['title'])
-			) {
-
-				if (isset($this->_currentNZBFile['segments'])) {
-					// Get the amount of segments for this file.
-					$segCount = (count($this->_currentNZBFile['segments']) - 1);
-					// If it's more than 1 try to get up to the site specified value of segments.
-					for ($i = 0; $i < $this->_segmentsToDownload; $i++) {
-						if ($i > $segCount) {
-							break;
-						}
-						$this->_JPGMessageIDs[] = (string)$this->_currentNZBFile['segments'][$i];
-					}
-				}
-			}
-
-			// Look for a video file, make sure it's not a sample, for MediaInfo.
-			if ($this->_processMediaInfo === true &&
-				empty($this->_MediaInfoMessageIDs) &&
-				!preg_match('/sample/i', $this->_currentNZBFile['title']) &&
-				preg_match('/' . $this->_videoFileRegex . '[. ")\]]/i', $this->_currentNZBFile['title'])
-			) {
-
-				if (isset($this->_currentNZBFile['segments'][0])) {
-					$this->_MediaInfoMessageIDs = (string)$this->_currentNZBFile['segments'][0];
-				}
-			}
-
-			// Look for a audio file.
-			if ($this->_processAudioInfo === true &&
-				empty($this->_AudioInfoMessageIDs) &&
-				preg_match('/' . $this->_audioFileRegex . '[. ")\]]/i', $this->_currentNZBFile['title'], $type)
-			) {
-
-				if (isset($this->_currentNZBFile['segments'])) {
-					// Get the extension.
-					$this->_AudioInfoExtension = $type[1];
-					$this->_AudioInfoMessageIDs = (string)$this->_currentNZBFile['segments'][0];
-				}
-			}
-
-			// Some releases contain many books, increment this to ignore them later.
-			if (preg_match($this->_ignoreBookRegex, $this->_currentNZBFile['title'])) {
-				$totalBookFiles++;
-			}
-		}
-		return $totalBookFiles;
-	}
-
-	/**
-	 * Process the NZB contents, find RAR/ZIP files, download them and extract them.
-	 */
-	protected function _processNZBCompressedFiles()
-	{
-		$failed = $downloaded = 0;
-		// Loop through the files, attempt to find if password-ed and files. Starting with what not to process.
-		foreach ($this->_nzbContents as $nzbFile) {
-			if ($downloaded >= $this->_maximumRarSegments) {
-				break;
-			} else if ($failed >= $this->_maximumRarPasswordChecks) {
-				break;
-			}
-
-			if ($this->_releaseHasPassword === true) {
-				$this->_echo('Skipping processing of rar ' . $nzbFile['title'] . ' it has a password.', 'primaryOver', false);
-				break;
-			}
-
-			// Probably not a rar/zip.
-			if (!preg_match(
-				'/\.\b(part\d+|part00\.rar|part01\.rar|rar|r00|r01|zipr\d{2,3}|zip|zipx)($|[ ")\]-])|"[a-f0-9]{32}\.[1-9]\d{1,2}".*\(\d+\/\d{2,}\)$/i',
-				$nzbFile['title']
-			)
-			) {
-				continue;
-			}
-
-			// Get message-id's for the rar file.
-			$segCount = (count($nzbFile['segments']) - 1);
-			$mID = array();
-			for ($i = 0; $i < $this->_maximumRarSegments; $i++) {
-				if ($i > $segCount) {
-					break;
-				}
-				$mID[] = (string)$nzbFile['segments'][$i];
-			}
-
-			// Download the article(s) from usenet.
-			$fetchedBinary = $this->_nntp->getMessages($this->_releaseGroupName, $mID, $this->_alternateNNTP);
-			if ($this->_nntp->isError($fetchedBinary)) {
-				$fetchedBinary = false;
-			}
-
-			if ($fetchedBinary !== false) {
-
-				// Echo we downloaded compressed file.
-				if ($this->_echoCLI) {
-					$this->_echo('(cB)', 'primaryOver', false);
-				}
-
-				$downloaded++;
-
-				// Process the compressed file.
-				$decompressed = $this->_processCompressedData($fetchedBinary);
-
-				if ($decompressed === true || $this->_releaseHasPassword === true) {
-					break;
-				}
-
-			} else {
-				$failed++;
-				if ($this->_echoCLI) {
-					$this->_echo('f(' . $failed . ')', 'warningOver', false);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check if the data is a ZIP / RAR file, extract files, get file info.
-	 *
-	 * @param string $compressedData
-	 *
-	 * @return bool
-	 */
-	protected function _processCompressedData(&$compressedData)
-	{
-		$this->_compressedFilesChecked++;
-		// Give the data to archive info so it can check if it's a rar.
-		if ($this->_archiveInfo->setData($compressedData, true) === false) {
-			$this->_debug('Data is probably not RAR or ZIP.' . PHP_EOL);
-			return false;
-		}
-
-		// Check if there's an error.
-		if ($this->_archiveInfo->error !== '') {
-			$this->_debug('ArchiveInfo Error: ' . $this->_archiveInfo->error);
-			return false;
-		}
-
-		// Get a summary of the compressed file.
-		$dataSummary = $this->_archiveInfo->getSummary(true);
-
-		// Check if the compressed file is encrypted.
-		if (!empty($this->_archiveInfo->isEncrypted) || (isset($dataSummary['is_encrypted']) && $dataSummary['is_encrypted'] != 0)) {
-			$this->_debug('ArchiveInfo: Compressed file has a password.');
-			$this->_releaseHasPassword = true;
-			$this->_passwordStatus[] = Releases::PASSWD_RAR;
-			return false;
-		}
-
-		switch ($dataSummary['main_type']) {
-			case ArchiveInfo::TYPE_RAR:
-				if ($this->_echoCLI) {
-					$this->_echo('r', 'primaryOver', false);
-				}
-
-				if ($this->_extractUsingRarInfo === false && $this->_unrarPath !== false) {
-					$fileName = $this->tmpPath . uniqid() . '.rar';
-					file_put_contents($fileName, $compressedData);
-					runCmd(
-						$this->_killString . $this->_unrarPath .
-						'" e -ai -ep -c- -id -inul -kb -or -p- -r -y "' .
-						$fileName . '" "' . $this->tmpPath . 'unrar/"'
-					);
-					unlink($fileName);
-				}
-				break;
-			case ArchiveInfo::TYPE_ZIP:
-				if ($this->_echoCLI) {
-					$this->_echo('z', 'primaryOver', false);
-				}
-
-				if ($this->_extractUsingRarInfo === false && $this->_7zipPath !== false) {
-					$fileName = $this->tmpPath . uniqid() . '.zip';
-					file_put_contents($fileName, $compressedData);
-					runCmd(
-						$this->_killString . $this->_7zipPath . '" x "' .
-						$fileName . '" -bd -y -o"' . $this->tmpPath . 'unzip/"'
-					);
-					unlink($fileName);
-				}
-				break;
-			default:
-				return false;
-		}
-
-		return $this->_processCompressedFileList();
-	}
-
-	/**
-	 * Get a list of all files in the compressed file, add the file info to the DB.
-	 *
-	 * @return bool
-	 */
-	protected function _processCompressedFileList()
-	{
-		// Get a list of files inside the Compressed file.
-		$files = $this->_archiveInfo->getArchiveFileList();
-		if (!is_array($files) || count($files) === 0) {
-			return false;
-		}
-
-		// Loop through the files.
-		foreach ($files as $file) {
-
-			if ($this->_releaseHasPassword === true) {
-				break;
-			}
-
-			if (isset($file['name'])) {
-
-				if (isset($file['error'])) {
-					$this->_debug("Error: {$file['error']} (in: {$file['source']})");
-					continue;
-				}
-
-				if ($file['pass'] == true) {
-					$this->_releaseHasPassword = true;
-					$this->_passwordStatus[] = Releases::PASSWD_RAR;
-					break;
-				}
-
-				if ($this->_innerFileBlacklist !== false && preg_match($this->_innerFileBlacklist, $file['name'])) {
-					$this->_releaseHasPassword = true;
-					$this->_passwordStatus[] = Releases::PASSWD_POTENTIAL;
-					break;
-				}
-
-				$fileName = array();
-				if (preg_match('/[^\/\\\\]*\.[a-zA-Z0-9]*$/', $file['name'], $fileName)) {
-					$fileName = $fileName[0];
-				} else {
-					$fileName = '';
-				}
-
-				if ($this->_extractUsingRarInfo === true) {
-					// Extract files from the rar.
-					if (isset($file['compressed']) && $file['compressed'] == 0) {
-						@file_put_contents(
-							($this->tmpPath . mt_rand(10, 999999) . '_' . $fileName),
-							$this->_archiveInfo->getFileData($file['name'], $file['source'])
-						);
-					} // If the files are compressed, use a binary extractor.
-					else {
-						$this->_archiveInfo->extractFile($file['name'], $this->tmpPath . mt_rand(10, 999999) . '_' . $fileName);
-					}
-				}
-			}
-
-			$this->_addFileInfo($file);
-		}
-		return ($this->_totalFileInfo > 0 ? true : false);
-	}
-
-	/**
-	 * Add info from files within RAR/ZIP/PAR2/etc...
-	 *
-	 * @param array $file
-	 *
-	 * @void
-	 */
-	protected function _addFileInfo(&$file)
-	{
-		// Don't add rar/zip files to the DB.
-		if (!isset($file['error']) && isset($file['source']) &&
-			!preg_match($this->_supportFileRegex . '|part\d+|r\d{1,3}|zipr\d{2,3}|\d{2,3}|zipx|zip|rar)(\s*\.rar)?$/i', $file['name'])
-		) {
-
-			// Cache the amount of files we find in the RAR or ZIP, return this to say we did find RAR or ZIP content.
-			// This is so we don't download more RAR or ZIP files for no reason.
-			$this->_totalFileInfo++;
-
-			/* Check if we already have the file or not.
-			 * Also make sure we don't add too many files, some releases have 100's of files, like PS3 releases.
-			 */
-			if ($this->_addedFileInfo < 11 &&
-				$this->pdo->queryOneRow(
-					sprintf(
-						'
-						SELECT id FROM releasefiles
-						WHERE releaseid = %d
-						AND name = %s
-						AND size = %d',
-						$this->_release['id'], $this->pdo->escapeString($file['name']), $file['size']
-					)
-				) === false
-			) {
-
-				if ($this->_releaseFiles->add($this->_release['id'], $file['name'], $file['size'], $file['date'], $file['pass'])) {
-					$this->_addedFileInfo++;
-
-					if ($this->_echoCLI) {
-						$this->_echo('^', 'primaryOver', false);
-					}
-
-					// Check for "codec spam"
-					if (preg_match('/alt\.binaries\.movies($|\.divx$)/', $this->_releaseGroupName) &&
-						preg_match('/[\/\\\\]Codec[\/\\\\]Setup\.exe/i', $file['name'])
-					) {
-						$this->_debug('Codec spam found, setting release to potentially passworded.' . PHP_EOL);
-						$this->_releaseHasPassword = true;
-						$this->_passwordStatus[] = Releases::PASSWD_POTENTIAL;
-					} //Run a PreDB filename check on insert to try and match the release
-					else if (strpos($file['name'], '.') != 0 && strlen($file['name']) > 0) {
-						$this->_release['filename'] = $file['name'];
-						$this->_release['releaseid'] = $this->_release['id'];
-						$this->_nameFixer->matchPredbFiles($this->_release, 1, 1, true, 1);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Go through all the extracted files in the temp folder and process them.
-	 */
-	protected function _processExtractedFiles()
-	{
-		$nestedLevels = 0;
-
-		// Go through all the files in the temp folder, look for compressed files, extract them and the nested ones.
-		while ($nestedLevels < $this->_maxNestedLevels) {
-
-			// Break out if we checked more than x compressed files.
-			if ($this->_compressedFilesChecked >= self::maxCompressedFilesToCheck) {
-				break;
-			}
-
-			$foundCompressedFile = false;
-
-			// Get all the compressed files in the temp folder.
-			$files = $this->_getTempDirectoryContents('/.*\.([rz]\d{2,}|rar|zipx?|0{0,2}1)($|[^a-z0-9])/i');
-
-			if ($files instanceof Traversable) {
-				foreach ($files as $file) {
-
-					// Check if the file exists.
-					if (is_file($file[0])) {
-						$rarData = @file_get_contents($file[0]);
-						if ($rarData !== false) {
-							$this->_processCompressedData($rarData);
-							$foundCompressedFile = true;
-						}
-						@unlink($file[0]);
-					}
-				}
-			}
-
-			// If we found no compressed files, break out.
-			if ($foundCompressedFile === false) {
-				break;
-			}
-
-			$nestedLevels++;
-		}
-
-		$fileType = array();
-
-		// Get all the remaining files in the temp dir.
-		$files = $this->_getTempDirectoryContents();
-		if ($files instanceof Traversable) {
-
-			foreach ($files as $file) {
-				$file = (string)$file;
-
-				// Skip /. and /..
-				if (preg_match('/[\/\\\\]\.{1,2}$/', $file)) {
-					continue;
-				}
-
-				if (is_file($file)) {
-
-					// Process PAR2 files.
-					if ($this->_foundPAR2Info === false && preg_match('/\.par2$/', $file)) {
-						$this->_siftPAR2Info($file);
-					} // Process NFO files.
-					else if ($this->_releaseHasNoNFO === true && preg_match('/(\.(nfo|inf|ofn)|info\.txt)$/i', $file)) {
-						$this->_processNfoFile($file);
-					} // Process audio files.
-					else if (
-						($this->_foundAudioInfo === false ||
-							$this->_foundAudioSample === false) &&
-						preg_match('/(.*)' . $this->_audioFileRegex . '$/i', $file, $fileType)
-					) {
-						// Try to get audio sample/audio media info.
-						@rename($file, $this->tmpPath . 'audiofile.' . $fileType[2]);
-						$this->_getAudioInfo($this->tmpPath . 'audiofile.' . $fileType[2], $fileType[2]);
-						@unlink($this->tmpPath . 'audiofile.' . $fileType[2]);
-					} // Process JPG files.
-					else if ($this->_foundJPGSample === false && preg_match('/\.jpe?g$/i', $file)) {
-						$this->_getJPGSample($file);
-						@unlink($file);
-					} // Video sample // video clip // video media info.
-					else if (($this->_foundSample === false || $this->_foundVideo === false || $this->_foundMediaInfo === false) &&
-						preg_match('/(.*)' . $this->_videoFileRegex . '$/i', $file)
-					) {
-						$this->_processVideoFile($file);
-					} // Check if it's alt.binaries.u4e file.
-					else if (in_array($this->_releaseGroupName, ['alt.binaries.u4e', 'alt.binaries.mom']) &&
-						preg_match('/Linux_2rename\.sh/i', $file) &&
-						($this->_release['categoryid'] == \Category::CAT_MISC_HASHED || $this->_release['categoryid'] == \Category::CAT_MISC_OTHER)
-					) {
-						$this->_processU4ETitle($file);
-					}
-					// Check file's magic info.
-					else {
-						$output = Utility::fileInfo($file);
-						if (!empty($output)) {
-
-							switch (true) {
-
-								case ($this->_foundJPGSample === false && preg_match('/^JPE?G/i', $output[0])):
-									$this->_getJPGSample($file);
-									@unlink($file);
-									break;
-
-								case (
-									($this->_foundMediaInfo === false || $this->_foundSample === false || $this->_foundVideo === false)
-									&& preg_match('/Matroska data|MPEG v4|MPEG sequence, v2|\WAVI\W/i', $output[0])
-								):
-									$this->_processVideoFile($file);
-									break;
-
-								case (
-									($this->_foundAudioSample === false || $this->_foundAudioInfo === false) &&
-									preg_match('/^FLAC|layer III|Vorbis audio/i', $file, $fileType)
-								):
-									switch ($fileType[0]) {
-										case 'FLAC':
-											$fileType = 'FLAC';
-											break;
-										case 'layer III':
-											$fileType = 'MP3';
-											break;
-										case 'Vorbis audio':
-											$fileType = 'OGG';
-											break;
-									}
-									@rename($file, $this->tmpPath . 'audiofile.' . $fileType);
-									$this->_getAudioInfo($this->tmpPath . 'audiofile.' . $fileType, $fileType);
-									@unlink($this->tmpPath . 'audiofile.' . $fileType);
-									break;
-
-								case ($this->_foundPAR2Info === false && preg_match('/^Parity/i', $file)):
-									$this->_siftPAR2Info($file);
-									break;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Download all binaries from usenet and form samples / get media info / etc from them.
-	 *
-	 * @void
-	 */
-	protected function _processMessageIDDownloads()
-	{
-		$this->_processSampleMessageIDs();
-		$this->_processMediaInfoMessageIDs();
-		$this->_processAudioInfoMessageIDs();
-		$this->_processJPGMessageIDs();
-
-	}
-
-	/**
-	 * Download and process binaries for sample videos.
-	 *
-	 * @void
-	 * @access protected
-	 */
-	protected function _processSampleMessageIDs()
-	{
-		// Download and process sample image.
-		if ($this->_foundSample === false || $this->_foundVideo === false) {
-
-			if (!empty($this->_sampleMessageIDs)) {
-
-				// Download it from usenet.
-				$sampleBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_sampleMessageIDs, $this->_alternateNNTP);
-				if ($this->_nntp->isError($sampleBinary)) {
-					$sampleBinary = false;
-				}
-
-				if ($sampleBinary !== false) {
-					if ($this->_echoCLI) {
-						$this->_echo('(sB)', 'primaryOver', false);
-					}
-
-					// Check if it's more than 40 bytes.
-					if (strlen($sampleBinary) > 40) {
-
-						$fileLocation = $this->tmpPath . 'sample_' . mt_rand(0, 99999) . '.avi';
-						// Try to create the file.
-						@file_put_contents($fileLocation, $sampleBinary);
-
-						// Try to get a sample picture.
-						if ($this->_foundSample === false) {
-							$this->_foundSample = $this->_getSample($fileLocation);
-						}
-
-						// Try to get a sample video.
-						if ($this->_foundVideo === false) {
-							$this->_foundVideo = $this->_getVideo($fileLocation);
-						}
-
-						// Try to get media info. Don't get it here if $mediaMsgID is not empty.
-						// 2014-06-28 -> Commented out, since the media info of a sample video is not indicative of the actual release.si
-						/*if ($this->_foundMediaInfo === false && empty($mediaMsgID)) {
-							$this->_foundMediaInfo = $this->_getMediaInfo($fileLocation);
-						}*/
-
-					}
-				} else if ($this->_echoCLI) {
-					$this->_echo('f', 'warningOver', false);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Download and process binaries for media info from videos.
-	 *
-	 * @void
-	 * @access protected
-	 */
-	protected function _processMediaInfoMessageIDs()
-	{
-		// Download and process mediainfo. Also try to get a sample if we didn't get one yet.
-		if ($this->_foundMediaInfo === false || $this->_foundSample === false || $this->_foundVideo === false) {
-
-			if ($this->_foundMediaInfo === false && !empty($this->_MediaInfoMessageIDs)) {
-
-				// Try to download it from usenet.
-				$mediaBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_MediaInfoMessageIDs, $this->_alternateNNTP);
-				if ($this->_nntp->isError($mediaBinary)) {
-					// If error set it to false.
-					$mediaBinary = false;
-				}
-
-				if ($mediaBinary !== false) {
-
-					if ($this->_echoCLI) {
-						$this->_echo('(mB)', 'primaryOver', false);
-					}
-
-					// If it's more than 40 bytes...
-					if (strlen($mediaBinary) > 40) {
-
-						$fileLocation = $this->tmpPath . 'media.avi';
-						// Create a file on the disk with it.
-						@file_put_contents($fileLocation, $mediaBinary);
-
-						// Try to get media info.
-						if ($this->_foundMediaInfo === false) {
-							$this->_foundMediaInfo = $this->_getMediaInfo($fileLocation);
-						}
-
-						// Try to get a sample picture.
-						if ($this->_foundSample === false) {
-							$this->_foundSample = $this->_getSample($fileLocation);
-						}
-
-						// Try to get a sample video.
-						if ($this->_foundVideo === false) {
-							$this->_foundVideo = $this->_getVideo($fileLocation);
-						}
-					}
-				} else if ($this->_echoCLI) {
-					$this->_echo('f', 'warningOver', false);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Download and process binaries for media info from songs.
-	 *
-	 * @void
-	 * @access protected
-	 */
-	protected function _processAudioInfoMessageIDs()
-	{
-		// Download audio file, use media info to try to get the artist / album.
-		if (($this->_foundAudioInfo === false || $this->_foundAudioSample === false)) {
-
-			if (!empty($this->_AudioInfoMessageIDs)) {
-				// Try to download it from usenet.
-				$audioBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_AudioInfoMessageIDs, $this->_alternateNNTP);
-				if ($this->_nntp->isError($audioBinary)) {
-					$audioBinary = false;
-				}
-
-				if ($audioBinary !== false) {
-					if ($this->_echoCLI) {
-						$this->_echo('(aB)', 'primaryOver', false);
-					}
-
-					$fileLocation = $this->tmpPath . 'audio.' . $this->_AudioInfoExtension;
-					// Create a file with it.
-					@file_put_contents($fileLocation, $audioBinary);
-
-					// Try to get media info / sample of the audio file.
-					$this->_getAudioInfo($fileLocation, $this->_AudioInfoExtension);
-
-				} else if ($this->_echoCLI) {
-					$this->_echo('f', 'warningOver', false);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Download and process binaries for JPG pictures.
-	 *
-	 * @void
-	 * @access protected
-	 */
-	protected function _processJPGMessageIDs()
-	{
-		// Download JPG file.
-		if ($this->_foundJPGSample === false && !empty($this->_JPGMessageIDs)) {
-
-			// Try to download it.
-			$jpgBinary = $this->_nntp->getMessages($this->_releaseGroupName, $this->_JPGMessageIDs, $this->_alternateNNTP);
-			if ($this->_nntp->isError($jpgBinary)) {
-				$jpgBinary = false;
-			}
-
-			if ($jpgBinary !== false) {
-
-				if ($this->_echoCLI) {
-					$this->_echo('(jB)', 'primaryOver', false);
-				}
-
-				// Try to create a file with it.
-				@file_put_contents($this->tmpPath . 'samplepicture.jpg', $jpgBinary);
-
-				// Try to resize and move it.
-				$this->_foundJPGSample = (
-				$this->_releaseImage->saveImage(
-					$this->_release['guid'] . '_thumb', $this->tmpPath . 'samplepicture.jpg',
-					$this->_releaseImage->jpgSavePath, 650, 650
-				) === 1 ? true : false
-				);
-
-				if ($this->_foundJPGSample !== false) {
-					// Update the DB to say we got it.
-					$this->pdo->queryExec(
-						sprintf(
-							'
-							UPDATE releases
-							SET jpgstatus = %d
-							WHERE id = %d',
-							1,
-							$this->_release['id']
-						)
-					);
-
-					if ($this->_echoCLI) {
-						$this->_echo('j', 'primaryOver', false);
-					}
-				}
-
-				@unlink($this->tmpPath . 'samplepicture.jpg');
-
-			} else if ($this->_echoCLI) {
-				$this->_echo('f', 'warningOver', false);
-			}
-		}
-	}
-
-	/**
-	 * Update the release to say we processed it.
-	 */
-	protected function _finalizeRelease()
-	{
-		$vSQL = $jSQL = '';
-		$iSQL = ', haspreview = 0';
-
-		// If samples exist from previous runs, set flags.
-		if (is_file($this->_releaseImage->imgSavePath . $this->_release['guid'] . '_thumb.jpg')) {
-			$iSQL = ', haspreview = 1';
-		}
-
-		if (is_file($this->_releaseImage->vidSavePath . $this->_release['guid'] . '.ogg')) {
-			$vSQL = ', videostatus = 1';
-		}
-
-		if (is_file($this->_releaseImage->jpgSavePath . $this->_release['guid'] . '_thumb.jpg')) {
-			$jSQL = ', jpgstatus = 1';
-		}
-
-		// Get the amount of files we found inside the RAR/ZIP files.
-		$releaseFiles = $this->pdo->queryOneRow(
-			sprintf(
-				'
-				SELECT COUNT(releasefiles.releaseid) AS count,
-				SUM(releasefiles.size) AS size
-				FROM releasefiles
-				WHERE releaseid = %d',
-				$this->_release['id']
-			)
-		);
-
-		if ($releaseFiles === false) {
-			$releaseFiles['count'] = $releaseFiles['size'] = 0;
-		}
-
-		$this->_passwordStatus = max($this->_passwordStatus);
-
-		// Set the release to no password if password processing is off.
-		if ($this->_processPasswords === false) {
-			$this->_releaseHasPassword = false;
-		}
-
-		// If we failed to get anything from the RAR/ZIPs, decrement the passwordstatus, if the rar/zip has no password.
-		if ($this->_releaseHasPassword === false && $this->_NZBHasCompressedFile && $releaseFiles['count'] == 0) {
-			$query = sprintf(
-				'
-								UPDATE releases
-								SET passwordstatus = passwordstatus - 1, rarinnerfilecount = %d %s %s %s
-								WHERE id = %d',
-				$releaseFiles['count'],
-				$iSQL,
-				$vSQL,
-				$jSQL,
-				$this->_release['id']
-			);
-		} // Else update the release with the password status (if the admin enabled the setting).
-		else {
-			$query = sprintf(
-				'
-				UPDATE releases
-				SET passwordstatus = %d, rarinnerfilecount = %d %s %s %s
-				WHERE id = %d',
-				($this->_processPasswords === true ? $this->_passwordStatus : Releases::PASSWD_NONE),
-				$releaseFiles['count'],
-				$iSQL,
-				$vSQL,
-				$jSQL,
-				$this->_release['id']
-			);
-		}
-
-		$this->pdo->queryExec($query);
-	}
-
-	/**
-	 * Return array of files in the Temp Directory.
-	 * Optional, pass a regex to filter the files.
-	 *
-	 * @param string $pattern Regex, optional
-	 * @param string $path    Path to the folder (if empty, uses $this->tmpPath)
-	 *
-	 * @return Iterator Object|bool
-	 */
-	protected function _getTempDirectoryContents($pattern = '', $path = '')
-	{
-		if ($path === '') {
-			$path = $this->tmpPath;
-		}
-		try {
-			if ($pattern !== '') {
-				return new RegexIterator(
-					new RecursiveIteratorIterator(
-						new RecursiveDirectoryIterator($path)
-					),
-					$pattern,
-					RecursiveRegexIterator::GET_MATCH
-				);
-			} else {
-				return new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator($path)
-				);
-			}
-		} catch (exception $e) {
-			$this->_debug('ERROR: Could not open temp dir: ' . $e->getMessage() . PHP_EOL);
-			return false;
-		}
-	}
-
-	/**
-	 * Fetch MediaInfo and a OGG sample for a Audio file.
-	 *
-	 * @param string $fileLocation
-	 * @param string $fileExtension
-	 *
-	 * @return bool
-	 */
-	protected function _getAudioInfo($fileLocation, $fileExtension)
-	{
-		// Return values.
-		$retVal = $audVal = false;
-
-		// Check if audio sample fetching is on.
-		if ($this->_processAudioSample === false) {
-			$audVal = true;
-		}
-
-		// Check if media info fetching is on.
-		if ($this->_processAudioInfo === false) {
-			$retVal = true;
-		}
-
-		// Make sure the category is music or other.
-		$rQuery = $this->pdo->queryOneRow(
-			sprintf(
-				'SELECT searchname, categoryid AS id, groupid FROM releases WHERE proc_pp = 0 AND id = %d',
-				$this->_release['id']
-			)
-		);
-
-		$musicParent = (string)Category::CAT_PARENT_MUSIC;
-		if ($rQuery === false || !preg_match(
-				sprintf(
-					'/%d\d{3}|%d|%d|%d/',
-					$musicParent[0],
-					Category::CAT_MISC_OTHER,
-					Category::CAT_MOVIE_OTHER,
-					Category::CAT_TV_OTHER
-				),
-				$rQuery['id']
-			)
-		) {
-			return false;
-		}
-
-		if (is_file($fileLocation)) {
-
-			// Check if media info is enabled.
-			if ($retVal === false) {
-
-				// Get the media info for the file.
-				$xmlArray = runCmd(
-					$this->_killString . $this->site->mediainfopath . '" --Output=XML "' . $fileLocation . '"'
-				);
-				if (is_array($xmlArray)) {
-
-					// Convert to array.
-					$arrXml = objectsIntoArray(@simplexml_load_string(implode("\n", $xmlArray)));
-
-					if (isset($arrXml['File']['track'])) {
-
-						foreach ($arrXml['File']['track'] as $track) {
-
-							if (isset($track['Album']) && isset($track['Performer'])) {
-
-								if (NN_RENAME_MUSIC_MEDIAINFO && $this->_release['prehashid'] == 0) {
-									// Make the extension upper case.
-									$ext = strtoupper($fileExtension);
-
-									// Form a new search name.
-									if (!empty($track['Recorded_date']) && preg_match('/(?:19|20)\d\d/', $track['Recorded_date'], $Year)) {
-										$newName = $track['Performer'] . ' - ' . $track['Album'] . ' (' . $Year[0] . ') ' . $ext;
-									} else {
-										$newName = $track['Performer'] . ' - ' . $track['Album'] . ' ' . $ext;
-									}
-
-									// Get the category or try to determine it.
-									if ($ext === 'MP3') {
-										$newCat = Category::CAT_MUSIC_MP3;
-									} else if ($ext === 'FLAC') {
-										$newCat = Category::CAT_MUSIC_LOSSLESS;
-									} else {
-										$newCat = $this->_categorize->determineCategory($rQuery['groupid'],$newName);
-									}
-
-									$newTitle = $this->pdo->escapeString(substr($newName, 0, 255));
-									// Update the search name.
-									$this->pdo->queryExec(
-										sprintf(
-											'
-											UPDATE releases
-											SET searchname = %s, categoryid = %d, iscategorized = 1, isrenamed = 1, proc_pp = 1
-											WHERE id = %d',
-											$newTitle,
-											$newCat,
-											$this->_release['id']
-										)
-									);
-									$this->sphinx->updateReleaseSearchName($this->_release['id'], $newTitle);
-
-									// Echo the changed name.
-									if ($this->_echoCLI) {
-										NameFixer::echoChangedReleaseName(
-											array(
-												'new_name' => $newName,
-												'old_name' => $rQuery['searchname'],
-												'new_category' => $newCat,
-												'old_category' => $rQuery['id'],
-												'group' => $rQuery['groupid'],
-												'release_id' => $this->_release['id'],
-												'method' => 'ProcessAdditional->_getAudioInfo'
-											)
-										);
-									}
-								}
-
-								// Add the media info.
-								$this->_releaseExtra->addFromXml($this->_release['id'], $xmlArray);
-
-								$retVal = true;
-								$this->_foundAudioInfo = true;
-								if ($this->_echoCLI) {
-									$this->_echo('a', 'primaryOver', false);
-								}
-								break;
-							}
-						}
-					}
-				}
-			}
-
-			// Check if creating audio samples is enabled.
-			if ($audVal === false) {
-
-				// File name to store audio file.
-				$audioFileName = ($this->_release['guid'] . '.ogg');
-
-				// Create an audio sample.
-				runCmd(
-					$this->_killString .
-					$this->site->ffmpegpath .
-					'" -t 30 -i "' .
-					$fileLocation .
-					'" -acodec libvorbis -loglevel quiet -y "' .
-					$this->tmpPath . $audioFileName .
-					'"'
-				);
-
-				// Check if the new file was created.
-				if (is_file($this->tmpPath . $audioFileName)) {
-
-					// Try to move the temp audio file.
-					$renamed = rename($this->tmpPath . $audioFileName, $this->_audioSavePath . $audioFileName);
-
-					if (!$renamed) {
-						// Try to copy it if it fails.
-						$copied = copy($this->tmpPath . $audioFileName, $this->_audioSavePath . $audioFileName);
-
-						// Delete the old file.
-						unlink($this->tmpPath . $audioFileName);
-
-						// If it didn't copy continue.
-						if (!$copied) {
-							return false;
-						}
-					}
-
-					// Try to set the file perms.
-					@chmod($this->_audioSavePath . $audioFileName, 0764);
-
-					// Update DB to said we got a audio sample.
-					$this->pdo->queryExec(
-						sprintf(
-							'
-							UPDATE releases
-							SET audiostatus = 1
-							WHERE id = %d',
-							$this->_release['id']
-						)
-					);
-
-					$audVal = $this->_foundAudioSample = true;
-
-					if ($this->_echoCLI) {
-						$this->_echo('A', 'primaryOver', false);
-					}
-
-				}
-			}
-		}
-		return ($retVal && $audVal);
-	}
-
-	/**
-	 * Try to get JPG picture, resize it and store it on disk.
-	 *
-	 * @param string $fileLocation
-	 */
-	protected function _getJPGSample($fileLocation)
-	{
-		// Try to resize/move the image.
-		$this->_foundJPGSample = (
-		$this->_releaseImage->saveImage(
-			$this->_release['guid'] . '_thumb',
-			$fileLocation, $this->_releaseImage->jpgSavePath, 650, 650
-		) === 1 ? true : false
-		);
-
-		// If it's successful, tell the DB.
-		if ($this->_foundJPGSample !== false) {
-			$this->pdo->queryExec(
-				sprintf(
-					'
-					UPDATE releases
-					SET jpgstatus = %d
-					WHERE id = %d',
-					1,
-					$this->_release['id']
-				)
-			);
-		}
-	}
-
-	/**
-	 * Get accurate time from video segment.
-	 *
-	 * @param string $videoLocation
-	 *
-	 * @return string
-	 */
-	private function getVideoTime($videoLocation)
-	{
-		// Attempt to get the file extension as ffmpeg fails on some videos with the wrong extension, avconv however is fine.
-		if (preg_match('/(\.[a-zA-Z0-9]+)\s*$/', $videoLocation, $extension)) {
-			$extension = $extension[1];
-		} else {
-			$extension = '.avi';
-		}
-
-		$tmpVideo = ($this->tmpPath . uniqid() . $extension);
-		// Get the real duration of the file.
-		$time = runCmd(
-			$this->_killString .
-			$this->site->ffmpegpath .
-			'" -i "' . $videoLocation .
-			'" -vcodec copy -y 2>&1 "' .
-			$tmpVideo . '"',
-			false
-		);
-		@unlink($tmpVideo);
-
-		if (empty($time) || !preg_match('/time=(\d{1,2}:\d{1,2}:)?(\d{1,2})\.(\d{1,2})\s*bitrate=/i', implode(' ', $time), $numbers)) {
-			return '';
-		} else {
-			// Reduce the last number by 1, this is to make sure we don't ask avconv/ffmpeg for non existing data.
-			if ($numbers[3] > 0) {
-				$numbers[3] -= 1;
-			} else if ($numbers[1] > 0) {
-				$numbers[2] -= 1;
-				$numbers[3] = '99';
-			}
-			// Manually pad the numbers in case they are 1 number. to get 02 for example instead of 2.
-			return ('00:00:' . str_pad($numbers[2], 2, '0', STR_PAD_LEFT) . '.' . str_pad($numbers[3], 2, '0', STR_PAD_LEFT));
-		}
-	}
-
-	/**
-	 * Try to get a preview image from a video file.
-	 *
-	 * @param string $fileLocation
-	 *
-	 * @return bool
-	 */
-	protected function _getSample($fileLocation)
-	{
-		if (!$this->_processSample) {
-			return false;
-		}
-
-		if (is_file($fileLocation)) {
-
-			// Create path to temp file.
-			$fileName = ($this->tmpPath . 'zzzz' . mt_rand(5, 12) . mt_rand(5, 12) . '.jpg');
-
-			$time = $this->getVideoTime($fileLocation);
-
-			// Create the image.
-			runCmd(
-				$this->_killString .
-				$this->site->ffmpegpath .
-				'" -i "' .
-				$fileLocation .
-				'" -ss ' . ($time === '' ? '00:00:03.00' : $time)  .
-				' -vframes 1 -loglevel quiet -y "' .
-				$fileName .
-				'"'
-			);
-
-			// Check if the file exists.
-			if (is_file($fileName)) {
-
-				// Try to resize/move the image.
-				$saved = $this->_releaseImage->saveImage(
-					$this->_release['guid'] . '_thumb',
-					$fileName,
-					$this->_releaseImage->imgSavePath, 800, 600
-				);
-
-				// Delete the temp file we created.
-				@unlink($fileName);
-
-				// Check if it saved.
-				if ($saved === 1) {
-
-					if ($this->_echoCLI) {
-						$this->_echo('s', 'primaryOver', false);
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Try to get a preview video from a video file.
-	 *
-	 * @param string $fileLocation
-	 *
-	 * @return bool
-	 */
-	protected function _getVideo($fileLocation)
-	{
-		if (!$this->_processVideo) {
-			return false;
-		}
-
-		// Try to find an avi file.
-		if (is_file($fileLocation)) {
-
-			// Create a filename to store the temp file.
-			$fileName = ($this->tmpPath . 'zzzz' . $this->_release['guid'] . '.ogg');
-
-			$newMethod = false;
-			// If wanted sample length is less than 60, try to get sample from the end of the video.
-			if ($this->_ffMPEGDuration < 60) {
-				// Get the real duration of the file.
-				$time = $this->getVideoTime($fileLocation);
-
-				if ($time !== '' && preg_match('/(\d{2}).(\d{2})/', $time, $numbers)) {
-					$newMethod = true;
-
-					// Get the lowest time we can start making the video at based on how many seconds the admin wants the video to be.
-					if ($numbers[1] <= $this->_ffMPEGDuration) { // If the clip is shorter than the length we want.
-
-						// The lowest we want is 0.
-						$lowestLength = '00:00:00.00';
-
-					} else { // If the clip is longer than the length we want.
-
-						// The lowest we want is the the difference between the max video length and our wanted total time.
-						$lowestLength = ($numbers[1] - $this->_ffMPEGDuration);
-
-						// Form the time string.
-						$end = '.' . $numbers[2];
-						switch (strlen($lowestLength)) {
-							case 1:
-								$lowestLength = ('00:00:0' . (string)$lowestLength . $end);
-								break;
-							case 2:
-								$lowestLength = ('00:00:' . (string)$lowestLength . $end);
-								break;
-							default:
-								$lowestLength = '00:00:60.00';
-						}
-					}
-
-					// Try to get the sample (from the end instead of the start).
-					runCmd(
-						$this->_killString .
-						$this->site->ffmpegpath .
-						'" -i "' .
-						$fileLocation .
-						'" -ss ' . $lowestLength .
-						' -t ' . $this->_ffMPEGDuration .
-						' -vcodec libtheora -filter:v scale=320:-1 ' .
-						' -acodec libvorbis -loglevel quiet -y "' .
-						$fileName .
-						'"'
-					);
-				}
-			}
-
-			if ($newMethod === false) {
-				// If longer than 60 or we could not get the video length, run the old way.
-				runCmd(
-					$this->_killString .
-					$this->site->ffmpegpath .
-					'" -i "' .
-					$fileLocation .
-					'" -vcodec libtheora -filter:v scale=320:-1 -t ' .
-					$this->_ffMPEGDuration .
-					' -acodec libvorbis -loglevel quiet -y "' .
-					$fileName .
-					'"'
-				);
-			}
-
-			// Until we find the video file.
-			if (is_file($fileName)) {
-
-				// Create a path to where the file should be moved.
-				$newFile = ($this->_releaseImage->vidSavePath . $this->_release['guid'] . '.ogg');
-
-				// Try to move the file to the new path.
-				$renamed = @rename($fileName, $newFile);
-
-				// If we couldn't rename it, try to copy it.
-				if (!$renamed) {
-
-					$copied = @copy($fileName, $newFile);
-
-					// Delete the old file.
-					@unlink($fileName);
-
-					// If it didn't copy, continue.
-					if (!$copied) {
-						return false;
-					}
-				}
-
-				// Change the permissions.
-				@chmod($newFile, 0764);
-
-				// Update query to say we got the video.
-				$this->pdo->queryExec(
-					sprintf(
-						'
-						UPDATE releases
-						SET videostatus = 1
-						WHERE guid = %s',
-						$this->pdo->escapeString($this->_release['guid'])
-					)
-				);
-				if ($this->_echoCLI) {
-					$this->_echo('v', 'primaryOver', false);
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Try to get media info xml from a video file.
-	 *
-	 * @param string $fileLocation
-	 *
-	 * @return bool
-	 */
-	protected function _getMediaInfo($fileLocation)
-	{
-		if (!$this->_processMediaInfo) {
-			return false;
-		}
-
-		// Look for the video file.
-		if (is_file($fileLocation)) {
-
-			// Run media info on it.
-			$xmlArray =runCmd(
-				$this->_killString . $this->site->mediainfopath . '" --Output=XML "' . $fileLocation . '"'
-			);
-
-			// Check if we got it.
-			if (is_array($xmlArray)) {
-
-				// Convert it to string.
-				$xmlArray = implode("\n", $xmlArray);
-
-				if (!preg_match('/<track type="(Audio|Video)">/i', $xmlArray)) {
-					return false;
-				}
-
-				// Insert it into the DB.
-				$this->_releaseExtra->addFull($this->_release['id'], $xmlArray);
-				$this->_releaseExtra->addFromXml($this->_release['id'], $xmlArray);
-
-				if ($this->_echoCLI) {
-					$this->_echo('m', 'primaryOver', false);
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get file info from inside PAR2, store it in DB, attempt to get a release name.
-	 *
-	 * @param string $fileLocation
-	 */
-	protected function _siftPAR2Info($fileLocation)
-	{
-		$this->_par2Info->open($fileLocation);
-
-		if ($this->_par2Info->error) {
-			return;
-		}
-
-		$releaseInfo = $this->pdo->queryOneRow(
-			sprintf(
-				'
-				SELECT UNIX_TIMESTAMP(postdate) AS postdate, proc_pp
-				FROM releases
-				WHERE id = %d',
-				$this->_release['id']
-			)
-		);
-
-		if ($releaseInfo === false) {
-			return;
-		}
-
-		// Only get a new name if the category is OTHER.
-		$foundName = true;
-		if (NN_RENAME_PAR2 &&
-			$releaseInfo['proc_pp'] == 0 &&
-			in_array(
-				((int)$this->_release['categoryid']),
-				array(
-					Category::CAT_BOOK_OTHER,
-					Category::CAT_GAME_OTHER,
-					Category::CAT_MOVIE_OTHER,
-					Category::CAT_MUSIC_OTHER,
-					Category::CAT_PC_MOBILEOTHER,
-					Category::CAT_TV_OTHER,
-					Category::CAT_MISC_HASHED,
-					Category::CAT_XXX_OTHER,
-					Category::CAT_MISC_OTHER
-				)
-			)
-		) {
-			$foundName = false;
-		}
-
-		$filesAdded = 0;
-
-		$files = $this->_par2Info->getFileList();
-		foreach ($files as $file) {
-
-			if (!isset($file['name'])) {
-				continue;
-			}
-
-			// If we found a name and added 10 files, stop.
-			if ($foundName === true && $filesAdded > 10) {
-				break;
-			}
-
-			// Add to release files.
-			if ($this->_addPAR2Files) {
-				if ($filesAdded < 11 &&
-					$this->pdo->queryOneRow(
-						sprintf(
-							'SELECT id FROM releasefiles WHERE releaseid = %d AND name = %s',
-							$this->_release['id'], $this->pdo->escapeString($file['name'])
-						)
-					) === false
-				) {
-
-					// Try to add the files to the DB.
-					if ($this->_releaseFiles->add($this->_release['id'], $file['name'], $file['size'], $releaseInfo['postdate'], 0)) {
-						$filesAdded++;
-					}
-				}
-			} else {
-				$filesAdded++;
-			}
-
-			// Try to get a new name.
-			if ($foundName === false) {
-				$this->_release['textstring'] = $file['name'];
-				$this->_release['releaseid'] = $this->_release['id'];
-				if ($this->_nameFixer->checkName($this->_release, ($this->_echoCLI ? 1 : 0), 'PAR2, ', 1, 1) === true) {
-					$foundName = true;
-				}
-			}
-		}
-		// Update the file count with the new file count + old file count.
-		$this->pdo->queryExec(
-			sprintf(
-				'UPDATE releases SET rarinnerfilecount = rarinnerfilecount + %d WHERE id = %d',
-				$filesAdded,
-				$this->_release['id']
-			)
-		);
-		$this->_foundPAR2Info = true;
-	}
-
-	/**
-	 * Verify a file is a NFO and add it to the database.
-	 *
-	 * @param string $fileLocation
-	 */
-	protected function _processNfoFile($fileLocation)
-	{
-		$data = @file_get_contents($fileLocation);
-		if ($data !== false) {
-			if ($this->_nfo->isNFO($data, $this->_release['guid']) === true) {
-				if ($this->_nfo->addAlternateNfo($data, $this->_release, $this->_nntp) === true) {
-					$this->_releaseHasNoNFO = false;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Process a video file for a preview image/video and mediainfo.
-	 *
-	 * @param string $fileLocation
-	 */
-	protected function _processVideoFile($fileLocation)
-	{
-		// Try to get a sample with it.
-		if ($this->_foundSample === false) {
-			$this->_foundSample = $this->_getSample($fileLocation);
-		}
-
-		/* Try to get a video with it.
-		 * Don't get it here if _sampleMessageIDs is empty
-		 * or has 1 message-id (Saves downloading another part).
-		 */
-		if ($this->_foundVideo === false && count($this->_sampleMessageIDs) < 2) {
-			$this->_foundVideo = $this->_getVideo($fileLocation);
-		}
-
-		// Try to get media info with it.
-		if ($this->_foundMediaInfo === false) {
-			$this->_foundMediaInfo = $this->_getMediaInfo($fileLocation);
-		}
-	}
-
-	/**
-	 * Try to get a title from a Linux_2rename.sh file for alt.binaries.u4e group.
-	 *
-	 * @param $fileLocation
-	 */
-	protected function _processU4ETitle($fileLocation)
-	{
-		// Open the file for reading.
-		$handle = @fopen($fileLocation, 'r');
-		// Check if it failed.
-		if ($handle) {
-			// Loop over the file line by line.
-			while (($buffer = fgets($handle, 16384)) !== false) {
-				// Check if we find the word
-				if (stripos($buffer, 'mkdir') !== false) {
-
-					// Get a new name.
-					$newName = trim(str_replace('mkdir ', '', $buffer));
-
-					// Check if it's a empty string or not.
-					if (empty($newName)) {
-						continue;
-					}
-
-					// Get a new category id.
-					$newCategory = $this->_categorize->determineCategory($this->_release['groupid'], $newName);
-
-					$newTitle = $this->pdo->escapeString(substr($newName, 0, 255));
-					// Update the release with the data.
-					$this->pdo->queryExec(
-						sprintf(
-							'
-							UPDATE releases
-							SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL,
-								tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL,
-								consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL, prehashid = 0,
-								searchname = %s, isrenamed = 1, iscategorized = 1, proc_files = 1, categoryid = %d
-							WHERE id = %d',
-							$newTitle,
-							$newCategory,
-							$this->_release['id']
-						)
-					);
-					$this->sphinx->updateReleaseSearchName($this->_release['id'], $newTitle);
-
-					// Echo the changed name to CLI.
-					if ($this->_echoCLI) {
-						NameFixer::echoChangedReleaseName(
-							array(
-								'new_name' => $newName,
-								'old_name' => $this->_release['searchname'],
-								'new_category' => $newCategory,
-								'old_category' => $this->_release['categoryid'],
-								'group' => $this->_release['groupid'],
-								'release_id' => $this->_release['id'],
-								'method' => 'ProcessAdditional->_processU4ETitle'
-							)
-						);
-					}
-
-					// Break out of the loop.
-					break;
-				}
-			}
-			// Close the file.
-			fclose($handle);
-		}
-		// Delete the file.
-		@unlink($fileLocation);
-	}
-
-	/**
-	 * Convert bytes to KB/MB/GB/TB and return in human readable format.
-	 *
-	 * @example 240640 would return 235KB
-	 *
-	 * @param int $bytes
-	 *
-	 * @return string
-	 */
-	protected function _readableBytesString($bytes)
-	{
-		$kb = 1024;
-		$mb = 1048576;
-		$gb = 1073741824;
-		$tb = $kb * $gb;
-		if ($bytes < $kb) {
-			return $bytes . 'B';
-		} else if ($bytes < $mb) {
-			return round($bytes / $kb, 1) . 'KB';
-		} else if ($bytes < $gb) {
-			return round($bytes / $mb, 1) . 'MB';
-		} else if ($bytes < $tb) {
-			return round($bytes / $gb, 1) . 'GB';
-		} else {
-			return round($bytes / $tb, 1) . 'TB';
-		}
-	}
-
-	/**
-	 * Comparison function for uSort, for sorting NZB files.
-	 *
-	 * @param array $a
-	 * @param array $b
-	 *
-	 * @return int
-	 */
-	protected function _sortNZB($a, $b)
-	{
-		$pos = 0;
-		$af = $bf = false;
-		$a = preg_replace('/\d+[- ._]?(\/|\||[o0]f)[- ._]?\d+?(?![- ._]\d)/i', ' ', $a['title']);
-		$b = preg_replace('/\d+[- ._]?(\/|\||[o0]f)[- ._]?\d+?(?![- ._]\d)/i', ' ', $b['title']);
-
-		if (preg_match('/\.(part\d+|r\d+)(\s*\.rar)*($|[ ")\]-])/i', $a)) {
-			$af = true;
-		}
-		if (preg_match('/\.(part\d+|r\d+)(\s*\.rar)*($|[ ")\]-])/i', $b)) {
-			$bf = true;
-		}
-
-		if (!$af && preg_match('/\.rar($|[ ")\]-])/i', $a)) {
-			$a = preg_replace('/\.rar(?:$|[ ")\]-])/i', '.*rar', $a);
-			$af = true;
-		}
-		if (!$bf && preg_match('/\.rar($|[ ")\]-])/i', $b)) {
-			$b = preg_replace('/\.rar(?:$|[ ")\]-])/i', '.*rar', $b);
-			$bf = true;
-		}
-
-		if (!$af && !$bf) {
-			return strnatcasecmp($a, $b);
-		} else if (!$bf) {
-			return -1;
-		} else if (!$af) {
-			return 1;
-		}
-
-		if ($af && $bf) {
-			return strnatcasecmp($a, $b);
-		} else if ($af) {
-			return -1;
-		} else if ($bf) {
-			return 1;
-		}
-
-		return $pos;
-	}
-
-	/**
-	 * Have we created a video file for the current release?
-	 * @var bool
-	 */
-	protected $_foundVideo;
-
-	/**
-	 * Have we found MediaInfo data for a Video for the current release?
-	 * @var bool
-	 */
-	protected $_foundMediaInfo;
-
-	/**
-	 * Have we found MediaInfo data for a Audio file for the current release?
-	 * @var bool
-	 */
-	protected $_foundAudioInfo;
-
-	/**
-	 * Have we created a short Audio file sample for the current release?
-	 * @var bool
-	 */
-	protected $_foundAudioSample;
-
-	/**
-	 * Extension of the found audio file (MP3/FLAC/etc).
-	 * @var string
-	 */
-	protected $_AudioInfoExtension;
-
-	/**
-	 * Have we downloaded a JPG file for the current release?
-	 * @var bool
-	 */
-	protected $_foundJPGSample;
-
-	/**
-	 * Have we created a Video JPG image sample for the current release?
-	 * @var bool
-	 */
-	protected $_foundSample;
-
-	/**
-	 * Have we found PAR2 info on this release?
-	 * @var bool
-	 */
-	protected $_foundPAR2Info;
-
-	/**
-	 * Message ID's for found content to download.
-	 * @var array
-	 */
-	protected $_sampleMessageIDs;
-	protected $_JPGMessageIDs;
-	protected $_MediaInfoMessageIDs;
-	protected $_AudioInfoMessageIDs;
-	protected $_RARFileMessageIDs;
-
-	/**
-	 * Password status of the current release.
-	 * @var array
-	 */
-	protected $_passwordStatus;
-
-	/**
-	 * Does the current release have a password?
-	 * @var bool
-	 */
-	protected $_releaseHasPassword;
-
-	/**
-	 * Does the current release have an NFO file?
-	 * @var bool
-	 */
-	protected $_releaseHasNoNFO;
-
-	/**
-	 * Name of the current release's usenet group.
-	 * @var string
-	 */
-	protected $_releaseGroupName;
-
-	/**
-	 * Number of file information added to DB (from rar/zip/par2 contents).
-	 * @var int
-	 */
-	protected $_addedFileInfo;
-
-	/**
-	 * Number of file information we found from RAR/ZIP.
-	 * (if some of it was already in DB, this count goes up, while the count above does not)
-	 * @var int
-	 */
-	protected $_totalFileInfo;
-
-	/**
-	 * How many compressed (rar/zip) files have we checked.
-	 * @var int
-	 */
-	protected $_compressedFilesChecked;
-
-	/**
-	 * Reset some variables for the current release.
-	 */
-	protected function _resetReleaseStatus()
-	{
-		// Only process for samples, previews and images if not disabled.
-		$this->_foundVideo = ($this->_processVideo ? false : true);
-		$this->_foundMediaInfo = ($this->_processMediaInfo ? false : true);
-		$this->_foundAudioInfo = ($this->_processAudioInfo ? false : true);
-		$this->_foundAudioSample = ($this->_processAudioSample ? false : true);
-		$this->_foundJPGSample = ($this->_processJPGSample ? false : true);
-		$this->_foundSample = ($this->_processSample ? false : true);
-		$this->_foundSample = (($this->_release['disablepreview'] == 1) ? true : false);
-		$this->_foundPAR2Info = false;
-
-		$this->_passwordStatus = array(Releases::PASSWD_NONE);
-		$this->_releaseHasPassword = false;
-
-		$this->_releaseGroupName = $this->_groups->getByNameByID($this->_release['groupid']);
-
-		$this->_releaseHasNoNFO = false;
-		// Make sure we don't already have an nfo.
-		if ($this->_release['nfostatus'] != 1) {
-			$this->_releaseHasNoNFO = true;
-		}
-
-		$this->_NZBHasCompressedFile = false;
-
-		$this->_sampleMessageIDs = $this->_JPGMessageIDs = $this->_MediaInfoMessageIDs = array();
-		$this->_AudioInfoMessageIDs = $this->_RARFileMessageIDs = array();
-		$this->_AudioInfoExtension = '';
-
-		$this->_addedFileInfo = 0;
-		$this->_totalFileInfo = 0;
-		$this->_compressedFilesChecked = 0;
-	}
-
-	/**
-	 * Echo a string to CLI.
-	 *
-	 * @param string $string  String to echo.
-	 * @param string $type    Method type.
-	 * @param bool   $newLine Print a new line at the end of the string.
-	 *
-	 * @void
-	 */
-	protected function _echo($string, $type, $newLine = true)
-	{
-		if ($this->_echoCLI) {
-			$this->pdo->log->doEcho($this->pdo->log->$type($string), $newLine);
-		}
-	}
-
-	/**
-	 * Echo a string to CLI. For debugging.
-	 *
-	 * @param string $string
-	 * @param bool   $newline
-	 *
-	 * @void
-	 */
-	protected function _debug($string, $newline = true)
-	{
-		if ($this->_echoDebug) {
-			$this->_echo('DEBUG: ' . $string, 'debug', $newline);
-		}
-	}
-}
-
-class ProcessAdditionalException extends Exception { }
\ No newline at end of file
diff --git a/lib/ReleaseCleaner.php b/lib/ReleaseCleaner.php
deleted file mode 100644
index a4efa07bf..000000000
--- a/lib/ReleaseCleaner.php
+++ /dev/null
@@ -1,8317 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR."lib/groups.php");
-require_once("prehash.php");
-/*
- * Cleans names for releases/imports/namefixer.
- * Names of group functions should match between CollectionsCleaning and this file
- */
-
-
-class ReleaseCleaning
-{
-	/**
-	 * Used for matching endings in article subjects.
-	 * @const
-	 * @string
-	 */
-	const REGEX_END = '[- ]{0,3}yEnc$/u';
-
-	/**
-	 * Used for matching file extension endings in article subjects.
-	 * @const
-	 * @string
-	 */
-	const REGEX_FILE_EXTENSIONS = '([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|")';
-
-	/**
-	 * Used for matching size strings in article subjects.
-	 * @example ' - 365.15 KB - '
-	 * @const
-	 * @string
-	 */
-	const REGEX_SUBJECT_SIZE = '[- ]{0,3}\d+([.,]\d+)? [kKmMgG][bB][- ]{0,3}';
-	/**
-	 * @var string
-	 */
-	public $e0;
-
-	/**
-	 * @var string
-	 */
-	public $e1;
-
-	/**
-	 * @var string
-	 */
-	public $e2;
-
-	/**
-	 * @var string
-	 */
-	public $fromName = '';
-
-	/**
-	 * @var string
-	 */
-	public $groupName = '';
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var string
-	 */
-	public $size = '';
-
-	/**
-	 * @var string
-	 */
-	public $subject = '';
-
-	/**
-	 * @param DB $settings
-	 */
-	public function __construct($settings = null)
-	{
-		// Extensions.
-		$this->e0  = self::REGEX_FILE_EXTENSIONS;
-		$this->e1  = self::REGEX_FILE_EXTENSIONS . self::REGEX_END;
-		$this->e2  = self::REGEX_FILE_EXTENSIONS .
-			self::REGEX_SUBJECT_SIZE . self::REGEX_END;
-		$this->pdo = ($settings instanceof DB ? $settings : new DB());
-	}
-
-	public function releaseCleaner($subject, $fromName, $groupName, $usepre = false)
-	{
-		$match           = $matches = array();
-		$this->groupName = $groupName;
-		$this->subject   = $subject;
-		$this->fromName  = $fromName;
-		// Get pre style name from releases.name
-		if (preg_match_all('/([\w\(\)]+[\s\._-]([\w\(\)]+[\s\._-])+[\w\(\)]+-\w+)/',
-			$this->subject,
-			$matches)) {
-			foreach ($matches as $match) {
-				foreach ($match as $val) {
-					$title = $this->pdo->queryOneRow("SELECT title, id from prehash WHERE title = " .
-						$this->pdo->escapeString(trim($val)));
-					// don't match against ab.teevee if title is for just the season
-					if ($this->groupName == 'alt.binaries.teevee' and preg_match('/\.S\d\d\./', $title['title'], $match)) {
-						$title = false;
-					}
-					if ($title !== false) {
-						return array(
-							"cleansubject"  => $title['title'],
-							"properlynamed" => true,
-							"increment"     => false,
-							"predb"         => $title['id'],
-							"requestid"     => false
-						);
-					}
-				}
-			}
-		}
-		// Get pre style name from requestid
-		if (preg_match('/^\[ ?(\d{4,6}) ?\]/', $this->subject, $match) ||
-			preg_match('/^REQ\s*(\d{4,6})/i', $this->subject, $match) ||
-			preg_match('/^(\d{4,6})-\d{1}\[/', $this->subject, $match) ||
-			preg_match('/(\d{4,6}) -/', $this->subject, $match)
-		) {
-			$title = $this->pdo->queryOneRow(
-				sprintf(
-					'SELECT p.title , p.id from prehash p INNER JOIN groups g on g.id = p.groupid WHERE p.requestid = %d and g.name = %s',
-					$match[1],
-					$this->pdo->escapeString($this->groupName)
-				)
-			);
-			//check for prehash title matches against other groups where it matches relative size / fromname
-			//known crossposted requests only atm
-			$reqGname = '';
-			switch ($this->groupName) {
-				case 'alt.binaries.etc':
-					if ($this->fromName === 'kingofpr0n (brian@iamking.ws)') {
-						$reqGname = 'alt.binaries.teevee';
-					}
-					break;
-				case 'alt.binaries.mom':
-					if ($this->fromName === 'Yenc@power-post.org (Yenc-PP-A&A)' ||
-						$this->fromName === 'yEncBin@Poster.com (yEncBin)'
-					) {
-						$reqGname = 'alt.binaries.moovee';
-					}
-					break;
-				case 'alt.binaries.hdtv.x264':
-					if ($this->fromName === 'moovee@4u.tv (moovee)') {
-						$reqGname = 'alt.binaries.moovee';
-					}
-					break;
-			}
-			if ($title === false && !empty($reqGname)) {
-				$title = $this->pdo->queryOneRow(
-					sprintf(
-						"SELECT p.title as title, p.id as id from prehash p INNER JOIN groups g on g.id = p.groupid
-								WHERE p.requestid = %d and g.name = %s",
-						$match[1],
-						$this->pdo->escapeString($reqGname)
-					)
-				);
-			}
-			// don't match against ab.teevee if title is for just the season
-			if ($this->groupName == 'alt.binaries.teevee' and preg_match('/\.S\d\d\./', $title['title'], $match)) {
-				$title = false;
-			}
-			if ($title !== false) {
-				return array(
-					"cleansubject"  => $title['title'],
-					"properlynamed" => true,
-					"increment"     => false,
-					"predb"         => $title['id'],
-					"requestid"     => true
-				);
-			}
-		}
-		if ($usepre === true) {
-			return false;
-		}
-		//if www.town.ag releases check against generic_town regexes
-		if (preg_match('/www\.town\.ag/i', $this->subject)) {
-			return $this->generic_town();
-		}
-		switch ($groupName) {
-			case 'alt.binaries.0day.stuffz':
-				return $this->_0daystuffz();
-			case 'alt.binaries.3d':
-				return $this->_3d();
-			case 'alt.binaries.amazing':
-				return $this->amazing();
-			case 'alt.binaries.anime':
-				return $this->anime();
-			case 'alt.binaries.ath':
-				return $this->ath();
-			case 'alt.binaries.audio.warez':
-				return $this->audio_warez();
-			case 'alt.binaries.b4e':
-				return $this->b4e();
-			case 'alt.binaries.barbarella':
-				return $this->barbarella();
-			case 'alt.binaries.big':
-				return $this->big();
-			case 'alt.binaries.bloaf':
-				return $this->bloaf();
-			case 'alt.binaries.blu-ray':
-				return $this->blu_ray();
-			case 'alt.binaries.boneless':
-				return $this->boneless();
-			case 'alt.binaries.british.drama':
-				return $this->british_drama();
-			case 'alt.binaries.bungabunga':
-				return $this->bungabunga();
-			case 'alt.binaries.cavebox':
-				return $this->cavebox();
-			case 'alt.binaries.cats':
-				return $this->cats();
-			case 'alt.binaries.cbt':
-				return $this->cbt();
-			case 'alt.binaries.cbts':
-				return $this->cbts();
-			case 'alt.binaries.cd.image':
-				return $this->cd_image();
-			case 'alt.binaries.cd.lossless':
-				return $this->cd_lossless();
-			case 'alt.binaries.chello':
-				return $this->chello();
-			case 'alt.binaries.classic.tv.shows':
-				return $this->classic_tv_shows();
-			case 'alt.binaries.comics':
-				return $this->comics();
-			case 'alt.binaries.comics.dcp':
-				return $this->comics_dcp();
-			case 'alt.binaries.comp':
-				return $this->comp();
-			case 'alt.binaries.cores':
-				return $this->cores();
-			case 'alt.binaries.console.ps3':
-				return $this->console_ps3();
-			case 'alt.binaries.dc':
-				return $this->dc();
-			case 'alt.binaries.divx.french':
-				return $this->divx_french();
-			case 'alt.binaries.documentaries':
-				return $this->documentaries();
-			case 'alt.binaries.dvd':
-				return $this->dvd();
-			case 'alt.binaries.dvd.movies':
-				return $this->dvd_movies();
-			case 'alt.binaries.dvdr':
-				return $this->dvdr();
-			case 'alt.binaries.dvd-german':
-				return $this->dvd_german();
-			case 'alt.binaries.dvd-r':
-				return $this->dvd_r();
-			case 'alt.binaries.ebook':
-				return $this->ebook();
-			case 'alt.binaries.e-book':
-				return $this->e_book();
-			case 'alt.binaries.e-book.flood':
-				return $this->e_book_flood();
-			case 'alt.binaries.e-book.german':
-				return $this->e_book_german();
-			case 'alt.binaries.e-book.magazines':
-				return $this->ebook_magazines();
-			case 'alt.binaries.e-book.technical':
-				return $this->ebook_technical();
-			case 'alt.binaries.e-book.rpg':
-				return $this->e_book_rpg();
-			case 'alt.binaries.erotica':
-				return $this->erotica();
-			case 'alt.binaries.erotica.divx':
-				return $this->erotica_divx();
-			case 'alt.binaries.etc':
-				return $this->etc();
-			case 'alt.binaries.ftn':
-				return $this->ftn();
-			case 'alt.binaries.frogs':
-				return $this->frogs();
-			case 'alt.binaries.fz':
-				return $this->fz();
-			case 'alt.binaries.game':
-				return $this->game();
-			case 'alt.binaries.games':
-				return $this->games();
-			case 'alt.binaries.games.dox':
-				return $this->games_dox();
-			case 'alt.binaries.games.xbox360':
-				return $this->games_xbox360();
-			case 'alt.binaries.german.movies':
-				return $this->german_movies();
-			case 'alt.binaries.ghosts':
-				return $this->ghosts();
-			case 'alt.binaries.hdtv':
-				return $this->hdtv();
-			case 'alt.binaries.hdtv.x264':
-				return $this->hdtv_x264();
-			case 'alt.binaries.highspeed':
-				return $this->highspeed();
-			case 'alt.binaries.inner-sanctum':
-				return $this->inner_sanctum();
-			case 'alt.binaries.kenpsx':
-				return $this->kenpsx();
-			case 'alt.binaries.mojo':
-				return $this->mojo();
-			case 'alt.binaries.mom':
-				return $this->mom();
-			case 'alt.binaries.moovee':
-				return $this->moovee();
-			case 'alt.binaries.movies':
-				return $this->movies();
-			case 'alt.binaries.movies.divx':
-				return $this->movies_divx();
-			case 'alt.binaries.movies.x264':
-				return $this->movies_x264();
-			case 'alt.binaries.mp3':
-				return $this->mp3();
-			case 'alt.binaries.mp3.complete_cd':
-				return $this->mp3_complete_cd();
-			case 'alt.binaries.mp3.full_albums':
-				return $this->mp3_full_albums();
-			case 'alt.binaries.multimedia':
-				return $this->multimedia();
-			case 'alt.binaries.multimedia.anime':
-				return $this->multimedia_anime();
-			case 'alt.binaries.multimedia.anime.highspeed':
-				return $this->multimedia_anime_highspeed();
-			case 'alt.binaries.multimedia.documentaries':
-				return $this->multimedia_documentaries();
-			case 'alt.binaries.multimedia.scifi':
-				return $this->multimedia_scifi();
-			case 'alt.binaries.music':
-				return $this->music();
-			case 'alt.binaries.music.mp3':
-				return $this->music_mp3();
-			case 'alt.binaries.multimedia.vintage-film.pre-1960':
-				return $this->multimedia_vintage_film_pre_1960();
-			case 'alt.binaries.nl':
-				return $this->nl();
-			case 'alt.binaries.pictures.erotica.anime':
-				return $this->pictures_erotica_anime();
-			case 'alt.binaries.ps3':
-				return $this->ps3();
-			case 'alt.binaries.series.tv.french':
-				return $this->series_tv_french();
-			case 'alt.binaries.sony.psp':
-				return $this->sony_psp();
-			case 'alt.binaries.sound.mp3':
-				return $this->sound_mp3();
-			case 'alt.binaries.sound.mp3.complete_cd':
-				return $this->sound_mp3_complete_cd();
-			case 'alt.binaries.sounds.flac':
-				return $this->sounds_flac();
-			case 'alt.binaries.sounds.lossless':
-				return $this->sounds_lossless();
-			case 'alt.binaries.sounds.mp3':
-				return $this->sounds_mp3();
-			case 'alt.binaries.sounds.mp3.complete_cd':
-				return $this->sounds_mp3_complete_cd();
-			case 'alt.binaries.sounds.mp3.dance':
-				return $this->sounds_mp3_dance();
-			case 'alt.binaries.sounds.mp3.electronic':
-				return $this->sounds_mp3_electronic();
-			case 'alt.binaries.teevee':
-				return $this->teevee();
-			case 'alt.binaries.test':
-				return $this->test();
-			case 'alt.binaries.town':
-				return $this->town();
-			case 'alt.binaries.town.cine':
-				return $this->town_cine();
-			case 'alt.binaries.town.xxx':
-				return $this->town_xxx();
-			case 'alt.binaries.tun':
-				return $this->tun();
-			case 'alt.binaries.tv':
-				return $this->tv();
-			case 'alt.binaries.tvseries':
-				return $this->tvseries();
-			case 'alt.binaries.games.wii':
-				return $this->games_wii();
-			case 'alt.binaries.tv.deutsch':
-				return $this->tv_deutsch();
-			case 'alt.binaries.u4e':
-				return $this->u4e();
-			case 'alt.binaries.u-4all':
-				return $this->u_4all();
-			case 'alt.binaries.usenetrevolution':
-				return $this->usenetrevolution();
-			case 'alt.binaries.warez':
-				return $this->warez();
-			case 'alt.binaries.warez.0-day':
-				return $this->warez_0_day();
-			case 'alt.binaries.wii':
-				return $this->wii();
-			case 'alt.binaries.wii.gamez':
-				return $this->wii_gamez();
-			case 'alt.binaries.worms':
-				return $this->worms();
-			case 'alt.binaries.x':
-				return $this->x();
-			case 'alt.binaries.x264':
-				return $this->x264();
-			case 'alt.binaries.xbox360':
-				return $this->xbox360();
-			case 'dk.binaer.tv':
-				return $this->dk_tv();
-			default:
-				return $this->generic();
-		}
-	}
-
-	public function _0daystuffz()
-	{
-		//ArcSoft.TotalMedia.Theatre.v5.0.1.87-Lz0 - [08/35] - "ArcSoft.TotalMedia.Theatre.v5.0.1.87-Lz0.vol43+09.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?) - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //rld-tcavu1 [5/6] - "rld-tcavu1.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(DVD Shrink.ss) [1/1] - "DVD Shrink.ss.rar" yEnc
-		if (preg_match('/^\((.+?)\) \[\d+(\/\d+] - ").+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //WinASO.Registry.Optimizer.4.8.0.0(1/4) - "WinASO_RO_v4.8.0.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?)\(\d+\/\d+\) - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function _3d()
-	{
-		//(084/113) "The Little Mermaid - 3D HSBS (1989) 1080p BluRay - Multi - P3n6u1n.part082.rar" - 10.56 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"pandas.3d.back.to.the.wild.h-sbs.fs-3d.r22" - 1.55 GB - yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function amazing()
-	{
-		//(???) [1/1] - "Asimov, Isaac - [Foundation 01] - De Foundation_v2.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Ass Backwards (2013) WEBrip XviD AC3 (english subs)) [18/35] - "Ass Backwards (2013) WEBrip XviD AC3 (english subs).part17.rar" yEnc
-		if (preg_match('/^\([\w!.,&_ ()\[\]\'\`-]{8,}\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Angels4Always) [1/1] - "Vermeulen, John - De tweelingparadox.rar" yEnc
-		if (preg_match('/^\(Angels4Always\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Heaven_en_Fayth Presenteren Diana Gabaldon - Reiziger Cyclus 01 - De Reiziger[0/3] - "Diana Gabaldon - Reiziger Cyclus 01 - De Reiziger.nzb" yEnc
-		if (preg_match('/^[\w!.,&_ ()\[\]\'\`-]{8,}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //www.wolfsteamers.info [1/6] - "Wohnen Bauen Leben - Sommer 2014.par2" - 16,46 MB yEnc
-		if (preg_match('/^www\.wolfsteamers\.info[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //096XZFUPQ0PxH4441H14fU8V - [34/99] - "096XZFUPQ0PxH4441H14fU8V.part033.rar" yEnc
-		if (preg_match('/^\w+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //05VANmA80DckBho "05VANmA80DckBho.part07.rar"08/94 yEnc
-		if (preg_match('/^\w+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'\d+(\/\d+)[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Slaapkop post voor http://the-ultimate-force.org.ua/) [0/7] - "Wham - I'm Your Man (1985).nzb" yEnc
-		if (preg_match('/^\(.+the-ultimate-force\.org\.ua\/\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(001/101) - P2H - "L62WD8P4U539A7.par2" - 4,66 GB - Z9F6KN7SXRCY845 yEnc
-		if (preg_match('/^\(\d+\/\d+\) - P2H - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+([.,]\d+)? [kKmMgG][bB][-_\s]{0,3}\w+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(001/101)  "654258ItB1418pBRDNS264159.par2" - 9,74 GB - yEnc
-		//(001/105) - Description - "oH291TB0bPxf3lqm1P7QQ.par2" - 4,56 GB - yEnc
-		//(03/43) - FTTEAM.INFO - "JDSJ2J4ENASJCKR-FTTEAM.INFO.part02.rar" - 2,04 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)([-_ ]{0,4}(Description|FTTEAM\.INFO))?[-_ ]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //- - [001/242] - "C65JuogI92CwfMo2TiX59.par2" yEnc
-		if (preg_match('/^[-_ .]{0,4}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- "5nivJ7V6Q2jqAR34bZ8m.part46.rar" yEnc
-		if (preg_match('/^[-_ .]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- "7UAF6LE2PDM38NB.par2" - 8,53 GB - yEnc
-		if (preg_match('/^[-_ .]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- [01/10] - "file.xyz" yEnc - [001/107] - "86u1Qr8mm56jGiW7nUPTM.par2" yEnc
-		if (preg_match('/^[-_ ]{0,4}\[\d+\/\d+\][-_\s]{0,3}".+" yEnc[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function anime()
-	{
-		//([AST] One Piece Episode 301-350 [720p]) [007/340] - "One Piece episode 301-350.part006.rar" yEnc
-		if (preg_match('/^\((\[.+?\] .+?)\) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[REPOST][ New Doraemon 2013.05.03 Episode 328 (TV Asahi) 1080i HDTV MPEG2 AAC-DoraClub.org ] [35/61] - "doraclub.org-doraemon-20130503-b8de1f8e.r32" yEnc
-		if (preg_match('/^\[.+?\]\[ (.+?) \] \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[De.us] Suzumiya Haruhi no Shoushitsu (1920x1080 h.264 Dual-Audio FLAC 10-bit) [017CB24D] [000/357] - "[De.us] Suzumiya Haruhi no Shoushitsu (1920x1080 h.264 Dual-Audio FLAC 10-bit) [017CB24D].nzb" yEnc
-		if (preg_match('/^\[.+?\] (.+?) \[[A-F0-9]+\] \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[eraser] Ghost in the Shell ARISE - border_1 Ghost Pain (BD 720p Hi444PP LC-AAC Stereo) - [01/65] - "[eraser] Ghost in the Shell ARISE - border_1 Ghost Pain (BD 720p Hi444PP LC-AAC Stereo) .md5" yEnc
-		if (preg_match('/^\[.+?\] (.+?) - \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(01/27) - Maid.Sama.Jap.dubbed.german.english.subbed - "01 Misaki ist eine Maid!.divx" - 6,44 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - (.+?) - ".+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ New Doraemon 2013.06.14 Episode 334 (TV Asahi) 1080i HDTV MPEG2 AAC-DoraClub.org ] [01/60] - "doraclub.org-doraemon-20130614-fae28cec.nfo" yEnc
-		if (preg_match('/^\[ (.+?) \] \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Overman King Gainer [Dual audio, EngSub] Exiled Destiny - [002/149] - "Overman King Gainer.part001.rar" yEnc
-		if (preg_match('/^(.+? \[Dual [aA]udio, EngSub\] .+?) - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ TOWN ]-[ www.town.ag ]-[ partner of www.ssl-news.info ]-[ ANIME ] [3/5] - "[HorribleSubs] Ai-Mai-Mi - Mousou Catastrophie - 04 [480p].part2.rar" - 26,44 MB yEnc
-		if (preg_match('/^.+?-\[\s*ANIME\s*\] \[\d+\/\d+\] - "(.*)" - \d+[,.]\d+ [mMkKgG][bB][\s]*yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ath()
-	{
-		//[3/3 Karel Gott - Die Biene Maja Original MP3 Karel Gott - Die Biene Maja Original MP3.mp3.vol0+1.PAR2" yEnc
-		if (preg_match('/^\[\d+\/\d+ ([a-zA-Z0-9]+ .+?)\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //8b33bf5960714efbe6cfcf13dd0f618f - (01/55) - "8b33bf5960714efbe6cfcf13dd0f618f.par2" yEnc
-		if (preg_match('/^([a-f0-9]{32}) - \(\d+\/\d+\) - "[a-f0-9]{32}\..+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //::: Usejunkies.tk ::: - [01/11] - "DJ Shog - DNA - HD 720p.par2" - 47,76 MB yEnc
-		if (preg_match('/^.+Usejunkies.tk.+ \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Uploader.Presents-Mutter.und.Sohn.German.2013.DVDRiP.x264-XFi[01/27]"xf-mutterusohn.nfo" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+)[\(\[]\d+\/\d+[\)\]]".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<->http://you-need-all.tk<-> - [28/32] - "Dirty Minded Wife Advent Vol 40 JAV Uncensored DVDRip x264-APX.vol007+08.par2" yEnc
-		if (preg_match('/^.+http:\/\/you-need-all\.tk.+\[\d+\/\d+\][\s-_]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[02/21] - "Staendig Feucht.part01.rar" - 493.38 MB ....::::UR-powered by SecretUsenet.com::::.... yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' - \d+[.,]\d+ [kKmMgG][bB] .+? yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //>>> usenet4ever.info <<<+>>> secretusenet.com <<< "Weltnaturerbe USA Grand Canyon Nationalpark 2012 3D Blu-ray untouched  - DarKneSS.part039.rar" - DarKneSS yEnc
-		if (preg_match('/^>+ .+?\.info [<>+]+ .+?\.com <+ "(.+?)\s+- .*?' . $this->e0 .
-			' - .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //nmlsrgnb - [04/37] - "htwlngmrstdsntdnh.part03.rar" yEnc
-		if (preg_match('/^([a-z]+) - \[\d+\/\d+\] - "[a-z]+\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>>>>>Hell-of-Usenet>>>>> - [01/33] - "Cassadaga Hier lebt der Teufel 2011 German AC3 DVDRip XViD iNTERNAL-VhV.par2" yEnc
-		if (preg_match('/^>+Hell-of-Usenet(\.org)?>+( -)? \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '( - \d+[.,]\d+ [kKmMgG][bB])? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //1dbo1u5ce6182436yb2eo (001/105) "1dbo1u5ce6182436yb2eo.par2" yEnc
-		if (preg_match('/^([a-z0-9]{10,}) \(\d+\/\d+\) "[a-z0-9]{10,}\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<>>>kosova-shqip.eu<<< Deep SWG - 90s Club Megamix 2011 >>>kosova-shqip.eu<<<<<< - (2/4) - "Deep SWG - 90s Club Megamix 2011.rar" yEnc
-		if (preg_match('/^<<<>>>kosova-shqip\.eu<<< (.+?) >>>kosova-shqip.eu<<<<<< - \(\d+\/\d+\) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<Have Fun> "Invader.German.2012.PAL.DVDR-MORTAL.nfo" SpongeBoZZ yEnc
-		if (preg_match('/^<Have Fun> "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' SpongeBoZZ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . $match[2];
-		} //Old Dad uppt Taffe Mädels XivD LD HDTV Rip oben Kleine Einblendug German 01/43] - "Taffe Mädels.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?\s{2,}|Old Dad uppt\s+)(.+?) \d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(????) Rom.S02E09.Deus.Impeditio.Esuritori.Nullus Rom.S02E09.Deus.Impeditio.Esuritori.Nullus.avi.vol007+08.PAR2" yEnc
-		if (preg_match('/^\(\?+\) (.+) .+?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})" yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"27MZ4CXQ3AN86D95KVHB.part06.rar" - 21,61 GB - yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"2EACM94X65NHZ37.par2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //A7Soft ExamXML v4.37.rar  yEnc
-		if (preg_match('/^([^.]{8,})([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[- ]{0,3}yEnc$/u',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function audiobooks()
-	{
-		//WEB Griffin - [06/26] - "The Outlaws-Part06.mp3" yEnc
-		//Re: WEB Griffin - [18/26] - "The Outlaws.par2" yEnc
-		if (preg_match('/^(Re: )?([\w\s]+) - \[\d+\/\d+\] - "(.+)[\.-]([Pp]art|vol|jpg|sfv|mp3|nzb|nfo|rar).*" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2] . ", " . $match[3];
-		}
-		//WEB Griffin - [06/26] - "The Outlaws-Part06.mp3" yEnc
-		//Re: WEB Griffin - [18/26] - "The Outlaws.par2" yEnc
-		if (preg_match('/^(Re: )?([\w\s]+) - \[\d+\/\d+\] - "(.+)[\.-]([Pp]ar2).*" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2] . ", " . $match[3];
-		} //[05/13] - "Into the Fire-Part03.mp3" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "(.+)-Part\d+\..+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[Repost - Original Damaged]  [35/86] - "Mark Twain - Personal Recollections of Joan of Arc Vol 1 and Vol 2 - 33 - 32 - Tinsel Trappings of Nobility.mp3" yEnc
-		if (preg_match('/^\[Repost.+\]\s+\[\d+\/\d+\] - "(.+)\.(part|vol|jpg|sfv|mp3|nzb|nfo|rar).*" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Repost - Original Damaged]  [35/86] - "Mark Twain - Personal Recollections of Joan of Arc Vol 1 and Vol 2 - 33 - 32 - Tinsel Trappings of Nobility.mp3" yEnc
-		if (preg_match('/^\[Repost.+\]\s+\[\d+\/\d+\] - "(.+)\.(par2).*" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [12/19] - "Notorious Nineteen.part10.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "(.+)\.(part|vol|jpg|sfv|mp3|nzb|nfo|rar).*" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [12/19] - "Notorious Nineteen.part10.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "(.+)\.(par2).*" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(08/10) "The Vampire Diaries - Kampen.vol63+15.par2" - 313,91 MB yEnc
-		if (preg_match('/^\(\d+\/\d+\) "(.+)[\.-](part|vol|jpg|sfv|mp3|nzb|nfo|rar).*" - \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/10) "The Vampire Diaries - Raseriet.par2" - 296,93 MB yEnc
-		if (preg_match('/^(Re: )?\(\d+\/\d+\) "(.+)[\.-](par2).*" - \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Margaret Weis - Dragonlance Kr?niker Bind 1-6 [Danish AudioBook] [02/18] - "DL-CRON.r00" yEnc
-		if (preg_match('/^(.+) \[Danish.+\] \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //David Baldacci - The Forgotten 128 kbps stereo [03/24] - "The Forgotten 01.m4b" yEnc
-		if (preg_match('/^([\w\s\d-]+) \d+ kbps stereo \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//ASOS0010 [03/40] - "ASOS.r01" yEnc
-		//FFTT0010 (01/22) "FFTT.r10" yEnc
-		if (preg_match('/(\w{4}\d{4}) [\[\(]\d+\/\d+[\]\)][ -]+"\w{4}\..+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Christopher Moore - Practrcal Demonkeeping (1992) [New Post] [04/15] "Christopher Moore - Practical Demonkeeping 01.mp3" yEnc
-		if (preg_match('/^(.+) \[New Post\] \[\d+\/\d+\] ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Christopher Moore - Coyote Blue (1994) NMR [04/17] "Christopher Moore - Coyote Blue  01.mp3" yEnc
-		if (preg_match('/^(.+) NMR \[\d+\/\d+\] ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Christopher Moore - Island of the Sequined Love Nun (1997) [09/19] "Christopher Moore - Island of the Sequined Love Nun 06.mp3" yEnc
-		if (preg_match('/^(.+\(\d{4}\)) \[\d+\/\d+\] ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //NR - Jonathan Maberry - Extinction Machine - [26/98] - "Extinction Machine - 26-89.mp3" yEnc
-		if (preg_match('/^NR - (.+) - \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[Seizing the Enigma - David Kahn (Unabridged)(NMR)] - [06/29] - "DKSTE.part03.rar" yEnc
-		if (preg_match('/^\[(.+)\] - \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[116/194] - "David Baldacci - SK 03 Simple Genius - 21 - SK 03 Simple Genius - 021.mp3" yEnc
-		if (preg_match('/\[\d+\/\d+\] - "(.+) - \d+ -.+-.+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Michael Moss - Salt Sugar Fat - How the Food Giants Hooked Us [03/20] "Salt Sugar Fat - How the Food Giants Hooked Us 01.mp3" yEnc
-		if (preg_match('/^([\s\w\d-]+) \[\d+\/\d+\][ -]+".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(TTC Audio - Impossible - Physics Beyond the Edge) [01/34] - "TTC Audio - Impossible - Physics Beyond the Edge.sfv" yEnc
-		if (preg_match('/^\((TTC Audio - .+)\) \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //TTC Audio - Impossible - Physics Beyond the Edge) (proper pars) [0/8] - "(proper par2s) TTC Audio - Impossible - Physics Beyond the Edge.nzb" yEnc
-		if (preg_match('/^(TTC Audio - .+)\)\s\(.+\[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function audio_warez()
-	{
-		//[#nzbx.audio/EFnet]-[1681]-[MagicScore.Note.v7.084-UNION]-[02/12] - "u-msn7.r00" yEnc
-		if (preg_match('/^(Re: )?\[.+?\]-\[\d+\]-\[(.+?)\]-\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//MacProVideo.com.Pro.Tools8.101.Core.Pro.Tools8.TUTORiAL-DYNAMiCS [2 of 50] "dyn-mpvprtls101.sfv" yEnc
-		//Native.Instruments.Komplete.7.VSTi.RTAS.AU.DVDR.D02-DYNAMiCS[01/13] - "dyn.par2" yEnc
-		//Native.Instruments.Komplete.7.VSTi.RTAS.AU.DVDR.DYNAMiCS.NZB.ONLY [02/13] - "dyn.vol0000+001.PAR2" yEnc
-		if (preg_match('/^([\w.-]+) ?\[\d+( of |\/)\d+\] ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //REQ : VSL Stuff ~ Here's PreSonus Studio One 1.5.2 for OS X [16 of 22] "a-p152x.rar" yEnc
-		if (preg_match('/^REQ : .+? ~ (.+?) \[\d+ of \d+\] ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Eminem - Recovery (2010) - [1/1] - "Eminem - Recovery (2010).rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?) - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [1/1] - "Dust in the Wind - the Violin Solo.rar" yEnc
-		if (preg_match('/^\(\?{4}\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Native Instruments Battery 3 incl Library ( VST DX RTA )( windows ) Libraries [1/1] - "Native Instruments Battery 2 + 3 SERIAL KEY KEYGEN.nfo" yEnc
-		if (preg_match('/^(.+?) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} /* TODO: REFRESH : Tonehammer Ambius 1 'Transmissions' ~ REQ: SAMPLE LOGIC SYNERGY [1 of 52] "dynamics.nfo" yEnc */
-		else {
-			return array(
-				"cleansubject"  => $this->releaseCleanerHelper($this->subject),
-				"properlynamed" => false
-			);
-		}
-	}
-
-	public function b4e()
-	{
-		//"B4E-vip2851.r83" yEnc
-		if (preg_match('/^"(B4E-vip\d+)\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[02/12] - "The.Call.GERMAN.2013.DL.AC3.Dubbed.720p.BluRay.x264 (Avi-RiP ).rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "(.+?) \(.+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //- "as-jew3.vol03+3.PAR2" - yEnc
-		if (preg_match('/^- "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function barbarella()
-	{
-		//ACDSee.Video.Converter.Pro.v3.5.41.Incl.Keymaker-CORE - [1/7] - "ACDSee.Video.Converter.Pro.v3.5.41.Incl.Keymaker-CORE.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?) - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Die.Nacht.Der.Creeps.THEATRICAL.GERMAN.1986.720p.BluRay.x264-GH - "gh-notcreepskf720.nfo" yEnc
-		//The.Fast.and.the.Furious.Tokyo.Drift.2006.German.1080p.BluRay.x264.iNTERNAL-MWS  - "mws-tfatftd-1080p.nfo" yEnc
-		if (preg_match('/^([\w.-]+)\s+-\s+".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//CorelDRAW Technical Suite X6-16.3.0.1114 x32-x64<><>DRM<><> - (10/48)  "CorelDRAW Technical Suite X6-16.3.0.1114 x32-x64.part09.rar" - 2,01 GB - yEnc
-		//AnyDVD_7.1.9.3_-_HD-BR - Beta<>give-me-all.org<>DRM<><> - (1/3)  "AnyDVD_7.1.9.3_-_HD-BR - Beta.par2" - 14,53 MB - yEnc
-		//Android Softarchive.net Collection Pack 27^^give-me-all.org^^^^DRM^^^^ - (01/26)  "Android Softarchive.net Collection Pack 27.par2" - 1,01 GB - yEnc
-		//WIN7_ULT_SP1_x86_x64_IE10_19_05_13_TRIBAL <> give-me-all.org <> DRM <> <> PW <> - (154/155)  "WIN7_ULT_SP1_x86_x64_IE10_19_05_13_TRIBAL.vol57+11.par2" - 7,03 GB - yEnc
-		//[Android].Ultimate.iOS7.Apex.Nova.Theme.v1.45 <> DRM <> - (1/3)  "[Android].Ultimate.iOS7.Apex.Nova.Theme.v1.45.par2" - 21,14 MB - yEnc
-		if (preg_match('/^(\[[A-Za-z]+\]\.|reup\.)?([a-zA-Z0-9].+?)([\^<> ]+give-me-all\.org[\^<> ]+|[\^<> ]+)DRM[\^<> ]+.+? - \(\d+\/\d+\)  ".+?" - .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(004/114) - Description - "Pluralsight.net XAML Patterns (10).rar" - 532,92 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - .+? - "(.+?)( \(\d+\))?' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(01/12) - "TransX - Living on a Video 1993.part01.rar" - 561,55 MB - TransX - Living on a Video 1993.[Lossless] Highh Quality yEnc
-		//(59/81) "1973 .Lee.Jun.Fan.DVD9.untouched.z46" - 7,29 GB - Lee.Jun.Fan.sein.Film.DVD9.untouched yEnc
-		if (preg_match('/^\(\d+\/\d+\)( -)? ".+?" - \d+[,.]\d+ [mMkKgG][bB] - (.+?) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //>>> www.lords-of-usenet.org <<<  "Der Schuh Des Manitu.par2" DVD5  [001/158] - 4,29 GB yEnc
-		if (preg_match('/^>>> www\.lords-of-usenet\.org <<<.+? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' .+? \[\d+\/\d+\] - .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//NEUES 4y - [@ usenet-4all.info - powered by ssl.news -] [5,58 GB] [002/120] "DovakinPack.part002.rar" yEnc
-		//NEUES 4y (PW)  [@ usenet-4all.info - powered by ssl.news -] [7,05 GB] [014/152] "EngelsGleich.part014.rar" yEnc
-		if (preg_match('/^.+? (-|\(PW\))\s+\[.+? -\] \[\d+[,.]\d+ [mMkKgG][bB]\] \[\d+\/\d+\] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//Old Dad uppt   Die Schatzinsel Teil 1+Teil2  AC3 DVD Rip German XviD Wp 01/33] - "upp11.par2" yEnc
-		//Old Dad uppt Scary Movie5 WEB RiP Line XviD German 01/24] - "Scary Movie 5.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?\s{2,}|Old Dad uppt\s+)(.+?) \d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//>>>  20,36 MB   "Winamp.Pro.v5.70.3392.Incl.Keygen-FFF.par2"   552 B yEnc
-		//..:[DoAsYouLike]:..    9,64 MB    "Snooper 1.39.5.par2"    468 B yEnc
-		if (preg_match('/^.+?\s{2,}\d+[,.]\d+ [mMkKgG][bB]\s{2,}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '\s{2,}(\d+ B|\d+[,.]\d+ [mMkKgG][bB]) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(MKV - DVD - Rip - German - English - Italiano) - "CALIGULA (1982) UNCUT.sfv" yEnc
-		if (preg_match('/^\(.+?\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"sre56565ztrtzuzi8inzufft.par2" yEnc
-		if (preg_match('/^"([a-z0-9]+)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function big()
-	{
-		//Girls.against.Boys.2012.German.720p.BluRay.x264-ENCOUNTERS - "encounters-giagbo_720p.nfo" yEnc
-		if (preg_match('/^([\w.-]+) - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//wtvrwschdhfthj - [001/246] - "dtstchhtmrrnvn.par2" yEnc
-		//oijhuiurfjvbklk - [01/18] - "tb5-3ioewr90f.par2" yEnc
-		if (preg_match('/^([a-z]{3,}) - \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(08/22) - "538D7B021B362A4300D1C0D84DD17E6D.r06" yEnc
-		if (preg_match('/^\(\d+\/\d+\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [02/71] - "Lasting Weep (1969-1971).part.par2" yEnc
-		if (preg_match('/^\(\?{4}\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(01/59) "ThienSuChungQuy_II_E16.avi.001" - 1,49 GB - yEnc
-		//(058/183) "LS_HoangChui_2xdvd5.part057.rar" - 8,36 GB -re yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB] -(re)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[AoU] Upload#00287 - [04/43] - "Upload-ZGT1-20130525.part03.rar" yEnc
-		if (preg_match('/^(\[[a-zA-Z]+\] .+?) - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(nate) [01/27] - "nate_light_13.05.23.par2" yEnc
-		if (preg_match('/^\([a-z]+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //""Absolute Database Component for BCBuilder 4-6 MultiUser Edit 4.85.rar"" yEnc
-		if (preg_match('/^""([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //781e1d8dccc641e8df6530edb7679a0e - (26/30) - "781e1d8dccc641e8df6530edb7679a0e.rar" yEnc
-		if (preg_match('/^([a-f0-9]{32}) - \(\d+\/\d+\) - "[a-f0-9]{32}.+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function bloaf()
-	{
-		//36c1d5d4eaf558126c67f00be46f77b6 - (01/22) - "36c1d5d4eaf558126c67f00be46f77b6.par2" yEnc
-		if (preg_match('/^([a-f0-9]{32}) - \(\d+\/\d+\) - "[a-f0-9]{32}.+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[10/17] - "EGk13kQ1c8.part09.rar" - 372.48 MB <-> usenet-space-cowboys.info <-> powered by secretusenet.com <-> yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB] .+? usenet-space.+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Neu bei Bitfighter vom 23-07-2013) - "01 - Sido - Bilder Im Kopf.mp3" yEnc
-		if (preg_match('/^\((.+?)\) - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(2/8) "Mike.und.Molly.S01E22.Maennergespraeche.GERMAN.DL.DUBBED.720p.BluRay.x264-TVP.part1.rar" - 1023,92 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //4y (PW)   [@ usenet-4all.info - powered by ssl.news -] [27,35 GB] [001/118] "1f8867bb6f89491793d3.part001.rar" yEnc
-		if (preg_match('/^.+? (-|\(PW\))\s+\[.+? -\] \[\d+[,.]\d+ [mMkKgG][bB]\] \[\d+\/\d+\] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Bennos Special Tools DVD - Die Letzte <> DRM <><> PW <> - (002/183)  "Bennos Special Tools DVD - Die Letzte.nfo" - 8,28 GB - yEnc
-		if (preg_match('/^(\[[A-Za-z]+\]\.)?([a-zA-Z0-9].+?)([\^<> ]+give-me-all\.org[\^<> ]+|[\^<> ]+)DRM[\^<> ]+.+? - \(\d+\/\d+\)\s+".+?" - .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//(1/9) - CyberLink.PhotoDirector.4.Ultra.4.0.3306.Multilingual - "CyberLink.PhotoDirector.4.Ultra.4.0.3306.Multilingual.par2" - 154,07 MB - yEnc
-		//(1/5) - Mac.DVDRipper.Pro.4.0.8.Mac.OS.X- "Mac.DVDRipper.Pro.4.0.8.Mac.OS.X.rar" - 24,12 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - (.+?) ?- ".+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[3/3 Helene Fischer - Die Biene Maja 2013 MP3 Helene Fischer - Die Biene Maja 2013 MP3.mp3.vol0+1.PAR2" yEnc
-		if (preg_match('/^\[\d+\/\d+ (.+?)\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Uploader.Presents-Mutter.und.Sohn.German.2013.DVDRiP.x264-XFi[01/27]"xf-mutterusohn.nfo" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+)[\(\[]\d+\/\d+[\)\]]".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function blu_ray()
-	{
-		//"786936833607.MK.A.part086.rar" yEnc
-		if (preg_match('/^"(\d+\.MK\.[A-Z])\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(????) [001/107] - "260713thbldnstnsclw.par2" yEnc
-		if (preg_match('/^\(\?{4}\) \[\d+\/\d+\] - "([a-z0-9]+)\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[www.allyourbasearebelongtous.pw]-[The Place Beyond the Pines 2012 1080p US Blu-ray AVC DTS-HD MA 5.1-HDWinG]-[03/97] "tt1817273-us-hdwing-bd.r00" - 46.51 GB - yEnc
-		if (preg_match('/^\[www\..+?\]-\[(.+?)\]-\[\d+\/\d+\] ".+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(01/71)  - "EwRQCtU4BnaeXmT48hbg7bCn.par2" - 54,15 GB - yEnc
-		//(63/63) "dfbgfdgtghtghthgGPGEIBPBrwg34t05.rev" - 10.67 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)(\s+ -)? "([a-zA-Z0-9]+?)\d*\..+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[01/67] - "O3tk4u681gd767Y.par2" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([a-zA-Z0-9]+)\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //209a212675ba31ca24a8 [usenet-4all.info] [powered by ssl-news] [21,59 GB] [002/223] "209a212675ba31ca24a8.part001.rar" yEnc
-		if (preg_match('/^([a-z0-9]+) \[.+?\] \[.+?\] \[\d+[,.]\d+ [mMkKgG][bB]\] \[\d+\/\d+\] ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //TIS97CC - "tis97cc.par2" yEnc
-		if (preg_match('/^([A-Z0-9]+) - "[a-z0-9]+\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //AsianDVDClub.org - Sengoku Basara: Season 2 (2010) AVC 1080p BD50+BD25 - Disc 1 of 2 [001/112] - "adc-71029a.nfo" yEnc
-		if (preg_match('/^AsianDVDClub\.org - (.+) \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //AsianDVDClub.org - Laputa: Castle in the Sky (1986) AVC 1080p BD50 - File 001 of 113: "adc-laputa.nfo" yEnc
-		if (preg_match('/^AsianDVDClub\.org - (.+) ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //THE_PACIFIC_DISC_6_FULL_BLURAY_BD50_EX3 - [5/6] - "THE PACIFIC DISC 6 FULL BLURAY.part07.rar" yEnc
-		if (preg_match(
-			'/^[\w-\. ]+[ _-]{0,3}[\(\[]\d+\/\d+[\)\]][ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match
-		)
-		) {
-			return $match[1];
-		} //LOST SEASON1 DISC4 REENCODED BD25 DJMASTURBEAT (151/154) "LOST SEASON1 DISC4 BD25 DJMASTURBEAT.vol3312+131.par2" - 26.91 GB - yEnc
-		if (preg_match('/^[\w-\. ]+[ _-]{0,3}[\(\[]\d+\/\d+[\)\]][ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function boneless()
-	{
-		//4Etmo7uBeuTW[047/106] - "006dEbPcea29U6K.part046.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9]+)\[\d+\/\d+\] - "[a-zA-Z0-9]+\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(PC-ISO) ( Trials.Fusion.Riders.of.the.Rustlands-SKIDROW ) [10/40] - "sr-tfrotr.part01.rar" yEnc
-		if (preg_match('/^\(PC-ISO\)[-_\s]{0,3}\( ([\w.,& ()\[\]\'\`-]{8,}?\b) \) \[\d+\/\d+\][-_\s]{0,3}".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //( Overlord II RELOADED ) - [013/112] - "rld-olii.part001.rar" yEnc
-		if (preg_match('/^\( ([\w. -]{8,}) \)[-_\s]{0,3}\[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(68/89) "dz1R2wT8hH1iQEA28gRvm.part67.rar" - 7,91 GB - yEnc
-		//(01/14)  - "JrjCY4pUjQ9qUqQ7jx6k2VLF.par2" - 4,39 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)\s+(- )?"([a-zA-Z0-9]+)\..+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(110320152518519) [22/78] - "110320152518519.part21.rar" yEnc
-		if (preg_match('/^\((\d+)\) \[\d+\/\d+\] - "\d+\..+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //1VSXrAZPD - [123/177] - "1VSXrAZPD.part122.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9]+) - \[\d+\/\d+\] - "[a-zA-Z0-9]+\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //( Peter Gabriel Albums 24x +17 Singles = 71x cd By Dready Niek )  ( ** By Dready Niek ** ) [113/178] - "Peter Gabriel Albums 24x +17 Singles = 71CDs By Dready Niek (1977-2010).part112.rar" yEnc
-		if (preg_match('/^\( (.+?) \)\s+\( .+?\) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Tarja - Colours In The Dark (2013) "00. Tarja-Colours In The Dark.m3u" yEnc
-		if (preg_match('/^([A-Za-z0-9].+? \((19|20)\d\d\)) "\d{2}\. .+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"BB636.part14.rar" - (15/39) - yEnc
-		if (preg_match('/^"([a-zA-Z0-9]+)' . $this->e0 . ' - \(\d+\/\d+\) - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Lutheria - FC Twente TV Special - Ze wilde op voetbal [16/49] - "Lutheria - FC Twente TV Special - Ze wilde op voetbal.part16.rar" yEnc
-		if (preg_match('/^([-a-zA-Z0-9 ]+) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Pee Mak Prakanong - 2013 - Thailand - ENG Subs - "Pee Mak Prakanong.2013.part22.rar" yEnc
-		if (preg_match('/^([-a-zA-Z0-9 ]+) - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//(????) [011/161] - "flynns-image-redux.part010.rar" yEnc
-		//(Dgpc) [000/110] - "Teen Wolf - Seizoen.3 - Dvd.2 (NLsub).nzb" yEnc
-		if (preg_match('/^\((\?{4}|[a-zA-Z]+)\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //("Massaladvd5Kilusadisc4S1.par2" - 4,55 GB -) "Massaladvd5Kilusadisc4S1.par2" - 4,55 GB - yEnc
-		if (preg_match('/^\("([a-z0-9A-Z]+).+?" - \d+[,.]\d+ [mMkKgG][bB] -\) ".+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"par.4kW9beE.1.vol122+21.par2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//brothers-of-usenet.info/.net <<<Partner von SSL-News.info>>> - [01/19] - "Age.of.Dinosaurs.German.AC3.HDRip.x264-FuN.par2" yEnc
-		//>>>>>Hell-of-Usenet.org>>>>> - [01/35] - "Female.Agents.German.2008.AC3.DVDRip.XviD.iNTERNAL-VideoStar.par2" yEnc
-		if (preg_match('/^.+?\.(info|org)>+ - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[010/101] - "Bf56a8aR-20743f8D-Vf7a11fD-d7c6c0.part09.rar" yEnc
-		//[1/9] - "fdbvgdfbdfb.part.par2" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[LB] - [063/112] - "RVL-GISSFBD.part063.rar" yEnc
-		if (preg_match('/^\[[A-Z]+\] - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //!!www.usenet4all.eu!! - Acceptance.2009.COMPLETE.NTSC.DVDR-D0PE[001/100] - #34;d0pe-a.nfo#34; yEnc
-		if (preg_match('/^!!www\.usenet4all\.eu!![ _-]{0,3}(.+)\[\d+\/\d+\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //NCIS.S11E03.HDTV.x264-LOL - "NCIS.S11E03.HDTV.x264-LOL.part.par2" yEnc
-		if (preg_match('/^([A-Za-z0-9][a-zA-Z0-9.-]{6,})\s+- ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//place2home.net - Call.of.Duty.Ghosts.XBOX360-iMARS - [095/101] - "imars-codghosts-360b.vol049+33.par2" yEnc
-		//Place2home.net - Diablo_III_USA_RF_XBOX360-PROTOCOL - "d3-ptc.r34" yEnc
-		if (preg_match('/^place2home\.net - (.*?) - (\[\d+\/\d+\] - )?".+?" yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[scnzbefnet][500934] Super.Fun.Night.S01E09.720p.HDTV.X264-DIMENSION [1/19] - "bieber.109.720p-dimension.sfv" yEnc
-		//REPOST: [scnzbefnet][500025] Major.Crimes.S02E13.720p.HDTV.x264-IMMERSE [16/33] - "major.crimes.s02e13.720p.hdtv.x264-immerse.r24" yEnc
-		if (preg_match('/^(REPOST: )?\[scnzbefnet\]\[(\d+)\] (.+?) \[\d+\/(\d+\]) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //[scnzbefnet] Murdoch.Mysteries.S07E09.HDTV.x264-KILLERS [1/20] - "murdoch.mysteries.s07e09.hdtv.x264-killers.r13" yEnc
-		if (preg_match('/^\[scnzbefnet\] (.+?) \[\d+\/(\d+\]) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Ancient.Aliens.S03E05.Aliens.and.Mysterious.Rituals.720p.HDTV.x264.AC3.2Ch.REPOST) [41/42] - "Ancient.Aliens.S03E05.Aliens.and.Mysterious.Rituals.720p.HDTV.x264.AC3.2Ch.REPOST.vol071+66.PAR2" yEnc
-		if (preg_match('/^(\((.+?)\) \[)\d+(\/\d+] - ").+?" yEnc$/', $this->subject, $match)) {
-			return $match[2];
-		} //(01/48) - [Lords-of-Usenet] <<Partner of SSL-News.info>> presents Sons.of.Anarchy.S02E03.Unten.am.Fluss.GERMAN.DUBBED.720p.BLURAY.x264-ZZGtv -"zzgtv-soa-s02e03.par2" - 1,84 GB
-		if (preg_match('/^\(\d+\/\d+\) - \[Lords-of-Usenet\] <<Partner of SSL-News.info>> presents (.+) -".+" - .+ yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Doobz Europa_Universalis_IV_Conquest_of_Paradise-FLT [10/54] - "flt-eucp.001" yEnc
-		if (preg_match('/^Doobz ([a-zA-z-_]+) \[\d+\/(\d+\]) - ".+' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(aangemeld bij usenet collector) [001/125] - "Northern_Exposure_Season_1_dvd_1.par2" yEnc
-		if (preg_match('/^\(aangemeld bij usenet collector\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[15/16] - "Person.of.Interest.S03E09.480p.HDTV.x264-mSD.vol0+1.par2" - 177,28 MB <-> usenet-space-cowboys.info <-> powered by secretusenet.com <-> yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] .+usenet-space-cowboys\.info.+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.info&net-empfehlen-ssl-news.info Black Mirror s01e01 - Der wille des volkes - [09/15] - "Black Mirror - S01E01 - Der Wille des Volkes.vol00+01.par2" yEnc
-		if (preg_match('/^brothers-of-usenet\.info.+ - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(024/264) "Enf.S04E02.G.D.H.X-M.vol51+46.PAR2" - 8,27 GB -Enf.S04.G.D.H.X yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] .+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- "Auction Hunters S04E04.HDTV.x264-StarryNights1.nzb" yEnc
-		if (preg_match('/.*"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function british_drama()
-	{
-		//Coronation Street 03.05.2012 [XviD] [01/23] - "coronation.street.03.05.12.[ws.pdtv].par2" yEnc
-		//Coronation Street 04.05.2012 - Part 1 [XviD] [01/23] - "coronation.street.04.05.12.part.1.[ws.pdtv].par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+? \[XviD\]) \[\d\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//The Prisoner E06-09 [001/152] - "06 The General.mkv.001" yEnc
-		//Danger Man S2E05-08 [075/149] - "7.The colonel's daughter.avi.001" yEnc
-		if (preg_match('/^([a-zA-Z0-9]+ .+? (S\d+)?E\d+-\d\d) \[\d+\/\d+\] - "\d(\d |\.).+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Wizards Vs Aliens - 1x06 - Rebel Magic, Part Two [XviD][00/27] - "wizards.vs.aliens.106.rebel.magic.part.two.[ws.pdtv].nzb" yEnc
-		if (preg_match('/^.+?[-_\s]{0,3}\d+[xX]\d+[-_\s]{0,3}.+?\[\d+\/\d+\][-_\s]{0,3}.+?"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Vera.3x03.Young.Gods.720p.HDTV.x264-FoV - "vera.3x03.young_gods.720p_hdtv_x264-fov.r00" yEnc
-		if (preg_match('/^[a-zA-Z0-9-\.]+ - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Heartbeat 9x23 Wise Guys.avi.015  yEnc
-		if (preg_match('/^(.+ \d+x\d+.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Minder S10E10 [00/52] - "S10E10.nzb" yEnc
-		if (preg_match('/^(.+ S\d+E\d+)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Rosemary & Thyme.106..The Tree of Death....Read txt file for more info about this posting - File 03 of 51 - "Rosemary & Thyme.106.The Tree of Death.part01.rar" yEnc
-		if (preg_match('/^.+File \d+ of \d+ - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The.Tudors.S01E04.2007.720p[33/57] - "The.Tudors.S01E04.2007.720p.part31.rar" yEnc
-		if (preg_match('/^.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Happy_Halloween_The Ice House (1978).par2  yEnc
-		if (preg_match('/^([\w. &()-]{8,}?\b)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Rosemary & Thyme - 2x02 Orpheus In The Undergrowth.par2"  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/45] - "Minder S01E08.sfv" yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function bungabunga()
-	{
-		//[01/29] - "Bellflower.2011.German.AC3.BDRip.XviD-EPHEMERiD.par2" - 1,01 GB yEnc
-		//(3/9) - "Microsoft Frontpage 2003 - 4 Town-Up from Kraenk.rar.par2" - 181,98 MB - yEnc
-		if (preg_match('/^[\[(]\d+\/\d+[\])] - "([A-Z0-9].{2,}?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cavebox()
-	{
-		//(www.Thunder-News.org) )Panamericana.E02.Von.Alaska.nach.Feuerland.GERMAN.DOKU.WS.dTV.XViD-SiTiN( (Sponsored by AstiNews) - (05/34) - #34;sitin-panamericanae02-xvid.r00#34; yEnc
-		if (preg_match('/^\(www\.Thunder-News\.org\) ?\)(.+)\( \(Sponsored.+\)[ _-]{0,3}\(\d+\/\d+\)[ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cats()
-	{
-		//Pb7cvL3YiiOu06dsYPzEfpSvvTul[02/37] - "Fkq33mlTVyHHJLm0gJNU.par2" yEnc
-		//DLJorQ37rMDvc [01/16] - "DLJorQ37rMDvc.part1.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9]{5,}) ?\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cbt()
-	{
-		//(WinEdt.v8.0.Build.20130513.Cracked-EAT) [01/10] - "eatwedt8.nfo" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9-\.\&_ ]+)\) \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[ ABCAsiaPacific.com - Study English IELTS Preparation (2006) ] AVI.PDF (17/34) - "abcap-senglishielts.r16" yEnc
-		//[ Ask Video - The Studio Edge 101 Planning a Recording Studio ] MP4.x264 (00/21) - "syn-avtse101.nzb" yEnc
-		//[ Brian Tracy and Colin Rose - Accelerated Learning Techniques (2003) ] MP3.PDF (00/14) - "btcr-accltech.nzb" yEnc
-		//[ Lynda.com - Advanced Modeling in Revit Architecture (2012) ] DVD.ISO (41/53) - "i-lcamira.r38" yEnc
-		//[ Morgan Kaufmann - Database Design Know It All (2008) ] TRUE.PDF (0/5) - "Morgan.Kaufmann.Database.Design.Know.It.All.Nov.2008.eBook-DDU.nzb" yEnc
-		//[ VertexPusher - Vol. 2 Lighting, Shading and Rendering (2012) ] MP4.x264 (05/20) - "vp-c4dlsar.r03" yEnc
-		if (preg_match('/^\[ ([a-zA-Z0-9-\.\&\(\)\,_ ]+) \] [a-zA-Z0-9]{3,4}\.[a-zA-Z0-9]{3,4} \(\d+\/(\d+\)) - ".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"MythBusters S10E02 720p HDTV x264-DHD.rar"  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' {1,2}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //2nd Annual American CountryMusicAwards 2011 HDTV XviD 2HD.rar  yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) {1,2}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [005/358] - "WLAN - professionell absichern.rar" Sayco  yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' Sayco  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cbts()
-	{
-		//"softWoRx.Suite.2.0.0.25.x32-TFT.rar" yEnc
-		if (preg_match('/"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cd_image()
-	{
-		//[www.drlecter.tk]-[The_Night_of_the_Rabbit-FLT]-[01/67] "Dr.Lecter.nfo" - 5.61 GB - yEnc
-		if (preg_match('/^\[www\..+?\]-\[(.+?)\]-\[\d+\/\d+\] ".+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Slender.The.Arrival-WaLMaRT.PC - [01/26] - "wmt-stal.nfo" - yEnc
-		//The.Night.of.the.Rabbit-FLT - [03/66] - "flt-notr.r00" - FAiRLIGHT - 5,10 GB - yEnc
-		//Resident.Evil.Revelations-FLT - PC GAME - [03/97] - "Resident.Evil.Revelations-FLT.r00" - FAiRLIGHT - yEnc
-		//Afterfall.Insanity.Dirty.Arena.Edition-WaLMaRT - [MULTI6][PCDVD] - [02/45] - "wmt-adae.r00" - PC GAME - yEnc
-		if (preg_match('/^([a-zA-Z0-9.-]{10,}) -( PC GAME -| [A-Z0-9\[\]]+ -)? \[\d+\/\d+\] - ".+?" - (.+? - (\d+[,.]\d+ [mMkKgG][bB] - )?)?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[01/46] - Crashtime 5 Undercover RELOADED - "rld-ct5u.nfo" - PC - yEnc
-		//[01/76] - Of.Orcs.And.Men-SKIDROW - "sr-oforcsandmen.nfo" - yEnc
-		//PC Game - [01/71] - MotoGP 13-RELOADED Including NoDVD Fix - "MotoGP 13-RELOADED Including NoDVD Fix nfo" - yEnc
-		if (preg_match('/^(PC Game - )?\[\d+\/\d+\] - (.+?) - ".+?" -( .+? -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//Magrunner Dark Pulse FLT (FAiRLIGHT) - [02/70] - "flt-madp par2" - PC - yEnc
-		//MotoGP 13 RELOADED - [01/71] - "rld-motogp13 nfo" - PC - yEnc
-		//Dracula 4: Shadow of the Dragon FAiRLIGHT - [01/36] - "flt-drc4 nfo" - PC - yEnc
-		if (preg_match('/^([A-Za-z0-9][a-zA-Z0-9: ]{8,}(-[a-zA-Z]+)?)( \(.+?\)| - [\[A-Z0-9\]]+)? - \[\d+\/\d+\] - ".+?" - .+? - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[NEW PC GAME] - Lumber.island-WaLMaRT - "wmt-lisd.nfo" - [01/18] - yEnc
-		//Trine.2.Complete.Story-SKIDROW - "sr-trine2completestory.nfo" - [01/78] - yEnc
-		if (preg_match('/^(\[[A-Z ]+\] - )?([a-zA-Z0-9.-]{10,}) - ".+?" - \[\d+\/\d+\] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Uploader.Presents-Metal.Gear.Rising.Revengeance-RELOADED(51/65]"rld-megerire.r48" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+)[\(\[]\d+\/\d+\]".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cd_lossless()
-	{
-		//Flac Flood - Modern Talking - China In Her Eyes (CDM) - "1 - Modern Talking - China In Her Eyes (feat. Eric Singleton) (Video Version).flac" (01/14) (23,64 MB)   136,66 MB yEnc
-		////Flac Flood Modern Talking - America - "1 - Modern Talking - Win The Race.flac" (01/18) (29,12 MB) 549,35 MB yEnc
-		if (preg_match('/^Flac Flood( -)? (.+?) - ".+?" \(\d+\/\d+\) .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//Cannonball Adderley - Nippon Soul [01/17] "00 - Cannonball Adderley - Nippon Soul.nfo" yEnc
-		//Black Tie White Noise [01/24] - "00 - David Bowie - Black Tie White Noise.nfo" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?) \[\d+\/\d+\]( -)? "\d{2,} - .+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//The Allman Brothers Band - Statesboro Blues [Swingin' Pig - Bootleg] [1970 April 4] - File 09 of 19: Statesboro Blues.cue yEnc
-		//[1977] Joan Armatrading - Show Some Emotion - File 15 of 20: 06 Joan Armatrading - Opportunity.flac yEnc
-		if (preg_match('/^((\[\d{4}\] )?[a-zA-Z0-9].+?) - File \d+ of \d+: .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Allman Brothers Band - The Fillmore Concerts [1971] - 06 The Allman Brothers Band - Done Somebody Wrong.flac yEnc
-		if (preg_match('/^([A-Z0-9].+? - [A-Z0-9].+? \[\d{4}\]) - \d{2,} .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Velvet Underground - Peel Slow And See (Box Set) Disc 5 of 5 - 13 The Velvet Underground - Oh Gin.flac yEnc
-		if (preg_match('/^([A-Z0-9].+? - [A-Z0-9].+? Disc \d+ of \d+) - [A-Z0-9].+?\..+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(28/55) "Ivan Neville - If My Ancestors Could See Me Now.par2" - 624,44 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function chello()
-	{
-		//0F623Uv71RHKt0jzA7inbGZLk00[2/5] - "l2iOkRvy80bgLrZm1xxw.par2" yEnc
-		//GMC2G8KixJKy [01/15] - "GMC2G8KixJKy.part1.rar" yEnc
-		if (preg_match('/^([A-Za-z0-9]{5,}) ?\[\d+\/\d+\] - "[A-Za-z0-9]{3,}.+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Imactools.Cefipx.v3.20.MacOSX.Incl.Keyfilemaker-NOY [03/10] - "parfile.vol000+01.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9][a-zA-Z0-9.-]+) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Siberian Mouses LS, BD models and special... [150/152] - "Xlola - Luba, Sasha & Vika.avi.jpg" yEnc
-		if (preg_match('/^([A-Za-z0-9-]+ .+?)[. ]\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function classic_tv_shows()
-	{
-		//Re: REQ: All In The Family - "Archie Bunkers Place 1x01 Archies New Partner part 1.nzb" yEnc
-		if (preg_match('/^Re: REQ: (.+? - ".+?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Per REQ - "The.Wild.Wild.West.S03E11.The.Night.of.the.Cut-Throats.DVDRip.XVID-tz.par2" 512x384 [01/40] yEnc
-		if (preg_match('/^Per REQ - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' .+? \[\d+\/\d+\] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //By req: "Dennis The Menace - 4x25 - Dennis and the Homing Pigeons.part05.rar" yEnc
-		if (preg_match('/^By req: "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //I Spy HQ DVDRips "I Spy - 3x26 Pinwheel.part10.rar" [13/22] yEnc
-		if (preg_match('/^[a-zA-Z ]+HQ DVDRips "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' \[\d+\/\d+\] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Sledge Hammer! S2D2 [016/138] - "SH! S2 D2.ISO.016" yEnc
-		//Sledge Hammer! S2D2 [113/138] - "SH! S2 D2.ISO.1132 yEnc
-		//Lost In Space - Season 1 - [13/40] - "S1E02 - The Derelict.avi" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+? (S\d+D\d+|- Season \d+))( -)? \[\d+\/\d+\] - ".+?"? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Night Flight TV Show rec 1991-01-12 (02/54) - "night flight rec 1991-01-12.nfo" yEnc
-		//Night Flight TV Show rec 1991-05-05 [NEW PAR SET] (1/9) - "night flight rec 1991-05-05.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+? \d{4}-\d\d-\d\d)( \[.+?\])? \(\d+\/\d+\) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//The.Love.Boat.S05E08 [01/31] - "The.Love.Boat.S05E08.Chefs.Special.Kleinschmidt.New.Beginnings.par2" yEnc
-		//Barney.Miller.S08E05.Stress.Analyzer [01/18] - "Barney.Miller.S08E05.Stress.Analyzer.VHSTVRip.DivX.par2" yEnc
-		if (preg_match('/^[a-zA-Z0-9][a-zA-Z0-9.-]+S\d+E\d+([a-zA-Z0-9.]+)? \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//"Batman - S1E13-The Thirteenth Hat.par2" yEnc
-		//"The Munsters - 1x01 Munster Masquerade.part.par" HQ DVDRip[02/16] yEnc
-		if (preg_match('/^(Re: )?"(.+?)(\.avi|\.mkv)?' . $this->e0 .
-			'( HQ DVDRip\[\d+\/\d+\])? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//Re: Outside Edge series 1 - [01/20] - "Outside Edge S01.nfo" yEnc
-		//Green Acres Season 1 [01/87] - "Green Acres Season 1.par2" yEnc
-		//MASH Season 1 - [01/54] - "MASH - Season 01.par2" yEnc
-		if (preg_match('/^(Re: )?[a-zA-Z0-9]+.+? (series|Season) \d+ (- )?\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		}
-		//Rich.Little.Show - 1x12 - Season.and.Series.Finale - [02/33] - "Rich Little Show - 1x12 - Bill Bixby.avi.002" yEnc
-		//Rich.Little.Show - 1x11 - [01/33] - "Rich Little Show - 1x11 - Jessica Walter.avi.001" yEnc
-		//REQ - Banacek - 2x07 - [02/61] - "Banacek - 2x07 - Fly Me - If You Can Find Me.avi.002" yEnc
-		if (preg_match('/^(REQ - )?[A-Z0-9a-z][A-Z0-9a-z.]+ - \d+x\d+ (- [A-Z0-9a-z.]+ )?- \[\d+\/\d+\] - "(.+?)(\.avi|\.mkv)?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //Handyman Shows-TOH-S32E10 - File 01 of 32 - yEnc
-		if (preg_match('/^Handyman Shows-(.+) - File \d+ of \d+ - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//'Mission: Impossible' - 1x09 - NTSC - DivX - 28 of 48 - "MI-S01E09.r23" yEnc
-		//'Mission: Impossible' - 1x09 - NTSC - DivX - 01 of 48 - "MI-S01E09.nfo" (1/1)
-		if (preg_match('/^([a-zA-Z0-9 -_\.:]+) - \d+( of \d+)[-_\s]{0,3}".+?' . $this->e0 .
-			' (\(\d+\/\d+\) )?(yEnc)?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//"Batman - S2E58-Ice Spy.par2"yEnc
-		//"Black Sheep Squadron 1x03 Best Three Out of Five.par2"
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '(yEnc)?( )?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Guns of Will Sonnett - 1x04.mp4" (Not My Rip)Guns Of Will Sonnett Season 1 1 - 26 Mp4 With Pars yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \(Not My Rip\).+ \d+ (- \d+) .+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/10) "Watch_With_Mother-Bill_And_Ben-1953_02_12-Scarecrow-VHSRip-XviD.avi" - 162.20 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(Our Gang - Little Rascals  DVDRips)  "Our Gang -  The Lucky Corner (1936).part0.sfv" [01/19] yEnc
-		//(Our Gang - Little Rascals  DVDRips)  "Our Gang -  Wild Poses (1933).part.par" [02/20] Last One I Have! yEnc
-		if (preg_match('/^\(.+\)  "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \[\d+\/(\d+\]) (Last One I Have! )?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[EnJoY] =>A Blast from Usenet Past (1/3)<= [00/14] - "Mcdonalds Training Film - 1972 (Vhs-Mpg).part.nzb" yEnc
-		if (preg_match('/^.+ Usenet Past .+\[\d+\/(\d+\]) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //<OPA_TV> [01/12] - "Yancy Derringer - 03 - Geheime Fracht.par2" yEnc
-		if (preg_match('/^<OPA_TV> \[\d+\/(\d+\]) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//77 Sunset Strip 409 [1 of 23] "77 Sunset Strip 409 The Missing Daddy Caper.avi.vol63+34.par2" yEnc
-		//Barney.Miller.NZBs [001/170] - "Barney.Miller.S01E01.Ramon.nzb" yEnc
-		if (preg_match('/^.+ [\[\(]\d+( of |\/)(\d+[\]\)])[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		//All in the Family - missing eps - DVDRips  "All in the Family - 6x23 Gloria & Mike's House Guests.part5.rar" [08/16] yEnc
-		//Amos 'n' Andy - more shows---read info.txt  "Amos 'n' Andy S01E00 Introduction of the Cast.mkv.001" (002/773) yEnc
-		if (preg_match('/^.+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' [\[\(]\d+\/(\d+[\]\)]) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Andy Griffith Show,The   1x05....Irresistible Andy - (DVD).part04.rar
-		if (preg_match('/^(.+\d+x\d+.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})( yEnc)?( (Series|Season) Finale)?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function comics()
-	{
-		//(The Walking Dead Comics Volume 1) [10/18] - "walking dead 002.cbr" yEnc
-		if (preg_match('/^\((.+)\)[ -]+\[\d+\/\d+\][ -]+".+"[ -]+yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //The Strain -1-9 [Comic] [1/2] - "TSC.nfo" yEnc
-		if (preg_match('/^(.+)[ -]+\[COMIC\][ -]+\[\d+\/\d+\][ -]+".+"[ -]+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} // Return anything between the quotes.
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			if (strlen($match[1]) > 7 && !preg_match('/\.vol.+/', $match[1])) {
-				return $match[1];
-			} else {
-				return array(
-					"cleansubject"  => $this->releaseCleanerHelper($this->subject),
-					"properlynamed" => false
-				);
-			}
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function comics_dcp()
-	{
-		//New Releases 2014.3.20 - "The Silver Surfer 012 (1970-01) (digital) (milton19-Empire).cbr" yEnc
-		if (preg_match('/\d{4}\.(\d{2}\.){2} - "(.+?)\.cb[rz]" yEnc$/i', $this->subject, $match)) {
-			return array('cleansubject' => $match[2], 'properlynamed' => false);
-		}
-		//Re: Req: Dark Tower - The Battle of Jericho Hill 05 (of 05) TIA - File 1 of 1 - yEnc
-		if (preg_match('/(Req?: )+(.+?) - File \d+ of \d+ - yEnc$/i', $this->subject, $match)) {
-			return array('cleansubject' => $match[2], 'properlynamed' => false);
-		}
-		//Amazing Spider-man 306 || FB-DCP scan || 1988 || - "Amazing Spider-man 306 (1988)(FB-DCP)(C2C).CBR" [3/7] yEnc
-		if (preg_match('/\|\| \d{4} \|\| - "(.+?)\.cb[rz]" \[\d+\/\d+\] yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return array('cleansubject' => $match[1], 'properlynamed' => false);
-		}
-		//All-Star Squadron Preview 00 (1981) [HQ rescan] [1/5] - All-Star Squadron Preview 00 (Aug 1981) [HQ rescan] [RexTyler].cbr yEnc
-		//Mad Color Classics (1st time as true CBR) - [1/1] Mad Color Classics 04 {FIXED} (c2c) [True CBR by RexTyler].cbr yEnc
-		//Comico Christmas Special (1988) - [1/5] Comico Christmas Special (1988) [starv].cbr.par2 yEnc
-		if (preg_match('/\s+\[\d+\/\d+\]\s+(-\s+)?([A-Z0-9].+?)(\[.*?(starv|RexTyler).*?\])?\.cb[rz](\.par2)?\s+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return array('cleansubject' => $match[2], 'properlynamed' => false);
-		}
-		//0-Day 2013.8.28 - "Ultimate Comics Spider-Man 026 (2013) complete/unbroken - File 1 of 1 - Ultimate Comics Spider-Man 026 (2013) (Digital) (Zone-Empire).cbr yEnc
-		//Ultimate Comics Spider-Man 026 - File 1 of 1 - Ultimate Comics Spider-Man 026 (2013) (Digital) (Zone-Empire).rar yEnc
-		if (preg_match('/\s+-\s+File \d+ of \d+\s+-\s+([A-Z0-9].+?)\.(cb[rz]|rar)\s+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return array('cleansubject' => $match[1], 'properlynamed' => false);
-		}
-		//Grimm Fairy Tales Myths & Legends 12 - File 1 of 1 - yEnc
-		if (preg_match('/^([a-z0-9].+?)\s+-\s+File \d+ of \d+\s+-\s+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return array('cleansubject' => $match[1], 'properlynamed' => false);
-		}
-		// Return anything between the quotes.
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			if (strlen($match[1]) > 7 && !preg_match('/\.vol.+/', $match[1])) {
-				return array('cleansubject' => $match[1], 'properlynamed' => false);
-			} else {
-				return array(
-					"cleansubject"  => $this->releaseCleanerHelper($this->subject),
-					"properlynamed" => false
-				);
-			}
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function comp()
-	{
-		//(45/74) NikJosuf post Magento tutorials "43 - Theming Magento 19 - Adding a Responsive Slideshow.mp4" yEnc
-		if (preg_match('/^\(\d+\/\d+\) .+? post (.+?) ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Photo Mechanic 5.0 build 13915 (1/6) "Photo Mechanic 5.0 build 13915 (1).par2" - 32,97 MB - yEnc
-		if (preg_match('/^(.{5,}?) \(\d+\/\d+\) ".+?" - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Advanced SystemCare Pro 6.3.0.269 Final ML Incl Serial) [01/10] - "Advanced SystemCare Pro 6.3.0.269 Final ML Incl Serial.nfo" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9. ]{10,}?)\) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/21 Geroellheimer - S01E03 - Swimming Pool Geroellheimer - S01E03 - Swimming Pool.mp4.001" yEnc
-		if (preg_match('/^\[\d+\/\d+ (.+?)(\.(part\d*|rar|avi|iso|mp4|mkv|mpg))?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return implode(' ',
-				array_intersect_key(explode(' ', $match[1]),
-					array_unique(array_map('strtolower',
-						explode(' ', $match[1])))));
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function console_ps3()
-	{
-		//Railfan_JPN_JB_PS3-Caravan [02/88] - "cvn-railfjb.par2" yEnc
-		//Madagascar.Kartz.German.JB.PS3-ATAX [01/40] - "atax-mkgjp.nfo"
-		//Saints_Row_The_Third_The_Full_Package_EUR-PS3-SPLiT [61/87] - "split-sr3fullpps3.r58" yEnc
-		if (preg_match('/^([\w.]+?-?PS3-[a-zA-Z0-9]+) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(4168) [00/24] - "Legend.Of.The.Guardians.Owls.GaHoole.USA.JB.PS3-PSFR33.nzb" yEnc
-		if (preg_match('/^\(\d+\) \[\d+\/\d+\] - "([\w.]{10,}?PS3-[A-Za-z0-9]+?)\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[4230]-[ABGX.net]-[ Air_Conflicts_Pacific_Carriers_USA_PS3-CLANDESTiNE ] (01/54) "clan-aircpc.nfo" yEnc
-		if (preg_match('/^\[\d+\]-\[.+?\]-\[ (.+?) \] \(\d+\/\d+\) ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //.: Birds_of_Steel_PS3-ABSTRAKT :. - .:www.thunder-news.org:. - .:sponsored by secretusenet.com:. - "as-bos.r39" yEnc
-		if (preg_match('/\.: (.+):. - .:www\.thunder-news\.org:. - .:sponsored by secretusenet\.com:\. - ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Armored_Core_V_PS3-ANTiDOTE__www.realmom.info__.r00" (03/78) 3,32 GB yEnc
-		if (preg_match('/^"(.+)__www.realmom.info__.+" \(\d+\/(\d+\)) \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Ace.Combat.Assault.Horizon.PS3-DUPLEX__www.realmom.info__.nfo"  7,14 GB yEnc
-		if (preg_match('/^"(.+)__www.realmom.info__.+"  (\d+[.,]\d+ [kKmMgG][bB]) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Angry Birds USA PSN PSP-NRP.exe" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function cores()
-	{
-		//Film - [13/59] - "Jerry Maguire (1996) 1080p DTS multisub HUN HighCode-PHD.part13.rar" yEnc
-		//Film - "Phone.booth.2003.RERIP.Bluray.1080p.DTS-HD.x264-Grym.part001.rar" yEnc
-		if (preg_match('/^Film - (\[\d+\/\d+\] - )?"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[Art-Of-Use.Net] :: [AUTO] :: - [34/36] - "ImmoralLive.13.11.10.Immoral.Orgies.Rikki.Six.Carmen.Callaway.And.Amanda.Tate.XXX.1080p.MP4-KTR.vol15+16.par2" yEnc
-		if (preg_match('/^\[Art-Of-Use\.Net\] :: \[.+?\] :: - \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.info.net Partner von---- SSL-News.info-----  brothers-of-usenet.info.net Partner von---- SSL-News.info-----AVG.Internet.Security.2014.Build.4335.x86.x64 - "AVG.Internet.Security.2014.Build.4335.vol00+01.PAR2" - 315,68 MB - yEnc
-		if (preg_match('/^brothers-of-usenet\.info\.net.+SSL-News\.info-----(.+) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>GOU<< ZDF.History.Das.Geiseldrama.von.Gladbeck.GERMAN.DOKU.720p.HDTV.x264-TVP >>www.SSL-News.info< - (02/35) - "tvp-gladbeck-720p.nfo" yEnc
-		if (preg_match('/^>+GOU<+ (.+?) >+www\..+?<+ - \(\d+\/\d+\) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<usenet-space-cowboys.info>>> USC <<<Powered by https://secretusenet.com>>> [22/26] - "Zombie.Tycoon.2.Brainhovs.Revenge-SKIDROW.vol00+1.par2" - 1,85 GB yEnc
-		if (preg_match('/^<<<usenet-space-cowboys\.info.+secretusenet\.com>>> \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //::: Usejunkies.tk ::: - [01/11] - "DJ Shog - DNA - HD 720p.par2" - 47,76 MB yEnc
-		if (preg_match('/^.+Usejunkies.tk.+ \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(5/9) :...Usejunkies.tk...:----"Leawo.Blu-ray.Ripper.v4.4.0.rar.vol003+04.par2" - 30.94 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\).+Usejunkies.tk.+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Grimms03e10) [6/9] - "Grimm_S03E10_Eyes_of_the_Beholder.avi.vol007+08.PAR2"Grimm S03E10  yEnc
-		if (preg_match('/^\(.+s\d+e\d+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Jipejans post voor u op www.Dreamplace.biz - [010/568] - "Alien-Antology-DC-Special-Edition-1979-1997-1080p-GER-HUN-HighCode.part009.rar" yEnc
-		//Egbert47 post voor u op www.nzbworld.me - [01/21] - "100 Hits - Lady Sings The Blues 2006 (5cd's).par2" yEnc
-		if (preg_match('/^[a-zA-Z0-9]+ post voor u op www\..+? - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>>> usenet4ever.info <<<+>>> secretusenet.com <<< "Weltnaturerbe USA Grand Canyon Nationalpark 2012 3D Blu-ray untouched  - DarKneSS.part039.rar" - DarKneSS yEnc
-		if (preg_match('/^>+ .+?\.info [<>+]+ .+?\.com <+ "(.+?)\s+- .*?' . $this->e0 .
-			' - .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Old Dad uppt   Der gro?e Gatsby   BD Rip AC3 Line XvidD German  01/57] - "Der gro?e Gatsby.par2" yEnc
-		if (preg_match('/^Old\s+Dad\s+uppt?\s*?(.+?)( mp4| )?\[?\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return preg_replace('/\s\s+/', ' ', $match[1]);
-		}
-		//panter - [46/60] - "68645-Busty Beauties Car Wash XXX 3D BD26.part45.rar" yEnc
-		//Wildrose - [01/57] - "49567-Kleine Rode Tractor Buitenpret.par2" yEnc
-		if (preg_match('/^[A-Za-z]+ - \[\d+\/\d+\] - "\d+-(.+?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<kere.ws> - FLAC - 1330543524 - Keziah_Jones-Femiliarise-PROMO_CDS-FLAC-2003-oNePiEcE - [01/11] - "00-keziah_jones-femiliarise-promo_cds-flac-2003-1.jpg" yEnc
-		if (preg_match('/^<kere\.ws>[ _-]{0,3}\w+(-\w+)?[ _-]{0,3}\d+[ _-]{0,3}(.+) - \[\d+\/\d+\][ _-]{0,3}("|#34;).+?("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Doobz Europa_Universalis_IV_Conquest_of_Paradise-FLT [10/54] - "flt-eucp.001" yEnc
-		if (preg_match('/^Doobz ([a-zA-z-_]+) \[\d+\/(\d+\]) - ".+' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(aangemeld bij usenet collector) [001/125] - "Northern_Exposure_Season_1_dvd_1.par2" yEnc
-		if (preg_match('/^\(aangemeld bij usenet collector\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[15/16] - "Person.of.Interest.S03E09.480p.HDTV.x264-mSD.vol0+1.par2" - 177,28 MB <-> usenet-space-cowboys.info <-> powered by secretusenet.com <-> yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] .+usenet-space-cowboys\.info.+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.info&net-empfehlen-ssl-news.info Black Mirror s01e01 - Der wille des volkes - [09/15] - "Black Mirror - S01E01 - Der Wille des Volkes.vol00+01.par2" yEnc
-		if (preg_match('/^brothers-of-usenet\.info.+ - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(024/264) "Enf.S04E02.G.D.H.X-M.vol51+46.PAR2" - 8,27 GB -Enf.S04.G.D.H.X yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] .+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/10] - "Wondershare.Video.Converter.Ultimate.v6.7.1.0.Multilanguage.par2" - 45,44 MB yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"8 Wenn ich einmal gross bin .mp3" Koelschefetz postet.Die Filue -Immer Wigger  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Adobe Photoshop Lightroom v5.2 - FiNaL - Multilingual [WIN].vol037+32.PAR2  yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) {0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dc()
-	{
-		//brothers-of-usenet.info&net-empfehlen-ssl-news.info (02/51) "Paul.Panzer.-.Hart.Backbord.2012.German.PAL.DVDR-icq4711.part01.rar" - 4,33 GB yEnc
-		if (preg_match('/^brothers-of-usenet.+? \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' - \d+[,.]\d+ [mMkKgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"The.Crow.1994.German.DL.PAL.HD2DVD.DVDR-Braunbaer.par2" yEnc
-		if (preg_match('/^"([\w.]{10,}-[a-zA-Z0-9]+)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Eragon postet  The Secret of Crickley Hall  S01E02  german Sub hardcodet      [02/28] - "the_secret_of_crickley_hall.1x02.hdtv_x264-fov_arc.par2" yEnc
-		if (preg_match('/^[A-Z0-9].+? postet\s+.+?\s+\[\d+\/\d+\] - "([\w.-]{10,}?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Eragon postet Hart of Dixie S02E13 german Sub hardcodet. [02/21] - "hart of dixie S02E13.par2" yEnc
-		if (preg_match('/^[A-Z0-9].+? postet\s+(.+?)\.?\s+\[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>GOU<< - "Internet Download Manager 6.15 Build 1.rar" yEnc
-		if (preg_match('/^>GOU<< - "(.+?)\.rar" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Die.wahren.Faelle.des.NCIS.S01E06.Mord.ohne.Skrupel.GERMAN.DOKU.WS.BDRip.XviD-MiSFiTS - "misfits-therealnciss01e06-xvid.par2" yEnc
-		if (preg_match('/^([\w.]{8,}-[a-zA-Z0-9]+) - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Double.Team.1997.German.FSK18.AC3.DVDRiP.XViD"team-xvid.oppo.par2" yEnc
-		if (preg_match('/^([\w.]{10,})".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function divx_french()
-	{
-		//.oO "20.Years.After.German.2008.AC3.BDRip.XviD.INTERNAL-ARC__www.realmom.info__.nfo" Oo. [02/39] 1,43 GB yEnc
-		if (preg_match('/^\.oO "(.+)__www.realmom.info__.+" Oo. \[\d+\/\d+\] \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function documentaries()
-	{
-		//#sterntuary - Alex Jones Radio Show - "05-03-2009_INFO_BAK_ALJ.nfo" yEnc
-		if (preg_match('/^#sterntuary - (.+? - ".+?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		//(08/25) "Wild Russia 5 of 6 The Secret Forest 2009.part06.rar" - 47.68 MB - 771.18 MB - yEnc
-		//(01/24) "ITV Wild Britain With Ray Mears 1 of 6 Deciduous Forest 2011.nfo" - 4.34 kB - 770.97 MB - yEnc
-		//(24/24) "BBC Great British Garden Revival 03 of 10 Cottage Gardens And House Plants 2013.vol27+22.PAR2" - 48.39 MB - 808.88 MB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) "((BBC|ITV) )?(.+?)(\.part\d+)?(\.(par2|(vol.+?))"|\.[a-z0-9]{3}"|") - \d.+? - (\d.+? -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		} //"Fat Head 2009 Tom Naughton (why we get fat documentary) XVID.par2" (01/66) Paleo Low Carb Gluten-Free Diet yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \(\d+\/\d+\).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[David.Attenboroughs.Natural.Curiosities.2013.5of5.Seeing.the.Pattern.720p.HDTV.x264.AAC-MVGroup]-[03/21] - "danc-e05.r00" yEnc
-		if (preg_match('/^\[(.+?MVGroup)\]-\[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Battlefield S1 S01E04 "Battlefield.104.The.Battle.of.Stalingrad.nfo" yEnc
-		if (preg_match('/^Battlefield S\d S\d+E\d+ "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //BBC The Space Race 1to4of4 (2005) <docu-drama> - "BBC.SR01.par2" yEnc
-		if (preg_match('/^(.+?) <docu-drama> - ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //[ BBC.Time.Machine.Part.1.of.3.2004.DVDRip.x264.AAC.Cht-Eng-Sub.D5799E84-GFC ] [01/17] - "gfc-tm1.sfv" yEnc
-		//[ Discovery.Channel.Discovery.Atlantis.1996.DVDRip.X264.AC3-xslidian ] [01/12] - "d-da.sfv" yEnc
-		//[ Mount.Fuji.2008.blu-ray.x264.720p.AC3-CHD ] [01/48] - "chd-mfj.sfv" yEnc
-		if (preg_match('/^\[ (.+?) \] \[\d+\/\d+\] - ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Rough Cut - Woodworking with Tommy Mac - Pilgrim Blanket Chest (1600s) DVDrip DivX - (02-17) "Rough.Cut-Woodworking.with.Tommy.Mac-Pilgrim.Blanket.Chest.1600s-DVDrip.DivX.2010.par2" - yEnc yEnc
-		if (preg_match('/.*[\(\[]\d+-(\d+[\)\]])[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}("|#34;)).+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		//Asia This Week (NHK World, 19 & 20 July 2013) - 'Malala's movement for girls' education + Japan seeks imports from Southeast Asia - soccer players' - (02|14) - "ATW-2013-07-20.par2" yEnc
-		//Asia Biz Forecast (NHK World, 6 & 7 July 2013) - 'China: limits of growth + Japan: remote access' - (05|14) - "ABF-2013-07-07.part3.rar" yEnc
-		if (preg_match('/(Asia.+) - [\(\[]\d+(\|\d+[\)\]])[-_\s]{0,3}("|#34;).+?(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}("|#34;)).+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Asia Biz Forecast (NHK World, 16-17 June 2012) - "Japan seeks energy options" - File 01 of 14  - ABF-2012-06-16.nfo  (yEnc
-		if (preg_match('/(Asia.+) - File \d+ of (\d+)[-_\s]{0,3}.+?(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}).+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Dark MatterDark Energy S02E06 - "Dark Matter_Dark Energy S02E06 - The Universe - History Channel.part1.rar"  51.0 MBytes yEnc
-		if (preg_match('/^.+? S\d+E\d+ - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'  (\d+[,.]\d+ [kKmMgG][bB]ytes) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //-'- Doc2011 -'- 01/16 - Glorious.Accidents.2011.par2 yEnc
-		if (preg_match('/^.+Doc2011.+ \d+\/\d+ - (.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"BBC.The.Treasures.of.Ancient.Rome.1of3.Warts.n.All.720p.HDTV.x264.AAC.MVGroup.org.mkv.025" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' {1,2}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return preg_replace('/MVGroup.+/', 'MVGroup', $match[1]);
-		} //"Time Team - 2012 - 05 - Beadnell, Northumbria.par2" -  [01 of 84 - 64 kb] yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' -  \[\d+ of \d+ - \d+([,.]\d+)? [kKmMgG][bB]\] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Lang Lang - Mendelssohn.m4v"  [2/9]  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(06/24) "BBC Upgrade Me 2009.part04.rar" - 47.68 MB - 807.79 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] .+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(35/45) - Keating Pt4 - "Keating Pt4.part34.rar" - 1.77 GB - yEnc
-		if (preg_match('/\(\d+\/(\d+\) - .+) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(World Air Routes - WESTJET - B737-700) [028/109] - "World Air Routes - WESTJET - B737-700.part027.rar" yEnc
-		if (preg_match('/^\(.+?\)\[\d+\/(\d+\][-_\s]{0,3}.+?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //Beyond Vanilla (2010) Documentary DVDrip XviD-Uncut - (02/22) "Beyond.Vanilla.2010.Documentary.DVDrip.XviD-Uncut.par2" - yenc yEnc
-		if (preg_match('/(.+?) - [\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}("|#34;).+?(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Michael Woods, The Story Of India - Beginnings 1of6.avi.013 - [14/62] yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) - \[\d+\/\d+\] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //PBS Nature The Private Life of Deer (01/23) - "PBS Nature 2013 The Private Life of Deer 720p x264 AAC.part01.rar" - 1.41 GB yEnc
-		if (preg_match('/^PBS.+\(\d+\/\d+\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //PBS - Inside Nature's Giants - Big Cats [100 of 101] "PBS - Inside Nature's Giants - Big Cats.m4v.vol970+143.par2" yEnc
-		if (preg_match('/^PBS.+\[\d+ of \d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //59/63 "Gates Of Heaven.vol023+19.PAR2" yEnc
-		if (preg_match('/^\d+\/\d+ "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Asia Biz Forecast (NHK World, 9 & 10 November 2013) - 'Mizuho: Shadow banking' (01|14) - "ABF-2013-11-09.nfo" yEnc
-		if (preg_match('/^(.+?) \(\d+\|\d+\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //TG1 "Top.gear.the.perfect.road.trip.2013.vol0000+128.PAR2" :: [01/10] yEnc
-		if (preg_match('/^[\w ]+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'(.+[\(\[]\d+\/\d+[\)\]])?[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Walmart - The High Cost of Low Prices]-[28/59] - "wthcolp.part26.rar" yEnc
-		if (preg_match('/^\[([\w- ]+)\]-\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[SR09-0013] - "America Revealed E02 Nation On The Move (2012) x264 720p AC3 5.1.nfo" yEnc
-		if (preg_match('/^\[[\w- ]+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Panzer III - Medium Tank The German War Files - Panzer III - Germany's WWII Medium Tank.part05.rar" yEnc
-		if (preg_match('/^([\w- ]+.+?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(World Air Routes - Turkish Airlines B777-300ER) [001/114] - "World Air Routes - Turkish Airlines B777-300ER.par2" yEnc
-		if (preg_match('/^\(World Air Routes.+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [001/137] - "BBC.Attenborough.Zoo.Quest.Assorted.WebRips.par2" yEnc
-		if (preg_match('/\(\?+\) \[\d+\/\d+\] - "(.+)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //dokus4alle presents (01/52) "BBC.Tweed.1of3.Trouble.Looms.H264.AAC.nfo" - 603.24 MB - yEnc
-		if (preg_match('/^dokus4alle presents \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[U4A]-[After Porn Ends DOCU WEBRip X264 AAC]-[01/65] - "after.porn.ends.par2" yEnc
-		if (preg_match('/^\[U4A\]-\[(.+)\]-\[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dvd()
-	{
-		//thnx to original poster [00/98] - "2669DFKKFD2008.nzb ` 2669DFKKFD2008 " yEnc
-		if (preg_match('/^thnx to original poster \[\d+(\/\d+\] - ".+?)(\.part\d*|\.rar)?(\.vol.+?|\.[A-Za-z0-9]{2,4})("| `).+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dvd_movies()
-	{
-		//Skata - Clouzot - Messa Da Requiem (49 / 79) - "Skata - Clouzot - MDR.part47.rar" yEnc
-		if (preg_match('/^Skata - (.+) \(\d+ \/ \d+\) - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(????) [02361/43619] - "18j  Amy-superlange Beine.exe" yEnc
-		if (preg_match('/\(\?+\) \[\d+\/\d+\] - "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Mutant.Chronicles.German.2008.AC3.DVDRip.XviD.(01/40) "Mutant.Chronicles.German.2008.AC3.DVDRip.XviD.nfo" yEnc
-		if (preg_match('/.*"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dvdr()
-	{
-		//Golem.The.Petrified.Garden.1993.NTSC.DVDR-FiCODVDR [001/111] - #34;ficodvdr-golempet.nfo#34; yEnc
-		if (preg_match('/^([a-zA-Z].+) \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dvd_german()
-	{
-		//.oO "20.Years.After.German.2008.AC3.BDRip.XviD.INTERNAL-ARC__www.realmom.info__.nfo" Oo. [02/39] 1,43 GB yEnc
-		if (preg_match('/^\.oO "(.+)__www.realmom.info__.+" Oo. \[\d+\/\d+\] \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dvd_r()
-	{
-		//katanxya "katanxya7221.par2" yEnc
-		if (preg_match('/^katanxya "(katanxya\d+)/', $this->subject, $match)) {
-			return $match[1];
-		} //[01/52] - "H1F3E_20130715_005.par2" - 4.59 GB yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([A-Z0-9](19|20)\d\d[01]\d[123]\d_\d+\.).+?" - \d+[,.]\d+ [mMkKgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ebook()
-	{
-		//New eBooks 8 June 2013 - "Melody Carlson - [Carter House Girls 08] - Last Dance (mobi).rar"
-		if (preg_match('/^New eBooks.+[ _-]{0,3}("|#34;)([\w., &\'()-]{8,}?\b)\.(par|vol|rar|nfo).*?("|#34;)/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Rowwendees post voor u op www.nzbworld.me - [0/6] - "Animaniacs - Lights, Camera, Action!.nzb" yEnc (1/1)
-		if (preg_match('/www.nzbworld.me - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' yEnc/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Re: Tune In: The Beatles: All These Years (Mark Lewisohn) - Lewisohn, Mark - Tune In- the Beatles- All These Years, Volume 01 -  [epub].rar  yEnc
-		//Re: REQ: Robert Edsel The Monuments Men - Edsel, Robert M - The Monuments Men- Allied Heroes, Nazi Thieves, and the Greatest Treasure Hunt in History (Retail) [epub].rar  yEnc
-		if (preg_match('/^Re:(Req:)? [\w:()\?\' -]+ - ([\w ,.()\[\]-]{8,}?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		if (preg_match('/^\(Nora Roberts\)"([\w., &\'()-]{8,}?\b)\.(epub|mobi|html|pdf|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Zelazny works) [36/39] - "Roger Zelazny - The Furies.mobi" yEnc
-		if (preg_match('/\((.+works)\) \[\d+\/(\d+\]) - ([\w., &\'()-]{8,}?\b)\.(mobi|pdf|epub|html|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(Joan D Vinge sampler) [17/17] - "Joan D Vinge - World's End.txt" yEnc
-		if (preg_match('/^\([a-zA-Z ]+ sampler\) \[\d+(\/\d+\]) - "([\w., &\'()-]{8,}?\b)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//New - Retail - Juvenile Fiction - "Magic Tree House #47_ Abe Lincoln at Last! - Mary Pope Osborne & Sal Murdocca.epub" yEnc
-		//New - Retail - "Linda Howard - Cover of Night.epub" yEnc
-		//New - Retail - "Kylie Logan_Button Box Mystery 01 - Button Holed.epub" yEnc
-		if (preg_match('/^New - Retail -( Juvenile Fiction -)? "([\w., &\'()-]{8,}?\b)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(No. 1 Ladies Detective Agency) [04/13] - "Alexander McCall Smith - No 1-12 - The Saturday Big Tent Wedding Party.mobi" yEnc
-		if (preg_match('/^\(No\. 1 Ladies Detective Agency\) \[\d+(\/\d+\]) - "([\w., &\'()-]{8,}?\b)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[25/33] Philip Jose Farmer - Toward the Beloved City [ss].mobi
-		//[2/4] Graham Masterton - Descendant.mobi
-		if (preg_match('/^\[\d+\/(\d+\]) ([\w., &\'()-]{8,}?\b)\.(txt|pdf|mobi|epub|azw)/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//(NordicAlbino) [01/10] - "SWHQ_NA_675qe0033102suSmzSE.sfv" yEnc
-		//365 Sex Positions A New Way Every Day for a Steamy Erotic Year [eBook] - (1/5) "365.Sex.Positions.A.New.Way.Every.Day.for.a.Steamy.Erotic.Year.eBook.nfo" - yenc yEnc
-		if (preg_match('/(.+)[-_\s]{0,3}[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '([-_\s]{0,3}yEnc){1,2}$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[001/125] (NL Epub Wierook Set 49) - "Abulhawa, Susan - Litteken van David_Ochtend in Jenin.epub" yEnc
-		if (preg_match('/^\[\d+\/\d+\] .+? - "([\w., &\'()-]{8,}?\b)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/1) "Radiological Imaging of the Kidney - E. Quaia (Springer, 2011) WW.pdf" - 162,82 MB - (Radiological Imaging of the Kidney - E. Quaia (Springer, 2011) WW) yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w., &\'()-]{8,}?\b)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/7) "0865779767.epub" - 88,93 MB - "Anatomic Basis of Neurologic Diagnosis - epub" yEnc
-		if (preg_match('/^\(\d+\/\d+\) ".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")([-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB])?[-_\s]{0,3}"([\w., &\'()-]{8,}?\b)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		}
-		//Re: REQ: Jay Lake's Mainspring series/trilogy (see titles inside) - "Lake, Jay - Clockwork Earth 03 - Pinion [epub].rar"  405.6 kBytes yEnc
-		//Attn: Brownian - "del Rey, Maria - Paradise Bay (FBS).rar" yEnc
-		//New Scan "Herbert, James - Sepulchre (html).rar" yEnc
-		if (preg_match('/^(Attn:|Re: REQ:|New Scan).+?[-_\s]{0,3}"([\w., &\'()-]{8,}?\b)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}(\d+[.,]\d+ [kKmMgG][bB](ytes)?)? yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//"Gabaldon, Diana - Outlander [5] The Fiery Cross.epub" yEnc
-		//Kiny Friedman "Friedman, Kinky - Prisoner of Vandam Street_ A Novel, The.epub" yEnc
-		if (preg_match('/.*"([\w., &\'()-]{8,}?\b)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Patterson flood - Mobi -  15/45  "James Patterson - AC 13 - Double Cross.mobi"
-		if (preg_match('/(.+?)[-_ ]{0,4}\d+\/\d+[-_\s]{0,3}([\w. &\'()\[\]-]{8,}?\b.?)\.(txt|pdf|mobi|epub|azw)"( \(\d+\/\d+\))?( )?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //--- Michael Dobbs - House of Cards.mobi  yEnc
-		if (preg_match('/^--- ([\w., &\'()-]{8,}?\b)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //'Steel's Edge - Ilona Andrews.epub'  yEnc
-		if (preg_match('/^\'([\w. &\'()\[\]-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})\'[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1 of 1] - Howard Gordon - Gideon's War & Hard Target.epub  yEnc
-		if (preg_match('/^\[\d+ of \d+\][-_\s]{0,3}([\w. &\'()\[\]-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //1 Playboy-Ausgabe vom Jnner 1953 [RARITT].rar  yEnc
-		if (preg_match('/^([\w. &\'\[\]-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Re: Req: Please, does anyone have Scott Berg's Wilson biography? MTIA... - A. Scott Berg - Wilson.epub  yEnc
-		if (preg_match('/^.+ - ([^.]{8,})\.[A-Za-z0-9]{2,4}[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //REQ: "Keep it Pithy" by Bill O'Reilly "Keep It Pithy - Bill O'Reilly.epub"yEnc
-		if (preg_match('/.*"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)\.[A-Za-z0-9]{2,4}"[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //For Your Eyes Only - Ian Fleming.epub - answering my own request  yEnc
-		if (preg_match('/^([^.]{8,})\.[A-Za-z0-9]{2,4}.+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function e_book()
-	{
-		//New eBooks 8 June 2013 - "Melody Carlson - [Carter House Girls 08] - Last Dance (mobi).rar"
-		if (preg_match('/^New eBooks.+[ _-]{0,3}("|#34;)(.+?.+)\.(par|vol|rar|nfo).*?("|#34;)/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		if (preg_match('/^\(Nora Roberts\)"(.+?)\.(epub|mobi|html|pdf|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Doctor Who - Target Books [128/175] - "DW125_ Terror of the Vervoids - Pip Baker.mobi" yEnc
-		if (preg_match('/^Doctor Who - Target Books \[\d+\/(\d+\]) - "DW[0-9]{0,3}[-_\s]{0,3}(.+?)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(American Curves - Summer 2012) [01/10] - "AMECURSUM12.par2" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9 -]+)\) \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(NordicAlbino) [01/10] - "SWHQ_NA_675qe0033102suSmzSE.sfv" yEnc
-		//365 Sex Positions A New Way Every Day for a Steamy Erotic Year [eBook] - (1/5) "365.Sex.Positions.A.New.Way.Every.Day.for.a.Steamy.Erotic.Year.eBook.nfo" - yenc yEnc
-		if (preg_match('/(.+)[-_\s]{0,3}[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[1/8] - "Robin Lane Fox - Travelling heroes.epub" yEnc
-		//(1/1) "Unintended Consequences - John Ross.nzb" - 8.67 kB - yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}")([-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB])?[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Mega Dating and Sex Advice Ebooks - Tips and Tricks for Men PDF ] - "Vatsyayana - The Kama Sutra.pdf.rar" - (54/58) yEnc
-		if (preg_match('/^[\(\[] .+? [\)\][-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //WWII in Photos - "WWII in Photos_05_Conflict Spreads Around the Globe - The Atlantic.epub" yEnc
-		if (preg_match('/^(WWII in Photos)[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Various ebooks on History pdf format  "Chelsea House Publishing Discovering U.S. History Vol. 8, World War I and the Roaring Twenties - 1914-1928 (2010).pdf"  [1 of 1] yEnc
-		if (preg_match('/^.+?"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}\[\d+ of (\d+\])[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //A few things -  [4 of 13] "Man From U.N.C.L.E. 08 - The Monster Wheel Affair - David McDaniel.epub" yEnc
-		if (preg_match('/.+[\(\[]\d+ of \d+[\)\]] "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //DDR Kochbuch 1968-wir kochen gut [1/1] - "DDR Kochbuch 1968-wir kochen gut.pdf" toby042002
-		if (preg_match('/.+[\(\[]\d+\/\d+[\)\]] - "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}") toby\d+$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Pottermore UK retail - "Harry Potter and the Goblet of Fire - J.K. Rowling.epub" (05/14) - 907.57 kB - yEnc
-		if (preg_match('/^.+?[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}") [\(\[]\d+\/\d+[\)\]] ([-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB])?[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[001/125] (NL Epub Wierook Set 49) - "Abulhawa, Susan - Litteken van David_Ochtend in Jenin.epub" yEnc
-		if (preg_match('/^\[\d+\/\d+\] .+? - "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/1) "Radiological Imaging of the Kidney - E. Quaia (Springer, 2011) WW.pdf" - 162,82 MB - (Radiological Imaging of the Kidney - E. Quaia (Springer, 2011) WW) yEnc
-		if (preg_match('/^\(\d+\/\d+\) "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/7) "0865779767.epub" - 88,93 MB - "Anatomic Basis of Neurologic Diagnosis - epub" yEnc
-		if (preg_match('/^\(\d+\/\d+\) ".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")([-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB])?[-_\s]{0,3}"(.+?)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		}
-		//Re: REQ: Jay Lake's Mainspring series/trilogy (see titles inside) - "Lake, Jay - Clockwork Earth 03 - Pinion [epub].rar"  405.6 kBytes yEnc
-		//Attn: Brownian - "del Rey, Maria - Paradise Bay (FBS).rar" yEnc
-		//New Scan "Herbert, James - Sepulchre (html).rar" yEnc
-		if (preg_match('/^(Attn:|Re: REQ:|New Scan).+?[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}(\d+[.,]\d+ [kKmMgG][bB](ytes)?)? yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//"Gabaldon, Diana - Outlander [5] The Fiery Cross.epub" yEnc
-		//Kiny Friedman "Friedman, Kinky - Prisoner of Vandam Street_ A Novel, The.epub" yEnc
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Patterson flood - Mobi -  15/45  "James Patterson - AC 13 - Double Cross.mobi"
-		if (preg_match('/(.+?)[-_\s]{0,3}\d+\/(\d+[-_\s]{0,3}".+?)\.(txt|pdf|mobi|epub|azw)"( \(\d+\/\d+\))?( )?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //04/63  Brave New World Revisited - Aldous Huxley.mobi  yEnc
-		if (preg_match('/\d+\/\d+[-_\s]{0,3}(.+)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- Campbell, F.E. - Susan - HIT 125.rar  BDSM Themed Adult Erotica - M/F F/F - Rtf & Pdf
-		if (preg_match('/^- (.+?)\.(par|vol|rar|nfo)[-_\s]{0,3}(.+)/', $this->subject, $match)) {
-			return $match[1];
-		} //"D. F. Jones - 03 - Colossus and The Crab.epub" (1/3)
-		if (preg_match('/^"(.+?)\.(txt|pdf|mobi|epub|azw)" \(\d+\/(\d+\))/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"D. F. Jones - 01 - Colossus.epub" (note the space on the end)
-		if (preg_match('/^"(.+?)\.(txt|pdf|mobi|epub|azw|lit|rar|nfo|par)" $/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/19] - "13_X_Panzer_Tracts_EBook.nfo " yEnc
-		if (preg_match('/^\[\d*+\/(\d+\]) - "(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4} "|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[09/14] Sven Hassel - Legion of the Damned 09, Reign of Hell.mobi  sven hassel as requested (1/7) yEnc
-		//[1/1] Alex Berenson - John Wells 05, The Secret Soldier.mobi (space at end)
-		if (preg_match('/^\[\d+\/(\d+\]) (.+?)\.(txt|pdf|mobi|epub|azw|lit|rar|nfo|par).+?(yEnc)?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[1/1] - "Die Kunst der Fotografie Lehrbuch und Bildband f  r ambitionierte Fotografen.rar"
-		//[1/1] - "Demonic_ How the Liberal Mob Is Endanger - Coulter, Ann.mobi" (note space at end)
-		//[1/1] - "Paris in Love_ A Memoir - Eloisa James.mobi"  1861K
-		if (preg_match('/^\[\d+\/(\d+\]) - "(.+?)\.(txt|pdf|mobi|epub|azw|lit|rar|nfo|par)"(  \d+K)?( )?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //002/240  Swordships.of.Scorpio.(Dray.Prescot).-.Alan.Burt.Akers.epub
-		if (preg_match('/^\d+\/(\d+)[-_\s]{0,3}(.+?)\.(txt|pdf|mobi|epub|azw|lit|rar|nfo|par)$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Akers Alan Burt - Dray Prescot Saga 14 - Krozair von Kregen.rar yEnc
-		if (preg_match('/^([a-zA-Z0-9. ].+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function e_book_flood()
-	{
-		//New eBooks 8 June 2013 - "Melody Carlson - [Carter House Girls 08] - Last Dance (mobi).rar"
-		if (preg_match('/^New eBooks.+[ _-]{0,3}("|#34;)(.+?.+)\.(par|vol|rar|nfo).*?("|#34;)/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//World War II History - "Spies of the Balkans - Alan Furst.mobi" yEnc
-		//True Crime  "T. J. English - Havana Nocturne (v5.0).mobi" yEnc
-		//E C Tubb Flood - "E C Tubb - Dumarest 31 The Temple of Truth.epub" - yEnc
-		if (preg_match('/^[A-Za-z ]+[-_\s]{0,3}"(.+?)\.(txt|pdf|mobi|epub|azw)"[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //SFF Dump - "Thomas M. Disch - Camp Concentration.epub" (1033/1217) - 226.47 kB - yEnc
-		if (preg_match('/^SFF Dump - "(.+?)\.(txt|pdf|mobi|epub|azw)" \(\d+\/\d+\) - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(American Curves - Summer 2012) [01/10] - "AMECURSUM12.par2" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9 -]+)\) \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Patterson flood - Mobi -  15/45  "James Patterson - AC 13 - Double Cross.mobi"
-		if (preg_match('/(.+?)[-_\s]{0,3}\d+\/(\d+[-_\s]{0,3}".+?)\.(txt|pdf|mobi|epub|azw)"( \(\d+\/\d+\))?( )?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//Re: REQ: Jay Lake's Mainspring series/trilogy (see titles inside) - "Lake, Jay - Clockwork Earth 03 - Pinion [epub].rar"  405.6 kBytes yEnc
-		//Attn: Brownian - "del Rey, Maria - Paradise Bay (FBS).rar" yEnc
-		//New Scan "Herbert, James - Sepulchre (html).rar" yEnc
-		if (preg_match('/^(Attn:|Re: REQ:|New Scan).+?[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}(\d+[.,]\d+ [kKmMgG][bB](ytes)?)? yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//"Gabaldon, Diana - Outlander [5] The Fiery Cross.epub" yEnc
-		//Kiny Friedman "Friedman, Kinky - Prisoner of Vandam Street_ A Novel, The.epub" yEnc
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[001/125] (NL Epub Wierook Set 49) - "Abulhawa, Susan - Litteken van David_Ochtend in Jenin.epub" yEnc
-		if (preg_match('/^\[\d+\/\d+\] .+? - "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/1) "Radiological Imaging of the Kidney - E. Quaia (Springer, 2011) WW.pdf" - 162,82 MB - (Radiological Imaging of the Kidney - E. Quaia (Springer, 2011) WW) yEnc
-		if (preg_match('/^\(\d+\/\d+\) "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/7) "0865779767.epub" - 88,93 MB - "Anatomic Basis of Neurologic Diagnosis - epub" yEnc
-		if (preg_match('/^\(\d+\/\d+\) ".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")([-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB])?[-_\s]{0,3}"(.+?)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		}
-		//Re: REQ: Jay Lake's Mainspring series/trilogy (see titles inside) - "Lake, Jay - Clockwork Earth 03 - Pinion [epub].rar"  405.6 kBytes yEnc
-		//Attn: Brownian - "del Rey, Maria - Paradise Bay (FBS).rar" yEnc
-		//New Scan "Herbert, James - Sepulchre (html).rar" yEnc
-		if (preg_match('/^(Attn:|Re: REQ:|New Scan).+?[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}(\d+[.,]\d+ [kKmMgG][bB](ytes)?)? yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//*FULL REPOST* New eBooks 26 Nov 2012 & 20% PAR2 Set -  "Elisabeth Kyle - The Captain's House (siPDF).rar"
-		//*REPOST* New eBooks 23 Nov 2012 -  "Charles Culver - [The 11th Floor 02] - Awakening (mobi).rar"
-		if (preg_match('/^\*(FULL )?REPOST\* New eBooks.+[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}")$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//1 - 5 July 2013 - Search for number at end of title - Bevin Alexander - How Hitler Could Have Won World War II- The Fatal Errors That Lead to Nazi Defeat (epub).rar - 14418-25255-6053.rar.txt yEnc
-		//10 July 2013 - Search 4 Numeric String at End of Subject - Andew Hodges - Alan Turing- The Enigma (Centenary Edition) (kf8 mobi).rar = 21317-25234-21710.rar.txt yEnc
-		if (preg_match('/^.+?Search (for|4) (number|Numeric String) at end of (title|Subject)[-_\s]{0,3}(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4})[-\=_ ]{0,3}\d+[-_\s]{0,3}.+?yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		} //"Back to Pakistan_ A Fifty-Year Journey - Leslie Noyes Mass.pdf"  2778K
-		if (preg_match('/^"(.+)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}\d+[kKmMgG]$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[002/182] A. E. Van Vogt - The Anarchistic Colossus.mobi  mobi flood
-		//[002/115] Alan Dean Foster - Alien.mobi  sf single author flood
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}(.+)\.(txt|pdf|mobi|epub|azw)[-_\s]{0,3}.+flood( )?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[2/4] Graham Masterton - Descendant.mobi
-		if (preg_match('/^\[\d+\/(\d+\]) (.+?)\.(txt|pdf|mobi|epub|azw)/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//14. Alexander Kent - [Bolitho 12] - Signal Close Action (v2.0) (epub).epubAs Req Alexander Kent  yEnc
-		//22.The Darkening Sea - Alexander Kent.epubAs Req Alexander Kent  yEnc
-		if (preg_match('/^\d+\. {0,1}(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})As Req.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //reposting 2012-10-31 new ebooks with 35.74 pars - AD&D - [Tomes] - The Rod of Seven Parts - Douglas Niles (mobi).rar  yEnc
-		if (preg_match('/^reposting \d+-\d+-\d+ new ebooks.+ pars[-_\s]{0,3}(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //15 - Men at Arms.pdf  yEnc
-		if (preg_match('/^\d+ - (.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Filling Req for Delderfield- To Serve Them All My Days - R F Delderfield.mobi [6/6] -  yEnc
-		//Filling Request - Armistead Maupin - 1 - Tales of the City.mobi [1/8] -  yEnc
-		if (preg_match('/^Filling Req(uest)?( for \w+)?[-_\s]{0,3}(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) \[\d+\/\d+\] -  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //ATTN:Fozz E Bear Rogue - Danielle Steel.epub  yEnc
-		if (preg_match('/^ATTN:Fozz E Bear (.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //As Requested - Silent Spring - Rachel Carson.epub [1/2] -  yEnc
-		if (preg_match('/^As Requested - (.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) \[\d+\/\d+\] -  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Attn: fastpiety - your requests - Countess of Carnarvon - Lady Almina and the Real Downton Abbey- The Lost Legacy of Highclere Castle (epub).epub [1/1] -  yEnc
-		if (preg_match('/^Attn: fastpiety - your requests[-_\s]{0,3}(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) \[\d+\/\d+\] -  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Amanda Ashley - [Night 02] - Night's Touch (v5.0) (epub).epub  yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //A Game of Thrones 01- George R. R. Martin.mobi_as found  yEnc
-		if (preg_match('/^([^.]{8,})\.[A-Za-z0-9]{2,4}_as found[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Ben Carson - America the Beautiful- Rediscovering What Made This Nation Great (epub).epub - File 1 of 1 - yEnc
-		if (preg_match('/^([^.]{8,})\.[A-Za-z0-9]{2,4}[-_\s]{0,3}File \d+ of \d+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Re: Attn Reg143- (Morse 7) The Secret of Annexe 3 - Colin Dexter.mobi [11/14] -  yEnc
-		if (preg_match('/^Re: Attn Reg143- ([^.]{8,})\.[A-Za-z0-9]{2,4}[-_\s]{0,3}\[\d+\/\d+\][- ]{0,4}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //New eBooks 20 Aug 2012 - File 001 of 409 - yEnc
-		if (preg_match('/^([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}File \d+ of \d+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Re: Request  - 05 L. E. Modesitt - Princeps.mobi [5/7] -  yEnc
-		if (preg_match('/^Re: Request[- ]{0,4}\d+[-_\s]{0,3}([^.]{8,})([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}\[\d+\/\d+\][- ]{0,4}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Bighathi) [4/4] - "Letters to Penthouse XXiLetters to Penthouse XXI - The Editors of Penthouse Magazine.epub" yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(HUMAN BIO & MED 207) [02/39] - "Organic Chemistry 6th ed - L. Wade {SOLUTIONS MANUAL - J. Simek] (Pearson, 2006) WW.pdf" *REPOST* yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+REPOST.+[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //01 - The Colour of Magic.pdf yEnc
-		if (preg_match('/^\d+[-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //(Esperanto novel) - H.A. Luyken - Pro ICtar.epub yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //All I have - not checked John D MacDonald - April Evil.epub yEnc
-		if (preg_match('/^All I have - not checked[-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //As req  "Aftermath - Peter Robinson.mobi" yEnc Peter Robinson - Inspector Banks 12
-		if (preg_match('/^As req[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '[-_\s]{0,3}yEnc.+$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //As req  "Aftermath - Peter Robinson.mobi" yEnc Peter Robinson - Inspector Banks 12
-		if (preg_match('/^Attn.+\[\d+-\d+\][-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //ATTN: Robert A. Ely - Wilde, Lori - Zero Control [html].rar yEnc
-		if (preg_match('/^Attn:[-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //ATTN: Drake@Darkest air.com - Kurtz, Katherine - Heirs of Saint Camber 03 - The Bastard Prince [txt].zip yEnc
-		if (preg_match('/^Attn:.+\.com[-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //reposting 2012-10-27 new ebooks with 35.74 pars - M William Phelps - Sleep In Heavenly Peace (mobi).rar yEnc
-		if (preg_match('/^reposting.+pars[-_\s]{0,3}([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];} //A Tradition of Victory - Alexander Kent.epub yEnc
-		if (preg_match('/^([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		}
-		//"Gabaldon, Diana - Outlander [5] The Fiery Cross.epub" yEnc
-		//Kiny Friedman "Friedman, Kinky - Prisoner of Vandam Street_ A Novel, The.epub" yEnc
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function e_book_german()
-	{
-		//.::::(eBook)::::. [01/10] - "Althaus modernisieren Magazin 08 09 2013.par2" - 65,71 MB yEnc
-		if (preg_match('/^.+\(eBook\).+?\[\d+\/\d+\] - "(.+?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//ATTN: falsifies RE: REQ:-Pathfinder RPG anything at all TIA [362/408] - "Pathfinder_-_PZO1110B_-_Pathfinder_RPG_-_Beta_Playtest_-_Prestige_Enhancement.pdf" yEnc
-		if (preg_match('/^.+?\[\d+\/(\d+\]) - "(.+?)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//"Abe, Shana - Der träumende Diamant 2 - Erdmagie.epub" yEnc
-		if (preg_match('/^"(.+?)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(1/1) "B  rse Online - No 30 2013.pdf" - 4,03 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "(.+?)\.(txt|pdf|mobi|epub|azw)"[-_\s]{0,3}\d+([.,]\d+)? [kKmMgG][bB][-_\s]{0,3}[-_\s]{0,3}yEnc$/ui',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function e_book_rpg()
-	{
-		//ATTN: falsifies RE: REQ:-Pathfinder RPG anything at all TIA [362/408] - "Pathfinder_-_PZO1110B_-_Pathfinder_RPG_-_Beta_Playtest_-_Prestige_Enhancement.pdf" yEnc
-		if (preg_match('/^.+?\[\d+\/(\d+\]) - "(.+?)\.(txt|pdf|mobi|epub|azw)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ebook_magazines()
-	{
-		// [Top.Gear.South.Africa-February.2014] - "Top.Gear.South.Africa-February.2014.pdf.vol00+1.par2" yEnc  - 809.32 KB
-		if (preg_match('/^\[(.+?)\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ebook_technical()
-	{
-		//ASST NEW MTLS 13 MAR 2012 A  -  [106/116] - "The Elements of Style, Illus. - W. Strunk Jr., E. White, M. Kalman (Penguin, 2005) WW.pdf" yEnc
-		if (preg_match('/ASST (NEW|OLD) MTLS.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/', $this->subject, $match)) {
-			return $match[2];
-		} //"ASTG TRANSMISSON REBUILD MANUALS FOR BMW.rar.par2" [07/73] yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //(???) [1/1] - "Asimov, Isaac - [Foundation 01] - De Foundation_v2.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(07/14) "NS120107 07Jan12.pdf" - 238.80 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		} //(103 eBooks On Music Production) [071/111] - "Pro Enginner School Vol. 1 + 2 By Record-Producer.com PDF.rar" yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //((BIO & MED 008) [29/64] - "Acupuncture Therapy for Neurological Diseases - Y. Xia, et al., (Springer, 2010) WW.pdf" *REPOST* yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+REPOST.+[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		} //(Bighathi) [4/4] - "Letters to Penthouse XXiLetters to Penthouse XXI - The Editors of Penthouse Magazine.epub" yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(Repost) Computing (Recent) [32 of 44] "Professional XMPP Programming (Wrox, 2010).pdf" yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}[\w]+[-_\s]{0,3}\(.+\)[-_\s]{0,3}\[\d+ of \d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //48 Unsorted E-books (03-12-2010) [49/52] - "Zend Framework 1.8 Web Application Development.pdf" yEnc
-		if (preg_match('/^\d+.+E-books[-_\s]{0,3}.+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //A large collection of programming ebooks [128 of 527] "Eckel - Thinking in C++ - Volume II - 2e (Prentice, 2000).pdf" yEnc
-		if (preg_match('/^A large collection of programming ebooks [-_\s]{0,3}\[\d+ of \d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //"Make Magazine - Volume 03.pdf" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //ADVANCES in CHEMICAL ENGINEERING 22aug11 [8 of 30] "Advances in Chemical Engineering Vol 20 Kwauk (AP 1994).pdf" yEnc
-		if (preg_match('/"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Arduino Books by Request  [9/9] - "iOS Sensor Apps with Arduino - A. Allan (O'Reilly, 2011) WW.pdf" (1/114) yEnc
-		if (preg_match('/"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function erotica()
-	{
-		//[######]-[FULL]-[#a.b.teevee@EFNet]-[ Misfits.S01.SUBPACK.DVDRip.XviD-P0W4DVD ] [1/5] - "Misfits.S01.SUBPACK.DVDRip.XviD-P0W4DVD.nfo" yEnc
-		if (preg_match('/\[#+\]-\[.+?\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //NihilCumsteR [1/8] - "Conysgirls.cumpilation.xxx.NihilCumsteR.par2" yEnc
-		if (preg_match('/^NihilCumsteR \[\d+\/\d+\] - "(.+?)NihilCumsteR\./', $this->subject, $match)) {
-			return $match[1];
-		} //[01/13] - "Mahina.Zaltana.14.01.17.720p.x264-DFury.7z.001" yEnc
-		if (preg_match('/^\[\s?\d+\/\d+\s?\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //>>>>>Hell-of-Usenet.org>>>>> - [01/23] - "Cum Hunters 3 XXX.par2" yEnc
-		if (preg_match('/^[><]+Hell-of-Usenet\.org[<>]+ - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Lesbian Crush Diaries 5 XXX DVDRip x264-Pr0nStarS - (01/26) "Lesbian.Crush.Diaries.5.XXX.DVDRip.x264-Pr0nStarS.nfo" - yenc
-		if (preg_match('/^[A-Z0-9][a-zA-Z0-9 -]{8,}? - \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' - yenc yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Megan Coxxx Takes Out Her Favourite Strap On Dildos And Plays With Her Girlfriend Re - File 01 of 67 - "Toy_Stories.r00.par2" yEnc
-		if (preg_match('/^([A-Z0-9][a-zA-Z0-9 ]{8,}?) - File \d+ of \d+ - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //[02/21] - "Staendig Feucht.part01.rar" - 493.38 MB ....::::UR-powered by SecretUsenet.com::::.... yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' - \d+[.,]\d+ [kKmMgG][bB] .+? yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Big Tits in Sport 12 (2013) XXX DVDRip x264-CHiKANi - (03/39) "Big.Tits.in.Sport.12.XXX.DVDRip.x264-CHiKANi.part01.rar" - yenc yEnc
-		if (preg_match('/^[A-Z0-9].{8,}? - \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' - yenc yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //"Babysitters_a_Slut_4_Scene_4.part01.rar"_SpotBots yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜߤƒ„¶!.,&;_()\[\]\'\`-]{8,})' . $this->e0 . '_SpotBots yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //<<<>>CowboyUp2012 XXX><<<Is.Not.Force.It.My.Younger.SOE-806.Jav.Censored.DVDRip.XviD-MotTto>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "Is.Not.Force.It.My.Younger.SOE-806.Jav.Censored.DVDRip.XviD-MotTto.part01.rar" >< 01/15 (1,39
-		if (preg_match('/^.+?usenet-space.+?Powered by.+? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+? \d+\/(\d+.+?)$/', $this->subject, $match)) {
-			return $match[1];
-		} //Fake Taxi E58 - Taylor[01/23] - "faket.e58.taylor.part01.rar" yEnc
-		if (preg_match('/^(Fake Taxi E\d+.+?)\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Flapdrol mp4 - "HotKinkyJo - 2013-12-28 - Pink Leopard toys sex movie.part5.rar" yEnc
-		if (preg_match('/^Flapdrol mp4 - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //[U4A][-always take the post from the first and original poster!-] - "VIDEOOT-10VSN01.vol27+23.PAR2" yEnc
-		if (preg_match('/^\[U4A\]\[.+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //VolSpuitenMetBud - - [14/26] - "SexuallyBroken - 2013-12-30 - Stunning Cherie DeVille turned into blowjob device, hardcore deepthroating, relentless pounding! Cherie DeVille & Matt Williams.part13.rar" yEnc
-		if (preg_match('/^VolSpuitenMetBud - - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //..::kleverig.eu::.. [01/18] - "CQVNAj4WLDW_7Bm8Ax6J.par2" - 686,38 MB yEnc
-		if (preg_match('/^.+[Kk]leverig\.eu.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		} //Brazilian.Transsexuals.SR.UD.12.28.13.HD.720p.HDL [19 of 24] "JhoanyWilkerXmasLD_1_hdmp4.mp4.vol00+1.par2" yEnc
-		if (preg_match('/^([\w\säöüÄÖÜߤƒ„¶!.,&;_()\[\]\'\`-]{8,})[-_\s]{0,3}[\(\[]\d+ of (\d+[\)\]])[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(????) [01/18] - "Blonde Cutie Seduces Her Step Dad Black Market.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //- - [001/202] - "epAgY717nUChOeWswZR4.par2" yEnc
-		if (preg_match('/^[-_\s]{0,4}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //- "ADJG3HG2H1U9YHDGHD5GA8H.par2" yEnc
-		if (preg_match('/^[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //- "dvd_10-96CEA81F.part1.rar" - [3/9] - 1,21 GB - yEnc
-		if (preg_match('/^[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}\d+([.,]\d+)? [kKmMgG][bB][-_\s]{0,3}[-_\s]{0,3}yEnc$/u', $this->subject, $match)) {
-			return $match[1];
-		} //- (01/74) - "50.Shades.Of.Dylan.Ryan.DVDRip.AVC.par2" yEnc
-		if (preg_match('/^[-_\s]{0,3}\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //"HD_1110.part01.rar"_SpotBots yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '_SpotBots[-_\s]{0,3}yEnc$/u', $this->subject, $match)) {
-			return $match[1];
-		} //( DreadysCEMPenetrationshumides(1977) )  ** By Dready Niek** ) [11/25] - "DreadysCEMPenetrationshumides(1977).part10.rar" yEnc
-		if (preg_match('/^\(\s*.+\s*\)\s*.+By Dready Niek.+\s*\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"Dreadys([^.]{8,})' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(  [  Magma classic - Tyra Misoux-Schwere Jungs Und Leichte Madchen  ]   ) [01/16] - ".par2" yEnc
-		if (preg_match('/^\(\s*\[\s*[Mm]agma classic[-_\s]{0,3}([\w\säöüÄÖÜߤƒ„¶!.,&;_()\[\]\'\`-]{8,})\s*\]\s*\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(01/21) - New.Nippi.Video.The.Artist - "Next.Door.Nikki.Sims.2013-05-03_the_artist.jpeg" - 574.84 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}New\.Nippi.+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		} //VolSpuitenMetBud - - [42/59] - "SexuallyBroken - 2012-11-19 - Apartment 345; A Feature Presentation of Real life fantasies from your favorite porn stars!, Penny Pax & Matt Williams & PD.part41.rar" yEnc
-		if (preg_match('/^VolSpuitenMetBud[-_\s]{0,5}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //PNG170514XW042SOE9[01/35] - "PNG170514XW042SOE9.jpg" yEnc
-		if (preg_match('/^[\w]+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			if (!preg_match('/^\[\s*\d+\s*\]/', $this->subject)) {
-				return $match[1];
-			}
-		} //(31/31) "Sex And Submission 2009 - 08.vol134+128.PAR2" - 2,05 GB -==UR-powered by SecretUsenet.com==- yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '[-_\s]{0,3}\d+([.,]\d+)? [kKmMgG][bB][-_\s]{0,3}.+yEnc$/i', $this->subject, $match)) {
-			return $match[1];
-		} //[http://www.hillysex.nl] - "H9DR3647K8V2Z5CG.par2" yEnc
-		if (preg_match('/^\[http:\/\/www\.hillysex\.nl\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //klokhuis(????) [01/28] - "Klokhuis-Hello-Titty-06.par2" yEnc
-		if (preg_match('/\w+\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(011/107) - v2v  - "0203114movie-eng-a.part10.rar" - 1,26 GB - yEnc
-		if (preg_match('/\(\d+\/\d+\)[-_\s]{0,3}v(2v)?[-_\s]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[2];
-		} //(????) [01/15] - "MRGVGoVNJ3_hc.par2" yEnc
-		if (preg_match('/\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(Czech Amateurs 01) [30/43] - "CZEAMA01.part29.rar" yEnc
-		if (preg_match('/\(([\w\s-]{8,})\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(????) [01/15] - "PMRJDNN.par2" yEnc
-		// *Note space after yEnc
-		if (preg_match('/\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '[-_\s]{0,3}yEnc $/iu', $this->subject, $match)) {
-			return $match[1];
-		} //"Cuties 6.part.vol551+106.par2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function erotica_divx()
-	{
-		// BBC190215XPLPU31SW[02/28] - "BBC190215XPLPU31SW.par2" yEnc
-		if (preg_match('/^\w+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function etc()
-	{
-		//[scnzbefnet] Were.the.Millers.2013.EXTENDED.720p.BluRay.x264-SPARKS [01/61] - "were.the.millers.2013.extended.720p.bluray.x264-sparks.nfo" yEnc
-		if (preg_match('/^\[scnzbefnet\] (.+?) \[\d+\/(\d+\]) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //..:[DoAsYouLike]:..    116,12 MB    "Graphite v8.9.17 SP4R4.nfo"    3,00 kB yEnc
-		if (preg_match('/^.+\[DoAsYouLike\].+\d+[.,]\d+ [kKmMgG][bB].+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '    (\d+[.,])?\d+ ([kKmMgG])?[bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(047/550) "Enf.S02E02.G.D.D.W.7.H.x2-e.vol105+99.PAR2" - 36,13 GB -Enf.S02.G.D.D.W.7.H.x2-e yEnc
-		//[3/3] - "Mayle Peter - Der Coup von Marseille.epub.vol0+1.par2" - 956,83 kB {UR} yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Old but Sold>>>  <<< >< >< "German Top 50 ODC - 12.08.2013.nfo" >< 02/33 (541,61 MB) >< 10,93 kB > yEnc
-		if (preg_match('/^.+Old but Sold.+>< "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' >< \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\).+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<THOR for Usenet-Space-Cowboys>>> - 1Password V1.0.9.236 Setup Key.PAR2  yEnc
-		if (preg_match('/^.+Usenet-Space-Cowboys.+> - ([A-Z0-9][a-zA-Z0-9\. ]{6,})([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}).+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //704900999555666777123978 - [398/415] - "Jormungand Complete [720p] mHD.part31.rar" yEnc
-		if (preg_match('/^\d+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Man.Of.Steel.2013.BRRip.x264.AC3-UNiQUE - [02/38] - "Man.Of.Steel.2013.BRRip.x264.AC3-UNiQUE.part01.rar" yEnc
-		if (preg_match('/^[\w. -]+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w.()-]{8,}?\b)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<< old but sold >>>> < USC> <"K11 - Kommissare im Einsatz (DE) NDS.part3.rar">[04/11] 74,54 MB yEnc
-		if (preg_match('/^.+old but sold.+([\w. ()-]{8,}?\b)' . $this->e0 .
-			'>\[\d+\/\d+\][-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Uploader.Presents-ACDC.Let.There.Be.Rock.1980.720p.BluRay.DD5.1.x264-DON(00/47]"rock.ac3.720p.nzb" yEnc
-		if (preg_match('/^Uploader\.Presents-([\w. ()-]{8,}?\b)[\(\[]\d+\/\d+\]".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Bitsum.Technologies.Process.Lasso.Pro.v6.5.00.Cracked-EAT - [3/4] - "eat.vol0+1.par2" yEnc
-		if (preg_match('/^([\w.()-]{8,})[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<usenet-space-cowboys.info>>> USC <<<Powered by https://secretusenet.com><Medieval Wii Pal>< "Medieval Wii Pal.vol108+29.par2" >< 60/60 (4,82 GB) >< 95,77 MB > yEnc
-		if (preg_match('/^.+?usenet-space.+?Powered by.+? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+? \d+\/(\d+.+?)$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Uploader.Presents-ACDC.Let.There.Be.Rock.1980.720p.BluRay.DD5.1.x264-DON(00/47]"rock.ac3.720p.nzb" yEnc
-		if (preg_match('/^Uploader\.Presents-([\w. ()-]{8,}?\b)[\(\[]\d+\/\d+\]".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Bitsum.Technologies.Process.Lasso.Pro.v6.5.00.Cracked-EAT - [3/4] - "eat.vol0+1.par2" yEnc
-		if (preg_match('/^([\w.()-]{8,})[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<usenet-space-cowboys.info>>> USC <<<Powered by https://secretusenet.com><Medieval Wii Pal>< "Medieval Wii Pal.vol108+29.par2" >< 60/60 (4,82 GB) >< 95,77 MB > yEnc
-		if (preg_match('/^.+?usenet-space.+?Powered by.+? ([\w. ()-]{8,}?\b)' . $this->e0 .
-			'.+? \d+\/(\d+.+?)$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //W33d5.S01.720p.BluRay.x264 - "W33d5.S01.720p.BluRay.x264.part63.rar" yEnc
-		if (preg_match('/^[\w. -]+[-_\s]{0,3}"([\w.()-]{8,}?\b)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Man.Of.Steel.2013.BRRip.x264.AC3-UNiQUE - [02/38] - "Man.Of.Steel.2013.BRRip.x264.AC3-UNiQUE.part01.rar" yEnc
-		if (preg_match('/^[\w. -]+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w.()-]{8,}?\b)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>GOU<< XUS Clock Plus v1.5.0 with Key [TorDigger].PAR2 >>www.SSL-News.info<  yEnc
-		if (preg_match('/^>GOU<< ([\w.\[\]() -]{8,}?\b)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rarr|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}).+www\.SSL-News\.info<[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Man.Of.Steel.2013.BRRip.x264.AC3-UNiQUE - [02/38] - "Man.Of.Steel.2013.BRRip.x264.AC3-UNiQUE.part01.rar" yEnc
-		if (preg_match('/^[\w. -]+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w.()-]{8,}?\b)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>GOU<< XUS Clock Plus v1.5.0 with Key [TorDigger].PAR2 >>www.SSL-News.info<  yEnc
-		if (preg_match('/^>GOU<< ([\w.\[\]() -]{8,}?\b)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rarr|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}).+www\.SSL-News\.info<[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Drains_READNFO-VACE.nfo" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function frogs()
-	{
-		//[.in] X-Art.13.03.08.Angelica.Spilled.Milk.XXX.540p-WMV [02/23] - "X-Art.13.03.08.Angelica.Spilled.Milk.XXX.540p-WMV.r00" yEnc
-		if (preg_match('/\[\.in\][-_\s]{0,3}.*[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Beachbody.ShaunT.Focus.T25 [01/39] - "Beachbody.ShaunT.Focus.T25.DVD3.Ab.Intervals.par2" yEnc
-		if (preg_match('/\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ftn()
-	{
-		//(aangemeld bij usenet collector) [181/190] - "Ally_McBeal_Season_3_Dvd_4.vol0176+176.par2" yEnc
-		//Usenet collector(aangemeld bij usenet collector) [001/124] - "Northern_Exposure_Season_4_dvd_2.par2" yEnc
-		if (preg_match('/^(Usenet collector)?\(aangemeld.+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"Family Games-OUTLAWS.nfo" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Adobe Photoshop Lightroom v5.2 - FiNaL - Multilingual [WIN].vol037+32.PAR2  yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) {0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Wondershare AllMyTube 3.8.0.4 + Patch) [01/12] - "Wondershare AllMyTube 3.8.0.4 + Patch.nfo" yEnc
-		if (preg_match('/^\(([\w+ .()-]{8,})\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [10/26] - "The.Young.Riders.S01E02.480pWEB-DL.AAC2.0.H.264-AJP69.part09.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function fz()
-	{
-		//>ghost-of-usenet.org>Monte.Cristo.GERMAN.2002.AC3.DVDRiP.XviD.iNTERNAL-HACO<HAVE FUN> "haco-montecristo-xvid-a.par2" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org>(.+?)<.+?> ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function game()
-	{
-		//[192474]-[MP3]-[a.b.inner-sanctumEFNET]-[ Newbie_Nerdz_-_I_Cant_Forget_that_Girl_EP-(IM005)-WEB-2012-YOU ] [17/17] - "newbie_nerdz_-_i_cant_forget_that_girl_ep-(im005)-web-2012-you.nfo" yEnc
-		if (preg_match('/(\[[\d#]+\]-\[.+?\]-\[.+?\]-)\[ (.+?) \][- ]\[\d+\/\d+\] - "(.+?)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function games()
-	{
-		//>ghost-of-usenet.org>Monte.Cristo.GERMAN.2002.AC3.DVDRiP.XviD.iNTERNAL-HACO<HAVE FUN> "haco-montecristo-xvid-a.par2" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org>(.+?)<.+?> ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //<ghost-of-usenet.org>XCOM.Enemy.Unknown.Deutsch.Patch.TokZic [0/9] - "XCOM Deutsch.nzb" ein CrazyUpp yEnc
-		if (preg_match('/^<ghost-of-usenet\.org>(.+?) \[\d+\/\d+\] - ".+?" .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Dawn.of.Fantasy.Kingdom.Wars-PROPHET ] - [12/52] - "ppt-dfkw.part04.rar" yEnc
-		if (preg_match('/^\[ ([-.a-zA-Z0-9]+) \] - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.info/.net <<<Partner von SSL-News.info>>> - [11/17] - "Reload.Outdoor.Action.Target.Down.GERMAN-0x0007.vol003+004.PAR2" yEnc
-		if (preg_match('/\.net <<<Partner von SSL-News\.info>>> - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[162198]-[FULL]-[a.b.teevee]-[ MasterChef.Junior.S01E07.720p.HDTV.X264-DIMENSION ]-[09/54] - "masterchef.junior.107.720p-dimension.nfo" yEnc
-		if (preg_match('/\[[\d#]+\]-\[.+?\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/(\d+\])[-_\s]{0,3}("|#34;).+?/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"A.Stroke.of.Fate.Operation.Valkyrie-SKIDROW__www.realmom.info__.nfo" (02/38) 1,34 GB yEnc
-		if (preg_match('/^"(.+)__www.realmom.info__.+" \(\d+\/\d+\) \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Mad.Men.S06E11.HDTV.x264-2HD.par2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Marvels.Agents.of.S.H.I.E.L.D.S01E07.HDTV.XviD-FUM.avi.nfo" [09/16] yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[ _-]{0,3}\[\d+\/(\d+\])[ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [03/20] - "Weblinger - The.Haunted.House.Mysteries.v1.0-ZEKE.part01.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(001/132) "Harry.Potter.And.The.Goblet.Of.Fire.2005.810p.BluRay.x264.DTS.PRoDJi.nfo" - 8,71 GB - yEnc
-		//(01/11) - Description - "ba588f108dbd068dc93e4b0182de652d.par2" - 696,63 MB - yEnc
-		//(01/11) "Microsoft Games for Windows 8 v1.2.par2" - 189,87 MB - [REPOST] yEnc
-		//(01/24) "ExBrULlNjyRPMdxqSlJKEtAYSncStZs3.nfo" - 3.96 kB - 404.55 MB - yEnc
-		//(01/44) - - "Wii_2688_R_Knorloading.par2" - 1,81 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)( - Description)?[-_ ]{0,5}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'( - \d+([.,]\d+ [kKmMgG])?[bB])? - \d+([.,]\d+ [kKmMgG])?[bB][-_\s]{0,3}(\[REPOST\] )?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(01/59) - [Lords-of-Usenet] presents Sins.of.a.Solar.Empire.Rebellion.Forbidden.Worlds-RELOADED - "rld-soaserfw.nfo" - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - \[Lords-of-Usenet\] presents (.+?)[-_\s]{0,3}".+?' .
-			$this->e0 . ' - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(19/28) "sr-joedanger.rar" - 816,05 MB -Joe.Danger-SKIDROW yEnc
-		//(39/40) "flt-ts31554.vol061+57.PAR2" - 1,43 GB -The_Sims_3_v1.55.4-FLTDOX yEnc
-		if (preg_match('/^\(\d+\/(\d+\))[-_\s]{0,3}".+?' . $this->e0 .
-			' - \d+([.,]\d+ [kKmMgG])?[bB] -([a-zA-Z0-9-_\.]+) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[8];
-		} //[02/17] - "Castle.Of.Illusion.Starring.Mickey.Mouse.PSN.PS3-DUPLEX.nfo" yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[PROPER] FIFA.14.PAL.XBOX360-iNSOMNi [008/100]- "ins-fifa14pal.r05" yEnc
-		if (preg_match('/^\[PROPER\] ([a-zA-Z0-9-_\.]+) [\(\[]\d+\/\d+[\)\]][-_\s]{0,3}".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<< Alien Zombie Death v2 EUR PSN PSP-PLAYASiA >>>> < USC> <"Alien Zombie Death v2 EUR PSN PSP-PLAYASiA.part4.rar">[06/16] 153,78 MB yEnc
-		if (preg_match('/^<<<< ([a-zA-Z0-9-_ ]+) >>>> < USC> <".+?' . $this->e0 .
-			'>\[\d+\/(\d+\]) \d+([.,]\d+ [kKmMgG])?[bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<usenet-space-cowboys.info>>> fuzzy <<<Powered by https://secretusenet.com><Adventures To Go EUR PSP-ZER0>< "Adventures To Go EUR PSP-ZER0.nfo" >< 2/6 (195,70 MB) >< 10,70 kB > yEnc
-		if (preg_match('/^<<<.+\.info>>> fuzzy <<<Powered by .+secretusenet\.com><([a-zA-Z0-9-_ ]+)>< ".+?' .
-			$this->e0 .
-			' >< \d+\/(\d+) \(\d+([.,]\d+ [kKmMgG])?[bB]\) >< \d+([.,]\d+ [kKmMgG])?[bB] > yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //FTDWORLD.NET| Grand.Theft.Auto.V.XBOX360-QUACK [020/195]- "gtavdisc1.r17" yEnc
-		if (preg_match('/^FTDWORLD\.NET\| ([a-zA-Z0-9 -_\.]+) \[\d+\/(\d+\])- ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(FIFA 14 Demo XBOX) [001/163] - "FIFA 14 Demo.part.par2" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9 -_\.]+)\) \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[16/62]  (CastleStorm.XBLA.XBOX360-MoNGoLS) - "mgl-cast.part15.rar" yEnc
-		if (preg_match('/^\[\d+\/(\d+\])  \(([a-zA-Z0-9 -_\.]+)\) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //GOGDump Wing Commander - Privateer (1993) [GOG] [03/14] - "Wing Commander - Privateer (1993) [GOG].part2.rar" yEnc
-		if (preg_match('/^GOGDump (.+) \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Uploader.Presents-Metal.Gear.Rising.Revengeance-RELOADED(51/65]"rld-megerire.r48" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+)[\(\[]\d+\/\d+\]".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Uploader.Presents-LEGO.The.Hobbit-RELOADED (????) [01/90] - "rld-legoho.nfo" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+?) \(\?+\) \[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //( Overlord II RELOADED ) - [013/112] - "rld-olii.part001.rar" yEnc
-		if (preg_match('/^\( ([\w. -]{8,}) \)[-_\s]{0,3}\[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Baku.No.JAP.Working.PSP-PaL - [1/7] - "Baku.No.JAP.Working.PSP-PaL.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9 -\._]+) - \[\d+\/(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<Old but Sold> <<<usenet-space-cowboys.info>>> USC <<<Powered by secretusenet.com><Flatout WII Format WBFS>< "Flatout WII Format WBFS.part20.rar" >< 21/35 (1,39 GB) >< 47,68 MB > yEnc
-		if (preg_match('/^.+old but sold.+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' >< \d+\/\d+[-_\s]{0,3}\(\d+[.,]\d+ [kKmMgG][bB]\) >< \d+[.,]\d+ [kKmMgG][bB] >[-_\s]{0,3}yEnc$/ui',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Tiny Toon Adventures Buster & The Beanstalk PSX2PSP         - "EBOOT.nzb" yEnc
-		if (preg_match('/^([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?)[-_\s]{4,10}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>>> www.lords-of-usenet.org <<< "SpongeBob & Freunde - Schlacht um die Vulkaninsel.part21.rar" (PS2 Game) [22/33] - [1,15 GB] yEnc
-		if (preg_match('/^>>> www\.lords-of-usenet\.org <<< "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '( \(PS2 Game\)) \[\d+\/\d+\] - \[\d+([.,]\d+ [kKmMgG])?[bB]\] yEnc$/ui',
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . $match[7];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function games_dox()
-	{
-		//[142961]-[MP3]-[a.b.inner-sanctumEFNET]-[ Pascal_and_Pearce-Passport-CDJUST477-2CD-2011-1REAL ] [28/36] - "Pascal_and_Pearce-Passport-CDJUST477-2CD-2011-1REAL.par2" yEnc
-		if (preg_match('/(\[[\d#]+\]-\[.+?\]-\[.+?\]-)\[ (.+?) \][- ]\[\d+\/\d+\] - "(.+?)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[NEW DOX] The.King.of.Fighters.XIII.Update.v1.1c-RELOADED [1/6] - "The.King.of.Fighters.XIII.Update.v1.1c-RELOADED.par2" yEnc
-		//[NEW DOX] Crysis.3.Crackfix.3.INTERNAL-RELOADED [00/12] ".nzb"  yEnc
-		if (preg_match('/^\[NEW DOX\][ _-]{0,3}(.+?)[ _-]{0,3}\[\d+\/\d+\][ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[NEW DOX] Minecraft.1.6.2.Installer.Updated.Server.List  - "Minecraft 1 6 2 Cracked Installer Updater Serverlist.nfo" - yEnc
-		if (preg_match('/^\[NEW DOX\][ _-]{0,3}(.+?)[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Assassins.Creed.3.UPDATE 1.01.CRACK.READNFO-P2P  00/17 ] "Assassins.Creed.3.UPDATE 1.01.nzb" yEnc
-		if (preg_match('/^\[ ([a-zA-Z0-9-\._ ]+)  \d+\/(\d+ \]) ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[01/16] - GRID.2.Update.v1.0.83.1050.Incl.DLC-RELOADED - "reloaded.nfo" - yEnc
-		//[12/17] - Call.of.Juarez.Gunslinger.Update.v1.03-FTS - "fts-cojgsu103.vol00+01.PAR2" - PC - yEnc
-		if (preg_match('/^\[\d+\/(\d+\]) - ([a-zA-Z0-9-\.\&_ ]+) - ".+?' . $this->e0 .
-			'( - PC)? - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[36/48] NASCAR.The.Game.2013.Update.2-SKIDROW - "sr-nascarthegame2013u2.r33" yEnc
-		if (preg_match('/^\[\d+\/(\d+\]) ([a-zA-Z0-9-\._ ]+) ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[Grand_Theft_Auto_Vice_City_1.1_Blood_NoCD_Patch-gimpsRus]- "grugtavc11bcd.nfo" yEnc
-		if (preg_match('/^\[([a-zA-Z0-9-\._ ]+)\]- ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //[OLD DOX] (0001/2018) - "18.Wheels.of.Steel.American.Long.Haul.CHEAT.CODES-RETARDS.7z" - 1,44 GB - yEnc
-		if (preg_match('/^\[OLD DOX\][ _-]{0,3}\(\d+\/\d+\)[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+[,.]\d+ [mMkKgG][bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Endless.Space.Disharmony.v1.1.1.Update-SKIDROW - [1/6] - "Endless.Space.Disharmony.v1.1.1.Update-SKIDROW.nfo" - yEnc
-		if (preg_match('/^([a-zA-Z0-9-\._ ]+) - \[\d+\/(\d+\]) - ".+?' . $this->e0 . '{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(F.E.A.R.3.Update.1-SKIDROW) [01/12] - "F.E.A.R.3.Update.1-SKIDROW.par2" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9-\._ ]+)\) \[\d+\/(\d+\]) - ".+?' . $this->e0 .
-			'{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Company.of.Heroes.2.Update.v3.0.0.9704.Incl.DLC.GERMAN-0x0007) - "0x0007.nfo" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9-\._ ]+)\) - ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function games_wii()
-	{
-		//"National.Geographic.Challenge.USA.WII-dumpTruck__www.realmom.info__.jpg" (003/111) 4,81 GB yEnc
-		if (preg_match('/^"(.+)__www.realmom.info__.+" \(\d+\/\d+\) \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Cabelas_North_American_Adventure_USA_WII-ZRY-Scrubbed-xeroxmalf]-[#a.b.g.w@efnet]-[www.abgx.net]-[01/27] - "Cabelas_North_American_Adventure_USA_WII-ZRY-Scrubbed-xeroxmalf.par2" yEnc
-		if (preg_match('/^\[(.+)\]-\[#a.b.g.w@efnet\]-\[www.abgx.net\]-\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//4300 World.Sports.Competition.USA.VC.Wii-OneUp....... AmigaOS4.1 RULEZ [0/9] - "4300.nzb" yEnc
-		//4300 1695.World.Sports.Competition.USA.VC.Wii-OneUp....... AmigaOS4.1 RULEZ [0/9] - "4300.nzb" yEnc
-		if (preg_match('/^\d+ (\d+\.)?(.+-OneUp).+ \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //6717 - Baseball.Stars.2.PAL.VC.NG.Wii-OneUp - 01/11 - "1u-baseball-stars-2-pal.nfo" yEnc
-		if (preg_match('/^\d+ - (.+-OneUp).+ \d+\/\d+ - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[2103]-[abgx.net] Harvey_Birdman_Attorney_At_Law-USA-WII [000/104] - "Harvey_Birdman_Attorney_At_Law-USA-WII.nzb" yEnc
-		if (preg_match('/^\[\d+\]-\[abgx.net\] (.+) \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(3790)-[abgx.net]-[Samurai_Warriors_Katana_USA-WII]-[000/105] - "3790.nzb" yEnc
-		if (preg_match('/^\(\d+\)-\[abgx.net\]-(.+)-\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[REQ# 7134] Full 105 Cocoto_Magic_Circus_PAL_Wii-OE PAL "oe-magic.r00" 4.57 GB yEnc
-		if (preg_match('/^\[REQ# \d+\] Full \d+ (.+) PAL ("|#34;).+("|#34;) \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[11614]-[#a.b.g.wii@efnet]-[ EA.Sports.Active.NFL.Training.Camp.USA.WII-ProCiSiON ]-[01/95] - "xxx-nflt.nfo" yEnc
-		if (preg_match('/\[[\d#]+\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/\d+\][-_\s]{0,3}".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[8524]-[#a.b.g.wii@EFNet]-[FULL]-[Fantastic_Four_Rise_Of_The_Silver_Surfer_NTSC_Wii-VORTEX]-[001/104] - "vortex-ffrotss.wii.nfo" yEnc
-		if (preg_match('/\[[\d#]+\]-\[.+?\]-\[.+?\]-\[(.+?)\][- ]\[\d+\/\d+\][-_\s]{0,3}".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[13118]-[abgx]-[FULL]-[Doods_Big_Adventure_PAL_WII-PLAYME]-po0p?!-[000/103] - "13118.nzb" yEnc
-		if (preg_match('/^\[\d+]-\[abgx\]-\[FULL\]-\[(.+)-PLAYME\]-po0p.+-\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[13208]-[#ab@EFNet]-[FULL]-[Calvin_Tuckers_Farm_Animal_Racing_PAL_Wii-WiiERD]-po0p!-[072/112] - "w-ctfar.r68" yEnc
-		if (preg_match('/^\[\d+]-\[#ab@EFNet\]-\[FULL\]-\[(.+)-WiiERD\]-po0p.+-\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(www.Thunder-News.org) >Winter.Stars.USA.WII-dumpTruck< <Sponsored by AstiNews> - (001/112) - "dumptruck-winterstars.par2" yEnc
-		if (preg_match('/^\(www\.Thunder-News\.org\) ?>(.+)< ?<Sponsored.+>[ _-]{0,3}(\(\d+\/\d+\)|\[\d+\/\d+\])?[ _-]{0,5}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[9987]-[#a.b.g.wii@efnet]-[ Tales.of.Elastic.Boy.Mission.1.USA.WiiWare.Wii-OneUp ]-[01/12] - #34;1u-tales-of-elastic-boy-mission-1.nfo#34; yEnc
-		if (preg_match('/^\[\d+]-\[#a\.b\.g\.wii@efnet\]-\[ ?(.+) ?\]-\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[2207] Swing_Golf_Pangya_JPN_Wii-Caravan NTSC-J DVD5 [001/102] - "cvn-sgp.nfo" yEnc
-		if (preg_match('/^\[\d+\] (.+) NTSC-J DVD5 \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[3867] FaceBreaker.K.O.Party.PAL.Wii-RANT <>000/110<> "3867.nzb" yEnc
-		if (preg_match('/^\[\d+\] (.+) <>\d+\/\d+<> ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[COMPRESSED] Family_Feud_2010_Edition_USA_Wii-QwiiF [01/26] - "Family_Feud_2010_Edition_USA_Wii-QwiiF.par2" yEnc
-		if (preg_match('/^\[COMPRESSED\] (.+) \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[COMPRESSED] Rooms.The.Main.Building.USA.WII-SUSHi - su-rousa.par2 [01/18] (1/1) (1/1) yEnc
-		if (preg_match('/^\[COMPRESSED\] (.+) - .+ \[\d+\/\d+\] .+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //WII4U - thinkSMART.Family.USA.WII-dumpTruck - [01/15] - "dumptruck-tf.par2" yEnc
-		if (preg_match('/^WII4U - (.+) - \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Old but Sold>>> <<< >< >< "Rogue Trooper The Quartz Zone Massacre (2009)PAL Wii" >< 037/131 () >< > yEnc
-		if (preg_match('/^<<<Old but Sold>>> <<< >< >< ("|#34;)(.+)("|#34;) >< \d+\/\d+ \(\) >< > yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[6840]-[abgx@Efnet]-[My.Fitness.Coach.NTSC-WII-ProCiSiON] - (001/110) "xxx-mfc.par2" - 4.76 GB yEnc
-		if (preg_match('/^\[\d+\]-\[abgx@Efnet\]-\[(.+)\] - \(\d+\/\d+\) ".+".+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[6820]-[abgx@Efnet]-[Full]-[Cotton_Fantastic_Night_Dreams_NTSC_RF_TG16-CD.iNJECT_iNTERNAL_VC_Wii-0RANGECHiCKEN]- [01/16] - 0c-cotton-rf.nfo (1/1) (1/1) yEnc
-		if (preg_match('/^\[\d+\]-\[abgx@Efnet\]-\[Full\]-\[(.+)\][ -]+\[\d+\/\d+\] .+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[3488] [#alt.binaries.games.wii@efnet] [Blades.Of.Steel.USA.VC.Wii-DiPLODOCUS] [0/8] 3488.nzb (1/1) (1/1) yEnc
-		if (preg_match('/^\[\d+\] \[#alt\.binaries\.games\.wii@efnet\] \[(.+)\] \[\d+\/\d+\].+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<Little.League.World.Series.Double.Play.USA.WII-dumpTruck> [001/110] - "Little.League.World.Series.Double.Play.USA.WII-dumpTruck.par2" yEnc
-		if (preg_match('/^<(.+)> \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function games_xbox360()
-	{
-		//Uploader.Presents-Injustice.Gods.Among.Us.Ultimate.Edition.XBOX360-COMPLEX(02/92]"complex-injustice.ultimate.nfo" yEnc
-		//Uploader.Presents-Need.For.Speed.Rivals.XBOX360-PROTOCOL[10/94]"nfs.r-ptc.r07" yEnc
-		if (preg_match('/^Uploader.Presents-(.+?)[\(\[]\d+\/\d+\]".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//place2home.net - Call.of.Duty.Ghosts.XBOX360-iMARS - [095/101] - "imars-codghosts-360b.vol049+33.par2" yEnc
-		//Place2home.net - Diablo_III_USA_RF_XBOX360-PROTOCOL - "d3-ptc.r34" yEnc
-		if (preg_match('/^place2home\.net - (.*?) - (\[\d+\/\d+\] - )?".+?" yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Arcana_Heart_3_PAL_XBOX360-ZER0__www.realmom.info__.nfo" (02/89) 7,58 GB yEnc
-		if (preg_match('/^"(.+)(__www\.realmom\.info__)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}") [\[\(]\d+\/(\d+[\]\)]) \d+[,.]\d+ [mMkKgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/15) "Mass.Effect.3.Collectors.Edition.DLC.JTAG-XPG.par2" - 747.42 MB - yEnc
-		if (preg_match('/^[\[\(]\d+\/(\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(????) [00/28] - "Farming.Simulator.XBOX360.JTAG.RGH.nzb" yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(14227) BloodRayne_Betrayal_XBLA_XBOX360-XBLAplus [01/25] - "xp-blobe.nfo" yEnc
-		if (preg_match('/^\(\d+\)[-_\s]{0,3}(.+)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(14811) [#alt.binaries.games.xbox360@EFNet]-[AMY_XBLA_XBOX360-XBLAplus]-[]-  "xp-amyxb.nfo"  yEnc
-		if (preg_match('/^(\(\d+\))[-_\s]{0,3}\[.+EFNet\][-_\s]{0,3}\[(.+)\][-_\s]{0,3}\[\][-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(14872) [#alt.binaries.games.xbox360@EFNet]-[BlazBlue_CS_System_Version_Data_Pack_1.03-DLC_XBOX360]-  "xp-bbcssvdp103.nfo"  yEnc
-		if (preg_match('/^(\(\d+\))[-_\s]{0,3}\[.+EFNet\][-_\s]{0,3}\[(.+)\][-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(44/82) - Fuzion_Frenzy_2_REPACK-USA-XBOX360-DAGGER - "ff2r-dgr.041" - 6.84 GB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\))[-_\s]{0,3}(.+?)[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[  14047  ] - [ ABGX@EFNET ] - [  Rock.Band.Pearl.Jam.Ten.DLC.XBOX360-FYK ALL DLC    ] -  (01/46) "rbpjtdlc-fyk.nfo" - 526,92 MB - yEnc
-		//[  14046  ] - [ ABGX@EFNET ] - [  Rock_Band-2011-07-19-DLC_XBOX360-XBLAplus ALL   ] -  (01/12) "xp-rb-2011-07-19.nfo" - 198,70 MB - yEnc
-		//[ 14102 ] -[ ABGX.NET ] - [ F1.2010.XBOX360-COMPLEX NTSC DVD9  ] -  (01/79) "cpx-f12010.nfo" - 6,57 GB - yEnc
-		if (preg_match('/^\[[-_\s]{0,3}(\d+)[-_\s]{0,3}\][-_\s]{0,3}\[ ABGX.+\][-_\s]{0,3}\[[-_\s]{0,3}(.+)[-_ ]{0,4}\][-_ ]{0,4}\(\d+\/\d+\)[-_\s]{0,3}"(.+?)(\.part\d*|\.rar)?(\.vol.+\(\d+\\d+\)"|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}\d+[,.]\d+ [mMkKgG][bB][-_\s]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//[ 17956]-[FULL]-[ abgx360EFNet ]-[ F1_2012_JPN_XBOX360-Caravan ]-[78/99] - "cvn-f12012j.r75" yEnc
-		//[ 17827]-[FULL]-[ #abgx360@EFNet ]-[ Capcom_Arcade_Cabinet_XBLA_XBOX360-XBLAplus ]-[01/34] - "xp-capac.nfo" yEnc
-		if (preg_match('/^\[[-_\s]{0,3}(\d+)[-_\s]{0,3}\][-_\s]{0,3}\[FULL\][-_\s]{0,3}\[ (abgx360EFNet|#abgx360@EFNet) \][-_\s]{0,3}\[[-_\s]{0,3}(.+)[-_\s]{0,3}\][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"(.+?)(\.part\d*|\.rar)?(\.vol.+\(\d+\\d+\)"|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //[ GAMERZZ ] - [ Grand.Theft.Auto.V.XBOX360-COMPLEX ] [159/170] - "complex-gta5.vol000+18.par2" yEnc
-		if (preg_match('/^\[[-_\s]{0,3}GAMERZZ[-_\s]{0,3}\][-_\s]{0,3}\[[-_\s]{0,3}(.+)[-_\s]{0,3}\][-_\s]{0,3}\[\d+\/(\d+\])[-_\s]{0,3}"(.+?)(\.part\d*|\.rar)?(\.vol.+\(\d+\\d+\)"|\.[A-Za-z0-9]{2,4}")[-_\s]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Mass.Effect.3.From.Ashes.DLC.XBOX360-MoNGoLS.nfo" yEnc
-		if (preg_match('/.*"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function german_movies()
-	{
-		//>ghost-of-usenet.org>Monte.Cristo.GERMAN.2002.AC3.DVDRiP.XviD.iNTERNAL-HACO<HAVE FUN> "haco-montecristo-xvid-a.par2" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org>(.+?)<.+?> ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //<ghost-of-usenet.org>XCOM.Enemy.Unknown.Deutsch.Patch.TokZic [0/9] - "XCOM Deutsch.nzb" ein CrazyUpp yEnc
-		if (preg_match('/^<ghost-of-usenet\.org>(.+?) \[\d+\/\d+\] - ".+?" .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ghosts()
-	{
-		//<ghost-of-usenet.org>XCOM.Enemy.Unknown.Deutsch.Patch.TokZic [0/9] - "XCOM Deutsch.nzb" ein CrazyUpp yEnc
-		if (preg_match('/^<ghost-of-usenet\.org>(.+?) \[\d+\/\d+\] - ".+?" .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(116/175) "Embrace.of.the.Vampire.1995.1080p.BluRay.x264.YIFY.part115.rar" - 1,60 GB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) ("|#34;)(.+)(\.[vol|part].+)?\.(par2|nfo|rar|nzb)("|#34;) - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function hdtv()
-	{
-		//[ TrollHD ] - [ 0270/2688 ] - "Tour De France 2013 1080i HDTV MPA 2.0 MPEG2-TrollHD.part0269.rar" yEnc
-		//[17/48] - "Oprah's Next Chapter S02E37 Lindsay Lohan 1080i HDTV DD5.1 MPEG2-TrollHD.part16.rar" yEnc
-		//[02/29] - "Fox Sports 1 on 1 - Tom Brady 720p HDTV DD5.1 MPEG2-DON.part01.rar" yEnc
-		if (preg_match('/^(\[ TrollHD \] - )?[\[\(][-_\s]{0,3}\d+\/(\d+[-_\s]{0,3}[\)\]]) - "(.+?) MPEG2-(DON|TrollHD)\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //.oO "20.Years.After.German.2008.AC3.BDRip.XviD.INTERNAL-ARC__www.realmom.info__.nfo" Oo. [02/39] 1,43 GB yEnc
-		if (preg_match('/^\.oO "(.+)__www.realmom.info__.+" Oo. \[\d+\/\d+\] \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ 09821 ] - [ TrollHD ] - [ 00/54 ] - "Chopped CQ0808H My Way 1080i HDTV DD5.1 MPEG2-TrollHD.nzb" yEnc
-		if (preg_match('/^\[ \d+ \] - \[ TrollHD \] - \[ \d+\/\d+ ] - "(.+)\..+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ TrollHD ] - [ 01/19 ] - "America's Test Kitchen From Cook's Illustrated - Ultimate Grilled Turkey Burgers 480i PDTV DD2.0 MPEG2-TrollSD.par2" yEnc
-		if (preg_match('/^\[ TrollHD \] - \[ \d+\/\d+ \] - "(.+)\.par.+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //NBC Nightly News - Flash Video - 11-20-2013 [13/15] - "NBC Nightly News 11-20-2013.flv.vol03+04.par2" yEnc
-		if (preg_match('/^NBC.+\[\d+\/\d+\] - "(.+)\.vol.+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(Newseros.com) Cueva 1080p [02/42] - "idonhom-mirc.part01.rar" yEnc
-		if (preg_match('/\(Newseros\.com\) .+? \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //It's.Always.Sunny.in.Philadelphia.S07E09.The.Gang.Gets.Trapped.BluRay.1080p.Remux.AVC.DTSHD-MA.5.1-PtZ-BeyondHD.me [047/123] - "It's.Always.Sunny.in.Philadelphia.S07E09.The.Gang.Gets.Trapped.BluRay.1080p.Remux.AVC.DTSHD-MA.5.1-PtZ-BeyondHD.me.r44" yEnc
-		if (preg_match('/^.+S\d+E\d+.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Alpha.House.S01E08.WEBRip.1080p.x264.DD5.1-Absinth) [14/24] - "Alpha.House.S01E08.WEBRip.1080p.x264.DD5.1-Absinth.part13.rar" yEnc
-		if (preg_match('/^\(.+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(024/264) "Enf.S04E02.G.D.H.X-M.vol51+46.PAR2" - 8,27 GB -Enf.S04.G.D.H.X yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] .+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/10] - "Wondershare.Video.Converter.Ultimate.v6.7.1.0.Multilanguage.par2" - 45,44 MB yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/60) "Micro Monsters With David Attenborough 2013 3D HSBS DTS5.1 EP5 - Family-3D4U.par2" yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\)\]] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ TrollHD ] - [ 01/32 ] - "Demi Lovato - 2vLive Concert 2013-10-28 PROPER [see NFO] 720p WEB-CAP AAC2.0 H.264-TrollHD.nfo" yEnc
-		if (preg_match('/^\[ TrollHD \] - [\(\[] \d+\/\d+ [\)\]] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[00245] [ PPKORE ] [44/57] - "The L Word S04E08 1080p WEB-DL DD5 1 H 264-PPKORE.vol014+14.par2" yEnc
-		if (preg_match('/\[\d+\][-_\s]{0,3}\[ PPKORE \][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Adobe Photoshop Lightroom v5.2 - FiNaL - Multilingual [WIN].vol037+32.PAR2  yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) {0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Bad.Penny.2013.720p.HDTV.x264-GBL "bad.penny.2013.720p.hdtv.x264-gbl.par2" yEnc
-		if (preg_match('/^[\w-\.]+ "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The.Colbert.Report.2013.07.29.The.Lumineers.WEBRip.AAC2.0.H.264-DCK [01/11] - "The.Colbert.Report.2013.07.29.The.Lumineers.WEBRip.AAC2.0.H.264-DCK.mp4"  yEnc
-		if (preg_match('/^[\w-\. ]+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"8 Wenn ich einmal gross bin .mp3" Koelschefetz postet.Die Filue -Immer Wigger  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Elysium  (AVCHD)  2013  (720p)  Untouched  (Postet by Edition50)    [01/169] - "file.xyz" yEnc
-		//Frozen Ground  (AVCHD)  2013  (720p)  postet by Edition50 - [01/158] - "file.xyz" yEnc - [000/158] - "FROZEN GROUND  (AVCHD)  2013  (720p)  Untouched.nzb" yEnc
-		//Cabin in the Woods  (AVCHD)  2013  (720p)  Postet by (Edition50) [01/159] - "file.xyz" yEnc
-		if (preg_match('/^(.+?)[-_\s]{0,3}\(?[Pp]ostet +by +\(?Edition50\)?[- ]{0,4}\[\d+\/\d+\][-_\s]{0,3}".+?' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Dark Zero Thirty (2013)  AVCHD (720p)  Untouched [01/151] - "ZERO DARK THIRTY  (2013)  AVCHD  720p)  Untouched.par2" yEnc
-		if (preg_match('/^(.+?)[-_\s]{0,3}[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function hdtv_x264()
-	{
-		//(23/36) "Love.Is.In.The.Meadow.S08E08.HDTV.720p.x264.ac3.part22.rar" - 2,80 GB - yEnc
-		//AMEa(01/49) - AME- "Arbitrage 2013 DTS HD MSTR 5.1 MKV h264 1080p German by AME.nfo" - 7,87 GB - yEnc
-		if (preg_match('/^(AMEa)?\(\d+\/\d+\)( - AME-)? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		//Hard.Target.1993.1080p.Bluray.X264-BARC0DE - [36/68] - "BARC0DE1080pHTAR.r22" yEnc
-		//Goddess.2013.720p.BDRip.x264.AC3-noOne  [086/100] - "Goddess.2013.720p.BDRip.x264.AC3-noOne.part84.rar" yEnc
-		if (preg_match('/^([A-Z0-9a-z][A-Za-z0-9.-]+) -? \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //I Love Democracy - Norwegen - Doku -  2012 - (German)  - AC3 HD720p  Avi by Waldorf -  [02/71] - "Waldorf.jpg" yEnc
-		if (preg_match('/(.+?)\s+(Avi )?by Waldorf\s+-\s+\[\d+\/\d+\]\s+-\s+".+?"\s+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return preg_replace('/\s\s+/', ' ', $match[1]);
-		}
-		//Season of the Witch 2011 - "Season.of.the.Witch.2011.1080p.BluRay.DTS.x264-CyTSuNee.part005.rar" yEnc
-		//Film - "Alien Antology DC Special Edition 1979-1997 1080p GER HUN HighCode.part001.rar" yEnc
-		//Austex Memorandum   "Austex Memorandum 700877270640835.z17" yEnc
-		if (preg_match('/^[A-Z][a-zA-Z0-9 ]+ [- ] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Ninja-Revenge Will Rise UC-Pittis AVCHD-ADD.English.dtsHR.nfo.txt" (01/55) yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \(\d+\/\d+\) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ The.Looney.Tunes.Show.S02E20.480p.WEB-DL.AAC2.0.H.264-YFN ] - [01/19] - "The.Looney.Tunes.Show.S02E20.The.Shell.Game.480p.WEB-DL.AAC2.0.H.264-YFN.nfo" yEnc
-		if (preg_match('/^\[ ([A-Za-z0-9.-]{7,}) \] - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //.oO "20.Years.After.German.2008.AC3.BDRip.XviD.INTERNAL-ARC__www.realmom.info__.nfo" Oo. [02/39] 1,43 GB yEnc
-		if (preg_match('/^\.oO "(.+)__www.realmom.info__.+" Oo. \[\d+\/\d+\] \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[8370]-[#alt.binaries.hdtv.x264@EFNet]-[Mr.Brooks.2007.720p.BluRay.DTS.x264-ESiR]-[00/86] "Mr.Brooks.2007.720p.BluRay.DTS.x264-ESiR.nzb" yEnc
-		if (preg_match('/^\[\d+\][ -]\[#.+\][ -]\[(.+)\][ -]\[\d+\/\d+\][-_\s]{0,3}("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(The.Ghost.Writer.2010.hd.for.ipad.NLSUB) [01/21] - "The.Ghost.Writer.2010.hd.for.ipad.NLSUB.part01.rar" yEnc
-		if (preg_match('/^\((.+)\) \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[ The Amazing Race S23 720p WEB-DL AAC2.0 H.264 ] - [01/40] - "The.Amazing.Race.S23E08.720p.WEB-DL.AAC2.0.H.264-KiNGS.nfo" yEnc
-		if (preg_match('/^\[ ([\w\s\.-]+) \] - \[\d+\/\d+\][ -]*".+"\s*yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Uploader.Presents-Phantom.2013.German.AC3D.BluRay.1080p.x264-IND[01/62]"phantom.1080p.par2" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+)[\(\[]\d+\/\d+[\)\]]".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/18] - "ROH.2013.11.16.#113.WEB-DL.h264-COiL.sfv" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "(.+WEB-DL.+)\.sfv" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //-{NR.C}- - [00/96] - "Being.Liverpool.S01.720p.HDTV.x264-DHD.nzb" yEnc
-		if (preg_match('/^-{NR\.C}- - \[\d+\/(\d+\]) - ("|#34;)(.+)(\.[vol|part].+)?\.(par2|nfo|rar|nzb)("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //- [34/69] - "Zero.Charisma.2013.WEB-DL.DD5.1.H.264-HaB.part33.rar" yEnc
-		if (preg_match('/^- \[\d+\/(\d+\]) - "(.+?)(\.part\d*|\.rar|\.pdf)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //-=www.hotrodpage.info=- Makaveli -=HoTCreWTeam=- Post: - [000/192] - "Hop (2011) 1080p AVCHD.nzb" yEnc
-		if (preg_match('/.+www\.hotrodpage\.info.+\[\d+\/(\d+\]) - "(.+?)(\.part\d*|\.rar|\.pdf)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //-4y (PW)   [ usenet-4all.info - powered by ssl.news -] [12,40 GB] [49/57] "43842168c542ed3.vol000+01.par2" yEnc
-		if (preg_match('/^.+?\[(\d+[.,]\d+ [kKmMgG][bB])\] \[\d+\/(\d+\][-_\s]{0,3}.+?)[-_\s]{0,3}"(.+?)(\.part\d*|\.rar|\.pdf)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //!MR [01/49] - "Persuasion 2007.par2" EN MKV yEnc
-		if (preg_match('/.*[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		//Wonders.of.the.Universe.S02E03.1080p.HDTV.x264.AC3.mp4 [1 of 54] "Wonders.of.the.Universe.S02E03.The.Known.and.the.Unknown.1080p.HDTV.x264.AC3-tNe.mp4.001" yEnc
-		//Wilfred Season 2 - US - 720p WEB-DL [28 of 43] "Wilfred.US.S02E01.Progress.720p.WEB-DL.DD5.1.H264-NTb.mkv.001" yEnc
-		if (preg_match('/^.+ ?\[\d+( of |\/)\d+\] ("|#34;)(.+?)(\.part\d*|\.rar)?(\.[A-Za-z0-9]{2,4})?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //The.Walking.Dead.S02E13.720p.WEB-DL.AAC2.0.H.264-CtrlHD -Kopimi- - 01/37 - "The.Walking.Dead.S02E13.Beside.the.Dying.Fire.720p.WEB-DL.AAC2.0.H.264-CtrlHD.nfo" yEnc
-		if (preg_match('/^.+ ?\d+( of |\/)\d+ - ("|#34;)(.+?)(\.part\d*|\.rar)?(\.[A-Za-z0-9]{2,4})?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //The.Guild.S05E12.Grande.Finale.1080p.WEB-DL.x264.AC3.PSIV - "The.Guild.S05E12.Grande.Finale.1080p.WEB-DL.x264.AC3.PSIV.nfo" yEnc
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function highspeed()
-	{
-		//Old Dad uppt 18 und immer (noch) Jungfrau DvD Rip AC3 XviD German 02/34] - "18 und immer (noch) Jungfrau.part01.rar" yEnc
-		//Old Dad uppt In ihrem Haus DVD Ripp AC3 German Xvid [01/31] - "In ihrem Haus.par2" yEnc
-		//Old Dad uppt Eine offene Rechnung XviD German DVd Rip[02/41] - "Eine offene Rechnung.part01.rar" yEnc
-		//Old Dad uppMiss Marple: Der Wachsblumenstrauß , Wunschpost Xvid German10/29] - "Miss Marple Der Wachsblumenstrauß.part09.rar" yEnc
-		if (preg_match('/^Old\s+Dad\s+uppt? ?(.+?)( mp4| )?\[?\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[03/61] - "www.realmom.info - xvid - xf-fatalmovecd1.r00" - 773,34 MB - yEnc
-		//[40/54] - "Mankind.Die.Geschichte.der.Menschheit.S01E12.Das.Ende.der.Reise.GERMAN.DUBBED.DL.DOKU.1080p.BluRay.x264-TVP.part39.rar" - 4,79 GB yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[02/10] - "Fast.And.Furious.6 (2013).German.720p.CAM.MD-MW upp.by soV1-soko.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "(.+?) upp.by.+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //>ghost-of-usenet.org>The A-Team S01-S05(Folgen einzelnd ladbar)<Sponsored by Astinews< (1930/3217) "isd-ateamxvid-s04e21.r19" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org>(.+?)\(.+?\).+? \(\d+\/\d+\) ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //www.usenet-town.com [Sponsored by Astinews] (103/103) "Intimate.Enemies.German.2007.AC3.[passwort protect].vol60+21.PAR2" yEnc
-		if (preg_match('/^www\..+? \[Sponsored.+?\] \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Das.Schwergewicht.German.DL.720p.BluRay.x264-ETM - "etm-schwergewicht-720p.part20.rar" yEnc
-		if (preg_match('/^([A-Za-z0-9][a-zA-Z0-9.-]{6,})\s+- ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ TiMnZb ] [ www.binnfo.in ] [REPOST] [01/46] - "Columbo - S07 E05 - Des sourires et des armes.nfo" yEnc
-		if (preg_match('/^\[ .+? \] \[ www\..+? \]( \[.+?\])? \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //< "Burn.Notice.S04E17.Out.of.the.Fire.GERMAN.DUBBED.DL.720p.WebHD.x264-TVP.par2" >< 01/17 (1.54 GB) >< 11.62 kB > yEnc
-		if (preg_match('/^< "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' >< \d+\/\d+ \(.+?\) >< .+? > yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Batman postet 30 Nights of Paranormal Activity with the Devil Inside AC3 XviD German [01/24] - "30 Nights of Paranormal Activity with the Devil Inside.par2" yEnc
-		if (preg_match('/^[A-Za-z0-9]+ postet (.+?) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[04/20 Geroellheimer - S03E19 - Freudige ?berraschung Geroellheimer - S03E19 - Freudige ?berraschung.mp4.004" yEnc
-		if (preg_match('/^\[\d+\/\d+ (.+?)(\.(part\d*|rar|avi|iso|mp4|mkv|mpg))?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return implode(' ',
-				array_intersect_key(explode(' ', $match[1]),
-					array_unique(array_map('strtolower',
-						explode(' ', $match[1])))));
-		} //"Homeland.S01.Complete.German.WS.DVDRiP.XViD-ETM.part001.rar" yEnc
-		if (preg_match('/^"(.+?)(\.(part\d*|rar|avi|mp4|mkv|mpg))?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			if (strlen($match[1]) > 7 && !preg_match('/\.vol.+/', $match[1])) {
-				return $match[1];
-			} else {
-				return array(
-					"cleansubject"  => $this->releaseCleanerHelper($this->subject),
-					"properlynamed" => false
-				);
-			}
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function inner_sanctum()
-	{
-		//[ nEwZ[NZB].iNFO - [ Zed--The_Invitation-WEB-2010-WUS ] - File [12/13]: "08-zed--the_river.mp3" yEnc
-		if (preg_match('/^\[ nEwZ\[NZB\]\.iNFO( \])?[-_\s]{0,3}\[ (\d+[-_])?(.+?) \][-_\s]{0,3}(File )?[\(\[]\d+\/(\d+[\)\]]): "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?(yEnc)?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //nEwZ[NZB].iNFO - VA-Universal_Music_Sampler_07_February-PROMO-CDR-FLAC-2013-WRE - File [6/9]: "01-alesso-years_(hard_rock_sofa_remix).flac"
-		if (preg_match('/^nEwZ\[NZB\]\.iNFO[-_\s]{0,3} (.+?) [-_\s]{0,3}(File )?[\(\[]\d+\/(\d+[\)\]]): "(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //..:[DoAsYouLike]:..   1,11 GB   "KGMmDSSHBWnxV4g7Vbq5.part01.rar"   47,68 MB yEnc
-		if (preg_match('/.+[DoAsYouLike\].?[ _-]{0,3}\d+[,.]\d+ [mMkKgG][bB][-_\s]{0,3}"(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[ _-]{0,3}\d+([,.]\d+ [mMkKgG])? [bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/10) "LeeDrOiD HD V3.3.2-Port-R4-A2SD.par2" - 357.92 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)( - Description -)? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'( - \d+[,.]\d+ [mMkKgG][bB])? - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"Ashlar-Vellum Graphite v8 2 2 WinAll Incl Keygen-CRD.par2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(VA-I_Love_Yaiza_Vol.1-WEB-2012-ServerLab) [01/11] - ".sfv" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9._-]+)\) \[\d+\/(\d+\]) - ".+?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}"|") yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(17/41) - "3-8139g0m530.017" yEnc
-		if (preg_match('/^[\[\(]\d+( of |\/)(\d+[\]\)])[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //nEwZNZB.wz.cz - The.Block.AU.Sky.High.S07E12.WS.PDTV.XviD.BF1 - File [01/22]: "The.Block.AU.Sky.High.S07E12.WS.PDTV.XviD.BF1.part01.rar" yEnc
-		if (preg_match('/^nEwZNZB\.wz\.cz - (.+?) - File \[\d+\/\d+]: ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //nEwZ[NZB]_wz_cz - u.s.drug.wars.s02e06.hdtv.x264-mtg - File [02/28]: "eII34BvTxvDMSJZ2ulvh.r00" yEnc
-		if (preg_match('/^nEwZ\[NZB\]_wz_cz - (.+?) - File \[\d+\/\d+]: ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //nEwZNZB.wz.cz - Club_FG-SAT-05-22 - File 4 of 4: "01-jean_jerome-club_fg-05-22-2013-tdmlive.mp3" yEnc
-		if (preg_match('/^nEwZNZB\.wz\.cz - (.+?) - File \d+ of \d+: ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Big.Brother.IL.S05E01.WS.PDTV.XviD-Silver007 [1/1] - "Big.Brother.IL.S05E01.WS.PDTV.XviD-Silver007.avi" yEnc
-		if (preg_match('/^[a-zA-Z0-9._-]+ \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-				$this->e1,
-				$this->subject,
-				$match) && !preg_match('/[a-fA-F0-9]{32}/', $this->subject)
-		) {
-			return $match[1];
-		}
-		//[ f680631754c469e49d3447bf0beadb8e ] [1/8] - "00-chris_carreiro-dirty-web-2014.m3u" yEnc
-		//		if (preg_match('/^\[ [a-f0-9]{32} \] \[\d+\/\d+\] - "\d+[-_](.+?)\.[a-z0-9]{3,4}" yEnc$/i', $this->subject, $match)) {
-		//			return $match[1];
-		//		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	// a.b.kenpsx
-	public function kenpsx()
-	{
-		// Beachbody.ShaunT.Focus.T25 [01/39] - "Beachbody.ShaunT.Focus.T25.DVD3.Ab.Intervals.par2" yEnc
-		if (preg_match('/\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		// 8rg5f9v7yba9ll2ny4z8vvh5exddygh2.par2" yEnc
-		if (preg_match('/^([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function mojo()
-	{
-		//[17/61] - "www.realmom.info - xvid - xf-devilstomb.r14" - 773,11 MB - yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function mom()
-	{
-		//[usenet4ever.info] und [SecretUsenet.com] - 96e323468c5a8a7b948c06ec84511839-u4e - "96e323468c5a8a7b948c06ec84511839-u4e.par2" yEnc
-		if (preg_match('/^\[usenet4ever\.info\] und \[SecretUsenet\.com\] - (.+?)-u4e - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.info/.net <<<Partner von SSL-News.info>>> - [01/26] - "Be.Cool.German.AC3.HDRip.x264-FuN.par2" yEnc
-		if (preg_match('/^\[Art-of-Usenet\] ([a-fA-F0-9]+) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(????) [03/20] - "Weblinger - The.Haunted.House.Mysteries.v1.0-ZEKE.part01.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+?[-_\s]{0,3}yEnc$/ui',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //ShesGonnaSquirt.12.12.13.Sindy.Lange.My.Knight.In.Squirting.Armor.XXX.1080p.x264 - [1/1] - "ShesGonnaSquirt.12.12.13.Sindy.Lange.My.Knight.In.Squirting.Armor.XXX.1080p.x264.rar" yEnc
-		if (preg_match('/[\w.-]{8,}[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Art-of-Usenet] dea75eb65e65c56197d749d57919806d [01/19] - "dea75eb65e65c56197d749d57919806d.par2" yEnc
-		if (preg_match('/^\[Art-of-Usenet\] .+? \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<ghost-of-usenet.org>XCOM.Enemy.Unknown.Deutsch.Patch.TokZic [0/9] - "XCOM Deutsch.nzb" ein CrazyUpp yEnc
-		if (preg_match('/^<ghost-of-usenet\.org>(.+?) \[\d+\/\d+\] - ".+?" .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //.oO "20.Years.After.German.2008.AC3.BDRip.XviD.INTERNAL-ARC__www.realmom.info__.nfo" Oo. [02/39] 1,43 GB yEnc
-		if (preg_match('/^\.oO "(.+)__www.realmom.info__.+" Oo. \[\d+\/\d+\] \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<kere.ws> - 0DAY - 1331086126 - Robokill.Rescue.Titan.Prime.v1.1.MacOSX.Cracked-CORE - [1/9] - "Robokill.Rescue.Titan.Prime.v1.1.MacOSX.Cracked-CORE.par2" yEnc
-		if (preg_match('/^<kere\.ws>[ _-]{0,3}\w+(-\w+)?[ _-]{0,3}\d+[ _-]{0,3}(.+) - \[\d+\/\d+\][ _-]{0,3}("|#34;).+?("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[A_New_Found_Glory-Its_All_About_The_Girls-Reissue-CDEP-FLAC-2003-JLM] [www.usenet4ever.info by Secretusenet] -  "00-a_new_found_glory-its_all_about_the_girls-reissue-cdep-flac-2003.jpg" yEnc
-		if (preg_match('/^\[(.+?)\][ _-]{0,3}\[www\.usenet4ever\.info by Secretusenet][ _-]{0,3} ".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//MoM100060 - "Florian_Arndt-Trix-(BBM36)-WEB-2012-UKHx__www.realmom.info__.nfo" [2/7] 29,04 MB yEnc
-		//"Alan.Wake.v1.02.16.4261.Update-SKIDROW__www.realmom.info__.nfo" (02/17) 138,07 MB yEnc
-		if (preg_match('/^(Mom\d+[ _-]{0,3})?"(.+?)__www\.realmom\.info__' . $this->e0 .
-			'[ _-]{0,3}[\(\[]\d+\/(\d+[\)\]]) \d+[.,]\d+ [kKmMgG][bB] yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"The.Draughtsmans.Contract.1982.576p.BluRay.DD2.0.x264-EA"(15/56) "The.Draughtsmans.Contract.1982.576p.BluRay.DD2.0.x264-EA.part13.rar" - 2.37 GB yEnc
-		if (preg_match('/^"(.+?)"\(\d+\/(\d+\))[ _-]{0,3}".+?' . $this->e0 .
-			'[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB] yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/29) - Description - "Revolution.2012.S01E06.HDTV.x264-LOL.nfo" - 317.24 MB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\))[ _-]{0,3}Description[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(02/17) - [Lords-of-Usenet] <<Partner of SSL-News.info>> i8dewFjzft94BW71EI0s -"19913.r00" - 928,75 MB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\))[ _-]{0,3}\[Lords-of-Usenet\][ _-]{0,3}<<Partner of SSL-News\.info>>[ _-]{0,3}(.+?)[ _-]{0,3}".+?' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[002/161] - "Rayman_Legends_USA_PS3-CLANDESTiNE.nfo" yEnc
-		if (preg_match('/^\[\d+\/\d+\][ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//NetVideoGirls.13.08.05.Julia.XXX.MP4-KTR - [1/1] - "NetVideoGirls.13.08.05.Julia.XXX.MP4-KTR.rar" yEnc
-		//FemaleAgent.E136.Rollie.XXX.1080p.MOV-KTR - [1/1] - "FemaleAgent.E136.Rollie.XXX.1080p.MOV-KTR.rar" yEnc
-		//Penthouse.13.07.13.Natalia.Starr.Pet.Of.Month.July.2013.XXX.3D.WMV-TBP - [1/1] - "Penthouse.13.07.13.Natalia.Starr.Pet.Of.Month.July.2013.XXX.3D.WMV-TBP.rar" yEnc
-		if (preg_match('/^([a-z0-9].+?\.XXX.*?\.[a-z0-9]{3,4}-[a-z0-9]+) - \[\d+\/\d+\] - ".+?" yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //happy birthday brothers - brothers-of-usenet.info&net-empfehlen-ssl-news - 2brokegirls-s03e12-Die.franzoesische.Versuchung.48 - [01/12] - "2brokegirls-s03e12-Die.franzoesische.Versuchung.480p.par2" yEnc
-		if (preg_match('/brothers-of-usenet\.info&net-empfehlen-ssl-news.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Eragon postet   Pfeil   S01E18   german                      [01/19] - "Pfeil S01E18.par2" yEnc
-		if (preg_match('/^Eragon postet.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"[Fansub-Resistance] Naruto Shippuuden 345 xvid (848x480).vol25+15.PAR2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Die.Sopranos.S05E02.German.AVC-TVS.vol063+60.par2" (repack180414) yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //LOL.3E05.720p.WEB.DL.nHD.x264-NhaNc3 [64/71] - "LOL.3E05.720p.WEB.DL.nHD.x264-NhaNc3.sfv" yEnc
-		if (preg_match('/^([\w.-]{8,})[-_\s]{0,3}\[\d+\/(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-				$this->subject,
-				$match)
-			&& !preg_match('/^(\d{4,6})-\d{1}\[/', $this->subject)
-		) {
-			return $match[1];
-		} //Uploader.Presents-LaLa.2014.Englisch.R6.HDCAM.x264.AC3-SmY(06/56]"SmY-I,F.2014.part05.rar" yEnc
-		if (preg_match('/^Uploader\.Presents-(.+)[\[\(]\d+\/\d+[\]\)]".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(21/27) - Description Lava.Land.2013.3D.1080p.Bluray.HOU.X264.DL-zman - "Lava.Land.2013.3D.1080.HOU.DL-zman.part20.rar" - 8,85 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}Description ([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}".+?' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- "z7QxDdQ5Qs63v8B8.01" - 374,56 MB - yEnc
-		//- Description - "le gars et son arc 2x21.vol06+05.PAR2" - 273,04 MB - yEnc
-		if (preg_match('/^- (Description - )?"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //::: Usejunkies.tk ::: - [11/15] - "Saitenfeuer - Kein Zurueck 2013.vol00+1.par2" - 116,42 MB yEnc
-		if (preg_match('/^.+Usejunkies\.tk.+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //:.Usejunkies.tk.:---- - [4/8] - "MKTO - MKTO.vol00+5.par2" yEnc
-		if (preg_match('/^.+Usejunkies\.tk.+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"8ÅdTbOMaåRuieuD4gåjÅwOåbmS72ADÅM1b2æefz9q4yW4O7exV.vol037+6.par2" yEnc
-		if (preg_match('/^"(.{8,}?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(08/12) [ArtofUsenet] >>> www.art-of-use.net <<< "Alles Atze - S01E05 - Die Anatolische Fliege.vol01+02.par2" - 245,19 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) \[ArtofUsenet\].+www\.art-of-use\.net.+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/10) - [Lords-of-Usenet] <<Sponsored by SSL-News.info>> presents AoA.Audio.Extractor.Platinum.v2.0.Portable.WiNALL.APPZ-NOTRADE -"notrade-aoaextractorplati_portable.par2" - 8,14 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - \[Lords-of-Usenet\].+ presents (.+?)[-_\s]{0,3}".+?' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(02/66) - [Lords-of-Usenet] <<Partner of SSL-News.info>> presents The_Swapper-FANiSO - "fan-swap.rar" - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - \[Lords-of-Usenet\].+ presents (.+?)[-_\s]{0,3}".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/3) - "Readers Digest Magazin Deutschland Oktober 10-2014.rar" - 10,92 MB - >>brothers-of-usenet.info/net<< empfehlen SSL-News.info yEnc
-		if (preg_match('/^\(\d+\/\d+\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+([.,]\d+)? [kKmMgG][bB][-_\s].+yEnc$/ui',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/3) "Die drei Fragezeichen - Folge 162 - Der schreiende Nebel.rar" - 121,56 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.ino/.net<<<Partner von SSL-News.info>>> - [05/33] - "oiu78_67O77OuiI_ztRe014.part04.rar" yEnc
-		if (preg_match('/^brothers-of-usenet.+SSL-News\.info.+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖܖ¤ß¶!.,&_()\[\]\'\`-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //"Fabulous MP3.v1.10.rar" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function moovee()
-	{
-		//\[ENJOY\]-\[FULL\]-\[.+\]-\[ (.+) \]-\[\d+\/\d+\]-".+" yEnc$/
-		if (preg_match('/\[ENJOY\]-\[FULL\]-\[.+\]-\[ (.+) \]-\[\d+\/\d+\]-".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} ///PROUT Movie (2010) NTSC DVD [157/15768] - "PROUTmovie_NTSC.part155.rar" yEnc
-		if (preg_match('/^(.+DVD.*) \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//[ Hammer.of.the.Gods.2013.720p.WEB-DL.DD5.1.H.264-ELiTE ]-[01/44] - "Hammer.of.the.Gods.2013.720p.WEB-DL.DD5.1.H.264-ELiTE.par2" yEnc
-		//[134863]-[ Rihanna.No.Regrets.2013.720p.WEB-DL.DD5.1.H.264-PZK ]-[52/52] - "Rihanna.No.Regrets.2013.720p.WEB-DL.DD5.1.H.264-PZK.vol127+76.par2" yEnc
-		//[Hard.Target.1993.UNRATED.720p.BluRay.x264-88keyz] - [001/101] - "Hard.Target.1993.UNRATED.720p.BluRay.x264-88keyz.nfo"
-		//[ Fast.And.Furious.6.2013.720p.WEB-DL.AAC2.0.H.264-HDCLUB ]-[REAL]-[01/54] - "Fast.And.Furious.6.2013.720p.WEB-DL.AAC2.0.H.264-HDCLUB.nfo" yEnc
-		if (preg_match('/^(\[\d+\]-)?\[ ?([a-zA-Z0-9.-]{6,}) ?\](-\[REAL\])? ?- ?\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"Nights.of.Cabiria.1957.NTSC.DVD.x264-Tree"(23/57) "Nights.of.Cabiria.1957.NTSC.DVD.x264-Tree.part22.rar" - 2.40 GB yEnc
-		if (preg_match('/^"(.+(DVD|BluRay|BRRip).+)"\(\d+\/\d+\) ".+".+[GMK]B yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [0/1] - "A.Good.Day.to.Die.Hard.2013.nzb" yEnc
-		if (preg_match('/^\(\?{4}\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[xxxxx]-[#a.b.moovee@EFNet]-[ xxxxx ]-[02/66] - "tulob88.part01.rar" yEnc
-		if (preg_match('/^\[x+\]-\[.+?\]-\[ x+ \]-\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Groove.2000.iNTERNAL.DVDRip.XviD-UBiK - [001/111] - "ubik-groove-cd1.par2" yEnc
-		//Antony.and.Cleopatra.1972.720p.WEB-DL.H264-brento -[35/57] - "Antony.and.Cleopatra.1972.720p.WEB-DL.AAC2.0.H.264-brento.part34.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9._-]+) - ?\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Iron.Man.3.2013.R5.DVDRip.XviD-AsA) (01/26) - "Iron.Man.3.2013.R5.DVDRip.XviD-AsA.part01.part.sfv" yEnc
-		if (preg_match('/^\(([a-zA-Z0-9.-]+)\) \(\d+\/\d+\) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Classic Surf) Morning.Of.The.Earth.1971 [03/29] - "Morning.Of.The.Earth.1971.part02.rar" yEnc
-		if (preg_match('/^\([a-zA-Z0-9].+?\) ([a-zA-Z0-9.-]+) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[51/62] Morrissey.25.Live.Concert.2013.BDRip.x264-N0TSC3N3 - "n0tsc3n3-morrissey.25.live.2013.bdrip.x264.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] (.+) - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[AD120512-00006]-[UnOFFSc3n4iT]-[0131105] Chloe.Tra.Seduzione.E.Inganno.2009.iTALiAN.DVDRip.XviD-TRL [19/41] - "trl-chltsdzn.part18.rar" yEnc
-		if (preg_match('/^\[\w+-\w+\]-\[\w+\]-\[\d+\] (.+) \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Breathe.In.2013.BRRip.x264-4UN [01/39] - "Breathe.In.2013.BRRip.x264-4UN.nfo" yEnc
-		if (preg_match('/^(.+x264.+) \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //The.CyB3rMaFiA.PimPs.YouR.RiDE.WiTH [REPACK] [40/42] - "d2p5uypp7yn3drpk1080417.vol255+064.par2" yEnc
-		if (preg_match('/^(.+) \[REPACK\] \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[ Oklahoma\!.1955.720p.WEB-DL.AAC2.0.H.264-CtrlHD ]-[32/55] - "Oklahoma.1955.720p.WEB-DL.AAC2.0.H.264-CtrlHD.part31.rar" yEnc
-		if (preg_match('/\[ (.+WEB-DL.+) \]-\[\d+\/\d+\] - "(.+)\.(mp4|mkv|ts|rar|par.+)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //REQ: working copy of "That Darn Cat 1997 Xvid-Any grp" Plz Ty  (47/60) "geckos-ghr2011-xvid.r44" - 744,19 MB - Gun.Hill.Road.2011.LIMITED.DVDRip.XviD-GECKOS yEnc
-		if (preg_match('/^REQ:.+".+".+\(\d+\/\d+\) ".+" - \d+[,.]\d+ [MGK]B - (.+) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(T.U.F The real thing I Frankenstein 2014 NL Subs T.U.F) [01/52] - "I Frankenstein 2014 NL Subs.par2" yEnc
-		if (preg_match('/^\(T\.U\.F The real thing (.+?) T\.U\.F\)/', $this->subject, $match)) {
-			return $match[1];
-		} //(Ringside.The.Best.of.Mike.Tyson.DVDRip.x264.AC3-FCZ)[01/68] - "Ringside.The.Best.of.Mike.Tyson.DVDRip.1.of.2.x264.AC3-FCZ.nfo" yEnc
-		if (preg_match('/^\(([\w.-]+)\)\[\d+\/(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function movies()
-	{
-		//Underworld.Evolution.2006.480p.BDRip.XviD.AC3-AsA - [000/143] - "asa.nzb" yEnc
-		if (preg_match('/^([a-z].+) - \[\d+\/\d+\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} ///^Have Fun - ("|#34;)(.+)\.nfo("|#34;) Ph4let0ast3r yEnc$/i
-		if (preg_match('/^Have Fun - ("|#34;)(.+)\.nfo("|#34;) Ph4let0ast3r yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(01/34) "Sniper.Reloaded.2011.BluRay.810p.DTS.x264-PRoDJi.Turkish.Audio.par2" - 139,30 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) ("|#34;)(.+)\.(par2|nfo|rar|nzb)("|#34;) - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"Discovery.Channel.Tsunami.Facing.The.Wave.720p.HDTV.x264-PiX.rar"
-		if (preg_match('/^("|#34;)(.+)\.rar("|#34;)$/i', $this->subject, $match)) {
-			return $match[2];
-		} //Saw.VII.2010.720p.Bluray.x264.DTS-HDChina Saw.VII.2010.720p.Bluray.x264.DTS-HDChina.nzb
-		if (preg_match('/^([a-z].+) .+\.(par2|nfo|rar|nzb)$/i', $this->subject, $match)) {
-			return $match[1];
-		} //(????) [1/1] - "The Secret Life of Walter Mitty 2013 CAM AAC x264-SSDD.mp4" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(001/114) - Description - "The.Chronicles.of.Riddick.2004.DC.BluRay.1080p.DTS.par2" - 10,50 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}Description[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[00/56] - "The.Last.Days.On.Mars.720p.BluRay.x264-DR.nzb" yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[REUP] 6.Degress.of.Hell.2012.1080p.BluRay.DTS-HD.x264-BARC0DE - [03/50] - "BARC0DE.vol00+1.PAR2" yEnc
-		//[REUP]Home.Of.The.Brave.2006.1080p.BluRay.DTS-HD.x264-BARC0DE - [03/38] - "BARC0DE.vol00+1.PAR2" yEnc
-		if (preg_match('/^\[REUP\]( )?(.+?) - \[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //- Description - "The.Legend.of.Hercules.2014.720p.BluRay.x264.YIFY.mp4.01" - 795,28 MB -  yEnc
-		if (preg_match('/^- Description - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'([-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB])[- ]{0,4}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Star.Trek.Into.Darkness.2013.3D.HOU.BDRip.1080p-FAGGOTS [431/432] - "stid3d.vol124+128.par2" yEnc
-		if (preg_match('/^([\w.()-]{8,}?)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(130/138) - Captain America The Winter Soldier 2014 NEW (FIXED) 720p CAM x264 Pimp4003 - "wXZ6LxFt.zip.130" - 2.02 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}([\w.() -]{8,}?\b)[-_\s]{0,3}".+?' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //22.Jump.Street.2014.720p.BluRay.x264-tpU.vol000+01.PAR2 [73/84] - "22.Jump.Street.2014.720p.BluRay.x264-tpU.vol000+01.PAR2" yEnc
-		if (preg_match('/^.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function movies_divx()
-	{
-		//(www.Thunder-News.org) >CD2< <Sponsored by Secretusenet> - "exvid-emma-cd2.par2" yEnc
-		if (preg_match('/^\(www\.Thunder-News\.org\) .+? - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Movieland Post Voor FTN - [01/43] - "movieland0560.par2" yEnc
-		if (preg_match('/^[a-zA-Z ]+Post Voor FTN - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Disney short films collection by mayhem masta"1923 - Alice's Wonderland.vol15+7.par2" yEnc
-		if (preg_match('/.+?by mayhem masta"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(http://dream-of-usenet.info) - [01/43] - "Nicht.auflegen.2002.German.DL.AC3.BDRip.XviD-iNCEPTiON.nfo" yEnc
-		if (preg_match('/^\(.+usenet\.info\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[######]-[FULL]-[#hdtv@LinkNet]-[Sesame.Street.S41E03.1080i.HDTV.DD5.1.MPEG2-TrollHD]-[00/51] - "Sesame Street S41E03 Chicken When It Comes to Thunderstorms 1080i HDTV DD5.1 MPEG2-TrollHD.nzb" yEnc
-		if (preg_match('/\[#]+\]-\[.+\]-\[.+\]-\[(.+)\][- ]\[\d+\/\d+\][-_\s]{0,3}".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Rules.of.Engagement.S06E12.720p.WEB-DL.DD5.1.H.264-CtrlHD ]-[01/24] - "Rules.of.Engagement.S06E12.720p.WEB-DL.DD5.1.H.264-CtrlHD.nfo" yEnc
-		if (preg_match('/^\[ ([a-zA-Z0-9.-]{6,}) \]-\[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function movies_x264()
-	{
-		//http://nzbroyalty.com - House.of.The.Rising.sun.2011.BluRay.720p.DTS.x264-CHD - [00/48] - "House.of.The.Rising.sun.2011.BluRay.720p.DTS.x264-CHD.nzb" yEnc
-		if (preg_match('/^http:\/\/nzbroyalty\.com - (.+?) - \[\d+\/(\d+\]) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Scream.4.2011.WS.720p.BluRay.X264-AMIABLE - [000/106] - "Scream.4.2011.WS.720p.BluRay.X264-AMIABLE.nzb" yEnc
-		if (preg_match('/^([a-zA-Z0-9._-]+ - ?\[)\d+\/(\d+\]) - "(.+?)\.(nzb|rar|par2)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //The Beaver 2011 720p BluRay DD5.1 x264-CtrlHD - [00/65] - "The Beaver 2011 720p BluRay DD5.1 x264-CtrlHD.nzb" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?)( - )\[\d+(\/\d+\] - ").+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"The.Hudsucker.Proxy.1994.1080p.Blu-ray.Remux.AVC.DTS.HD.MA.2.0-KRaLiMaRKo"(127/132) "The.Hudsucker.Proxy.1994.1080p.Blu-ray.Remux.AVC.DTS.HD.MA.2.0-KRaLiMaRKo.vol379+20.par2" - 24.61 GB - yEnc
-		if (preg_match('/("|#34;)(.+)("|#34;)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}("|#34;).+?(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(Amour.2012.1080p.BluRay.x264-EbP)(002/337) "Amour.2012.1080p.BluRay.x264-EbP.part001.rar" - 16.58 GB - yEnc
-		if (preg_match('/^\([\w.-]+\)[\(\[]\d+\/\d+[\]\)] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(La.pianiste.(aka.The.Piano.Teacher).(2001).720p.BluRay.AC3.x264-MandR) [085/101] - "La.pianiste.(aka.The.Piano.Teacher).(2001).720p.BluRay.AC3.x264-MandR.part084.rar" yEnc
-		if (preg_match('/^\([\w .()-]+\) [\(\[]\d+\/\d+[\]\)] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[00/56] - "The.Last.Days.On.Mars.720p.BluRay.x264-DR.nzb" yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //< Michael.Jackson.Bad.25.2012.720p.BluRay.x264-PHD > - "Michael.Jackson.Bad.25.2012.720p.BluRay.x264-PHD.par2" (01/64) yEnc
-		if (preg_match('/^< [\w.() -]+ > - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \(\d+\/\d+\) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //:Waga.Haha.no.Ki.2012.BluRay.720p.DTS.x264 - Chronicle.Of.My.Mother.2012 - [55/56] - "waha.720p.vol063+64.par2" yEnc
-		if (preg_match('/^:([\w.-]+)[-_\s]{0,3}[\w.-]+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Cat Ballou (1965) Multi-Dub AVC 480p.MKV.001" 01 of 11  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \d+ of \d+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Fly.With.The.Gold.2012.720p.BluRay.x264-WiKi [03/73] - "wiki-fwtg.par2" yEnc
-		if (preg_match('/^([\w.-]+)[-_\s]{0,3}\[\d+\/(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Parker.2013.MULTi.720p.BluRay.x264-GAIA - "Parker.2013.MULTi.720p.BluRay.x264-GAIA.nfo" yEnc
-		if (preg_match('/^([\w.-]+)[-_\s]{0,3}".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function mp3()
-	{
-		//"The Absence - Riders Of The Plague" [00/14] - "the_absence-riders_of_the_plague.nzb" yEnc
-		if (preg_match('/"([\w. -]{8,})"[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}".+' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//( Albert Cummings Albums 6x By Dready Niek (1999-2012) )  ( ** By Dready Niek ** ) [11/20] - "Albert Cummings Albums 6x By Dready Niek (1999-2012).part10.rar" yEnc
-		//( Fat Freddy's Drop - Blackbird (2013) -- By Dready Niek ) -- By Dready Niek ) [01/15] - "Fat Freddy's Drop - Blackbird (2013) -- By Dready Niek.par2" yEnc
-		if (preg_match('/\( ([\w. -]{8,}) \)[-_\s]{0,3}( |\().+\)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Old but Sold>>>  <<< >< >< "German Top 50 ODC - 12.08.2013.nfo" >< 02/33 (541,61 MB) >< 10,93 kB > yEnc
-		if (preg_match('/^.+Old but Sold.+>< "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' >< \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\).+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Musikjunkie-The.Voice.Of.Germany.2013.The.Best.of.Liveshows.4.CD.Box.Set.VBR [15/28]"voice.part13.rar" yEnc
-		if (preg_match('/^Musikjunkie-([\w. -]{8,})[-_\s]{0,3}\[\d+\/\d+\]".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Metallica - Ride The Lightning    "01 - Fight Fire With Fire.mp3" yEnc
-		if (preg_match('/^([\w. -]{8,})[-_\s]{0,3}("|#34;)(.+?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //::: Usejunkies.tk ::: - [08/11] - "DJ Shog - DNA - HD 720p.vol00+1.par2" - 47,76 MB yEnc
-		if (preg_match('/^.+Usejunkies\.tk.+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"AnyDVD 7.0.0.0.rar" poc  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[-_\s]{0,3}poc[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"A Produce & Loren Nerell - Intangible.nzb" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/12) "Sunfly Hits April (2013) SF326 [Skytwohigh].par2" - 109.59 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/15) - Description - "Goldene Schlager - Erinnerungen Folge 3.par2" - 126,08 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}Description[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Musica - House&Dance - mix 1 - april 2014 1) [00/45] - "Musica - House&Dance mix 1 april.nzb" yEnc
-		if (preg_match('/^\(([^.]{8,})\) \[\d+\/\d+\][-_\s]{0,3}".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[04/17] - "Schlager.am.laufenden.Band.-.Vol.13.part02.rar" - 622,46 MB yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Karate Andi - Pilsator Platin   2014.nfo.nfo Karate Andi - Pilsator Platin   2014 by PsyDealer  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) [\w.,& ()\[\]\'\`-]{8,}?\b.?( by )?PsyDealer  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [089/100] - "090-florence_and_the_machine_-_spectrum_(say_my_name)_(calvin_harris_edit).mp3 Top 100 Single Charts 13.05.2013"  yEnc
-		if (preg_match('/^\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"[\w.,& ()\[\]\'\`-]{8,}?\b.?\.[A-Za-z0-9]{2,4} (Top \d+ Single Charts \d+\.\d+\.\d+)"[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [02/26] - "8Cursed.rar" yEnc
-		if (preg_match('/^\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [00/34] - "The Official UK Top 40 Singles Chart 15-06-2014.nzb"otfINWnjfg7856fghj  yEnc
-		if (preg_match('/^\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '\w+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/24) VA - Now Thats What I Call Disco 2013 - "VA - Now Thats What I Call Disco 2013.7z.001" - 487.23 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) ([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}"[\w.,& ()\[\]\'\`-]{8,}?\b.?' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(102400) [06/13] - "Time Life - The Teen Years.part05.rar" yEnc
-		if (preg_match('/^\(102400\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(18 Gouden Piraten Hits Deel 2 [03/11] - "18 Gouden Piraten Hits Deel 2.part2.rar" yEnc
-		if (preg_match('/^\([\w.,& ()\[\]\'\`-]{8,} \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Amigos - Ihre Lieblingshits - Folge 2 - 2013 - by Taekwondo145)[00/62] - "Amigos - Ihre Lieblingshits - Folge 2 - 2013.nzb" yEnc
-		if (preg_match('/^\([\w.,& ()\[\]\'\`-]{8,}\)\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(German TOP100 Single Jahrescharts-2013 - by Taekwondo456([67/70] - "German TOP100 Single Jahrescharts-2013.vol041+41.PAR2" yEnc
-		if (preg_match('/^\([\w.,& ()\[\]\'\`-]{8,} - by Taekwondo(\d+\()?\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(Liedjes uit de film De Grote Patriottische Oorlog..o.a. Rod McK )  ( ** By Dready Niek ** ) [02/11] - "Liedjes uit de film De Grote Patriottische Oorlog..o.a. Rod McKuen - By Dready Niek.part1.rar" yEnc
-		if (preg_match('/^\( ?([\w.,& ()\[\]\'\`-]{8,}) ?\)[-_\s]{0,3}\(.+Dready Niek.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"[\w.,& ()\[\]\'\`-]{8,}?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[21/23] - "JNEQ3_20130413_028.vol0+1.par2" - 282,65 MB <-> Partner of secretusenet.com <-> yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB] <-> Partner of secretusenet\.com <->[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Yogi_and_Husky--Nu_Sound_EP-(RSR021)-WEB-2012-dh - "Yogi_and_Husky--Nu_Sound_EP-(RSR021)-WEB-2012-dh.r00" yEnc
-		if (preg_match('/^[\w.,& ()\[\]\'\`-]{8,}?[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Zido.Alben.All.in.One.Read.NFO-Ren & Stimpy - [35/43] - "Zydo.part33.rar" yEnc
-		if (preg_match('/^([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //! ! !! - h311b0y101022014 - !! ! ! [01/14] - "h311b0y101022014.par2" yEnc
-		if (preg_match('/(h311b0y|Hellboy).+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function mp3_complete_cd()
-	{
-		//(05/10) - [Lords-of-usenet] <<Partner of SSL-News.info>>  "Wynardtage Praise The Fallen(2007).vol00+01.PAR2" - 132,64 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ _-]{0,3}\[Lords-of-usenet\][ _-]{0,3}<<Partner of SSL-News.info>>[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(06/11) - <www.lords-of-usenet.org><by Nerts> - "Diens - Schwarzmale.vol00+01.PAR2" - 141,07 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ _-]{0,3}<www\.lords-of-usenet\.org><by Nerts>[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<www.Lords-Of-Usenet.org><by Nerts> (09/18) - "Mantus - Fatum (2013) [2CD].FH.vol00+2.PAR2" - 336,39 MB - yEnc
-		if (preg_match('/^<www\.lords-of-usenet\.org><by Nerts>[ _-]{0,3}\(\d+\/\d+\)[ _-]{0,3}[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(08/15) "Noemi-Red.(Unreleased).2006.by.NYCrules.vol000+01.PAR2" - 179,66 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[16_Bit_Lolitas-Warung_Brazil_002-2CD-2012-iHF] [www.usenet4ever.info by Secretusenet] -  "000-16_bit_lolitas-warung_brazil_002-2cd-2012-ihf.sfv" yEnc
-		//[3RD_Prototype_-_On_My_Way-(TB7368)-WEB-2013-FMC] [www.usenet4ever.info by Secretusenet] -  "01-3rd_prototype_-_deafback-when_you_are_in_the_dark_(deafback_remix).mp3" yEnc
-		//[Armin_Van_Buuren_Feat._Fiora-Waiting_For_The_Night-(ARMD1140)-WEB-2013-UKHx] [www.usenet4ever.info by Secretusenet] -  "00-armin_van_buuren_feat._fiora-waiting_for_the_night-(armd1140)-web-2013-ukhx.m3u" yEnc
-		if (preg_match('/^\[([a-zA-Z0-9-_\(\)\.]+)\] \[www\.usenet4ever\.info by Secretusenet\] -  "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>ghost-of-usenet.org<< 16_Bit_Lolitas-Warung_Brazil_002-2CD-2012-iHF >>www.SSL-News.info> -  "101-16_bit_lolitas-warung_brazil_002_cd1.mp3" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org<< ([a-zA-Z0-9-_\(\)\.]+) >>www\.SSL-News\.info> -  "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Blok_B-Bienvenue_Dans_Mon_Blok_Vol.1-2005-BZ_INT [20 of 27] "01-gangsta.mp3" yEnc
-		//DJ Neev - HedKandi_2013-06-08 (Ministry of Sound Radio) [01/13] - "DJ Neev - HedKandi_2013-06-08 (Ministry of Sound Radio).par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\(\)\.]+) \[\d+(\/| of )(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(www.Thunder-News.org) >Dee_And_Crane-Let_The_Music_Play-WEB-2012-UKHx< <Sponsored by Secretusenet> - "05-dee_and_crane-let_the_music_play_(jay_frogs_keep_the_groove_remix_edit).mp3" yEnc
-		if (preg_match('/^\(www\.Thunder-News\.org\) >(.+?)< <Sponsored by Secretusenet> - ".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/1] - (MP3 ALBUM CHARTS) - "Andreas Gabalier - Volksrock'n'roller-Live.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - \((MP3 )?ALBUM CHARTS\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"Miley Cyrus - Bangerz (Deluxe Version).nzb" - yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . ' - yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //VA 200 NRJ 2014 CD2 mp3_320kbps[18/27]VA 200 NRJ 2014 CD2 mp3_320kbps"(217) [Capital Cities] Safe And Sound.mp3"  yEnc
-		if (preg_match('/^.+\[\d+\/\d+\](.+)"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function mp3_full_albums()
-	{
-		//. - [05/10] - "Blues 'N Trouble - With Friends Like These [1989].vol00+01.par2" yEnc
-		if (preg_match('/^\. - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(001/122) "[www.Lords-of-Usenet.org]_[Partner von SSL-News]_Blind_Guardian-Discographie.par2" - 2,20 GB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) "\[www\.Lords-of-Usenet\.org\]_\[Partner von SSL-News\]_(.+?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//(06/10) "Pink Floyd - Dark Side Of The Moon [MFSL UDCD 517].vol00+01.PAR2"- - 67,88 MB - Pink Floyd - Dark Side Of The Moon [MFSL UDCD 517] yEnc
-		//(07/11) "VA - Twilight - New Moon - Ost.vol00+01.PAR2"- - 93,69 MB - VA - Twilight - New Moon - Ost yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[ _-]{0,4}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}.+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(Kitty Samtpfote) [01/12] - "Electronic Music of the 80s.Michael Garrison - In The Regions Of Sunreturn and beyond 1991.par2 . http://usenet4ever.info_Sponsored by www.Secretusenet.com  " yEnc
-		if (preg_match('/^\(.+\) \[\d+\/(\d+\]) - "(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) . http:\/\/usenet4ever\.info_Sponsored by www\.Secretusenet\.com  " yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //(www.Thunder-News.org) >Boehse Onkelz - Discography< <Sponsored by AstiNews> - (113/145) - "Boehse Onkelz - Discography.s10" yEnc
-		if (preg_match('/^\(.+\) >(.+?)< <Sponsored by AstiNews> - \(\d+\/(\d+\)) - ".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[00021]-["1999 Alphaville - Dreamscapes.part069.rar"[ yEnc
-		if (preg_match('/^\[\d+\]-\["([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'\[ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(nzbDMZ) [0/2] - "Miles Crossing - Miles Crossing (2011).nzb" yEnc
-		if (preg_match('/^\(.+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[06/10] - "Jeff Healey - Legacy Volume One [The Singles].vol00+01.PAR2" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //00008 "2003 Camouflage - Sensor.par2" yEnc
-		if (preg_match('/^\d+ "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Alex Oriental Experience_-_Live II (Live II) [1/9] - "01_Red_Dress.mp3" yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\(\)\.]+) \[\d+(\/| of )(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function multimedia()
-	{
-		//Escort.2006.DUTCH.WEB-RiP.x264-DLH - [01/23] - "Escort.2006.DUTCH.WEB-RiP.x264-DLH.par2" yEnc
-		//Tusenbroder.S01E05.PDTV.XViD.SWEDiSH-NTV  [01/69] - "ntv-tusenbroder.s01e05.nfo" yEnc
-		if (preg_match('/^([A-Z0-9a-z.-]{10,})\s+(- )?\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[####]-[FULL]-[#a.b.teevee@EFNet]-[ Tosh.0.S02E14.720p.HDTV.x264-aAF ]-[10/21] - "aaf-tosh.0.s02e14.720p.r07" yEnc
-		if (preg_match('/\[[#]+\]-\[.+?\]-\[.+?\]-\[ ([\w.,& ()\[\]\'\`-]{8,}?) \][- ]\[\d+\/\d+\][-_\s]{0,3}("|#34;).+?/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Top.Chef.S11E12.Mississippi.Mud.Bugs.720p.WEB-DL.AAC2.0.H.264-TVSmash ] - [13/38] - "tc1112-720p.r10" yEnc
-		if (preg_match('/^\[ ?([\w.,& ()\[\]\'\`-]{8,}?) ?\][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Handyman Shows-TOH-S32E10 - File 01 of 32 - yEnc
-		if (preg_match('/^Handyman Shows-(.+) - File \d+ of \d+ - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //- "Auction Hunters S04E04.HDTV.x264-StarryNights1.nzb" yEnc
-		if (preg_match('/.*"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //homeland.s02e12.1080p.bluray-bia.r08 - [011/111]  yEnc
-		if (preg_match('/^([^.]{8,})\.[A-Za-z0-9]{2,4} - \[\d+\/(\d+\])  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function multimedia_anime()
-	{
-		//High School DxD New 01 (480p|.avi|xvid|mp3) ~bY Hatsuyuki [01/18] - "[Hatsuyuki]_High_School_DxD_New_01_[848x480][76B2BB8C].avi.001" yEnc
-		if (preg_match('/(.+?\s*\((360|480|720|1080)p\|.+?\s*~bY\s*.+?)\s*\[\d+\/\d+\]\s*- "(?P<release>.+?\[(?P<crc>[0-9A-Fa-f]+)\]).+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match['release'];
-		}
-
-		//[Hatsuyuki]_Seirei_Tsukai_no_Blade_Dance_-_03_[720p] [E18FCA59] [01/18]
-		if (preg_match('#(?P<release>\[[A-Z0-9-]+\][\w_-]+_\d+_\[\d{3,4}[ip]\]\s*\[[(?P<crc>0-9A-Fa-f]{8}\])\s\[\d+/(\d+)\]#i',
-			$this->subject,
-			$match)
-		) {
-			return $match['release'];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function multimedia_anime_highspeed()
-	{
-		//High School DxD New 01 (480p|.avi|xvid|mp3) ~bY Hatsuyuki [01/18] - "[Hatsuyuki]_High_School_DxD_New_01_[848x480][76B2BB8C].avi.001" yEnc
-		if (preg_match('/.+? \((360|480|720|1080)p\|.+? ~bY .+? \[\d+\/\d+\] - "(.+?\[[A-F0-9]+\].+?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function multimedia_documentaries()
-	{
-		//"Universe S4E08.part40.rar" - [41 of 76 - 10013 kb] yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \[\d+ of \d+ - \d+ [kKmMgG][bB]\] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function multimedia_scifi()
-	{
-		//some m4vs - "SilverHawks_v1eps01_The Origin Story.par2" yEnc
-		if (preg_match('/^some m4vs - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function music()
-	{
-		//( 80's Giga Hits Collection (32 CDs) By Dready Niek )  By Dready Niek ) [44/54] - "80's Giga Hits Collection (32 CDs) By Dready Niek.part43.rar" yEnc
-		if (preg_match('/^.+By Dready Niek \) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(00/24]  Marco Mengoni - Prontoacorrere (2013) "Marco Mengoni - Prontoacorrere (2013).nzb" - nightsteff  yEnc
-		if (preg_match('/^\(\d+\/\d+\]  (.+?) ".+?' . $this->e0 . ' - nightsteff  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(80's Disco-Soul-Funk) [136/426] - ["Level 42 - Lessons In Love.mp3"] yEnc
-		if (preg_match('/^\((.+)\) \[\d+\/\d+\] - \[".+?' . $this->e0 . '\] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [001/153] - "C4 House Party Horse Meat Disco Set 6.nfo" C4 House Party Horse Meat Disco Set 6 yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [19/22] - C.K.N. Demo 85  "19-rotten system.mp3" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - (.+)[-_\s]{0,3}".+?' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Jungle Fever Tapepacks) [67/79] - "Jungle Fever Tapepacks.part65.rar" yEnc
-		if (preg_match('/^\((.+)\) \[\d+\/(\d+\]) - ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //[1/8] - "Black Market Flowers - Bind (1993).sfv" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[DreamPieter] (Glen Tipton - Two solo albums) [04/23] - "Glenn Tipton - Baptizm of Fire - 04 - Fuel Me Up.mp3" yEnc
-		if (preg_match('/^\[DreamPieter\] \((.+)\) \[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<< <ghost-of-usenet.org> <"Dream Dance Vol. 21-30 - 20CDs MP3 - Ghost.part20.rar"> >www.SSL-News.info<  - (22/32) - 2,45 GB yEnc
-		if (preg_match('/^.+ghost-of-usenet\.org.+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'> >www\.SSL-News\.info<  - \(\d+\/\d+\) - \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Musikjunkie-The.Voice.Of.Germany.2013.The.Best.of.Liveshows.4.CD.Box.Set.VBR [15/28]"voice.part13.rar" yEnc
-		if (preg_match('/^Musikjunkie-([\pL\pN\pM\pP. -]{8,})[-_\s]{0,3}\[\d+\/\d+\]".+?' .
-			$this->e1 . 'u',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"8 Wenn ich einmal gross bin .mp3" Koelschefetz postet.Die Filue -Immer Wigger  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Der etwas andere Mix - Deutscher Foxmix 14 (by dem verrückten Lordi) (3/8) "Der etwas andere Mix - Deutscher Foxmix 14.txt" - 271,24 MB 11.11.03 yEnc
-		if (preg_match('/^.+\(by dem verrückten Lordi\)[-_\s]{0,3}\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB].+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(01/10) "Mylène Farmer - Monkey me (2012 Bluray Audio).rar" - 1,56 GB - yEnc
-		//(3/7) "DJ Taz3 - Your Choice Sendung Silvester 2012.mp3.vol00+01.PAR2" - 119,50 MB -RadioShows und Livesets yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB][-_\s]{0,3}.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[00/20]  Nomadi - Terzo Tempo (2012) "Nomadi - Terzo Tempo (2012).nzb" - nightsteff  yEnc
-		//[02/56] - The Beatles - The Decca Tapes "Beatles - The Decca Tapes.part01.rar" yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\]\)][-_\s]{0,3}(.+) ".+?' . $this->e0 .
-			'([-_\s]{0,3}nightsteff)?[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Marillion - Live From Cadogan Hall 2011 (DVD 1)] [981/98] - "Marillion - Live From Cadogan Hall 2011 (DVD 1).par2" yEnc
-		if (preg_match('/^\[.+\] \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //XTC - NMR - 2001 - Homegrown - The Wasp Star Home Demos [22 of 34] "2001 - Homegrown - The Wasp Star Home Demos.vol00+01.PAR2" yEnc
-		if (preg_match('/^.+ \[\d+ of \d+\] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Wendy O Williams Bump n Grind - "Wendy.O.Williams.Bump.n.Grind.nfo"  yEnc
-		if (preg_match('/^.+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Amity Affliction - Chasing Ghosts_lossless (01/11) - "The Amity Affliction - Chasing Ghosts_lossless.par2" - 321,40 MB - codari_4_usenetrevolution.info-Partner of SSL-News yEnc
-		if (preg_match('/^.+ \(\d+\/\d+\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' - \d+[.,]\d+ [kKmMgG][bB].+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Bob Marley & The Wailers - African Herbsman.nzb 0/8  yEnc
-		if (preg_match('/^([^.]{8,})([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) \d+\/\d+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //DOG DAYS' Season 2 ED Single - Natsu no Yakusoku (Horie Yui)[KICM-1402].- DOG DAYS' Season 2 ED Single - Natsu no Yakusoku (Horie Yui)[KICM-1402].nzb [00/13]  yEnc
-		if (preg_match('/^[\w. &()\[\]\'-]+?\.- ([^.]{8,})([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) \[\d+\/\d+\][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //7 Seconds - Complete Discography - 21 releases - 1980-2005(04/51) "7 Seconds - Complete Discography 1980-2005 - 21 releases.part02.rar" - 639.17 MB - yEnc
-		if (preg_match('/"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		} //7 Seconds - Complete Discography - 21 releases - 1980-2005(04/51) "7 Seconds - Complete Discography 1980-2005 - 21 releases.part02.rar" yEnc
-		if (preg_match('/"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //El.Huervo-Do.Not.Lay.Waste.To.Homes.WEB-DL.MP3.VBR.V0.2012 [00/25] - "vbr.nzb" yEnc
-		if (preg_match('/(.+)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"[a-zA-Z]{3,4}\.nzb"[-_\s]{0,3}yEnc$/ui', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	// a.b.music.mp3
-	public function music_mp3()
-	{
-		//(00/20]  Nomadi - Terzo Tempo (2012) "Nomadi - Terzo Tempo (2012).nzb" - nightsteff  yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\]\)][-_\s]{0,3}(.+) ".+?' . $this->e0 .
-			'[-_\s]{0,3}nightsteff[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [0/8] - Crionics Post - Alice In Chains - Dirt REPOST"Alice In Chains - Dirt.nzb" yEnc
-		if (preg_match('/^.+?\[\d+\/(\d+\][-_\s]{0,3}.+?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(????) [001/153] - "C4 House Party Horse Meat Disco Set 6.nfo" C4 House Party Horse Meat Disco Set 6 yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [19/22] - C.K.N. Demo 85  "19-rotten system.mp3" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - (.+)[-_\s]{0,3}".+?' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(BierbauchFreddy Quwinn seine größten Coversongs Vol2) [22/60] - "040c - Freddy Quinn - Don't Forbid Me (1957) (NH 22 639, EPH 20 575).mp3" yEnc
-		if (preg_match('/^\((.+)\) \[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Spectrum (ft. Matthew Koma) (Extended Mix) - Zedd ] - [2012] - [256 Kbps MP3] [1 of 7] "Spectrum (ft. Matthew Koma) [Extended Mix].mp3" yEnc
-		if (preg_match('/^\[ (.+) \] - \[\d+\] - \[\d+ Kbps MP3\] \[\d+ of \d+\] ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[1/1] - (150 MP3 Album Charts) - "Atlantean Kodex - The White Goddess.rar"  yEnc
-		//[1/1] - (MP3 Album Charts) - "Black Sabbath - 13.rar"  yEnc
-		//[1/1] - (Top100 Album Charts) - "Bastille - Pompeii.rar"  yEnc
-		//[1/1] - (Top100 Charts) - "Beatrice Egli - Gluecksgefuehle.rar"  yEnc
-		//[1/1] - (Top100 Single Charts) -  "Alicia Keys - Girl On Fire.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}\(((Top)?\d+ )?(MP3 )?((Album|Single) )?Charts\)[ -]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[6];
-		}
-		//[1/1] - Album Top 100 - "Amy MacDonald - Life In A Beautiful Light.rar"  yEnc
-		//[1/1] - Top 100 Album Charts 2012 - "Cro - Einmal Um Die Welt.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}(Album )?Top \d+( Album Charts \d+)?[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		//[1/1] (Album Top 100 - 2012) - "Cro - Einmal Um Die Welt.rar"  yEnc
-		//[1/1] (Album Top 100 2012) - "Cro - Einmal Um Die Welt.rar"  yEnc
-		//[1/1] (Album Top 100) - "Cro - Raop.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}\(Album Top \d+(( -)? \d+)?\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //100 Greatest One Hit Wonders 80s[mp3].rar  yEnc
-		if (preg_match('/^(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(001/225) "Dead Can Dance (mp3 - 320Kbs - CBR).part001.rar" - 1.11 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/1] (MP3 Album)- "Agnes Obel - Aventine.rar"  yEnc
-		if (preg_match('/^[\(\[]\d+\/\d+[\]\)][-_\s]{0,3}\(MP3 Album\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ech0park]-[spotnet]-[Snow Patrol 2012 Tour Sampler - 2012-iND] [02/20] - "02-snow_patrol-ill_never_let_go.mp3" yEnc
-		if (preg_match('/^\[ech0park\]-\[spotnet\]-\[(.+?)\] \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<< http://usenet-piraten.info >> - [13/15] - "Monster Cyborg - Overkill (mp3).vol0+1.par2" yEnc
-		if (preg_match('/^.+usenet-piraten\.info.+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/8] - "Nightwish - Storytime (Retail-Single 2011).sfv" -  ShapterV yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[- ]{0,4}ShapterV yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //100 Rock - Vol.04<>usenet-piraten.info<>www.newsconnection.eu<> - (1/5)  "100 Rock - Vol.04.par2" - 101,65 MB - yEnc
-		if (preg_match('/^.+usenet-piraten\.info.+newsconnection\.eu.+[-_\s]{0,3}\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //40 Italo Dance Tunes (2CD) - "00. 40 Italo Dance Tunes 2011.nfo" [02/ 50] nightsteff  yEnc
-		if (preg_match('/^(.+?)[-_\s]{0,3}".+?' . $this->e0 .
-			'[-_\s]{0,3}\[\d+\/ (\d+\]) nightsteff[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Bud Spencer & Terence Hill - Greatest Hits Vol 1 (1995) "04 - Just A Good Boy.mp3" nightsteff  yEnc
-		if (preg_match('/^(.+?) ".+?' . $this->e0 . '[-_\s]{0,3}nightsteff  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Attn: bearcat - Avenged Sevenfold - Avenged Sevenfold 320[17/18] - .vol15+16.par2 5.9Mb yEnc
-		if (preg_match('/^Attn: \w+ - (.+?)\[\d+\/(\d+\]) - .+?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}\d+[.,]\d+[kKmMgG][bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} else {
-			return $this->generic();
-		}
-	}
-
-	public function multimedia_vintage_film_pre_1960()
-	{
-		//WE.WANT.OUR.MUMMY.(THE.THREE.STOOGES).(1939) [08/15] - "The.Three.Stooges.S06E02.We.Want.Our.Mummy.DVDRip.XviD-DEiMOS.part6.rar" yEnc
-		if (preg_match('/^\S+ \[\d+\/\d+\] - ("|#34;)(\S+)\.part\d+\.rar("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //[Hepburn-Tracy Movie Pack] [4of8] Xvid 700mb ENG No-Subs - [00/62] - "State of the Union (1948).nzb" yEnc
-		if (preg_match('/^\[.+\] \[\d+of\d+\] .+ - \[\d+\/\d+\] - ("|#34;)(.+)\.nzb("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //{Dracula #01}  Dracula (1931) - Xvid DVDRip 624x464 NTSC FS Dual Audio - [00/15] - "DRACULA.nzb" yEnc
-		if (preg_match('/^\{.+\} (.+ \(\d{4}\)) .+ \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Incredible Shrinking Man (1957) - Xvid DVDRip 688x384 NTSC WS - [00/16] - "TISM.nzb" yEnc
-		if (preg_match('/^(.+ \(\d{4}\)) - .+ - \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Sudden.Danger.1955.VHSRip.XviD-KG [01/56] - "Sudden.Danger.1955.VHSRip.XviD-KG.nfo" yEnc
-		if (preg_match('/^(.+\d{4})\.(VHSRip|COLOR).+\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //W.C. Fields - You Can't Cheat An Honest Man - 1939 - DVDRip - Xvid - [00/68] - "you can't cheat an honest man 1939.nzb" yEnc
-		if (preg_match('/^.+ - (.+) -( \d{4}) - DVDRip.+ \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . $match[2];
-		} //-=>EnJoY!<-=->Experimental/Avant-Garde/Artistic Shorts<-=->(Day1/?) [00/26] - "Unseen Cinema - Disc I - The Mechanized Eye - Experiments in Technique and Form - 1894-1941 (480p,x264).nzb" yEnc
-		if (preg_match('/^.+enjoy\!.+\[\d+\/\d+\] - ("|#34;)(.+)\.(nzb|nfo|part\d+\.rar|part\.PAR2)("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Goodbye.Charlie.1964.COLOR.TVRip.XviD-CG [01/56] - "Goodbye.Charlie.1964.COLOR.TVRip.XviD-CG.nfo" yEnc
-		if (preg_match('/^(.+\d{4})(\.COLOR)?\.(TV|VHS|VHSTV)Rip.+ \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The.Adventures.of.Sadie.(Our.Girl.Friday).1953.COLOR.DVDRip.XviD-CG [01/69] - "Our.Girl.Friday.1953.COLOR.DVDRip.XviD-CG.nfo" yEnc
-		if (preg_match('/^(\S+\d{4})\.COLOR\.DVDRip.+ \[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Singin' in the Rain (1952) AVC 480p.MKV.001" 01 of 15
-		if (preg_match('/^("|#34;)(.+)\.MKV\.\d+("|#34;) \d+ of \d+$/', $this->subject, $match)) {
-			return $match[2];
-		} //RANDOLPH.SCOTT.-.PARIS.CALLING.(1941) [42/49] - "Paris.Calling.1941.VHSRip.AVC-DD.vol001+002.par2" yEnc
-		if (preg_match('/^.+\(\d{4}\)(\.EXTRA\.PARS|\.\[REPOST\])? \[\d+(\/| of )\d+\][ -]+("|#34;)(.+)(\.vol\d+\+\d+\.par2|-\[big.+\]\.nfo|\.nzb|\.nfo| \- .+.avi\.\d+)("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //RANDOLPH.SCOTT.-.PARIS.CALLING.(1941) [42/49] - "Paris.Calling.1941.VHSRip.AVC-DD.vol001+002.par2" yEnc
-		if (preg_match('/^.+\(\d{4}\)(\.EXTRA\.PARS|\.\[REPOST\])? \[\d+(\/| of )\d+\][ -]+("|#34;)(.+)(\.vol\d+\+\d+\.par2|-\[big.+\]\.nfo|\.nzb|\.nfo| \- .+.avi\.\d+|\.par2)("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Mickey.1918.SILENT.DVDRip.XviD-KG [01/70] - "Mickey.1918.SILENT.DVDRip.XviD-KG.nfo" yEnc
-		if (preg_match('/^.+\d{4}\.(SILENT|DVDRip).+ \[\d+\/\d+\] - ("|#34;)(.+)\.nfo("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //More Assorted Goodies - REQ:Decasia [01/16] - "The Bullwinkle Show with Occasional Rare Bullwinkle Puppet - BnW.part.nzb" yEnc
-		if (preg_match('/^(More Assorted Goodies|Even More Offerings) - REQ:.+ \[\d+\/\d+\] - ("|#34;)(.+)\.part\.nzb("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //The Birth of a Nation - 1915 [1 of 71] "The Birth of a Nation - 1915.part01.rar" yEnc
-		if (preg_match('/^(.+) -( \d{4}) \[\d+ of \d+\] ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . $match[2];
-		} //Musicals [05/10] - "The band wagon 1953.nzb" yEnc
-		if (preg_match('/^Musicals(\.NZBs)? \[\d+\/\d+\] - ("|#34;)(.+)\.nzb("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //Torchy Runs for Mayor (Maypo) [13 of 24] "Torchy Runs for Mayor.avi.013" yEnc
-		if (preg_match('/^(Torchy.+) \[\d+ of \d+\] ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/27] - "Monkey Business (1952).avi.001" (1/130)
-		if (preg_match('/^\[\d+\/\d+\] - ("|#34;)(.+ \(\d{4}\))\.avi\.\d+("|#34;)( \(\d+\/\d+\))?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function nl()
-	{
-		//(????) [01/46] - "NCIS.S11E02.Past.Present.and.Future.1080p.WEB-DL.DD5.1.H.264-CtrlHD.par2" yEnc
-		if (preg_match('/\((\d+|\?+)\) \[\d+\/\d+\].*"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/', $this->subject, $match)) {
-			return $match[2];
-		} //JN - [1/3] - "Operatie Teheran-Joel C Rosenberg JN.par2" yEnc
-		if (preg_match('/^\w+[-_\s]{0,3}[\[\(]\d+\/\d+[\]\)][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //( Overlord II RELOADED ) - [013/112] - "rld-olii.part001.rar" yEnc
-		if (preg_match('/^\( ([\w. -]{8,}) \)[-_\s]{0,3}\[\d+\/(\d+\]) - ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Batman.Arkham-Origins.Initiation-RELOADED - [006/296] - "r.vol010+08.PAR2" yEnc
-		if (preg_match('/^([\w. &()-]{8,}?\b)[-_\s]{0,3}\[\d+\/(\d+\])[-_\s]{0,3}".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(PC-ISO) ( Trials.Fusion.Riders.of.the.Rustlands-SKIDROW ) [10/40] - "sr-tfrotr.part01.rar" yEnc
-		if (preg_match('/^\(PC-ISO\)[-_\s]{0,3}\( ([\w.,& ()\[\]\'\`-]{8,}?\b) \) \[\d+\/\d+\][-_\s]{0,3}".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //- - [03/33] - "s88fX0O0g7ZPGa96TyeDr.part02.rar" yEnc
-		if (preg_match('/^[-_\s]{0,4}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function pictures_erotica_anime()
-	{
-		// [ABPEA - Original] Arima Zin - Tennen Koiiro Alcohol [BB, Boy] - 005 of 229 - yEnc "Tennen_Koiiro_Alcohol-005.jpg" to [ABPEA - Original] Arima Zin - Tennen Koiiro Alcohol [BB, Boy]
-		if (preg_match('/(.*)\s+-\s+\d+\s+of\s+\d+\s+-\s+yEnc\s+".*"/i', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function ps3()
-	{
-		//[4197] [036/103] - "ant-mgstlcd2.r34" yEnc
-		if (preg_match('/^(\[\d+\] )\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	// a.b.pwp
-	public function pwp()
-	{
-		//(300/454) "James_Bond_You_Only_Live_Twice_bd25.part300.rar" - 22,22 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_ ]{0,3}"(.+?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function series_tv_french()
-	{
-		//(01/34) "Merlin.2008.1x04.la.vengeance.de.nimue.par2" - 388,38 MB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Breaking.Bad.S02.MULTi.720p.BluRay.AC3.x264-BoO [749/883] - "212ACS3517.part01.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9._-]+)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Dawson.Saison2.DVDRIP.x264.FRENCH [111 of 196] "Dawson.S2.E22.Tout feu, tout flambe.m4v.003" yEnc
-		if (preg_match('/^([a-zA-Z0-9._-]+)[-_\s]{0,3}[\(\[]\d+ of (\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/22] - "Unnatural.History.1x03.Espion.En.Sommeil.FR.LD.par2" yEnc
-		if (preg_match('/^[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[MagNeum 3.14 S1 D.V.D + par2][1148/1167] - "ZDFRIKK8470DO776.D7P" yEnc
-		if (preg_match('/^\[(.+?)\][-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sony_psp()
-	{
-		//(01/10) "Assassins Creed - Bloodlines [EUR].par2" - 408,46 MB yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+([.,]\d+ [kKmMgG])?[bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(20444) FIFA_12_EUR_GERMAN_PSP-ABSTRAKT [01/50] - "as-f12g.nfo" yEnc
-		if (preg_match('/^\(\d+\) ([a-zA-Z0-9 -_\.]+) \[\d+\/(\d+\]) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sound_mp3()
-	{
-		//- codari_4_usenetrevolution.info-Partner of SSL-News UK.Single.Charts.Top.40  [01/25] - "UK.Single.Charts.Top.40.par2" - 301,70 MB - yEnc
-		if (preg_match('/.+[-_\s]{0,3}[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"(.+)' . $this->e0 .
-			'[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Terraplane Sun - Funnel of Love.mp3" - 21.55 MB - (1/6) - yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}\(\d+\/(\d+\))[ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //trtk09920 - [01/12] - "Guido Negraszus - Night Cafe Iii (Freedom Travellers) (2012)(320).par2" yEnc
-		if (preg_match('/^trtk\d+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [001/153] - "C4 House Party Horse Meat Disco Set 6.nfo" C4 House Party Horse Meat Disco Set 6 yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [19/22] - C.K.N. Demo 85  "19-rotten system.mp3" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - (.+)[-_\s]{0,3}".+?' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(LUNATIC SOUL - IMPRESSIONS) [00/18] - "Lunatic Soul - Impressions 2011.nzb" yEnc
-		if (preg_match('/^\(.+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/8] - "Black Market Flowers - Bind (1993).sfv" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[1/1] - (150 MP3 Album Charts) - "Atlantean Kodex - The White Goddess.rar"  yEnc
-		//[1/1] - (MP3 Album Charts) - "Black Sabbath - 13.rar"  yEnc
-		//[1/1] - (Top100 Album Charts) - "Bastille - Pompeii.rar"  yEnc
-		//[1/1] - (Top100 Charts) - "Beatrice Egli - Gluecksgefuehle.rar"  yEnc
-		//[1/1] - (Top100 Single Charts) -  "Alicia Keys - Girl On Fire.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}\(((Top)?\d+ )?(MP3 )?((Album|Single) )?Charts\)[ -]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[6];
-		} //[1/1] - (Album Top 100) - "[Dance] David Guetta - One Love (2010) .rar"  yEnc
-		//[1/1] - (Album Top 100) - "Aerosmith - Music From Another Dimension.rar"  yEnc
-		//[1/1] - Album Top 100 - "ACDC - Live At River Plate.rar"  yEnc
-		//[1/1] (Album Top 100 - 2012) - "Alicia Keys - Girl On Fire.rar"  yEnc
-		//[1/1] (Album Top 100 2012) - "Asaf Avidan And The Mojos - One Day.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}(\()?(Album|Single) Top \d+ ([- ]{0,2}\d+)?(\))? - "(\[.+?\] )?(.+?)' .
-			$this->e0 . ' {1,4}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[6];
-		} //[1/1] - Top 100 Album Charts 2012 - "Aura Dione feat. Rock Mafia - Friends.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}Top \d+ Album Charts \d+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' {1,4}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<>usenet-piraten.info<>partner<>ssl-news.info<> - [10/10] - "Overexposed (Deluxe Version).vol31+23.par2" yEnc
-		if (preg_match('/^.+usenet-piraten\.info.+ - \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/1) "Adam Levine (Maroon 5) & Alicia Keys - Daylight & Girl on fire LIVE 55TH GRAMMY AWARDS 320Kpbs.mp3" yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/4) - VERBAteam™ present - "Avril Lavigne - Rock 'N Roll (Official Audio).mp3" - 5,80 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - VERBAteam™ present - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/1] - (Album Top 1000) - "Davis, Miles - Complete Live at the Plugged Nickel 1965.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}\(Album Top \d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/1] - Album Top 100 - "Rammstein - Made In Germany 1995-2011.rar"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}Album Top \d+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Andrea Berg - My Danish Collection (2013) by dem verrückten Lordi (14/27) "Andrea Berg - My Danish Collection (2013).par2" - 132,74 MB  150920134 yEnc
-		//Der Deutsche Beat Mix Teil 2 auf wunsch (by dem verrückten Lordi) (2/9) "Der Deutsche Beat Mix Teil 3 Back.jpg" - 117,84 MB 13.11.05 yEnc
-		if (preg_match('/^(.+?) (\()?by dem verrückten Lordi(\))? {1,2}\(\d+\/\d+\) ".+?' .
-			$this->e0 . '[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB].+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Christian Anders - Tief in dir  (15/24) "Christian Anders - Tief In Dir Back.jpg" - 58,56 MB by dem verrückten Lordi 0703123 yEnc
-		if (preg_match('/^(.+?)  \(\d+\/\d+\) ".+?' . $this->e0 .
-			'[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB] {1,2}by dem verrückten Lordi.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Der etwas andere Mix - Wilde Herzenmix (auf wunsch) neu (by dem verrückten Lordi) (1/8) "Der etwas andere Mix - Wilde Herzenmix.par2" yEnc
-		if (preg_match('/^Der etwas.+ - (.+) \(\d+\/\d+\) ".+?' . $this->e0 . '.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Full Discography - The Cranberries (01/47) "Full Discography - The Cranberries.par2" - 3,52 GB  2812111 yEnc
-		if (preg_match('/^(.+?) \(\d+\/\d+\) ".+?' . $this->e0 .
-			'[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB] {1,2}\d+ yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //jean ferrat  année 1967 à 1969  meil29 "17 Rien à voir.mp3" yEnc
-		if (preg_match('/^(.+?) meil29 ".+?' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //Selected Songs by Various Artists - Depeche Mode - Personal Jesus (Acoustic Version).mp3  yEnc
-		if (preg_match('/^Selected Songs by Various Artists - (.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sound_mp3_complete_cd()
-	{
-		//(05/10) - [Lords-of-usenet] <<Partner of SSL-News.info>>  "Wynardtage Praise The Fallen(2007).vol00+01.PAR2" - 132,64 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ _-]{0,3}\[Lords-of-usenet\][ _-]{0,3}<<Partner of SSL-News.info>>[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(06/11) - <www.lords-of-usenet.org><by Nerts> - "Diens - Schwarzmale.vol00+01.PAR2" - 141,07 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ _-]{0,3}<www\.lords-of-usenet\.org><by Nerts>[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //trtk09920 - [01/12] - "Guido Negraszus - Night Cafe Iii (Freedom Travellers) (2012)(320).par2" yEnc
-		if (preg_match('/^trtk\d+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [01/31] - "Adrian von Ziegler - Discography - 2010-2013.par2" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<www.Lords-Of-Usenet.org><by Nerts> (09/18) - "Mantus - Fatum (2013) [2CD].FH.vol00+2.PAR2" - 336,39 MB - yEnc
-		if (preg_match('/^<www\.lords-of-usenet\.org><by Nerts>[ _-]{0,3}\(\d+\/\d+\)[ _-]{0,3}[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(08/15) "Noemi-Red.(Unreleased).2006.by.NYCrules.vol000+01.PAR2" - 179,66 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[16_Bit_Lolitas-Warung_Brazil_002-2CD-2012-iHF] [www.usenet4ever.info by Secretusenet] -  "000-16_bit_lolitas-warung_brazil_002-2cd-2012-ihf.sfv" yEnc
-		//[3RD_Prototype_-_On_My_Way-(TB7368)-WEB-2013-FMC] [www.usenet4ever.info by Secretusenet] -  "01-3rd_prototype_-_deafback-when_you_are_in_the_dark_(deafback_remix).mp3" yEnc
-		//[Armin_Van_Buuren_Feat._Fiora-Waiting_For_The_Night-(ARMD1140)-WEB-2013-UKHx] [www.usenet4ever.info by Secretusenet] -  "00-armin_van_buuren_feat._fiora-waiting_for_the_night-(armd1140)-web-2013-ukhx.m3u" yEnc
-		if (preg_match('/^\[([a-zA-Z0-9-_\(\)\.]+)\] \[www\.usenet4ever\.info by Secretusenet\] -  "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>ghost-of-usenet.org<< 16_Bit_Lolitas-Warung_Brazil_002-2CD-2012-iHF >>www.SSL-News.info> -  "101-16_bit_lolitas-warung_brazil_002_cd1.mp3" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org<< ([a-zA-Z0-9-_\(\)\.]+) >>www\.SSL-News\.info> -  "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Blok_B-Bienvenue_Dans_Mon_Blok_Vol.1-2005-BZ_INT [20 of 27] "01-gangsta.mp3" yEnc
-		//DJ Neev - HedKandi_2013-06-08 (Ministry of Sound Radio) [01/13] - "DJ Neev - HedKandi_2013-06-08 (Ministry of Sound Radio).par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\(\)\.]+) \[\d+(\/| of )(\d+\])[-_\s]{0,3}".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(www.Thunder-News.org) >Dee_And_Crane-Let_The_Music_Play-WEB-2012-UKHx< <Sponsored by Secretusenet> - "05-dee_and_crane-let_the_music_play_(jay_frogs_keep_the_groove_remix_edit).mp3" yEnc
-		if (preg_match('/^\(www\.Thunder-News\.org\) >(.+?)< <Sponsored by Secretusenet> - ".+?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/1] - (MP3 ALBUM CHARTS) - "Andreas Gabalier - Volksrock'n'roller-Live.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - \((MP3 )?ALBUM CHARTS\) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sounds_flac()
-	{
-		//[32974]-[FULL]-[#a.b.flac]-[ Tenniscoats-Tokinouta-JP-CD-FLAC-2011-BCC ]-[04/28] - "00-tenniscoats-tokinouta-jp-cd-flac-2011.nfo" yEnc
-		if (preg_match('/^\[\d+\]-\[.+?\]-\[.+?\]-\[ (.+?) \]-\[\d+\/\d+] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[:SEK9:][FLAC/Metal]-[:Burn_The_Priest-Burn_The_Priest-Remastered-CD-FLAC-2005-TiLLMYDEATH:]-[01/18]-"00-burn_the_priest-burn_the_priest-remastered-cd-flac-2005-proof.jpg" yEnc
-		if (preg_match('/^\[:.+:\]\[FLAC.+\]-\[:(.+):\]-\[\d+\/\d+\]-".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sounds_lossless()
-	{
-		//http://dream-of-usenet.org empfehlen newsconnection.eu - [02/32] - "Adam_Ant-Manners_and_Physique-(MCAD-6315)-CD-FLAC-1989-2Eleven.par2" yEnc
-		if (preg_match('/^http:\/\/dream-of-usenet\.org .+? - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Rush - Sector One 24-96  (000/229] - ".nzb" yEnc
-		//Stevie Ray Vaughan - Couldn't Stand the Weather  (01/19] - ".sfv" yEnc
-		if (preg_match('/^([a-zA-Z0-9]+.+? - .+?)\s+\(\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //trtk07073 - [18/26] - "1990 Santana - Spirits Dancing In The Flesh (flac).part17.rar" yEnc
-		if (preg_match('/^trtk\d+ - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //COMPLETE REPOST Magma - NMR - 1974 - Wurdah Itah [01 of 23] "1974 - Wurdah Itah.par2" yEnc
-		if (preg_match('/^COMPLETE REPOST (.+? - )NMR -( \d{4}) - (.+?) \[\d+ of \d+\] ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . $match[3] . "(" . $match[2] . ")";
-		} //Sensation - VA - Source Of Light (2CD 2012) [02 of 67] - "00 - Sensation - VA - Source Of Light (2CD 2012) [nmr].txt" yEnc
-		if (preg_match('/^([A-Z0-9].+? - VA - .+?) \[\d+ of \d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Ryan McGarvey - Forward In Reverse [01/21] - "00 - Ryan Mcgarvey - Forward in Reverse.nfo" yEnc
-		//JFC - The Timerewinder (NMR) [01/15] - "00 - The Timerewinder.nfo" yEnc
-		//The Brothers Johnson - 1981 - Winners (2011 expanded remastered) [01/31] - "01 - The Real Thing.flac" yEnc
-		//Jermaine Jackson - 1980 - Let's Get Serious [00/23] - "Jermaine Jackson - 1980 - Let's Get Serious.nzb" yEnc
-		if (preg_match('/^([A-Z0-9][A-Za-z0-9 ]{2,} -( \d{4} -)? [A-Z0-9].+?( \(.+?\))?) \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Miles Davis - In A Silent Way (1969) [2013 - HDTracks 24-176,4] - "iasw24-176.par2" yEnc
-		//Bob James & David Sanborn - Quartette Humaine (2013) [HDTracks 24-88,2] - "qh24-88.par2" yEnc
-		if (preg_match('/^([A-Z0-9].+? - [A-Z0-9].+? \(\d{4}\) \[.*?HDTracks.+?\]) - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Sonny Landreth - 2010 - Mississippi Blues - 04 of 29 - 00 - Mississippi Blues.sfv yEnc
-		//Fruteland Jackson - 1996 - ... Is All I Crave - 08 of 20 - 00 - Fruteland Jackson - ... Is All I Crave.log yEnc
-		if (preg_match('/^([A-Z0-9].+? - \d{4} - .+?) - \d+ of \d+ - \d+ - .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(VA - Cafe Del Mar Dreams 5-2012-Samfie Man) [37/38] - "VA - Cafe Del Mar Dreams 5-2012-Samfie Man.vol063+040.par2" yEnc
-		if (preg_match('/^\((VA - .+?)\) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(152092XA20) [08/16] - "Guns and Roses - Use Your Illusion I - 08-Back Off Bitch.flac" yEnc
-		if (preg_match('/^\([A-Z0-9]+\) \[\d+\/\d+\] - "(.+?) - \d+-.+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Eros_Ramazzotti-Eros-IT-CD-FLAC-1997-FADA[04/26] - "00-eros_ramazzotti-eros-1997-fada.sfv" yEnc
-		if (preg_match('/^([\w-]{5,})\[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//.: VA-Liquid_Music-The_Future_House_Compilation-CD-FLAC-1993-WRS :. - .:www.thunder-news.org:. - .:sponsored by secretusenet.com:. - "00-va-liquid_music-the_future_house_compilation-cd-flac-1993-wrs.nfo" yEnc
-		//.:Bruce_BecVar-Arriba-CD-FLAC-1993-JLM:. - .:thunder-news.org:. - .:sponsored by secretusenet.com:. - "00-bruce_becvar-arriba-cd-flac-1993.m3u" yEnc
-		if (preg_match('/^.:[-_\s]{0,3}(.+?)[-_\s]{0,3}:..+?thunder-news\.org.+?secretusenet\.com:. - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //_ "CARUSO & GIGLI - O Sole Mio - The  Unknown.nzb" yEnc
-		if (preg_match('/^[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//"Art Tatum - The Complete Trio Sessions with Tiny Grimes & Slam Stewart - Vol 1.NFO" - 1 of 6 (1/1)
-		//"Galen Jeter and the Dallas Jazz Orchestra - Thank You, Leon.NFO" - 1 of 5 (1/1) (1/1)
-		if (preg_match('/^[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[-_\s]{0,3}\d+ (of \d+)( \(\d+\/\d+\)){1,2} (yEnc)?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Doc Watson - 1973 - The Essential Doc Watson - 01 - Tom Dooley.flac" - 406.64 MB - yEnc
-		if (preg_match('/^[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sounds_mp3()
-	{
-		//(dream-of-usenet.info) - [04/15] - "Enya-And_Winter_Came...-2008.part2.rar" yEnc
-		if (preg_match('/^\(dream-of-usenet\.info\) - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //http://dream-of-usenet.org empfehlen newsconnection.eu - [02/32] - "Adam_Ant-Manners_and_Physique-(MCAD-6315)-CD-FLAC-1989-2Eleven.par2" yEnc
-		if (preg_match('/^http:\/\/dream-of-usenet\.org .+? - \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //trtk09920 - [01/12] - "Guido Negraszus - Night Cafe Iii (Freedom Travellers) (2012)(320).par2" yEnc
-		if (preg_match('/^trtk\d+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>>> CREATIVE COMMONS NZB <<< "dexter romweber duo-lookout" - File 1 of 9: "creative_commons_nzb_dexter_romweber_duo-lookout.rar" yEnc
-		if (preg_match('/^>>> CREATIVE COMMONS NZB <<< "(.+?)" - File \d+ of \d+: ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<usenet-space-cowboys.info>>>  <<<Powered by https://secretusenet.com>< "Justin_Bieber-Believe_Acoustic-2013-pLAN9_usenet-space-cowbys.info.rar" >< 4/6 (78.65 MB) >< 60.84 MB > yEnc
-		if (preg_match('/^.+?usenet-space.+?Powered by.+? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'.+? \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\) .+? \d+[.,]\d+ [kKmMgG][bB] .+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"The Absence - Riders Of The Plague" [00/14] - "the_absence-riders_of_the_plague.nzb" yEnc
-		if (preg_match('/"(.+)"[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//( Albert Cummings Albums 6x By Dready Niek (1999-2012) )  ( ** By Dready Niek ** ) [11/20] - "Albert Cummings Albums 6x By Dready Niek (1999-2012).part10.rar" yEnc
-		//( Fat Freddy's Drop - Blackbird (2013) -- By Dready Niek ) -- By Dready Niek ) [01/15] - "Fat Freddy's Drop - Blackbird (2013) -- By Dready Niek.par2" yEnc
-		if (preg_match('/\( (.+?)\)[-_\s]{0,3}( |\().+\)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //( Addison_Road-Addison_Road-2008 ) [01/10] - "01. Addison Road - This Could Be Our Day.mp3" yEnc
-		if (preg_match('/\( (.+?) \)[-_\s]{0,3}[\(\[]\d+\/(\d+[\)\]])[-_\s]{0,3}".+(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [0/8] - Crionics Post - Alice In Chains - Dirt REPOST"Alice In Chains - Dirt.nzb" yEnc
-		if (preg_match('/^.+?\[\d+\/(\d+\][-_\s]{0,3}.+?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(????) [001/153] - "C4 House Party Horse Meat Disco Set 6.nfo" C4 House Party Horse Meat Disco Set 6 yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [19/22] - C.K.N. Demo 85  "19-rotten system.mp3" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - (.+)[-_\s]{0,3}".+?' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(03/11) "Europe - Discography (1983 - 2009) (320 kbps CBR)  www.brothers-of-usenet.org - empfehlen - Newsconnection.par2" yEnc
-		//(03/11) "Evanescence Diskographie (1998-2011) www.brothers-of-usenet.org - empfehlen - Newsconnection.par2" yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"(.+?) {1,3}www\.brothers-of-usenet\.org - empfehlen - Newsconnection' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(107/123) - "Mark.EG.M.Zone.Rave.Tape.Packs.Hard.Trance.1990s.vol006+04.PAR2" - 11.39 GB yEnc
-		//(12/16) "Horrid Henry The Movie - Original Soundtrack.vol00+01.PAR2" - 102.32 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[002/123] - "Mark.EG.M.Zone.Rave.Tape.Packs.Hard.Trance.1990s.part001.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //< usenetrevolution > <-> Partner of ssl-news.info <-> Anastacia.-.It's.a.Mans.World  [04/15] - "Anastacia.-.It's.a.Mans.World.part01.rar" - 100,47 MB - yEnc
-		if (preg_match('/^.+usenetrevolution.+Partner of ssl-news\.info.+\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Old but Sold>>>  <<< >< >< "German Top 50 ODC - 12.08.2013.nfo" >< 02/33 (541,61 MB) >< 10,93 kB > yEnc
-		if (preg_match('/^.+Old but Sold.+>< "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' >< \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\).+ yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<< <ghost-of-usenet.org> <"MC Basstard Diskographie 16CDs 2000-2011 MP3 - Ghost.part08.rar"> >www.SSL-News.info<  - (10/43) - 1,69 GB yEnc
-		//<<< <ghost-of-usenet.org> >"UltraTraxx Rare Remixes - Vol 011 MP3 192kbps.par2"> >www.SSL-News.info<  - (1/9) - 120,82 MB yEnc
-		if (preg_match('/^.+ghost-of-usenet.org[<>] [><]"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'> >www\.SSL-News\.info<  - \(\d+\/\d+\)[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //BY REQ:........! - "Keith Whitley - All American Country - .par2" [06/22]  yEnc
-		if (preg_match('/^BY REQ.+ - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \[\d+\/\d+\]  yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Der etwas andere Mix - Wilde Herzenmix (auf wunsch) neu (by dem verrückten Lordi) (1/8) "Der etwas andere Mix - Wilde Herzenmix.par2" yEnc
-		if (preg_match('/^Der etwas.+ \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //DJ Inferno Beatport Xtreme September 2011[63/66] - "DJ Inferno Beatport Xtreme September 2011.vol073+55.PAR2" upp o-o  yEnc
-		//Kastelruther Spatzen - Weihnachten Bei Uns Daheim (2011) (22/25) "Kastelruther Spatzen - Weihnachten Bei Uns Daheim (2011).vol00+1.PAR2" - 113,03 MB -  Tapier 13.11.02 yEnc
-		if (preg_match('/^.+[\[\(]\d+\/\d+[\)\]][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"8 Wenn ich einmal gross bin .mp3" Koelschefetz postet.Die Filue -Immer Wigger  yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Queens Of The Stone Age - Rated R (2000) (10th Anniversary Deluxe Edition 2010) [EAC/Lame V0] "QU2 - Queens of the Stone Age - Rated R.M3u" yEnc
-		if (preg_match('/^.+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //squeeze-east side story-nmr- [01/14] - 01-squeeze-in quintessence.mp3  yEnc
-		if (preg_match('/^(.+?)- [\[\(]\d+\/\d+[\)\]][-_\s]{0,3}\d\d.+?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sounds_mp3_complete_cd()
-	{
-		//(01/11) "Der Kleine Vampir Komplett - Folge 01 bis 18 www.brothers-of-usenet.org - empfehlen - Newsconnection.eu.nfo" yEnc
-		if (preg_match('/^\(\d+\/\d+\) "(.+?) www\.brothers-of-usenet\.org - empfehlen - Newsconnection(\.eu)?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/15) "Dafuniks - Enter The Sideshow Groove.rar.001"by_Funkeefly yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'by_Funkeefly yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //trtk09920 - [01/12] - "Guido Negraszus - Night Cafe Iii (Freedom Travellers) (2012)(320).par2" yEnc
-		if (preg_match('/^trtk\d+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/20) "Oz Discography by Grave Digger.par2" - 445,72 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(D The Best Of Leon Russell [23/28] - The Best Of Leon Russell.vol00+01.PAR2  yEnc
-		if (preg_match('/^\(D(\))? (.+) {1,2}\[\d+\/\d+\] - .+?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) {1,2}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //<<< <ghost-of-usenet.org> <"Dream Dance Vol. 21-30 - 20CDs MP3 - Ghost.part20.rar"> >www.SSL-News.info<  - (22/32) - 2,45 GB yEnc
-		if (preg_match('/^.+ghost-of-usenet\.org.+"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'> >www\.SSL-News\.info<  - \(\d+\/\d+\) - \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Cowboyup35>>><<<Adele - Rolling In The Deep.mp4>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "Adele - Rolling In The Deep.mp4" >< 2/5 (77,13 MB) >< 63,94 MB > yEnc
-		//<<<Thor0103>>><<<Amorphis_-_Tuonela-Digipak-1999-kispatak>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "09_rusty_moon-kispatak.mp3.par2" >< 01/26 (143,73 MB) >< 6,10 kB > yEnc
-		if (preg_match('/^<<<.+>>><<<(.+)>>>usenet-space-cowboys\.info.+secretusenet\.com>< ".+?' .
-			$this->e0 .
-			' >< \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\) >< \d+[.,]\d+ [kKmMgG][bB] > yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<usenet-space-cowboys.info>>> THOR <<<Powered by https://secretusenet.com>< "Bangbros_Vs_Hansebanger_-_Kiezstyle-Promo-Vinyl-2006-ToTo_usenet-space-cowbys.info.avi" >< 3/5 (31,12 MB) >< 11,21 MB > yEnc
-		if (preg_match('/^<<<usenet-space-cowboys\.info>>>.+secretusenet\.com>< "(.+?)-\w+_usenet-space-cowbys\.info' .
-			$this->e0 .
-			' >< \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\) >< \d+[.,]\d+ [kKmMgG][bB] > yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Usenet-Space-Cowboys.info>>><<<Fuzzy>>> <Powered by https://secretusenet.com> < "Alice_Cooper-Trash-1989-Wyse.nfo" >< 2/8 (89,39 MB) >< 17,21 kB > yEnc
-		if (preg_match('/^<<<usenet-space-cowboys\.info>>>.+secretusenet\.com> < "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			' >< \d+\/\d+ \(\d+[.,]\d+ [kKmMgG][bB]\) >< \d+[.,]\d+ [kKmMgG][bB] > yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>>> www.lords-of-usenet.org <<< "Chris De Burgh - The Getaway.par2" - [1/9] - [115,51 MB] yEnc
-		//>>> www.lords-of-usenet.org <<< "Das Deutsche Schlager Magazin Die Maxis 1 2CD.par2" [01/12] - 205,70 MB yEnc
-		if (preg_match('/^>>> www.lords-of-usenet\.org <<< "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 .
-			'[-_\s]{0,3}\[\d+\/\d+\] - (\[)?\d+[.,]\d+ [kKmMgG][bB](\])? yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[BFMP3] [Barrelhouse_Time Frames.nzb] [00/18] yEnc
-		if (preg_match('/^\[.+?\][-_\s]{0,3}\[([\w.,& ()\[\]\'\`-]{8,}?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}\])[-_\s]{0,3}[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Metallica - Ride The Lightning    "01 - Fight Fire With Fire.mp3" yEnc
-		if (preg_match('/^([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/11) "Der Kleine Vampir Komplett - Folge 01 bis 18 www.brothers-of-usenet.org - empfehlen - Newsconnection.eu.nfo" yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w.,& ()\[\]\'\`-]{8,}?) www\.brothers-of-usenet\.org - empfehlen - Newsconnection\.eu' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Refreshments - [1/9] - "The Refreshments - Rock´n Roll Christmas [2003].par2" yEnc
-		if (preg_match('/([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Longines Symphonette-Far Away Places-(LP2 of 2)-Far Away Places-LP 2.par2 yEnc
-		if (preg_match('/^([\w.,& ()\[\]\'\`-]{8,}?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4}) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Reader's Digest- Mario Lanza-The Very Best of Mario Lanza(CD3 of 3)-CD 3.par2  yEnc
-		if (preg_match('/^Reader\'s Digest- {0,1}(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/10] - "Acdc - Fly On The Wall - 1985 -01 - Fly On The Wall -Creative7164.mp3"  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}"([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}\d+[\w.,& ()\[\]\'\`-]{8,}?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[1/7] ->> "God Forbid 2009 - Reject the Sickness.par2" <<- ShapterV  yEnc
-		if (preg_match('/^\[\d+\/\d+\] ->> "([\w.,& ()\[\]\'\`-]{8,}?)' . $this->e0 .
-			' <<- ShapterV  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Glenn Miller-The Missing Chapters Vol. 6-Blue Champagne--Glenn Miller-The Missing Chapters Vol. 6-Blue Champagne.par2  yEnc
-		if (preg_match('/^([\w.,& ()\[\]\'\`-]{8,}?)--[\w.,& ()\[\]\'\`-]{8,}?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sounds_mp3_dance()
-	{
-		//[2707]Solarstone-Solarstone_Collected_Vol_1-ARDI3177-WEB-2012-TraX "02-solarstone_feat_kym_marsh-day_by_day_(red_jerry_smackthe_bigot_up_remix).mp3" - yEnc
-		if (preg_match('/^\[\d+\](.+?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function sounds_mp3_electronic()
-	{
-		//(03/10) "Washing Machines - Planet-E CH-Basel Ultimate Hardcore - 4.9.1993.vol00+01.PAR2" - 232.39 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(2/7) "Cosmic Baby live at Energy 1995.vol00+01.PAR2" - 0 B - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+ [bB][-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[0sk]-[2002-12-06]-[idm]-[vinyl]-[4/5]-[Maps_And_Diagrams_-_Ti_Sta_Bene_Marone-(cact_001)-Vinyl-2002]--cact 001.sfv  yEnc
-		if (preg_match('/^\[0sk\]-\[\d+-\d+-\d+\]-\[.+\]-\[.+\]-\[\d+\/\d+\]-\[([\w.,& ()\[\]\'\`-]{8,})\]--.+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[10_years---happy_bday_absme]-[cd]-[04/15]-[va_-_spacewars_01-(plkcd003)-cd-1996-nwd]-01-Nuw Idol - Union Of Ilk -nwd-.mp3  yEnc
-		if (preg_match('/^\[.+\]-\[.+\]-\[\d+\/\d+\]-\[([\w.,& ()\[\]\'\`-]{8,})\]-.+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Alec Empire - Low On Ice  06 - Untitled.mp3  yEnc
-		if (preg_match('/^([\w.,& ()\[\]\'\`-]{8,}?)[-_\s]{0,3}\d+[-_\s]{0,3}[\w.,& ()\[\]\'\`-]{8,}?\b.?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Selected Songs by Various Artists - Collide - Razor Sharp.mp3  yEnc
-		if (preg_match('/^Selected Songs by Various Artists - ([^.]{8,})([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function teevee()
-	{
-		// rename these teevee releases as the requestid is for the full season
-		// Episode info in 4th block so use that
-		//[169018]-[FULL]-[a.b.teevee]-[ House.of.Lies.S01E01.720p.WEB-DL.DD5.1.H.264-BS ]-[04/32] - "House.of.Lies.S01E01.The.Gods.of.Dangerous.Financial.Instruments.720p.WEB-DL.DD5.1.H.264-BS.part03.rar" yEnc
-		if (preg_match('/\[\d+\]-\[.+?\]-\[.+?\]-\[ (.+\.S\d\dE\d\d\..+?) \][- ]\[\d+\/\d+\][ -]{0,3}"[\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}-]{8,}?\b.?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		// Season only in 4th block so take filename
-		//[169019]-[FULL]-[a.b.teevee]-[ House.of.Lies.S02.720p.WEB-DL.DD5.1.H.264-BS ]-[24/32] - "House.of.Lies.S02E02.When.Dinosaurs.Ruled.the.Planet.720p.WEB-DL.DD5.1.H.264-BS.vol000+01.par2" yEnc
-		if (preg_match('/\[\d+\]-\[.+?\]-\[.+?\]-\[ .+\.S\d\d\..+? \][- ]\[\d+\/\d+\][ -]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		// END teevee requestid renaming
-
-		//[######]-[FULL]-[#a.b.teevee@EFNet]-[ Misfits.S01.SUBPACK.DVDRip.XviD-P0W4DVD ] [1/5] - "Misfits.S01.SUBPACK.DVDRip.XviD-P0W4DVD.nfo" yEnc
-		if (preg_match('/^\[#+\]-\[.+?\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/\d+\][-_\s]{0,3}("|#34;).+?("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[34148]-[FULL]-[#a.b.teevee@EFNet]-[Batman.The.Animated.Series.S04E01.DVDRiP.XviD-PyRo]-[00/35] "Batman.The.Animated.Series.S04E01.DVDRiP.XviD-PyRo.nzb" yEnc
-		if (preg_match('/^\[#+\]-\[.+?\]-\[.+?\]-\[(.+?)\][- ]\[\d+\/\d+\][-_\s]{0,3}".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[38722]-[#a.b.foreign@EFNet]-[ Game.Of.Thrones.S01E01.Der.Winter.Naht.GERMAN.DL.WS.1080p.HDTV.x264-MiSFiTS ]-[01/37] - "misfits-gameofthrones1080-s01e01-sample-sample.par2" yEnc
-		if (preg_match('/^\[#+\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/\d+\][-_\s]{0,3}".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[#a.b.teevee] Parks.and.Recreation.S01E01.720p.WEB-DL.DD5.1.H.264-CtrlHD - [01/24] - "Parks.and.Recreation.S01E01.720p.WEB-DL.DD5.1.H.264-CtrlHD.nfo" yEnc
-		if (preg_match('/^\[#+\]-\[.+?\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/\d+\][-_\s]{0,3}("|#34;).+?("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[17319]-[FULL]-[#a.b.teevee@EFNet]-[ CSI.New.York.S05E22.720p.HDTV.X264-DIMENSION ]-[01/34] "csi.new.york.522.720p-dimension.nfo" (1/1) (1/1
-		if (preg_match('/\[#+\]-\[.+?\]-\[.+?\]-\[ ?(.+?) ?\][- ]\[\d+\/\d+\][-_\s]{0,3}("|#34;).+?("|#34;) \(\d+\/\d+\) \(\d+\/\d+$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(01/37) "Entourage S08E08.part01.rar" - 349,20 MB - yEnc
-		//(01/24) "EGtnu7OrLNQMO2pDbgpDrBL8SnjZDpab.nfo" - 686 B - 338.74 MB - yEnc (1/1)
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d.+?B - (\d.+?B -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/28) - Continuum.S02E13.Second.Time.1080p.WEB-DL.AAC2.0.H264 - "Continuum.S02E13.Second.Time.1080p.WEB-DL.AAC2.0.H264.par2" - 1.75 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - ([\w.-]{5,}) - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/42] - "King.And.Maxwell.S01E08.1080p.WEB-DL.DD5.1.H264-Abjex.par2" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([A-Za-z0-9.-]+?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		} //(01/15) - "Oz.S01E01.The.Routine.par2" - 380.18 MB yEnc
-		//(01/87) "Homeland.S03E05.Mini.720p.WEB.DL.DD5.1.H.264-ITSat.par2" - 773,24 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [10/26] - "The.Young.Riders.S01E02.480pWEB-DL.AAC2.0.H.264-AJP69.part09.rar" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Dgpc) [01/19] - "The.Xtra.Factor.S10E04.PDTVx264.JIVE.par2" yEnc
-		if (preg_match('/^\(Dgpc\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Anthony.Bourdain.Parts.Unknown.S01.480p.HDTV.x264-mSD ] MKV.h264 (03/17) - "Anthony.Bourdain.Parts.Unknown.S01E01.480p.HDTV.x264-mSD.mkv" yEnc
-		if (preg_match('/^\[ (.+?) \] .+ \(\d+\/\d+\) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[01/31] Unsealed.Alien.Files.S02E02.The.Kecksburg.Incident.720p.HDTV.x264-N0TSC3N3 - "n0tsc3n3-unsealed.alien.files.s02e02.the.kecksburg.incident.720p.hdtv.x264.par2"  yEnc
-		if (preg_match('/^\[\d+\/\d+\] (.+S\d+E\d+.+?) - ".+?' . $this->e0 . '  yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Colbert Report [00/12] "The.Colbert.Report.2014.01.20.Scott.Stossel.720p.WEB-DL.AAC2.0.H.264-monkee.nzb" yEnc
-		//Colbert [01/10] "The.Colbert.Report.2013.12.19.Ben Stiller.720p.WEB-DL.AAC2.0.H264-zee.rar" yEnc
-		//Whale Wars (01/30) "Whale.Wars.S06.A.Commander.Rises.PDTV.XviD-ZEN.par2" yEnc
-		if (preg_match('/^[\w ]+[\(\[]\d+\/\d+[\)\]] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //. - [01/42] - "Under.the.Dome.S01E03.Manhunt.1080p.WEB-DL.DD5.1.H.264-NTb.par2" yEnc
-		if (preg_match('/^\. - \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//House.Hunters.International.S05E502.720p.hdtv.x264 [01/27] - "House.Hunters.International.S05E502.720p.hdtv.x264.nfo" yEnc
-		//Criminal.Minds.S03E01.Doubt.PROPER.DVDRip.XviD-SAiNTS - [01/33] - "Criminal.Minds.S03E01.Doubt.PROPER.DVDRip.XviD-SAiNTS.par2" yEnc
-		if (preg_match('/^(Re: )?([\w._-]{8,})([{}A-Z_]+)?( -)? \[\d+(\/| of )\d+\]( -)? ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			if (strlen($match[2]) !== 32) //don't match hashed names
-			{
-				return $match[2];
-			}
-		} //Silent Witness S15E02 Death has no dominion.par2 [01/44] - yEnc
-		if (preg_match('/^([a-zA-Z0-9 ]+)(\.part\d*|\.rar)?(\.vol.+? |\.[A-Za-z0-9]{2,4} )\[\d+\/\d+\] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(bf1) [03/31] - "The.Block.AU.Sky.High.S07E61.WS.PDTV.XviD.BF1.part01.sfv" yEnc (1/1)
-		if (preg_match('/^\(bf1\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Moving.On.S05E05.HDTV.x264.part19.rar" - (21/28) - Per REQ  yEnc
-		if (preg_match('/^"([\w._-]{8,}?\b)' . $this->e0 .
-			'[-_\s]{0,3}\(\d+\/\d+\)[-_\s]{0,3}[\w. -]+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [01/20] - "Boxing.Cinnamon vs El Perro.8th.March.2014.PDTV.x264-Sir.Paul.par2" Cinnamon vs El Perro  yEnc
-		if (preg_match('/^\(\?+\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w._-]{8,}?\b)' . $this->e0 .
-			'[-_\s]{0,3}[\w. -]+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[REPOST]-"True.Blood.S06E01-E10.HDTV.x264.part094.rar" yEnc
-		if (preg_match('/^\[[\w. -]+\][-_\s]{0,3}"([\w._-]{8,}?\b)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Pretty.Little.Liars.S04E11.Bring.Down.the.Hoe.1080p.WEB-DL.DD5.1.H.264-BS) [31/45] - ""Pretty.Little.Liars.S04E11.Bring.Down.the.Hoe.1080p.WEB-DL.DD5.1.H.264-BS.part29.rar"" yEnc yEnc
-		if (preg_match('/^\([\w. -]{8,}\)[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}""([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '"[-_\s]{0,3}[\w. -]+[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[]-[FULL]-[a.b.teevee]-[Hannibal.S01.Special.Ceuf.720p.WEB-DL.DD5.1.H-264-NTb]-[03/40] - "Hannibal.S01.Special.Ceuf.720p.WEB-DL.DD5.1.H-264-NTb.part01.rar"  yEnc
-		if (preg_match('/^[\w(). -]+[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Ax.Men.S06E18.Risking.it.All.720p.WEB-DL.AAC.2.0.H.264-AKS74u]-[07/68] "Ax.Men.S06E18.Risking.it.All.720p.WEB-DL.AAC.2.0.H.264-AKS74u.r04" - 1.46 GB yEnc
-		if (preg_match('/^\[[\w. -]{8,}\][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ As requested ] Pawn.Stars.S07E15.Colt.To.The.Touch.720p.WEB-DL.AAC2.0.H.264.par2  yEnc
-		if (preg_match('/^\[ As requested \][-_\s]{0,3}([\w. -]+)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Alaska.The.Last.Frontier.S02E15.HDTV.XviD-AFG.nzb  yEnc
-		if (preg_match('/^([\w.-]+)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //09/13 The.Exes.S03E10.My.Ex-Boyfriends.Wedding.WEBRip.x264.AAC-NoGRP.vol007+05.PAR2  yEnc
-		if (preg_match('/^\d+\/\d+[-_\s]{0,3}([\w. -]+)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[14/16] - Game.of.Thrones.S03E04.720p to 640x480 for size.vol11+08.PAR2  yEnc
-		//[22/39] LEGO.Batman.The.Movie.2013.1080p.WEB-DL.DD5.1.H.264-YFN.part21.rar  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}([\w. -]+)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(tv) ncis.1021.hdtv-lol [1/8] - "ncis.1021.hdtv-lol.sfv" yEnc
-		if (preg_match('/^\[\]-\[FULL\]-\[a\.b\.teevee\]-\[[\w.-]+\][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(05/29) - LoK214 - "The.Legend.of.Korra.S02E14.Light.in.the.Dark.1080p.WEB-DL.DD5.1.H.264-BS.part04.rar" - 1,01 GB - yEnc
-		//(34/45) -Continuum.S02E11.1080p.WEB-DL.AAC2.0.H264- "Continuum.S02E11.1080p.WEB-DL.AAC2.0.H264.part33.rar" - 1.76 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}[\w. -]+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ TVPower ] - "Dexter.S07E10.720p.HDTV.x264-NLsubs.par2" yEnc
-		//[ TVPower ] - [010/101] - "Desperate.Housewives.S08Disc2.NLsubs.part009.rar" yEnc
-		if (preg_match('/^\[ [A-Za-z]+ \] - (\[\d+\/\d+\] - )?"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[www.allyourbasearebelongtous.pw]-[WWE.Monday.Night.Raw.2013.07.22.HDTV.x264-IWStreams]-[03/69] "WWE.Monday.Night.Raw.2013.07.22.HDTV.x264-IWStreams.r00" - 1.58 GB - yEnc
-		if (preg_match('/^\[.+?\]-\[(.+?)\]-\[\d+\/\d+\] ".+?" - \d+([.,]\d+ [kKmMgG])?[bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(www.Thunder-News.org) >CD1< <Sponsored by Secretusenet> - "moovee-fastest.cda.par2" yEnc
-		if (preg_match('/^\(www\..+?\) .+? <Sponsored.+?> - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Pitbull>>> usenet-space-cowboys.info <<<Powered by https://secretusenet.com>< "S05E03 Pack die Badehose ein_usenet-space-cowbys.info.par2" >< 01/10 (411,16 MB) >< 3,48 kB > yEnc
-		if (preg_match('/\.info .+?Powered by .+?\.com "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' .+? \d+\/\d+ \(\d+[,.]\d+ [mMkKgG][bB]\) .+? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Newport Harbor The Real Orange County - S01E01 - A Black & White Affair [01/11] - "Newport Harbor The Real Orange County - S01E01 - A Black & White Affair.mkv" yEnc
-		if (preg_match('/^([a-zA-Z0-9]+ .+? - S\d+E\d+ - .+?) \[\d+\/\d+\] - ".+?\..+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(www.Thunder-News.org) >Robin.Hood.S02E04.Der.Todesengel.German.WS.DVDRip.XviD-GTVG< <Sponsored by Secretusenet> -  "gtvg-rh.xvid.s02e04.jpg" yEnc
-		if (preg_match('/^\(www\.Thunder-News\.org\) ?>(.+)< ?<Sponsored.+>[ _-]{0,3}(\(\d+\/\d+\)|\[\d+\/\d+\])?[ _-]{0,5}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //.: Breaking.Bad.S04E10.Prost.German.WS.DVDRip.XviD-GTVG :. - .:www.thunder-news.org:. - .:sponsored by secretusenet.com:. - "gtvg-bb.xvid.s04e10_poster.jpg" yEnc
-		if (preg_match('/^\.: (.+):. - .:www\.thunder-news\.org:. - .:sponsored by secretusenet\.com:\. - ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[FULL]-[#a.b.teevee@EFNet] - Celemony Melodyne Studio Edition 3.2 (MAC OSX).rar
-		if (preg_match('/\[FULL\]-\[.+.EFNet\] - (.+)\.rar$/', $this->subject, $match)) {
-			return $match[1];
-		} //(00912/17663) "Afghanistan The Great Game With Rory Stewart Part1 HDTV XviD-AFG.rar" - 344,98 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) ("|#34;)(.+?)\.rar("|#34;) - .+ - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[84491]-[FULL]-[#a.b.teevee@EFNet]-[ Tennis.Australian.Open.2012.Mens.1st.Round.Lleyton.Hewitt.vs.Cedrik-Marcel.Stebe.720p.HDTV.x264-LMAO ]-[04/97] - "tennis.australian.open.2012.mens.1st.round.lleyton.hewitt.vs.cedrik-marcel.stebe.720p.hdtv.x264-lmao.r01
-		if (preg_match('/^\[[\d#]+\]-\[.+?\]-\[.+?\]-\[ (.+?) \][- ]\[\d+\/\d+\][-_\s]{0,3}("|#34;).+?/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(((Nimue)))(((Hawaii.Five.0.S02E12.Der.Mann.im.Bunker.GERMAN.DUBBED.HDTVRiP.XviD-SOF))) usenet-space-cowboys.info (((Powered by https://secretusenet.com)( #34;hawaii.five.0.s02e12.avi#34; )( 02/11 (762,35 MB) )( 349,83 MB ) yEnc
-		if (preg_match('/^\(\(\((Nimue|CowboyUp26-1208)\)\)\)\(\(\((.+)\)\)\).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //__www.realmom.info__ - 56 Downloader (XMLBar) - DOWNLOAD EVERY VIDEO!.rar
-		if (preg_match('/^__www\.realmom\.info__ - (.+)\.(rar$|rar yEnc$)/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(My.Name.Is.Earl.S03.DVDRip.XviD-ORPHEUS-NODLABS.PARS)[000/197] - "My.Name.Is.Earl.S03.DVDRip.XviD-ORPHEUS-NODLABS.PARS.nzb" yEnc
-		if (preg_match('/^\((.+)\)\[\d+\/\d+\] - ("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Curb.Your.Enthusiasm.S08.DVDRiP.XviD.COMPLETE.REPACK-CLuE - "sample-curb.your.enthusiasm.s08.dvdrip.xvid.complete.repack-clue.avi.vol1+2.PAR2"  770.0 KBytes yEnc
-		if (preg_match('/^([a-zA-Z].+) - ("|#34;).+("|#34;)  \d+[,.]\d+ [mMkKgG][bB]ytes yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Thor>>><<<Chuck S04E20 Chuck gegen die Familie Volkoff German Dubbed DL 720p BluRay x264-idTV>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "idtv-chuck_s04e20_720p-sample.mkv" >< 03/61 (2,39 GB) >< 21,89 MB > yEnc
-		if (preg_match('/^<<<(Thor(\d+)?)>>><<<(.+)>>>usenet-space-cowboys.+<<<Powered.+>< ("|#34;).+("|#34;).+> yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(Public) (FULL) (a.b.teevee@EFNet) [04/13] (????) [00/27] - "DC.Guy.in.a.Ceelo.Green.Hood..S01E07.720p.HDTV.X264-DIMENSION.nzb" yEnc
-		if (preg_match('/\(Public\).*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>ghost-of-usenet.org<< Suburgatory.S01E13.Sex.und.die.Vorstadt.GERMAN.DUBBED.DL.720p.WebHD.x264-TVP >>www.SSL-News.info> -  "tvp-suburgatory-s01e13-720p.nfo" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org<< ?(.+) ?>>www.+>[ _-]{0,3}("|#34;)?.+("|#34;)? ?yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Touch.S02E09.PROPER.1080p.WEB-DL.DD5.1.H.264-LFF NoAds [01/30] - "Touch.S02E09.PROPER.1080p.WEB-DL.DD5.1.H.264-LFF.nfo" yEnc
-		if (preg_match('/^(.+?) NoAds \[\d+\/\d+\][-_\s]{0,3}("|#34;).+?("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<<Thor1602>>><<<NCIS.Los.Angeles.S03E02.Die.Cyberattacke.GERMAN.DUBBED.HDTVRiP.XviD-SOF>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "sof-ncis.los.angeles.s03e02.die.cyberattacke.(2010).hdtvdubbed.nfo" >< 02/28 (419,00 MB) >< 4,18
-		if (preg_match('/^<<<(Thor(\d+)?)>>><<<(.+)>>>.+<<<.+>< ("|#34;).+("|#34;).+/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //AS REQ: "Game.of.Thrones.Season.3.480p.HDTV.H264.part52.rar" yEnc
-		if (preg_match('/^AS REQ: "(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//<<<Nimue>>><<<Die.Geschichte.der.Fliegerei.E05.Von.der.Luffahrt.zur.Raumfahrt.GERMAN.DOKU.FS.DVDRip.XviD-NGE>>> usenet-space-cowboys.info <<<Powered by https://secretusenet.com>< "nge-dgdf-e05-xvid.r04" >< 07/39 (1,51 GB) >< 47,68 MB > yEnc
-		//<<<CowboyUp26-0706>>><<<Spartacus.S02E09.Monster.GERMAN.DUBBED.720p.HDTV.x264-ZZGtv>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "zzgtv-spartacus-s02e09.r00" >< 04/43 (1,72 GB) >< 47,68 MB > yEnc
-		//<<<Nimue>>><<<Die.Geschichte.der.Fliegerei.E05.Von.der.Luffahrt.zur.Raumfahrt.GERMAN.DOKU.FS.DVDRip.XviD-NGE>>> usenet-space-cowboys.info <<<Powered by https://secretusenet.com>< "nge-dgdf-e05-xvid.r04" >< 07/39 (1,51 GB) >< 47,68 MB > yEnc
-		//<<<Hustensaft1402>>><<<CSI.Las.Vegas.S10E21.Schutz.und.Racheengel.German.DL.1080p.BluRay.x264-ETM>>>usenet-space-cowboys.info<<<Powered by https://secretusenet.com>< "etm-csi_las_vegas_s10e21-1080p.r12.vol000+01.par2" >< 39/49 (3,86 GB) >< 3,32 MB > yEnc
-		if (preg_match('/^<<<(Hustensaft\d+|Nimue|CowboyUp\d+(-\d+)?)>>><<<(.+)>>>.+<<<Powered by.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //[ Ugly.Betty.S02E13.DVDRip.XviD-SAiNTS ] - [01/39] - "Ugly.Betty.S02E13.DVDRip.XviD-SAiNTS.par2" yEnc
-		if (preg_match('/^\[ ([a-zA-Z].+) \] - \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(Wainy Days.S02E07.DVDRip.x264-PiNK) [01/10] - "Wainy Days.S02E07.DVDRip.x264-PiNK.par2" yEnc
-		if (preg_match('/^\(([\w.,& ()\[\]\'\`-]{8,}?)\) \[\d+\/\d+\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Mercy.S01.720p.WEB-DL.DD5.1.h.264-LP-MMI]-[ Mercy.S01E18.Of Course I'm Not.720p.WEB-DL.DD5.1.H.264-LP ]-[01/24] - "Mercy.S01E18.Of Course I'm Not.720p.WEB-DL.DD5.1.H.264-LP.par2" yEnc
-		if (preg_match('/^\[.+\][-_\s]{0,3}\[ (.+) \][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}("|#34;).+("|#34;) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //REPOST: [ Th3.V@mpir3.Di@ri35.S05E02.HDTV.X264-DIMENSION ] - [31/33] - "Th3.V@mpir3.Di@ri35.S05E02.HDTV.X264-DIMENSION.vol050+051.par2" yEnc
-		if (preg_match('/^(REPOST: )?\[ (.+) \] - \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[#a.b.teevee] Covert.Affairs.S04E11.720p.WEB-DL.DD5.1.H.264-XEON - [11/40] - "Covert.Affairs.S04E11.720p.WEB-DL.DD5.1.H.264-XEON.part09.rar" yEnc
-		if (preg_match('/^\[#a\.b\.teevee\] (.+) - \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Breaking Bad S6E03 Confessions enjoy! [7 of 46] "03 Confessions (1080p HD).mov.007" yEnc
-		if (preg_match('/^(.+) Confessions.+\[\d+ of \d+\] ".+\(((1080|720).+[HS]D)\).+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1] . "-" . $match[2];
-		} //[51/62] Morrissey.25.Live.Concert.2013.BDRip.x264-N0TSC3N3 - "n0tsc3n3-morrissey.25.live.2013.bdrip.x264.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] (.+) - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(01/19) - Description - "How I Met Your Mother S05E24 - Doppelgangers.part01.rar" - 175,05 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[ -]+Description[ -]+"(.+)\.part\d+\.rar"[ -]+\d+[.,]\d+ [kKmMgG][bB][ -]+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(23/23) -The.Mindy.Project.S02E09.720p.WEB-DL.DD5.1.H.264 - "The.Mindy.Project.S02E09.720p.WEB-DL.DD5.1.H.264.vol31+29.PAR2" - 768.86 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) -(.+) - ".+" - \d+[.,]\d+ [MGK]B - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The Mindy Project s02e06 720p WEB-DL - [02/24] - "The Mindy Project S02E06 720p WEB-DL.part01.rar" yEnc
-		if (preg_match('/^(.+[Ss]\d+.+) - \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //[ Breaking.Bad.S05E16.BDRip.x264-DEMAND ] [30/30] - "breaking.bad.s05e16.bdrip.x264-demand.vol42+37.PAR2" yEnc
-		if (preg_match('/^\[ ?(.+(S\d+|READ\.NFO).+) ?\] \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[32/44] - "Scandal.S03E07.Everything's.Coming.Up.Mellie.1080p.WEB-DL.DD5.1.H.264-ECI.part31.rar" yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "(.+S\d+.+)\.par.+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //<UHQ>< Welcome.to.the.Jungle.German.2003.DVD9.AC3.DL.1080p.BluRay.x264-MOViESTARS >- [93/95] - "moviestars-wttj.1080p.vol15+16.par2" yEnc
-		if (preg_match('/^<UHQ>< (.+) >- \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Sam & Cat S01E06 BabysitterWar [1 of 9] "Sam & Cat - S01E06 - BabysitterWar-ORIG.mp4" yEnc
-		if (preg_match('/[Ss]\d+[Ee]\d+.+\[\d+ of \d+\] "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Sam & Cat - S01E10 - BabysittingCommercial - "Sam & Cat - S01E10 - BabysittingCommercial.m4v" yEnc
-		if (preg_match('/[Ss]\d+[Ee]\d+.+- "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[12/22] - "stargate_sg-1.6x12.unnatural_selection.ws_dvdrip_xvid-fov.avi"  yEnc
-		if (preg_match('/^\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //For teevee - "Silent.Witness.S17E05.480p.HDTV.x264-mSD.mkv.sfv" [01/23] yEnc
-		if (preg_match('/^For teevee - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' \[\d+\/\d+\][ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Mad.Men.S06E11.HDTV.x264-2HD.par2" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Marvels.Agents.of.S.H.I.E.L.D.S01E07.HDTV.XviD-FUM.avi.nfo" [09/16] yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'[ _-]{0,3}\[\d+\/(\d+\])[ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Public Enemies (2009).720p.x264.English Subtitles.Dolby Digital 5.1.mkv [04/55]"Public Enemies sample.mkv" yEnc
-		if (preg_match('/^(.+(1080|720).+)\..+\[\d+\/\d+\]".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //-=->EnJoY!<-=- (Day1/5) [01/17] - "The Machine that Changed the World S01E01 - Giant Brains - 1992 (480p,x264).nfo" yEnc
-		//-=>EnJoY!<-=->Req:The Animated Alias:Tribunal (2004)<=- [01/17] - "Da Vinci's Demons - S01E07 - The Hierophant (480p,x264).nfo" yEnc
-		if (preg_match('/^.+EnJoY\!.+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The.Colbert.Report.2013.07.29.The.Lumineers.WEBRip.AAC2.0.H.264-DCK [01/11] - "The.Colbert.Report.2013.07.29.The.Lumineers.WEBRip.AAC2.0.H.264-DCK.mp4"  yEnc
-		if (preg_match('/^[\w. -]+\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //the.lockerbie.bombing.720p.HDTV.x264-fatboy  - "the.lockerbie.bombing.720p.HDTV.x264-fatboy.nfo" - 829.12 MB - yEnc
-		if (preg_match('/^[\w. -]+[-_ ]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //The.Vampire.Diaries.S05E13.HDTV.X264"The.Vampire.Diaries.S05E13.HDTV.X264.vol40+36.PAR2" yEnc
-		if (preg_match('/^[\w. -]+[-_ ]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Doomsday.Preppers.S03E11.720p.HDTV.x264-TTVa] - NOT ORIGINAL RARS, REPACKED. Sorry. - (18/35) "Doomsday.Preppers.S03E11.720p.HDTV.x264-TTVa.r16" - 1.31 GB - yEnc
-		if (preg_match('/^\[[\w.-]+\][-_\s]{0,3}.+[-_\s]{0,3}\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[CONAN] Conan.2013.12.12.Adam.Levine.WEBRiP.x264-CoCo [Missed Conan Episodes] - [22/32] - "conan.2013.12.12.adam.levine.webrip.x264-coco.r18" yEnc
-		if (preg_match('/^\[[\w. -]+\][-_\s]{0,3}.+[-_\s]{0,3}[\[\(]\d+\/\d+[\]\)][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Dave Gorman Modern Life is Goodish Series 1 - [114 of 126] - "Dave Gorman Modern Life is Goodish S01E06.mkv.008" yEnc
-		if (preg_match('/^[\w -]+[-_\s]{0,3}[\[\(]\d+ of \d+[\]\)][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/9) "Tronens_Spil_S03E08.par2" yEnc
-		if (preg_match('/^[\[\(]\d+\/\d+[\]\)][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //07/14  "Sister.Wives.S06E06.STV.XviD-kralcx.vol000+01.PAR2" yEnc
-		if (preg_match('/^\d+\/\d+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //07/14  "Sister.Wives.S06E06.STV.XviD-kralcx.vol000+01.PAR2" yEnc
-		if (preg_match('/^\d+\/\d+[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ 749,75 MB ]-[ 01/20 ]-"choir.of.young.believers-this.is.for.the.white.in.your.eyes.live.2009.pdtv.x264.nfo" yEnc
-		if (preg_match('/^\[ \d+[.,]\d+ [kKmMgG][bB] \][-_\s]{0,3}\[ \d+\/\d+ \][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<Enjoy> Hannibal.S01E04.mp4  yEnc
-		if (preg_match('/^<Enjoy> ([\w. ()-]{8,}?\b)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar|\.7z)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //A5F - [ NOVA.S40E19.Manhunt.Boston.Bombers.HDTV.x264-A5F ] - [01/43] - "NOVA.S40E19.Manhunt.Boston.Bombers.HDTV.x264-A5F.sfv" (not.teevee) yEnc
-		if (preg_match('/^A5F[-_\s]{0,3}\[ ([\w. ()-]{8,}?\b) \][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}".+?' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Arrested.Development.S04E08.x264(04/164) "Arrested.Development.S04E08.WEBRiP.x264.part03.rar" - 197.21 MB - yEnc
-		if (preg_match('/^[\w. ()-]{8,}?\b\(\d+\/\d+\)[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Divers (12/42) -"Juste.Pour.Rire.2013.Gala.JF.Mercier.FRENCH.720p.HDTV.x264-QuebecRules.part11.rar" yEnc
-		//Par le chapeau (06/43) - "8C7D59F472E03.part04.rar" yEnc
-		if (preg_match('/^([a-zA-Z0-9 ]+) \(\d+\/\d+\) - ?".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[140022]-[04] - [01/40] - "140022-04.nfo" yEnc
-		if (preg_match('/\[\d+\]-\[.+\] - \[\d+\/\d+\] - "\d+-.+" yEnc/', $this->subject)) {
-			return array(
-				"cleansubject" => $this->subject, "properlynamed" => false, "ignore" => true
-			);
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function test()
-	{
-		//brothers-of-usenet.net)(Sons.of.Anarchy.S03E03.Fuersorge.GERMAN.DUBBED.720p.BLURAY.x264-ZZGtv))(07/31) #34;zzgtv-soa-s03e03.part05.rar#34; - 2,02 GB - yEnc
-		if (preg_match('/^brothers-of-usenet.net\)\((.+)\)\)\(\d+\/\d+\) ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.net(Sons.of.Anarchy.S03E03.Fuersorge.GERMAN.DUBBED.720p.BLURAY.x264-ZZGtv))(07/31) #34;zzgtv-soa-s03e03.part05.rar#34; - 2,02 GB - yEnc
-		elseif (preg_match('/^brothers-of-usenet.net\((.+)\)\)\(\d+\/\d+\) ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //brothers-of-usenet.net><Sons.of.Anarchy.S03E02.Letzte.Oelung.GERMAN.DUBBED.720p.BLURAY.x264-ZZGtv>>(01/31) "zzgtv-soa-s03e02.nfo" - 1,98 GB - yEnc
-		elseif (preg_match('/^brothers-of-usenet.net><(.+)>>\(\d+\/\d+\) ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function town()
-	{
-		//[01/29] - "Bellflower.2011.German.AC3.BDRip.XviD-EPHEMERiD.par2" - 1,01 GB yEnc
-		//(3/9) - "Microsoft Frontpage 2003 - 4 Town-Up from Kraenk.rar.par2" - 181,98 MB - yEnc
-		if (preg_match('/^[\[(]\d+\/\d+[\])] - "([A-Z0-9].{2,}?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Armored_Core_V_PS3-ANTiDOTE__www.realmom.info__.r00" (03/78) 3,32 GB yEnc
-		if (preg_match('/^"(.+)__www.realmom.info__.+" \(\d+\/(\d+\)) \d+[.,]\d+ [kKmMgG][bB] yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function town_cine()
-	{
-		//[01/29] - "Bellflower.2011.German.AC3.BDRip.XviD-EPHEMERiD.par2" - 1,01 GB yEnc
-		//(3/9) - "Microsoft Frontpage 2003 - 4 Town-Up from Kraenk.rar.par2" - 181,98 MB - yEnc
-		if (preg_match('/^[\[(]\d+\/\d+[\])] - "([A-Z0-9].{2,}?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function town_xxx()
-	{
-		//[01/29] - "Bellflower.2011.German.AC3.BDRip.XviD-EPHEMERiD.par2" - 1,01 GB yEnc
-		//(3/9) - "Microsoft Frontpage 2003 - 4 Town-Up from Kraenk.rar.par2" - 181,98 MB - yEnc
-		if (preg_match('/^[\[(]\d+\/\d+[\])] - "([A-Z0-9].{2,}?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function tun()
-	{
-		/*
-		// Leaving here to show that you can get the names from these.
-		// Useless since all these are passworded and if there is a backlog in post proc, sickbeard will pull these and they will fail since they are passworded.
-		//[ nEwZ[NZB].iNFO - [ QmlnTW91dGhmdWxzLjEzLjA3LjA4LkNocmlzc3kuR3JlZW5lLlhYWC43MjBwLk1QNC1LVFI= ] - File [06/48]: "b582519da4d849df003559fc4ae45219.nfo" yEnc
-		if (preg_match('/^\[ nEwZ\[NZB\]\.iNFO - \[ ([a-z0-9A-Z]{3,}=) \] - File \[\d+\/\d+\]: ".+?" yEnc$/', $this->subject, $match))
-		return base64_decode($match[1]);
-		//[PRiVATE] VHdpc3R5cy5jb21fMTMuMDguMDkuQWlkZW4uQXNobGV5LkVsbGUuQWxleGFuZHJhLldoYXQuWW91ci5GdXR1cmUuSG9sZHMuWFhYLklNQUdFU0VULUZ1R0xp [06/10] - "89857cebff1efd7927ebddf30281b0e4.part2.rar" yEnc
-		if (preg_match('/^\[PRiVATE\] ([a-z0-9A-Z]{4,}=*) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match))
-		return base64_decode($match[1]);
-		else
-		return array("cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false);
-		*/
-		return $this->generic();
-	}
-
-	public function tv()
-	{
-		//#a.b.mm@efnet - req 86820 - World.Series.of.Poker.2009.E05.Celebrity.No-Limit.Holdem.Part.1.of.2.HDTV.XviD-FQM - [26/28] - "world.series.of.poker.2009.e05.hdtv.xvid-fqm.vol07+08.par2" yEnc
-		//#a.b.mm@efnet - req 60243 - Dawn.Porter.Mail.Order.Bride.PROPER.WS.PDTV.XviD-NOsegmenT - [01/28] - dawn.porter.mail.order.bride.proper.ws.pdtv.xvid-nosegment.nfo yEnc
-		//a.b.mm@EFNet - Req 58360 - Seinfeld.7x02.The_Postponement.DVDRip_XviD-FoV - [01/21] "seinfeld.7x02.the_postponement.dvdrip_xvid-fov.nfo" yEnc
-		//#a.b.mm@efnet - req xxxxx - Spin.City.S02E04.PROPER.DVDRiP.XViD-NODLABS - [07/28] - "spin.city.s02e04.proper.dvdrip.xvid.subs-nodlabs.vol0+1.par2" yEnc
-		//#a.b.mm@EFNeT - REQ 58160 - How.I.Met.Your.Mother.S03E19.DVDRip.XviD-ORPHEUS - 00/26 - how.i.met.your.mother.s03e19.dvdrip.xvid-orpheus.nzb yEnc
-		//#a.b.mm@EFNeT - REQ 81686 - Burn.Notice.S02E01.720p.HDTV.X264-2HD- 00/42 - Burn.Notice.S02E01.720p.HDTV.X264-2HD.nzb yEnc
-		if (preg_match('/^#?.+req (\d+|x+)[ -]{1,}(.+)\s*- ?\[?\d+\/\d+\]?[ -]{1,3}"?.+"? yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //www.Bin-Req.net Presents: #57629 - Man.vs.Wild.S05E03.Bears.Essentials.HDTV.XviD-GNARLY - [01/37] - man.vs.wild.s05e03.bears.essentials.hdtv.xvid-gnarly.sample.avi (1/27) yEnc
-		if (preg_match('/^www\.Bin-Req\.net Presents: #\d+[ -]{1,3}(.+) - \[\d+\/\d+\].+\(\d+\/\d+\) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(The.Legend.Of.Korra.S01E08.When.Extremes.Meet.720p.HDTV.h264) (00/41) - "The.Legend.Of.Korra.S01E08.When.Extremes.Meet.720p.HDTV.h264.nzb" yEnc
-		if (preg_match('/^\(([a-zA-Z].+)\) \(\d+\/\d+\) - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //NCIS.S11E08.HDTV.x264-LOL - "NCIS.S11E08.HDTV.x264-LOL.part.par2" yEnc
-		if (preg_match('/^([A-Za-z0-9][a-zA-Z0-9.-]{6,})\s+- ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //>ghost-of-usenet.org<24.S07E01.German.SATRip.XviD-ITG>Sponsored by Astinews< (02/27) "itg-24-s07e01.nfo" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org< ?(.+)>Sponsored.+< ?\(\d+\/\d+\)[ _-]{0,3}("|#34;)?.+("|#34;)?[ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //World's.Strongest.Man.2013.Episode1.Webrip [01/46] - "2013x01.nfo" yEnc
-		if (preg_match('/^([\w.\' -]{8,}) [\[\(]\d+\/\d+[\]\)] - ".+?' . $this->e0 .
-			'([-_\s]{0,3}[\w.-]+)?[ _-]{0,3}yEncs$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Handyman Shows-TOH-S32E10 - File 01 of 32 - yEnc
-		if (preg_match('/^Handyman Shows-(.+) - File \d+ of \d+ - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} ///^Handyman Shows.+"(.+)\.(par2|nfo|avi|nzb)" yEnc$/
-		if (preg_match('/^Handyman Shows.+"(.+)\.(par2|nfo|avi|nzb)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Kung Fu S02E15 A Dream WIthin a Dream.par2  yEnc
-		//Kids In The Hall S01E15.par2  yEnc
-		if (preg_match('/^((Kung Fu|Kids In The Hall) S\d+\E\d+.+)\.(par2|avi)\s+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Project.Runway.Canada.S02E05.HDTV.DivX-JWo - 00/33 - project.runway.canada.205.nzb yEnc
-		//Yu-Gi-Oh.S03.DVDRip.AAC2.0.x264-DarkDream - [000/306] - "Yu-Gi-Oh.S03.DVDRip.AAC2.0.x264-DarkDream" yEnc
-		if (preg_match('/^([a-zA-Z][\w\d\.-]+) - \[?\d+\/\d+\]? - "?.+\.?(par2|nzb|nfo|avi)?"? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Borgen.2x02.A.Bruxelles.Non.Ti.Sentono.Urlare.ITA.BDMux.x264-NovaRip [02/22] - "borgen.2x02.ita.bdmux.x264-novarip.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9.-]+) \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(bf1) [03/31] - "The.Block.AU.Sky.High.S07E56.WS.PDTV.XviD.BF1.part01.sfv" yEnc
-		//[REPOST] - [01/33] - "Breaking.Bad.S05E16.Felina.1080p.WEB-DL.DD5.1.H.264-BS.par2" yEnc
-		if (preg_match('/^[\[\(]\w+[\]\)][-_\s]{0,3}\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [01/11] - "The Carrie Diaries - S02E01 - HDTV x264-LOL.sfvCarrieDiariesS02E01" yEnc
-		if (preg_match('/^\(\?+\)[-_\s]{0,3}[\(\[]\d+\/\d+[\]\)][-_\s]{0,3}"(.+?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})Carrie.+"[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(noname 0307) NCIS.S11E14.HDTV.x264-LOL[rarbg].vol047+40.PAR2  yEnc
-		if (preg_match('/^\([\w. ]+\)[-_\s]{0,3}([\w+. -]{8,})(\[\w+\])?([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[014/144] - The Bible (2013) - S1E01 - In the Beginning AVC 480p.vol31+27.PAR2  yEnc
-		if (preg_match('/^\[\d+\/\d+\][-_\s]{0,3}([\w.() -]{8,}?\b)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Saturday Morning Classic Return-to-the-Planet-of-the-Apes-S01E03 - Lagoon of Peril.avi.001  yEnc
-		if (preg_match('/^Saturday Morning Classic ([\w.()-]{8,}?)([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev|\.vol.+?|\.[A-Za-z0-9]{2,4})[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"NCIS S11E21" yEnc - [01/21] - "NCIS.S11E21.hdtv-lol.par2" yEnc
-		if (preg_match('/^"[\w ]+" yEnc[-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Best.Friends.Forever.S01E06.720p.WEB-DL.DD5.1.H.264-HWD ]-[01/25] - "Best.Friends.Forever.S01E06.720p.WEB-DL.DD5.1.H.264-HWD.nfo" yEnc
-		if (preg_match('/^(\[\d+\]-)?\[ ?([a-zA-Z0-9.-]{6,}) ?\](-\[REAL\])? ?- ?\[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //"Arrow S02E07" yEnc
-		if (preg_match('/^"([\w. -]{8,})"[-_\s]{0,3}yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function tvseries()
-	{
-		//Mr.Sunshine.1x10.Ben.E.Vivian.ITA.DVDMux.XviD-NovaRip [01/14] - "mr.sunshine.1x10.ita.dvdmux.xvid-novarip.nfo" yEnc
-		if (preg_match('/^(.+\d+x\d+.+)\s*\[\d+\/\d+\][ -]*".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Ancient.Aliens.S06E03.The.Anunnaki.Connection.HDTV.x264-SOL - [13/28] - "Ancient.Aliens.S06E03.The.Anunnaki.Connection.HDTV.x264-SOL.r10" yEnc
-		if (preg_match('/^(.+S\d+E\d+.+)[ -]+\[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Moonlight Post Voor Dutch Release Crew [077/110] - "HLVRSM87654_S2D4.part76.rar" Wij Zoeken Nog Stafleden Meld Je Bij De Staf yEnc yEnc
-		if (preg_match('/^([\w\s]+)\[\d+\/\d+\] - ".+" [\w\s]+ yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//[QWERTY] "The.Real.Housewives.of.Atlanta.S06E02.HDTV.x264-CRiMSON.mp4" yEnc
-		//[QWERTY] "Air.Crash.Investigation.S10E06.HDTV.x264-TViLLAGE.mp4" - 6.76 GB - yEnc
-		if (preg_match('/\[QWERTY\] "(.+)\.(mp4|mkv|ts)"( - \d+[.,]\d+ GB)?[ -]+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(01/32) - "Adam.Devines.House.Party.S01E04.HDTV.x264-YesTV.mp4" - 9.98 GB - yEnc
-		//(01/24) "BBC Dr Who An Unearthly Child S01E04 The Firemaker 1963.nfo" - 3.86 kB - 329.37 MB - yEnc
-		if (preg_match('/\(\d+\/\d+\)[ -]*"(BBC )?(.+)\.(mp4|mkv|ts|nfo|par|par2)".+[GKM]B - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //Touched.By.An.Angel.S09 (001/179) - Description - "Season 9.par2" - 8.10 GB - yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\.]+) \(\d+\/\d+\) - Description - "(.+)".+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(01/31) - Balika.Vadhu.s01e1379.2013.09.07.720p.web-dl.x264 - "Balika.Vadhu.s01e1379.2013.09.07.720p.web-dl.x264.nfo" - 340.72 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - (.+) - "(.+)".+yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //Israeli AutoRarPar0002  [54/55] - "Hameofefim.Hanoazim.E02.PDTV.XviD-Sweet-Star.vol063+64.par2" yEnc
-		if (preg_match('/\Israeli.+\[\d+\/\d+\] - "(.+)\.(mp4|mkv|ts|vol.+|)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Israeli AutoRarPar0021  [07/44] - "Hameofefim.Hanoazim.E23.PDTV.XviD-Sweet-Star.part06.rar" yEnc
-		if (preg_match('/\Israeli.+\[\d+\/\d+\] - "(.+)\.(mp4|mkv|ts|par.+)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //AutoRarPar0005  [44/45] - "Prisoners of War (Hatufim) S01 E05 - Xvid - Hardcoded Subs - Sno.vol063+64.par2" yEnc
-		if (preg_match('/AutoRarPar\d+\s+\[\d+\/\d+\] - "(.+S\d+\s*E\d+.+)\.[vol|part].+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ Skins UK - S02 - Season 2 DVDRip ] AVI.XviD (06/20) - "Skins.UK.S02E04.DVDRip.XviD-Affinity.rar" yEnc
-		if (preg_match('/\[ .+S\d+.+ \] \w+\.\w+ \(\d+\/\d+\) - "(.+)\.(mp4|mkv|ts|rar)" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ gtvg-mm.xvid.s03 [ PWP ] - [ TV ] - [ DBS 0883 ] - [ "gtvg-mm.xvid.s03e11.r09" ] 7,32 GB yEnc
-		if (preg_match('/^\[ .+[sS]\d+ \[ \w+ \] - \[ \w+ \] - \[ \w+ \d+ \] - \[ "(.+[sS]\d+[eE]\d+).+".+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//"Forbrydelsen.II.S01E03.2009.DVDRip.MULTi.DD5.1.x264.nzb" - 213.54 kB - yEnc
-		//"Futurama S07E01 The Bots And The Bees.vol26+23.PAR2" - 8.49 MB - 193.51 MB - yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			'( - \d+([.,]\d+ [kKmMgG])?[bB])? - \d+([.,]\d+ [kKmMgG])?[bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"Rijdende.Rechter.-.19x01.-.Huisbiggen.1080p.MKV-BNABOYZ.part38.rar" - [40/56] - yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \[\d+\/(\d+\]) - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(003/104) "blackcave1001.part002.rar" - 4,83 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Chuck - Season2 (015/164) - "2x04.par2" yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\.]+) \(\d+(\/\d+\)) - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //X-Men Evolution - 2000 -  [01/20] - "X-Men Evolution - 3x03 - Mainstream.par2" yEnc
-		if (preg_match('/^[a-zA-Z0-9 -_\.]+ \[\d+\/(\d+\]) - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		//'X-Files' Season 1 XviD RETRY  "Files101.par2" 004/387
-		//'X-Files' Season 5 XviD "Files502.par2" 018/321 yEnc
-		//'X-Files' Season 2 XviD  "Files223.part2.rar" 356/401  yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\.]+) (RETRY)?[-_\s]{0,3}".+?' . $this->e0 .
-			' \d+(\/\d+)( {0,2}yEnc)?$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //"the.tudors.s03e03.nfo" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//(08/25) "Wild Russia 5 of 6 The Secret Forest 2009.part06.rar" - 47.68 MB - 771.18 MB - yEnc
-		//(01/24) "ITV Wild Britain With Ray Mears 1 of 6 Deciduous Forest 2011.nfo" - 4.34 kB - 770.97 MB - yEnc
-		//(24/24) "BBC Great British Garden Revival 03 of 10 Cottage Gardens And House Plants 2013.vol27+22.PAR2" - 48.39 MB - 808.88 MB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) "((BBC|ITV) )?(.+?)(\.part\d+)?(\.(par2|(vol.+?))"|\.[a-z0-9]{3}"|") - \d.+? - (\d.+? -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[4];
-		} //[ Angel.S01.NTSC.DVDRip.DD2.0.x264.CRF-OtakuLoser ]-[003/550] - "Angel.S01E01.City.Of.NTSC.DVDRip.DD2.0.CRF.x264-OtakuLoser.part01.rar" yEnc
-		if (preg_match('/^(.+?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //FIRST.WAVE.NTSC.DVD.DD2.0 - [121/512] - "FIRST_WAVE_SEASON_1_DVD2.r26" - 44,33 GB - yEnc
-		if (preg_match('/^([a-zA-Z0-9 -_\.]+) - \[\d+(\/\d+\]) - ".+?' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(03/19) "Damages S04E02 FR.avi" - 5,49 GB yEnc
-		if (preg_match('/^\(\d+(\/\d+\)) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function tv_deutsch()
-	{
-		//>ghost-of-usenet.org<< Roseanne.S03E02.Die.lieben.Verwandten.German.1990.FS.DVDRip.XviD-GM4FS >>www.SSL-News.info> - (01/32) - "gm4fs-roseannedxvid-s03e02-sample.par2" yEnc
-		if (preg_match('/^>ghost-of-usenet\.org<< ?(.+) ?>>www.+>[ _-]{0,3}("|#34;)?.+("|#34;)? ?yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function u4e()
-	{
-		//"Angry Birds USA PSN PSP-NRP.exe" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function u_4all()
-	{
-		//Breakin.1984.German.DL.720p.HDTV.x264-msd [ich for usenet-4all.info] [ich25729] [powered by ssl-news.info] (01/99) "ich25729.par2" yEnc
-		if (preg_match('/^(.+)\[.+?usenet-4all\.info\][ _-]{0,3}\[.+\][ _-]{0,3}\(\d+\/\d+\) ("|#34;).+("|#34;) yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		//-4y (PW)   [ usenet-4all.info - powered by ssl.news -] [1,44 GB] [08/14] "71cc4edc6R08eb7.vol00+01.PAR2" yEnc
-		if (preg_match('/\[ usenet-4all\.info - powered by ssl\.news -\][-_\s]{0,3}\[\d+([.,]\d+)? [kKmMgG][bB]\][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[2];
-		}
-		//(????) [02838/75096] - "3D  Browser v5.51.rar" yEnc
-		if (preg_match('/^\(\?{4}\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)	) {
-			return $match[1];
-		}
-		//(????) [02838/75096] - "3D  Browser v5.51.rar" yEnc
-		if (preg_match('/^\(\?{4}\) \[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 . '.+yEnc$/ui', $this->subject, $match)	) {
-			return $match[1];
-		}
-		//(06/10) "Christopher Paolini - Eragon 01-04.part5.rar" - 7,84 GB - yEnc
-		//[09/22] - "H56A2_20131018_038.part08.rar" - 858,20 MB yEnc
-		if (preg_match('/^[\[\(]\d+\/\d+[\]\)][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		}
-		//(07/27) - Description - " Court Order 890879887870337.vol015+016.par2" - 1.80 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\)[-_\s]{0,3}Description[-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		}
-		//"18X Girls  Mirabella  Gets Her Tight Ass Hole Plowed Hard.rar" yEnc
-		if (preg_match('/^"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e1, $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function usenetrevolution()
-	{
-		//[3/3] - "Berwein Saskia - Leitner und Grohmann 02 - Herzenskaelte.epub.vol0+1.par2" - 860,05 kB {UR - powered by secretusenet.com} yEnc
-		if (preg_match('/^\[\d+\/\d+\][ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB].+secretusenet\.com.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//- UR-powered by secretusenet.com - [3/3] - "Berg Ellen - Zur Hoelle mit Seniorentellern!.vol0+1.par2" - 1,24 MB yEnc
-		if (preg_match('/^.secretusenet\.com[ _-]{0,3}\[\d+\/\d+\][ _-]{0,3}"([\w.,&! ()\[\]\'-]{8,}?\b.?)' .
-			$this->e0 . '[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB][-_\s]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//- "Alcohol 120 Retail v2.0.2.5629German-UR.info.rar" - (2/3) -  13,35 MB -...:::UR.info-SecretUsenet.com:::... yEnc
-		if (preg_match('/^"([\w.,&! ()\[\]\'-]{8,}?\b.?)' . $this->e0 .
-			'[ _-]{0,3}\(\d+\/\d+\)[ _-]{0,3}[-_\s]{0,3}\d+[.,]\d+ [kKmMgG][bB].+secretusenet\.com.+yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function warez()
-	{
-		//BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX - [7/7] - "BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX.rar.vol15+5.par2" yEnc
-		if (preg_match('/^([a-zA-Z].+) - \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS - [1/7] - #34;ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS.rar#34; yEnc
-		if (preg_match('/^([a-z].+) - \[\d+\/\d+\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//-Panzer.Command.Kharkov-SKIDROW - [1/7] - "-Panzer.Command.Kharkov-SKIDROW.rar" yEnc
-		//-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS - [1/7] - #34;-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS.rar#34; yEnc
-		if (preg_match('/.*[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc
-		if (preg_match('/^\( (.+?) \) - yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function warez_0_day()
-	{
-		//BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX - [7/7] - "BabysitterMovies.13.03.11.Babysitter.Jocelyn.Pink.XXX.HR.WMV-VSEX.rar.vol15+5.par2" yEnc
-		if (preg_match('/^([a-zA-Z].+) - \[\d+\/\d+\] - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS - [1/7] - #34;ATKExotics.13.01.06.Janea.Toys.XXX.1080p.x264-SEXORS.rar#34; yEnc
-		if (preg_match('/^([a-z].+) - \[\d+\/\d+\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//-Panzer.Command.Kharkov-SKIDROW - [1/7] - "-Panzer.Command.Kharkov-SKIDROW.rar" yEnc
-		//-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS - [1/7] - #34;-AssMasterpiece.12.07.09.Alexis.Monroe.XXX.1080p.x264-SEXORS.rar#34; yEnc
-		if (preg_match('/.*[\(\[]\d+\/\d+[\)\]][-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4})("|#34;)(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //- "JH2U0H5FIK8TO7YK3Q.part12.rar" yEnc
-		if (preg_match('/.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}")(.+?)yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //( XS Video Converter Ultimate 7.7.0 Build 20121226 ) - yEnc
-		if (preg_match('/^\( (.+?) \) - yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function wii()
-	{
-		//<kere.ws/illuminatenboard.org>Guitar.Hero.5-Vampire.Weekend.The.Kids.Dont.Stand.a.Chance.PAL.DLC.Wii-OneUp>(01/13) "1u-gh5-the-kids-dont-stand-a-chance-pal.nfo" yEnc
-		if (preg_match('/^<kere\.ws.+>(.+)>\(\d+\/\d+\) ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(Alice_In_Wonderland_PAL_Wii-BAHAMUT) [000/101] - "b-alicew.nzb" (1/4yEnc
-		if (preg_match('/^\(([a-zA-Z].+)\) \[\d+\/\d+\] - ".+".+yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(13/24) "amateur.-.Deutsches.Girl.-.Erster.User.Anal.Fick.rar" - 2,40 GB -md-hobbys.com yEnc
-		if (preg_match('/^\(\d+\/\d+\) "(.+)\.(rar|par2|avi|URL|jpg)".+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[000/104] - "Story_Hour_Adventures_USA_WII-ZRY.nzb" - Story_Hour_Adventures_USA_WII-ZRY (1/9yEnc
-		if (preg_match('/^\[\d+\/\d+\] - ".+" - ([A-z0-9_-]+).+yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //www.theplace4you.org - [066/104] - "1234 Star.Wars.The.Force.Unleashed.2.PAL.Wii.part065.rar" yEnc
-		if (preg_match('/^www\.theplace4you\.org.*"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}").+?yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<<www.illuminatenboard.org>>Super_Monkey_Ball_PAL_MULTi5_NGC_WORKING_iNTERNAL_For_Wii-SUNSHiNE>(01/35) "shine-gmbp.nfo" yEnc
-		if (preg_match('/^<<www\.illuminatenboard\.org>>(.+)>\(\d+\/\d+\) ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(-=  R-KNORLOADING POST  =-: Super Paper MarioPAL FTD-NR: 874068   =-   R-KNORLOADING   -= ) [01/19] - "R-KNORLOADING POST super paper mario PAL.sfv" yEnc
-		if (preg_match('/^\(-=\s+R-KNORLOADING POST\s+=-: (.+) FTD-NR: \d+\s+=-.+-= \) \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //With Wii-Studio you can convert movie and music files easily so you can play it on Wii (2009) - "S.A.D.-Wii.Studio.v1.0.7.1127-incl.Patch.nfo" - (01/18) yEnc
-		if (preg_match('/^.+"(.+)\.nfo" - \(\d+\/\d+\) yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function wii_gamez()
-	{
-		//Wicked_Monster_Blast_USA_WII-ZRY - [1/105] - "Wicked_Monster_Blast_USA_WII-ZRY.par2" yEnc
-		if (preg_match('/^(\w.+) - \[\d+\/\d+\] - ".+" yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function worms()
-	{
-		//[U4A] 2 Dudes and a Dream 2009 BRRip XvidHD 720p-NPW[01/36] - "2 Dudes and a Dream 2009 BRRip XvidHD 720p-NPW-Sample.avi" yEnc
-		if (preg_match('/^(\[U4A]) (.+?)\[\d+(\/\d+\]) - ".+?" yEnc$/', $this->subject, $match)) {
-			return $match[2];
-		}
-		//(38/57) "Fright.Night.2.New.Blood.2013.UNRATED.BluRay.810p.DTS.x264-PRoDJi.part26.rar" - 4,81 GB - yEnc
-		//(14/20) "Jack.the.Giant.Slayer.2013.AC3.192Kbps.23fps.2ch.TR.Audio.BluRay-Demuxed.by.par2" - 173,15 MB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) ("|#34;)(.+)(\.[vol|part].+)?\.(par2|nfo|rar|nzb)("|#34;) - \d+[.,]\d+ [kKmMgG][bB] - yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(01/40) - Description - "Cloudy.with.a.Chance.of.Meatballs.2009.AC3.23Fps.640Kbps.6Ch.TR.Audio.BD-Demuxed.by.DWA.nfo" - 454,60 MB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) - Description - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(151/161) "Troy.2004.Directors.Cut.1080p.BluRay.x264.DTS.vol064+21.PAR2.bad" - 18,64 GB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//[Macguffin Proudly Presents] (33/75) -Reservoir Dogs 1992 720p BDRip AC3 x264 MacGuffin - "macguffin-redog720p.r30"  - 3.06 GB - yEnc
-		//[Request][MacGuffin Proudly Presents](056/229) - LOTR The Trilogy EXTENDED REPOST 720p BRRip AC3 x264 MacGuffin - "macguffin-tfotr720p.r53" - 18.54 GB - yEnc
-		//[REPOST][MacGuffin Proudly Presents](44/54) - Flight 2012 720p BRRip REPOST AC3 x264 MacGuffin - "macguffin-flit720p.rar" - 4.09 GB - yEnc
-		if (preg_match('/^(\[(Request|Repost)\])?\[Macguffin Proudly Presents\][-_\s]{0,3}\(\d+\/\d+\)[-_\s]{0,3}(.+?) MacGuffin[-_\s]{0,3}".+' .
-			$this->e0 . '[- ]{0,4}\d+[.,]\d+ [kKmMgG][bB][-_\s]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function x()
-	{
-		//!!www.usenet4all.eu!! - Acceptance.2009.COMPLETE.NTSC.DVDR-D0PE[001/100] - #34;d0pe-a.nfo#34; yEnc
-		if (preg_match('/^!!www\.usenet4all\.eu!![ _-]{0,3}(.+)\[\d+\/\d+\][ _-]{0,3}("|#34;).+("|#34;) yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function x264()
-	{
-		//"Batman-8 TDKR-Pittis AVCHD-ADD.English.dtsHDma.part013.rar" (042/197) yEnc
-		if (preg_match('/^"(.+?)(\.part\d*|\.rar)?(\.vol.+?"|\.[A-Za-z0-9]{2,4}") \(\d+\/(\d+\)) yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(001/108) "Wizards.of.Waverly.Place.720p.S04E01.by.sugarr.par2" - 5,15 GB - yEnc
-		if (preg_match('/^\(\d+\/(\d+\)) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e0 .
-			' - \d+[,.]\d+ [mMkKgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[NZBsRus.com]-[Arthur.Christmas.2011.BDRip.AC3-5.1.x264-AKS74u] [18/74] - "ac-bdrip-aks74u.r15" yEnc
-		if (preg_match('/^\[NZBsRus\.com.+\]-\[(.+)\][-_\s]{0,3}\[\d+\/\d+\] - ".+?' . $this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[Entourage.S05.720p.WEB-DL.DD5.1.H.264-BTN]-[167/193] - "Entourage.S05E11.Playn.With.Fire.720p.WEB-DL.DD5.1.h.264-BTN.part05.rar" yEnc
-		if (preg_match('/^\[.+\]-\[\d+\/\d+\] - "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //CTW487678426 | Get.the.Gringo.1080p.BluRay.x264.DTS-HDChina.r43-CTW  yEnc
-		if (preg_match('/^CTW\d+ \| (.+)  yEnc$/', $this->subject, $match)) {
-			return $match[1];
-		} //(????) [0/8] - Crionics Post - Alice In Chains - Dirt REPOST"Alice In Chains - Dirt.nzb" yEnc
-		if (preg_match('/^.+?\[\d+\/(\d+\][-_\s]{0,3}.+?)[-_\s]{0,3}("|#34;)(.+?)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}("|#34;))[-_\s]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(????) [001/153] - "C4 House Party Horse Meat Disco Set 6.nfo" C4 House Party Horse Meat Disco Set 6 yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\][-_\s]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(????) [19/22] - C.K.N. Demo 85  "19-rotten system.mp3" yEnc
-		if (preg_match('/^\(\?+\) \[\d+\/\d+\] - (.+)[-_\s]{0,3}".+?' . $this->e0 . '.+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function xbox360()
-	{
-		//a.b.g.xbox360 presents [ReqID: 8747][Lego_Star_Wars_The_Complete_Saga_USA_XBOX360-PROTOCOL] [01/80] - "ptc-swcs.nfo" yEnc
-		if (preg_match('/^a\.b\.g\.xbox360 presents \[ReqID: \d+\]\[(.+)\] \[\d+\/\d+\] - ".+" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function dk_tv()
-	{
-		//Store.Boligdroemme.S02E06.DANiS H.HDTV.x264-TVBYEN - [01/28] - "store.boligdroemme.s02e06.danis h.hdtv.x264-tvbyen.nfo" yEnc
-		if (preg_match('/^([a-zA-Z0-9].+?) - \[\d+\/\d+\] - ".+?" yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function generic_town()
-	{
-		//<TOWN><www.town.ag > <download all our files with>>> www.ssl-news.info <<< > [05/87] - "Deep.Black.Ass.5.XXX.1080p.WEBRip.x264-TBP.part03.rar" - 7,87 GB yEnc
-		//<TOWN><www.town.ag > <partner of www.ssl-news.info > [02/24] - "Dragons.Den.UK.S11E02.HDTV.x264-ANGELiC.nfo" - 288,96 MB yEnc
-		//<TOWN><www.town.ag > <SSL - News.Info> [6/6] - "TTT.Magazine.2013.08.vol0+1.par2" - 33,47 MB yEnc
-		if (preg_match('/^<TOWN>.+?town\.ag.+?(www\..+?|News)\.[iI]nfo.+? \[\d+\/\d+\]( -)? "(.+?)(-sample)?' . $this->e0 . ' - \d+[.,]\d+ [kKmMgG][bB]M? yEnc$/', $this->subject, $match)) {
-			return $match[3];
-		} //[ TOWN ]-[ www.town.ag ]-[ partner of www.ssl-news.info ]-[ 1080p ] - [320/352] - "Gq7YGEWLy8wAA2NhbZx5LukEa.vol000+5.par2" - 17.09 GB yEnc
-		if (preg_match('/^\[\s*TOWN\s*\][-_\s]{0,3}\[\s*www\.town\.ag\s*\][-_\s]{0,3}\[\s*partner of www\.ssl-news\.info\s*\][-_\s]{0,3}\[\s* .*\s*\][-_\s]{0,3}\[\d+\/\d+\][-_\s]{0,4}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2, $this->subject, $match)) {
-			return $match[1];
-		} //<TOWN><www.town.ag > <download all our files with>>> www.ssl-news.info <<< >IP Scanner Pro 3.21-Sebaro - [1/3] - "IP Scanner Pro 3.21-Sebaro.rar" yEnc
-		if (preg_match('/^<TOWN>.+?town\.ag.+?(www\..+?|News)\.[iI]nfo.+? \[\d+\/\d+\]( -)? "(.+?)(-sample)?' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //(05/10) -<TOWN><www.town.ag > <partner of www.ssl-news.info > - "D.Olivier.Wer Boeses.saet-gsx-.part4.rar" - 741,51 kB - yEnc
-		if (preg_match('/^\(\d+\/\d+\) -<TOWN><www\.town\.ag >\s+<partner.+> - ("|#34;)([\w. ()-]{8,}?\b)(\.par2|-\.part\d+\.rar|\.nfo)("|#34;) - \d+[.,]\d+ [kKmMgG][bB]( -)? yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[ TOWN ]-[ www.town.ag ]-[ partner of www.ssl-news.info ]-[ MOVIE ] [14/19] - "Night.Vision.2011.DVDRip.x264-IGUANA.part12.rar" - 660,80 MB yEnc
-		if (preg_match('/^\[ TOWN \][ _-]{0,3}\[ www\.town\.ag \][ _-]{0,3}\[ partner of www\.ssl-news\.info \][ _-]{0,3}\[ .* \] \[\d+\/\d+\][ _-]{0,3}("|#34;)(.+)((\.part\d+\.rar)|(\.vol\d+\+\d+\.par2))("|#34;)[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[ TOWN ]-[ www.town.ag ]-[ partner of www.ssl-news.info ]-[ MOVIE ] [01/84] - "The.Butterfly.Effect.2.2006.1080p.BluRay.x264-LCHD.par2" - 7,49 GB yEnc
-		if (preg_match('/^\[ TOWN \][ _-]{0,3}\[ www\.town\.ag \][ _-]{0,3}\[ partner of www\.ssl-news\.info \][ _-]{0,3}\[ .* \] \[\d+\/\d+\][ _-]{0,3}("|#34;)(.+)\.(par2|rar|nfo|nzb)("|#34;)[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[ TOWN ]-[ www.town.ag ]-[ partner of www.ssl-news.info ] [22/22] - "Arsenio.Hall.2013.09.11.Magic.Johnson.720p.HDTV.x264-2HD.vol31+11.par2" - 1,45 GB yEnc
-		if (preg_match('/^\[ TOWN \][ _-]{0,3}\[ www\.town\.ag \][ _-]{0,3}\[ partner of www\.ssl-news\.info \][ _-]{0,3}(\[ TV \] )?\[\d+\/\d+\][ _-]{0,3}("|#34;)(.+)((\.part\d+\.rar)|(\.vol\d+\+\d+\.par2)|\.nfo|\.vol\d+\+\.par2)("|#34;)[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //[ TOWN ]-[ www.town.ag ]-[ partner of www.ssl-news.info ] [01/28] - "Arsenio.Hall.2013.09.18.Dr.Phil.McGraw.HDTV.x264-2HD.par2" - 352,58 MB yEnc
-		if (preg_match('/^\[ TOWN \][ _-]{0,3}\[ www\.town\.ag \][ _-]{0,3}\[ partner of www\.ssl-news\.info \][ _-]{0,3}(\[ TV \] )?\[\d+\/\d+\][ _-]{0,3}("|#34;)(.+)\.par2("|#34;)[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[3];
-		} //4675.-.Wedding.Planner.multi3.(EU) <TOWN><www.town.ag > <partner of www.ssl-news.info > <Games-NDS >  [01/10] - "4675.-.Wedding.Planner.multi3.(EU).par2" - 72,80 MB - yEnc
-		if (preg_match('/^\d+\.-\.(.+) <TOWN><www\.town\.ag >\s+<partner .+>\s+<.+>\s+\[\d+\/\d+\] - ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//4675.-.Wedding.Planner.multi3.(EU) <TOWN><www.town.ag > <partner of www.ssl-news.info > <Games-NDS >  [01/10] - "4675.-.Wedding.Planner.multi3.(EU).par2" - 72,80 MB - yEnc
-		// Some have no yEnc
-		if (preg_match('/^\d+\.-\.(.+) <TOWN><www\.town\.ag >\s+<partner .+>\s+<.+>\s+\[\d+\/\d+\] - ("|#34;).+/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //Marco.Fehr.-.In.the.Mix.at.Der.Club-09-01-SAT-2012-XDS <TOWN><www.town.ag > <partner of www.ssl-news.info >  [01/13] - "Marco.Fehr.-.In.the.Mix.at.Der.Club-09-01-SAT-2012-XDS.par2" - 92,12 MB - yEnc
-		if (preg_match('/^(\w.+) <TOWN><www\.town\.ag >\s+<partner.+>\s+\[\d+\/\d+\] - ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//Marco.Fehr.-.In.the.Mix.at.Der.Club-09-01-SAT-2012-XDS <TOWN><www.town.ag > <partner of www.ssl-news.info >  [01/13] - "Marco.Fehr.-.In.the.Mix.at.Der.Club-09-01-SAT-2012-XDS.par2" - 92,12 MB - yEnc
-		// Some have no yEnc
-		if (preg_match('/^(\w.+) <TOWN><www\.town\.ag >\s+<partner.+>\s+\[\d+\/\d+\] - ("|#34;).+/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<TOWN><www.town.ag > <partner of www.ssl-news.info > JetBrains.IntelliJ.IDEA.v11.1.4.Ultimate.Edition.MacOSX.Incl.Keymaker-EMBRACE  [01/18] - "JetBrains.IntelliJ.IDEA.v11.1.4.Ultimate.Edition.MacOSX.Incl.Keymaker-EMBRACE.par2" - 200,77 MB - yEnc
-		if (preg_match('/^<TOWN><www\.town\.ag >\s+<partner .+>\s+(.+)\s+\[\d+\/\d+\] - ("|#34;).+("|#34;).+yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		//<TOWN><www.town.ag > <partner of www.ssl-news.info > JetBrains.IntelliJ.IDEA.v11.1.4.Ultimate.Edition.MacOSX.Incl.Keymaker-EMBRACE  [01/18] - "JetBrains.IntelliJ.IDEA.v11.1.4.Ultimate.Edition.MacOSX.Incl.Keymaker-EMBRACE.par2" - 200,77 MB - yEnc
-		// Some have no yEnc
-		if (preg_match('/^<TOWN><www\.town\.ag >\s+<partner .+>\s+(.+)\s+\[\d+\/\d+\] - ("|#34;).+/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<TOWN><www.town.ag > <partner of www.ssl-news.info > [01/18] - "2012-11.-.Supurbia.-.Volume.Tw o.Digital-1920.K6-Empire.par2" - 421,98 MB yEnc
-		if (preg_match('/^[ <\[]{0,2}TOWN[ >\]]{0,2}[ _-]{0,3}[ <\[]{0,2}www\.town\.ag[ >\]]{0,2}[ _-]{0,3}[ <\[]{0,2}partner of www.ssl-news\.info[ >\]]{0,2}[ _-]{0,3}\[\d+\/\d+\][ _-]{0,3}("|#34;)(.+)\.(par|vol|rar|nfo).*?("|#34;).+?yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //<TOWN> www.town.ag > sponsored by www.ssl-news.info > (1/3) "HolzWerken_40.par2" - 43,89 MB - yEnc
-		if (preg_match('/^<TOWN> www\.town\.ag > sponsored by www\.ssl-news\.info > \(\d+\/\d+\) "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e0 . ' - \d+[,.]\d+ [mMkKgG][bB] - yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(1/9)<<<www.town.ag>>> sponsored by ssl-news.info<<<[HorribleSubs]_AIURA_-_01_[480p].mkv "[HorribleSubs]_AIURA_-_01_[480p].par2" yEnc
-		if (preg_match('/^\(\d+\/\d+\).+?www\.town\.ag.+?sponsored by (www\.)?ssl-news\.info<+?.+? "([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' .
-			$this->e1,
-			$this->subject,
-			$match)
-		) {
-			return $match[2];
-		} //[ TOWN ]-[ www.town.ag ]-[ Assassins.Creed.IV.Black.Flag.XBOX360-COMPLEX ]-[ partner of www.ssl-news.info ] [074/195]- "complex-ac4.bf.d1.r71" yEnc
-		if (preg_match('/^\[ TOWN \][ _-]{0,3}\[ www\.town\.ag \][ _-]{0,3}\[ (.+?) \][ _-]{0,3}\[ partner of www\.ssl-news\.info \][ _-]{0,3}\[\d+\/(\d+\])[ _-]{0,3}"(.+)(\.part\d*|\.rar)?(\.vol.+ \(\d+\/\d+\) "|\.[A-Za-z0-9]{2,4}")[ _-]{0,3}yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //(TOWN)(www.town.ag ) (partner of www.ssl-news.info ) Twinz-Conversation-CD-FLAC-1995-CUSTODES  [01/23] - #34;Twinz-Conversation-CD-FLAC-1995-CUSTODES.par2#34; - 266,00 MB - yEnc
-		if (preg_match('/^\(TOWN\)\(www\.town\.ag \)[ _-]{0,3}\(partner of www\.ssl-news\.info \)[ _-]{0,3} (.+?) \[\d+\/(\d+\][ _-]{0,3}("|#34;).+?)\.(par2|rar|nfo|nzb)("|#34;)[ _-]{0,3}\d+[.,]\d+ [kKmMgG][bB][ _-]{0,3}yEnc$/',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //<TOWN><www.town.ag > <partner of www.ssl-news.info > Greek.S04E06.Katerstimmung.German.DL.Dubbed.WEB-DL.XviD-GEZ  [01/22] - "Greek.S04E06.Katerstimmung.German.DL.Dubbed.WEB-DL.XviD-GEZ.par2" - 526,99 MB - yEnc
-		if (preg_match('/^<TOWN><www\.town\.ag > <partner of www\.ssl-news\.info > (.+) \[\d+\/\d+\][ _-]{0,3}("|#34;).+?("|#34;).+?yEnc$/i',
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		} //[ TOWN ]-[ www.town.ag ]-[ ANIME ] [01/17] - "[Chyuu] Nanatsu no Taizai - 12 [720p][D1F49539].par2" - 585,03 MB yEnc
-		if (preg_match('/^\[ TOWN \][ _-]{0,3}\[ www\.town\.ag \][ _-]{0,3}\[ .* \][ _-]{0,3}\[\d+\/\d+\][ _-]{0,3}"([\w\säöüÄÖÜß+¤ƒ¶!.,&_()\[\]\'\`{}#-]{8,}?\b.?)' . $this->e2,
-			$this->subject,
-			$match)
-		) {
-			return $match[1];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	// Run at the end because this can be dangerous. In the future it's better to make these per group. There should not be numbers after yEnc because we remove them as well before inserting (even when importing).
-	public function generic()
-	{
-		// This regex gets almost all of the predb release names also keep in mind that not every subject ends with yEnc, some are truncated, because of the 255 character limit and some have extra charaters tacked onto the end, like (5/10).
-		if (preg_match('/^\[\d+\][-_\s]{0,3}(\[(reup|full|repost.+?|part|re-repost|xtr|sample)(\])?[-_\s]{0,3}\[[- #@\.\w]+\][-_\s]{0,3}|\[[- #@\.\w]+\][-_\s]{0,3}\[(reup|full|repost.+?|part|re-repost|xtr|sample)(\])?[-_\s]{0,3}|\[.+?efnet\][-_\s]{0,3}|\[(reup|full|repost.+?|part|re-repost|xtr|sample)(\])?[-_\s]{0,3})(\[FULL\])?[-_\s]{0,3}(\[ )?(\[)? ?(\/sz\/)?(F: - )?(?P<title>[- _!@\.\'\w\(\)~]{10,}) ?(\])?[-_\s]{0,3}(\[)? ?(REPOST|REPACK|SCENE|EXTRA PARS|REAL)? ?(\])?[-_\s]{0,3}?(\[\d+[-\/~]\d+\])?[-_\s]{0,3}["|#34;]*.+["|#34;]* ?[yEnc]{0,4}/i',
-			$this->subject,
-			$match)
-		) {
-			return $match['title'];
-		}
-		return array(
-			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
-		);
-	}
-
-	public function releaseCleanerHelper($subject)
-	{
-		$cleanerName = preg_replace('/(- )?yEnc$/', '', $subject);
-		return trim(preg_replace('/\s\s+/', ' ', $cleanerName));
-	}
-
-	//
-	//	Cleans release name for the namefixer class.
-	//
-	public function fixerCleaner($name)
-	{
-		//Extensions.
-		$cleanerName = preg_replace('/([-_](proof|sample|thumbs?))*(\.part\d*(\.rar)?|\.rar)?(\d{1,3}\.rev"|\.vol.+?"|\.[A-Za-z0-9]{2,4}$|$)/i',
-			' ',
-			$name);
-		//Remove stuff from the start.
-		$cleanerName = preg_replace('/^(Release Name|sample-)/i', ' ', $cleanerName);
-		//Replace multiple spaces with 1 space
-		$cleanerName = preg_replace('/\s\s+/i', ' ', $cleanerName);
-		//Remove invalid characters.
-		$cleanerName = trim(utf8_encode(preg_replace('/[^(\x20-\x7F)]*/', '', $cleanerName)));
-		return $cleanerName;
-	}
-}
\ No newline at end of file
diff --git a/lib/ReleaseRemover.php b/lib/ReleaseRemover.php
deleted file mode 100644
index f8e8fb9d2..000000000
--- a/lib/ReleaseRemover.php
+++ /dev/null
@@ -1,1304 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/cache.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("Enzebe.php");
-
-/**
- * Handles removing of various unwanted releases.
- *
- * Class ReleaseRemover
- */
-class ReleaseRemover
-{
-	/**
-	 * @const New line.
-	 */
-	const N = PHP_EOL;
-
-	/**
-	 * @var string
-	 */
-	protected $blacklistID;
-
-	/**
-	 * Is is run from the browser?
-	 *
-	 * @var bool
-	 */
-	protected $browser;
-
-	/**
-	 * @var ConsoleTools
-	 */
-	protected $consoleTools;
-
-	/**
-	 * @var string
-	 */
-	protected $crapTime = '';
-
-	/**
-	 * @var bool
-	 */
-	protected $delete;
-
-	/**
-	 * @var int
-	 */
-	protected $deletedCount = 0;
-
-	/**
-	 * @var bool
-	 */
-	protected $echoCLI;
-
-	/**
-	 * If an error occurred, store it here.
-	 *
-	 * @var string
-	 */
-	protected $error;
-
-	/**
-	 * Ignore user check?
-	 *
-	 * @var bool
-	 */
-	protected $ignoreUserCheck;
-
-	/**
-	 * @var string
-	 */
-	protected $method = '';
-
-	/**
-	 * @var DB
-	 */
-	protected $pdo;
-
-	/**
-	 * The query we will use to select unwanted releases.
-	 *
-	 * @var string
-	 */
-	protected $query;
-
-	/**
-	 * @var Releases
-	 */
-	protected $releases;
-
-	/**
-	 * Result of the select query.
-	 *
-	 * @var array
-	 */
-	protected $result;
-
-	/**
-	 * Time we started.
-	 *
-	 * @var int
-	 */
-	protected $timeStart;
-
-	/**
-	 * @var NZB
-	 */
-	private $nzb;
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options Class instances / various options.
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Browser'      => false, // Are we coming from the web script.
-			'ConsoleTools' => null,
-			'Echo'         => true, // Echo to CLI?
-			'NZB'          => null,
-			'ReleaseImage' => null,
-			'Releases'     => null,
-			'Settings'     => null,
-		];
-		$options += $defaults;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->consoleTools = ($options['ConsoleTools'] instanceof \ConsoleTools ? $options['ConsoleTools'] : new \ConsoleTools(['ColorCLI' => $this->pdo->log]));
-		$this->releases = ($options['Releases'] instanceof \Releases ? $options['Releases'] : new \Releases(['Settings' => $this->pdo]));
-		$this->nzb = ($options['NZB'] instanceof \NZB ? $options['NZB'] : new \NZB($this->pdo));
-		$this->releaseImage = ($options['ReleaseImage'] instanceof \ReleaseImage ? $options['ReleaseImage'] : new \ReleaseImage($this->pdo));
-
-		$this->query = '';
-		$this->error = '';
-		$this->ignoreUserCheck = false;
-		$this->browser = $options['Browser'];
-		$this->echoCLI = (!$this->browser && NN_ECHOCLI && $options['Echo']);
-	}
-
-	/**
-	 * Remove releases using user criteria.
-	 *
-	 * @param array $arguments Array of criteria used to delete unwanted releases.
-	 *                         Criteria muse look like this : columnName=modifier="content"
-	 *                         columnName is a column name from the releases table.
-	 *                         modifiers are : equals,like,bigger,smaller
-	 *                         content is what to change the column content to
-	 *
-	 * @return string|bool
-	 */
-	public function removeByCriteria($arguments)
-	{
-		$this->delete = true;
-		$this->ignoreUserCheck = false;
-		// Time we started.
-		$this->timeStart = TIME();
-
-		// Start forming the query.
-		$this->query = 'SELECT id, guid, searchname FROM releases WHERE 1=1';
-
-		// Keep forming the query based on the user's criteria, return if any errors.
-		foreach ($arguments as $arg) {
-			$this->error = '';
-			$string = $this->formatCriteriaQuery($arg);
-			if ($string === false) {
-				return $this->returnError();
-			}
-			$this->query .= $string;
-		}
-		$this->query = $this->cleanSpaces($this->query);
-
-		// Check if the user wants to run the query.
-		if ($this->checkUserResponse() === false) {
-			return false;
-		}
-
-		// Check if the query returns results.
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		$this->method = 'userCriteria';
-
-		$this->deletedCount = 0;
-		// Delete the releases.
-		$this->deleteReleases();
-
-		if ($this->echoCLI) {
-			echo $this->pdo->log->headerOver(($this->delete ? "Deleted " : "Would have deleted ") . $this->deletedCount . " release(s). This script ran for ");
-			echo $this->pdo->log->header($this->consoleTools->convertTime(TIME() - $this->timeStart));
-		}
-
-		return ($this->browser
-			?
-			'Success! ' .
-			($this->delete ? "Deleted " : "Would have deleted ") .
-			$this->deletedCount .
-			' release(s) in ' .
-			$this->consoleTools->convertTime(TIME() - $this->timeStart)
-			:
-			true
-		);
-	}
-
-	/**
-	 * Delete crap releases.
-	 *
-	 * @param bool       $delete                 Delete the release or just show the result?
-	 * @param int|string $time                   Time in hours (to select old releases) or 'full' for no time limit.
-	 * @param string     $type                   Type of query to run [blacklist, executable, gibberish, hashed, installbin, passworded,
-	 *                                           passwordurl, sample, scr, short, size, ''] ('' runs against all types)
-	 * @param string     $blacklistID
-	 *
-	 * @return string|bool
-	 */
-	public function removeCrap($delete, $time, $type = '', $blacklistID = '')
-	{
-		$this->timeStart = time();
-		$this->delete = $delete;
-		$this->blacklistID = '';
-
-		if (isset($blacklistID) && is_numeric($blacklistID)) {
-			$this->blacklistID = sprintf("AND id = %d", $blacklistID);
-		}
-
-		$time = trim($time);
-		$this->crapTime = '';
-		$type = strtolower(trim($type));
-
-		switch ($time) {
-			case 'full':
-				if ($this->echoCLI) {
-					echo $this->pdo->log->header("Removing " . ($type == '' ? "All crap releases " : $type . " crap releases") . " - no time limit.\n");
-				}
-				break;
-			default:
-				if (!is_numeric($time)) {
-					$this->error = 'Error, time must be a number or full.';
-
-					return $this->returnError();
-				}
-				if ($this->echoCLI) {
-					echo $this->pdo->log->header("Removing " . ($type == '' ? "All crap releases " : $type . " crap releases") . " from the past " . $time . " hour(s).\n");
-				}
-				$this->crapTime = ' AND r.adddate > (NOW() - INTERVAL ' . $time . ' HOUR)';
-				break;
-
-		}
-
-		$this->deletedCount = 0;
-		$type = strtolower(trim($type));
-		switch ($type) {
-			case 'blacklist':
-				$this->removeBlacklist();
-				break;
-			case 'blfiles':
-				$this->removeBlacklistFiles();
-				break;
-			case 'executable':
-				$this->removeExecutable();
-				break;
-			case 'gibberish':
-				$this->removeGibberish();
-				break;
-			case 'hashed':
-				$this->removeHashed();
-				break;
-			case 'installbin':
-				$this->removeInstallBin();
-				break;
-			case 'passworded':
-				$this->removePassworded();
-				break;
-			case 'passwordurl':
-				$this->removePasswordURL();
-				break;
-			case 'sample':
-				$this->removeSample();
-				break;
-			case 'scr':
-				$this->removeSCR();
-				break;
-			case 'short':
-				$this->removeShort();
-				break;
-			case 'size':
-				$this->removeSize();
-				break;
-			case 'huge':
-				$this->removeHuge();
-				break;
-			case 'codec':
-				$this->removeCodecPoster();
-				break;
-			case '':
-				$this->removeBlacklist();
-				$this->removeBlacklistFiles();
-				$this->removeExecutable();
-				$this->removeGibberish();
-				$this->removeHashed();
-				$this->removeInstallBin();
-				$this->removePassworded();
-				$this->removeSample();
-				$this->removeSCR();
-				$this->removeShort();
-				$this->removeSize();
-				$this->removeHuge();
-				$this->removeCodecPoster();
-				break;
-			default:
-				$this->error = 'Wrong type: ' . $type;
-
-				return $this->returnError();
-		}
-
-		if ($this->echoCLI) {
-			echo $this->pdo->log->headerOver(($this->delete ? "Deleted " : "Would have deleted ") . $this->deletedCount . " release(s). This script ran for ");
-			echo $this->pdo->log->header($this->consoleTools->convertTime(TIME() - $this->timeStart));
-		}
-
-		return ($this->browser
-			?
-			'Success! ' .
-			($this->delete ? "Deleted " : "Would have deleted ") .
-			$this->deletedCount .
-			' release(s) in ' .
-			$this->consoleTools->convertTime(TIME() - $this->timeStart)
-			:
-			true
-		);
-	}
-
-	/**
-	 * Remove releases with 15 or more letters or numbers, nothing else.
-	 *
-	 * @return bool
-	 */
-	protected function removeGibberish()
-	{
-		$this->method = 'Gibberish';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.nfostatus = 0
-			AND r.iscategorized = 1
-			AND r.rarinnerfilecount = 0
-			AND r.categoryid NOT IN (%d)
-			AND r.searchname REGEXP '^[a-zA-Z0-9]{15,}$'
-			%s",
-			\Category::CAT_MISC_HASHED,
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with 25 or more letters/numbers, probably hashed.
-	 *
-	 * @return bool
-	 */
-	protected function removeHashed()
-	{
-		$this->method = 'Hashed';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.nfostatus = 0
-			AND r.iscategorized = 1
-			AND r.rarinnerfilecount = 0
-			AND r.categoryid NOT IN (%d, %d)
-			AND r.searchname REGEXP '[a-zA-Z0-9]{25,}'
-			%s",
-			\Category::CAT_MISC_OTHER, \Category::CAT_MISC_HASHED, $this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with 5 or less letters/numbers.
-	 *
-	 * @return bool
-	 */
-	protected function removeShort()
-	{
-		$this->method = 'Short';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.nfostatus = 0
-			AND r.iscategorized = 1
-			AND r.rarinnerfilecount = 0
-			AND r.categoryid NOT IN (%d)
-			AND r.searchname REGEXP '^[a-zA-Z0-9]{0,5}$'
-			%s",
-			\Category::CAT_MISC_OTHER, $this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with an exe file not in other misc or pc apps/games.
-	 *
-	 * @return bool
-	 */
-	protected function removeExecutable()
-	{
-		$this->method = 'Executable';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			INNER JOIN releasefiles rf ON rf.releaseid = r.id
-			WHERE r.searchname NOT LIKE %s
-			AND rf.name LIKE %s
-			AND r.categoryid NOT IN (%d, %d, %d, %d, %d, %d) %s",
-			"'%.exes%'",
-			"'%.exe%'",
-			\Category::CAT_PC_0DAY,
-			\Category::CAT_PC_GAMES,
-			\Category::CAT_PC_ISO,
-			\Category::CAT_PC_MAC,
-			\Category::CAT_MISC_OTHER,
-			\Category::CAT_MISC_HASHED,
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with an install.bin file.
-	 *
-	 * @return bool
-	 */
-	protected function removeInstallBin()
-	{
-		$this->method = 'Install.bin';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			INNER JOIN releasefiles rf ON rf.releaseid = r.id
-			WHERE rf.name LIKE %s %s",
-			"'%install.bin%'",
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with an password.url file.
-	 *
-	 * @return bool
-	 */
-	protected function removePasswordURL()
-	{
-		$this->method = 'Password.url';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			INNER JOIN releasefiles rf ON rf.releaseid = r.id
-			WHERE rf.name LIKE %s %s",
-			"'%password.url%'",
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with password in the search name.
-	 *
-	 * @return bool
-	 */
-	protected function removePassworded()
-	{
-		$this->method = 'Passworded';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.searchname LIKE %s
-			AND r.searchname NOT LIKE %s
-			AND r.searchname NOT LIKE %s
-			AND r.searchname NOT LIKE %s
-			AND r.searchname NOT LIKE %s
-			AND r.searchname NOT LIKE %s
-			AND r.searchname NOT LIKE %s
-			AND r.nzbstatus = 1
-			AND r.categoryid NOT IN (%d, %d, %d, %d, %d, %d, %d, %d, %d) %s",
-			// Matches passwort / passworded / etc also.
-			"'%passwor%'",
-			"'%advanced%'",
-			"'%no password%'",
-			"'%not password%'",
-			"'%recovery%'",
-			"'%reset%'",
-			"'%unlocker%'",
-			\Category::CAT_PC_GAMES,
-			\Category::CAT_PC_0DAY,
-			\Category::CAT_PC_ISO,
-			\Category::CAT_PC_MAC,
-			\Category::CAT_PC_MOBILEANDROID,
-			\Category::CAT_PC_MOBILEIOS,
-			\Category::CAT_PC_MOBILEOTHER,
-			\Category::CAT_MISC_OTHER,
-			\Category::CAT_MISC_HASHED,
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases smaller than 2MB with 1 part not in MP3/books/misc section.
-	 *
-	 * @return bool
-	 */
-	protected function removeSize()
-	{
-		$this->method = 'Size';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.totalpart = 1
-			AND r.size < 2097152
-			AND r.categoryid NOT IN (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d) %s",
-			\Category::CAT_MUSIC_MP3,
-			\Category::CAT_BOOK_COMICS,
-			\Category::CAT_BOOK_EBOOK,
-			\Category::CAT_BOOK_FOREIGN,
-			\Category::CAT_BOOK_MAGS,
-			\Category::CAT_BOOK_TECHNICAL,
-			\Category::CAT_BOOK_OTHER,
-			\Category::CAT_PC_0DAY,
-			\Category::CAT_PC_GAMES,
-			\Category::CAT_MISC_OTHER,
-			\Category::CAT_MISC_HASHED,
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases bigger than 200MB with just a single file.
-	 *
-	 * @return bool
-	 */
-	protected function removeHuge()
-	{
-		$this->method = 'Huge';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.totalpart = 1
-			AND r.size > 209715200 %s",
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with more than 1 part, less than 40MB, sample in name. TV/Movie sections.
-	 *
-	 * @return bool
-	 */
-	protected function removeSample()
-	{
-		$this->method = 'Sample';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			WHERE r.totalpart > 1
-			AND r.size < 40000000
-			AND r.name LIKE %s
-			AND r.categoryid IN (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d) %s",
-			"'%sample%'",
-			\Category::CAT_TV_ANIME,
-			\Category::CAT_TV_DOCU,
-			\Category::CAT_TV_FOREIGN,
-			\Category::CAT_TV_HD,
-			\Category::CAT_TV_OTHER,
-			\Category::CAT_TV_SD,
-			\Category::CAT_TV_SPORT,
-			\Category::CAT_TV_WEBDL,
-			\Category::CAT_MOVIE_3D,
-			\Category::CAT_MOVIE_BLURAY,
-			\Category::CAT_MOVIE_DVD,
-			\Category::CAT_MOVIE_FOREIGN,
-			\Category::CAT_MOVIE_HD,
-			\Category::CAT_MOVIE_OTHER,
-			\Category::CAT_MOVIE_SD,
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases with a scr file in the filename/subject.
-	 *
-	 * @return bool
-	 */
-	protected function removeSCR()
-	{
-		$this->method = '.scr';
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id
-			FROM releases r
-			LEFT JOIN releasefiles rf on rf.releaseid = r.id
-			WHERE (rf.name REGEXP '[.]scr[$ \"]' OR r.name REGEXP '[.]scr[$ \"]')
-			%s",
-			$this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Remove releases using the site blacklist regexes.
-	 *
-	 * @return bool
-	 */
-	protected function removeBlacklist()
-	{
-		$status = sprintf('AND status = %d', \Binaries::BLACKLIST_ENABLED);
-
-		if (isset($this->blacklistID) && $this->blacklistID !== '' && $this->delete === false) {
-			$status = '';
-		}
-
-		$regexList = $this->pdo->query(
-			sprintf(
-				'SELECT regex, id, groupname, msgcol
-				FROM binaryblacklist
-				WHERE optype = %d %s %s',
-				\Binaries::OPT_BLACKLIST,
-				$this->blacklistID,
-				$status
-			)
-		);
-
-		if (count($regexList) > 0) {
-
-			foreach ($regexList as $regex) {
-
-				$regexSQL = $ftMatch = $regexMatch = $opTypeName = '';
-				$dbRegex = $this->pdo->escapeString($regex['regex']);
-
-				if ($this->crapTime === '') {
-
-					// Match Regex beginning for long running foreign search
-					if (substr($dbRegex, 2, 17) === 'brazilian|chinese') {
-						// Find first brazilian instance position in Regex, then find first closing parenthesis.
-						// Then substitute all pipes (|) with spaces for FT search and insert into query
-						$forBegin = strpos($dbRegex, 'brazilian');
-						$regexMatch =
-							substr($dbRegex, $forBegin,
-								strpos($dbRegex, ')') - $forBegin
-							);
-					} else if (substr($dbRegex, 7, 11) === 'bl|cz|de|es') {
-						// Find first bl|cz instance position in Regex, then find first closing parenthesis.
-						$forBegin = strpos($dbRegex, 'bl|cz');
-						$regexMatch = '"' .
-							str_replace('|', '" "',
-								substr($dbRegex, $forBegin, strpos($dbRegex, ')') - $forBegin)
-							) . '"';
-					} else if (substr($dbRegex, 8, 5) === '19|20') {
-						// Find first bl|cz instance position in Regex, then find last closing parenthesis as this is reversed.
-						$forBegin = strpos($dbRegex, 'bl|cz');
-						$regexMatch = '"' .
-							str_replace('|', '" "',
-								substr($dbRegex, $forBegin, strrpos($dbRegex, ')') - $forBegin)
-							) . '"';
-					} else if (substr($dbRegex, 7, 14) === 'chinese.subbed') {
-						// Find first brazilian instance position in Regex, then find first closing parenthesis.
-						$forBegin = strpos($dbRegex, 'chinese');
-						$regexMatch =
-							str_replace('nl  subed|bed|s', 'nlsubs|nlsubbed|nlsubed',
-								str_replace('?', '',
-									str_replace('.', ' ',
-										str_replace(array('-', '(', ')'), '',
-											substr($dbRegex, $forBegin,
-												strrpos($dbRegex, ')') - $forBegin
-											)
-										)
-									)
-								)
-							);
-					} else if (substr($dbRegex, 8, 2) === '4u') {
-						// Find first 4u\.nl instance position in Regex, then find first closing parenthesis.
-						$forBegin = strpos($dbRegex, '4u');
-						$regexMatch =
-							str_replace('nov[ a]+rip', 'nova',
-								str_replace('4u.nl', '"4u" "nl"',
-									substr($dbRegex, $forBegin, strpos($dbRegex, ')') - $forBegin)
-								)
-							);
-					} else if (substr($dbRegex, 8, 5) === 'bd|dl') {
-						// Find first bd|dl instance position in Regex, then find last closing parenthesis as this is reversed.
-						$forBegin = strpos($dbRegex, 'bd|dl');
-						$regexMatch =
-							str_replace(array('\\',']','['), '',
-								str_replace('bd|dl)mux', 'bdmux|dlmux',
-									substr($dbRegex, $forBegin,
-										strrpos($dbRegex, ')') - $forBegin
-									)
-								)
-							);
-					} else if (substr($dbRegex, 7, 9) === 'imageset|') {
-						// Find first imageset| instance position in Regex, then find last closing parenthesis.
-						$forBegin = strpos($dbRegex, 'imageset');
-						$regexMatch = substr($dbRegex, $forBegin, strpos($dbRegex, ')') - $forBegin);
-					} else if (substr($dbRegex, 1, 9) === 'hdnectar|') {
-						// Find first hdnectar| instance position in Regex.
-						$regexMatch = str_replace('\'', '', $dbRegex);
-					} else if (substr($dbRegex, 1, 10) === 'Passworded') {
-						// Find first Passworded instance position in Regex, then find last closing parenthesis.
-						$regexMatch = str_replace('\'', '', $dbRegex);
-					}
-
-					$ftMatch = (NN_RELEASE_SEARCH_TYPE == \ReleaseSearch::SPHINX
-						? sprintf('rse.query = "@(name,searchname) %s;limit=10000;maxmatches=10000;mode=any" AND', str_replace('|', ' ', str_replace('"', '', $regexMatch)))
-						: sprintf("(MATCH (rs.name) AGAINST ('%1\$s') OR MATCH (rs.searchname) AGAINST ('%1\$s')) AND", str_replace('|', ' ', $regexMatch))
-					);
-				}
-
-				switch ((int)$regex['msgcol']) {
-					case \Binaries::BLACKLIST_FIELD_SUBJECT:
-						$regexSQL = sprintf("WHERE %s (r.name REGEXP %s OR r.searchname REGEXP %s)", $ftMatch, $dbRegex, $dbRegex);
-						$opTypeName = "Subject";
-						break;
-					case \Binaries::BLACKLIST_FIELD_FROM:
-						$regexSQL = "WHERE r.fromname REGEXP " . $dbRegex;
-						$opTypeName = "Poster";
-						break;
-					case \Binaries::BLACKLIST_FIELD_MESSAGEID:
-						break;
-				}
-
-				if ($regexSQL === '') {
-					continue;
-				}
-
-				// Get the group id if the regex is set to work against a group.
-				$groupID = '';
-				if (strtolower($regex['groupname']) !== 'alt.binaries.*') {
-
-					$groupIDs = $this->pdo->query(
-						'SELECT id FROM groups WHERE name REGEXP ' .
-						$this->pdo->escapeString($regex['groupname'])
-					);
-
-					$groupIDCount = count($groupIDs);
-					if ($groupIDCount === 0) {
-						continue;
-					} elseif ($groupIDCount === 1) {
-						$groupIDs = $groupIDs[0]['id'];
-					} else {
-						$string = '';
-						foreach ($groupIDs as $ID) {
-							$string .= $ID['id'] . ',';
-						}
-						$groupIDs = (substr($string, 0, -1));
-					}
-
-					$groupID = ' AND r.groupid in (' . $groupIDs . ') ';
-				}
-				$this->method = 'Blacklist [' . $regex['id'] . ']';
-
-				// Check if using FT Match and declare for echo
-				if ($ftMatch !== '' && $opTypeName == "Subject") {
-					$blType = "FULLTEXT match with REGEXP";
-					$ftUsing = 'Using (' . $regexMatch . ') as interesting words.' . PHP_EOL;
-				} else {
-					$blType = "only REGEXP";
-					$ftUsing = "\n";
-				}
-
-				// Provide useful output of operations
-				echo $this->pdo->log->header(sprintf("Finding crap releases for %s: Using %s method against release %s.\n" .
-						"%s", $this->method, $blType, $opTypeName, $ftUsing
-					)
-				);
-
-				if ($opTypeName == 'Subject') {
-					$join = (NN_RELEASE_SEARCH_TYPE == \ReleaseSearch::SPHINX ? 'INNER JOIN releases_se rse ON rse.id = r.id' : 'INNER JOIN releasesearch rs ON rs.releaseid = r.id');
-				} else {
-					$join = '';
-				}
-
-				$this->query = sprintf("
-							SELECT r.guid, r.searchname, r.id
-							FROM releases r %s %s %s %s",
-					$join,
-					$regexSQL,
-					$groupID,
-					$this->crapTime
-				);
-
-				if ($this->checkSelectQuery() === false) {
-					continue;
-				}
-				$this->deleteReleases();
-
-			}
-		} else {
-			echo $this->pdo->log->error("No regular expressions were selected for blacklist removal. Make sure you have activated REGEXPs in Site Edit and you're specifying a valid id.\n");
-		}
-
-		return true;
-	}
-
-	/**
-	 * Remove releases using the site blacklist regexes against file names.
-	 *
-	 * @return bool
-	 */
-	protected function removeBlacklistFiles()
-	{
-		$allRegex = $this->pdo->query(
-			sprintf(
-				'SELECT regex, id, groupname
-				FROM binaryblacklist
-				WHERE status = %d
-				AND optype = %d
-				AND msgcol = %d',
-				\Binaries::BLACKLIST_ENABLED,
-				\Binaries::OPT_BLACKLIST,
-				\Binaries::BLACKLIST_FIELD_SUBJECT
-			)
-		);
-
-		if (count($allRegex) > 0) {
-
-			foreach ($allRegex as $regex) {
-
-				$regexSQL = sprintf("LEFT JOIN releasefiles rf ON r.id = rf.releaseid
-				WHERE rf.name REGEXP %s ", $this->pdo->escapeString($regex['regex'])
-				);
-
-				if ($regexSQL === '') {
-					continue;
-				}
-
-				// Get the group id if the regex is set to work against a group.
-				$groupID = '';
-				if (strtolower($regex['groupname']) !== 'alt.binaries.*') {
-					$groupIDs = $this->pdo->query(
-						'SELECT id FROM groups WHERE name REGEXP ' .
-						$this->pdo->escapeString($regex['groupname'])
-					);
-					$groupIDCount = count($groupIDs);
-					if ($groupIDCount === 0) {
-						continue;
-					} elseif ($groupIDCount === 1) {
-						$groupIDs = $groupIDs[0]['id'];
-					} else {
-						$string = '';
-						foreach ($groupIDs as $fID) {
-							$string .= $fID['id'] . ',';
-						}
-						$groupIDs = (substr($string, 0, -1));
-					}
-
-					$groupID = ' AND r.groupid in (' . $groupIDs . ') ';
-				}
-
-				$this->method = 'Blacklist ' . $regex['id'];
-				$this->query = sprintf(
-					"SELECT r.guid, r.searchname, r.id
-					FROM releases r %s %s %s", $regexSQL, $groupID, $this->crapTime
-				);
-
-				if ($this->checkSelectQuery() === false) {
-					continue;
-				}
-
-				$this->deleteReleases();
-
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Remove releases that contain .wmv files and Codec\Setup.exe files, aka that spam poster.
-	 * Thanks to dizant from nZEDb forums for parts of the sql query
-	 *
-	 * @return bool
-	 */
-	protected function removeCodecPoster()
-	{
-		$this->method = 'Codec Poster';
-		$regex = "rf.name REGEXP 'x264.*\.(wmv|avi)$'";
-		$regex2 = "rf.name REGEXP '\\\\.*((DVDrip|BRRip)[. ].*[. ](R[56]|HQ)|720p[ .](DVDrip|HQ)|Webrip.*[. ](R[56]|Xvid|AC3|US)|720p.*[. ]WEB-DL[. ]Xvid[. ]AC3[. ]US|HDRip.*[. ]Xvid[. ]DD5).*[. ]avi$'";
-		$codec = '%\\Codec%Setup.exe%';
-		$iferror = '%If_you_get_error.txt%';
-		$ifnotplaying = '%read me if the movie not playing.txt%';
-		$frenchv = '%Lisez moi si le film ne demarre pas.txt%';
-		$nl = '%lees me als de film niet spelen.txt%';
-		$german = '%Lesen Sie mir wenn der Film nicht abgespielt.txt%';
-		$categories = sprintf("r.categoryid IN (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d) AND",
-			\Category::CAT_MOVIE_3D,
-			\Category::CAT_MOVIE_BLURAY,
-			\Category::CAT_MOVIE_DVD,
-			\Category::CAT_MOVIE_FOREIGN,
-			\Category::CAT_MOVIE_HD,
-			\Category::CAT_MOVIE_OTHER,
-			\Category::CAT_MOVIE_SD,
-			\Category::CAT_XXX_WMV,
-			\Category::CAT_XXX_X264,
-			\Category::CAT_XXX_XVID,
-			\Category::CAT_XXX_OTHER
-		);
-		$codeclike = sprintf("UNION SELECT r.guid, r.searchname, r.id FROM releases r
-			LEFT JOIN releasefiles rf ON r.id = rf.releaseid
-			WHERE %s rf.name LIKE '%s' OR rf.name LIKE '%s' OR rf.name LIKE '%s' OR rf.name LIKE '%s' OR rf.name LIKE '%s' OR rf.name LIKE '%s'", $categories, $codec, $iferror, $ifnotplaying, $frenchv, $nl, $german
-		);
-		$this->query = sprintf(
-			"SELECT r.guid, r.searchname, r.id FROM releases
-			r INNER JOIN releasefiles rf ON (rf.releaseid = r.id)
-			WHERE %s %s OR %s %s %s %s", $categories, $regex, $regex2, $this->crapTime, $codeclike, $this->crapTime
-		);
-
-		if ($this->checkSelectQuery() === false) {
-			return $this->returnError();
-		}
-
-		return $this->deleteReleases();
-	}
-
-	/**
-	 * Delete releases from the database.
-	 */
-	protected function deleteReleases()
-	{
-		$deletedCount = 0;
-		foreach ($this->result as $release) {
-			if ($this->delete) {
-				$this->releases->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-				if ($this->echoCLI) {
-					echo $this->pdo->log->primary('Deleting: ' . $this->method . ': ' . $release['searchname']);
-				}
-			} elseif ($this->echoCLI) {
-				echo $this->pdo->log->primary('Would be deleting: ' . $this->method . ': ' . $release['searchname']);
-			}
-			$deletedCount++;
-		}
-
-		$this->deletedCount += $deletedCount;
-
-		return true;
-	}
-
-	/**
-	 * Verify if the query has any results.
-	 *
-	 * @return bool|int False on failure, count of found releases.
-	 */
-	protected function checkSelectQuery()
-	{
-		// Run the query, check if it picked up anything.
-		$result = $this->pdo->query($this->cleanSpaces($this->query));
-		if (count($result) <= 0) {
-			if ($this->method === 'userCriteria') {
-				$this->error = 'No releases were found to delete, try changing your criteria.';
-			} else {
-				$this->error = '';
-			}
-
-			return false;
-		}
-		$this->result = $result;
-
-		return true;
-	}
-
-	/**
-	 * Go through user arguments and format part of the query.
-	 *
-	 * @param string $argument User argument.
-	 *
-	 * @return bool|string
-	 */
-	protected function formatCriteriaQuery($argument)
-	{
-		// Check if the user wants to ignore the check.
-		if ($argument === 'ignore') {
-			$this->ignoreUserCheck = true;
-
-			return '';
-		}
-
-		$this->error = 'Invalid argument supplied: ' . $argument . self::N;
-		$args = explode('=', $argument);
-		if (count($args) === 3) {
-
-			$args[0] = $this->cleanSpaces($args[0]);
-			$args[1] = $this->cleanSpaces($args[1]);
-			$args[2] = $this->cleanSpaces($args[2]);
-			switch ($args[0]) {
-				case 'categoryid':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND categoryid = ' . $args[2];
-						default:
-							break;
-					}
-					break;
-				case 'imdbid':
-					switch ($args[1]) {
-						case 'equals':
-							if ($args[2] === 'NULL') {
-								return ' AND imdbid IS NULL ';
-							}
-							else {
-								return ' AND imdbid = ' . $args[2];
-							}
-						default:
-							break;
-					}
-					break;
-				case 'nzbstatus':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND nzbstatus = ' . $args[2];
-						default:
-							break;
-					}
-					break;
-				case 'rageid':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND rageid = ' . $args[2];
-						default:
-							break;
-					}
-					break;
-				case 'totalpart':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND totalpart = ' . $args[2];
-						case 'bigger':
-							return ' AND totalpart > ' . $args[2];
-						case 'smaller':
-							return ' AND totalpart < ' . $args[2];
-						default:
-							break;
-					}
-					break;
-				case 'fromname':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND fromname = ' . $this->pdo->escapeString($args[2]);
-						case 'like':
-							return ' AND fromname ' . $this->formatLike($args[2], 'fromname');
-					}
-					break;
-				case 'groupname':
-					switch ($args[1]) {
-						case 'equals':
-							$group = $this->pdo->queryOneRow('SELECT id FROM groups WHERE name = ' . $this->pdo->escapeString($args[2]));
-							if ($group === false) {
-								$this->error = 'This group was not found in your database: ' . $args[2] . PHP_EOL;
-								break;
-							}
-
-							return ' AND groupid = ' . $group['id'];
-						case 'like':
-							$groups = $this->pdo->query('SELECT id FROM groups WHERE name ' . $this->formatLike($args[2], 'name'));
-							if (count($groups) === 0) {
-								$this->error = 'No groups were found with this pattern in your database: ' . $args[2] . PHP_EOL;
-								break;
-							}
-							$gQuery = ' AND groupid IN (';
-							foreach ($groups as $group) {
-								$gQuery .= $group['id'] . ',';
-							}
-							$gQuery = substr($gQuery, 0, strlen($gQuery) - 1) . ')';
-
-							return $gQuery;
-						default:
-							break;
-					}
-					break;
-				case 'guid':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND guid = ' . $this->pdo->escapeString($args[2]);
-						default:
-							break;
-					}
-					break;
-				case 'name':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND name = ' . $this->pdo->escapeString($args[2]);
-						case 'like':
-							return ' AND name ' . $this->formatLike($args[2], 'name');
-						default:
-							break;
-					}
-					break;
-				case 'searchname':
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND searchname = ' . $this->pdo->escapeString($args[2]);
-						case 'like':
-							return ' AND searchname ' . $this->formatLike($args[2], 'searchname');
-						default:
-							break;
-					}
-					break;
-				case 'size':
-					if (!is_numeric($args[2])) {
-						break;
-					}
-					switch ($args[1]) {
-						case 'equals':
-							return ' AND size = ' . $args[2];
-						case 'bigger':
-							return ' AND size > ' . $args[2];
-						case 'smaller':
-							return ' AND size < ' . $args[2];
-						default:
-							break;
-					}
-					break;
-				case 'adddate':
-					if (!is_numeric($args[2])) {
-						break;
-					}
-					switch ($args[1]) {
-						case 'bigger':
-							return ' AND adddate <  NOW() - INTERVAL ' . $args[2] . ' HOUR';
-						case 'smaller':
-							return ' AND adddate >  NOW() - INTERVAL ' . $args[2] . ' HOUR';
-						default:
-							break;
-					}
-					break;
-				case 'postdate':
-					if (!is_numeric($args[2])) {
-						break;
-					}
-					switch ($args[1]) {
-						case 'bigger':
-							return ' AND postdate <  NOW() - INTERVAL ' . $args[2] . ' HOUR';
-						case 'smaller':
-							return ' AND postdate >  NOW() - INTERVAL ' . $args[2] . ' HOUR';
-						default:
-							break;
-					}
-					break;
-				case 'completion':
-					if (!is_numeric($args[2])) {
-						break;
-					}
-					switch ($args[1]) {
-						case 'smaller':
-							return ' AND completion > 0 AND completion < ' . $args[2];
-						default:
-							break;
-					}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if the user wants to run the current query.
-	 *
-	 * @return bool
-	 */
-	protected function checkUserResponse()
-	{
-		if ($this->ignoreUserCheck || $this->browser) {
-			return true;
-		}
-
-		// Print the query to the user, ask them if they want to continue using it.
-		echo $this->pdo->log->primary(
-			'This is the query we have formatted using your criteria, you can run it in SQL to see if you like the results:' .
-			self::N . $this->query . ';' . self::N .
-			'If you are satisfied, type yes and press enter. Anything else will exit.'
-		);
-
-		// Check the users response.
-		$userInput = trim(fgets(fopen('php://stdin', 'r')));
-		if ($userInput !== 'yes') {
-			echo $this->pdo->log->primary('You typed: "' . $userInput . '", the program will exit.');
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Remove multiple spaces and trim leading spaces.
-	 *
-	 * @param string $string
-	 *
-	 * @return string
-	 */
-	protected function cleanSpaces($string)
-	{
-		return trim(preg_replace('/\s{2,}/', ' ', $string));
-	}
-
-	/**
-	 * Format a "like" string. ie: "name LIKE '%test%' AND name LIKE '%123%'
-	 *
-	 * @param string $string The string to format.
-	 * @param string $type   The column name.
-	 *
-	 * @return string
-	 */
-	protected function formatLike($string, $type)
-	{
-		$newString = explode(' ', $string);
-		if (count($newString) > 1) {
-			$string = implode("%' AND {$type} LIKE '%", array_unique($newString));
-		}
-
-		return " LIKE '%" . $string . "%' ";
-	}
-
-	/**
-	 * Echo the error and return false if on CLI.
-	 * Return the error if on browser.
-	 *
-	 * @return bool/string
-	 */
-	protected function returnError()
-	{
-		if ($this->browser) {
-			return $this->error . '<br />';
-		} else {
-			if ($this->echoCLI && $this->error !== '') {
-				echo $this->pdo->log->error($this->error);
-			}
-
-			return false;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/lib/Sharing.php b/lib/Sharing.php
deleted file mode 100644
index 93312c3c9..000000000
--- a/lib/Sharing.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR . '/lib/nntp.php');
-
-/**
- *
- *
- * Class Sharing
- */
-Class Sharing
-{
-	/**
-	 *      --------------------------------------------
-	 *      sharing_sites table (contains remote sites):
-	 *      --------------------------------------------
-	 *      id            id of the site.
-	 *      site_name     Name of the site.
-	 *      site_guid     Unique hash identifier for the site.
-	 *      last_time     Newest comment time for this site.
-	 *      first_time    Oldest comment time for this site.
-	 *      enabled       Have we enabled this site?
-	 *      comments      How many comments has this site given us so far?
-	 *
-	 *      -------------------------------------------
-	 *      sharing table (contains local settings):
-	 *      -------------------------------------------
-	 *      site_guid     Unique identifier for our site.
-	 *      site_name     Our site name.
-	 *      enabled       Is sharing/fetching enabled or disabled (overrides settings below)?
-	 *      posting       Should we upload our comments?
-	 *      fetching      Should we fetch remote comments?
-	 *      auto_enable   Should we auto_enable new sites?
-	 *      hide_users    Hide usernames before uploading comments?
-	 *      last_article  Last article number we downloaded from usenet.
-	 *      max_push      Max comments to upload per run.
-	 *      max_pull      Max articles to download per run.
-	 *
-	 *      -------------------------------------------
-	 *      releasecomments table (modifications)
-	 *      -------------------------------------------
-	 *      shared        Has this comment been shared or have we received it from another site. (0 not shared, 1 shared, 2 received)
-	 *      shareid       Unique identifier to know if we already have the comment or not.
-	 *      nzb_guid      Guid of the NZB's first message-id.
-	 */
-
-	/**
-	 * @var DB
-	 */
-	protected $db;
-
-	/**
-	 * @var NNTP
-	 */
-	protected $nntp;
-
-	/**
-	 * Array containing site settings.
-	 *
-	 * @var array
-	 */
-	protected $siteSettings = array();
-
-	/**
-	 * Group to work in.
-	 *
-	 * @const
-	 */
-	const group = 'alt.binaries.zines';
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options Class instances.
-	 *
-	 * @access public
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults= [
-			'Settings' => null,
-			'NNTP'     => null,
-		];
-		$options += $defaults;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-
-		// Get all sharing info from DB.
-		$check = $this->pdo->queryOneRow('SELECT * FROM sharing');
-
-		// Initiate sharing settings if this is the first time..
-		if (empty($check)) {
-			$check = $this->initSettings();
-		}
-
-		// Second check to make sure nothing went wrong.
-		if (empty($check)) {
-			return;
-		}
-
-		$this->nntp = ($options['NNTP'] instanceof \NNTP ? $options['NNTP'] : new \NNTP(['Settings' => $this->pdo]));
-
-		// Cache sharing settings.
-		$this->siteSettings = $check;
-		unset($check);
-
-		// Convert to bool to speed up checking.
-		$this->siteSettings['hide_users'] = ($this->siteSettings['hide_users'] == 1 ? true : false);
-		$this->siteSettings['auto_enable'] = ($this->siteSettings['auto_enable'] == 1 ? true : false);
-		$this->siteSettings['posting'] = ($this->siteSettings['posting'] == 1 ? true : false);
-		$this->siteSettings['fetching'] = ($this->siteSettings['fetching'] == 1 ? true : false);
-		$this->siteSettings['enabled'] = ($this->siteSettings['enabled'] == 1 ? true : false);
-		$this->siteSettings['start_position'] = ($this->siteSettings['start_position'] == 1 ? true : false);
-	}
-
-	/**
-	 * Main method.
-	 */
-	public function start()
-	{
-		// Admin has disabled sharing so return.
-		if ($this->siteSettings['enabled'] === false) {
-			return;
-		}
-
-		if (is_null($this->nntp)) {
-			$this->nntp = new NNTP();
-			$this->nntp->doConnect();
-		}
-
-		if ($this->siteSettings['fetching']) {
-			$this->fetchAll();
-		}
-		$this->matchComments();
-		if ($this->siteSettings['posting']) {
-			$this->postAll();
-			$this->postSC();
-		}
-	}
-
-	/**
-	 * Initialise of reset sharing settings.
-	 *
-	 * @param string $siteGuid Optional hash (must be sha1) we can set the site guid to.
-	 *
-	 * @return array|bool
-	 */
-	public function initSettings(&$siteGuid = '')
-	{
-		$this->pdo->queryExec('TRUNCATE TABLE sharing');
-		$siteName = uniqid('newznab_', true);
-		$this->pdo->queryExec(
-			sprintf('
-				INSERT INTO sharing
-				(site_name, site_guid, max_push, max_pull, hide_users, start_position, auto_enable, fetching, max_download)
-				VALUES (%s, %s, 40 , 20000, 1, 1, 1, 1, 150)',
-				$this->pdo->escapeString($siteName),
-				$this->pdo->escapeString(($siteGuid === '' ? sha1($siteName) : $siteGuid))
-			)
-		);
-
-		return $this->pdo->queryOneRow('SELECT * FROM sharing');
-	}
-
-	/**
-	 * Post all new comments to usenet.
-	 */
-	protected function postAll()
-	{
-		// Get all comments that we have not posted yet.
-		$newComments = $this->pdo->query(
-			sprintf(
-				'SELECT rc.text, rc.id, %s, u.username, r.nzb_guid
-				FROM releasecomment rc
-				INNER JOIN users u ON rc.userid = u.id
-				INNER JOIN releases r on rc.releaseid = r.id
-				WHERE (rc.shared = 0 or issynced = 1) LIMIT %d',
-				$this->pdo->unix_timestamp_column('rc.createddate'),
-				$this->siteSettings['max_push']
-			)
-		);
-
-		// Check if we have any comments to push.
-		if (count($newComments) === 0) {
-			return;
-		}
-
-
-		echo '(Sharing) Starting to upload comments.' . PHP_EOL;
-
-
-		// Loop over the comments.
-		foreach ($newComments as $comment) {
-			$this->postComment($comment);
-		}
-
-
-		echo PHP_EOL . '(Sharing) Finished uploading comments.' . PHP_EOL;
-
-	}
-
-	/**
-	 * Post all new comments to usenet.
-	 */
-	protected function postSC()
-	{
-		// Get all comments from spotnab that we have not posted yet.
-		$newComments = $this->pdo->query(
-			sprintf(
-				'SELECT id, text, UNIX_TIMESTAMP(createddate) AS unix_time,
-				username, nzb_guid FROM releasecomment
-				WHERE issynced = 1 AND shared = 1 AND shareid IS NULL
-				ORDER BY id DESC'
-			)
-		);
-
-		// Check if we have any comments to push.
-		if (count($newComments) === 0) {
-			return;
-		}
-
-
-		echo '(Sharing) Starting to upload spotnab comments.' . PHP_EOL;
-
-
-		// Loop over the comments.
-		foreach ($newComments as $comment) {
-			$this->postComment($comment);
-		}
-
-
-		echo PHP_EOL . '(Sharing) Finished uploading spotnab comments.' . PHP_EOL;
-
-	}
-
-	/**
-	 * Post a comment to usenet.
-	 *
-	 * @param array $row
-	 */
-	protected function postComment(&$row)
-	{
-		// Create a unique identifier for this comment.
-		$sid = sha1($row['unix_time'] . $row['text'] . $row['nzb_guid']);
-
-		// Check if the comment is already shared.
-		$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM releasecomment WHERE shareid = %s', $this->pdo->escapeString($sid)));
-		if ($check === false) {
-
-			// Example of a subject.
-			//(_nZEDb_)nZEDb_533f16e46a5091.73152965_3d12d7c1169d468aaf50d5541ef02cc88f3ede10 - [1/1] "92ba694cebc4fbbd0d9ccabc8604c71b23af1131" (1/1) yEnc
-
-			// Attempt to upload the comment to usenet.
-			$success = $this->nntp->postArticle(
-				self::group,
-				('(_nZEDb_)' . $this->siteSettings['site_name'] . '_' . $this->siteSettings['site_guid'] . ' - [1/1] "' . $sid . '" yEnc (1/1)'),
-				json_encode(
-					array(
-						'USER' => ($this->siteSettings['hide_users'] ? 'ANON' : $row['username']),
-						'TIME' => $row['unix_time'],
-						'SID'  => $sid,
-						'RID'  => $row['nzb_guid'],
-						'BODY' => $row['text']
-					)
-				),
-				'<anon@anon.com>'
-			);
-
-			// Check if we succesfully uploaded it.
-			if ($this->nntp->isError($success) === false && $success === true) {
-
-				// Update DB to say we posted the article.
-				$this->pdo->queryExec(
-					sprintf('
-						UPDATE releasecomment
-						SET shared = 1, shareid = %s
-						WHERE id = %d',
-						$this->pdo->escapeString($sid),
-						$row['id']
-					)
-				);
-
-				echo '.';
-
-			}
-		} else {
-			// Update the DB to say it's shared.
-			$this->pdo->queryExec(sprintf('UPDATE releasecomment SET shared = 1 WHERE id = %d', $row['id']));
-		}
-	}
-
-	/**
-	 * Match added comments to releases.
-	 */
-	protected function matchComments()
-	{
-		$res = $this->pdo->query('
-			SELECT r.id, r.nzb_guid
-			FROM releases r
-			INNER JOIN releasecomment rc ON rc.nzb_guid = r.nzb_guid
-			WHERE rc.releaseid = 0'
-		);
-
-		$found = count($res);
-		if ($found > 0) {
-			foreach ($res as $row) {
-				$this->pdo->queryExec(
-					sprintf(
-						"UPDATE releasecomment SET releaseid = %d WHERE nzb_guid = %s",
-						$row['id'],
-						$this->pdo->escapeString($row['nzb_guid'])
-					)
-				);
-				$this->pdo->queryExec(sprintf('UPDATE releases SET comments = comments + 1 WHERE id = %d', $row['id']));
-			}
-
-			echo '(Sharing) Matched ' . $found . ' comments.' . PHP_EOL;
-
-		}
-	}
-
-	/**
-	 * Get all new comments from usenet.
-	 *
-	 * @access protected
-	 */
-	protected function fetchAll()
-	{
-		// Get NNTP group data.
-		$group = $this->nntp->selectGroup(self::group, false, true);
-
-		// Check if there's an issue.
-		if ($this->nntp->isError($group)) {
-			return;
-		}
-
-		// Check if this is the first time, set our oldest article.
-		if ($this->siteSettings['last_article'] == 0) {
-			// If the user picked to start from the oldest, get the oldest.
-			if ($this->siteSettings['start_position'] === true) {
-				$this->siteSettings['last_article'] = $ourOldest = $group['first'];
-				// Else get the newest.
-			} else {
-				$this->siteSettings['last_article'] = $ourOldest = (string)($group['last'] - $this->siteSettings['max_download']);
-				if ($ourOldest < $group['first']) {
-					$this->siteSettings['last_article'] = $ourOldest = $group['first'];
-				}
-			}
-		} else {
-			$ourOldest = (string)($this->siteSettings['last_article'] + 1);
-		}
-
-		// Set our newest to our oldest wanted + max pull setting.
-		$newest = (string)($ourOldest + $this->siteSettings['max_pull']);
-
-		// Check if our newest wanted is newer than the group's newest, set to group's newest.
-		if ($newest >= $group['last']) {
-			$newest = $group['last'];
-		}
-
-		// We have nothing to do, so return.
-		if ($ourOldest > $newest) {
-			return;
-		}
-
-		if (NN_ECHOCLI) {
-			echo '(Sharing) Starting to fetch new comments.' . PHP_EOL;
-		}
-
-		// Get the wanted aritcles
-		$headers = $this->nntp->getOverview($ourOldest . '-' . $newest, true, false);
-
-		// Check if we received nothing or there was an error.
-		if ($this->nntp->isError($headers) || count($headers) === 0) {
-			return;
-		}
-
-		$found = $total = $currentArticle = 0;
-		// Loop over NNTP headers until we find comments.
-		foreach ($headers as $header) {
-
-			// Check if the article is missing.
-			if (!isset($header['Number'])) {
-				continue;
-			}
-
-			// Get the current article number.
-			$currentArticle = $header['Number'];
-
-			// Break out of the loop if we have downloaded more comments than the user wants.
-			if ($found > $this->siteSettings['max_download']) {
-				break;
-			}
-
-			$matches = [];
-			//(_nZEDb_)nZEDb_533f16e46a5091.73152965_3d12d7c1169d468aaf50d5541ef02cc88f3ede10 - [1/1] "92ba694cebc4fbbd0d9ccabc8604c71b23af1131" (1/1) yEnc
-			if ($header['From'] === '<anon@anon.com>' &&
-				preg_match('/^\(_nZEDb_\)(?P<site>.+?)_(?P<guid>[a-f0-9]{40}) - \[1\/1\] "(?P<sid>[a-f0-9]{40})" yEnc \(1\/1\)$/i', $header['Subject'], $matches)) {
-
-				// Check if this is from our own site.
-				if ($matches['guid'] === $this->siteSettings['site_guid']) {
-					continue;
-				}
-
-				// Check if we already have the comment.
-				$check = $this->pdo->queryOneRow(
-					sprintf('SELECT id FROM releasecomment WHERE shareid = %s',
-						$this->pdo->escapeString($matches['sid'])
-					)
-				);
-
-				// We don't have it, so insert it.
-				if ($check === false) {
-
-					// Check if we have the site and if it is enabled.
-					$check = $this->pdo->queryOneRow(
-						sprintf('SELECT enabled FROM sharing_sites WHERE site_guid = %s',
-							$this->pdo->escapeString($matches['guid'])
-						)
-					);
-
-					if ($check === false) {
-						// Check if the user has auto enable on.
-						if ($this->siteSettings['auto_enable'] === false) {
-							// Insert the site so the admin can enable it later on.
-							$this->pdo->queryExec(
-								sprintf('
-									INSERT INTO sharing_sites
-									(site_name, site_guid, last_time, first_time, enabled, comments)
-									VALUES (%s, %s, NOW(), NOW(), 0, 0)',
-									$this->pdo->escapeString($matches['site']),
-									$this->pdo->escapeString($matches['guid'])
-								)
-							);
-							continue;
-						} else {
-							// Insert the site as enabled since the user has auto enabled on.
-							$this->pdo->queryExec(
-								sprintf('
-									INSERT INTO sharing_sites
-									(site_name, site_guid, last_time, first_time, enabled, comments)
-									VALUES (%s, %s, NOW(), NOW(), 1, 0)',
-									$this->pdo->escapeString($matches['site']),
-									$this->pdo->escapeString($matches['guid'])
-								)
-							);
-						}
-					} else {
-						// The user has disabled this site, so continue.
-						if ($check['enabled'] == 0) {
-							continue;
-						}
-					}
-
-					// Insert the comment, if we got it, update the site to increment comment count.
-					if ($this->insertNewComment($header['Message-id'], $matches['guid'])) {
-						$this->pdo->queryExec(
-							sprintf('
-								UPDATE sharing_sites SET comments = comments + 1, last_time = NOW(), site_name = %s WHERE site_guid = %s',
-								$this->pdo->escapeString($matches['site']),
-								$this->pdo->escapeString($matches['guid'])
-							)
-						);
-						$found++;
-						if (NN_ECHOCLI) {
-							echo '.';
-							if ($found % 40 == 0) {
-								echo '[' . $found . ']' . PHP_EOL;
-							}
-						}
-					}
-				}
-			}
-			// Update once in a while in case the user cancels the script.
-			if ($total++ % 10 == 0) {
-				$this->siteSettings['lastarticle'] = $currentArticle;
-				$this->pdo->queryExec(sprintf('UPDATE sharing SET last_article = %d', $currentArticle));
-			}
-		}
-
-		if ($currentArticle > 0) {
-			// Update sharing's last article number.
-			$this->siteSettings['lastarticle'] = $currentArticle;
-			$this->pdo->queryExec(sprintf('UPDATE sharing SET last_article = %d', $currentArticle));
-		}
-
-		if (NN_ECHOCLI) {
-			if ($found > 0) {
-				echo PHP_EOL . '(Sharing) Fetched ' . $found . ' new comments.' . PHP_EOL;
-			} else {
-				echo '(Sharing) Finish looking for new comments, but did not find any.' . PHP_EOL;
-			}
-		}
-	}
-
-	/**
-	 * Fetch a comment and insert it.
-	 *
-	 * @param string $messageID Message-id for the article.
-	 * @param string $siteID    id of the site.
-	 *
-	 * @return bool
-	 */
-	protected function insertNewComment(&$messageID, &$siteID)
-	{
-		// Get the article body.
-		$body = $this->nntp->getMessages(self::group, $messageID);
-
-		// Check if there's an error.
-		if ($this->nntp->isError($body)) {
-			return false;
-		}
-
-		// Decompress the body.
-		$body = @gzinflate($body);
-		if ($body === false) {
-			return false;
-		}
-
-		// JSON Decode the body.
-		$body = json_decode($body, true);
-		if ($body === false) {
-			return false;
-		}
-
-		// Just in case.
-		if (!isset($body['USER']) || !isset($body['SID']) || !isset($body['RID']) || !isset($body['TIME']) | !isset($body['BODY'])) {
-			return false;
-		}
-		$cid = md5($body['SID'].$body['USER'].$body['TIME'].$siteID);
-
-		// Insert the comment.
-		if ($this->pdo->queryExec(
-			sprintf('
-				INSERT IGNORE INTO releasecomment
-				(text, createddate, issynced, shareid, cid, gid, nzb_guid, siteid, username, userid, releaseid, shared, host, sourceid)
-				VALUES (%s, %s, 1, %s, %s, %s, %s, %s, %s, 0, 0, 2, "", 999)',
-				$this->pdo->escapeString($body['BODY']),
-				$this->pdo->from_unixtime(($body['TIME'] > time() ? time() : $body['TIME'])),
-				$this->pdo->escapeString($body['SID']),
-				$this->pdo->escapeString($cid),
-				$this->pdo->escapeString($body['RID']),
-				$this->pdo->escapeString($body['RID']),
-				$this->pdo->escapeString($siteID),
-				$this->pdo->escapeString((substr($body['USER'], 0, 3) === 'sn-' ? 'SH_ANON' : 'SH_' . $body['USER']))
-			)
-		)
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/TraktTv.php b/lib/TraktTv.php
deleted file mode 100644
index 1b687162c..000000000
--- a/lib/TraktTv.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-require_once(WWW_DIR . '/lib/framework/db.php');
-require_once(WWW_DIR . '/lib/Tmux.php');
-require_once(WWW_DIR . '/lib/util.php');
-
-/**
- * Class TraktTv
- * Lookup information from trakt.tv using their API.
- */
-Class TraktTv
-{
-	private $APIKEY;
-
-	/**
-	 * Construct. Set up API key.
-	 *
-	 * @param array $options Class instances.
-	 *
-	 * @access public
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$settings = ($options['Settings'] instanceof Sites ? $options['Settings'] : new Sites());
-		$this->APIKEY = $settings->get()->trakttvkey;
-	}
-
-	/**
-	 * Fetches summary from trakt.tv for the TV show using the title/season/episode.
-	 *
-	 * @param string $title
-	 * @param string $season
-	 * @param string $ep
-	 *
-	 * @return bool|mixed
-	 *
-	 * @access public
-	 */
-	public function traktTVSEsummary($title = '', $season = '', $ep = '')
-	{
-		if (!empty($this->APIKEY)) {
-			$TVjson = Utility::getUrl([
-					'url' =>
-						'http://api.trakt.tv/show/episode/summary.json/' .
-						$this->APIKEY . '/' .
-						str_replace([' ', '_', '.'], '-', $title) . '/' .
-						str_replace(['S', 's'], '', $season) . '/' .
-						str_replace(['E', 'e'], '', $ep)
-				]
-			);
-
-			if ($TVjson !== false) {
-				return json_decode($TVjson, true);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Fetches summary from trakt.tv for the movie.
-	 * Accept a title (the-big-lebowski-1998), a IMDB id, or a TMDB id.
-	 *
-	 * @param string $movie Title or IMDB id.
-	 * @param bool $array   Return the full array or just the IMDB id.
-	 *
-	 * @return bool|mixed
-	 *
-	 * @access public
-	 */
-	public function traktMoviesummary($movie = '', $array=false)
-	{
-		if (!empty($this->APIKEY)) {
-			$MovieJson = Utility::getUrl([
-					'url' =>
-						'http://api.trakt.tv/movie/summary.json/' .
-						$this->APIKEY .
-						'/' .
-						str_replace([' ', '_', '.'], '-',  str_replace(['(', ')'], '', $movie))
-				]
-			);
-
-			if ($MovieJson !== false) {
-				$MovieJson = json_decode($MovieJson, true);
-				if (isset($MovieJson['status']) && $MovieJson['status'] === 'failure') {
-					return false;
-				}
-
-				if ($array) {
-					return $MovieJson;
-				} elseif (isset($MovieJson["imdb_id"])) {
-					return $MovieJson["imdb_id"];
-				}
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/lib/TvAnger.php b/lib/TvAnger.php
deleted file mode 100644
index e1c269753..000000000
--- a/lib/TvAnger.php
+++ /dev/null
@@ -1,1154 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/Logger.php");
-require_once("TraktTv.php");
-
-/**
- * Class TvAnger
- */
-class TvAnger
-{
-	const APIKEY = '7FwjZ8loweFcOhHfnU3E';
-	const MATCH_PROBABILITY = 75;
-
-	/**
-	 * @var Settings
-	 */
-	public $pdo;
-
-	public $echooutput;
-	public $rageqty;
-	public $showInfoUrl         = 'http://www.tvrage.com/shows/id-';
-	public $showQuickInfoURL    = 'http://services.tvrage.com/tools/quickinfo.php?show=';
-	public $xmlFullSearchUrl    = 'http://services.tvrage.com/feeds/full_search.php?show=';
-	public $xmlShowInfoUrl      = 'http://services.tvrage.com/feeds/showinfo.php?sid=';
-	public $xmlFullShowInfoUrl  = 'http://services.tvrage.com/feeds/full_show_info.php?sid=';
-	public $xmlEpisodeInfoUrl;
-	public $xmlFullScheduleUrl  = 'http://services.tvrage.com/feeds/fullschedule.php?country=';
-
-	/**
-	 * @param array $options Class instances / Echo to CLI.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->rageqty = ($this->site->maxrageprocessed != '') ? $this->site->maxrageprocessed : 75;
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-
-
-		$this->xmlEpisodeInfoUrl =
-			"http://services.tvrage.com/myfeeds/episodeinfo.php?key=" . \TvAnger::APIKEY;
-	}
-
-	/**
-	 * Get rage info for a id.
-	 *
-	 * @param int $id
-	 *
-	 * @return array|bool
-	 */
-	public function getByID($id)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM tvrage WHERE id = %d", $id));
-	}
-
-	/**
-	 * Get rage info for a rage id.
-	 *
-	 * @param int $id
-	 *
-	 * @return array
-	 */
-	public function getByRageID($id)
-	{
-		return $this->pdo->query(sprintf("SELECT * FROM tvrage WHERE rageid = %d", $id));
-	}
-
-	/**
-	 * Get rage info for a title.
-	 *
-	 * @param $title
-	 *
-	 * @return bool
-	 */
-	public function getByTitle($title)
-	{
-		// Set string to differentiate between mysql and PG for string replacement matching operations
-		$string = '"\'"';
-
-		// Check if we already have an entry for this show.
-		$res = $this->pdo->queryOneRow(sprintf("SELECT rageid FROM tvrage WHERE LOWER(releasetitle) = LOWER(%s)", $this->pdo->escapeString($title)));
-		if (isset($res['rageid'])) {
-			return $res['rageid'];
-		}
-
-		$title2 = str_replace(' and ', ' & ', $title);
-		if ($title != $title2) {
-			$res = $this->pdo->queryOneRow(sprintf("SELECT rageid FROM tvrage WHERE LOWER(releasetitle) = LOWER(%s)", $this->pdo->escapeString($title2)));
-			if (isset($res['rageid'])) {
-				return $res['rageid'];
-			}
-			$pieces = explode(' ', $title2);
-			$title4 = '%';
-			foreach ($pieces as $piece) {
-				$title4 .= str_replace(array("'", "!"), "", $piece) . '%';
-			}
-			$res = $this->pdo->queryOneRow(sprintf("SELECT rageid FROM tvrage WHERE replace(replace(releasetitle, %s, ''), '!', '') LIKE %s", $string ,$this->pdo->escapeString($title4)));
-			if (isset($res['rageid'])) {
-				return $res['rageid'];
-			}
-		}
-
-		// Some words are spelled correctly 2 ways
-		// example theatre and theater
-		$title3 = str_replace('er', 're', $title);
-		if ($title != $title3) {
-			$res = $this->pdo->queryOneRow(sprintf("SELECT rageid FROM tvrage WHERE LOWER(releasetitle) = LOWER(%s)", $this->pdo->escapeString($title3)));
-			if (isset($res['rageid'])) {
-				return $res['rageid'];
-			}
-			$pieces = explode(' ', $title3);
-			$title4 = '%';
-			foreach ($pieces as $piece) {
-				$title4 .= str_replace(array("'", "!"), "", $piece) . '%';
-			}
-			$res = $this->pdo->queryOneRow(sprintf("SELECT rageid FROM tvrage WHERE replace(replace(releasetitle, %s, ''), '!', '') LIKE %s", $string ,$this->pdo->escapeString($title4)));
-			if (isset($res['rageid'])) {
-				return $res['rageid'];
-			}
-		}
-
-		// If there was not an exact title match, look for title with missing chars
-		// example release name :Zorro 1990, tvrage name Zorro (1990)
-		// Only search if the title contains more than one word to prevent incorrect matches
-		$pieces = explode(' ', $title);
-		if (count($pieces) > 1) {
-			$title4 = '%';
-			foreach ($pieces as $piece) {
-				$title4 .= str_replace(array("'", "!"), "", $piece) . '%';
-			}
-			$res = $this->pdo->queryOneRow(sprintf("SELECT rageid FROM tvrage WHERE replace(replace(releasetitle, %s, ''), '!', '') LIKE %s", $string, $this->pdo->escapeString($title4)));
-			if (isset($res['rageid'])) {
-				return $res['rageid'];
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get a country code for a country name.
-	 *
-	 * @param string $country
-	 *
-	 * @return mixed
-	 */
-	public function countryCode($country)
-	{
-		if (!is_array($country) && strlen($country) > 2) {
-			$code = $this->pdo->queryOneRow(
-				'SELECT code FROM countries WHERE LOWER(name) = LOWER(' . $this->pdo->escapeString($country) . ')'
-			);
-			if (isset($code['code'])) {
-				return $code['code'];
-			}
-		}
-		return $country;
-	}
-
-	public function add($rageID, $releasename, $desc, $genre, $country, $imgbytes)
-	{
-		$releasename = str_replace(array('.', '_'), array(' ', ' '), $releasename);
-		$country = $this->countryCode($country);
-
-		if ($rageID != -2) {
-			$ckid = $this->pdo->queryOneRow('SELECT id FROM tvrage WHERE rageid = ' . $rageID);
-		} else {
-			$ckid = $this->pdo->queryOneRow('SELECT id FROM tvrage WHERE releasetitle = ' . $this->pdo->escapeString($releasename));
-		}
-
-		if (!isset($ckid['id'])) {
-			$this->pdo->queryExec(sprintf('INSERT INTO tvrage (rageid, releasetitle, description, genre, country, createddate, imgdata) VALUES (%s, %s, %s, %s, %s, NOW(), %s)', $rageID, $this->pdo->escapeString($releasename), $this->pdo->escapeString(substr($desc, 0, 10000)), $this->pdo->escapeString(substr($genre, 0, 64)), $this->pdo->escapeString($country), $this->pdo->escapeString($imgbytes)));
-		} else {
-			$this->pdo->queryExec(sprintf('UPDATE tvrage SET releasetitle = %s, description = %s, genre = %s, country = %s, createddate = NOW(), imgdata = %sWHERE id = %d', $this->pdo->escapeString($releasename), $this->pdo->escapeString(substr($desc, 0, 10000)), $this->pdo->escapeString(substr($genre, 0, 64)), $this->pdo->escapeString($country), $this->pdo->escapeString($imgbytes), $ckid['id']));
-		}
-	}
-
-	public function update($id, $rageID, $releasename, $desc, $genre, $country, $imgbytes)
-	{
-		$country = $this->countryCode($country);
-		if ($imgbytes != '') {
-			$imgbytes = ', imgdata = ' . $this->pdo->escapeString($imgbytes);
-		}
-
-		$this->pdo->queryExec(sprintf('UPDATE tvrage SET rageid = %d, releasetitle = %s, description = %s, genre = %s, country = %s %sWHERE id = %d', $rageID, $this->pdo->escapeString($releasename), $this->pdo->escapeString(substr($desc, 0, 10000)), $this->pdo->escapeString($genre), $this->pdo->escapeString($country), $imgbytes, $id));
-	}
-
-	public function delete($id)
-	{
-		return $this->pdo->queryExec(sprintf("DELETE FROM tvrage WHERE id = %d", $id));
-	}
-
-	public function fetchShowQuickInfo($show, array $options = array())
-	{
-		$defaults = array('exact' => '', 'episode' => '');
-		$options += $defaults;
-		$ret = [];
-
-		if (!$show) {
-			return false;
-		}
-
-		$url = $this->showQuickInfoURL . urlencode($show);
-		$url .= !empty($options['episode']) ? '&ep=' . urlencode($options['episode']) : '';
-		$url .= !empty($options['exact']) ? '&exact=' . urlencode($options['exact']) : '';
-		$fp = fopen($url, "r", false, stream_context_create(streamSslContextOptions()));
-		if ($fp) {
-			while (!feof($fp)) {
-				$line = fgets($fp, 1024);
-				list ($sec, $val) = explode('@', $line, 2);
-				$val = trim($val);
-
-				switch ($sec) {
-					case 'Show id':
-						$ret['rageid'] = $val;
-						break;
-					case 'Show Name':
-						$ret['name'] = $val;
-						break;
-					case 'Show URL':
-						$ret['url'] = $val;
-						break;
-					case 'Premiered':
-						$ret['premier'] = $val;
-						break;
-					case 'Country':
-						$ret['country'] = $val;
-						break;
-					case 'Status':
-						$ret['status'] = $val;
-						break;
-					case 'Classification':
-						$ret['classification'] = $val;
-						break;
-					case 'Genres':
-						$ret['genres'] = $val;
-						break;
-					case 'Network':
-						$ret['network'] = $val;
-						break;
-					case 'Airtime':
-						$ret['airtime'] = $val;
-						break;
-					case 'Latest Episode':
-						list ($ep, $title, $airdate) = explode('^', $val);
-						$ret['episode']['latest'] =
-							$ep . ", \"" . $title . "\" aired on " . $airdate;
-						break;
-					case 'Next Episode':
-						list ($ep, $title, $airdate) = explode('^', $val);
-						$ret['episode']['next'] = $ep . ", \"" . $title . "\" airs on " . $airdate;
-						break;
-					case 'Episode Info':
-						list ($ep, $title, $airdate) = explode('^', $val);
-						$ret['episode']['info'] = $ep . ", \"" . $title . "\" aired on " . $airdate;
-						break;
-					case 'Episode URL':
-						$ret['episode']['url'] = $val;
-						break;
-					case '':
-						break;
-
-					default:
-						break;
-				}
-			}
-			fclose($fp);
-
-			return $ret;
-		}
-		return false;
-	}
-
-	public function getRange($start, $num, $ragename = "")
-	{
-		if ($start === false) {
-			$limit = "";
-		} else {
-			$limit = " LIMIT " . $num . " OFFSET " . $start;
-		}
-
-		$rsql = '';
-		if ($ragename != "") {
-			$rsql .= sprintf("AND tvrage.releasetitle LIKE %s ", $this->pdo->escapeString("%" . $ragename . "%"));
-		}
-
-		return $this->pdo->query(sprintf("SELECT id, rageid, releasetitle, description, createddate FROM tvrage WHERE 1=1 %s ORDER BY rageid ASC" . $limit, $rsql));
-	}
-
-	public function getCount($ragename = "")
-	{
-		$rsql = '';
-		if ($ragename != "") {
-			$rsql .= sprintf("AND tvrage.releasetitle LIKE %s ", $this->pdo->escapeString("%" . $ragename . "%"));
-		}
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT COUNT(id) AS num FROM tvrage WHERE 1=1 %s", $rsql));
-		return $res["num"];
-	}
-
-	public function getCalendar($date = "")
-	{
-		if (!preg_match('/\d{4}-\d{2}-\d{2}/', $date)) {
-			$date = date("Y-m-d");
-		}
-		$sql = sprintf("SELECT * FROM tvrageepisodes WHERE DATE(airdate) = %s ORDER BY airdate ASC", $this->pdo->escapeString($date));
-		return $this->pdo->query($sql);
-	}
-
-	public function getSeriesList($uid, $letter = "", $ragename = "")
-	{
-		$rsql = '';
-		if ($letter != "") {
-			if ($letter == '0-9') {
-				$letter = '[0-9]';
-			}
-
-			$rsql .= sprintf("AND tvrage.releasetitle REGEXP %s", $this->pdo->escapeString('^' . $letter));
-		}
-		$tsql = '';
-		if ($ragename != '') {
-			$tsql .= sprintf("AND tvrage.releasetitle LIKE %s", $this->pdo->escapeString("%" . $ragename . "%"));
-		}
-
-		return $this->pdo->query(
-			sprintf("
-				SELECT tvrage.id, tvrage.rageid, tvrage.releasetitle, tvrage.genre, tvrage.country, tvrage.createddate, tvrage.prevdate, tvrage.nextdate,
-					userseries.id AS userseriesid
-				FROM tvrage
-				LEFT OUTER JOIN userseries ON userseries.userid = %d
-					AND userseries.rageid = tvrage.rageid
-				WHERE tvrage.rageid IN (SELECT DISTINCT rageid FROM releases WHERE categoryid BETWEEN 5000 AND 5999 AND rageid > 0)
-				AND tvrage.rageid > 0 %s %s
-				GROUP BY tvrage.rageid
-				ORDER BY tvrage.releasetitle ASC",
-				$uid,
-				$rsql,
-				$tsql
-			)
-		);
-	}
-
-	public function updateSchedule()
-	{
-		$countries = $this->pdo->query("SELECT DISTINCT(country) AS country FROM tvrage WHERE country != ''");
-		$showsindb = $this->pdo->query("SELECT DISTINCT(rageid) AS rageid FROM tvrage");
-		$showarray = array();
-		foreach ($showsindb as $show) {
-			$showarray[] = $show['rageid'];
-		}
-		foreach ($countries as $country) {
-			if ($this->echooutput) {
-				echo $this->pdo->log->headerOver('Updating schedule for: ') . $this->pdo->log->primary($country['country']);
-			}
-
-			$sched = Utility::getURL(['url' => $this->xmlFullScheduleUrl . $country['country']]);
-			if ($sched !== false && ($xml = @simplexml_load_string($sched))) {
-				$tzOffset = 60 * 60 * 6;
-				$yesterday = strtotime("-1 day") - $tzOffset;
-				$xmlSchedule = array();
-
-				foreach ($xml->DAY as $sDay) {
-					$currDay = strtotime($sDay['attr']);
-					foreach ($sDay as $sTime) {
-						$currTime = (string) $sTime['attr'];
-						foreach ($sTime as $sShow) {
-							$currShowName = (string) $sShow['name'];
-							$currShowId = (string) $sShow->sid;
-							$day_time = strtotime($sDay['attr'] . ' ' . $currTime);
-							$tag = ($currDay < $yesterday) ? 'prev' : 'next';
-							if ($tag == 'prev' || ($tag == 'next' && !isset($xmlSchedule[$currShowId]['next']))) {
-								$xmlSchedule[$currShowId][$tag] = array('name' => $currShowName, 'day' => $currDay, 'time' => $currTime, 'day_time' => $day_time, 'day_date' => date("Y-m-d H:i:s", $day_time), 'title' => html_entity_decode((string) $sShow->title, ENT_QUOTES, 'UTF-8'), 'episode' => html_entity_decode((string) $sShow->ep, ENT_QUOTES, 'UTF-8'));
-								$xmlSchedule[$currShowId]['showname'] = $currShowName;
-							}
-
-							// Only add it here, no point adding it to tvrage aswell that will automatically happen when an ep gets posted.
-							if ($sShow->ep == "01x01") {
-								$showarray[] = $sShow->sid;
-							}
-
-							// Only stick current shows and new shows in there.
-							if (in_array($currShowId, $showarray)) {
-								$this->pdo->queryExec(sprintf("INSERT INTO tvrageepisodes (rageid, showtitle, fullep, airdate, link, eptitle) VALUES (%d, %s, %s, %s, %s, %s) ON DUPLICATE KEY UPDATE airdate = %s, link = %s ,eptitle = %s, showtitle = %s", $sShow->sid, $this->pdo->escapeString($currShowName), $this->pdo->escapeString($sShow->ep), $this->pdo->escapeString(date("Y-m-d H:i:s", $day_time)), $this->pdo->escapeString($sShow->link), $this->pdo->escapeString($sShow->title), $this->pdo->escapeString(date("Y-m-d H:i:s", $day_time)), $this->pdo->escapeString($sShow->link), $this->pdo->escapeString($sShow->title), $this->pdo->escapeString($currShowName)));
-							}
-						}
-					}
-				}
-				// Update series info.
-				foreach ($xmlSchedule as $showId => $epInfo) {
-					$res = $this->pdo->query(sprintf("SELECT * FROM tvrage WHERE rageid = %d", $showId));
-					if (sizeof($res) > 0) {
-						foreach ($res as $arr) {
-							$prev_ep = $next_ep = "";
-							$query = array();
-
-							// Previous episode.
-							if (isset($epInfo['prev']) && $epInfo['prev']['episode'] != '') {
-								$prev_ep = $epInfo['prev']['episode'] . ', "' . $epInfo['prev']['title'] . '"';
-								$query[] = sprintf("prevdate = %s, previnfo = %s", $this->pdo->from_unixtime($epInfo['prev']['day_time']), $this->pdo->escapeString($prev_ep));
-							}
-
-							// Next episode.
-							if (isset($epInfo['next']) && $epInfo['next']['episode'] != '') {
-								if ($prev_ep == "" && $arr['nextinfo'] != '' && $epInfo['next']['day_time'] > strtotime($arr["nextdate"]) && strtotime(date('Y-m-d', strtotime($arr["nextdate"]))) < $yesterday) {
-									$this->pdo->queryExec(sprintf("UPDATE tvrage SET prevdate = nextdate, previnfo = nextinfo  WHERE id = %d", $arr['id']));
-									$prev_ep = "SWAPPED with: " . $arr['nextinfo'] . " - " . date("r", strtotime($arr["nextdate"]));
-								}
-								$next_ep = $epInfo['next']['episode'] . ', "' . $epInfo['next']['title'] . '"';
-								$query[] = sprintf("nextdate = %s, nextinfo = %s ", $this->pdo->from_unixtime($epInfo['next']['day_time']), $this->pdo->escapeString($next_ep));
-							} else {
-								$query[] = "nextdate = NULL, nextinfo = NULL ";
-							}
-
-							// Output.
-							if ($this->echooutput) {
-								echo $this->pdo->log->primary($epInfo['showname'] . " (" . $showId . "):");
-								if (isset($epInfo['prev']['day_time'])) {
-									echo $this->pdo->log->headerOver("Prev EP: ") . $this->pdo->log->primary("{$prev_ep} - " . date("m/d/Y H:i T", $epInfo['prev']['day_time']));
-								}
-								if (isset($epInfo['next']['day_time'])) {
-									echo $this->pdo->log->headerOver("Next EP: ") . $this->pdo->log->primary("{$next_ep} - " . date("m/d/Y H:i T", $epInfo['next']['day_time']));
-								}
-								echo "\n";
-							}
-
-							// Update info.
-							if (count($query) > 0) {
-								$sql = join(", ", $query);
-								$sql = sprintf("UPDATE tvrage SET {$sql} WHERE id = %d", $arr['id']);
-								$this->pdo->queryExec($sql);
-							}
-						}
-					}
-				}
-			} else {
-				// No response from tvrage.
-				if ($this->echooutput) {
-					echo $this->pdo->log->info("Schedule not found.");
-				}
-			}
-		}
-		if ($this->echooutput) {
-			echo $this->pdo->log->primary("Updated the TVRage schedule succesfully.");
-		}
-	}
-
-	public function getEpisodeInfo($rageID, $series, $episode)
-	{
-		$result = array('title' => '', 'airdate' => '');
-
-		$series = str_ireplace("s", "", $series);
-		$episode = str_ireplace("e", "", $episode);
-		$xml = Utility::getUrl(['url' => $this->xmlEpisodeInfoUrl . "&sid=" . $rageID . "&ep=" . $series . "x" . $episode]);
-		if ($xml !== false) {
-			if (preg_match('/no show found/i', $xml)) {
-				return false;
-			}
-
-			$xmlObj = @simplexml_load_string($xml);
-			$arrXml = objectsIntoArray($xmlObj);
-			if (is_array($arrXml)) {
-				if (isset($arrXml['episode']['airdate']) && $arrXml['episode']['airdate'] != '0000-00-00') {
-					$result['airdate'] = $arrXml['episode']['airdate'];
-				}
-				if (isset($arrXml['episode']['title'])) {
-					$result['title'] = $arrXml['episode']['title'];
-				}
-
-				return $result;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	public function getRageInfoFromPage($rageID)
-	{
-		$result = array('desc' => '', 'imgurl' => '');
-		$page =Utility::getUrl(['url' => $this->showInfoUrl . $rageID]);
-		$matches = '';
-		if ($page !== false) {
-			// Description.
-			preg_match('@<div class="show_synopsis">(.*?)</div>@is', $page, $matches);
-			if (isset($matches[1])) {
-				$desc = $matches[1];
-				$desc = preg_replace('/<hr>.*/s', '', $desc);
-				$desc = preg_replace('/&nbsp;?/', '', $desc);
-				$desc = preg_replace('/<br>(\n)?<br>/', ' / ', $desc);
-				$desc = preg_replace('/\n/', ' ', $desc);
-				$desc = preg_replace('/<a href.*?<\/a>/', '', $desc);
-				$desc = preg_replace('/<script.*?<\/script>/', '', $desc);
-				$desc = preg_replace('/<.*?>/', '', $desc);
-				$desc = str_replace('()', '', $desc);
-				$desc = trim(preg_replace('/\s{2,}/', ' ', $desc));
-				$result['desc'] = $desc;
-			}
-			// Image.
-			preg_match("@src=[\"'](http://images.tvrage.com/shows.*?)[\"']@i", $page, $matches);
-			if (isset($matches[1])) {
-				$result['imgurl'] = $matches[1];
-			}
-		}
-		return $result;
-	}
-
-	public function getRageInfoFromService($rageID)
-	{
-		$result = array('genres' => '', 'country' => '', 'showid' => $rageID);
-		// Full search gives us the akas.
-		$xml =Utility::getUrl(['url' => $this->xmlShowInfoUrl . $rageID]);
-		if ($xml !== false) {
-			$arrXml = objectsIntoArray(simplexml_load_string($xml));
-			if (is_array($arrXml)) {
-				$result['genres'] = (isset($arrXml['genres'])) ? $arrXml['genres'] : '';
-				$result['country'] = (isset($arrXml['origin_country'])) ? $arrXml['origin_country'] : '';
-				$result = $this->countryCode($result);
-				return $result;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	// Convert 2012-24-07 to 2012-07-24, there is probably a better way
-	public function checkDate($date)
-	{
-		if (!empty($date) && $date != NULL) {
-			$chk = explode(" ", $date);
-			$chkd = explode("-", $chk[0]);
-			if ($chkd[1] > 12) {
-				$date = date('Y-m-d H:i:s', strtotime($chkd[1] . " " . $chkd[2] . " " . $chkd[0]));
-			}
-			return $date;
-		}
-		return NULL;
-	}
-
-	public function updateEpInfo($show, $relid)
-	{
-		if ($this->echooutput) {
-			echo $this->pdo->log->headerOver("Updating Episode: ") . $this->pdo->log->primary($show['cleanname'] . " " . $show['seriesfull'] . (($show['year'] != '') ? ' ' . $show['year'] : '') . (($show['country'] != '') ? ' [' . $show['country'] . ']' : ''));
-		}
-
-		$tvairdate = (isset($show['airdate']) && !empty($show['airdate'])) ? $this->pdo->escapeString($this->checkDate($show['airdate'])) : "NULL";
-		$this->pdo->queryExec(sprintf("UPDATE releases SET seriesfull = %s, season = %s, episode = %s, tvairdate = %s WHERE id = %d", $this->pdo->escapeString($show['seriesfull']), $this->pdo->escapeString($show['season']), $this->pdo->escapeString($show['episode']), $tvairdate, $relid));
-	}
-
-	public function updateRageInfo($rageID, $show, $tvrShow, $relid)
-	{
-		// Try and get the episode specific info from tvrage.
-		$epinfo = $this->getEpisodeInfo($rageID, $show['season'], $show['episode']);
-		if ($epinfo !== false) {
-			$tvairdate = (!empty($epinfo['airdate'])) ? $this->pdo->escapeString($epinfo['airdate']) : "NULL";
-			$tvtitle = (!empty($epinfo['title'])) ? $this->pdo->escapeString($epinfo['title']) : "NULL";
-
-			$this->pdo->queryExec(sprintf("UPDATE releases set tvtitle = %s, tvairdate = %s, rageid = %d where id = %d", $this->pdo->escapeString(trim($tvtitle)), $tvairdate, $tvrShow['showid'], $relid));
-		} else {
-			$this->pdo->queryExec(sprintf("UPDATE releases SET rageid = %d WHERE id = %d", $tvrShow['showid'], $relid));
-		}
-
-		$genre = '';
-		if (isset($tvrShow['genres']) && is_array($tvrShow['genres']) && !empty($tvrShow['genres'])) {
-			if (is_array($tvrShow['genres']['genre'])) {
-				$genre = implode('|', $tvrShow['genres']['genre']);
-			} else {
-				$genre = $tvrShow['genres']['genre'];
-			}
-		}
-
-		$country = '';
-		if (isset($tvrShow['country']) && !empty($tvrShow['country'])) {
-			$country = $this->countryCode($tvrShow['country']);
-		}
-
-		$rInfo = $this->getRageInfoFromPage($rageID);
-		$desc = '';
-		if (isset($rInfo['desc']) && !empty($rInfo['desc'])) {
-			$desc = $rInfo['desc'];
-		}
-
-		$imgbytes = '';
-		if (isset($rInfo['imgurl']) && !empty($rInfo['imgurl'])) {
-			$img = Utility::getUrl(['url' => $rInfo['imgurl']]);
-			if ($img !== false) {
-				$im = @imagecreatefromstring($img);
-				if ($im !== false) {
-					$imgbytes = $img;
-				}
-			}
-		}
-		$this->add($rageID, $show['cleanname'], $desc, $genre, $country, $imgbytes);
-	}
-
-	public function updateRageInfoTrakt($rageID, $show, $traktArray, $relid)
-	{
-		// Try and get the episode specific info from tvrage.
-		$epinfo = $this->getEpisodeInfo($rageID, $show['season'], $show['episode']);
-		if ($epinfo !== false) {
-			$tvairdate = (!empty($epinfo['airdate'])) ? $this->pdo->escapeString($epinfo['airdate']) : "NULL";
-			$tvtitle = (!empty($epinfo['title'])) ? $this->pdo->escapeString($epinfo['title']) : "NULL";
-			$this->pdo->queryExec(sprintf("UPDATE releases SET tvtitle = %s, tvairdate = %s, rageid = %d WHERE id = %d", $this->pdo->escapeString(trim($tvtitle)), $tvairdate, $traktArray['show']['tvrage_id'], $relid));
-		} else {
-			$this->pdo->queryExec(sprintf("UPDATE releases SET rageid = %d WHERE id = %d", $traktArray['show']['tvrage_id'], $relid));
-		}
-
-		$genre = '';
-		if (isset($traktArray['show']['genres']) && is_array($traktArray['show']['genres']) && !empty($traktArray['show']['genres'])) {
-			$genre = $traktArray['show']['genres']['0'];
-		}
-
-		$country = '';
-		if (isset($traktArray['show']['country']) && !empty($traktArray['show']['country'])) {
-			$country = $this->countryCode($traktArray['show']['country']);
-		}
-
-		$rInfo = $this->getRageInfoFromPage($rageID);
-		$desc = '';
-		if (isset($rInfo['desc']) && !empty($rInfo['desc'])) {
-			$desc = $rInfo['desc'];
-		}
-
-		$imgbytes = '';
-		if (isset($rInfo['imgurl']) && !empty($rInfo['imgurl'])) {
-			$img = Utility::getUrl(['url' => $rInfo['imgurl']]);
-			if ($img !== false) {
-				$im = @imagecreatefromstring($img);
-				if ($im !== false) {
-					$imgbytes = $img;
-				}
-			}
-		}
-
-		$this->add($rageID, $show['cleanname'], $desc, $genre, $country, $imgbytes);
-	}
-
-	public function processTvReleases($groupID = '', $guidChar = '', $lookupTvRage = 1, $local = false)
-	{
-		$ret = 0;
-		if ($lookupTvRage == 0) {
-			return $ret;
-		}
-		$trakt = new \TraktTv(['Settings' => $this->pdo]);
-
-		// Get all releases without a rageid which are in a tv category.
-
-		$res = $this->pdo->query(
-			sprintf("
-				SELECT r.searchname, r.id
-				FROM releases r
-				WHERE r.nzbstatus = 1
-				AND r.rageid = -1
-				AND r.size > 1048576
-				AND r.categoryid BETWEEN 5000 AND 5999
-				%s %s %s
-				ORDER BY r.postdate DESC
-				LIMIT %d",
-				($groupID === '' ? '' : 'AND r.groupid = ' . $groupID),
-				($guidChar === '' ? '' : 'AND r.guid ' . $this->pdo->likeString($guidChar, false, true)),
-				($lookupTvRage == 2 ? 'AND r.isrenamed = 1' : ''),
-				$this->rageqty
-			)
-		);
-		$tvcount = count($res);
-
-		if ($this->echooutput && $tvcount > 1) {
-			echo $this->pdo->log->header("Processing TV for " . $tvcount . " release(s).");
-		}
-
-		foreach ($res as $arr) {
-			$show = $this->parseNameEpSeason($arr['searchname']);
-			if (is_array($show) && $show['name'] != '') {
-				// Update release with season, ep, and airdate info (if available) from releasetitle.
-				$this->updateEpInfo($show, $arr['id']);
-
-				// Find the rageid.
-				$id = $this->getByTitle($show['cleanname']);
-
-				// Force local lookup only
-				if ($local == true) {
-					$lookupTvRage = false;
-				}
-
-				if ($id === false && $lookupTvRage) {
-					// If it doesnt exist locally and lookups are allowed lets try to get it.
-					if ($this->echooutput) {
-						echo $this->pdo->log->primaryOver("TVRage id for ") . $this->pdo->log->headerOver($show['cleanname']) . $this->pdo->log->primary(" not found in local db, checking web.");
-					}
-
-					$tvrShow = $this->getRageMatch($show);
-					if ($tvrShow !== false && is_array($tvrShow)) {
-						// Get all tv info and add show.
-						$this->updateRageInfo($tvrShow['showid'], $show, $tvrShow, $arr['id']);
-					} else if ($tvrShow === false) {
-						// If tvrage fails, try trakt.
-						$traktArray = $trakt->traktTVSEsummary($show['name'], $show['season'], $show['episode']);
-						if ($traktArray !== false) {
-							if (isset($traktArray['show']['tvrage_id']) && $traktArray['show']['tvrage_id'] !== 0) {
-								if ($this->echooutput) {
-									echo $this->pdo->log->primary('Found TVRage id on trakt:' . $traktArray['show']['tvrage_id']);
-								}
-								$this->updateRageInfoTrakt($traktArray['show']['tvrage_id'], $show, $traktArray, $arr['id']);
-							}
-							// No match, add to tvrage with rageid = -2 and $show['cleanname'] title only.
-							else {
-								$this->add(-2, $show['cleanname'], '', '', '', '');
-							}
-						}
-						// No match, add to tvrage with rageid = -2 and $show['cleanname'] title only.
-						else {
-							$this->add(-2, $show['cleanname'], '', '', '', '');
-						}
-					} else {
-						// $tvrShow probably equals -1 but we'll do this as a catchall instead of a specific else if.
-						// Skip because we couldnt connect to tvrage.com.
-					}
-				} else if ($id > 0) {
-					//if ($this->echooutput) {
-					//    echo $this->pdo->log->AlternateOver("TV series: ") . $this->pdo->log->header($show['cleanname'] . " " . $show['seriesfull'] . (($show['year'] != '') ? ' ' . $show['year'] : '') . (($show['country'] != '') ? ' [' . $show['country'] . ']' : ''));
-					// }
-					$tvairdate = (isset($show['airdate']) && !empty($show['airdate'])) ? $this->pdo->escapeString($this->checkDate($show['airdate'])) : "NULL";
-					$tvtitle = "NULL";
-
-					if ($lookupTvRage) {
-						$epinfo = $this->getEpisodeInfo($id, $show['season'], $show['episode']);
-						if ($epinfo !== false) {
-							if (isset($epinfo['airdate'])) {
-								$tvairdate = $this->pdo->escapeString($this->checkDate($epinfo['airdate']));
-							}
-
-							if (!empty($epinfo['title'])) {
-								$tvtitle = $this->pdo->escapeString(trim($epinfo['title']));
-							}
-						}
-					}
-					if ($tvairdate == "NULL") {
-						$this->pdo->queryExec(sprintf('UPDATE releases SET tvtitle = %s, rageid = %d WHERE id = %d', $tvtitle, $id, $arr['id']));
-					} else {
-						$this->pdo->queryExec(sprintf('UPDATE releases SET tvtitle = %s, tvairdate = %s, rageid = %d WHERE id = %d', $tvtitle, $tvairdate, $id, $arr['id']));
-					}
-					// Cant find rageid, so set rageid to n/a.
-				} else {
-					$this->pdo->queryExec(sprintf('UPDATE releases SET rageid = -2 WHERE id = %d', $arr['id']));
-				}
-				// Not a tv episode, so set rageid to n/a.
-			} else {
-				$this->pdo->queryExec(sprintf('UPDATE releases SET rageid = -2 WHERE id = %d', $arr['id']));
-			}
-			$ret++;
-		}
-		return $ret;
-	}
-
-	public function getRageMatch($showInfo)
-	{
-		$title = $showInfo['cleanname'];
-		// Full search gives us the akas.
-		$xml = Utility::getUrl(['url' => $this->xmlFullSearchUrl . urlencode(strtolower($title))]);
-		if ($xml !== false) {
-			$arrXml = @objectsIntoArray(simplexml_load_string($xml));
-			if (isset($arrXml['show']) && is_array($arrXml)) {
-				// We got a valid xml response
-				$titleMatches = $urlMatches = $akaMatches = array();
-
-				if (isset($arrXml['show']['showid'])) {
-					// We got exactly 1 match so lets convert it to an array so we can use it in the logic below.
-					$newArr = array();
-					$newArr[] = $arrXml['show'];
-					unset($arrXml);
-					$arrXml['show'] = $newArr;
-				}
-
-				foreach ($arrXml['show'] as $arr) {
-					$tvrlink = '';
-
-					// Get a match percentage based on our name and the name returned from tvr.
-					$titlepct = $this->checkMatch($title, $arr['name']);
-					if ($titlepct !== false) {
-						$titleMatches[$titlepct][] = array('title' => $arr['name'], 'showid' => $arr['showid'], 'country' => $this->countryCode($arr['country']), 'genres' => $arr['genres'], 'tvr' => $arr);
-					}
-
-					// Get a match percentage based on our name and the url returned from tvr.
-					if (isset($arr['link']) && preg_match('/tvrage\.com\/((?!shows)[^\/]*)$/i', $arr['link'], $tvrlink)) {
-						$urltitle = str_replace('_', ' ', $tvrlink[1]);
-						$urlpct = $this->checkMatch($title, $urltitle);
-						if ($urlpct !== false) {
-							$urlMatches[$urlpct][] = array('title' => $urltitle, 'showid' => $arr['showid'], 'country' => $this->countryCode($arr['country']), 'genres' => $arr['genres'], 'tvr' => $arr);
-						}
-					}
-
-					// Check if there are any akas for this result and get a match percentage for them too.
-					if (isset($arr['akas']['aka'])) {
-						if (is_array($arr['akas']['aka'])) {
-							// Multuple akas.
-							foreach ($arr['akas']['aka'] as $aka) {
-								$akapct = $this->checkMatch($title, $aka);
-								if ($akapct !== false) {
-									$akaMatches[$akapct][] = array('title' => $aka, 'showid' => $arr['showid'], 'country' => $this->countryCode($arr['country']), 'genres' => $arr['genres'], 'tvr' => $arr);
-								}
-							}
-						} else {
-							// One aka.
-							$akapct = $this->checkMatch($title, $arr['akas']['aka']);
-							if ($akapct !== false) {
-								$akaMatches[$akapct][] = array('title' => $arr['akas']['aka'], 'showid' => $arr['showid'], 'country' => $this->countryCode($arr['country']), 'genres' => $arr['genres'], 'tvr' => $arr);
-							}
-						}
-					}
-				}
-
-				// Reverse sort our matches so highest matches are first.
-				krsort($titleMatches);
-				krsort($urlMatches);
-				krsort($akaMatches);
-
-				// Look for 100% title matches first.
-				if (isset($titleMatches[100])) {
-					if ($this->echooutput) {
-						echo $this->pdo->log->primary('Found 100% match: "' . $titleMatches[100][0]['title'] . '"');
-					}
-					return $titleMatches[100][0];
-				}
-
-				// Look for 100% url matches next.
-				if (isset($urlMatches[100])) {
-					if ($this->echooutput) {
-						echo $this->pdo->log->primary('Found 100% url match: "' . $urlMatches[100][0]['title'] . '"');
-					}
-					return $urlMatches[100][0];
-				}
-
-				// Look for 100% aka matches next.
-				if (isset($akaMatches[100])) {
-					if ($this->echooutput) {
-						echo $this->pdo->log->primary('Found 100% aka match: "' . $akaMatches[100][0]['title'] . '"');
-					}
-					return $akaMatches[100][0];
-				}
-
-				// No 100% matches, loop through what we got and if our next closest match is more than TvAnger::MATCH_PROBABILITY % of the title lets take it.
-				foreach ($titleMatches as $mk => $mv) {
-					// Since its not 100 match if we have country info lets use that to make sure we get the right show.
-					if (isset($showInfo['country']) && !empty($showInfo['country']) && !empty($mv[0]['country'])) {
-						if (strtolower($showInfo['country']) != strtolower($mv[0]['country'])) {
-							continue;
-						}
-					}
-
-					if ($this->echooutput) {
-						echo $this->pdo->log->primary('Found ' . $mk . '% match: "' . $titleMatches[$mk][0]['title'] . '"');
-					}
-					return $titleMatches[$mk][0];
-				}
-
-				// Same as above but for akas.
-				foreach ($akaMatches as $ak => $av) {
-					if (isset($showInfo['country']) && !empty($showInfo['country']) && !empty($av[0]['country'])) {
-						if (strtolower($showInfo['country']) != strtolower($av[0]['country'])) {
-							continue;
-						}
-					}
-
-					if ($this->echooutput) {
-						echo $this->pdo->log->primary('Found ' . $ak . '% aka match: "' . $akaMatches[$ak][0]['title'] . '"');
-					}
-					return $akaMatches[$ak][0];
-				}
-
-				if ($this->echooutput) {
-					echo $this->pdo->log->primary('No match found on TVRage trying Trakt.');
-				}
-				return false;
-			} else {
-				if ($this->echooutput) {
-					echo $this->pdo->log->primary('Nothing returned from tvrage.');
-				}
-				return false;
-			}
-		} else {
-			return -1;
-		}
-	}
-
-	public function checkMatch($ourName, $tvrName)
-	{
-		// Clean up name ($ourName is already clean).
-		$tvrName = $this->cleanName($tvrName);
-		$tvrName = preg_replace('/ of /i', '', $tvrName);
-		$ourName = preg_replace('/ of /i', '', $ourName);
-
-		// Create our arrays.
-		$ourArr = explode(' ', $ourName);
-		$tvrArr = explode(' ', $tvrName);
-
-		// Set our match counts.
-		$numMatches = 0;
-		$totalMatches = sizeof($ourArr) + sizeof($tvrArr);
-
-		// Loop through each array matching again the opposite value, if they match increment!
-		foreach ($ourArr as $oname) {
-			if (preg_match('/ ' . preg_quote($oname, '/') . ' /i', ' ' . $tvrName . ' ')) {
-				$numMatches++;
-			}
-		}
-		foreach ($tvrArr as $tname) {
-			if (preg_match('/ ' . preg_quote($tname, '/') . ' /i', ' ' . $ourName . ' ')) {
-				$numMatches++;
-			}
-		}
-
-		// Check what we're left with.
-		if ($numMatches <= 0) {
-			return false;
-		} else {
-			$matchpct = ($numMatches / $totalMatches) * 100;
-		}
-
-		if ($matchpct >= \TvAnger::MATCH_PROBABILITY) {
-			return $matchpct;
-		} else {
-			return false;
-		}
-	}
-
-	public function cleanName($str)
-	{
-		$str = str_replace(['.', '_'], ' ', $str);
-
-		$str = str_replace(['à', 'á', 'â', 'ã', 'ä', 'æ', 'À', '�', 'Â', 'Ã', 'Ä'], 'a', $str);
-		$str = str_replace(['ç', 'Ç'], 'c', $str);
-		$str = str_replace(['Σ', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë'], 'e', $str);
-		$str = str_replace(['ì', 'í', 'î', 'ï', 'Ì', '�', 'Î', '�'], 'i', $str);
-		$str = str_replace(['ò', 'ó', 'ô', 'õ', 'ö', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö'], 'o', $str);
-		$str = str_replace(['ù', 'ú', 'û', 'ü', 'ū', 'Ú', 'Û', 'Ü', 'Ū'], 'u', $str);
-		$str = str_replace('ß', 'ss', $str);
-
-		$str = str_replace('&', 'and', $str);
-		$str = preg_replace('/^(history|discovery) channel/i', '', $str);
-		$str = str_replace(['\'', ':', '!', '"', '#', '*', '’', ',', '(', ')', '?'], '', $str);
-		$str = str_replace('$', 's', $str);
-		$str = preg_replace('/\s{2,}/', ' ', $str);
-
-		$str = trim($str, '\"');
-		return trim($str);
-	}
-
-	public function parseNameEpSeason($relname)
-	{
-		$showInfo = array('name' => '', 'season' => '', 'episode' => '', 'seriesfull' => '', 'airdate' => '', 'country' => '', 'year' => '', 'cleanname' => '');
-		$matches = '';
-
-		$following = '[^a-z0-9](\d\d-\d\d|\d{1,2}x\d{2,3}|(19|20)\d\d|(480|720|1080)[ip]|AAC2?|BDRip|BluRay|D0?\d|DD5|DiVX|DLMux|DTS|DVD(Rip)?|E\d{2,3}|[HX][-_. ]?264|ITA(-ENG)?|[HPS]DTV|PROPER|REPACK|S\d+[^a-z0-9]?(E\d+)?|WEB[-_. ]?(DL|Rip)|XViD)[^a-z0-9]';
-
-		// For names that don't start with the title.
-		if (preg_match('/[^a-z0-9]{2,}(?P<name>[\w .-]*?)' . $following . '/i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-		} else if (preg_match('/^(?P<name>[a-z0-9][\w .-]*?)' . $following . '/i', $relname, $matches)) {
-			// For names that start with the title.
-			$showInfo['name'] = $matches[1];
-		}
-
-		if (!empty($showInfo['name'])) {
-			// S01E01-E02 and S01E01-02
-			if (preg_match('/^(.*?)[^a-z0-9]s(\d{1,2})[^a-z0-9]?e(\d{1,3})(?:[e-])(\d{1,3})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = array(intval($matches[3]), intval($matches[4]));
-			}
-			//S01E0102 - lame no delimit numbering, regex would collide if there was ever 1000 ep season.
-			else if (preg_match('/^(.*?)[^a-z0-9]s(\d{2})[^a-z0-9]?e(\d{2})(\d{2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = array(intval($matches[3]), intval($matches[4]));
-			}
-			// S01E01 and S01.E01
-			else if (preg_match('/^(.*?)[^a-z0-9]s(\d{1,2})[^a-z0-9]?e(\d{1,3})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = intval($matches[3]);
-			}
-			// S01
-			else if (preg_match('/^(.*?)[^a-z0-9]s(\d{1,2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = 'all';
-			}
-			// S01D1 and S1D1
-			else if (preg_match('/^(.*?)[^a-z0-9]s(\d{1,2})[^a-z0-9]?d\d{1}[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = 'all';
-			}
-			// 1x01
-			else if (preg_match('/^(.*?)[^a-z0-9](\d{1,2})x(\d{1,3})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = intval($matches[3]);
-			}
-			// 2009.01.01 and 2009-01-01
-			else if (preg_match('/^(.*?)[^a-z0-9](19|20)(\d{2})[^a-z0-9](\d{2})[^a-z0-9](\d{2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = $matches[2] . $matches[3];
-				$showInfo['episode'] = $matches[4] . '/' . $matches[5];
-				$showInfo['airdate'] = $matches[2] . $matches[3] . '-' . $matches[4] . '-' . $matches[5]; //yy-m-d
-			}
-			// 01.01.2009
-			else if (preg_match('/^(.*?)[^a-z0-9](\d{2})[^a-z0-9](\d{2})[^a-z0-9](19|20)(\d{2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = $matches[4] . $matches[5];
-				$showInfo['episode'] = $matches[2] . '/' . $matches[3];
-				$showInfo['airdate'] = $matches[4] . $matches[5] . '-' . $matches[2] . '-' . $matches[3]; //yy-m-d
-			}
-			// 01.01.09
-			else if (preg_match('/^(.*?)[^a-z0-9](\d{2})[^a-z0-9](\d{2})[^a-z0-9](\d{2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = ($matches[4] <= 99 && $matches[4] > 15) ? '19' . $matches[4] : '20' . $matches[4];
-				$showInfo['episode'] = $matches[2] . '/' . $matches[3];
-				$showInfo['airdate'] = $showInfo['season'] . '-' . $matches[2] . '-' . $matches[3]; //yy-m-d
-			}
-			// 2009.E01
-			else if (preg_match('/^(.*?)[^a-z0-9]20(\d{2})[^a-z0-9](\d{1,3})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = '20' . $matches[2];
-				$showInfo['episode'] = intval($matches[3]);
-			}
-			// 2009.Part1
-			else if (preg_match('/^(.*?)[^a-z0-9](19|20)(\d{2})[^a-z0-9]Part(\d{1,2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = $matches[2] . $matches[3];
-				$showInfo['episode'] = intval($matches[4]);
-			}
-			// Part1/Pt1
-			else if (preg_match('/^(.*?)[^a-z0-9](?:Part|Pt)[^a-z0-9](\d{1,2})[^a-z0-9]/i', $relname, $matches)) {
-				$showInfo['season'] = 1;
-				$showInfo['episode'] = intval($matches[2]);
-			}
-			//The.Pacific.Pt.VI.HDTV.XviD-XII / Part.IV
-			else if (preg_match('/^(.*?)[^a-z0-9](?:Part|Pt)[^a-z0-9]([ivx]+)/i', $relname, $matches)) {
-				$showInfo['season'] = 1;
-				$epLow = strtolower($matches[2]);
-				switch ($epLow) {
-					case 'i': $e = 1;
-						break;
-					case 'ii': $e = 2;
-						break;
-					case 'iii': $e = 3;
-						break;
-					case 'iv': $e = 4;
-						break;
-					case 'v': $e = 5;
-						break;
-					case 'vi': $e = 6;
-						break;
-					case 'vii': $e = 7;
-						break;
-					case 'viii': $e = 8;
-						break;
-					case 'ix': $e = 9;
-						break;
-					case 'x': $e = 10;
-						break;
-					case 'xi': $e = 11;
-						break;
-					case 'xii': $e = 12;
-						break;
-					case 'xiii': $e = 13;
-						break;
-					case 'xiv': $e = 14;
-						break;
-					case 'xv': $e = 15;
-						break;
-					case 'xvi': $e = 16;
-						break;
-					case 'xvii': $e = 17;
-						break;
-					case 'xviii': $e = 18;
-						break;
-					case 'xix': $e = 19;
-						break;
-					case 'xx': $e = 20;
-						break;
-					default:
-						$e = 0;
-				}
-				$showInfo['episode'] = $e;
-			}
-			// Band.Of.Brothers.EP06.Bastogne.DVDRiP.XviD-DEiTY
-			else if (preg_match('/^(.*?)[^a-z0-9]EP?[^a-z0-9]?(\d{1,3})/i', $relname, $matches)) {
-				$showInfo['season'] = 1;
-				$showInfo['episode'] = intval($matches[2]);
-			}
-			// Season.1
-			else if (preg_match('/^(.*?)[^a-z0-9]Seasons?[^a-z0-9]?(\d{1,2})/i', $relname, $matches)) {
-				$showInfo['season'] = intval($matches[2]);
-				$showInfo['episode'] = 'all';
-			}
-
-			$countryMatch = $yearMatch = '';
-			// Country or origin matching.
-			if (preg_match('/\W(US|UK|AU|NZ|CA|NL|Canada|Australia|America|United[^a-z0-9]States|United[^a-z0-9]Kingdom)\W/', $showInfo['name'], $countryMatch)) {
-				$currentCountry = strtolower($countryMatch[1]) ;
-				if ($currentCountry == 'canada') {
-					$showInfo['country'] = 'CA';
-				} else if ($currentCountry == 'australia') {
-					$showInfo['country'] = 'AU';
-				} else if ($currentCountry == 'america' || $currentCountry == 'united states') {
-					$showInfo['country'] = 'US';
-				} else if ($currentCountry == 'united kingdom') {
-					$showInfo['country'] = 'UK';
-				} else {
-					$showInfo['country'] = strtoupper($countryMatch[1]);
-				}
-			}
-
-			// Clean show name.
-			$showInfo['cleanname'] = $this->cleanName($showInfo['name']);
-
-			// Check for dates instead of seasons.
-			if (strlen($showInfo['season']) == 4) {
-				$showInfo['seriesfull'] = $showInfo['season'] . "/" . $showInfo['episode'];
-			} else {
-				// Get year if present (not for releases with dates as seasons).
-				if (preg_match('/[^a-z0-9](19|20)(\d{2})/i', $relname, $yearMatch)) {
-					$showInfo['year'] = $yearMatch[1] . $yearMatch[2];
-				}
-
-				$showInfo['season'] = sprintf('S%02d', $showInfo['season']);
-				// Check for multi episode release.
-				if (is_array($showInfo['episode'])) {
-					$tmpArr = array();
-					foreach ($showInfo['episode'] as $ep) {
-						$tmpArr[] = sprintf('E%02d', $ep);
-					}
-					$showInfo['episode'] = implode('', $tmpArr);
-				} else {
-					$showInfo['episode'] = sprintf('E%02d', $showInfo['episode']);
-				}
-
-				$showInfo['seriesfull'] = $showInfo['season'] . $showInfo['episode'];
-			}
-			$showInfo['airdate'] = (!empty($showInfo['airdate'])) ? $showInfo['airdate'] . ' 00:00:00' : '';
-			return $showInfo;
-		}
-		return false;
-	}
-
-	public function getGenres()
-	{
-		return array('Action', 'Adult/Porn', 'Adventure', 'Anthology', 'Arts & Crafts', 'Automobiles', 'Buy, Sell & Trade', 'Celebrities', 'Children', 'Cinema/Theatre', 'Comedy', 'Cooking/Food', 'Crime', 'Current Events',
-					 'Dance', 'Debate', 'Design/Decorating', 'Discovery/Science', 'Drama', 'Educational', 'Family', 'Fantasy', 'Fashion/Make-up', 'Financial/Business', 'Fitness', 'Garden/Landscape', 'History',
-					 'Horror/Supernatural', 'Housing/Building', 'How To/Do It Yourself', 'Interview', 'Lifestyle', 'Literature', 'Medical', 'Military/War', 'Music', 'Mystery', 'Pets/Animals', 'Politics', 'Puppets',
-					 'Religion', 'Romance/Dating', 'Sci-Fi', 'Sketch/Improv', 'Soaps', 'Sports', 'Super Heroes', 'Talent', 'Tech/Gaming', 'Teens', 'Thriller', 'Travel', 'Western', 'Wildlife');
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/NNBase.php b/lib/copy_this/NNBase.php
deleted file mode 100644
index 31b0c7181..000000000
--- a/lib/copy_this/NNBase.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php exit(dirname(__FILE__)); ?>
diff --git a/lib/copy_this/config_edit_before_copy/config.php b/lib/copy_this/config_edit_before_copy/config.php
deleted file mode 100644
index dab35bbd5..000000000
--- a/lib/copy_this/config_edit_before_copy/config.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-//=========================
-// Config you must change - updated by installer.
-//=========================
-define('DB_TYPE', 'mysql');
-define('DB_HOST', '127.0.0.1');
-define('DB_PORT', '3306');
-define('DB_SOCKET', '');
-define('DB_USER', '');
-define('DB_PASSWORD', '');
-define('DB_NAME', 'newznab');
-define('DB_INNODB', true);
-define('DB_PCONNECT', false);
-
-define('NNTP_USERNAME', '');
-define('NNTP_PASSWORD', '');
-define('NNTP_SERVER', '');
-define('NNTP_PORT', '');
-define('NNTP_SSLENABLED', false);
-
-define('NNTP_USERNAME_A', '');
-define('NNTP_PASSWORD_A', '');
-define('NNTP_SERVER_A', '');
-define('NNTP_PORT_A', '');
-define('NNTP_SSLENABLED_A', false);
-
-// Wether to use memcached or not.
-define('MEMCACHE_ENABLED', false);
-// To use a socket instead set MEMCACHE_HOST as 'unix:///path/to/memcached.sock' and MEMCACHE_PORT as '0'.
-define('MEMCACHE_HOST', '127.0.0.1');
-define('MEMCACHE_PORT', '11211');
-// Amount of time to keep a query in ram in seconds.
-define('MEMCACHE_EXPIRY', '900');
-// To compress the queries using zlib or not (more cpu usage and less ram usage if set to true, inverse for false);
-define('MEMCACHE_COMPRESSION', true);
-
-/* Location to CA bundle file on your system. You can download one here: http://curl.haxx.se/docs/caextract.html */
-define('NN_SSL_CAFILE', '/etc/ssl/certs/cacert.pem');
-/* Path where openssl cert files are stored on your system, this is a fall back if the CAFILE is not found. */
-define('NN_SSL_CAPATH', '/etc/ssl/certs/');
-/* Use the aforementioned CA bundle file to verify remote SSL certificates when connecting to a server using TLS/SSL. */
-define('NN_SSL_VERIFY_PEER', '0');
-/* Verify the host is who they say they are. */
-define('NN_SSL_VERIFY_HOST', '0');
-/* Allow self signed certificates. Note this does not work on CURL as CURL does not have this option. */
-define('NN_SSL_ALLOW_SELF_SIGNED', '1');
-
-require_once 'automated.config.php';
\ No newline at end of file
diff --git a/lib/copy_this/config_edit_before_copy/readme.txt b/lib/copy_this/config_edit_before_copy/readme.txt
deleted file mode 100644
index ff988b6ed..000000000
--- a/lib/copy_this/config_edit_before_copy/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-First edit the included config.php and then copy it to your newznab www folder.
\ No newline at end of file
diff --git a/lib/copy_this/misc/sphinxsearch/README.md b/lib/copy_this/misc/sphinxsearch/README.md
deleted file mode 100644
index 53401c74c..000000000
--- a/lib/copy_this/misc/sphinxsearch/README.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# newznab SPHINX SEARCH Readme
----------------------------
-
-## _Installation_:
-
-_Forewarning: Your MySQL server requires the SphinxSE plugin, this should be pre-installed on MariaDB._
-
-_For MySQL or Percona, you might have to compile them. Please make sure you have this before continuing as this is required.  Please see the end of this file for instructions on compiling the Percona plugin._
-
-_You can type SHOW ENGINES; in a MySQL client to verify that SPHINX is supported._
-
-Head to http://sphinxsearch.com/downloads/release/, download the latest version for your operating system.
-
-Assuming you are on ubuntu, you would:
-
-`sudo add-apt-repository ppa:builds/sphinxsearch-rel21`
-
-`sudo apt-get update`
-
-`sudo apt-get install sphinxsearch`
-
-## _Configuration_:
-#####Replace the default sphinx.conf file with our included sphinx.conf file:
-
-If you are on linux, you can copy over our sphinx.conf, on other operating systems you will need to edit yours using ours as a guide.
-
-Assuming you are on ubuntu:
-
-`sudo mv /etc/sphinxsearch/sphinx.conf /etc/sphinxsearch/sphinx.conf.1`
-
-`sudo cp /var/www/newznab/misc/sphinxsearch/sphinx.conf /etc/sphinxsearch/sphinx.conf`
-
-##### Edit the sphinx.conf file:
-Everything should be good by default for linux, but you can get better performance by changing some settings. Specifically the rt_mem_limit and mem_limit settings, setting those to 2048M if you have the RAM will make a difference.
-
-Read the sphinx manual for detailed information on various settings to get the best performance for your server: http://sphinxsearch.com/docs/current.html#conf-reference
-
-Assuming you are on ubuntu:
-
-`sudo nano /etc/sphinxsearch/sphinx.conf`
-
-## _Create folders_:
-Create the folders you specified in sphinx.conf
-
-Assuming you are on ubuntu:
-
-`sudo mkdir -p /var/lib/sphinxsearch/data/`
-
-`sudo mkdir -p /var/log/sphinxsearch/`
-
-## _Start the sphinx service_:
-Assuming you are on ubuntu:
-`sudo service sphinxsearch restart`
-
-## _Test sphinxQL / Troubleshooting_:
-At this point you should have a working sphinxQL server running on port 9306
-
-You can test this by typing `mysql -P9306 -h0`
-
-Now you should be logged in to sphinxQL, type `show tables` make sure you see the releases_rt Index
-
-If you do not see the above, or could not log in to sphinxQL, look at the log file you specified in sphinx.conf or look at the /var/log/upstart/sphinxsearch.log file if you are on linux.
-
-## _Setting up newznab for sphinx support_:
-
-#### MAKE SURE ALL RELEASE CREATION / IMPORT SCRIPTS ARE STOPPED.
-
-##### Edit the settings.php file:
-Open up the www/settings.php file with a text editor, if you do not have it copy the www/settings.php.example file to www/settings.php
-
-Change the `NN_RELEASE_SEARCH_TYPE` to `2`
-
-If you changed the `listen` setting in sphinx.conf you will need to change the `NN_SPHINXQL_HOST_NAME` / `NN_SPHINXQL_PORT` / `NN_SPHINXQL_SOCK_FILE` settings accordingly, otherwise it's fine.
-
-##### Create the SphinxSE table:
-In this folder (.../misc/sphinxsearch) there is a create_se_tables.php file, run the file using your hostname / port to the sphinx server you set in sphinx.conf (by default this should be 0 and 9312).
-
-##### Populate the Sphinx RT index with data:
-In this folder (.../misc/sphinxsearch) there is a populate_rt_indexes.php file, run the file and wait until it is complete.
-
-You are now done with this guide, sphinx search should work. The index will populate itself from now on, you do not need to rerun this script unless you disable sphinx.
-
-## _Misc_:
-
-##### Optimizing: You can optimize the rt index(es) by running optimize.php
-
-Read about the benefits/drawbacks of optimizing here: http://sphinxsearch.com/docs/current.html#sphinxql-optimize-index
-
-##### Installing sphinxSE plugin in MariaDB
-
-First login to your mariadb server and type:
-
-show engines;
-
-If there is no mention of sphinx, you need to perform a one time install of the plugin by simply typing:
-
-INSTALL SONAME 'ha_sphinx';
-
-##### Compiling SphinxSE Plugin for Percona:
-
-Please STOP mysql during the build process.
-
-First, pull down my building repository I forked from dragolabs and updated for Percona 5.6\Trusty.
-
-`git clone https://github.com/ruhllatio/dpkg-sphinx-se.git`
-
-`cd dpkg-sphinx-se`
-
-_Note_:
-
-If you are using Percona 5.6.19-67.0 and Sphinx 2.1.9 on Ubuntu 14.04 LTS 64-bit with all three most up-to-date from their repositories, you can likely install the Debian pkg in the trusty directory and forego the rest of this action by running:
-
-`dpkg -i ./trusty/percona-5.6.19-67.0/sphinx-se-2.1.9_amd64.deb`
-
-This action should install AND activate the Sphinx plugin in MySQL automatically.  If you get any errors with failed dependencies run:
-
-`apt-get -f install`
-
-If you insist on compiling yourself, read on.
-
-First you need to install the bundler dependency.
-
-`apt-get install bundler`
-
-Once installed, run:
-
-`bundle install`
-
-From the project root.  This is the intricate part.  You must run the build script providing the following command line arguments as they exist in your environment.
-
-`build.sh -s 2.1.9 -p 5.6.19-67.0 -d 5.6.19-67.0-618.trusty -o trusty`
-
-The -s is your Sphinx version.  If you are unsure of the package version you installed, issue:
-
-`dpkg -l | grep sphinxsearch`
-
-You should see something along the lines of:
-
-`ii  sphinxsearch 2.1.9-release-0ubuntu11~trusty  amd64 Fast standalone full-text SQL search engine`
-
-In this case, 2.1.9 would be your sphinx version.
-
--p Is the version of percona-server you have installed on the machine and -d is the version of percona-server that exists in the repository you used to install it.  If you do not know these, issue:
-
-`dpkg -l | grep percona-server-server-5.6` (or 5.5 if that's what you have installed)
-
-You should see something similar to:
-
-`ii percona-server-server-5.6  5.6.19-67.0-618.trusty amd64 Percona Server database server binaries`
-
-In this case, 5.6.19-67.0 would be the installed version and 5.6.19-67.0-618.trusty would be the repository version.
-
-The final argument for build.sh is optional.  It just marks the iteration of compilation for the plugin if you want multiple.
-
-This script, once completed should leave a deb package in the _pkg directory.  You can install it with:
-
-`dpkg -i file.deb`
-
-This will copy the plugin to the correct directory and activate it in MySQL.  You can verify it is active by issuing:
-
-`SHOW PLUGINS';` OR `SHOW ENGINES;` to see that Sphinx is installed and active.
diff --git a/lib/copy_this/misc/sphinxsearch/create_se_tables.php b/lib/copy_this/misc/sphinxsearch/create_se_tables.php
deleted file mode 100644
index d3871963a..000000000
--- a/lib/copy_this/misc/sphinxsearch/create_se_tables.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require dirname(__FILE__) . '/../../www/config.php';
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once (NN_LIB . 'ReleaseSearch.php');
-
-if (NN_RELEASE_SEARCH_TYPE != \ReleaseSearch::SPHINX) {
-	exit('Error, NN_RELEASE_SEARCH_TYPE in www/settings.php must be set to SPHINX!' . PHP_EOL);
-}
-
-if (!isset($argv[1]) || !isset($argv[2]) || !is_numeric($argv[2])) {
-	exit('Argument 1 must the hostname or IP to the Sphinx searchd server, Argument 2 must be the port to the Sphinx searchd server.' . PHP_EOL);
-}
-
-$pdo = new DB();
-
-$sphinxConnection = sprintf('%s:%d', $argv[1], $argv[2]);
-
-$tables = [];
-$tables['releases_se'] =
-sprintf(
-"CREATE TABLE releases_se
-(
-	id          BIGINT UNSIGNED NOT NULL,
-	weight      INTEGER NOT NULL,
-	query       VARCHAR(1024) NOT NULL,
-	guid        VARCHAR(40) NOT NULL,
-	name        VARCHAR(255) NOT NULL DEFAULT '',
-	searchname  VARCHAR(255) NOT NULL DEFAULT '',
-	fromname    VARCHAR(255) NULL,
-	INDEX(query)
-) ENGINE=SPHINX CONNECTION=\"sphinx://%s/releases_rt\"",
-$sphinxConnection
-);
-
-foreach ($tables as $table => $query) {
-	$pdo->queryExec(sprintf('DROP TABLE IF EXISTS %s', $table));
-	$pdo->queryExec($query);
-}
-
-echo 'All done! If you messed up your sphinx connection info, you can rerun this script.' . PHP_EOL;
diff --git a/lib/copy_this/misc/sphinxsearch/optimize.php b/lib/copy_this/misc/sphinxsearch/optimize.php
deleted file mode 100644
index 06f773807..000000000
--- a/lib/copy_this/misc/sphinxsearch/optimize.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-require dirname(__FILE__) . '/../../www/config.php';
-require_once (NN_LIB . 'SphinxSearch.php');
-
-if (!isset($argv[1]) || !in_array($argv[1], ['releases_rt'])) {
-	exit('Argument1 is the index name, currently only releases_rt is supported.' . PHP_EOL);
-}
-(new \SphinxSearch())->optimizeRTIndex($argv[1]);
diff --git a/lib/copy_this/misc/sphinxsearch/populate_rt_indexes.php b/lib/copy_this/misc/sphinxsearch/populate_rt_indexes.php
deleted file mode 100644
index 85f94e707..000000000
--- a/lib/copy_this/misc/sphinxsearch/populate_rt_indexes.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-require dirname(__FILE__) . '/../../www/config.php';
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once (NN_LIB . 'ReleaseSearch.php');
-require_once (NN_LIB . 'SphinxSearch.php');
-
-if (NN_RELEASE_SEARCH_TYPE != \ReleaseSearch::SPHINX) {
-	exit('Error, NN_RELEASE_SEARCH_TYPE in www/settings.php must be set to SPHINX!' . PHP_EOL);
-}
-
-if (!isset($argv[1]) || !in_array($argv[1], ['releases_rt'])) {
-	exit('Argument1 is the index name, releases_rt is the only supported currently.' . PHP_EOL);
-}
-
-switch ($argv[1]) {
-	case 'releases_rt':
-		releases_rt();
-		break;
-	default:
-		exit();
-}
-
-// Bulk insert releases into sphinx RT index.
-function releases_rt()
-{
-	$pdo = new \DB();
-	$rows = $pdo->queryExec('SELECT id, guid, name, searchname, fromname FROM releases');
-
-	if ($rows !== false && $rows->rowCount()) {
-		$sphinx = new \SphinxSearch();
-
-		$total = $rows->rowCount();
-		$string = 'REPLACE INTO releases_rt (id, guid, name, searchname, fromname) VALUES ';
-		$tempString = '';
-		$i = 0;
-		echo '[Starting to populate sphinx RT indexes with ' . $total . ' releases.] ';
-		foreach ($rows as $row) {
-			$i++;
-			$tempString .= sprintf(
-				'(%d, %s, %s, %s, %s),' ,
-				$row['id'],
-				$sphinx->sphinxQL->escapeString($row['guid']),
-				$sphinx->sphinxQL->escapeString($row['name']),
-				$sphinx->sphinxQL->escapeString($row['searchname']),
-				$sphinx->sphinxQL->escapeString($row['fromname'])
-			);
-			if ($i === 1000 || $i >= $total) {
-				$sphinx->sphinxQL->queryExec($string . rtrim($tempString, ','));
-				$tempString = '';
-				$total -= $i;
-				$i = 0;
-				echo '.';
-			}
-		}
-		echo ' [Done.]' . PHP_EOL;
-	} else {
-		echo 'No releases in your DB or an error occurred. This will need to be resolved before you can use the search.' . PHP_EOL;
-	}
-}
diff --git a/lib/copy_this/misc/sphinxsearch/sphinx.conf b/lib/copy_this/misc/sphinxsearch/sphinx.conf
deleted file mode 100644
index 0d6e18503..000000000
--- a/lib/copy_this/misc/sphinxsearch/sphinx.conf
+++ /dev/null
@@ -1,318 +0,0 @@
-# !*: indicates newznab Notes
-
-# !*: Do not change the "releases_rt" word.
-index releases_rt
-{
-	# !*: Do not change this.
-	type			= rt
-
-	# !*: Do not change this.
-	dict 			= keywords
-
-	# !*: These allow wildcard searches, they take more ram/disk space.
-	# !*: If you want to turn it off, put min_infix_len, min_prefix_len and enable_star to 0.
-	#
-	# !*: min_prefix_len Allows wildcard searches from the start of the word. ie: to search fishing you can
-	#     do fish* ; This mode takes less ram/disk space than min_infix_len. To set it on, put min_infix_len to 0
-	#     and min_prefix_len to 1
-	#
-	# !*: min_infix_len Allows wildcard searches from any position in the word, ie: *ish* would match fishing
-	#     This comes at the expense of more ram/disk space.
-	#     NOTE: min_infix_len DOES NOT WORK FOR RT INDEXES ON SOME VERSIONS OF SPHINX, IT WILL DEFAULT TO min_prefix_len
-	#           IF YOUR SPHINX VERSION DOES NOT SUPPORT IT.
-	#
-	# !*: DO NOT ENABLE BOTH min_prefix_len AND min_infix_len AT THE SAME TIME.
-	#
-	min_prefix_len 		= 0
-	min_infix_len 		= 1
-	enable_star			= 1
-
-	# !*: Path to where the index files will be stored.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-path
-	path			= /var/lib/sphinxsearch/data/releases_rt
-
-	# RAM chunk size limit
-	# RT index will keep at most this much data in RAM, then flush to disk
-	# !*: http://sphinxsearch.com/docs/current.html#conf-rt-mem-limit
-	rt_mem_limit		= 1024M
-
-	# Full-text field declarations.
-	# !*: Do not change these.
-	rt_field		= name
-	rt_field		= searchname
-	rt_field		= fromname
-
-	# String attribute declations.
-	# !*: Do not change these.
-	rt_attr_string		= name
-	rt_attr_string		= searchname
-	rt_attr_string		= fromname
-	rt_attr_string		= guid
-}
-
-indexer
-{
-	# Memory limit, in bytes, kiloytes (16384K) or megabytes (256M)
-	# Default is 32M, max is 2047M, recommended is 256M to 1024M
-	# !*: http://sphinxsearch.com/docs/current.html#conf-mem-limit
-	mem_limit		= 1024M
-
-	# Maximum IO calls per second (for I/O throttling)
-	# optional, default is 0 (unlimited)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-iops
-	# max_iops		= 0
-
-	# Maximum IO call size, bytes (for I/O throttling)
-	# optional, default is 0 (unlimited)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-iosize
-	# max_iosize		= 0
-
-	# Write buffer size, bytes
-	# several (currently up to 4) buffers will be allocated
-	# write buffers are allocated in addition to mem_limit
-	# optional, default is 1M
-	# !*: http://sphinxsearch.com/docs/current.html#conf-write-buffer
-	# write_buffer		= 1M
-
-	# maximum file field adaptive buffer size
-	# optional, default is 8M, minimum is 1M
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-file-field-buffer
-	# max_file_field_buffer	= 8M
-
-	# Lemmatizer cache size. Optional, default is 256K.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-lemmatizer-cache
-	# lemmatizer_cache = 256K
-}
-
-searchd
-{
-	# [hostname:]port[:protocol], or /unix/socket/path to listen on
-	# known protocols are 'sphinx' (SphinxAPI) and 'mysql41' (SphinxQL)
-	#
-	# multi-value, multiple listen points are allowed
-	# optional, defaults are 9312:sphinx and 9306:mysql41, as below
-	# listen			= 127.0.0.1
-	# listen			= 192.168.0.1:9312
-	# listen			= 9312
-	# listen			= /var/run/searchd.sock
-	# !*: If you change this, you will need to change your newznab settings.php file accordingly.
-	#     Setting anything else can cause issues, beware.
-	#     The first listen is for the sphinxse plugin in MySQL to communicate with the sphinx server,
-	#     so we can select from the RT index.
-	#     The second listen is for sphinxql, to insert and delete data from the RT index.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-listen
-	listen			= 9312
-	listen			= 9306:mysql41
-
-	# log file, searchd run info is logged here
-	# optional, default is 'searchd.log'
-	# !*: Make sure this folder exists and is writable, if you have issues starting sphinx,
-	#     look at /var/log/upstart/sphinxsearch.log also.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-log
-	log			= /var/log/sphinxsearch/searchd.log
-
-	# query log file, all search queries are logged here
-	# optional, default is empty (do not log queries)
-	# !*: Not recommended enabling this.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-query-log
-	# query_log		= /var/log/sphinxsearch/query.log
-
-	# query log file format
-	# optional, known values are plain and sphinxql, default is plain
-	# !*: http://sphinxsearch.com/docs/current.html#conf-query-log-format
-	# query_log_format		= sphinxql
-
-	# client read timeout, seconds
-	# optional, default is 5
-	# !*: http://sphinxsearch.com/docs/current.html#conf-read-timeout
-	read_timeout		= 5
-
-	# request timeout, seconds
-	# optional, default is 5 minutes
-	# !*: http://sphinxsearch.com/docs/current.html#conf-client-timeout
-	client_timeout		= 300
-
-	# maximum amount of children to fork (concurrent searches to run)
-	# optional, default is 0 (unlimited)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-children
-	# max_children		= 0
-
-	# PID file, searchd process id file name
-	# mandatory
-	# !*: Sphinx will not start if this folder does not exist.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-pid-file
-	pid_file		= /var/run/searchd.pid
-
-	# max amount of matches the daemon ever keeps in RAM, per-index
-	# WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL
-	# default is 1000 (just like Google)
-	# !*: Note, this is deprecated in v2.2.3 of sphinx.
-	max_matches		= 10000
-
-	# seamless rotate, prevents rotate stalls if precaching huge datasets
-	# optional, default is 1
-	# !*: http://sphinxsearch.com/docs/current.html#conf-seamless-rotate
-	seamless_rotate		= 1
-
-	# whether to forcibly preopen all indexes on startup
-	# optional, default is 1 (preopen everything)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-preopen-indexes
-	preopen_indexes		= 1
-
-	# whether to unlink .old index copies on succesful rotation.
-	# optional, default is 1 (do unlink)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-unlink-old
-	unlink_old		= 1
-
-	# attribute updates periodic flush timeout, seconds
-	# updates will be automatically dumped to disk this frequently
-	# optional, default is 0 (disable periodic flush)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-attr-flush-period
-	# attr_flush_period	= 0
-
-	# max allowed network packet size
-	# limits both query packets from clients, and responses from agents
-	# optional, default size is 8M
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-packet-size
-	max_packet_size		= 8M
-
-	# MVA updates pool size
-	# shared between all instances of searchd, disables attr flushes!
-	# optional, default size is 1M
-	# !*: http://sphinxsearch.com/docs/current.html#conf-mva-updates-pool
-	mva_updates_pool	= 1M
-
-	# max allowed per-query filter count
-	# optional, default is 256
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-filters
-	max_filters		= 256
-
-	# max allowed per-filter values count
-	# optional, default is 4096
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-filter-values
-	max_filter_values	= 4096
-
-	# socket listen queue length
-	# optional, default is 5
-	# !*: http://sphinxsearch.com/docs/current.html#conf-listen-backlog
-	# listen_backlog		= 5
-
-	# per-keyword read buffer size
-	# optional, default is 256K
-	# !*: http://sphinxsearch.com/docs/current.html#conf-read-buffer
-	# read_buffer		= 256K
-
-	# unhinted read size (currently used when reading hits)
-	# optional, default is 32K
-	# !*: http://sphinxsearch.com/docs/current.html#conf-read-unhinted
-	# read_unhinted		= 32K
-
-	# max allowed per-batch query count (aka multi-query count)
-	# optional, default is 32
-	# !*: http://sphinxsearch.com/docs/current.html#conf-max-batch-queries
-	# max_batch_queries	= 32
-
-	# max common subtree document cache size, per-query
-	# optional, default is 0 (disable subtree optimization)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-subtree-docs-cache
-	# subtree_docs_cache	= 4M
-
-	# max common subtree hit cache size, per-query
-	# optional, default is 0 (disable subtree optimization)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-subtree-hits-cache
-	# subtree_hits_cache	= 8M
-
-	# multi-processing mode (MPM)
-	# known values are none, fork, prefork, and threads
-	# optional, default is fork
-	# !*: Do not change this.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-workers
-	workers = threads
-
-	# max threads to create for searching local parts of a distributed index
-	# optional, default is 0, which means disable multi-threaded searching
-	# should work with all MPMs (ie. does NOT require workers=threads)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-dist-threads
-	# dist_threads		= 4
-
-	# binlog files path; use empty string to disable binlog
-	# optional, default is build-time configured data directory
-	# binlog_path		= # disable logging
-	# !*: This is recommended, it rebuilds indexes if your server crashes.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-binlog-path
-	binlog_path		= /var/lib/sphinxsearch/data
-
-	# binlog flush/sync mode
-	# 0 means flush and sync every second
-	# 1 means flush and sync every transaction
-	# 2 means flush every transaction, sync every second
-	# optional, default is 2
-	# !*: You should leave this to 2
-	# !*: http://sphinxsearch.com/docs/current.html#conf-binlog-flush
-	binlog_flush		= 2
-
-	# binlog per-file size limit
-	# optional, default is 128M, 0 means no limit
-	# !*: http://sphinxsearch.com/docs/current.html#conf-binlog-max-log-size
-	binlog_max_log_size	= 512M
-
-	# default server-wide collation
-	# optional, default is libc_ci
-	# !*: http://sphinxsearch.com/docs/current.html#conf-collation-server
-	# collation_server		= utf8_general_ci
-
-	# server-wide locale for libc based collations
-	# optional, default is C
-	# !*: http://sphinxsearch.com/docs/current.html#conf-collation-libc-locale
-	# collation_libc_locale	= ru_RU.UTF-8
-
-	# trusted plugin directory
-	# optional, default is empty (disable UDFs)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-plugin-dir
-	# plugin_dir			= /usr/local/sphinx/lib
-
-	# version string returned to MySQL network protocol clients
-	# optional, default is empty (use Sphinx version)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-mysql-version-string
-	# mysql_version_string	= 5.0.37
-
-	# RT RAM chunks flush period
-	# optional, default is 0 (no periodic flush)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-rt-flush-period
-	rt_flush_period		= 900
-
-	# per-thread stack size, only affects workers=threads mode
-	# optional, default is 64K
-	# !*: http://sphinxsearch.com/docs/current.html#conf-thread-stack
-	# thread_stack			= 128K
-
-	# per-keyword expansion limit (for dict=keywords prefix searches)
-	# optional, default is 0 (no limit)
-	# !*: http://sphinxsearch.com/docs/current.html#conf-expansion-limit
-	# expansion_limit		= 1000
-
-	# threaded server watchdog (only used in workers=threads mode)
-	# optional, values are 0 and 1, default is 1 (watchdog on)
-	# !*: Do not set this to 0.
-	# !*: http://sphinxsearch.com/docs/current.html#conf-watchdog
-	# watchdog				= 1
-
-	# SphinxQL compatibility mode (legacy columns and their names)
-	# optional, default is 0 (SQL compliant syntax and result sets)
-	# !*: Deprecated in v2.2.1
-	# compat_sphinxql_magics	= 1
-
-	# A maximum number of I/O operations (per second) that the RT chunks merge thread is allowed to start.
-	# This directive lets you throttle down the I/O impact arising from the OPTIMIZE statements.
-	# Optional, default is 0 (no limit).
-	# !*: http://sphinxsearch.com/docs/current.html#conf-rt-merge-iops
-	# rt_merge_iops = 0
-
-	# A maximum size of an I/O operation that the RT chunks merge thread is allowed to start.
-	# This directive lets you throttle down the I/O impact arising from the OPTIMIZE statements.
-	# Optional, default is 0 (no limit).
-	# !*: http://sphinxsearch.com/docs/current.html#conf-rt-merge-maxiosize
-	# rt_merge_maxiosize = 0
-}
-
-# --eof--
diff --git a/lib/copy_this/misc/sphinxsearch/toggle_search_type.php b/lib/copy_this/misc/sphinxsearch/toggle_search_type.php
deleted file mode 100644
index 17ed8f767..000000000
--- a/lib/copy_this/misc/sphinxsearch/toggle_search_type.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-require_once dirname(__FILE__) . '/../../www/config.php';
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once (NN_LIB . 'ReleaseSearch.php');
-
-
-if (!isset($argv[1]) || !in_array($argv[1], ['sphinx', 'standard'])) {
-	exit('Argument1 (required) is the method of search you would like to optimize for.  Choices are sphinx or standard.' . PHP_EOL .
-		'Argument2 (optional) is the storage engine and row_format you would like the releasesearch table to use. If not entered it will be left default.' . PHP_EOL .
-		'Choices are (c|d)(myisam|innodb) (Compressed|Dynamic)(MyISAM|InnoDB) entered like dinnodb.  This argument has no effect if optimizinf for Sphinx.' . PHP_EOL .
-		'Please stop all processing scripts before running this script.' . PHP_EOL);
-}
-
-switch ($argv[1]) {
-	case 'sphinx':
-		if (NN_RELEASE_SEARCH_TYPE == \ReleaseSearch::SPHINX) {
-			optimizeForSphinx(new \DB());
-		} else {
-			echo PHP_EOL . $pdo->log->error('Error, NN_RELEASE_SEARCH_TYPE in www/settings.php must be set to SPHINX to optimize for Sphinx!' . PHP_EOL);
-		}
-		break;
-	case 'standard':
-		revertToStandard(new \DB());
-		break;
-}
-
-// Optimize database usage for Sphinx full-text
-function optimizeForSphinx($pdo)
-{
-	echo PHP_EOL . $pdo->log->info('Dropping search triggers to save CPU and lower QPS. (Quick)' . PHP_EOL);
-	dropSearchTriggers($pdo);
-
-	echo $pdo->log->info('Truncating releasesearch table to free up memory pools/buffers.  (Quick)' . PHP_EOL);
-	$pdo->queryExec('TRUNCATE TABLE releasesearch');
-
-	echo $pdo->log->header('Optimization for Sphinx process complete!' . PHP_EOL);
-}
-
-//Revert database to standard schema
-function revertToStandard($pdo)
-{
-	$engFormat = '';
-
-	if (isset($argv[2]) && in_array($argv[2], ['cinnodb', 'dinnodb', 'cmyisam', 'dmyisam'])) {
-
-		switch ($argv[2]) {
-			case 'cinnnodb':
-				$engFormat = 'ENGINE = InnoDB ROW_FORMAT = Compressed';
-				break;
-			case 'dinnodb':
-				$engFormat = 'ENGINE = InnoDB ROW_FORMAT = Dynamic';
-				break;
-			case 'cmyisam':
-				$engFormat = 'ENGINE = MyISAM ROW_FORMAT = Compressed';
-				break;
-			case 'dmyisam':
-				$engFormat = 'ENGINE = MyISAM ROW_FORMAT = Dynamic';
-				break;
-		}
-	}
-
-	echo PHP_EOL . $pdo->log->info('Dropping old table data and recreating fresh from schema. (Quick)' . PHP_EOL);
-	$pdo->queryExec('DROP TABLE IF EXISTS releasesearch');
-	$pdo->queryExec(
-			sprintf("
-				CREATE TABLE releasesearch (
-					id INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-					releaseid INT(11) UNSIGNED NOT NULL,
-					guid VARCHAR(50) NOT NULL,
-					name VARCHAR(255) NOT NULL DEFAULT '',
-					searchname VARCHAR(255) NOT NULL DEFAULT '',
-					fromname VARCHAR(255) DEFAULT NULL,
-					PRIMARY KEY (id),
-					FULLTEXT INDEX ix_releasesearch_name_ft (name),
-					FULLTEXT INDEX ix_releasesearch_searchname_ft (searchname),
-					FULLTEXT INDEX ix_releasesearch_fromname_ft (fromname),
-					INDEX ix_releasesearch_releaseid (releaseid),
-					INDEX ix_releasesearch_guid (guid)
-				)
-				%s
-				DEFAULT CHARSET = utf8
-				COLLATE = utf8_unicode_ci
-				AUTO_INCREMENT = 1",
-				$engFormat
-			)
-	);
-
-	echo $pdo->log->info('Populating the releasearch table with initial data. (Slow)' . PHP_EOL);
-	$pdo->queryInsert('INSERT INTO releasesearch (releaseid, guid, name, searchname, fromname)
-				SELECT id, guid, name, searchname, fromname FROM releases');
-
-	echo $pdo->log->info('Adding the auto-population triggers. (Quick)' . PHP_EOL);
-
-	dropSearchTriggers($pdo);
-
-	$pdo->exec('
-				CREATE TRIGGER insert_search AFTER INSERT ON releases FOR EACH ROW
-					BEGIN
-						INSERT INTO releasesearch (releaseid, guid, name, searchname, fromname)
-						VALUES (NEW.id, NEW.guid, NEW.name, NEW.searchname, NEW.fromname);
-					END;
-
-				CREATE TRIGGER update_search AFTER UPDATE ON releases FOR EACH ROW
-					BEGIN
-						IF NEW.guid != OLD.guid
-						THEN UPDATE releasesearch
-							SET guid = NEW.guid
-							WHERE releaseid = OLD.id;
-						END IF;
-						IF NEW.name != OLD.name
-						THEN UPDATE releasesearch
-							SET name = NEW.name
-							WHERE releaseid = OLD.id;
-						END IF;
-						IF NEW.fromname != OLD.fromname
-						THEN UPDATE releasesearch
-							SET fromname = NEW.fromname
-							WHERE releaseid = OLD.id;
-						END IF;
-					END;
-
-				CREATE TRIGGER delete_search AFTER DELETE ON releases FOR EACH ROW
-					BEGIN
-						DELETE FROM releasesearch
-						WHERE releaseid = OLD.id;
-					END;'
-	);
-	echo $pdo->log->header('Standard search should once again be available.' . PHP_EOL);
-}
-
-//Drops existing triggers
-function dropSearchTriggers($pdo)
-{
-	$pdo->queryExec('DROP TRIGGER IF EXISTS insert_search');
-	$pdo->queryExec('DROP TRIGGER IF EXISTS update_search');
-	$pdo->queryExec('DROP TRIGGER IF EXISTS delete_search');
-}
diff --git a/lib/copy_this/misc/update_scripts/backfill.php b/lib/copy_this/misc/update_scripts/backfill.php
deleted file mode 100644
index 6748ad0f7..000000000
--- a/lib/copy_this/misc/update_scripts/backfill.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR."/lib/backfill.php");
-require_once(WWW_DIR . "/lib/nntp.php"); 
-
-$pdo = new DB();
-
-// Create the connection here and pass
-$nntp = new \NNTP(['Settings' => $pdo]);
-if ($nntp->doConnect() !== true) {
-	exit($pdo->log->error("Unable to connect to usenet."));
-}
-
-if (isset($argv[1]) && $argv[1] == 'all' && $argv[1] !== 'safe' && $argv[1] !== 'alph' && $argv[1] !== 'date' && !is_numeric($argv[1]) && !isset($argv[2])) {
-	$backfill = new \Backfill(['NNTP' => $nntp, 'Settings' => $pdo]);
-	$backfill->backfillAllGroups();
-} else if (isset($argv[1]) && $argv[1] !== 'all' && $argv[1] !== 'safe' && $argv[1] !== 'alph' && $argv[1] !== 'date' && !is_numeric($argv[1]) && !isset($argv[2])) {
-	$backfill = new \Backfill(['NNTP' => $nntp, 'Settings' => $pdo]);
-	$backfill->backfillAllGroups($argv[1]);
-} else if (isset($argv[1]) && $argv[1] !== 'all' && $argv[1] !== 'safe' && $argv[1] !== 'alph' && $argv[1] !== 'date' && !is_numeric($argv[1]) && isset($argv[2]) && is_numeric($argv[2])) {
-	$backfill = new \Backfill(['NNTP' => $nntp, 'Settings' => $pdo]);
-	$backfill->backfillAllGroups($argv[1], $argv[2]);
-} else if (isset($argv[1]) && $argv[1] !== 'all' && $argv[1] !== 'safe' && $argv[1] == 'alph' && $argv[1] !== 'date' && !is_numeric($argv[1]) && isset($argv[2]) && is_numeric($argv[2])) {
-	$backfill = new \Backfill(['NNTP' => $nntp, 'Settings' => $pdo]);
-	$backfill->backfillAllGroups('', $argv[2], 'normal');
-} else if (isset($argv[1]) && $argv[1] !== 'all' && $argv[1] !== 'safe' && $argv[1] !== 'alph' && $argv[1] == 'date' && !is_numeric($argv[1]) && isset($argv[2]) && is_numeric($argv[2])) {
-	$backfill = new \Backfill(['NNTP' => $nntp, 'Settings' => $pdo]);
-	$backfill->backfillAllGroups('', $argv[2], 'date');
-} else if (isset($argv[1]) && $argv[1] !== 'all' && $argv[1] == 'safe' && $argv[1] !== 'alph' && $argv[1] !== 'date' && !is_numeric($argv[1]) && isset($argv[2]) && is_numeric($argv[2])) {
-	$backfill = new \Backfill(['NNTP' => $nntp, 'Settings' => $pdo]);
-	$backfill->safeBackfill($argv[2]);
-} else {
-	exit($pdo->log->error("\nWrong set of arguments.\n"
-			. 'php backfill.php safe 200000		 ...: Backfill an active group alphabetically, x articles, the script stops,' . "\n"
-			. '					 ...: if the group has reached reached 2012-06-24, the next group will backfill.' . "\n"
-			. 'php backfill.php alph 200000 		 ...: Backfills all groups (sorted alphabetically) by number of articles' . "\n"
-			. 'php backfill.php date 200000 		 ...: Backfills all groups (sorted by least backfilled in time) by number of articles' . "\n"
-			. 'php backfill.php alt.binaries.ath 200000 ...: Backfills a group by name by number of articles' . "\n"
-			. 'php backfill.php all			 ...: Backfills all groups 1 at a time, by date (set in admin-view groups)' . "\n"
-			. 'php backfill.php alt.binaries.ath	 ...: Backfills a group by name, by date (set in admin-view groups)' . "\n"));
-}
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/config.php b/lib/copy_this/misc/update_scripts/config.php
deleted file mode 100644
index 48e96baf7..000000000
--- a/lib/copy_this/misc/update_scripts/config.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/../../www/config.php");
diff --git a/lib/copy_this/misc/update_scripts/import.php b/lib/copy_this/misc/update_scripts/import.php
deleted file mode 100644
index 46e0d4932..000000000
--- a/lib/copy_this/misc/update_scripts/import.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-define('FS_ROOT', realpath(dirname(__FILE__)));
-require_once(FS_ROOT . "/../../www/lib/framework/db.php");
-require_once(FS_ROOT . "/../../www/lib/releases.php");
-require_once(FS_ROOT . "/../../www/lib/nzbinfo.php");
-require_once(FS_ROOT . "/../../www/lib/util.php");
-require_once(FS_ROOT . "/../../www/lib/nzb.php");
-require_once(FS_ROOT . "/../../www/lib/category.php");
-
-$releases = new Releases();
-$db = new Db();
-$cat = new Category();
-$releaseRegex = new ReleaseRegex();
-$nzb = new NZB();
-$page = new Page();
-$num = 0;
-$usefilename = true;
-$dupecheck = true;
-$movefiles = true;
-$categoryoverride = -1;
-
-if (empty($argc) || $argc <= 1) {
-	$path = "./";
-} else {
-	$util = new Utility();
-	$path = (!$util->endsWith($argv[1], "/") ? $argv[1] . "/" : $argv[1]);
-	if (isset($argv[2]))
-		$usefilename = strtolower($argv[2]) == 'true';
-	if (isset($argv[3]))
-		$dupecheck = strtolower($argv[3]) == 'true';
-	if (isset($argv[4]))
-		$movefiles = strtolower($argv[4]) == 'true';
-	if (isset($argv[5]) && is_numeric($argv[5]))
-		$categoryoverride = $argv[5];
-}
-
-$groups = $db->query("SELECT id, name FROM groups");
-foreach ($groups as $group)
-	$siteGroups[$group["name"]] = $group["id"];
-
-echo "\nUsage: php import.php [path(string)] [usefilename(true/false)] [dupecheck(true/false)] [movefiles(true/false)] [overridecategory(number)]\n";
-
-$filestoprocess = glob($path . "*.{nzb,nzb.gz}", GLOB_BRACE);
-$items = count($filestoprocess);
-$matches = array();
-$digits = preg_match_all("/[0-9]/", count($filestoprocess), $matches);
-$dupepath = $path . "dupe/";
-$nogrouppath = $path . "nogroup/";
-$importedpath = $path . "imported/";
-$noregexpath = $path . "noregex/";
-$errorpath = $path . "error/";
-$missinggroups = array();
-echo "[Importing " . $items . " *.nzb file" . ($items != 1 ? "s" : "") . " from " . $path . ($usefilename ? " U" : " Not u") . "sing filename, " . ($dupecheck ? "C" : "Not c") . "hecking for duplicates" . ($categoryoverride != -1 ? ", Forcing category to " . $categoryoverride : "") . "]\n\n";
-
-foreach ($filestoprocess as $nzbFile) {
-	$groupID = -1;
-	$groupName = "";
-	$num++;
-	$nzbInfo = new nzbInfo;
-
-	if (!$nzbInfo->loadFromFile($nzbFile, true)) {
-		echo "Failed to load nzb from disk " . $nzbFile . "\n";
-		if ($movefiles) {
-			if (!file_exists($errorpath)) mkdir($errorpath);
-			if (!file_exists($errorpath . basename($nzbFile))) rename($nzbFile, $errorpath . basename($nzbFile));
-		}
-	} else {
-		if ($dupecheck) {
-			$dupes = $db->queryOneRow(sprintf("SELECT EXISTS(SELECT 1 FROM releases WHERE gid = %s) as total", $db->escapeString($nzbInfo->gid)));
-			if ($dupes['total'] > 0) {
-				echo sprintf("%0" . $digits . "d %.2f%% Error : Dupe %s - GID(%s)\n", $items - $num, $num / $items * 100, $nzbFile, $nzbInfo->gid);
-				if ($movefiles) {
-					if (!file_exists($dupepath)) mkdir($dupepath);
-					if (!file_exists($dupepath . basename($nzbFile))) rename($nzbFile, $dupepath . basename($nzbFile));
-				}
-				continue;
-			}
-		}
-
-		foreach ($nzbInfo->groups as $group) {
-			$group = (string)$group;
-			if (array_key_exists($group, $siteGroups)) {
-				$groupID = $siteGroups[$group];
-				$groupName = $group;
-				break;
-			}
-		}
-
-		if ($groupID == -1) {
-			echo sprintf("%0" . $digits . "d %.2f%% Error : Missing group %s - Group(%s)\n", $items - $num, $num / $items * 100, $nzbFile, str_replace("alt.binaries.", "a.b.", implode(",", $nzbInfo->groups)));
-			if ($movefiles) {
-				if (!file_exists($nogrouppath)) mkdir($nogrouppath);
-				if (!file_exists($nogrouppath . basename($nzbFile))) rename($nzbFile, $nogrouppath . basename($nzbFile));
-				$missinggroups = array_merge($missinggroups, $nzbInfo->groups);
-			}
-			continue;
-		} else {
-			if ($usefilename) {
-				$relguid = md5(uniqid());
-				$name = $releases->cleanReleaseName(str_replace(".nzb", "", basename($nzbFile)));
-				$catId = $cat->determineCategory($groupName, $name);
-				$relid = $releases->insertRelease($name, $nzbInfo->filecount, $groupID, $relguid, $catId, "", date("Y-m-d H:i:s", $nzbInfo->postedlast), $nzbInfo->poster, "", $page->site);
-				$db->queryExec(sprintf("update releases set totalpart = %d, size = %s, completion = %d, GID=%s where id = %d", $nzbInfo->filecount, $nzbInfo->filesize, $nzbInfo->completion, $db->escapeString($nzbInfo->gid), $relid));
-
-				$nzbfilename = $nzb->getNZBPath($relguid, $page->site->nzbpath, true);
-				$fp = gzopen($nzbfilename, "w");
-				if ($fp) {
-					gzwrite($fp, $nzbInfo->toNzb());
-					gzclose($fp);
-					echo sprintf("%0" . $digits . "d %.2f%% Imported %s\n", $items - $num, $num / $items * 100, $name);
-					if ($movefiles) {
-						if (!file_exists($importedpath)) mkdir($importedpath);
-						if (!file_exists($importedpath . basename($nzbFile))) rename($nzbFile, $importedpath . basename($nzbFile));
-					}
-				} else {
-					echo sprintf("%0" . $digits . "d %.2f%% Error : Failed to write file to disk %s\n", $items - $num, $num / $items * 100, $nzbfilename);
-					if ($movefiles) {
-						if (!file_exists($errorpath)) mkdir($errorpath);
-						if (!file_exists($errorpath . basename($nzbFile))) rename($nzbFile, $errorpath . basename($nzbFile));
-					}
-					$releases->delete($relid);
-				}
-			} else {
-				$numbins = 0;
-				$numparts = 0;
-				$binaryId = 0;
-				$groupRegexes = $releaseRegex->getForGroup($groupName);
-				foreach ($nzbInfo->nzb as $postFile) {
-					$regexMatches = array();
-
-					foreach ($groupRegexes as $groupRegex) {
-						$regexCheck = $releaseRegex->performMatch($groupRegex, $postFile["subject"]);
-						if ($regexCheck !== false) {
-							$regexMatches = $regexCheck;
-							break;
-						}
-					}
-
-					if (!empty($regexMatches)) {
-						$relparts = explode("/", $regexMatches['parts']);
-						$regexMatches['regcatid'] = ($categoryoverride != -1 ? $categoryoverride : $regexMatches['regcatid']);
-
-						$sql = sprintf("INSERT INTO binaries (name, fromname, date, xref, totalparts, groupid, binaryhash, dateadded,
-                        categoryid, regexid, reqid, procstat, relpart, reltotalpart, relname)
-                        values (%s, %s, %s, %s, %d, %d, %s, NOW(), %s, %d, %s, %d, %d, %d, %s )",
-							$db->escapeString($postFile["subject"]), $db->escapeString($postFile["poster"]),
-							$db->escapeString(date("Y-m-d H:i:s", $postFile["posted"])),
-							$db->escapeString(implode(': ', $nzbInfo->groups) . ':'),
-							$postFile["segmenttotal"], $groupID,
-							$db->escapeString(md5($postFile["subject"] . $postFile["poster"] . $groupID)),
-							$regexMatches['regcatid'],
-							$regexMatches['regexid'], $db->escapeString($regexMatches['reqid']),
-							Releases::PROCSTAT_TITLEMATCHED, $relparts[0], $relparts[1], $db->escapeString(str_replace('_', ' ', $regexMatches['name']))
-						);
-						$binaryId = $db->queryInsert($sql);
-						$numbins++;
-
-						if (count($postFile['segments']) > 0) {
-							$sql = "INSERT INTO parts (binaryid, messageid, number, partnumber, size) values ";
-							foreach ($postFile['segments'] as $fileSegmentNum => $fileSegment) {
-								$sql .= sprintf("(%d, %s, 0, %d, %d),", $binaryId, $db->escapeString($fileSegment), $fileSegmentNum, $postFile['segmentbytes'][$fileSegmentNum]);
-								$numparts++;
-							}
-							$db->queryInsert(substr($sql, 0, -1));
-						}
-					}
-				}
-				if ($binaryId != 0) {
-					echo sprintf("%0" . $digits . "d %.2f%% Imported %s (%d:%s-%d/%d)\n", $items - $num, $num / $items * 100, basename($nzbFile), $regexMatches['regcatid'], $regexMatches['regexid'], $numbins, $numparts);
-					if ($movefiles) {
-						if (!file_exists($importedpath)) mkdir($importedpath);
-						if (!file_exists($importedpath . basename($nzbFile))) rename($nzbFile, $importedpath . basename($nzbFile));
-					}
-				} else {
-					echo sprintf("%0" . $digits . "d %.2f%% Error : No Regex Match %s\n", $items - $num, $num / $items * 100, basename($nzbFile));
-					if ($movefiles) {
-						if (!file_exists($noregexpath)) mkdir($noregexpath);
-						if (!file_exists($noregexpath . basename($nzbFile))) rename($nzbFile, $noregexpath . basename($nzbFile));
-					}
-				}
-			}
-		}
-	}
-}
-
-if (count($missinggroups) > 0) {
-	$missinggroups = array_unique($missinggroups);
-	$grpsql = "INSERT INTO groups (name, backfill_target, first_record, first_record_postdate, last_record, last_record_postdate, last_updated, minfilestoformrelease, minsizetoformrelease, active, regexmatchonly, description) VALUES ('%s', 0, 0, null, 0, null, null, null, null, 0, 1, 'Added by import');\n";
-	$grpout = "";
-	foreach ($missinggroups as $mg)
-		$grpout .= sprintf($grpsql, $mg);
-
-	@file_put_contents(sprintf("missing_groups_%s.sql", uniqid()), $grpout);
-}
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/require.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/require.php
deleted file mode 100644
index feb4bbe95..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/require.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require_once dirname(dirname(dirname(dirname(dirname(__DIR__))))) . DIRECTORY_SEPARATOR . 'www' . DIRECTORY_SEPARATOR . 'config.php';
-
-if (is_file(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'settings.php')) {
-	require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'settings.php';
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php
deleted file mode 100644
index 676cbc101..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.do_not_run/switch.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-
-if (!isset($argv[1])) {
-	exit("This script is not intended to be run manually." . PHP_EOL);
-}
-
-require_once dirname(__FILE__) . '/../../../../../www/config.php';
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/backfill.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(NN_LIB . 'RequestIDLocal.php');
-
-
-// Are we coming from python or php ? $options[0] => (string): python|php
-// The type of process we want to do: $options[1] => (string): releases
-$options = explode('  ', $argv[1]);
-
-switch ($options[1]) {
-
-	// Runs backFill interval or all.
-	// $options[2] => (string)group name, Name of group to work on.
-	// $options[3] => (int)   backfill type from tmux settings. 1 = Backfill interval , 2 = Bakfill all
-	case 'backfill':
-		if (in_array((int)$options[3], [1, 2])) {
-			$pdo = new \DB();
-			$value = $pdo->queryOneRow("SELECT value FROM tmux WHERE setting = 'backfill_qty'");
-			if ($value !== false) {
-				$nntp = nntp($pdo);
-				(new \Backfill())->backfillAllGroups($options[2], ($options[3] == 1 ? '' : $value['value']));
-			}
-		}
-		break;
-
-	/*  BackFill up to x number of articles for all groups.
-	 *
-	 * $options[2] => (string) Group name.
-	 * $options[3] => (int)    Quantity of articles to download.
-	 */
-	case 'backfill_all_quantity':
-		$pdo = new \DB();
-		$nntp = nntp($pdo);
-		(new \Backfill())->backfillAllGroups($options[2], $options[3]);
-		break;
-
-	// BackFill a single group, 10000 parts.
-	// $options[2] => (string)group name, Name of group to work on.
-	case 'backfill_all_quick':
-		$pdo = new \DB();
-		$nntp = nntp($pdo);
-		(new \Backfill())->backfillAllGroups($options[2], 10000, 'normal');
-		break;
-
-	/* Get a range of article headers for a group.
-	 *
-	 * $options[2] => (string) backfill/binaries
-	 * $options[3] => (string) Group name.
-	 * $options[4] => (int)    First article number in range.
-	 * $options[5] => (int)    Last article number in range.
-	 * $options[6] => (int)    Number of threads.
-	 */
-	case 'get_range':
-		$pdo = new \DB();
-		$nntp = nntp($pdo);
-		$groups = new \Groups();
-		$s = new Sites();
-		$site = $s->get();
-		$groupMySQL = $groups->getByName($options[3]);
-		if ($nntp->isError($nntp->selectGroup($groupMySQL['name']))) {
-			if ($nntp->isError($nntp->dataError($nntp, $groupMySQL['name']))) {
-				return;
-			}
-		}
-		$binaries = new \Binaries();
-		$return = $binaries->scan($groupMySQL, $options[4], $options[5], ($site->safepartrepair == 1 ? 'update' : 'backfill'));
-		if (empty($return)) {
-			exit();
-		}
-		$columns = [];
-		switch ($options[2]) {
-			case 'binaries':
-				if ($return['lastArticleNumber'] <= $groupMySQL['last_record']){
-					exit();
-				}
-				$columns[1] = sprintf(
-					'last_record_postdate = %s',
-					$pdo->from_unixtime(
-						(is_numeric($return['lastArticleDate']) ? $return['lastArticleDate'] : strtotime($return['lastArticleDate']))
-					)
-				);
-				$columns[2] = sprintf('last_record = %s', $return['lastArticleNumber']);
-				$query = sprintf(
-					'UPDATE groups SET %s, %s, last_updated = NOW() WHERE id = %d AND last_record < %s',
-					$columns[1],
-					$columns[2],
-					$groupMySQL['id'],
-					$return['lastArticleNumber']
-				);
-				break;
-			case 'backfill':
-				if ($return['firstArticleNumber'] >= $groupMySQL['first_record']){
-					exit();
-				}
-				$columns[1] = sprintf(
-					'first_record_postdate = %s',
-					$pdo->from_unixtime(
-						(is_numeric($return['firstArticleDate']) ? $return['firstArticleDate'] : strtotime($return['firstArticleDate']))
-					)
-				);
-				$columns[2] = sprintf('first_record = %s', $return['firstArticleNumber']);
-				$query = sprintf(
-					'UPDATE groups SET %s, %s, last_updated = NOW() WHERE id = %d AND first_record > %s',
-					$columns[1],
-					$columns[2],
-					$groupMySQL['id'],
-					$return['firstArticleNumber']
-				);
-				break;
-			default:
-				exit();
-		}
-		$pdo->queryExec($query);
-		break;
-
-	/* Do part repair for a group.
-	 *
-	 * $options[2] => (string) Group name.
-	 */
-	case 'part_repair':
-		$pdo = new \DB();
-		$groups = new \Groups(['Settings' => $pdo]);
-		$groupMySQL = $groups->getByName($options[2]);
-		$nntp = nntp($pdo);
-		// Select group, here, only once
-		$data = $nntp->selectGroup($groupMySQL['name']);
-		if ($nntp->isError($data)) {
-			if ($nntp->dataError($nntp, $groupMySQL['name']) === false) {
-				exit();
-			}
-		}
-		(new \Binaries())->partRepair($groupMySQL);
-		break;
-
-	// Process releases.
-	// $options[2] => (string)groupCount, number of groups terminated by _ | (int)groupid, group to work on
-	case 'releases':
-		$pdo = new \DB();
-		$releases = new \Releases(['Settings' => $pdo]);
-
-		//Runs function that are per group
-		if (is_numeric($options[2])) {
-			processReleases($releases, $options[2]);
-
-		} else {
-
-			// Run functions that run on releases table after all others completed.
-			$groupCount = rtrim($options[2], '_');
-			if (!is_numeric($groupCount)) {
-				$groupCount = 1;
-			}
-			$releases->deletedReleasesByGroup();
-			$releases->deleteReleases();
-			$releases->processRequestIDs('', (5000 * $groupCount), true);
-			$releases->processRequestIDs('', (1000 * $groupCount), false);
-			$releases->categorizeReleases(2);
-		}
-		break;
-
-	// Process all local requestid for a single group.
-	// $options[2] => (int)groupid, group to work on
-	case 'requestid':
-		if (is_numeric($options[2])) {
-			(new \RequestIDLocal(['Echo' => true]))->lookupRequestIDs(['GroupID' => $options[2], 'limit' => 5000]);
-		}
-		break;
-
-	/* Update a single group's article headers.
-	 *
-	 * $options[2] => (string) Group name.
-	 */
-	case 'update_group_headers':
-		$pdo = new \DB();
-		$nntp = nntp($pdo);
-		$groups = new \Groups();
-		$groupMySQL = $groups->getByName($options[2]);
-		(new \Binaries())->updateGroup($groupMySQL);
-		break;
-
-
-	// Do a single group (update_binaries/backFill/update_releases/postprocess).
-	// $options[2] => (int)groupid, group to work on
-	case 'update_per_group':
-		if (is_numeric($options[2])) {
-
-			$pdo = new \DB();
-
-			// Get the group info from MySQL.
-			$groupMySQL = $pdo->queryOneRow(sprintf('SELECT * FROM groups WHERE id = %d', $options[2]));
-
-			if ($groupMySQL === false) {
-				exit('ERROR: Group not found with id ' . $options[2] . PHP_EOL);
-			}
-
-			// Connect to NNTP.
-			$nntp = nntp($pdo);
-			$backFill = new \Backfill();
-
-			// Update the group for new binaries.
-			(new \Binaries())->updateGroup($groupMySQL);
-
-			// BackFill the group with 20k articles.
-			$backFill->backfillAllGroups($groupMySQL['name'], 20000, 'normal');
-
-			// Create releases.
-			processReleases(new \Releases(['Settings' => $pdo]), $options[2]);
-
-			// Post process the releases.
-			(new \ProcessAdditional(['Echo' => true, 'NNTP' => $nntp, 'Settings' => $pdo]))->start($options[2]);
-			(new \Info(['Echo' => true, 'Settings' => $pdo]))->processNfoFiles($nntp, $options[2]);
-
-		}
-		break;
-
-	// Post process additional and NFO.
-	// $options[2] => (char)Letter or number a-f 0-9, first character of release guid.
-	case 'pp_additional':
-	case 'pp_nfo':
-		if (charCheck($options[2])) {
-			$pdo = new \DB();
-
-			// Create the connection here and pass, this is for post processing, so check for alternate.
-			$nntp = nntp($pdo, true);
-
-			if ($options[1] === 'pp_nfo') {
-				(new \Info(['Echo' => true, 'Settings' => $pdo]))->processNfoFiles($nntp, '', $options[2]);
-			} else {
-				(new \ProcessAdditional(['Echo' => true, 'NNTP' => $nntp, 'Settings' => $pdo]))->start('', $options[2]);
-			}
-		}
-		break;
-
-	/* Post process movies.
-	 *
-	 * $options[2] (char) Single character, first letter of release guid.
-	 * $options[3] (int)  Process all releases or renamed releases only.
-	 */
-	case 'pp_movie':
-		if (charCheck($options[2])) {
-			$pdo = new \DB();
-			(new \PProcess(['Settings' => $pdo]))->processMovies('', $options[2], (isset($options[3]) ? $options[3] : ''));
-		}
-		break;
-
-	/* Post process TV.
-	 *
-	 * $options[2] (char) Single character, first letter of release guid.
-	 * $options[3] (int)  Process all releases or renamed releases only.
-	 */
-	case 'pp_tv':
-		if (charCheck($options[2])) {
-			$pdo = new \DB();
-			(new \PProcess(['Settings' => $pdo]))->processTv('', $options[2], (isset($options[3]) ? $options[3] : ''));
-		}
-		break;
-}
-
-/**
- * Create / process releases for a groupid.
- *
- * @param \Releases $releases
- * @param int             $groupID
- */
-function processReleases($releases, $groupID)
-{
-    $releases->applyRegex($groupID);
-	$releases->processIncompleteBinaries($groupID);
-	$releases->createReleases($groupID);
-	$releases->deleteBinaries($groupID);
-}
-
-/**
- * Check if the character contains a-f or 0-9.
- *
- * @param string $char
- *
- * @return bool
- */
-function charCheck($char)
-{
-	if (in_array($char, ['a','b','c','d','e','f','0','1','2','3','4','5','6','7','8','9'])) {
-		return true;
-	}
-	return false;
-}
-
-/**
- * Check if the group should be processed.
- *
- * @param \DB $pdo
- * @param int                $groupID
- */
-function collectionCheck(&$pdo, $groupID)
-{
-	if ($pdo->queryOneRow(sprintf('SELECT id FROM collections_%d LIMIT 1', $groupID)) === false) {
-		exit();
-	}
-}
-
-/**
- * Connect to usenet, return NNTP object.
- *
- * @param \DB $pdo
- * @param bool               $alternate Use alternate NNTP provider.
- *
- * @return NNTP
- */
-function &nntp(&$pdo, $alternate = false)
-{
-	$nntp = new \NNTP(['Settings' => $pdo]);
-	$s = new Sites();
-	$site = $s->get();
-	if (($alternate && $site->alternate_nntp == 1 ? $nntp->doConnect(true, true) : $nntp->doConnect()) !== true) {
-		exit("ERROR: Unable to connect to usenet." . PHP_EOL);
-	}
-
-	return $nntp;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.gitignore b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.gitignore
deleted file mode 100644
index 9f37e3549..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/settings.php
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/Forking.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/Forking.php
deleted file mode 100644
index 4ee323e4a..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/Forking.php
+++ /dev/null
@@ -1,1105 +0,0 @@
-<?php
-require_once (NN_MULTI . 'forkdaemon-php' . DS . 'fork_daemon.php');
-require_once(NN_LIB . 'framework' .DS . 'db.php');
-require_once(NN_LIB . 'ColorCLI.php');
-require_once(NN_LIB . 'site.php');
-require_once(NN_LIB . 'nntp.php');
-require_once(NN_LIB . 'postprocess.php');
-require_once(NN_LIB . 'RequestID.php');
-require_once(NN_TMUX . 'lib' . DS . 'Pprocess.php');
-require_once(NN_TMUX . 'lib' . DS . 'Enzebe.php');
-
-
-
-/**
- * Class Forking
- *
- * This forks various newznab scripts.
- *
- * For example, you get all the id's of the active groups in the groups table, you then iterate over them and spawn
- * processes of misc/update_binaries.php passing the group id's.
- *
- * @package nzedb\libraries
- */
-class Forking extends \fork_daemon
-{
-	const OUTPUT_NONE     = 0; // Don't display child output.
-	const OUTPUT_REALTIME = 1; // Display child output in real time.
-	const OUTPUT_SERIALLY = 2; // Display child output when child is done.
-
-	/**
-	 * Setup required parent / self vars.
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->_colorCLI = new \ColorCLI();
-		$s = new \Sites();
-		$this->site = $s->get();
-
-		$this->register_logging(
-			[0 => $this, 1 => 'logger'],
-			(defined('NN_MULTIPROCESSING_LOG_TYPE') ? NN_MULTIPROCESSING_LOG_TYPE : \fork_daemon::LOG_LEVEL_INFO)
-		);
-
-		$this->max_work_per_child_set(1);
-		if (defined('NN_MULTIPROCESSING_MAX_CHILD_WORK')) {
-			$this->max_work_per_child_set(NN_MULTIPROCESSING_MAX_CHILD_WORK);
-		}
-
-		$this->child_max_run_time_set(1800);
-		if (defined('NN_MULTIPROCESSING_MAX_CHILD_TIME')) {
-			$this->child_max_run_time_set(NN_MULTIPROCESSING_MAX_CHILD_TIME);
-		}
-
-		// Use a single exit method for all children, makes things easier.
-		$this->register_parent_child_exit([0 => $this, 1 => 'childExit']);
-
-		$this->outputType = self::OUTPUT_REALTIME;
-		if (defined('NN_MULTIPROCESSING_CHILD_OUTPUT_TYPE')) {
-			switch (NN_MULTIPROCESSING_CHILD_OUTPUT_TYPE) {
-				case 0:
-					$this->outputType = self::OUTPUT_NONE;
-					break;
-				case 1:
-					$this->outputType = self::OUTPUT_REALTIME;
-					break;
-				case 2:
-					$this->outputType = self::OUTPUT_SERIALLY;
-					break;
-				default:
-					$this->outputType = self::OUTPUT_REALTIME;
-			}
-		}
-
-		$this->dnr_path = PHP_BINARY . ' ' . NN_MULTI . '.do_not_run' . DS . 'switch.php "php  ';
-	}
-
-	/**
-	 * Setup the class to work on a type of work, then process the work.
-	 * Valid work types:
-	 *
-	 * @param string $type    The type of multiProcessing to do : backfill, binaries, releases, postprocess
-	 * @param array  $options Array containing arguments for the type of work.
-	 *
-	 * @throws ForkingException
-	 */
-	public function processWorkType($type, array $options = [])
-	{
-		// Set/reset some variables.
-		$startTime = microtime(true);
-		$this->workType = $type;
-		$this->workTypeOptions = $options;
-		$this->processAdditional = $this->processNFO = $this->processTV = $this->processMovies = $this->tablePerGroup = $this->ppRenamedOnly = false;
-		$this->work = [];
-
-		// Init Settings here, as forking causes errors when it's destroyed.
-		$this->pdo = new \DB();
-
-		// Process extra work that should not be forked and done before forking.
-		$this->processStartWork();
-
-		// Get work to fork.
-		$this->getWork();
-
-		// Now we destroy settings, to prevent errors from forking.
-		unset($this->pdo);
-
-		// Process the work we got.
-		$this->processWork();
-
-		// Process extra work that should not be forked and done after.
-		$this->processEndWork();
-
-		if (NN_ECHOCLI) {
-			$this->_colorCLI->doEcho(
-				$this->_colorCLI->header(
-					'Multi-processing for ' . $this->workType . ' finished in ' . (microtime(true) - $startTime) .
-					' seconds at ' . date(DATE_RFC2822) . '.' . PHP_EOL
-				)
-			);
-		}
-	}
-
-	/**
-	 * Only post process renamed movie / tv releases?
-	 * @var bool
-	 */
-	private $ppRenamedOnly;
-
-	/**
-	 * Get work for our workers to work on, set the max child processes here.
-	 */
-	private function getWork()
-	{
-		$maxProcesses = 0;
-
-		switch ($this->workType) {
-
-			case 'backfill':
-				$maxProcesses = $this->backfillMainMethod();
-				break;
-
-			case 'binaries':
-				$maxProcesses = $this->binariesMainMethod();
-				break;
-
-			case 'fixRelNames_nfo':
-			case 'fixRelNames_filename':
-			case 'fixRelNames_md5':
-			case 'fixRelNames_par2':
-			case 'fixRelNames_miscsorter':
-			case 'fixRelNames_predbft':
-				$maxProcesses = $this->fixRelNamesMainMethod();
-				break;
-
-			case 'releases':
-				$maxProcesses = $this->releasesMainMethod();
-				break;
-
-			case 'postProcess_ama':
-				$this->processSingle();
-				break;
-
-			case 'postProcess_add':
-				$maxProcesses = $this->postProcessAddMainMethod();
-				break;
-
-			case 'postProcess_mov':
-				$this->ppRenamedOnly = (isset($this->workTypeOptions[0]) && $this->workTypeOptions[0] === true ? true : false);
-				$maxProcesses = $this->postProcessMovMainMethod();
-				break;
-
-			case 'postProcess_nfo':
-				$maxProcesses = $this->postProcessNfoMainMethod();
-				break;
-
-			case 'postProcess_sha':
-				$this->processSharing();
-				break;
-
-			case 'postProcess_tv':
-				$this->ppRenamedOnly = (isset($this->workTypeOptions[0]) && $this->workTypeOptions[0] === true ? true : false);
-				$maxProcesses = $this->postProcessTvMainMethod();
-				break;
-
-			case 'request_id':
-				$maxProcesses = $this->requestIDMainMethod();
-				break;
-
-			case 'safe_backfill':
-				$maxProcesses = $this->safeBackfillMainMethod();
-				break;
-
-			case 'safe_binaries':
-				$maxProcesses = $this->safeBinariesMainMethod();
-				break;
-
-			case 'update_per_group':
-				$maxProcesses = $this->updatePerGroupMainMethod();
-				break;
-		}
-
-		$this->setMaxProcesses($maxProcesses);
-	}
-
-	/**
-	 * Process work if we have any.
-	 */
-	private function processWork()
-	{
-		$this->_workCount = count($this->work);
-		if ($this->_workCount > 0) {
-
-			if (NN_ECHOCLI) {
-				$this->_colorCLI->doEcho(
-					$this->_colorCLI->header(
-						'Multi-processing started at ' . date(DATE_RFC2822) . ' for ' . $this->workType . ' with ' . $this->_workCount .
-						' job(s) to do using a max of ' . $this->maxProcesses . ' child process(es).'
-					)
-				);
-			}
-
-			$this->addwork($this->work);
-			$this->process_work(true);
-		} else {
-			if (NN_ECHOCLI) {
-				$this->_colorCLI->doEcho(
-					$this->_colorCLI->header('No work to do!')
-				);
-			}
-		}
-	}
-
-	/**
-	 * Process any work that does not need to be forked, but needs to run at the end.
-	 */
-	private function processStartWork()
-	{
-		switch ($this->workType) {
-			//case 'safe_backfill':
-			case 'safe_binaries':
-				$this->_executeCommand(
-					PHP_BINARY . ' ' . NN_NIX . 'tmux/bin/update_groups.php'
-				);
-				break;
-		}
-	}
-
-	/**
-	 * Process any work that does not need to be forked, but needs to run at the end.
-	 */
-	private function processEndWork()
-	{
-		switch ($this->workType) {
-			case 'releases':
-				if ($this->tablePerGroup === true) {
-					$this->_executeCommand(
-						$this->dnr_path . 'releases  ' . count($this->work) . '_"'
-					);
-				}
-				break;
-			case 'update_per_group':
-				$this->_executeCommand(
-					$this->dnr_path . 'releases  ' . count($this->work) . '_"'
-				);
-				break;
-			case 'safe_backfill':
-				$this->_executeCommand(
-					$this->dnr_path . 'backfill_all_quantity  ' . $this->safeBackfillGroup . '  1000' . '"'
-				);
-				break;
-		}
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////////////////////////// All backFill code here ////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * @return int
-	 */
-	private function backfillMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'backFillChildWorker']);
-		// The option for backFill is for doing up to x articles. Else it's done by date.
-		$this->work = $this->pdo->query(
-			sprintf(
-				'SELECT name %s FROM groups WHERE backfill = 1',
-				($this->workTypeOptions[0] === false ? '' : (', ' . $this->workTypeOptions[0] . ' AS max'))
-			)
-		);
-		return $this->site->backfillthreads;
-	}
-
-	public function backFillChildWorker($groups, $identifier = '')
-	{
-		foreach ($groups as $group) {
-			$this->_executeCommand(
-				PHP_BINARY . ' ' . NN_UPDATE . 'backfill.php ' .
-			$group['name'] . (isset($group['max']) ? (' ' . $group['max']) : '')
-			);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	private function safeBackfillMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'safeBackfillChildWorker']);
-
-		$run = $this->pdo->query("SELECT (SELECT value FROM tmux WHERE setting = 'backfill_qty') AS qty, (SELECT value FROM tmux WHERE setting = 'backfill') AS backfill, (SELECT value FROM tmux WHERE setting = 'backfill_order') AS orderby, (SELECT value FROM tmux WHERE setting = 'backfill_days') AS days, (SELECT value FROM site WHERE setting = 'maxmssgs') AS maxmsgs");
-		$threads = $this->site->backfillthreads;
-
-		$orderby = "ORDER BY a.last_record ASC";
-		switch ((int)$run[0]['orderby']) {
-			case 1:
-				$orderby = "ORDER BY first_record_postdate DESC";
-				break;
-
-			case 2:
-				$orderby = "ORDER BY first_record_postdate ASC";
-				break;
-
-			case 3:
-				$orderby = "ORDER BY name ASC";
-				break;
-
-			case 4:
-				$orderby = "ORDER BY name DESC";
-				break;
-
-			case 5:
-				$orderby = "ORDER BY a.last_record DESC";
-				break;
-		}
-
-		$backfilldays = '';
-		if ($run[0]['days'] == 1) {
-			$backfilldays = "backfill_target";
-		} elseif ($run[0]['days'] == 2) {
-			$backfilldays = round(abs(strtotime(date("Y-m-d")) - strtotime($this->site->safebackfilldate)) / 86400);;
-		}
-
-		$data = $this->pdo->queryOneRow(
-			sprintf(
-				"SELECT g.name,
-				g.first_record AS our_first,
-				MAX(a.first_record) AS their_first,
-				MAX(a.last_record) AS their_last
-				FROM groups g
-				INNER JOIN shortgroups a ON g.name = a.name
-				WHERE g.first_record IS NOT NULL
-				AND g.first_record_postdate IS NOT NULL
-				AND g.backfill = 1
-				AND (NOW() - INTERVAL %s DAY) < g.first_record_postdate
-				GROUP BY a.name, a.last_record, g.name, g.first_record
-				%s",
-				$backfilldays,
-				$orderby
-			)
-		);
-
-		$count = 0;
-		if ($data['name']) {
-			$this->safeBackfillGroup = $data['name'];
-
-			$count = ($data['our_first'] - $data['their_first']);
-		}
-
-		if ($count > 0) {
-			if ($count > ($run[0]['qty'] * $threads)) {
-				$geteach = ceil(($run[0]['qty'] * $threads) / $run[0]['maxmsgs']);
-			} else {
-				$geteach = $count / $run[0]['maxmsgs'];
-			}
-
-			$queue = array();
-			for ($i = 0; $i <= $geteach - 1; $i++) {
-				$queue[$i] = sprintf("get_range  backfill  %s  %s  %s  %s", $data['name'], $data['our_first'] - $i * $run[0]['maxmsgs'] - $run[0]['maxmsgs'], $data['our_first'] - $i * $run[0]['maxmsgs'] - 1, $i + 1);
-			}
-			$this->work = $queue;
-		}
-
-		return $threads;
-	}
-
-	public function safeBackfillChildWorker($ranges, $identifier = '')
-	{
-		foreach ($ranges as $range) {
-			$this->_executeCommand(
-				$this->dnr_path . $range . '"'
-			);
-		}
-		return;
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////////////////////////// All binaries code here ////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	private function binariesMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'binariesChildWorker']);
-		$this->work = $this->pdo->query(
-			sprintf(
-				'SELECT name, %d AS max FROM groups WHERE active = 1',
-				$this->workTypeOptions[0]
-			)
-		);
-		return $this->site->binarythreads;
-	}
-
-	public function binariesChildWorker($groups, $identifier = '')
-	{
-		foreach ($groups as $group) {
-			$this->_executeCommand(
-				PHP_BINARY . ' ' . NN_UPDATE  . 'update_binaries.php ' . $group['name'] . ' ' . $group['max']
-			);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	private function safeBinariesMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'safeBinariesChildWorker']);
-
-		$maxmssgs = $this->site->maxmssgs;
-		$threads = $this->site->binarythreads;
-
-		$groups = $this->pdo->query("SELECT g.name AS groupname, g.last_record AS our_last, a.last_record AS their_last FROM groups g INNER JOIN shortgroups a ON g.active = 1 AND g.name = a.name ORDER BY a.last_record DESC");
-
-		if ($groups) {
-			$i = 1;
-			$queue = array();
-			foreach ($groups as $group) {
-				if ($group['our_last'] == 0) {
-					$queue[$i] = sprintf("update_group_headers  %s", $group['groupname']);
-					$i++;
-				} else {
-					//only process if more than 20k headers available and skip the first 20k
-					$count = $group['their_last'] - $group['our_last'] - 20000;
-					//echo "count: " . $count . "maxmsgs x2: " . ($maxmssgs * 2) . PHP_EOL;
-					if ($count <= $maxmssgs * 2) {
-						$queue[$i] = sprintf("update_group_headers  %s", $group['groupname']);
-						$i++;
-					} else {
-						$queue[$i] = sprintf("part_repair  %s", $group['groupname']);
-						$i++;
-						$geteach = floor($count / $maxmssgs);
-						$remaining = $count - $geteach * $maxmssgs;
-						//echo "maxmssgs: " . $maxmssgs . " geteach: " . $geteach . " remaining: " . $remaining . PHP_EOL;
-						for ($j = 0; $j < $geteach; $j++) {
-							$queue[$i] = sprintf("get_range  binaries  %s  %s  %s  %s", $group['groupname'], $group['our_last'] + $j * $maxmssgs + 1, $group['our_last'] + $j * $maxmssgs + $maxmssgs, $i);
-							$i++;
-						}
-						//add remainder to queue
-						$queue[$i] = sprintf("get_range  binaries  %s  %s  %s  %s", $group['groupname'], $group['our_last'] + ($j + 1) * $maxmssgs + 1, $group['our_last'] + ($j + 1) * $maxmssgs + $remaining + 1, $i);
-						$i++;
-					}
-				}
-			}
-			//var_dump($queue);
-			$this->work = $queue;
-		}
-
-		return $threads;
-	}
-
-	public function safeBinariesChildWorker($ranges, $identifier = '')
-	{
-		foreach ($ranges as $range) {
-			$this->_executeCommand(
-				$this->dnr_path . $range . '"'
-			);
-		}
-		return;
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////////////////////// All fix release names code here ///////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	private function fixRelNamesMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'fixRelNamesChildWorker']);
-
-		$join = "";
-		$where = "";
-		$groupby = "GROUP BY guidchar";
-		$orderby = "ORDER BY guidchar ASC";
-		$rowLimit = "LIMIT 16";
-		$extrawhere = "AND r.prehashid = 0 AND r.nzbstatus = 1";
-		$select = "DISTINCT LEFT(r.guid, 1) AS guidchar, COUNT(*) AS count";
-
-
-		$threads = $this->site->fixnamethreads;
-		$maxperrun = $this->site->fixnamesperrun;
-
-		if ($threads > 16) {
-			$threads = 16;
-		}
-		switch($this->workTypeOptions[0]) {
-			case "md5":
-				$join = "LEFT OUTER JOIN releasefiles rf ON r.id = rf.releaseid AND rf.ishashed = 1";
-				$where = "r.ishashed = 1 AND r.dehashstatus BETWEEN -6 AND 0";
-				break;
-
-			case "nfo":
-				$where = "r.proc_nfo = 0 AND r.nfostatus = 1";
-				break;
-
-			case "filename":
-				$join = "INNER JOIN releasefiles rf ON r.id = rf.releaseid";
-				$where = "r.proc_files = 0";
-				break;
-
-			case "par2":
-				$where = "r.proc_par2 = 0";
-				break;
-
-			case "miscsorter":
-				$where = "r.nfostatus = 1 AND r.proc_nfo = 1 AND r.proc_sorter = 0 AND r.isrenamed = 0";
-				break;
-
-			case "predbft":
-				$extrawhere = "";
-				$where = "1=1";
-				$rowLimit = sprintf("LIMIT %s", $threads);
-				break;
-		}
-
-		$datas = $this->pdo->query(sprintf("SELECT %s FROM releases r %s WHERE %s %s %s %s %s", $select, $join, $where, $extrawhere, $groupby, $orderby, $rowLimit));
-
-		if ($datas) {
-			$count = 0;
-			$queue = array();
-			foreach ($datas as $firstguid) {
-				if ($count >= $threads) {
-					$count = 0;
-				}
-				$count++;
-				if ($firstguid['count'] < $maxperrun) {
-					$limit = $firstguid['count'];
-				} else {
-					$limit = $maxperrun;
-				}
-				if ($limit > 0) {
-					$queue[$count] = sprintf("%s %s %s %s", $this->workTypeOptions[0], $firstguid['guidchar'], $limit, $count);
-				}
-			}
-			$this->work = $queue;
-		}
-		return $threads;
-	}
-
-	public function fixRelNamesChildWorker($guids, $identifier = '')
-	{
-		foreach ($guids as $guid) {
-			$this->_executeCommand(
-				PHP_BINARY . ' ' . NN_NIX . 'tmux/bin/groupfixrelnames.php "' . $guid . '"' . ' true'
-			);
-		}
-		return;
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////////////////////////// All releases code here ////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	private function releasesMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'releasesChildWorker']);
-
-		$this->tablePerGroup = ($this->site->tablepergroup == 1 ? true : false);
-		if ($this->tablePerGroup === true) {
-
-			$groups = $this->pdo->queryDirect('SELECT id FROM groups WHERE (active = 1 OR backfill = 1)');
-
-			if ($groups instanceof \Traversable) {
-				foreach($groups as $group) {
-					if ($this->pdo->queryOneRow(sprintf('SELECT id FROM binaries_%d  LIMIT 1',$group['id'])) !== false) {
-						$this->work[] = ['id' => $group['id']];
-					}
-				}
-			}
-		} else {
-			$this->work = $this->pdo->query('SELECT name FROM groups WHERE (active = 1 OR backfill = 1)');
-		}
-
-		return $this->site->releasethreads;
-	}
-
-	public function releasesChildWorker($groups, $identifier = '')
-	{
-		foreach ($groups as $group) {
-			if ($this->tablePerGroup === true) {
-				$this->_executeCommand(
-					$this->dnr_path . 'releases  ' .  $group['id'] . '"'
-				);
-			} else {
-				$this->_executeCommand(
-					PHP_BINARY . ' ' . NN_TMUX . 'bin' . DS . 'update_releases.php 1 false ' . $group['name']
-				);
-			}
-		}
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	/////////////////////////////////////// All post process code here /////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Only 1 exit method is used for post process, since they are all similar.
-	 *
-	 * @param        $groups
-	 * @param string $identifier
-	 */
-	public function postProcessChildWorker($groups, $identifier = '')
-	{
-		foreach ($groups as $group) {
-			$type = '';
-			if ($this->processAdditional) {
-				$type = 'pp_additional  ';
-			} else if ($this->processNFO) {
-				$type = 'pp_nfo  ';
-			} else if ($this->processMovies) {
-				$type = 'pp_movie  ';
-			} else if ($this->processTV) {
-				$type = 'pp_tv  ';
-			}
-
-			if ($type !== '') {
-				$this->_executeCommand(
-					$this->dnr_path . $type .  $group['id'] . (isset($group['renamed']) ? ('  ' . $group['renamed']) : '') . '"'
-				);
-			}
-		}
-	}
-
-	private $ppAddMinSize = '';
-	private $ppAddMaxSize = '';
-
-	/**
-	 * Check if we should process Additional's.
-	 * @return bool
-	 */
-	private function checkProcessAdditional()
-	{
-		$this->ppAddMinSize =
-			(string)($this->site->minsizetopostprocess != '') ? $this->site->minsizetopostprocess : 1;
-		$this->ppAddMinSize = ($this->ppAddMinSize === 0 ? '' : 'AND r.size > ' . ($this->ppAddMinSize * 1048576));
-		$this->ppAddMaxSize =
-			(string)($this->site->maxsizetopostprocess != '') ? $this->site->maxsizetopostprocess : 100;
-		$this->ppAddMaxSize = ($this->ppAddMaxSize === 0 ? '' : 'AND r.size < ' . ($this->ppAddMaxSize * 1073741824));
-		return (
-			$this->pdo->queryOneRow(
-				sprintf('
-					SELECT r.id
-					FROM releases r
-					LEFT JOIN category c ON c.id = r.categoryid
-					WHERE r.nzbstatus = %d
-					AND r.passwordstatus BETWEEN -6 AND -1
-					AND r.haspreview = -1
-					AND c.disablepreview = 0
-					%s %s
-					LIMIT 1',
-					\Enzebe::NZB_ADDED,
-					$this->ppAddMaxSize,
-					$this->ppAddMinSize
-				)
-			) === false ? false : true
-		);
-	}
-
-	private function postProcessAddMainMethod()
-	{
-		$maxProcesses = 1;
-		if ($this->checkProcessAdditional() === true) {
-			$this->processAdditional = true;
-			$this->register_child_run([0 => $this, 1 => 'postProcessChildWorker']);
-			$this->work = $this->pdo->query(
-				sprintf('
-					SELECT LEFT(r.guid, 1) AS id
-					FROM releases r
-					LEFT JOIN category c ON c.id = r.categoryid
-					WHERE r.nzbstatus = %d
-					AND r.passwordstatus BETWEEN -6 AND -1
-					AND r.haspreview = -1
-					AND c.disablepreview = 0
-					%s %s
-					GROUP BY LEFT(r.guid, 1)
-					LIMIT 16',
-					\Enzebe::NZB_ADDED,
-					$this->ppAddMaxSize,
-					$this->ppAddMinSize
-				)
-			);
-			$maxProcesses = $this->site->postthreads;
-		}
-		return $maxProcesses;
-	}
-
-	private $nfoQueryString = '';
-
-	/**
-	 * Check if we should process NFO's.
-	 * @return bool
-	 */
-	private function checkProcessNfo()
-	{
-		if ($this->site->lookupnfo == 1) {
-			$this->nfoQueryString = \Info::NfoQueryString($this->pdo);
-			return (
-				$this->pdo->queryOneRow(
-					sprintf(
-						'SELECT r.id FROM releases r WHERE 1=1 %s LIMIT 1',
-						$this->nfoQueryString
-					)
-				) === false ? false : true
-			);
-		}
-		return false;
-	}
-
-	private function postProcessNfoMainMethod()
-	{
-		$maxProcesses = 1;
-		if ($this->checkProcessNfo() === true) {
-			$this->processNFO = true;
-			$this->register_child_run([0 => $this, 1 => 'postProcessChildWorker']);
-			$this->work = $this->pdo->query(
-				sprintf('
-					SELECT LEFT(r.guid, 1) AS id
-					FROM releases r
-					WHERE 1=1 %s
-					GROUP BY LEFT(r.guid, 1)
-					LIMIT 16',
-					$this->nfoQueryString
-				)
-			);
-			$maxProcesses = $this->site->nfothreads;
-		}
-		return $maxProcesses;
-	}
-
-	/**
-	 * Check if we should process Movies.
-	 * @return bool
-	 */
-	private function checkProcessMovies()
-	{
-		if ($this->site->lookupimdb > 0) {
-			return (
-				$this->pdo->queryOneRow(
-					sprintf('
-						SELECT id
-						FROM releases
-						WHERE nzbstatus = %d
-						AND imdbid IS NULL
-						AND categoryid BETWEEN 2000 AND 2999
-						%s %s
-						LIMIT 1',
-						\Enzebe::NZB_ADDED,
-						($this->site->lookupimdb == 2 ? 'AND isrenamed = 1' : ''),
-						($this->ppRenamedOnly ? 'AND isrenamed = 1' : '')
-					)
-				) === false ? false : true
-			);
-		}
-		return false;
-	}
-
-	private function postProcessMovMainMethod()
-	{
-		$maxProcesses = 1;
-		if ($this->checkProcessMovies() === true) {
-			$this->processMovies = true;
-			$this->register_child_run([0 => $this, 1 => 'postProcessChildWorker']);
-			$this->work = $this->pdo->query(
-				sprintf('
-					SELECT LEFT(guid, 1) AS id, %d AS renamed
-					FROM releases
-					WHERE nzbstatus = %d
-					AND imdbid IS NULL
-					AND categoryid BETWEEN 2000 AND 2999
-					%s %s
-					GROUP BY LEFT(guid, 1)
-					LIMIT 16',
-					($this->ppRenamedOnly ? 2 : 1),
-					\Enzebe::NZB_ADDED,
-					($this->site->lookupimdb == 2 ? 'AND isrenamed = 1' : ''),
-					($this->ppRenamedOnly ? 'AND isrenamed = 1' : '')
-				)
-			);
-			$maxProcesses = $this->site->postthreadsnon;
-		}
-		return $maxProcesses;
-	}
-
-	/**
-	 * Check if we should process TV's.
-	 * @return bool
-	 */
-	private function checkProcessTV()
-	{
-		if ($this->site->lookuptvrage > 0) {
-			return (
-				$this->pdo->queryOneRow(
-					sprintf('
-						SELECT id
-						FROM releases
-						WHERE nzbstatus = %d
-						AND size > 1048576
-						AND rageid = -1
-						AND categoryid BETWEEN 5000 AND 5999
-						%s %s
-						LIMIT 1',
-						\Enzebe::NZB_ADDED,
-						($this->site->lookuptvrage == 2 ? 'AND isrenamed = 1' : ''),
-						($this->ppRenamedOnly ? 'AND isrenamed = 1' : '')
-					)
-				) === false ? false : true
-			);
-		}
-		return false;
-	}
-
-	private function postProcessTvMainMethod()
-	{
-		$maxProcesses = 1;
-		if ($this->checkProcessTV() === true) {
-			$this->processTV = true;
-			$this->register_child_run([0 => $this, 1 => 'postProcessChildWorker']);
-			$this->work = $this->pdo->query(
-				sprintf('
-					SELECT LEFT(guid, 1) AS id, %d AS renamed
-					FROM releases
-					WHERE nzbstatus = %d
-					AND rageid = -1
-					AND size > 1048576
-					AND categoryid BETWEEN 5000 AND 5999
-					%s %s
-					GROUP BY LEFT(guid, 1)
-					LIMIT 16',
-					($this->ppRenamedOnly ? 2 : 1),
-					\Enzebe::NZB_ADDED,
-					($this->site->lookuptvrage == 2 ? 'AND isrenamed = 1' : ''),
-					($this->ppRenamedOnly ? 'AND isrenamed = 1' : '')
-				)
-			);
-			$maxProcesses = $this->site->postthreadsnon;
-		}
-		return $maxProcesses;
-	}
-
-	/**
-	 * Process sharing.
-	 *
-	 * @return bool
-	 */
-	private function processSharing()
-	{
-		$sharing = $this->pdo->queryOneRow('SELECT enabled FROM sharing');
-		if ($sharing !== false && $sharing['enabled'] == 1) {
-			$nntp = new \NNTP(['Settings' => $this->pdo]);
-			if (($this->site->alternate_nntp == 1 ? $nntp->doConnect(true, true) : $nntp->doConnect()) === true) {
-				(new PProcess(['Settings' => $this->pdo, 'ColorCLI' => $this->_colorCLI]))->processSharing($nntp);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Process all that require a single thread.
-	 */
-	private function processSingle()
-	{
-		$postProcess = new PProcess(['Settings' => $this->pdo, 'ColorCLI' => $this->_colorCLI]);
-		$pp = new PostProcess(true);
-		//$postProcess->processAnime();
-		$postProcess->processBooks();
-		$pp->processBooks();
-		$postProcess->processConsoles();
-		$postProcess->processGames();
-		$postProcess->processMusic();
-		$pp->processMusic();
-		$postProcess->processXXX();
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	////////////////////////////////////// All requestid code goes here ////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	private function requestIDMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'requestIDChildWorker']);
-		$this->work = $this->pdo->query(
-			sprintf('
-				SELECT DISTINCT(g.id)
-				FROM groups g
-				INNER JOIN releases r ON r.groupid = g.id
-				WHERE g.active = 1
-				AND r.nzbstatus = %d
-				AND r.prehashid = 0
-				AND r.isrequestid = 1
-				AND r.reqidstatus = %d',
-				\Enzebe::NZB_ADDED,
-				\RequestID::REQID_UPROC
-			)
-		);
-		return $this->site->reqidthreads;
-	}
-
-	public function requestIDChildWorker($groups, $identifier = '')
-	{
-		foreach ($groups as $group) {
-			$this->_executeCommand(
-				$this->dnr_path . 'requestid  ' .  $group['id'] . '"'
-			);
-		}
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	///////////////////////////////// All "update_per_Group" code goes here ////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	private function updatePerGroupMainMethod()
-	{
-		$this->register_child_run([0 => $this, 1 => 'updatePerGroupChildWorker']);
-		$this->work = $this->pdo->query('SELECT id FROM groups WHERE (active = 1 OR backfill = 1)');
-		return $this->site->releasethreads;
-	}
-
-	public function updatePerGroupChildWorker($groups, $identifier = '')
-	{
-		foreach ($groups as $group) {
-			$this->_executeCommand(
-				$this->dnr_path . 'update_per_group  ' .  $group['id'] . '"'
-			);
-		}
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////////////////////////////// Various methods ///////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Execute a shell command, use the appropriate PHP function based on user setting.
-	 *
-	 * @param string $command
-	 */
-	protected function _executeCommand($command)
-	{
-		switch($this->outputType) {
-			case self::OUTPUT_NONE:
-				exec($command);
-				break;
-			case self::OUTPUT_REALTIME:
-				passthru($command);
-				break;
-			case self::OUTPUT_SERIALLY:
-				echo shell_exec($command);
-				break;
-		}
-	}
-
-	/**
-	 * Set the amount of max child processes.
-	 * @param int $maxProcesses
-	 */
-	private function setMaxProcesses($maxProcesses)
-	{
-		// Check if override setting is on.
-		if (defined('NN_MULTIPROCESSING_MAX_CHILDREN_OVERRIDE') && NN_MULTIPROCESSING_MAX_CHILDREN_OVERRIDE > 0) {
-			$maxProcesses = NN_MULTIPROCESSING_MAX_CHILDREN_OVERRIDE;
-		}
-
-		if (is_numeric($maxProcesses) && $maxProcesses > 0) {
-			switch ($this->workType) {
-				case 'postProcess_tv':
-				case 'postProcess_mov':
-				case 'postProcess_nfo':
-				case 'postProcess_add':
-					if ($maxProcesses > 16) {
-						$maxProcesses = 16;
-					}
-			}
-			$this->maxProcesses = (int)$maxProcesses;
-			$this->max_children_set($this->maxProcesses);
-		} else {
-			$this->max_children_set(1);
-		}
-	}
-
-	/**
-	 * Echo a message to CLI.
-	 *
-	 * @param string $message
-	 */
-	public function logger($message)
-	{
-		if (NN_ECHOCLI) {
-			echo $message . PHP_EOL;
-		}
-	}
-
-	/**
-	 * This method is executed whenever a child is finished doing work.
-	 *
-	 * @param string $pid        The PID numbers.
-	 * @param string $identifier Optional identifier to give a PID a name.
-	 */
-	public function childExit($pid, $identifier = '')
-	{
-		if (NN_ECHOCLI) {
-			$this->_colorCLI->doEcho(
-				$this->_colorCLI->header(
-					'Process id #' . $pid . ' has completed.' . PHP_EOL .
-					'There are ' . ($this->forked_children_count - 1) . ' process(es) still active with ' .
-					(--$this->_workCount) . ' job(s) left in the queue.' . PHP_EOL
-				)
-			);
-		}
-	}
-
-	/**
-	 *
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	////////////////////////////////////////// All class vars here /////////////////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Path to do not run folder.
-	 * @var string
-	 */
-	private $dnr_path = '';
-
-	/**
-	 * Work to work on.
-	 * @var array
-	 */
-	private $work = [];
-
-	/**
-	 * How much work do we have to do?
-	 * @var int
-	 */
-	public $_workCount = 0;
-
-	/**
-	 * The type of work we want to work on.
-	 * @var string
-	 */
-	private $workType = '';
-
-	/**
-	 * List of passed in options for the current work type.
-	 * @var array
-	 */
-	private $workTypeOptions = [];
-
-	/**
-	 * Max amount of child processes to do work at a time.
-	 * @var int
-	 */
-	private $maxProcesses = 1;
-
-	/**
-	 * Are we using tablePerGroup?
-	 * @var bool
-	 */
-	private $tablePerGroup = false;
-
-	/**
-	 * Group used for safe backfill.
-	 * @var string
-	 */
-	private $safeBackfillGroup = '';
-
-	/**
-	 * @var \DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	private $processAdditional = false; // Should we process additional?
-	private $processNFO = false;        // Should we process NFOs?
-	private $processMovies = false;     // Should we process Movies?
-	private $processTV = false;         // Should we process TV?
-}
-
-class ForkingException extends \Exception {}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/ForkingImportNZB.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/ForkingImportNZB.php
deleted file mode 100644
index 13f9692e4..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/ForkingImportNZB.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once('Forking.php');
-
-
-/**
- * Class ForkingImportNZB
- *
- * Multi-processing of NZB Import.
- */
-class ForkingImportNZB extends Forking
-{
-	/**
-	 *
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'settings' => new DB(),
-		];
-		$options += $defaults;
-
-		parent::__construct($options);
-		$this->importPath = (PHP_BINARY . ' ' . NN_TMUX . 'lib' . DS . 'testing' . DS . 'nzb-import.php ');
-		$this->pdo = $options['settings'];
-	}
-
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-	private $deleteComplete;
-	private $deleteFailed;
-	private $useFileName;
-	private $maxPerProcess;
-
-	public function start($folder, $maxProcesses, $deleteComplete, $deleteFailed, $useFileName, $maxPerProcess)
-	{
-		$startTime = microtime(true);
-		$directories = glob($folder . '/*' , GLOB_ONLYDIR);
-
-		$this->_workCount = count($directories);
-
-		if ($this->_workCount == 0) {
-			echo $this->pdo->log->error('No sub-folders were found in your specified folder (' . $folder . ').');
-			exit();
-		}
-
-		if (NN_ECHOCLI) {
-			echo $this->pdo->log->header(
-				'Multi-processing started at ' . date(DATE_RFC2822) . ' with ' . $this->_workCount .
-				' job(s) to do using a max of ' . $maxProcesses . ' child process(es).'
-			);
-		}
-
-		$this->deleteComplete = $deleteComplete;
-		$this->deleteFailed = $deleteFailed;
-		$this->useFileName = $useFileName;
-		$this->maxPerProcess = $maxPerProcess;
-
-		$this->max_children_set($maxProcesses);
-		$this->register_child_run([0 => $this, 1 => 'importChildWorker']);
-		$this->child_max_run_time_set(86400);
-		$this->addwork($directories);
-		$this->process_work(true);
-
-		if (NN_ECHOCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->header(
-					'Multi-processing for import finished in ' . (microtime(true) - $startTime) .
-					' seconds at ' . date(DATE_RFC2822) . '.' . PHP_EOL
-				)
-			);
-		}
-	}
-
-	public function importChildWorker($directories, $identifier = '')
-	{
-		foreach ($directories as $directory) {
-			$this->_executeCommand(
-				$this->importPath  . '"' .
-				$directory . '" ' .
-				$this->deleteComplete . ' ' .
-				$this->deleteFailed . ' ' .
-				$this->useFileName . ' ' .
-				$this->maxPerProcess
-			);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/README.md b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/README.md
deleted file mode 100644
index 54d031838..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-####These multi-processing scripts require a POSIX compliant operating system and the PHP pcntl extension.
-
-
-####binaries.php
-This will download new headers for all active groups using your binaries threads site setting.
-You can pass a argument, a number to limit the max amount of new headers to download.
-
-
-####releases.php
-This is identical to the python releases_threaded.py
-This will create new releases/delete unwanted releases, process requestid's, categorize releases by group
-using your release threads site setting.
-
-
-####update_per_group.php:
-This is identical to the python update_threaded.py
-This will download new headers for all active groups, backfill 20k headers from all backfill enabled groups,
-create new releases/delete unwanted releases, process requestid's, categorize releases, process additional and NFO
-by group using your release threads site setting.
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/backfill.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/backfill.php
deleted file mode 100644
index b43e5edc7..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/backfill.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-// Check if argument 1 is numeric, which is to limit article count.
-(new \Forking())->processWorkType(
-	'backfill', (isset($argv[1]) && is_numeric($argv[1]) && $argv[1] > 0 ? array(0 => $argv[1]) : array(0 => false))
-);
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/binaries.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/binaries.php
deleted file mode 100644
index 70826294d..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/binaries.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-if (!isset($argv[1]) || !is_numeric($argv[1])) {
-	exit(
-		'Argument 1 => (Number) Set to 0 to ignore, else fetches up to x new headers for every active group.' . PHP_EOL
-	);
-}
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-(new \Forking())->processWorkType('binaries', array(0 => $argv[1]));
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/fixrelnames.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/fixrelnames.php
deleted file mode 100644
index f06853b83..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/fixrelnames.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-if (!isset($argv[1]) || !in_array($argv[1], ['nfo', 'filename', 'md5', 'par2', 'miscsorter', 'predbft'])) {
-	exit(
-		'First argument (mandatory):' . PHP_EOL .
-		'nfo => Attempt to fix release name using the nfo.' . PHP_EOL .
-		'filename => Attempt to fix release name using the filenames.' . PHP_EOL .
-		'md5 => Attempt to fix release name using the MD5.' . PHP_EOL .
-		'par2 => Attempt to fix release name using the par2.' . PHP_EOL .
-		'miscsorter => Attempt to fix release name using magic.' . PHP_EOL .
-		'predbft  => Attempt to fix release name using Predb full text matching.' . PHP_EOL .  PHP_EOL
-	);
-}
-
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-(new \Forking())->processWorkType('fixRelNames_' . $argv[1], [0 => $argv[1]]);
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/LICENSE b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/LICENSE
deleted file mode 100644
index 0b50498ee..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013 Barracuda Networks, Inc.
-
-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.
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/README.md b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/README.md
deleted file mode 100644
index 333b64221..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# PHP Fork Daemon
-A library to make setup and management of forking daemons in PHP easy.
-
-## Features
--   Easy management of PHP forks
--   Return result of children by callback or polling parent for results
--   Splitting work units into buckets
--   Preforking callbacks to manage resources before forking
--   Dynamic setting of number of children / work per child
-
-## Usage
-Check out the examples in the examples directory
-``php example/blocking.php``
-
-## Caveats
--	You need to specify ``declare(ticks=1);`` before inclusion of the fork-daemon library, otherwise signals wont be handled. This *must* be done in the main PHP file, as ``declare(ticks=N);`` only works for the file in which it is declared and the files which that file includes. Reference: [PHP Documentation](http://php.net/manual/en/control-structures.declare.php#control-structures.declare.ticks)
-
-## License
-Copyright 2013 Barracuda Networks, Inc.
-Licensed under the MIT License
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/composer.json b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/composer.json
deleted file mode 100644
index b6efb800a..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "barracudanetworks/forkdaemon-php",
-    "type": "library",
-    "description": "A library to make setup and management of forking daemons in PHP easy.",
-    "keywords": ["forking", "daemons", "php"],
-    "homepage": "https://github.com/barracudanetworks/forkdaemon-php",
-    "license": "MIT",
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "files": [ "fork_daemon.php" ]
-    }
-}
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/blocking.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/blocking.php
deleted file mode 100644
index 8053b8a53..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/blocking.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-declare(ticks=1);
-
-require_once(__DIR__ . '/../fork_daemon.php');
-
-/* setup forking daemon */
-$server = new fork_daemon();
-$server->max_children_set(5);
-$server->max_work_per_child_set(3);
-$server->register_child_run("process_child_run");
-$server->register_parent_child_exit("process_child_exit");
-$server->register_logging("logger", fork_daemon::LOG_LEVEL_ALL);
-
-test_blocking();
-
-function test_blocking()
-{
-	global $server;
-
-	echo "Adding 10 units of work\n";
-
-	$data_set = array();
-	for($i=0; $i<10; $i++) $data_set[] = $i;
-	shuffle($data_set);
-	$server->addwork($data_set);
-
-	/* process work blocking mode */
-	$server->process_work(true);
-
-	echo "Adding 15 more units of work\n";
-
-	$data_set = array();
-	for($i=10; $i<25; $i++) $data_set[] = $i;
-	shuffle($data_set);
-	$server->addwork($data_set);
-
-	/* process work blocking mode */
-	$server->process_work(true);
-}
-
-/*
- * CALLBACK FUNCTIONS
- */
-
-/* registered call back function */
-function process_child_run($data_set, $identifier = "")
-{
-	echo "I'm child working on: " . implode(",", $data_set) . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-	sleep(rand(4,8));
-}
-
-/* registered call back function */
-function process_child_exit($pid, $identifier = "")
-{
-	echo "Child $pid just finished" . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-}
-
-/* registered call back function */
-function logger($message)
-{
-	echo "logger: " . $message . PHP_EOL;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/bucket.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/bucket.php
deleted file mode 100644
index 69c770a81..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/bucket.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(ticks=1);
-
-require_once(__DIR__ . '/../fork_daemon.php');
-
-/* setup forking daemon */
-$server = new fork_daemon();
-$server->max_children_set(5);
-$server->max_work_per_child_set(3);
-$server->register_child_run("process_child_run");
-$server->register_parent_child_exit("process_child_exit");
-$server->register_logging("logger", fork_daemon::LOG_LEVEL_ALL);
-
-test_bucket();
-
-function test_bucket()
-{
-	global $server;
-
-	define("BUCKET1", 1);
-	define("BUCKET2", 2);
-
-	$server->add_bucket(BUCKET1);
-	$server->add_bucket(BUCKET2);
-	$server->max_children_set(2, BUCKET1);
-	$server->max_children_set(5, BUCKET2);
-
-	$data_set = array();
-	for($i=0; $i<100; $i++) $data_set[] = $i;
-
-	/* add work to bucket 1 */
-	shuffle($data_set);
-	$server->addwork($data_set, "", BUCKET1);
-
-	/* add work to bucket 2 */
-	shuffle($data_set);
-	$server->addwork($data_set, "", BUCKET2);
-
-	/* wait until all work allocated */
-	while ($server->work_sets_count(BUCKET1) > 0 || $server->work_sets_count(BUCKET2) > 0)
-	{
-		echo "work set count(1): " . $server->work_sets_count(BUCKET1) . ", count(2): " . $server->work_sets_count(BUCKET2) . "\n";
-		if ($server->work_sets_count(BUCKET1) > 0) $server->process_work(false, BUCKET1);
-		if ($server->work_sets_count(BUCKET2) > 0) $server->process_work(false, BUCKET2);
-		sleep(1);
-	}
-
-	/* wait until all children finish */
-	while ($server->children_running() > 0)
-	{
-		echo "waiting for " . $server->children_running() . " children to finish\n";
-		sleep(1);
-	}
-}
-
-/*
- * CALLBACK FUNCTIONS
- */
-
-/* registered call back function */
-function process_child_run($data_set, $identifier = "")
-{
-	echo "I'm child working on: " . implode(",", $data_set) . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-	sleep(rand(4,8));
-}
-
-/* registered call back function */
-function process_child_exit($pid, $identifier = "")
-{
-	echo "Child $pid just finished" . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-}
-
-/* registered call back function */
-function logger($message)
-{
-	echo "logger: " . $message . PHP_EOL;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/identifier.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/identifier.php
deleted file mode 100644
index 0805f29a6..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/identifier.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-declare(ticks=1);
-
-require_once(__DIR__ . '/../fork_daemon.php');
-
-/* setup forking daemon */
-$server = new fork_daemon();
-$server->max_children_set(5);
-$server->max_work_per_child_set(3);
-$server->register_child_run("process_child_run");
-$server->register_parent_child_exit("process_child_exit");
-$server->register_logging("logger", fork_daemon::LOG_LEVEL_ALL);
-
-test_identifier();
-
-function test_identifier()
-{
-	global $server;
-
-	$server->child_single_work_item_set(true);
-	$server->max_work_per_child_set(1);
-
-	echo "Adding 100 units of work\n";
-
-	/* add work */
-	$data_set = array();
-	for($i=0; $i<100; $i++) $data_set[] = $i;
-	shuffle($data_set);
-	$data_set = array_chunk($data_set, 3);
-
-	$i = 0;
-	foreach ($data_set as $item)
-	{
-		$server->addwork($item, "IDn$i");
-		$i++;
-	}
-
-	echo "Processing work in non-blocking mode\n";
-
-	/* process work non blocking mode */
-	$server->process_work(false);
-
-	/* wait until all work allocated */
-	while ($server->work_sets_count() > 0)
-	{
-		echo "work set count: " . $server->work_sets_count() . "\n";
-		$server->process_work(false);
-		sleep(1);
-	}
-
-	/* wait until all children finish */
-	while ($server->children_running() > 0)
-	{
-		echo "waiting for " . $server->children_running() . " children to finish\n";
-		sleep(1);
-	}
-}
-
-/*
- * CALLBACK FUNCTIONS
- */
-
-/* registered call back function */
-function process_child_run($data_set, $identifier = "")
-{
-	echo "I'm child working on: " . implode(",", $data_set) . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-	sleep(rand(4,8));
-}
-
-/* registered call back function */
-function process_child_exit($pid, $identifier = "")
-{
-	echo "Child $pid just finished" . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-}
-
-/* registered call back function */
-function logger($message)
-{
-	echo "logger: " . $message . PHP_EOL;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/nonblocking.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/nonblocking.php
deleted file mode 100644
index cfde30f3e..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/nonblocking.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(ticks=1);
-
-require_once(__DIR__ . '/../fork_daemon.php');
-
-/* setup forking daemon */
-$server = new fork_daemon();
-$server->max_children_set(5);
-$server->max_work_per_child_set(3);
-$server->register_child_run("process_child_run");
-$server->register_parent_child_exit("process_child_exit");
-$server->register_logging("logger", fork_daemon::LOG_LEVEL_ALL);
-
-test_nonblocking();
-
-function test_nonblocking()
-{
-	global $server;
-
-	echo "Adding 100 units of work\n";
-
-	/* add work */
-	$data_set = array();
-	for($i=0; $i<100; $i++) $data_set[] = $i;
-	shuffle($data_set);
-	$server->addwork($data_set);
-
-	echo "Processing work in non-blocking mode\n";
-
-	/* process work non blocking mode */
-	$server->process_work(false);
-
-	/* wait until all work allocated */
-	while ($server->work_sets_count() > 0)
-	{
-		echo "work set count: " . $server->work_sets_count() . "\n";
-		$server->process_work(false);
-		sleep(1);
-	}
-
-	/* wait until all children finish */
-	while ($server->children_running() > 0)
-	{
-		echo "waiting for " . $server->children_running() . " children to finish\n";
-		sleep(1);
-	}
-}
-
-/*
- * CALLBACK FUNCTIONS
- */
-
-/* registered call back function */
-function process_child_run($data_set, $identifier = "")
-{
-	echo "I'm child working on: " . implode(",", $data_set) . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-	sleep(rand(4,8));
-}
-
-/* registered call back function */
-function process_child_exit($pid, $identifier = "")
-{
-	echo "Child $pid just finished" . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-}
-
-/* registered call back function */
-function logger($message)
-{
-	echo "logger: " . $message . PHP_EOL;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/result_callback.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/result_callback.php
deleted file mode 100644
index 609b25e47..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/result_callback.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Sample of passing in work and getting back results using a callback
- */
-
-declare(ticks=1);
-
-require_once(__DIR__ . '/../fork_daemon.php');
-
-/* setup forking daemon */
-$server = new fork_daemon();
-$server->max_children_set(5);
-$server->max_work_per_child_set(3);
-$server->register_child_run("process_child_run");
-$server->register_parent_child_exit("process_child_exit");
-$server->register_logging("logger", fork_daemon::LOG_LEVEL_ALL);
-$server->register_parent_results("process_results");
-
-test_nonblocking();
-
-function test_nonblocking()
-{
-	global $server;
-
-	echo "Adding 100 units of work\n";
-
-	/* add work */
-	$data_set = array();
-	for($i=0; $i<100; $i++) $data_set[] = $i;
-	shuffle($data_set);
-	$server->addwork($data_set);
-
-	echo "Processing work in non-blocking mode\n";
-
-	/* process work non blocking mode */
-	$server->process_work(false);
-
-	/* wait until all work allocated */
-	while ($server->work_sets_count() > 0)
-	{
-		echo "work set count: " . $server->work_sets_count() . "\n";
-		$server->process_work(false);
-		sleep(1);
-	}
-
-	/* wait until all children finish */
-	while ($server->children_running() > 0)
-	{
-		echo "waiting for " . $server->children_running() . " children to finish\n";
-		sleep(1);
-	}
-}
-
-/*
- * CALLBACK FUNCTIONS
- */
-
-function process_results($results, $identifier = "")
-{
-	echo "Results came back: " . implode(",", $results) . ($identifier == "" ? "" : " (id:$identifier)") . PHP_EOL;
-}
-
-/* registered call back function */
-function process_child_run($data_set, $identifier = "")
-{
-	echo "I'm child working on: " . implode(",", $data_set) . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-
-	$result = array_sum($data_set);
-	sleep(rand(1,3));
-
-	// return results
-	return $result;
-}
-
-/* registered call back function */
-function process_child_exit($pid, $identifier = "")
-{
-	echo "Child $pid just finished" . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-}
-
-/* registered call back function */
-function logger($message)
-{
-	echo "logger: " . $message . PHP_EOL;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/result_deferred.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/result_deferred.php
deleted file mode 100644
index cfc66dd67..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/examples/result_deferred.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Sample of passing in work and getting back results using a call at the
- * end of the child processing
- */
-
-declare(ticks=1);
-
-require_once(__DIR__ . '/../fork_daemon.php');
-
-/* setup forking daemon */
-$server = new fork_daemon();
-$server->max_children_set(100);
-$server->max_work_per_child_set(3);
-$server->store_result_set(true);
-$server->register_child_run("process_child_run");
-$server->register_parent_child_exit("process_child_exit");
-$server->register_logging("logger", fork_daemon::LOG_LEVEL_ALL);
-// no callback with this method since we check results at the end
-
-test_nonblocking();
-
-// since deferred results, check at the end
-$results = $server->get_all_results();
-var_dump($results);
-echo "Sum:   " . array_sum($results) . PHP_EOL;
-echo "Count: " . count($results) . PHP_EOL;
-
-function test_nonblocking()
-{
-	global $server;
-
-	echo "Adding 100 units of work\n";
-
-	/* add work */
-	$data_set = array();
-	for($i=0; $i<100; $i++) $data_set[] = $i;
-	shuffle($data_set);
-	$server->addwork($data_set);
-
-	echo "Processing work in non-blocking mode\n";
-	echo "Sum:   " . array_sum($data_set) . PHP_EOL;
-
-	/* process work non blocking mode */
-	$server->process_work(false);
-
-	/* wait until all work allocated */
-	while ($server->work_sets_count() > 0)
-	{
-		echo "work set count: " . $server->work_sets_count() . "\n";
-		$server->process_work(false);
-		sleep(1);
-	}
-
-	/* wait until all children finish */
-	while ($server->children_running() > 0)
-	{
-		echo "waiting for " . $server->children_running() . " children to finish\n";
-		sleep(1);
-	}
-}
-
-/*
- * CALLBACK FUNCTIONS
- */
-
-/* registered call back function */
-function process_child_run($data_set, $identifier = "")
-{
-	echo "I'm child working on: " . implode(",", $data_set) . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-
-	sleep(rand(1,3));
-
-	// just do a sum and return it as the result
-	$result = array_sum($data_set);
-
-	// return results
-	return $result;
-}
-
-/* registered call back function */
-function process_child_exit($pid, $identifier = "")
-{
-	echo "Child $pid just finished" . ($identifier == "" ? "" : " (id:$identifier)") . "\n";
-}
-
-/* registered call back function */
-function logger($message)
-{
-	echo "logger: " . $message . PHP_EOL;
-}
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/fork_daemon.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/fork_daemon.php
deleted file mode 100644
index 52f50cac6..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/forkdaemon-php/fork_daemon.php
+++ /dev/null
@@ -1,1855 +0,0 @@
-<?php
-/**
- * System process functions
- * @category system
- * @package fork_daemon
- */
-
-class fork_daemon
-{
-	/**
-	 * Child process status constants
-	 *
-	 * @access public
-	 */
-	const WORKER = 0;
-	const HELPER = 1;
-	const STOPPED = 2;
-
-	/**
-	 * Bucket constants
-	 *
-	 * @access public
-	 */
-	const DEFAULT_BUCKET = -1;
-
-	/**
-	 * Logging constants
-	 *
-	 * @access public
-	 */
-	const LOG_LEVEL_ALL = -1;
-	const LOG_LEVEL_CRIT = 2;
-	const LOG_LEVEL_WARN = 4;
-	const LOG_LEVEL_INFO = 6;
-	const LOG_LEVEL_DEBUG = 7;
-
-	/**
-	 * Socket constants
-	 *
-	 * @access public
-	 */
-	const SOCKET_HEADER_SIZE = 4;
-
-	/**
-	 * Variables
-	 */
-
-	/**
-	 * Maximum time in seconds a PID may execute
-	 * @access private
-	 * @var integer $child_max_run_time
-	 */
-	private $child_max_run_time = array(self::DEFAULT_BUCKET => 86400);
-
-	/**
-	 * Function the child invokes with a set of worker units
-	 * @access private
-	 * @var integer $child_function_run
-	 */
-	private $child_function_run = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Function the parent invokes when a child finishes
-	 * @access private
-	 * @var integer $parent_function_child_exited
-	 */
-	private $parent_function_child_exited = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Function the child invokes when sigint/term is received
-	 * @access private
-	 * @var integer $child_function_exit
-	 */
-	private $child_function_exit = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Function the parent invokes when a child is killed due to exceeding the max runtime
-	 * @access private
-	 * @var integer $child_function_timeout
-	 */
-	private $child_function_timeout = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Function the parent invokes before forking a child
-	 * @access private
-	 * @var integer $parent_function_prefork
-	 */
-	private $parent_function_prefork = '';
-
-	/**
-	 * Function the parent invokes when a child is spawned
-	 * @access private
-	 * @var integer $parent_function_fork
-	 */
-	private $parent_function_fork = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Function the parent invokes when the parent receives a SIGHUP
-	 * @access private
-	 * @var integer $parent_function_sighup
-	 */
-	private $parent_function_sighup = '';
-
-	/**
-	 * Property of the parent sighup function.  If true, the parent
-	 * will send sighup to all children when the parent receives a
-	 * sighup.
-	 * @access private
-	 * @var integer $parent_function_sighup_cascade
-	 */
-	private $parent_function_sighup_cascade = true;
-
-	/**
-	 * Function the child invokes when the child receives a SIGHUP
-	 * @access private
-	 * @var integer $child_function_sighup
-	 */
-	private $child_function_sighup = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Function the parent invokes when a child has results to post
-	 * @access private
-	 * @var integer $parent_function_results
-	 */
-	private $parent_function_results = array(self::DEFAULT_BUCKET => '');
-
-	/**
-	 * Stores whether results are stored for retrieval by the parent
-	 * @access private
-	 * @var boolean $store_result
-	 */
-	private $store_result = false;
-
-	/**
-	 * Max number of seconds to wait for a child process
-	 * exit once it has been requested to exit
-	 * @access private
-	 * @var integer $children_kill_timeout
-	 */
-	private $children_max_timeout = 30;
-
-	/**
-	 * Function the parent runs when the daemon is getting shutdown
-	 * @access private
-	 * @var integer $parent_function_exit
-	 */
-	private $parent_function_exit = '';
-
-	/**
-	 * Stores whether the daemon is in single item mode or not
-	 * @access private
-	 * @var bool $child_single_work_item
-	 */
-	private $child_single_work_item = array(self::DEFAULT_BUCKET => false);
-
-	/**
-	 * Function to call when there is a message to log
-	 * @access private
-	 * @var array $log_function array of callables index by severity
-	 * called with call_user_func($log_function, $message)
-	 */
-	private $log_function = null;
-
-	/**
-	 * Stores whether or not we have received an exit request
-	 * @access private
-	 * @default false
-	 * @var bool $exit_request_status
-	 */
-	private $exit_request_status = false;
-
-	/**************** SERVER CONTROLS ****************/
-	/**
-	 * Upper limit on the number of children started.
-	 * @access private
-	 * @var integer $max_children
-	 */
-	private $max_children = array(self::DEFAULT_BUCKET => 25);
-
-	/**
-	 * Upper limit on the number of work units sent to each child.
-	 * @access private
-	 * @var integer $max_work_per_child
-	 */
-	private $max_work_per_child = array(self::DEFAULT_BUCKET => 100);
-
-	/**
-	 * Interval to do house keeping in seconds
-	 * @access private
-	 * @var integer $housekeeping_check_interval
-	 */
-	private $housekeeping_check_interval = 20;
-
-	/**************** TRACKING CONTROLS ****************/
-
-	/**
-	 * track children of parent including their status and create time
-	 * @access private
-	 * @var array $forked_children
-	 */
-	private $forked_children = array();
-
-	/**
-	 * number of tracked children (not stopped)
-	 * @access private
-	 * @var array $forked_children_count
-	 */
-	protected $forked_children_count = 0;
-
-	/**
-	 * track the work units to process
-	 * @access private
-	 * @var array $work_units
-	 */
-	private $work_units = array(self::DEFAULT_BUCKET => array());
-
-	/**
-	 * track the buckets
-	 * @access private
-	 * @var array $buckets
-	 */
-	private $buckets = array(0 => self::DEFAULT_BUCKET);
-
-	/**
-	 * for the parent the track the results received from chilren
-	 * @access private
-	 * @var array $work_units
-	 */
-	private $results = array(self::DEFAULT_BUCKET => array());
-
-	/**
-	 * within a child, track the bucket the child exists in. note,
-	 * this shouldn't be set or referenced in the parent process
-	 * @access private
-	 * @var int $child_bucket
-	 */
-	private $child_bucket = null;
-
-	/**************** MOST IMPORTANT CONTROLS  ****************/
-
-	/**
-	 * parent pid
-	 * @access private
-	 * @var array $parent_pid
-	 */
-	static private $parent_pid;
-
-	/**
-	 * last housekeeping check time
-	 * @access private
-	 * @var array $housekeeping_last_check
-	 */
-	private $housekeeping_last_check = 0;
-
-	/**************** FUNCTION DEFINITIONS  ****************/
-
-	/**
-	 * Set and Get functions
-	 */
-
-	/**
-	 * Allows the app to set the max_children value
-	 * @access public
-	 * @param int $value the new max_children value.
-	 * @param int $bucket the bucket to use
-	 */
-	public function max_children_set($value, $bucket = self::DEFAULT_BUCKET)
-	{
-		if ($value < 1)
-		{
-			$value = 0;
-			$this->log(($bucket === self::DEFAULT_BUCKET ? 'default' : $bucket) . ' bucket max_children set to 0, bucket will be disabled', self::LOG_LEVEL_WARN);
-		}
-
-		$this->max_children[$bucket] = $value;
-	}
-
-	/**
-	 * Allows the app to retrieve the current max_children value.
-	 * @access public
-	 * @param int $bucket the bucket to use
-	 * @return int the max_children value
-	 */
-	public function max_children_get($bucket = self::DEFAULT_BUCKET)
-	{
-		return($this->max_children[$bucket]);
-	}
-
-	/**
-	 * Allows the app to set the max_work_per_child value
-	 * @access public
-	 * @param int $value new max_work_per_child value.
-	 * @param int $bucket the bucket to use
-	 */
-	public function max_work_per_child_set($value, $bucket = self::DEFAULT_BUCKET)
-	{
-		if ($this->child_single_work_item[$bucket])
-		{
-			$value = 1;
-		}
-
-		if ($value < 1)
-		{
-			$value = 0;
-			$this->log(($bucket === self::DEFAULT_BUCKET ? 'default' : $bucket) . ' bucket max_work_per_child set to 0, bucket will be disabled', self::LOG_LEVEL_WARN);
-		}
-
-		$this->max_work_per_child[$bucket] = $value;
-	}
-
-	/**
-	 * Allows the app to retrieve the current max_work_per_child value.
-	 * @access public
-	 * @param int $bucket the bucket to use
-	 * @return int the max_work_per_child value
-	 */
-	public function max_work_per_child_get($bucket = self::DEFAULT_BUCKET)
-	{
-		return($this->max_work_per_child[$bucket]);
-	}
-
-	/**
-	 * Allows the app to set the child_max_run_time value
-	 * @access public
-	 * @param int $value new child_max_run_time value.
-	 * @param int $bucket the bucket to use
-	 */
-	public function child_max_run_time_set($value, $bucket = self::DEFAULT_BUCKET)
-	{
-		if ($value < 1)
-		{
-			$value = 0;
-			$this->log(($bucket === self::DEFAULT_BUCKET ? 'default' : $bucket) . ' bucket child_max_run_time set to 0', self::LOG_LEVEL_WARN);
-		}
-
-		$this->child_max_run_time[$bucket] = $value;
-	}
-
-	/**
-	 * Allows the app to retrieve the current child_max_run_time value.
-	 * @access public
-	 * @param int $bucket the bucket to use
-	 * @return int the child_max_run_time value
-	 */
-	public function child_max_run_time_get($bucket = self::DEFAULT_BUCKET)
-	{
-		return($this->child_max_run_time[$bucket]);
-	}
-
-	/**
-	 * Allows the app to set the child_single_work_item value
-	 * @access public
-	 * @param int $value new child_single_work_item value.
-	 * @param int $bucket the bucket to use
-	 */
-	public function child_single_work_item_set($value, $bucket = self::DEFAULT_BUCKET)
-	{
-		if ($value < 1)
-		{
-			$value = 0;
-			$this->log(($bucket === self::DEFAULT_BUCKET ? 'default' : $bucket) . ' bucket child_single_work_item set to 0', self::LOG_LEVEL_WARN);
-		}
-
-		$this->child_single_work_item[$bucket] = $value;
-	}
-
-	/**
-	 * Allows the app to retrieve the current child_single_work_item value.
-	 * @access public
-	 * @param int $bucket the bucket to use
-	 * @return int the child_single_work_item value
-	 */
-	public function child_single_work_item_get($bucket = self::DEFAULT_BUCKET)
-	{
-		return($this->child_single_work_item[$bucket]);
-	}
-
-	/**
-	 * Allows the app to set the store_result value
-	 * @access public
-	 * @param int $value new store_result value.
-	 */
-	public function store_result_set($value)
-	{
-		$this->store_result = $value;
-	}
-
-	/**
-	 * Allows the app to retrieve the current store_result value.
-	 * @access public
-	 * @return boolean the store_result value
-	 */
-	public function store_result_get()
-	{
-		return $this->store_result;
-	}
-
-	/**
-	 * Allows the app to retrieve the current child_bucket value.
-	 * @access public
-	 * @return int the child_bucket value representing the bucket number of the child
-	 */
-	public function child_bucket_get()
-	{
-		// this function does not apply to the parent
-		if (self::$parent_pid == getmypid()) return false;
-
-		return($this->child_bucket);
-	}
-
-
-	/**
-	 * Creates a new bucket to house forking operations
-	 * @access public
-	 * @param int $bucket the bucket to create
-	 */
-	public function add_bucket($bucket)
-	{
-		/* create the bucket by copying values from the default bucket */
-		$this->max_children[$bucket] = $this->max_children[self::DEFAULT_BUCKET];
-		$this->child_single_work_item[$bucket] = $this->child_single_work_item[self::DEFAULT_BUCKET];
-		$this->max_work_per_child[$bucket] = $this->max_work_per_child[self::DEFAULT_BUCKET];
-		$this->child_max_run_time[$bucket] = $this->child_max_run_time[self::DEFAULT_BUCKET];
-		$this->child_single_work_item[$bucket] = $this->child_single_work_item[self::DEFAULT_BUCKET];
-		$this->child_function_run[$bucket] = $this->child_function_run[self::DEFAULT_BUCKET];
-		$this->parent_function_fork[$bucket] = $this->parent_function_fork[self::DEFAULT_BUCKET];
-		$this->child_function_sighup[$bucket] = $this->child_function_sighup[self::DEFAULT_BUCKET];
-		$this->child_function_exit[$bucket] = $this->child_function_exit[self::DEFAULT_BUCKET];
-		$this->child_function_timeout[$bucket] = $this->child_function_timeout[self::DEFAULT_BUCKET];
-		$this->parent_function_child_exited[$bucket] = $this->parent_function_child_exited[self::DEFAULT_BUCKET];
-		$this->work_units[$bucket] = array();
-		$this->buckets[$bucket] = $bucket;
-		$this->results[$bucket] = array();
-	}
-
-	/**
-	 * Allows the app to set the call back function for child processes
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_child_run($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		/* call child function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->child_function_run[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set call back functions to cleanup resources before forking
-	 * @access public
-	 * @param array names of functions to be called.
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_parent_prefork($function_names)
-	{
-		$this->parent_function_prefork = $function_names;
-		return true;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when a child process is spawned
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_parent_fork($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		/* call child function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->parent_function_fork[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when a parent process receives a SIGHUP
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param bool $cascade_signal if true, the parent will send a sighup to all of it's children
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_parent_sighup($function_name, $cascade_signal = true)
-	{
-		/* call child function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->parent_function_sighup         = $function_name;
-			$this->parent_function_sighup_cascade = $cascade_signal;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when a child process receives a SIGHUP
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_child_sighup($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		/* call child function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->child_function_sighup[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when a child process exits
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_child_exit($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		/* call child function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->child_function_exit[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when a child process is killed to exceeding its max runtime
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_child_timeout($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		/* call child function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->child_function_timeout[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when the parent process exits
-	 * @access public
-	 * @param string name of function to be called.
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_parent_exit($function_name)
-	{
-		// call parent function
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->parent_function_exit = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when a child exits in the parent
-	 * @access public
-	 * @param string name of function to be called.
-	 * @param int $bucket the bucket to use
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_parent_child_exit($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		/* call parent function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->parent_function_child_exited[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for when the a child has results
-	 * @access public
-	 * @param string name of function to be called.
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_parent_results($function_name, $bucket = self::DEFAULT_BUCKET)
-	{
-		// call parent function
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->parent_function_results[$bucket] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Allows the app to set the call back function for logging
-	 * @access public
-	 * @param callable name of function to be called.
-	 * @param int $severity the severity level
-	 * @return bool true if the callback was successfully registered, false if it failed
-	 */
-	public function register_logging($function_name, $severity)
-	{
-		/* call parent function */
-		if ( ( is_array($function_name) && method_exists($function_name[0], $function_name[1]) ) || method_exists($this, $function_name) || function_exists($function_name) )
-		{
-			$this->log_function[$severity] = $function_name;
-			return true;
-		}
-
-		return false;
-	}
-
-	/************ NORMAL FUNCTION DEFS ************/
-
-	/**
-	 * This is the class constructor, initializes the object.
-	 * @access public
-	 */
-	public function __construct()
-	{
-		/* record pid of parent process */
-		self::$parent_pid = getmypid();
-
-		/* install signal handlers */
-		declare(ticks = 1);
-		pcntl_signal(SIGHUP,  array(&$this, 'signal_handler_sighup'));
-		pcntl_signal(SIGCHLD, array(&$this, 'signal_handler_sigchild'));
-		pcntl_signal(SIGTERM, array(&$this, 'signal_handler_sigint'));
-		pcntl_signal(SIGINT,  array(&$this, 'signal_handler_sigint'));
-		pcntl_signal(SIGALRM, SIG_IGN);
-		pcntl_signal(SIGUSR2, SIG_IGN);
-		pcntl_signal(SIGBUS,  SIG_IGN);
-		pcntl_signal(SIGPIPE, SIG_IGN);
-		pcntl_signal(SIGABRT, SIG_IGN);
-		pcntl_signal(SIGFPE,  SIG_IGN);
-		pcntl_signal(SIGILL,  SIG_IGN);
-		pcntl_signal(SIGQUIT, SIG_IGN);
-		pcntl_signal(SIGTRAP, SIG_IGN);
-		pcntl_signal(SIGSYS,  SIG_IGN);
-
-		/* add barracuda specific prefork functions (doesn't hurt anything) */
-		$this->parent_function_prefork = array('db_clear_connection_cache', 'memcache_clear_connection_cache');
-	}
-
-	/**
-	 * Destructor does not do anything.
-	 * @access public
-	*/
-	public function __destruct()
-	{
-	}
-
-	/**
-	 * Handle both parent and child registered sighup callbacks.
-	 *
-	 * @param int $signal_number is the signal that called this function. (should be '1' for SIGHUP)
-	 * @access public
-	 */
-	public function signal_handler_sighup($signal_number)
-	{
-		if (self::$parent_pid == getmypid())
-		{
-			// parent received sighup
-			$this->log('parent process [' . getmypid() . '] received sighup', self::LOG_LEVEL_DEBUG);
-
-			// call parent's sighup registered callback
-			$this->invoke_callback($this->parent_function_sighup, $parameters = array(), true);
-
-			// if cascading, send sighup to all child processes
-			if ($this->parent_function_sighup_cascade === true)
-			{
-				foreach ($this->forked_children as $pid => $pid_info)
-				{
-					if ($pid_info['status'] == self::STOPPED)
-						continue;
-					$this->log('parent process [' . getmypid() . '] sending sighup to child ' . $pid, self::LOG_LEVEL_DEBUG);
-					posix_kill($pid, SIGHUP);
-				}
-			}
-		}
-		else
-		{
-			// child received sighup. note a child is only in one bucket, do not loop through all buckets
-			$this->log('child process [' . getmypid() . '] received sighup with bucket type [' . $this->child_bucket . ']', self::LOG_LEVEL_DEBUG);
-			$this->invoke_callback(
-				$this->child_function_sighup[$this->child_bucket],
-				array($this->child_bucket),
-				true
-			);
-		}
-	}
-
-	/**
-	 * Handle parent registered sigchild callbacks.
-	 *
-	 * @param int $signal_number is the signal that called this function.
-	 * @access public
-	 */
-	public function signal_handler_sigchild($signal_number)
-	{
-		// do not allow signals to interrupt this
-		declare(ticks = 0)
-		{
-			// reap all child zombie processes
-			if (self::$parent_pid == getmypid())
-			{
-				$status = '';
-
-				do
-				{
-					// get child pid that exited
-					$child_pid = pcntl_waitpid(0, $status, WNOHANG);
-					if ($child_pid > 0)
-					{
-						// child exited
-						$identifier = false;
-						if (!isset($this->forked_children[$child_pid]))
-						{
-							die("Cannot find $child_pid in array!\n");
-						}
-
-						$child = $this->forked_children[$child_pid];
-						$identifier = $child['identifier'];
-
-						// call exit function if and only if its declared */
-						if ($child['status'] == self::WORKER)
-							$this->invoke_callback($this->parent_function_child_exited[ $this->forked_children[$child_pid]['bucket'] ], array($child_pid, $this->forked_children[$child_pid]['identifier']), true);
-
-						// stop the child pid
-						$this->forked_children[$child_pid]['status'] = self::STOPPED;
-						$this->forked_children_count--;
-
-						// respawn helper processes
-						if ($child['status'] == self::HELPER && $child['respawn'] === true)
-						{
-							$this->log('Helper process ' . $child_pid . ' died, respawning', self::LOG_LEVEL_INFO);
-							$this->helper_process_spawn($child['function'], $child['arguments'], $child['identifier'], true);
-						}
-
-						// Poll for results from any children
-						$this->post_results($child['bucket']);
-					}
-					elseif ($child_pid < 0)
-					{
-						// ignore acceptable error 'No child processes' given we force this signal to run potentially when no children exist
-						if (pcntl_get_last_error() == 10) continue;
-
-						// pcntl_wait got an error
-						$this->log('pcntl_waitpid failed with error ' . pcntl_get_last_error() . ':' . pcntl_strerror((pcntl_get_last_error())), self::LOG_LEVEL_DEBUG);
-					}
-				}
-				while ($child_pid > 0);
-			}
-		}
-	}
-
-	/**
-	 * Handle both parent and child registered sigint callbacks
-	 *
-	 * User terminated by CTRL-C (detected only by the parent)
-	 *
-	 * @param int $signal_number is the signal that called this function
-	 * @access public
-	 */
-	public function signal_handler_sigint($signal_number)
-	{
-		// log that we received an exit request
-		$this->received_exit_request(true);
-
-		// kill child processes
-		if (self::$parent_pid == getmypid())
-		{
-			foreach ($this->forked_children as $pid => &$pid_info)
-			{
-				if ($pid_info['status'] == self::STOPPED)
-					continue;
-
-				// tell helpers not to respawn
-				if ($pid_info['status'] == self::HELPER)
-					$pid_info['respawn'] = false;
-
-				$this->log('requesting child exit for pid: ' . $pid, self::LOG_LEVEL_INFO);
-				posix_kill($pid, SIGINT);
-			}
-
-			sleep(1);
-
-			// checking for missed sigchild
-			$this->signal_handler_sigchild(SIGCHLD);
-
-			$start_time = time();
-
-			// wait for child processes to go away
-			while ($this->forked_children_count > 0)
-			{
-				if (time() > ($start_time + $this->children_max_timeout))
-				{
-					foreach ($this->forked_children as $pid => $child)
-					{
-						if ($child['status'] == self::STOPPED)
-							continue;
-
-						$this->log('force killing child pid: ' . $pid, self::LOG_LEVEL_INFO);
-						posix_kill($pid, SIGKILL);
-
-						// stop the child
-						$this->forked_children[$pid]['status'] = self::STOPPED;
-						$this->forked_children_count--;
-					}
-				}
-				else
-				{
-					$this->log('waiting ' . ($start_time + $this->children_max_timeout - time()) . ' seconds for ' . $this->forked_children_count . ' children to clean up', self::LOG_LEVEL_INFO);
-					sleep(1);
-					$this->housekeeping_check();
-				}
-			}
-
-			// make call back to parent exit function if it exists
-			$this->invoke_callback($this->parent_function_exit, $parameters = array(self::$parent_pid), true);
-		}
-		else
-		{
-			// invoke child cleanup callback
-			if (isset($this->child_bucket))
-				$this->invoke_callback($this->child_function_exit[$this->child_bucket], $parameters = array($this->child_bucket), true);
-		}
-
-		exit(-1);
-	}
-
-	/**
-	 * Check or set if we have recieved an exit request
-	 *
-	 * @param boolen $requested (optional) have we received the request
-	 * @return current exit request status
-	 */
-	public function received_exit_request($requested = null)
-	{
-		// if we are retreiving the value of the exit request
-		if ($requested === null)
-		{
-			return $this->exit_request_status;
-		}
-
-		// ensure we have good data, or set to false if not
-		if (! is_bool($requested))
-		{
-			$requested = false;
-		}
-
-		// set and return the ne value
-		return ($this->exit_request_status = $requested);
-	}
-
-	/**
-	 * Add work to the group of work to be processed
-	 *
-	 * @param mixed array of items to be handed back to child in chunks
-	 * @param string a unique identifier for this work
-	 * @param int $bucket the bucket to use
-	 * @param bool $sort_queue true to sort the work unit queue
-	 */
-	public function addwork(array $new_work_units, $identifier = '', $bucket = self::DEFAULT_BUCKET, $sort_queue = false)
-	{
-		// ensure bucket is setup before we try to add data to it
-		if (! array_key_exists($bucket, $this->work_units))
-			$this->add_bucket($bucket);
-
-		// add to queue to send
-		if ($this->child_single_work_item[$bucket])
-		{
-			// prepend identifier with 'id-' because array_splice() re-arranges numeric keys
-			$this->work_units[$bucket]['id-' . $identifier] = $new_work_units;
-		}
-		elseif ($new_work_units === null || sizeof($new_work_units) === 0)
-		{
-			// no work
-		}
-		else
-		{
-			// merge in the new work units
-			$this->work_units[$bucket] = array_merge($this->work_units[$bucket], $new_work_units);
-		}
-
-		// sort the queue
-		if ($sort_queue)
-			ksort($this->work_units[$bucket]);
-
-		return;
-	}
-
-	/*
-	 * Based on identifier and bucket is a child working on the work
-	 *
-	 * @param string unique identifier for the work
-	 * @param int $bucket the bucket
-	 * @return bool true if child has work, false if not
-	 */
-	public function is_work_running($identifier, $bucket = self::DEFAULT_BUCKET)
-	{
-		foreach ($this->forked_children as $info)
-		{
-			if (($info['status'] != self::STOPPED) && ($info['identifier'] == $identifier) && ($info['bucket'] == $bucket))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/*
-	 * Return array of currently running children
-	 *
-	 * @param int $bucket the bucket
-	 * @return bool true if child has work, false if not
-	 */
-	public function work_running($bucket = self::DEFAULT_BUCKET)
-	{
-		$results = array();
-		foreach ($this->forked_children as $pid => $child)
-		{
-			if ($child['status'] != self::STOPPED)
-				$results[$pid] = $child;
-		}
-		return $results;
-	}
-
-	/**
-	 * Return a list of the buckets which have been created
-	 *
-	 * @param bool $include_default_bucket optionally include self::DEFAULT_BUCKET in returned value (DEFAULT: true)
-	 * @return array list of buckets
-	 */
-	public function bucket_list($include_default_bucket = true)
-	{
-		$bucket_list = array();
-
-		foreach($this->buckets as $bucket_id)
-		{
-			// skip the default bucket if ignored
-			if ( ($include_default_bucket === false) && ($bucket_id === self::DEFAULT_BUCKET) )
-				continue;
-
-			$bucket_list[] = $bucket_id;
-		}
-
-		return $bucket_list;
-	}
-
-	/**
-	 * Check to see if a bucket exists
-	 *
-	 * @return bool true if the bucket exists, false if it does not
-	 */
-	public function bucket_exists($bucket_id)
-	{
-		return (array_key_exists($bucket_id, $this->buckets));
-	}
-
-	/**
-	 * Return the number of work sets queued
-	 *
-	 * A work set is a chunk of items to be worked on.  A whole work set
-	 * is handed off to a child processes.  This size of the work sets can
-	 * be controlled by $this->max_work_per_child_set()
-	 *
-	 * @param int $bucket the bucket to use
-	 * @param bool $process_all_buckets if set to true, return the count of all buckets
-	 * @return int the number of work sets queued
-	 */
-	public function work_sets_count($bucket = self::DEFAULT_BUCKET, $process_all_buckets = false)
-	{
-		// if asked to process all buckets, count all of them and return the count
-		if ($process_all_buckets === true)
-		{
-			$count = 0;
-			foreach($this->buckets as $bucket_slot)
-			{
-				$count += count($this->work_units[$bucket_slot]);
-			}
-			return $count;
-		}
-
-		return count($this->work_units[$bucket]);
-	}
-
-	/**
-	 * Return the contents of work sets queued
-	 *
-	 * A work set is a chunk of items to be worked on.  A whole work set
-	 * is handed off to a child processes.  This size of the work sets can
-	 * be controlled by $this->max_work_per_child_set()
-	 *
-	 * @param int $bucket the bucket to use
-	 * @return array contents of  the bucket
-	 */
-	public function work_sets($bucket = self::DEFAULT_BUCKET)
-	{
-		return $this->work_units[$bucket];
-	}
-
-	/**
-	 * Return the number of children running
-	 *
-	 * @param int $bucket the bucket to use
-	 * @param bool $show_pending True to show children that are done,
-	 * 		but not yet had their results retrieved
-	 * @return int the number of children running
-	 */
-	public function children_running($bucket = self::DEFAULT_BUCKET, $show_pending = false)
-	{
-		// force reaping of children
-		$this->signal_handler_sigchild(SIGCHLD);
-
-		// return global count if bucket is default
-		if ($bucket == self::DEFAULT_BUCKET)
-			return ($show_pending ? count($this->forked_children) : $this->forked_children_count);
-
-		// count within the specified bucket
-		$count = 0;
-		foreach ($this->forked_children as $child)
-		{
-			if ($show_pending)
-			{
-				if ($child['bucket'] == $bucket)
-					$count++;
-			}
-			else if (($child['bucket'] == $bucket) && ($child['status'] != self::STOPPED))
-			{
-				$count++;
-			}
-		}
-
-		return $count;
-	}
-
-	/**
-	 * Returns the number of pending child items, including running children and
-	 * work sets that have not been allocated.  Children running includes those
-	 * that have not had their results retrieved yet.
-	 *
-	 * @param type $bucket The bucket to check for pending children items
-	 * @return int Number of pending children items
-	 */
-	public function children_pending($bucket = self::DEFAULT_BUCKET)
-	{
-		return $this->children_running($bucket, true) + $this->work_sets_count($bucket);
-	}
-
-	/**
-	 * Check if the current processes is a child
-	 *
-	 * @return bool true if the current PID is a child PID, false otherwise
-	 */
-	static public function is_child()
-	{
-		return (isset(self::$parent_pid) ? (self::$parent_pid != getmypid()) : false);
-	}
-
-	/**
-	 * Spawns a helper process
-	 *
-	 * Spawns a new helper process to perform duties under the parent server
-	 * process without accepting connections. Helper processes can optionally
-	 * be respawned when they die.
-	 *
-	 * @access public
-	 * @param string $function_name helper function to call
-	 * @param array $arguments function arguments
-	 * @param string $identifier helper process unique identifier
-	 * @param bool $respawn whether to respawn the helper process when it dies
-	 */
-	public function helper_process_spawn($function_name, $arguments = array(), $idenfifier = '', $respawn = true)
-	{
-		if ((is_array($function_name) && method_exists($function_name[0], $function_name[1])) || function_exists($function_name))
-		{
-			// init the IPC sockets
-			list($socket_child, $socket_parent) = $this->ipc_init();
-
-			// do not process signals while we are forking
-			declare(ticks = 0);
-			$pid = pcntl_fork();
-
-			if ($pid == -1)
-			{
-				die("Forking error!\n");
-			}
-			elseif ($pid == 0)
-			{
-				/*
-				 * Child process
-				 */
-
-				declare(ticks = 1);
-
-				// close our socket (we only need the one to the parent)
-				socket_close($socket_child);
-
-				// execute the function
-				$this->log('Calling function ' . $function_name, self::LOG_LEVEL_DEBUG);
-				$result = call_user_func_array($function_name, $arguments);
-
-				// send the response to the parent
-				self::socket_send($socket_parent, $result);
-
-				exit(0);
-			}
-			else
-			{
-				/*
-				 * Parent process
-				 */
-
-				declare(ticks = 1);
-				$this->log('Spawned new helper process with pid ' . $pid, self::LOG_LEVEL_INFO);
-
-				// close our socket (we only need the one to the child)
-				socket_close($socket_parent);
-
-				// track the child
-				$this->forked_children[$pid] = array(
-					'ctime' => time(),
-					'identifier' => $idenfifier,
-					'status' => self::HELPER,
-					'bucket' => self::DEFAULT_BUCKET,
-					'respawn' => true,
-					'function' => $function_name,
-					'arguments' => $arguments,
-					'socket' => $socket_child,
-					'last_active' => microtime(true),
-				);
-				$this->forked_children_count++;
-			}
-		}
-		else
-		{
-			$this->log("Unable to spawn undefined helper function '" . $function_name . "'", self::LOG_LEVEL_CRIT);
-		}
-	}
-
-	/**
-	 * Forces a helper process to respawn
-	 *
-	 * @param string $identifier id of the helper process to respawn
-	 */
-	public function helper_process_respawn($identifier)
-	{
-		if ($identifier == '') return false;
-
-		foreach ($this->forked_children as $pid => $child)
-		{
-			if ($child['status'] == self::HELPER && $child['identifier'] == $identifier)
-			{
-				$this->log('Forcing helper process \'' . $identifier . '\' with pid ' . $pid . ' to respawn', self::LOG_LEVEL_INFO);
-				posix_kill($pid, SIGKILL);
-			}
-		}
-	}
-
-	/**
-	 * Kill a specified child(ren) by pid
-	 *
-	 * Note: This method will block until all requested pids have exited
-	 *
-	 * @param int $pids the child pid to kill
-	 * @param int $kill_delay how many seconds to wait before sending sig kill on stuck processes
-	 * @access public
-	 */
-	public function kill_child_pid($pids, $kill_delay = 30)
-	{
-		if (! is_array($pids)) $pids = array($pids);
-
-		// send int sigs to the children
-		foreach ($pids as $index => $pid)
-		{
-			// make sure we own this pid
-			if (! array_key_exists($pid, $this->forked_children) || $this->forked_children[$pid]['status'] == self::STOPPED)
-			{
-				$this->log('Skipping kill request on pid ' . $pid . ' because we dont own it', self::LOG_LEVEL_INFO);
-				unset($pids[$index]);
-				continue;
-			}
-
-			$this->log('Asking pid ' . $pid . ' to exit via sigint', self::LOG_LEVEL_INFO);
-			posix_kill($pid, SIGINT);
-		}
-
-		// store the requst time
-		$request_time = microtime(true);
-		$time = 0;
-
-		// make sure the children exit
-		while ((count($pids) > 0) && ($time >= $kill_delay))
-		{
-			foreach ($pids as $index => $pid)
-			{
-				// check if the pid exited gracefully
-				if ($this->forked_children[$pid]['status'] == self::STOPPED)
-				{
-					$this->log('Pid ' . $pid . ' has exited gracefully', self::LOG_LEVEL_INFO);
-					unset($pids[$index]);
-					continue;
-				}
-
-				$time = microtime(true) - $request_time;
-				if ($time < $kill_delay)
-				{
-					$this->log('Waiting ' . round($time, 0) . ' seconds for ' . count($pids) . ' to exit gracefully', self::LOG_LEVEL_INFO);
-					sleep(1);
-					continue;
-				}
-
-				$this->log('Force killing pid ' . $pid, self::LOG_LEVEL_INFO);
-				posix_kill($pid, SIGKILL);
-			}
-		}
-	}
-
-	/**
-	 * Process work on the work queue
-	 *
-	 * This function will take work sets and hand them off to children.
-	 * Part of the process is calling invoking fork_work_unit to fork
-	 * off the child. If $blocking is set to true, this function will
-	 * process all work units and wait until the children are done until
-	 * returning.  If $blocking is set to false, this function will
-	 * start as many work units as max_children allows and then return.
-	 *
-	 * Note, if $blocking is turned off, the caller has to handle when
-	 * the children are done with their current load.
-	 *
-	 * @param bool true for blocking mode, false for immediate return
-	 * @param int $bucket the bucket to use
-	 */
-	public function process_work($blocking = true, $bucket = self::DEFAULT_BUCKET, $process_all_buckets = false)
-	{
-		$this->housekeeping_check();
-
-		// process work on all buckets if desired
-		if ($process_all_buckets === true)
-		{
-			foreach($this->buckets as $bucket_slot)
-			{
-				$this->process_work($blocking, $bucket_slot, false);
-			}
-			return true;
-		}
-
-		// if room fork children
-		if ($blocking === true)
-		{
-			// process work until completed
-			while ($this->work_sets_count($bucket) > 0)
-			{
-				// check to make sure we have not hit or exceded the max children (globally or within the bucket)
-				while ( $this->children_running($bucket) >= $this->max_children[$bucket] )
-				{
-					$this->housekeeping_check();
-					$this->signal_handler_sigchild(SIGCHLD);
-					sleep(1);
-				}
-
-				$this->process_work_unit($bucket);
-			}
-
-			// wait until work finishes
-			while ($this->children_running($bucket) > 0)
-			{
-				sleep(1);
-				$this->housekeeping_check();
-				$this->signal_handler_sigchild(SIGCHLD);
-			}
-
-			// make call back to parent exit function if it exists
-			$this->invoke_callback($this->parent_function_exit, $parameters = array(self::$parent_pid), true);
-		}
-		else
-		{
-			// fork children until max
-			while ( $this->children_running($bucket) < $this->max_children[$bucket] )
-			{
-				if ($this->work_sets_count($bucket) == 0)
-					return true;
-
-				$this->process_work_unit($bucket);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns the first result available from the bucket.  This will run
-	 * a non-blocking poll of the children for updated results.
-	 *
-	 * @param string $bucket The bucket to check
-	 * @return mixed The data retrieved from a child process on the buckets
-	 */
-	public function get_result($bucket = self::DEFAULT_BUCKET)
-	{
-		// check for additional results
-		$this->post_results($bucket);
-
-		if (! $this->has_result($bucket))
-			return null;
-
-		return array_shift($this->results[$bucket]);
-	}
-
-	/**
-	 * Returns all the results currently in the results queue.  This will
-	 * run a non-blocking poll of the children for updated results.
-	 *
-	 * @param string $bucket The bucket to retrieves results
-	 * @return mixed Array of results from each child that has finished.
-	 */
-	public function get_all_results($bucket = self::DEFAULT_BUCKET)
-	{
-		// check for additional results
-		$this->post_results($bucket);
-
-		if (! $this->has_result($bucket))
-			return array();
-
-		$results = $this->results[$bucket];
-		$this->results[$bucket] = array();
-
-		return $results;
-	}
-
-	/**
-	 * Checks if there is a result on the bucket.  Before checking,
-	 * runs a non-blocking poll of the children for updated results.
-	 *
-	 * @param string $bucket The bucket to check
-	 * @return int Returns true if there is a result
-	 */
-	public function has_result($bucket = self::DEFAULT_BUCKET)
-	{
-		// check for additional results
-		$this->post_results($bucket);
-
-		return (! empty($this->results[$bucket]));
-	}
-
-	/**
-	 * Checks if any changed child sockets are in the bucket.
-	 *
-	 * @param type $bucket The bucket to get results in
-	 * @return type Returns the number of changed sockets for children workers in $bucket,
-	 * or empty array if none.
-	 */
-	private function get_changed_sockets($bucket = self::DEFAULT_BUCKET, $timeout = 0)
-	{
-		$write_dummy = null;
-		$exception_dummy = null;
-
-		// grab all the children sockets
-		$sockets = array();
-		foreach ($this->forked_children as $pid => $child)
-		{
-			if ($child['bucket'] == $bucket)
-				$sockets[$pid] = $child['socket'];
-		}
-
-		if (! empty($sockets))
-		{
-			// find changed sockets and return the array of them
-			$result = @socket_select($sockets, $write_dummy, $exception_dummy, $timeout);
-			if ($result !== false && $result > 0)
-				return $sockets;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns any pending results from the child sockets.  If a
-	 * child has no results and it has status self::STOPPED, this will remove
-	 * the child record from $this->forked_children.
-	 *
-	 * NOTE: This must be polled to check for changed sockets.
-	 *
-	 * @param type $blocking Set to true to block until a result comes in
-	 * @param type $bucket The bucket to look in
-	 * @return type The result of the child worker
-	 */
-	private function fetch_results($blocking = true, $timeout = 0, $bucket = self::DEFAULT_BUCKET)
-	{
-		$start = microtime(true);
-		$results = array();
-
-		// loop while there is pending children and pending sockets; this
-		// will break early on timeouts and when not blocking.
-		do
-		{
-			$ready_sockets = $this->get_changed_sockets($bucket, $timeout);
-			if (is_array($ready_sockets))
-			{
-				foreach ($ready_sockets as $pid => $socket)
-				{
-					$result = $this->socket_receive($socket);
-					if ($result !== false && (! is_null($result)))
-					{
-						$this->forked_children[$pid]['last_active'] = $start;
-						$results[$pid] = $result;
-					}
-				}
-			}
-
-			// clean up forked children that have stopped and did not have recently
-			// active sockets.
-			foreach ($this->forked_children as $pid => &$child)
-			{
-				if (isset($child['last_active']) && ($child['last_active'] < $start) && ($child['status'] == self::STOPPED))
-				{
-					// close the socket from the parent
-					unset($this->forked_children[$pid]);
-				}
-			}
-			unset($child);
-
-			// check if timed out
-			if ($timeout && (microtime(true) - $start > $timeout))
-				return $results;
-
-			// return null if not blocking and we haven't seen results
-			if (! $blocking)
-			{
-				return $results;
-			}
-		}
-		while (count($this->forked_children) > 0);
-
-		return $results;
-	}
-
-	/**
-	 * Posts any new results to a callback function if one is available, or stores
-	 * them to the internal results storage if not.  This does not block and will
-	 * post any results that are available, so call while children are running
-	 * to check and post more results.
-	 *
-	 * NOTE: This should be polled to update results.
-	 *
-	 * @param type $bucket The bucket to post the results in
-	 * @return type Returns true on successfully posting results, even if none
-	 * to post.  Returns false on error from this function or error from
-	 * the $this->parent_function_results callback.
-	 */
-	private function post_results($bucket = self::DEFAULT_BUCKET)
-	{
-		// fetch all the results up to this point
-		$results = $this->fetch_results(false, 0, $bucket);
-		if (is_array($results) && empty($results))
-			return true;
-
-		if (! empty($this->parent_function_results[$bucket]))
-		{
-			if ($this->invoke_callback($this->parent_function_results[$bucket], array($results), true) === false)
-				return false;
-		}
-		elseif ($this->store_result === true)
-		{
-			$this->results[$bucket] += $results;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Pulls items off the work queue for processing
-	 *
-	 * Process the work queue by taking up to max_work_per_child items
-	 * off the queue. A new child is then spawned off to process the
-	 * work.
-	 *
-	 * @param int $bucket the bucket to use
-	 */
-	private function process_work_unit($bucket = self::DEFAULT_BUCKET)
-	{
-		$child_work_units = array_splice($this->work_units[$bucket], 0, $this->max_work_per_child[$bucket]);
-
-		if (count($child_work_units) > 0)
-		{
-			if ($this->child_single_work_item[$bucket])
-			{
-				// break out identifier and unit
-				list($child_identifier, $child_work_unit) = each($child_work_units);
-
-				// strip preceeding 'id-' from the identifier
-				if (strpos($child_identifier, 'id-') === 0)
-					$child_identifier = substr($child_identifier, 3);
-
-				// process work unit
-				$this->fork_work_unit(array($child_work_unit, $child_identifier), $child_identifier, $bucket);
-			}
-			else
-			{
-				$this->fork_work_unit(array($child_work_units), '', $bucket);
-			}
-		}
-
-		// Poll for results from children
-		$this->post_results($bucket);
-	}
-
-	/**
-	 * Fork one child with one unit of work
-	 *
-	 * Given a work unit array, fork a child and hand
-	 * off the work unit to the child.
-	 *
-	 * @param mixed $work_unit an array of work to process
-	 * @param string a unique identifier for this work
-	 * @param int $bucket the bucket to use
-	 * @return mixed the child pid on success or boolean false on failure
-	 */
-	private function fork_work_unit($work_unit, $identifier = '', $bucket = self::DEFAULT_BUCKET)
-	{
-		// prefork callback
-		foreach ($this->parent_function_prefork as $function)
-		{
-			$this->invoke_callback($function, array(), true);
-		}
-
-		// init the IPC sockets
-		list($socket_child, $socket_parent) = $this->ipc_init();
-
-		// turn off signals temporarily to prevent a SIGCHLD from interupting the parent before $this->forked_children is updated
-		declare(ticks = 0);
-
-		// spoon!
-		$pid = pcntl_fork();
-
-		if ($pid == -1)
-		{
-			/**
-			 * Fork Error
-			 */
-
-			$this->log('failed to fork', self::LOG_LEVEL_CRIT);
-			return false;
-		}
-		elseif ($pid)
-		{
-			/**
-			 * Parent Process
-			 */
-
-			// keep track of this pid in the parent
-			$this->forked_children[$pid] = array(
-				'ctime' => time(),
-				'identifier' => $identifier,
-				'bucket' => $bucket,
-				'status' => self::WORKER,
-				'socket' => $socket_child,
-				'last_active' => microtime(true),
-			);
-			$this->forked_children_count++;
-
-			// turn back on signals now that $this->forked_children has been updated
-			declare(ticks = 1);
-
-			// close our socket (we only need the one to the child)
-			socket_close($socket_parent);
-
-			// debug logging
-			$this->log('forking child ' . $pid . ' for bucket ' . $bucket, self::LOG_LEVEL_DEBUG);
-
-			// parent spawned child callback
-			$this->invoke_callback($this->parent_function_fork[$bucket], $parameters = array($pid, $identifier), true);
-		}
-		else
-		{
-			/**
-			 * Child Process
-			 */
-
-			// free up unneeded parent memory for child process
-			$this->work_units = null;
-			$this->forked_children = null;
-			$this->results = null;
-
-			// set child properties
-			$this->child_bucket = $bucket;
-
-			// turn signals on for the child
-			declare(ticks = 1);
-
-			// close our socket (we only need the one to the parent)
-			socket_close($socket_child);
-
-			// re-seed the random generator to prevent clone from parent
-			srand();
-
-			// child run callback
-			$result = $this->invoke_callback($this->child_function_run[$bucket], $work_unit, false);
-
-			// send the result to the parent
-			self::socket_send($socket_parent, $result);
-
-			// delay the child's exit slightly to avoid race conditions
-			usleep(500);
-
-			// exit after we complete one unit of work
-			exit;
-		}
-
-		return $pid;
-	}
-
-	/**
-	 * Performs house keeping every housekeeping_check_interval seconds
-	 * @access private
-	 */
-	private function housekeeping_check()
-	{
-		if ((time() - $this->housekeeping_last_check) >= $this->housekeeping_check_interval)
-		{
-			// check to make sure no children are violating the max run time
-			$this->kill_maxtime_violators();
-
-			// look for zombie children just in case
-			$this->signal_handler_sigchild(SIGCHLD);
-
-			// update the last check time to now
-			$this->housekeeping_last_check = time();
-		}
-	}
-
-	/**
-	 * Kills any children that have been running for too long.
-	 * @access private
-	 */
-	private function kill_maxtime_violators()
-	{
-		foreach ($this->forked_children as $pid => $pid_info)
-		{
-			if ($pid_info['status'] == self::STOPPED)
-				continue;
-
-			if ((time() - $pid_info['ctime']) > $this->child_max_run_time[$pid_info['bucket']])
-			{
-				$this->log('Force kill ' . $pid . ' has run too long', self::LOG_LEVEL_INFO);
-
-				// notify app that child process timed out
-				$this->invoke_callback($this->child_function_timeout{$pid_info['bucket']}, array($pid, $pid_info['identifier']), true);
-
-				posix_kill($pid, SIGKILL); // its probably stuck on something, kill it immediately.
-				sleep(3); // give the child time to die
-
-				// force signal handling
-				$this->signal_handler_sigchild(SIGCHLD);
-			}
-		}
-	}
-
-	/**
-	 * Invoke a call back function with parameters
-	 *
-	 * Given the name of a function and parameters to send it, invoke the function.
-	 * This function will try using the objects inherited function if it exists.  If not,
-	 * it'll look for a declared function of the given name.
-	 *
-	 * @access private
-	 * @param string $function_name the name of the function to invoke
-	 * @param array $parameters an array of parameters to pass to function
-	 * @param bool $optional is set to true, don't error if function_name not available
-	 * @return mixed false on error, otherwise return of callback function
-	 */
-	private function invoke_callback($function_name, $parameters, $optional = false)
-	{
-		// call child function
-		if (is_array($function_name) && method_exists($function_name[0], $function_name[1]))
-		{
-			if (!is_array($parameters)) $parameters = array($parameters);
-			return call_user_func_array($function_name, $parameters);
-		}
-		elseif (method_exists($this, $function_name) )
-		{
-			if (!is_array($parameters)) $parameters = array($parameters);
-			return call_user_func_array($this->$function_name, $parameters);
-		}
-		else if (function_exists($function_name))
-		{
-			if (!is_array($parameters)) $parameters = array($parameters);
-			return call_user_func_array($function_name, $parameters);
-		}
-		else
-		{
-			if ($optional === false)
-				$this->log("Error there are no functions declared in scope to handle callback for function '" . $function_name . "'", self::LOG_LEVEL_CRIT);
-		}
-	}
-
-	/**
-	 * Initialize interprocess communication by setting up a pair
-	 * of sockets and returning them as an array.
-	 *
-	 * @return type
-	 */
-	private function ipc_init()
-	{
-		// windows needs AF_INET
-		$domain = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' ? AF_INET : AF_UNIX;
-
-		// create a socket pair for IPC
-		$sockets = array();
-		if (socket_create_pair($domain, SOCK_STREAM, 0, $sockets) === false)
-		{
-			$this->log('socket_create_pair failed: ' . socket_strerror(socket_last_error()), self::LOG_LEVEL_CRIT);
-			return false;
-		}
-
-		// return the sockets
-		return $sockets;
-	}
-
-	/**
-	 * Sends a serializable message to the socket.
-	 *
-	 * @param type $socket The socket to send the message on
-	 * @param type $message The serializable message to send
-	 * @return type Returns true on success, false on failure
-	 */
-	private function socket_send($socket, $message)
-	{
-		$serialized_message = @serialize($message);
-		if ($serialized_message == false)
-		{
-			$this->log('socket_send failed to serialize message', self::LOG_LEVEL_CRIT);
-			return false;
-		}
-
-		$header = pack('N', strlen($serialized_message));
-		$data = $header . $serialized_message;
-		$bytes_left = strlen($data);
-		while ($bytes_left > 0)
-		{
-			$bytes_sent = @socket_write($socket, $data);
-			if ($bytes_sent === false)
-			{
-				$this->log('socket_send error: ' . socket_strerror(socket_last_error()), self::LOG_LEVEL_CRIT);
-				return false;
-			}
-
-			$bytes_left -= $bytes_sent;
-			$data = substr($data, $bytes_sent);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Receives a serialized message from the socket.
-	 *
-	 * @param type $socket Thes socket to receive the message from
-	 * @return type Returns true on success, false on failure
-	 */
-	private function socket_receive($socket)
-	{
-		// initially read to the length of the header size, then
-		// expand to read more
-		$bytes_total = self::SOCKET_HEADER_SIZE;
-		$bytes_read = 0;
-		$have_header = false;
-		$socket_message = '';
-		while ($bytes_read < $bytes_total)
-		{
-			$read = @socket_read($socket, $bytes_total - $bytes_read);
-			if ($read === false)
-			{
-				$this->log('socket_receive error: ' . socket_strerror(socket_last_error()), self::LOG_LEVEL_CRIT);
-				return false;
-			}
-
-			// blank socket_read means done
-			if ($read == '')
-				break;
-
-			$bytes_read += strlen($read);
-			$socket_message .= $read;
-
-			if (!$have_header && $bytes_read >= self::SOCKET_HEADER_SIZE)
-			{
-				$have_header = true;
-				list($bytes_total) = array_values(unpack('N', $socket_message));
-				$bytes_read = 0;
-				$socket_message = '';
-			}
-		}
-
-		$message = @unserialize($socket_message);
-
-		return $message;
-	}
-
-	/**
-	 * Log a message
-	 *
-	 * @access private
-	 * @param string $message the text to log
-	 * @param int $severity the severity of the message
-	 * @param bool true on success, false on error
-	 */
-	private function log($message, $severity)
-	{
-		if (!empty($this->log_function))
-		{
-			if (isset($this->log_function[$severity]))
-			{
-				return call_user_func($this->log_function[$severity], $message);
-			}
-			elseif (isset($this->log_function[self::LOG_LEVEL_ALL]))
-			{
-				return call_user_func($this->log_function[self::LOG_LEVEL_ALL], $message);
-			}
-		}
-		// Barracuda specific logging class, to keep internal code working
-		elseif (method_exists('Log', 'message'))
-		{
-			return Log::message($message, $severity);
-		}
-
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/import.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/import.php
deleted file mode 100644
index d90a8fdc7..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/import.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('ForkingImportNZB.php');
-
-if (!isset($argv[1]) || !is_dir($argv[1])) {
-	exit(
-		'First argument (mandatory):' . PHP_EOL .
-		'Path to a folder, containing folders with .nzb or .nzb.gz files inside them.' . PHP_EOL .
-		'If you supply a path containing only files, the files will be ignored.' . PHP_EOL .
-		'The sub-folders will be searched recursively for NZB files.' . PHP_EOL . PHP_EOL .
-		'Second argument (optional):' . PHP_EOL .
-		'Number of processes, how many processes to run max at a time. (default is 1)' . PHP_EOL . PHP_EOL .
-		'Third argument (optional):' . PHP_EOL .
-		'true|false => Delete the NZB files after they are imported (recommended), if you stop and restart you will have to go over the imported files again.' . PHP_EOL . PHP_EOL .
-		'Fourth argument (optional)' . PHP_EOL .
-		'true|false => Delete the NZB if importing it fails (not recommended).' . PHP_EOL .
-		'Fifth argument (optional):' . PHP_EOL .
-		'true|false => Use the NZB file name as the release name (not recommended), the names in the NZB are better.' . PHP_EOL . PHP_EOL .
-		'Sixth argument (optional):' . PHP_EOL .
-		'How many NZB files to import per process, if this is not set, it will do 50,000 per process.' . PHP_EOL . PHP_EOL .
-		'Note that successfully imported NZB files WILL be deleted.' . PHP_EOL
-
-	);
-}
-(new \ForkingImportNZB())->start(
-	$argv[1],
-	(isset($argv[2]) && is_numeric($argv[2]) && $argv[2] > 0 ? $argv[2] : 1),
-	(isset($argv[3]) && $argv[3] === 'true' ? 'true' : 'false'),
-	(isset($argv[4]) && $argv[4] === 'true' ? 'true' : 'false'),
-	(isset($argv[5]) && $argv[5] === 'true' ? 'true' : 'false'),
-	(isset($argv[6]) && is_numeric($argv[6]) && $argv[6] > 0 ? $argv[6] : 50000)
-);
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/postprocess.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/postprocess.php
deleted file mode 100644
index a3fc8c50c..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/postprocess.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-if (!isset($argv[1]) || !in_array($argv[1], ['ama', 'add', 'mov', 'nfo', 'sha', 'tv'])) {
-	exit(
-		'First argument (mandatory):' . PHP_EOL .
-		'ama => Do amazon processing, this does not use multi-processing, because of amazon API restrictions.' . PHP_EOL .
-		'add => Do additional (rar|zip) processing.' . PHP_EOL .
-		'mov => Do movie processing.' . PHP_EOL .
-		'nfo => Do NFO processing.' . PHP_EOL .
-		'sha => Do sharing processing, this does not use multi-processing.' . PHP_EOL .
-		'tv  => Do TV processing.' . PHP_EOL .  PHP_EOL .
-		'Second argument (optional):' . PHP_EOL .
-		'true|false => Only post-process renamed releases. This is for the mov|tv options.' . PHP_EOL
-	);
-}
-
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-(new \Forking())->processWorkType('postProcess_' . $argv[1], (isset($argv[2]) && $argv[2] === 'true' ? [0 => true] : []));
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/releases.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/releases.php
deleted file mode 100644
index c8bfd87bd..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/releases.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-(new \Forking())->processWorkType('releases');
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/requestid.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/requestid.php
deleted file mode 100644
index 98510074c..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/requestid.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-(new \Forking())->processWorkType('request_id');
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/safe.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/safe.php
deleted file mode 100644
index 995ca9074..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/safe.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-if (!isset($argv[1]) || !in_array($argv[1], ['backfill', 'binaries'])) {
-	exit(
-		'First argument (mandatory):' . PHP_EOL .
-		'binaries => Do Safe Binaries update.' . PHP_EOL .
-		'backfill => Do Safe Backfill update.' . PHP_EOL
-	);
-}
-
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-(new \Forking())->processWorkType('safe_' . $argv[1]);
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/settings.php.example b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/settings.php.example
deleted file mode 100644
index c903dba02..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/settings.php.example
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Maximum time in seconds a child can stay alive.
- * Keeps long processes, like groups with millions of parts from preventing other groups to update.
- *
- * @default 1800
- */
-define('NN_MULTIPROCESSING_MAX_CHILD_TIME', 1800);
-
-/**
- * How much work can 1 child do.
- * Increasing this currently reduces performance with no benefits, here for testing or future use.
- *
- * @default 1
- */
-define('NN_MULTIPROCESSING_MAX_CHILD_WORK', 1);
-
-/**
- * This setting can be used to override your site settings, to cap the maximum amount of child processes.
- * Set to 0 to ignore.
- *
- * @default 0
- */
-define('NN_MULTIPROCESSING_MAX_CHILDREN_OVERRIDE', 0);
-
-/**
- * Which type of messages to display on the screen.
- *
- * -1 All messages.
- *  2 Critical messages.
- *  4 Warnings.
- *  6 Info messages.
- *  7 Debug messages.
- *
- * @default 6
- */
-define('NN_MULTIPROCESSING_LOG_TYPE', 6);
-
-/**
- * How to display the text output (echo's) from the child processes.
- *
- * 0 - Do not display any anything.
- * 1 - Display the text as the child outputs it in real time. (This will mix all the child process text output.)
- * 2 - Display the text when the child is done. (This will display the text serially.)
- *
- * @default 1
- */
-define('NN_MULTIPROCESSING_CHILD_OUTPUT_TYPE', 1);
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/update_per_group.php b/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/update_per_group.php
deleted file mode 100644
index 387129ca5..000000000
--- a/lib/copy_this/misc/update_scripts/nix_scripts/multiprocessing/update_per_group.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-declare(ticks=1);
-require('.do_not_run/require.php');
-require_once('Forking.php');
-// This is the same as the python update_threaded.php
-(new \Forking())->processWorkType('update_per_group');
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/nntpproxy.php b/lib/copy_this/misc/update_scripts/nntpproxy.php
deleted file mode 100644
index f487dd95b..000000000
--- a/lib/copy_this/misc/update_scripts/nntpproxy.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/site.php");
-
-passthru("clear");
-
-$pdo = new DB();
-$t = new \Tmux();
-$tmux = $t->get();
-$powerline = (isset($tmux->powerline)) ? $tmux->powerline : 0;
-$s= new Sites();
-$site = $s->get();
-
-$tmux_session = 'NNTPProxy';
-
-function python_module_exist($module)
-{
-	exec("python -c \"import $module\"", $output, $returnCode);
-	return ($returnCode == 0 ? true : false);
-}
-
-$nntpproxy = $site->nntpproxy;
-if ($nntpproxy === '0') {
-	exit();
-} else {
-	$modules = array("socketpool");
-	foreach ($modules as &$value) {
-		if (!python_module_exist($value)) {
-			exit($pdo->log->error("NNTP Proxy requires " . $value . " python module but it's not installed. Aborting."));
-		}
-	}
-}
-
-function window_proxy($tmux_session, $powerline)
-{
-	global $pdo;
-	global $site;
-
-	$DIR = NN_MISC;
-	if ($powerline === '1') {
-		$tmuxconfig = $DIR . "update_scripts/nix_scripts/tmux/powerline/tmux.conf";
-	} else {
-		$tmuxconfig = $DIR . "update_scripts/nix_scripts/tmux/tmux.conf";
-	}
-
-	$nntpproxy = $pdo->getSetting('nntpproxy');
-	if ($nntpproxy === '1') {
-		$DIR = NN_MISC;
-		$nntpproxypy = $DIR . "update_scripts/nix_scripts/_tmux/python/nntpproxy.py";
-		if (file_exists($DIR . "update_scripts/nix_scripts/tmux//python/lib/nntpproxy.conf")) {
-			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf";
-			shell_exec("cd ${DIR}/update_scripts/nix_scripts/tmux; tmux -f $tmuxconfig attach-session -t $tmux_session || tmux -f $tmuxconfig new-session -d -s $tmux_session -n NNTPProxy 'printf \"\033]2;\"NNTPProxy\"\033\" && python $nntpproxypy $nntpproxyconf'");
-		}
-	}
-
-	if ($nntpproxy == '1' && ($site->alternate_nntp == '1')) {
-		$DIR = NN_MISC;
-		$nntpproxypy = $DIR . "update_scripts/nix_scripts/tmux/python/nntpproxy.py";
-		if (file_exists($DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy_a.conf")) {
-			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy_a.conf";
-			shell_exec("tmux selectp -t 0; tmux splitw -t $tmux_session:0 -h -p 50 'printf \"\033]2;NNTPProxy\033\" && python $nntpproxypy $nntpproxyconf'");
-		}
-	}
-}
-
-window_proxy($tmux_session, $powerline);
diff --git a/lib/copy_this/misc/update_scripts/update_binaries.php b/lib/copy_this/misc/update_scripts/update_binaries.php
deleted file mode 100644
index 551113ae6..000000000
--- a/lib/copy_this/misc/update_scripts/update_binaries.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/config.php");
-require_once(WWW_DIR."/lib/groups.php");
-require_once(WWW_DIR."/lib/binaries.php");
-require_once(WWW_DIR."/lib/nntp.php");
-
-$pdo = new DB();
-
-// Create the connection here and pass
-$nntp = new \NNTP(['Settings' => $pdo]);
-if ($nntp->doConnect() !== true) {
-	exit($pdo->log->error("Unable to connect to usenet."));
-}
-$binaries = new \Binaries(['NNTP' => $nntp, 'Settings' => $pdo]);
-
-if (isset($argv[1]) && !is_numeric($argv[1])) {
-	$groupName = $argv[1];
-	echo $pdo->log->header("Updating group: $groupName");
-
-	$grp = new \Groups(['Settings' => $pdo]);
-	$group = $grp->getByName($groupName);
-	if (is_array($group)) {
-		$binaries->updateGroup($group, (isset($argv[2]) && is_numeric($argv[2]) && $argv[2] > 0 ? $argv[2] : 0));
-	}
-} else {
-	$binaries->updateAllGroups((isset($argv[1]) && is_numeric($argv[1]) && $argv[1] > 0 ? $argv[1] : 0));
-}
\ No newline at end of file
diff --git a/lib/copy_this/misc/update_scripts/update_theaters.php b/lib/copy_this/misc/update_scripts/update_theaters.php
deleted file mode 100644
index 3604ea946..000000000
--- a/lib/copy_this/misc/update_scripts/update_theaters.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-//run this once per day
-require_once("config.php");
-require_once(WWW_DIR.'/../misc/update_scripts/nix_scripts/tmux/lib/Film.php');
-
-$m = new \Film(['Echo' => true]);
-$m->updateUpcoming();
-
diff --git a/lib/copy_this/misc/update_scripts/update_tvschedule.php b/lib/copy_this/misc/update_scripts/update_tvschedule.php
deleted file mode 100644
index 6b1e92eed..000000000
--- a/lib/copy_this/misc/update_scripts/update_tvschedule.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// Run this once per day.
-require_once("config.php");
-require_once(WWW_DIR.'/../misc/update_scripts/nix_scripts/tmux/lib/TvAnger.php');
-
-(new \TvAnger(['Echo' => true]))->updateSchedule();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/ajax_group-edit.php b/lib/copy_this/www/admin/ajax_group-edit.php
deleted file mode 100644
index 705e4812a..000000000
--- a/lib/copy_this/www/admin/ajax_group-edit.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/groups.php");
-
-$admin = new AdminPage;
-$group  = new Groups(['Settings' => $admin->settings]);
-
-// session_write_close(); allows the admin to use the site while the ajax request is being processed.
-if (isset($_GET['action']) && $_GET['action'] == "2") {
-	$id = (int)$_GET['group_id'];
-	session_write_close();
-	$group->delete($id);
-	print "Group $id deleted.";
-} else if (isset($_GET['action']) && $_GET['action'] == "3") {
-	$id = (int)$_GET['group_id'];
-	session_write_close();
-	$group->reset($id);
-	print "Group $id reset.";
-} else if (isset($_GET['action']) && $_GET['action'] == "4") {
-	$id = (int)$_GET['group_id'];
-	session_write_close();
-	$group->purge($id);
-	print "Group $id purged.";
-} else if (isset($_GET['action']) && $_GET['action'] == "5") {
-	$group->resetall();
-	print "All groups reset.";
-} else if (isset($_GET['action']) && $_GET['action'] == "6") {
-	session_write_close();
-	$group->purge();
-	print "All groups purged.";
-} else {
-	if (isset($_GET['group_id'])) {
-		$id = (int)$_GET['group_id'];
-		if(isset($_GET['group_status'])) {
-			$status = isset($_GET['group_status']) ? (int)$_GET['group_status'] : 0;
-			print $group->updateGroupStatus($id, $status);
-		}
-		if(isset($_GET['backfill_status'])) {
-			$status = isset($_GET['backfill_status']) ? (int)$_GET['backfill_status'] : 0;
-			print $group->updateBackfillStatus($id, $status);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/ajax_sharing_settings.php b/lib/copy_this/www/admin/ajax_sharing_settings.php
deleted file mode 100644
index d6dc3a7d3..000000000
--- a/lib/copy_this/www/admin/ajax_sharing_settings.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-
-// Login check.
-$admin = new AdminPage;
-$db = new DB();
-
-if (isset($_GET['site_ID']) && isset($_GET['site_status'])) {
-	$db->queryExec(sprintf('UPDATE sharing_sites SET enabled = %d WHERE id = %d', $_GET['site_status'], $_GET['site_ID']));
-	if ($_GET['site_status'] == 1) {
-		print 'Activated site ' . $_GET['site_ID'];
-	} else {
-		print 'Deactivated site ' . $_GET['site_ID'];
-	}
-}
-
-else if (isset($_GET['enabled_status'])) {
-	$db->queryExec(sprintf('UPDATE sharing SET enabled = %d', $_GET['enabled_status']));
-	if ($_GET['enabled_status'] == 1) {
-		print 'Enabled sharing!';
-	} else {
-		print 'Disabled sharing!';
-	}
-}
-
-else if (isset($_GET['posting_status'])) {
-	$db->queryExec(sprintf('UPDATE sharing SET posting = %d', $_GET['posting_status']));
-	if ($_GET['posting_status'] == 1) {
-		print 'Enabled posting!';
-	} else {
-		print 'Disabled posting!';
-	}
-}
-
-else if (isset($_GET['fetching_status'])) {
-	$db->queryExec(sprintf('UPDATE sharing SET fetching = %d', $_GET['fetching_status']));
-	if ($_GET['fetching_status'] == 1) {
-		print 'Enabled fetching!';
-	} else {
-		print 'Disabled fetching!';
-	}
-}
-
-else if (isset($_GET['auto_status'])) {
-	$db->queryExec(sprintf('UPDATE sharing SET auto_enable = %d', $_GET['auto_status']));
-	if ($_GET['auto_status'] == 1) {
-		print 'Enabled automatic site enabling!';
-	} else {
-		print 'Disabled automatic site enabling!';
-	}
-}
-
-else if (isset($_GET['hide_status'])) {
-	$db->queryExec(sprintf('UPDATE sharing SET hide_users = %d', $_GET['hide_status']));
-	if ($_GET['hide_status'] == 1) {
-		print 'Enabled hiding of user names!';
-	} else {
-		print 'Disabled hiding of user names!';
-	}
-}
-
-else if (isset($_GET['start_position'])) {
-	$db->queryExec(sprintf('UPDATE sharing SET start_position = %d', $_GET['start_position']));
-	if ($_GET['start_position'] == 1) {
-		print 'Enabled fetching from start of group!';
-	} else {
-		print 'Disabled fetching from start of group!';
-	}
-}
-
-else if (isset($_GET['toggle_all'])) {
-	$db->queryExec(sprintf('UPDATE sharing_sites SET enabled = %d', $_GET['toggle_all']));
-}
-
-else if (isset($_GET['reset_settings'])) {
-	$guid = $db->queryOneRow('SELECT site_guid FROM sharing');
-	$guid = ($guid === false ? '' : $guid['site_guid']);
-	(new Sharing(['Settings' => $admin->settings]))->initSettings($guid);
-	print 'Re-initiated sharing settings!';
-}
-
-else if (isset($_GET['purge_site'])) {
-	$guid = $db->queryOneRow(sprintf('SELECT site_guid FROM sharing_sites WHERE id = %d', $_GET['purge_site']));
-	if ($guid === false) {
-		print 'Error purging site ' . $_GET['purge_site'] . '!';
-	} else {
-		$ids = $db->query(sprintf('SELECT id FROM releasecomment WHERE siteid = %s', $db->escapeString($guid['site_guid'])));
-		$total = count($ids);
-		if ($total > 0) {
-			$rc = new ReleaseComments();
-			foreach ($ids as $id) {
-				$rc->deleteComment($id['id']);
-			}
-		}
-		$db->queryExec(sprintf('UPDATE sharing_sites SET comments = 0 WHERE id = %d', $_GET['purge_site']));
-		print 'Deleted ' . $total . ' comments for site ' . $_GET['purge_site'];
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/game-edit.php b/lib/copy_this/www/admin/game-edit.php
deleted file mode 100644
index 5a07bdab5..000000000
--- a/lib/copy_this/www/admin/game-edit.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/Games.php");
-require_once(WWW_DIR."/lib/genres.php");
-
-$page = new AdminPage();
-$games = new Games(['Settings' => $page->settings]);
-$gen = new Genres(['Settings' => $page->settings]);
-$id = 0;
-
-// Set the current action.
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-if (isset($_REQUEST["id"])) {
-	$id = $_REQUEST["id"];
-	$game = $games->getGamesInfo($id);
-
-	if (!$game) {
-		$page->show404();
-	}
-
-	switch($action) {
-		case 'submit':
-			$coverLoc = NN_COVERS . "games/" . $id . '.jpg';
-
-			if($_FILES['cover']['size'] > 0) {
-				$tmpName = $_FILES['cover']['tmp_name'];
-				$file_info = getimagesize($tmpName);
-				if(!empty($file_info)) {
-					move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc);
-				}
-			}
-
-			$_POST['cover'] = (file_exists($coverLoc)) ? 1 : 0;
-			$_POST['releasedate'] = (empty($_POST['releasedate']) || !strtotime($_POST['releasedate'])) ? $game['releasedate'] : date("Y-m-d H:i:s", strtotime($_POST['releasedate']));
-
-			$games->update($id, $_POST["title"], $_POST['asin'], $_POST['url'], $_POST["publisher"], $_POST["releasedate"], $_POST["esrb"], $_POST["cover"], $_POST['trailerurl'], $_POST["genre"]);
-
-			header("Location:".WWW_TOP."/game-list.php");
-			die();
-		break;
-
-		case 'view':
-		default:
-			$page->title = "Game Edit";
-			$page->smarty->assign('game', $game);
-			$page->smarty->assign('genres', $gen->getGenres(\Genres::GAME_TYPE));
-		break;
-	}
-}
-
-$page->content = $page->smarty->fetch('game-edit.tpl');
-$page->render();
diff --git a/lib/copy_this/www/admin/game-list.php b/lib/copy_this/www/admin/game-list.php
deleted file mode 100644
index 02b5c050e..000000000
--- a/lib/copy_this/www/admin/game-list.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/Games.php");
-
-$page = new AdminPage();
-$game = new Games(['Settings' => $page->settings]);
-
-$page->title = "Game List";
-
-$gamecount = $game->getCount();
-
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$page->smarty->assign('pagertotalitems',$gamecount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP."/game-list.php?offset=");
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$gamelist = $game->getRange($offset, ITEMS_PER_PAGE);
-
-$page->smarty->assign('gamelist',$gamelist);
-
-$page->content = $page->smarty->fetch('game-list.tpl');
-$page->render();
diff --git a/lib/copy_this/www/admin/group-bulk.php b/lib/copy_this/www/admin/group-bulk.php
deleted file mode 100644
index 4ba66e2ff..000000000
--- a/lib/copy_this/www/admin/group-bulk.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/groups.php");
-
-$page = new AdminPage();
-
-// set the current action
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-switch($action)
-{
-	case 'submit':
-		if (isset($_POST['groupfilter']) && !empty($_POST['groupfilter'])) {
-			$groups = new Groups;
-			$msgs = $groups->addBulk($_POST['groupfilter'], $_POST['active'], $_POST['backfill']);
-		}
-		break;
-	default:
-		$msgs = '';
-		break;
-}
-
-$page->smarty->assign('groupmsglist',$msgs);
-$page->smarty->assign('yesno_ids', array(1,0));
-$page->smarty->assign('yesno_names', array( 'Yes', 'No'));
-
-$page->title = "Bulk Add Newsgroups";
-$page->content = $page->smarty->fetch('group-bulk.tpl');
-$page->render();
diff --git a/lib/copy_this/www/admin/group-edit.php b/lib/copy_this/www/admin/group-edit.php
deleted file mode 100644
index 62c08bd31..000000000
--- a/lib/copy_this/www/admin/group-edit.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/groups.php");
-require_once(WWW_DIR."/lib/category.php");
-
-$page = new AdminPage();
-$groups = new Groups(['Settings' => $page->settings]);
-$id = 0;
-
-// Set the current action.
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-switch($action) {
-	case 'submit':
-		if ($_POST["id"] == "") {
-			// Add a new group.
-			$groups->add($_POST);
-		} else {
-			// Update an existing group.
-			$groups->update($_POST);
-		}
-		header("Location:".WWW_TOP."/group-list.php");
-		break;
-
-	case 'view':
-	default:
-		if (isset($_GET["id"])) {
-			$page->title = "Newsgroup Edit";
-			$id = $_GET["id"];
-			$group = $groups->getByID($id);
-		} else {
-			$page->title = "Newsgroup Add";
-			$group = array();
-			$group["active"] = "0";
-			$group["backfill"] = "0";
-			$group["minfilestoformrelease"] = "0";
-			$group["minsizetoformrelease"] = "0";
-			$group["first_record"] = "0";
-			$group["last_record"] = "0";
-			$group["backfill_target"] = "0";
-			$group["regexmatchonly"] = "1";
-		}
-		$page->smarty->assign('group', $group);
-		break;
-}
-
-$page->smarty->assign('yesno_ids', array(1,0));
-$page->smarty->assign('yesno_names', array( 'Yes', 'No'));
-
-$page->content = $page->smarty->fetch('group-edit.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/group-list-active.php b/lib/copy_this/www/admin/group-list-active.php
deleted file mode 100644
index 244f866f1..000000000
--- a/lib/copy_this/www/admin/group-list-active.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/groups.php");
-
-$page = new AdminPage();
-$groups = new Groups(['Settings' => $page->settings]);
-
-$gname = "";
-if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
-	$gname = $_REQUEST['groupname'];
-}
-
-$groupcount = $groups->getCountActive($gname);
-
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
-
-$page->smarty->assign('groupname',$groupname);
-$page->smarty->assign('pagertotalitems',$groupcount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-
-$groupsearch = ($gname != "") ? 'groupname='.$gname.'&amp;' : '';
-$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list-active.php?".$groupsearch."offset=");
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$grouplist = $groups->getRangeActive($offset, ITEMS_PER_PAGE, $gname);
-
-$page->smarty->assign('grouplist',$grouplist);
-
-$page->title = "Group List";
-
-$page->content = $page->smarty->fetch('group-list.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/group-list-inactive.php b/lib/copy_this/www/admin/group-list-inactive.php
deleted file mode 100644
index 939cf6598..000000000
--- a/lib/copy_this/www/admin/group-list-inactive.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/groups.php");
-
-$page = new AdminPage();
-$groups = new Groups(['Settings' => $page->settings]);
-
-$gname = "";
-if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
-	$gname = $_REQUEST['groupname'];
-}
-
-$groupcount = $groups->getCountInactive($gname);
-
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
-
-$page->smarty->assign('groupname',$groupname);
-$page->smarty->assign('pagertotalitems',$groupcount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-
-$groupsearch = ($gname != "") ? 'groupname='.$gname.'&amp;' : '';
-$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list-inactive.php?".$groupsearch."offset=");
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$grouplist = $groups->getRangeInactive($offset, ITEMS_PER_PAGE, $gname);
-
-$page->smarty->assign('grouplist',$grouplist);
-
-$page->title = "Group List";
-
-$page->content = $page->smarty->fetch('group-list.tpl');
-$page->render();
diff --git a/lib/copy_this/www/admin/group-list.php b/lib/copy_this/www/admin/group-list.php
deleted file mode 100644
index 894a321e9..000000000
--- a/lib/copy_this/www/admin/group-list.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/groups.php");
-
-$page = new AdminPage();
-$groups = new Groups(['Settings' => $page->settings]);
-
-$gname = "";
-if (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) {
-	$gname = $_REQUEST['groupname'];
-}
-
-$groupcount = $groups->getCount($gname);
-
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
-
-$page->smarty->assign('groupname',$groupname);
-$page->smarty->assign('pagertotalitems',$groupcount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-
-$groupsearch = ($gname != "") ? 'groupname='.$gname.'&amp;' : '';
-$page->smarty->assign('pagerquerybase', WWW_TOP."/group-list.php?".$groupsearch."offset=");
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$grouplist = $groups->getRange($offset, ITEMS_PER_PAGE, $gname);
-
-$page->smarty->assign('grouplist',$grouplist);
-
-$page->title = "Group List";
-
-$page->content = $page->smarty->fetch('group-list.tpl');
-$page->render();
diff --git a/lib/copy_this/www/admin/opcachestats.php b/lib/copy_this/www/admin/opcachestats.php
deleted file mode 100644
index 07dc0b37d..000000000
--- a/lib/copy_this/www/admin/opcachestats.php
+++ /dev/null
@@ -1,585 +0,0 @@
-<?php
-
-// #newznab-tmux : Denotes modifications done for newznab-tmux integration.
-
-/* #newznab-tmux */
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-$page = new AdminPage();
-$NNURL = $page->serverurl;
-/* #newznab-tmux */
-
-/**
- * OPcache GUI
- *
- * A simple but effective single-file GUI for the OPcache PHP extension.
- *
- * @author Andrew Collington, andy@amnuts.com
- * @version 2.0.0
- * @link https://github.com/amnuts/opcache-gui
- * @license MIT, http://acollington.mit-license.org/
- */
-
-if (!extension_loaded('Zend OPcache')) {
-	die('The Zend OPcache extension does not appear to be installed');
-}
-
-class OpCacheService
-{
-	protected $data;
-	protected $options = [
-		'allow_invalidate' => true
-	];
-
-	private function __construct($options = [])
-	{
-		$this->data = $this->compileState();
-		$this->options = array_merge($this->options, $options);
-	}
-
-	public static function init($options = [])
-	{
-		$self = new self($options);
-		if (!empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-			&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'
-		) {
-			if ((isset($_GET['reset']))) {
-				echo '{ "success": "' . ($self->resetCache() ? 'yes' : 'no') . '" }';
-			} else if ((isset($_GET['invalidate']))) {
-				echo '{ "success": "' . ($self->resetCache($_GET['invalidate']) ? 'yes' : 'no') . '" }';
-			} else {
-				echo json_encode($self->getData(@$_GET['section'] ?: null));
-			}
-			exit;
-		} else if ((isset($_GET['reset']))) {
-			$self->resetCache();
-		} else if ((isset($_GET['invalidate']))) {
-			$self->resetCache($_GET['invalidate']);
-		}
-		return $self;
-	}
-
-	public function getOption($name = null)
-	{
-		if ($name === null) {
-			return $this->options;
-		}
-		return (isset($this->options[$name])
-			? $this->options[$name]
-			: null
-		);
-	}
-
-	public function getData($section = null, $property = null)
-	{
-		if ($section === null) {
-			return $this->data;
-		}
-		$section = strtolower($section);
-		if (isset($this->data[$section])) {
-			if ($property === null || !isset($this->data[$section][$property])) {
-				return $this->data[$section];
-			}
-			return $this->data[$section][$property];
-		}
-		return null;
-	}
-
-	public function canInvalidate()
-	{
-		return ($this->getOption('allow_invalidate') && function_exists('opcache_invalidate'));
-	}
-
-	public function resetCache($file = null)
-	{
-		$success = false;
-		if ($file === null) {
-			$success = opcache_reset();
-		} else if (function_exists('opcache_invalidate')) {
-			$success = opcache_invalidate(urldecode($file), true);
-		}
-		if ($success) {
-			$this->compileState();
-		}
-		return $success;
-	}
-
-	protected function compileState()
-	{
-		$status = opcache_get_status();
-		$config = opcache_get_configuration();
-		$memsize = function($size, $precision = 3, $space = false)
-		{
-			$i = 0;
-			$val = array(' bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-			while (($size / 1024) > 1) {
-				$size /= 1024;
-				++$i;
-			}
-			return sprintf("%.{$precision}f%s%s", $size, (($space && $i) ? ' ' : ''), $val[$i]);
-		};
-
-		$files = [];
-		if (!empty($status['scripts'])) {
-			uasort($status['scripts'], function($a, $b) {
-				return $a['hits'] < $b['hits'];
-			});
-			foreach ($status['scripts'] as &$file) {
-				$file['full_path'] = str_replace('\\', '/', $file['full_path']);
-				$file['readable'] = [
-					'hits'               => number_format($file['hits']),
-					'memory_consumption' => $memsize($file['memory_consumption'])
-				];
-			}
-			$files = array_values($status['scripts']);
-		}
-
-		$overview = array_merge(
-			$status['memory_usage'], $status['opcache_statistics'], [
-				'used_memory_percentage'  => round(100 * (
-						($status['memory_usage']['used_memory'] + $status['memory_usage']['wasted_memory'])
-						/ $config['directives']['opcache.memory_consumption'])),
-				'hit_rate_percentage'     => round($status['opcache_statistics']['opcache_hit_rate']),
-				'wasted_percentage'       => round($status['memory_usage']['current_wasted_percentage'], 2),
-				'readable' => [
-					'total_memory'       => $memsize($config['directives']['opcache.memory_consumption']),
-					'used_memory'        => $memsize($status['memory_usage']['used_memory']),
-					'free_memory'        => $memsize($status['memory_usage']['free_memory']),
-					'wasted_memory'      => $memsize($status['memory_usage']['wasted_memory']),
-					'num_cached_scripts' => number_format($status['opcache_statistics']['num_cached_scripts']),
-					'hits'               => number_format($status['opcache_statistics']['hits']),
-					'misses'             => number_format($status['opcache_statistics']['misses']),
-					'blacklist_miss'     => number_format($status['opcache_statistics']['blacklist_misses']),
-					'num_cached_keys'    => number_format($status['opcache_statistics']['num_cached_keys']),
-					'max_cached_keys'    => number_format($status['opcache_statistics']['max_cached_keys']),
-					'start_time'         => date_format(date_create("@{$status['opcache_statistics']['start_time']}"), 'Y-m-d H:i:s'),
-					'last_restart_time'  => ($status['opcache_statistics']['last_restart_time'] == 0
-						? 'never'
-						: date_format(date_create("@{$status['opcache_statistics']['last_restart_time']}"), 'Y-m-d H:i:s')
-					)
-				]
-			]
-		);
-
-		$directives = [];
-		ksort($config['directives']);
-		foreach ($config['directives'] as $k => $v) {
-			$directives[] = ['k' => $k, 'v' => $v];
-		}
-
-		$version = array_merge(
-			$config['version'],
-			[
-				'php'    => phpversion(),
-				'server' => $_SERVER['SERVER_SOFTWARE'],
-				'host'   => (function_exists('gethostname')
-					? gethostname()
-					: (php_uname('n')
-						?: (empty($_SERVER['SERVER_NAME'])
-							? $_SERVER['HOST_NAME']
-							: $_SERVER['SERVER_NAME']
-						)
-					)
-				)
-			]
-		);
-
-		return [
-			'version'    => $version,
-			'overview'   => $overview,
-			'files'      => $files,
-			'directives' => $directives,
-			'blacklist'  => $config['blacklist'],
-			'functions'  => get_extension_funcs('Zend OPcache')
-		];
-	}
-}
-
-$opcache = OpCacheService::init();
-
-?>
-<!doctype html>
-<html>
-<head>
-	<meta charset="UTF-8"/>
-	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-	<title>OPcache statistics on <?php echo $opcache->getData('version', 'host'); ?></title>
-	<script src="//cdn.jsdelivr.net/react/0.12.2/react.min.js"></script>
-	<script src="//code.jquery.com/jquery-2.1.3.min.js"></script>
-	<style type="text/css">
-		body { font-family:sans-serif; font-size:90%; padding: 0; margin: 0 }
-		nav { padding-top: 20px; }
-		nav > ul { list-style-type: none; padding-left: 8px; margin: 0; border-bottom: 1px solid #ccc; }
-		nav > ul > li { display: inline-block; padding: 0; margin: 0 0 -1px 0; }
-		nav > ul > li > a { display: block; margin: 0 10px; padding: 15px 30px; border: 1px solid transparent; border-bottom-color: #ccc; text-decoration: none; }
-		nav > ul > li > a:hover { background-color: #f4f4f4; text-decoration: underline; }
-		nav > ul > li > a.active:hover { background-color: initial; }
-		nav > ul > li > a[data-for].active { border: 1px solid #ccc; border-bottom-color: #ffffff; border-top: 3px solid #6ca6ef; }
-		table { margin: 0 0 1em 0; border-collapse: collapse; border-color: #fff; width: 100%; }
-		table caption { text-align: left; font-size: 1.5em; }
-		table tr { background-color: #99D0DF; border-color: #fff; }
-		table th { text-align: left; padding: 6px; background-color: #6ca6ef; color: #fff; border-color: #fff; font-weight: normal; }
-		table td { padding: 4px 6px; line-height: 1.4em; vertical-align: top; border-color: #fff; }
-		table tr:nth-child(odd) { background-color: #EFFEFF; }
-		table tr:nth-child(even) { background-color: #E0ECEF; }
-		td.pathname { width: 70%; }
-		footer { border-top: 1px solid #ccc; padding: 1em 2em; }
-		footer a { padding: 2em; text-decoration: none; opacity: 0.7; }
-		footer a:hover { opacity: 1; }
-		#tabs { padding: 2em; }
-		#tabs > div { display: none; }
-		#tabs > div#overview { display:block; }
-		#resetCache, #toggleRealtime, footer > a { background-position: 5px 50%; background-repeat: no-repeat; background-color: transparent; }
-		footer > a { background-position: 0 50%; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjE2MENCRkExNzVBQjExRTQ5NDBGRTUzMzQyMDVDNzFFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjE2MENCRkEyNzVBQjExRTQ5NDBGRTUzMzQyMDVDNzFFIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MTYwQ0JGOUY3NUFCMTFFNDk0MEZFNTMzNDIwNUM3MUUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTYwQ0JGQTA3NUFCMTFFNDk0MEZFNTMzNDIwNUM3MUUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7HtUU1AAABN0lEQVR42qyUvWoCQRSF77hCLLKC+FOlCKTyIbYQUuhbWPkSFnZ2NpabUvANLGyz5CkkYGMlFtFAUmiSM8lZOVkWsgm58K079+fMnTusZl92BXbgDrTtZ2szd8fas/XBOzmBKaiCEFyTkL4pc9L8vgpNJJDyWtDna61EoXpO+xcFfXUVqtrf7Vx7m9Pub/EatvgHoYXD4ylztC14BBVwydvydgDPHPgNaErN3jLKIxAUmEvAXK21I18SJpXBGAxyBAaMlblOWOs1bMXFkMGeBFsi0pJNe/QNuV7563+gs8LfhrRfE6GaHLuRqfnUiKi6lJ034B44EXL0baTTJWujNGkG3kBX5uRyZuRkPl3WzDTBtzjnxxiDDq83yNxUk7GYuXM53jeLuMNavvAXkv4zrJkTaeGHAAMAIal3icPMsyQAAAAASUVORK5CYII='); font-size: 80%; }
-		#resetCache { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NjBFMUMyMjI3NDlGMTFFNEE3QzNGNjQ0OEFDQzQ1MkMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NjBFMUMyMjM3NDlGMTFFNEE3QzNGNjQ0OEFDQzQ1MkMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MEUxQzIyMDc0OUYxMUU0QTdDM0Y2NDQ4QUNDNDUyQyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo2MEUxQzIyMTc0OUYxMUU0QTdDM0Y2NDQ4QUNDNDUyQyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PplZ+ZkAAAD1SURBVHjazFPtDYJADIUJZAMZ4UbACWQENjBO4Ao6AW5AnODcADZQJwAnwJ55NbWhB/6zycsdpX39uDZNpsURtjgzwkDoCBecs5ITPGGMwCNAkIrQw+8ri36GhBHsavFdpILEo4wEpZxRigy009EhG760gr0VhFoyZfvJKPwsheIWIeGejBZRIxRVhMRFevbuUXBew/iE/lhlBduV0j8Jx+TvJEWPphq8n5li9utgaw6cW/h6NSt/JcnVBhQxotIgKTBrbNvIHo2G0x1rwlKqTDusxiAz6hHNL1zayTVqVKRKpa/LPljPH1sJh6l/oNSrZfwSYABtq3tFdZA5BAAAAABJRU5ErkJggg=='); }
-		#toggleRealtime { position: relative; background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAUCAYAAACAl21KAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODE5RUU4NUE3NDlGMTFFNDkyMzA4QzY1RjRBQkIzQjUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODE5RUU4NUI3NDlGMTFFNDkyMzA4QzY1RjRBQkIzQjUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4MTlFRTg1ODc0OUYxMUU0OTIzMDhDNjVGNEFCQjNCNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4MTlFRTg1OTc0OUYxMUU0OTIzMDhDNjVGNEFCQjNCNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PpXjpvMAAAD2SURBVHjarFQBEcMgDKR3E1AJldA5wMEqAQmTgINqmILdFCChdUAdMAeMcukuSwnQbbnLlZLwJPkQIcrSiT/IGNQHNb8CGQDyRw+2QWUBqC+luzo4OKQZIAVrB+ssyKp3Bkijf0+ijzIh4wQppoBauMSjyDZfMSCDxYZMsfHF120T36AqWZMkgyguQ3GOfottJ5TKnHC+wfeRsC2oDVayPgr3bbN2tHBH3tWuJCPa0JUgKtFzMQrcZH3FNHAc0yOp1cCASALyngoN6lhDopkJWxdifwY9A3u7l29ImpxOFSWIOVsGwHKENIWxss2eBVKdOeeXAAMAk/Z9h4QhXmUAAAAASUVORK5CYII='); }
-		#counts { width: 270px; float: right; }
-		#counts > div > div { background-color: #ededed; margin-bottom: 10px; }
-		#counts > div > div > h3 { background-color: #cdcdcd; padding: 4px 6px; margin: 0; }
-		#counts > div > div > p { margin: 0; text-align: center; }
-		#counts > div > div > p > span.large + span { font-size: 20pt; margin: 0; }
-		#counts > div > div > p > span.large { font-size: 80pt; margin: 0; padding: 0; text-align: center; }
-		#info { margin-right: 280px; }
-		#frmFilter { width: 520px; }
-		#moreinfo { padding: 10px; }
-		#moreinfo > p { text-align: left !important; line-height: 180%; }
-		.metainfo { font-size: 80%; }
-		.hide { display: none; }
-		#toggleRealtime.pulse::before {
-			content: ""; position: absolute;
-			top: 13px; left: 3px; width: 18px; height: 18px;
-			z-index: 10; opacity: 0; background-color: transparent;
-			border: 2px solid rgb(255, 116, 0); border-radius: 100%;
-			-webkit-animation: pulse 1s linear 2;
-			-moz-animation: pulse 1s linear 2;
-			animation: pulse 1s linear 2;
-		}
-		@media screen and (max-width: 750px) {
-			#info { margin-right:auto; clear:both; }
-			nav > ul { border-bottom: 0; }
-			nav > ul > li { display: block; margin: 0; }
-			nav > ul > li > a { display: block; margin: 0 10px; padding: 10px 0 10px 30px; border: 0; }
-			nav > ul > li > a[data-for].active { border-bottom-color: #ccc; }
-			#counts { position:relative; display:block; width:100%; }
-			#toggleRealtime.pulse::before { top: 8px; }
-		}
-		@media screen and (max-width: 550px) {
-			#frmFilter { width: 100%; }
-		}
-		@keyframes pulse {
-			0% {transform: scale(1); opacity: 0;}
-			50% {transform: scale(1.3); opacity: 0.7;}
-			100% {transform: scale(1.6); opacity: 1;}
-		}
-		@-webkit-keyframes pulse {
-			0% {-webkit-transform: scale(1); opacity: 0;}
-			50% {-webkit-transform: scale(1.3); opacity: 0.7;}
-			100% {-webkit-transform: scale(1.6); opacity: 0;}
-		}
-		@-moz-keyframes pulse {
-			0% {-moz-transform: scale(1); opacity: 0;}
-			50% {-moz-transform: scale(1.3); opacity: 0.7;}
-			100% {-moz-transform: scale(1.6); opacity: 0;}
-		}
-	</style>
-</head>
-
-<body>
-
-<header>
-	<nav>
-		<ul>
-			<!-- #newznab-tmux -->
-			<li><a href="<?php echo $NNURL; ?>" class="button">Newznab</a></li>
-			<!-- #newznab-tmux -->
-			<li><a data-for="overview" href="#overview" class="active">Overview</a></li>
-			<li><a data-for="files" href="#files">File usage</a></li>
-			<li><a href="?reset=1" id="resetCache" onclick="return confirm('Are you sure you want to reset the cache?');">Reset cache</a></li>
-			<li><a href="#" id="toggleRealtime">Enable real-time update</a></li>
-		</ul>
-	</nav>
-</header>
-
-<div id="tabs">
-	<div id="overview">
-		<div class="container">
-			<div id="counts"></div>
-			<div id="info">
-				<div id="generalInfo"></div>
-				<div id="directives"></div>
-				<div id="functions">
-					<table>
-						<thead>
-						<tr><th>Available functions</th></tr>
-						</thead>
-						<tbody>
-						<?php foreach ($opcache->getData('functions') as $func): ?>
-							<tr><td><a href="http://php.net/<?php echo $func; ?>" title="View manual page" target="_blank"><?php echo $func; ?></a></td></tr>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-				</div>
-				<br style="clear:both;" />
-			</div>
-		</div>
-	</div>
-	<div id="files">
-		<p><label>Start typing to filter on script path<br/><input type="text" name="filter" id="frmFilter" /><label></p>
-		<div class="container" id="filelist"></div>
-	</div>
-</div>
-
-<footer>
-	<a href="https://github.com/amnuts/opcache-gui" target="_blank">https://github.com/amnuts/opcache-gui</a>
-</footer>
-
-<script type="text/javascript">
-	var realtime = false;
-	var opstate = <?php echo json_encode($opcache->getData()); ?>;
-	var canInvalidate = <?php echo ($opcache->canInvalidate() ? 'true' : 'false'); ?>;
-
-	$(function(){
-		function updateStatus() {
-			$('#toggleRealtime').removeClass('pulse');
-			$.ajax({
-				url: "#",
-				dataType: "json",
-				cache: false,
-				success: function(data) {
-					$('#toggleRealtime').addClass('pulse');
-					opstate = data;
-					overviewCountsObj.setState({
-						data : opstate.overview
-					});
-					generalInfoObj.setState({
-						version : opstate.version,
-						start : opstate.overview.readable.start_time,
-						reset : opstate.overview.readable.last_restart_time
-					});
-					filesObj.setState({
-						data : opstate.files,
-						count_formatted : opstate.overview.readable.num_cached_scripts,
-						count : opstate.overview.num_cached_scripts
-					});
-					$('#frmFilter').trigger('keyup');
-				}
-			});
-		}
-		$('#toggleRealtime').click(function(){
-			if (realtime === false) {
-				realtime = setInterval(function(){updateStatus()}, 5000);
-				$(this).text('Disable real-time update');
-			} else {
-				clearInterval(realtime);
-				realtime = false;
-				$(this).text('Enable real-time update').removeClass('pulse');
-			}
-		});
-		$('nav a[data-for]').click(function(){
-			$('#tabs > div').hide();
-			$('#' + $(this).data('for')).show();
-			$('nav a[data-for]').removeClass('active');
-			$(this).addClass('active');
-			return false;
-		});
-		$(document).on('paint', '#filelist table tbody', function(event, params) {
-			var trs = $('tr', $(this)).not('.hide');
-			trs.filter(':odd').css({backgroundColor:'#E0ECEF'})
-				.end().filter(':even').css({backgroundColor:'#EFFEFF'});
-			filesObj.setState({showing: trs.length});
-		});
-		$('#frmFilter').bind('keyup', function(event){
-			$('span.pathname').each(function(index){
-				if ($(this).text().toLowerCase().indexOf($('#frmFilter').val().toLowerCase()) == -1) {
-					$(this).closest('tr').addClass('hide');
-				} else {
-					$(this).closest('tr').removeClass('hide');
-				}
-			});
-			$('#filelist table tbody').trigger('paint');
-		});
-	});
-
-	var OverviewCounts = React.createClass({displayName: 'OverviewCounts',
-		getInitialState: function() {
-			return { data : opstate.overview };
-		},
-		render: function() {
-			return (
-				React.createElement("div", null,
-					React.createElement("div", null,
-						React.createElement("h3", null, "memory usage"),
-						React.createElement("p", null, React.createElement("span", {className: "large"}, this.state.data.used_memory_percentage), React.createElement("span", null, "%"))
-					),
-					React.createElement("div", null,
-						React.createElement("h3", null, "hit rate"),
-						React.createElement("p", null, React.createElement("span", {className: "large"}, this.state.data.hit_rate_percentage), React.createElement("span", null, "%"))
-					),
-					React.createElement("div", {id: "moreinfo"},
-						React.createElement("p", null, React.createElement("b", null, "total memory:"), this.state.data.readable.total_memory),
-						React.createElement("p", null, React.createElement("b", null, "used memory:"), this.state.data.readable.used_memory),
-						React.createElement("p", null, React.createElement("b", null, "free memory:"), this.state.data.readable.free_memory),
-						React.createElement("p", null, React.createElement("b", null, "wasted memory:"), this.state.data.readable.wasted_memory, " (", this.state.data.wasted_percentage, "%)"),
-						React.createElement("p", null, React.createElement("b", null, "number of cached files:"), this.state.data.readable.num_cached_scripts),
-						React.createElement("p", null, React.createElement("b", null, "number of hits:"), this.state.data.readable.hits),
-						React.createElement("p", null, React.createElement("b", null, "number of misses:"), this.state.data.readable.misses),
-						React.createElement("p", null, React.createElement("b", null, "blacklist misses:"), this.state.data.readable.blacklist_miss),
-						React.createElement("p", null, React.createElement("b", null, "number of cached keys:"), this.state.data.readable.num_cached_keys),
-						React.createElement("p", null, React.createElement("b", null, "max cached keys:"), this.state.data.readable.max_cached_keys)
-					)
-				)
-			);
-		}
-	});
-
-	var GeneralInfo = React.createClass({displayName: 'GeneralInfo',
-		getInitialState: function() {
-			return {
-				version : opstate.version,
-				start : opstate.overview.readable.start_time,
-				reset : opstate.overview.readable.last_restart_time
-			};
-		},
-		render: function() {
-			return (
-				React.createElement("table", null,
-					React.createElement("thead", null,
-						React.createElement("tr", null, React.createElement("th", {colSpan: "2"}, "General info"))
-					),
-					React.createElement("tbody", null,
-						React.createElement("tr", null, React.createElement("td", null, "Zend OPcache"), React.createElement("td", null, this.state.version.version)),
-						React.createElement("tr", null, React.createElement("td", null, "PHP"), React.createElement("td", null, this.state.version.php)),
-						React.createElement("tr", null, React.createElement("td", null, "Host"), React.createElement("td", null, this.state.version.host)),
-						React.createElement("tr", null, React.createElement("td", null, "Server Software"), React.createElement("td", null, this.state.version.server)),
-						React.createElement("tr", null, React.createElement("td", null, "Start time"), React.createElement("td", null, this.state.start)),
-						React.createElement("tr", null, React.createElement("td", null, "Last reset"), React.createElement("td", null, this.state.reset))
-					)
-				)
-			);
-		}
-	});
-
-	var Directives = React.createClass({displayName: 'Directives',
-		getInitialState: function() {
-			return { data : opstate.directives };
-		},
-		render: function() {
-			var directiveNodes = this.state.data.map(function(directive) {
-				var map = { 'opcache.':'', '_':' ' };
-				var dShow = directive.k.replace(/opcache\.|_/gi, function(matched){
-					return map[matched];
-				});
-				var vShow;
-				if (directive.v === true || directive.v === false) {
-					vShow = React.createElement('i', {}, directive.v.toString());
-				} else if (directive.v == '') {
-					vShow = React.createElement('i', {}, 'no value');
-				} else {
-					vShow = directive.v;
-				}
-				return (
-					React.createElement("tr", {key: directive.k},
-						React.createElement("td", {title: directive.k}, dShow),
-						React.createElement("td", null, vShow)
-					)
-				);
-			});
-			return (
-				React.createElement("table", null,
-					React.createElement("thead", null,
-						React.createElement("tr", null, React.createElement("th", {colSpan: "2"}, "Directives"))
-					),
-					React.createElement("tbody", null, directiveNodes)
-				)
-			);
-		}
-	});
-
-	var Files = React.createClass({displayName: 'Files',
-		getInitialState: function() {
-			return {
-				data : opstate.files,
-				showing: null
-			};
-		},
-		handleInvalidate: function(e) {
-			e.preventDefault();
-			if (realtime) {
-				$.get('#', { invalidate: e.currentTarget.getAttribute('data-file') }, function(data) {
-					console.log('success: ' + data.success);
-				}, 'json');
-			} else {
-				window.location.href = e.currentTarget.href;
-			}
-		},
-		render: function() {
-			var fileNodes = this.state.data.map(function(file) {
-				var invalidate, invalidated;
-				if (file.timestamp == 0) {
-					invalidated = React.createElement("span", null, React.createElement("i", {className: "invalid metainfo"}, "has been invalidated"));
-				}
-				if (canInvalidate) {
-					invalidate = React.createElement("span", null, ", ", React.createElement("a", {className: "metainfo", href: '?invalidate='
-					+ file.full_path, 'data-file': file.full_path, onClick: this.handleInvalidate}, "force file invalidation"));
-				}
-				return (
-					React.createElement("tr", {key: file.full_path},
-						React.createElement("td", null,
-							React.createElement("div", null,
-								React.createElement("span", {className: "pathname"}, file.full_path), React.createElement("br", null),
-								React.createElement(FilesMeta, {data: [file.readable.hits, file.readable.memory_consumption, file.last_used]}),
-								invalidate,
-								invalidated
-							)
-						)
-					)
-				);
-			}.bind(this));
-			return (
-				React.createElement("div", null,
-					React.createElement(FilesListed, {showing: this.state.showing}),
-					React.createElement("table", null,
-						React.createElement("thead", null, React.createElement("tr", null, React.createElement("th", null, "Script"))),
-						React.createElement("tbody", null, fileNodes)
-					)
-				)
-			);
-		}
-	});
-
-	var FilesMeta = React.createClass({displayName: 'FilesMeta',
-		render: function() {
-			return (
-				React.createElement("span", {className: "metainfo"},
-					React.createElement("b", null, "hits: "), React.createElement("span", null, this.props.data[0], ", "),
-					React.createElement("b", null, "memory: "), React.createElement("span", null, this.props.data[1], ", "),
-					React.createElement("b", null, "last used: "), React.createElement("span", null, this.props.data[2])
-				)
-			);
-		}
-	});
-
-	var FilesListed = React.createClass({displayName: 'FilesListed',
-		getInitialState: function() {
-			return {
-				formatted : opstate.overview.readable.num_cached_scripts,
-				total     : opstate.overview.num_cached_scripts
-			};
-		},
-		render: function() {
-			var display = this.state.formatted + ' file' + (this.state.total == 1 ? '' : 's') + ' cached';
-			if (this.props.showing !== null && this.props.showing != this.state.total) {
-				display += ', ' + this.props.showing + ' showing due to filter';
-			}
-			return (React.createElement("h3", null, display));
-		}
-	});
-
-	var overviewCountsObj = React.render(React.createElement(OverviewCounts, null), document.getElementById('counts'));
-	var generalInfoObj = React.render(React.createElement(GeneralInfo, null), document.getElementById('generalInfo'));
-	var filesObj = React.render(React.createElement(Files, null), document.getElementById('filelist'));
-	React.render(React.createElement(Directives, null), document.getElementById('directives'));
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/regex-test.php b/lib/copy_this/www/admin/regex-test.php
deleted file mode 100644
index 240c444e0..000000000
--- a/lib/copy_this/www/admin/regex-test.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/releaseregex.php");
-require_once(WWW_DIR."/lib/groups.php");
-require_once(WWW_DIR."/lib/category.php");
-
-require_once(WWW_DIR."/lib/nntp.php");
-
-$page = new AdminPage();
-$reg = new ReleaseRegex();
-$groups = new Groups();
-$cat = new Category();
-$id = 0;
-
-// set the current action
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-$numarticlesdefault = 20000;
-$groupList = $groups->getAll();
-array_unshift($groupList, array('id'=>0, 'name'=>'All Groups'));
-
-$gid = $gnames = array();
-$groupname = (isset($_REQUEST['groupname']) && !empty($_REQUEST['groupname'])) ? $_REQUEST['groupname'] : '';
-$groupID = isset($_REQUEST['groupid']) ? $_REQUEST['groupid'] : '0';
-$regex = (isset($_REQUEST['regex']) && !empty($_REQUEST['regex'])) ? $_REQUEST['regex'] : '/^(?P<name>.*)$/i';
-$poster = (isset($_REQUEST['poster']) && !empty($_REQUEST['poster'])) ? $_REQUEST['poster'] : '';
-$unreleased = isset($_REQUEST['unreleased']) ? $_REQUEST['unreleased'] : '';
-$matchagainstbins = isset($_REQUEST['matchagainstbins']) ? $_REQUEST['matchagainstbins'] : '';
-$numarticles = (isset($_REQUEST['numarticles']) && !empty($_REQUEST['numarticles'])) ? $_REQUEST['numarticles'] : $numarticlesdefault;
-$clearexistingbins = isset($_REQUEST['clearexistingbins']) ? true : false;
-foreach($groupList as $grp)
-{
-	$gid[$grp["id"]] = $grp["id"];
-	$gnames[$grp["id"]] = $grp["name"];
-}
-
-$group = $groupname;
-if ($group == '')
-{
-	if ($groupID == 0)
-		$group = 0;
-	else
-		$group = $gnames[$groupID];
-}
-
-$page->smarty->assign('gid', $gid);
-$page->smarty->assign('gnames', $gnames);
-$page->smarty->assign('group', $group);
-$page->smarty->assign('groupname', $groupname);
-$page->smarty->assign('groupid', $groupID);
-$page->smarty->assign('regex', $regex);
-$page->smarty->assign('poster', $poster);
-$page->smarty->assign('unreleased', $unreleased);
-$page->smarty->assign('matchagainstbins', $matchagainstbins);
-$page->smarty->assign('numarticles', $numarticles);
-
-switch($action)
-{
-	case 'test':
-		if (isset($_REQUEST["regex"]))
-		{
-			$matches = $reg->testRegex($_REQUEST['regex'], $group, $poster, $unreleased, $matchagainstbins);
-
-			$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-			$page->smarty->assign('pagertotalitems',sizeof($matches));
-			$page->smarty->assign('pageroffset',$offset);
-			$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-			$page->smarty->assign('pagerquerybase', WWW_TOP."/regex-test.php?action=test&groupname={$groupname}&groupid={$groupID}&regex=".urlencode($regex)."&poster=".urlencode($poster)."&unreleased={$unreleased}&matchagainstbins={$matchagainstbins}&offset=");
-			$pager = $page->smarty->fetch("pager.tpl");
-			$page->smarty->assign('pager', $pager);
-
-			$matches = array_slice($matches, $offset, ITEMS_PER_PAGE);
-
-			$page->smarty->assign('matches', $matches);
-		}
-		break;
-	case 'fetch':
-		$result = $reg->fetchTestBinaries($group, $numarticles, $clearexistingbins);
-
-		$page->smarty->assign('error', implode('<br />', $result));
-
-		break;
-}
-
-$page->title = "Release Regex Test";
-
-$page->content = $page->smarty->fetch('regex-test.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/release-edit.php b/lib/copy_this/www/admin/release-edit.php
deleted file mode 100644
index 70c2d8273..000000000
--- a/lib/copy_this/www/admin/release-edit.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/category.php");
-
-$page = new AdminPage();
-$releases = new Releases();
-$category = new Category();
-$id = 0;
-
-// set the current action
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-switch($action)
-{
-	case 'submit':
-
-		$releases->update($_POST["id"], $_POST["name"], $_POST["searchname"], $_POST["fromname"], $_POST["category"], $_POST["totalpart"], $_POST["grabs"], $_POST["size"], $_POST["postdate"], $_POST["adddate"], $_POST["rageid"], $_POST["seriesfull"], $_POST["season"], $_POST["episode"], $_POST['imdbid'], $_POST['anidbid'], $_POST['tvdbid'], $_POST['consoleinfoid']);
-
-		if(isset($_POST['from']) && !empty($_POST['from']))
-		{
-			header("Location:".$_POST['from']);
-			exit;
-		}
-
-		header("Location:".WWW_TOP."/release-list.php");
-		break;
-	case 'view':
-	default:
-
-		if (isset($_GET["id"]))
-		{
-			$page->title = "Release Edit";
-			$id = $_GET["id"];
-
-			$release = $releases->getByID($id);
-
-			if ($release && $release["imdbid"] != "")
-			{
-				require_once(WWW_DIR."/lib/movie.php");
-				$movie = new Movie();
-				$mov = $movie->getMovieInfo($release['imdbid']);
-				$page->smarty->assign('updatename', $mov["title"]);
-			}
-
-			if ($release && $release["musicinfoid"] != "")
-			{
-				require_once(WWW_DIR."/lib/music.php");
-				$music = new Music();
-				$mus = $music->getMusicInfo($release['musicinfoid']);
-				$page->smarty->assign('updatename', $mus["artist"]." - ".$mus["title"].($mus["year"] != "" ? " - ".$mus["year"] : ""));
-			}
-
-			$page->smarty->assign('release', $release);
-		}
-
-		break;
-}
-
-$page->smarty->assign('yesno_ids', array(1,0));
-$page->smarty->assign('yesno_names', array( 'Yes', 'No'));
-$page->smarty->assign('catlist',$category->getForSelect(false));
-
-$page->content = $page->smarty->fetch('release-edit.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/sharing.php b/lib/copy_this/www/admin/sharing.php
deleted file mode 100644
index 7dee3a966..000000000
--- a/lib/copy_this/www/admin/sharing.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-
-$page = new AdminPage();
-$page->title = 'Sharing Settings';
-
-$db = new DB();
-
-$offset = (isset($_GET['offset']) ? $_GET['offset'] : 0);
-
-$allSites = $db->query(sprintf('SELECT * FROM sharing_sites ORDER BY id LIMIT %d OFFSET %d', 25, $offset));
-if (count($allSites) === 0) {
-	$allSites = false;
-}
-
-$ourSite = $db->queryOneRow('SELECT * FROM sharing');
-
-if (!empty($_POST)) {
-	if (!empty($_POST['sharing_name']) && !preg_match('/\s+/', $_POST['sharing_name']) && strlen($_POST['sharing_name']) < 255) {
-		$site_name = trim($_POST['sharing_name']);
-	} else {
-		$site_name = $ourSite['site_name'];
-	}
-	if (!empty($_POST['sharing_maxpush']) && is_numeric($_POST['sharing_maxpush'])) {
-		$max_push = trim($_POST['sharing_maxpush']);
-	} else {
-		$max_push = $ourSite['max_push'];
-	}
-	if (!empty($_POST['sharing_maxpull']) && is_numeric($_POST['sharing_maxpush'])) {
-		$max_pull = trim($_POST['sharing_maxpull']);
-	} else {
-		$max_pull = $ourSite['max_pull'];
-	}
-	if (!empty($_POST['sharing_maxdownload']) && is_numeric($_POST['sharing_maxdownload'])) {
-		$max_download = trim($_POST['sharing_maxdownload']);
-	} else {
-		$max_download = $ourSite['max_download'];
-	}
-	$db->queryExec(
-		sprintf('
-			UPDATE sharing
-			SET site_name = %s, max_push = %d, max_pull = %d, max_download = %d',
-			$db->escapeString($site_name), $max_push, $max_pull, $max_download
-		)
-	);
-	$ourSite = $db->queryOneRow('SELECT * FROM sharing');
-}
-
-$total = $db->queryOneRow('SELECT COUNT(*) AS total FROM sharing_sites');
-
-$page->smarty->assign('pagertotalitems', ($total === false ? 0 : $total['total']));
-$page->smarty->assign('pageroffset', $offset);
-$page->smarty->assign('pageritemsperpage', 25);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/sharing.php?offset=");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$page->smarty->assign(array('local' => $ourSite, 'sites' => $allSites));
-
-$page->content = $page->smarty->fetch('sharing.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/site-edit.php b/lib/copy_this/www/admin/site-edit.php
deleted file mode 100644
index f88b4336b..000000000
--- a/lib/copy_this/www/admin/site-edit.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/sabnzbd.php");
-
-$page = new AdminPage();
-$sites = new Sites();
-$id = 0;
-
-// set the current action
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-switch($action)
-{
-	case 'submit':
-
-		if (!empty($_POST['book_reqids'])) {
-			// book_reqids is an array it needs to be a comma separated string, make it so.
-			$_POST['book_reqids'] = is_array($_POST['book_reqids']) ?
-				implode(', ', $_POST['book_reqids']) : $_POST['book_reqids'];
-		}
-		$error = "";
-		$ret = $sites->update($_POST);
-		if (is_int($ret))
-		{
-			if ($ret == Sites::ERR_BADUNRARPATH)
-				$error = "The unrar path does not point to a valid binary";
-			elseif ($ret == Sites::ERR_BADFFMPEGPATH)
-				$error = "The ffmpeg path does not point to a valid binary";
-			elseif ($ret == Sites::ERR_BADMEDIAINFOPATH)
-				$error = "The mediainfo path does not point to a valid binary";
-			elseif ($ret == Sites::ERR_BADNZBPATH)
-				$error = "The nzb path does not point to a valid directory";
-			elseif ($ret == Sites::ERR_DEEPNOUNRAR)
-				$error = "Deep password check requires a valid path to unrar binary";
-			elseif ($ret == Sites::ERR_BADTMPUNRARPATH)
-				$error = "The temp unrar path is not a valid directory";
-			elseif ($ret == Sites::ERR_BADLAMEPATH)
-				$error = "The lame path is not a valid directory";
-			elseif ($ret == Sites::ERR_SABCOMPLETEPATH)
-				$error = "The sab complete path is not a valid directory";
-		}
-
-		if ($error == "")
-		{
-			$site = $ret;
-			$returnid = $site->id;
-			header("Location:".WWW_TOP."/site-edit.php?id=".$returnid);
-		}
-		else
-		{
-			$page->smarty->assign('error', $error);
-			$site = $sites->row2Object($_POST);
-			$page->smarty->assign('fsite', $site);
-		}
-
-		break;
-	case 'view':
-	default:
-
-		$page->title = "Site Edit";
-		$site = $sites->get();
-		$page->smarty->assign('fsite', $site);
-
-		break;
-}
-
-$page->smarty->assign('yesno_ids', array(1,0));
-$page->smarty->assign('yesno_names', array( 'Yes', 'No'));
-
-$page->smarty->assign('passwd_ids', array(1,0));
-$page->smarty->assign('passwd_names', array( 'Deep (requires unrar)', 'None'));
-
-$page->smarty->assign('rottentomatoquality_ids', array('thumbnail', 'profile', 'detailed', 'original'));
-$page->smarty->assign('rottentomatoquality_names', array('Thumbnail', 'Profile', 'Detailed', 'Original'));
-
-$page->smarty->assign('sabintegrationtype_ids', array(SABnzbd::INTEGRATION_TYPE_USER, SABnzbd::INTEGRATION_TYPE_SITEWIDE, SABnzbd::INTEGRATION_TYPE_NONE));
-$page->smarty->assign('sabintegrationtype_names', array( 'User', 'Site-wide', 'None (Off)'));
-
-$page->smarty->assign('sabapikeytype_ids', array(SABnzbd::API_TYPE_NZB,SABnzbd::API_TYPE_FULL));
-$page->smarty->assign('sabapikeytype_names', array( 'Nzb Api Key', 'Full Api Key'));
-
-$page->smarty->assign('sabpriority_ids', array(SABnzbd::PRIORITY_FORCE, SABnzbd::PRIORITY_HIGH, SABnzbd::PRIORITY_NORMAL, SABnzbd::PRIORITY_LOW));
-$page->smarty->assign('sabpriority_names', array( 'Force', 'High', 'Normal', 'Low'));
-
-$page->smarty->assign('curlproxytype_names', array( '', 'HTTP', 'SOCKS5'));
-
-$page->smarty->assign('newgroupscan_names', array('Days','Posts'));
-
-$page->smarty->assign('registerstatus_ids', array(Sites::REGISTER_STATUS_API_ONLY, Sites::REGISTER_STATUS_OPEN, Sites::REGISTER_STATUS_INVITE, Sites::REGISTER_STATUS_CLOSED));
-$page->smarty->assign('registerstatus_names', array('API Only', 'Open', 'Invite', 'Closed'));
-
-$page->smarty->assign('passworded_ids', array(0,1,2));
-$page->smarty->assign('passworded_names', array( 'Dont show passworded or potentially passworded', 'Dont show passworded', 'Show everything'));
-
-$page->smarty->assign('sphinxrebuildfreqday_days', array('', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'));
-
-$page->smarty->assign('lookuplanguage_iso', array('en', 'de', 'es', 'fr', 'it', 'nl', 'pt', 'sv'));
-$page->smarty->assign('lookuplanguage_names', array('English', 'Deutsch', 'Español', 'Français', 'Italiano', 'Nederlands', 'Português', 'Svenska'));
-
-$page->smarty->assign('imdb_urls', array(0,1));
-$page->smarty->assign('imdburl_names', array('imdb.com', 'akas.imdb.com'));
-
-$page->smarty->assign('lookupbooks_ids', [0,1,2]);
-$page->smarty->assign('lookupbooks_names', ['Disabled', 'Lookup All Books', 'Lookup Renamed Books']);
-
-$page->smarty->assign('lookupgames_ids', [0,1,2]);
-$page->smarty->assign('lookupgames_names', ['Disabled', 'Lookup All Consoles', 'Lookup Renamed Consoles']);
-
-$page->smarty->assign('lookupmusic_ids', [0,1,2]);
-$page->smarty->assign('lookupmusic_names', ['Disabled', 'Lookup All Music', 'Lookup Renamed Music']);
-
-$page->smarty->assign('lookupmovies_ids', [0,1,2]);
-$page->smarty->assign('lookupmovies_names', ['Disabled', 'Lookup All Movies', 'Lookup Renamed Movies']);
-
-$page->smarty->assign('lookuptv_ids', [0,1,2]);
-$page->smarty->assign('lookuptv_names', ['Disabled', 'Lookup All TV', 'Lookup Renamed TV']);
-
-$page->smarty->assign('lookup_reqids_ids', array(0,1,2));
-$page->smarty->assign('lookup_reqids_names', array('Disabled', 'Lookup Request IDs', 'Lookup Request IDs Threaded'));
-
-// return a list of audiobooks, mags, ebooks, technical and foreign books
-$result = $page->settings->query("SELECT id, title FROM category WHERE id in (3030, 7010, 7020, 7040, 7060)");
-
-// setup the display lists for these categories, this could have been static, but then if names changed they would be wrong
-$book_reqids_ids = array();
-$book_reqids_names = array();
-foreach ($result as $bookcategory)
-{
-	$book_reqids_ids[]   = $bookcategory["id"];
-	$book_reqids_names[] = $bookcategory["title"];
-}
-
-// convert from a string array to an int array as we want to use int
-$book_reqids_ids = array_map(create_function('$value', 'return (int)$value;'), $book_reqids_ids);
-$page->smarty->assign('book_reqids_ids', $book_reqids_ids);
-$page->smarty->assign('book_reqids_names', $book_reqids_names);
-
-// convert from a list to an array as we need to use an array, but teh sites table only saves strings
-$books_selected = explode(",", $page->site->book_reqids);
-
-// convert from a string array to an int array
-$books_selected = array_map(create_function('$value', 'return (int)$value;'), $books_selected);
-$page->smarty->assign('book_reqids_selected', $books_selected);
-
-$themelist = array();
-$themes = scandir(WWW_DIR."/templates");
-foreach ($themes as $theme)
-	if (strpos($theme, ".") === false && is_dir(WWW_DIR."/templates/".$theme))
-		$themelist[] = $theme;
-
-$page->smarty->assign('themelist', $themelist);
-
-if (strpos(NNTP_SERVER, "astra")===false)
-	$page->smarty->assign('compress_headers_warning', "compress_headers_warning");
-
-$page->content = $page->smarty->fetch('site-edit.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/tmux-edit.php b/lib/copy_this/www/admin/tmux-edit.php
deleted file mode 100644
index cbee5b490..000000000
--- a/lib/copy_this/www/admin/tmux-edit.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/Tmux.php");
-
-$page = new AdminPage();
-$tmux = new Tmux();
-$id = 0;
-
-// Set the current action.
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-switch($action)
-{
-	case 'submit':
-		$error = "";
-		$ret = $tmux->update($_POST);
-		$page->title = "Tmux Settings Edit";
-		$settings = $tmux->get();
-		$page->smarty->assign('ftmux', $settings);
-		break;
-
-	case 'view':
-	default:
-		$page->title = "Tmux Settings Edit";
-		$settings = $tmux->get();
-		$page->smarty->assign('ftmux', $settings);
-		break;
-}
-
-$page->smarty->assign('yesno_ids', array(1, 0));
-$page->smarty->assign('yesno_names', array('yes', 'no'));
-
-$page->smarty->assign('backfill_ids', array(0,4,2,1));
-$page->smarty->assign('backfill_names', array('Disabled', 'Safe', 'All', 'Interval'));
-$page->smarty->assign('backfill_group_ids', array(1,2,3,4,5,6));
-$page->smarty->assign('backfill_group', array('Newest', 'Oldest', 'Alphabetical', 'Alphabetical - Reverse', 'Most Posts', 'Fewest Posts'));
-$page->smarty->assign('backfill_days', array('Days per Group', 'Safe Backfill day'));
-$page->smarty->assign('backfill_days_ids', array(1,2));
-$page->smarty->assign('dehash_ids', array(0,1,2,3));
-$page->smarty->assign('dehash_names', array('Disabled', 'Decrypt Hashes', 'Predb', 'All'));
-$page->smarty->assign('import_ids', array(0,1,2));
-$page->smarty->assign('import_names', array('Disabled', 'Import - Do Not Use Filenames', 'Import - Use Filenames'));
-$page->smarty->assign('releases_ids', array(0,1,2));
-$page->smarty->assign('releases_names', array('Disabled', 'Update Releases', 'Update Releases Threaded'));
-$page->smarty->assign('post_ids', array(0,1,2,3));
-$page->smarty->assign('post_names', array('Disabled', 'PostProcess Additional', 'PostProcess NFOs', 'All'));
-$page->smarty->assign('fix_crap_radio_ids', array('Disabled', 'All', 'Custom'));
-$page->smarty->assign('fix_crap_radio_names', array('Disabled', 'All', 'Custom'));
-$page->smarty->assign('fix_crap_check_ids', array('blacklist', 'blfiles', 'executable', 'gibberish', 'hashed', 'installbin', 'passworded', 'passwordurl', 'sample', 'scr', 'short', 'size', 'huge', 'codec'));
-$page->smarty->assign('fix_crap_check_names', array('blacklist', 'blfiles', 'executable', 'gibberish', 'hashed', 'installbin', 'passworded', 'passwordurl', 'sample', 'scr', 'short', 'size', 'huge', 'codec'));
-$page->smarty->assign('sequential_ids', array(0,1,2));
-$page->smarty->assign('sequential_names', array('Disabled', 'Basic Sequential', 'Complete Sequential'));
-$page->smarty->assign('binaries_ids', array(0,1,2));
-$page->smarty->assign('binaries_names', array('Disabled', 'Simple Threaded Update', 'Complete Threaded Update'));
-$page->smarty->assign('post_non_ids', array(0,1,2));
-$page->smarty->assign('post_non_names', array('Disabled', 'All Available Releases', 'Properly Renamed Releases'));
-$page->smarty->assign('lookup_reqids_ids', array(0,1,2));
-$page->smarty->assign('lookup_reqids_names', array('Disabled', 'Lookup Request IDs', 'Lookup Request IDs Threaded'));
-$page->smarty->assign('predb_ids', array(0,1));
-$page->smarty->assign('predb_names', array('Disabled', 'Enabled'));
-
-
-$page->content = $page->smarty->fetch('tmux-edit.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/user-edit.php b/lib/copy_this/www/admin/user-edit.php
deleted file mode 100644
index cd150367b..000000000
--- a/lib/copy_this/www/admin/user-edit.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR . "/lib/adminpage.php");
-require_once(WWW_DIR . "/lib/users.php");
-
-$page = new AdminPage();
-$users = new Users();
-$id = 0;
-
-// set the current action
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-//get the user roles
-$userroles = $users->getRoles();
-$roles = array();
-$defaultrole = Users::ROLE_USER;
-$defaultinvites = Users::DEFAULT_INVITES;
-foreach ($userroles as $r) {
-	$roles[$r['id']] = $r['name'];
-	if ($r['isdefault'] == 1) {
-		$defaultrole = $r['id'];
-		$defaultinvites = $r['defaultinvites'];
-	}
-}
-
-switch ($action) {
-	case 'add':
-		$user = array();
-		$user["role"] = $defaultrole;
-		$user["notes"] = "";
-		$user["invites"] = $defaultinvites;
-		$user["movieview"] = "1";
-		$user["musicview"] = "1";
-		$user["gameview"] = "1";
-		$user["xxxview"] = "1";
-		$user["consoleview"] = "1";
-		$user["bookview"] = "1";
-		$page->smarty->assign('user', $user);
-		break;
-	case 'submit':
-
-		if ($_POST["id"] == "") {
-			$invites = $defaultinvites;
-			foreach ($userroles as $role) {
-				if ($role['id'] == $_POST['role'])
-					$invites = $role['defaultinvites'];
-			}
-			$ret = $users->signup($_POST["username"], $_POST["password"], $_POST["email"], '', $_POST["role"], $_POST["notes"], $invites, "", true, false, false, true);
-		} else {
-			$ret = $users->update($_POST["id"], $_POST["username"], $_POST["email"], $_POST["grabs"], $_POST["role"], $_POST["notes"], $_POST["invites"], (isset($_POST['movieview']) ? "1" : "0"), (isset($_POST['musicview']) ? "1" : "0"), (isset($_POST['gameview']) ? "1" : "0"), (isset($_POST['xxxview']) ? "1" : "0"), (isset($_POST['consoleview']) ? "1" : "0"), (isset($_POST['bookview']) ? "1" : "0"));
-			if ($_POST['password'] != "")
-				$users->updatePassword($_POST["id"], $_POST['password']);
-		}
-
-		if ($ret >= 0)
-			header("Location:" . WWW_TOP . "/user-list.php");
-		else {
-			switch ($ret) {
-				case Users::ERR_SIGNUP_BADUNAME:
-					$page->smarty->assign('error', "Bad username. Try a better one.");
-					break;
-				case Users::ERR_SIGNUP_BADPASS:
-					$page->smarty->assign('error', "Bad password. Try a longer one.");
-					break;
-				case Users::ERR_SIGNUP_BADEMAIL:
-					$page->smarty->assign('error', "Bad email.");
-					break;
-				case Users::ERR_SIGNUP_UNAMEINUSE:
-					$page->smarty->assign('error', "Username in use.");
-					break;
-				case Users::ERR_SIGNUP_EMAILINUSE:
-					$page->smarty->assign('error', "Email in use.");
-					break;
-				default:
-					$page->smarty->assign('error', "Unknown save error.");
-					break;
-			}
-			$user = array();
-			$user["id"] = $_POST["id"];
-			$user["username"] = $_POST["username"];
-			$user["email"] = $_POST["email"];
-			$user["grabs"] = (isset($_POST["grabs"]) ? $_POST["grabs"] : "0");
-			$user["role"] = $_POST["role"];
-			$user["notes"] = $_POST["notes"];
-			$user["invites"] = (isset($_POST["invites"]) ? $_POST["invites"] : "0");
-			$user["movieview"] = $_POST["movieview"];
-			$user["bookview"] = $_POST["bookview"];
-			$page->smarty->assign('user', $user);
-		}
-		break;
-	case 'view':
-	default:
-
-	if (isset($_GET["id"])) {
-			$page->title = "User Edit";
-			$id = $_GET["id"];
-			$user = $users->getByID($id);
-
-			$page->smarty->assign('user', $user);
-		}
-
-		break;
-}
-
-$page->smarty->assign('yesno_ids', array(1, 0));
-$page->smarty->assign('yesno_names', array('Yes', 'No'));
-
-$page->smarty->assign('role_ids', array_keys($roles));
-$page->smarty->assign('role_names', $roles);
-
-$page->content = $page->smarty->fetch('user-edit.tpl');
-$page->render();
-
diff --git a/lib/copy_this/www/admin/user-list.php b/lib/copy_this/www/admin/user-list.php
deleted file mode 100644
index e658b0919..000000000
--- a/lib/copy_this/www/admin/user-list.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR."/lib/adminpage.php");
-require_once(WWW_DIR."/lib/users.php");
-
-$page = new AdminPage();
-
-$users = new Users();
-
-$page->title = "User List";
-
-$usercount = $users->getCount();
-$userroles = $users->getRoles();
-$roles = array();
-foreach ($userroles as $r) {
-	$roles[$r['id']] = $r['name'];
-}
-
-
-$offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
-$ordering = $users->getBrowseOrdering();
-$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-$usearch = '';
-$username = '';
-if (isset($_REQUEST["username"])) {
-	$username = $_REQUEST["username"];
-	$usearch .= '&amp;username='.$username;
-}
-$email = '';
-if (isset($_REQUEST["email"])) {
-	$email = $_REQUEST["email"];
-	$usearch .= '&amp;email='.$email;
-}
-$host = '';
-if (isset($_REQUEST["host"])) {
-	$host = $_REQUEST["host"];
-	$usearch .= '&amp;host='.$host;
-}
-$role = '';
-if (isset($_REQUEST["role"]) && array_key_exists($_REQUEST['role'], $roles)) {
-	$role = $_REQUEST["role"];
-	$usearch .= '&amp;role='.$role;
-}
-
-$page->smarty->assign('username',$username);
-$page->smarty->assign('email',$email);
-$page->smarty->assign('host',$host);
-$page->smarty->assign('role',$role);
-$page->smarty->assign('role_ids', array_keys($roles));
-$page->smarty->assign('role_names', $roles);
-
-$page->smarty->assign('pagertotalitems',$usercount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP."/user-list.php?ob=".$orderby.$usearch."&amp;offset=");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-foreach($ordering as $ordertype)
-	$page->smarty->assign('orderby'.$ordertype, WWW_TOP."/user-list.php?ob=".$ordertype."&amp;offset=0");
-
-$userlist = $users->getRange($offset, ITEMS_PER_PAGE, $orderby, $username, $email, $host, $role);
-$page->smarty->assign('userlist',$userlist);
-
-$page->content = $page->smarty->fetch('user-list.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/admin/view-logs.php b/lib/copy_this/www/admin/view-logs.php
deleted file mode 100644
index b783debb5..000000000
--- a/lib/copy_this/www/admin/view-logs.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-require_once("config.php");
-require_once(WWW_DIR . "/lib/adminpage.php");
-require_once(WWW_DIR . "/lib/Logger.php");
-
-$page = new AdminPage();
-$page->title = 'View Logs';
-
-$type = isset($_GET['t']) ? $_GET['t'] : 'all';
-$page->smarty->assign('type', $type);
-$offset = isset($_GET['offset']) ? $_GET['offset'] : 0;
-
-$logPath = Logger::getDefaultLogPaths();
-$logPath = $logPath['LogPath'];
-
-$regex = false;
-
-switch($type) {
-	case 'info':
-		$regex = '/\[INFO\]/';
-		break;
-	case 'notice':
-		$regex = '/\[NOTICE\]/';
-		break;
-	case 'warning':
-		$regex = '/\[WARN\]/';
-		break;
-	case 'error':
-		$regex = '/\[ERROR\]/';
-		break;
-	case 'fatal':
-		$regex = '/\[FATAL\]/';
-		break;
-	case 'sql':
-		$regex = '/\[SQL\]/';
-		break;
-	case 'all':
-	default:
-		break;
-}
-
-$data = $file = false;
-if (is_file($logPath)) {
-	$file = file($logPath);
-}
-$total = 0;
-if ($file !== false) {
-	rsort($file);
-	$data = [];
-	foreach ($file as $line) {
-		$line = str_replace(array('>', '<'), '', $line);
-		if ($regex !== false) {
-			if (preg_match($regex, $line)) {
-				$data[] = $line;
-			}
-		} else {
-			$data[] = $line;
-		}
-	}
-	if (count($data) === 0) {
-		$data = false;
-	} else {
-		$total = count($data);
-		$data = array_slice($data, $offset, ITEMS_PER_PAGE);
-	}
-}
-
-$page->smarty->assign(
-	array(
-		'data' => $data,
-		'types' => array('all', 'info', 'notice', 'warning', 'error', 'fatal', 'sql'),
-		'path' => NN_WWW . 'automated.config.php'
-	)
-);
-
-$page->smarty->assign('pagertotalitems', $total);
-$page->smarty->assign('pageroffset', $offset);
-$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/view-logs.php?t=" . $type . "&amp;offset=");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$page->content = $page->smarty->fetch('view-logs.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/automated.config.php b/lib/copy_this/www/automated.config.php
deleted file mode 100644
index 4b0c20fa6..000000000
--- a/lib/copy_this/www/automated.config.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-// YOU SHOULD NOT EDIT ANYTHING IN THIS FILE, COPY settings.php.example TO settings.php AND EDIT THAT FILE!
-
-define('NN_MINIMUM_PHP_VERSION', '5.5.0');
-define('NN_MINIMUM_MYSQL_VERSION', '5.5');
-
-define('DS', DIRECTORY_SEPARATOR);
-
-// These are file path constants
-define('NN_ROOT', realpath((dirname(__FILE__))) . DS);
-
-// Used to refer to the main lib class files.
-define('NN_LIB', NN_ROOT . 'lib' . DS);
-define('NN_CORE', NN_LIB);
-
-// Refers to the web root for the Smarty lib
-define('NN_WWW', NN_ROOT);
-
-//Refers to the misc folder
-define('NN_MISC', NN_WWW . '..' . DS . 'misc' . DS);
-
-//Refers to update_scripts folder
-define('NN_UPDATE', NN_MISC . 'update_scripts' . DS);
-
-//Refers to nix_scripts folder
-define('NN_NIX', NN_UPDATE . 'nix_scripts' . DS );
-
-//Refers to multiprocessing folder
-define('NN_MULTI', NN_NIX . 'multiprocessing' . DS);
-
-//refers to tmux folder
-define('NN_TMUX', NN_NIX . 'tmux' . DS);
-
-// Refers to the covers folder
-define('NN_COVERS', NN_WWW . 'covers' .DS);
-
-// Used to refer to the resources folder
-define('NN_RES', NN_ROOT . 'resources' . DS);
-
-// Used to refer to the tmp folder
-define('NN_TMP', NN_RES . 'tmp' . DS);
-
-// Full path is fs to the themes folder
-define('NN_THEMES', NN_WWW . 'templates' . DS);
-
-// Path where log files are stored.
-define('NN_LOGS', NN_RES . 'logs' . DS);
-
-if (function_exists('ini_set') && function_exists('ini_get')) {
-	$ps = (strtolower(PHP_OS) == 'windows') ? ';' : ':';
-	ini_set('include_path', NN_WWW . $ps . ini_get('include_path'));
-}
-
-// Path to smarty files. (not prefixed with NN as the name is needed in smarty files).
-define('SMARTY_DIR', NN_LIB . 'smarty' . DS);
-
-//
-// used to refer to the /www/lib class files
-//
-define('WWW_DIR', NN_WWW);
-
-// These are site constants
-$www_top = str_replace("\\", "/", dirname($_SERVER['PHP_SELF']));
-if (strlen($www_top) == 1) {
-	$www_top = "";
-}
-
-// Used everywhere an href is output, includes the full path to the NN install.
-define('WWW_TOP', $www_top);
-
-define('NN_VERSIONS', NN_LIB . 'build' . DS . 'newznab.xml');
-
-if (is_file(__DIR__ . DS . 'settings.php')) {
-	require_once(__DIR__ . DS . 'settings.php');
-	// Remove this in the future, here for those not updating settings.php
-	if (!defined('NN_USE_SQL_TRANSACTIONS')) {
-		define('NN_USE_SQL_TRANSACTIONS', true);
-	}
-} else {
-	define('ITEMS_PER_PAGE', '50');
-	define('ITEMS_PER_COVER_PAGE', '20');
-	define('ITEMS_PER_PAGE_SMALL', '15');
-	define('NN_ECHOCLI', true);
-	define('NN_DEBUG', false);
-	define('NN_LOGGING', false);
-	define('NN_LOGINFO', false);
-	define('NN_LOGNOTICE', false);
-	define('NN_LOGWARNING', false);
-	define('NN_LOGERROR', false);
-	define('NN_LOGFATAL', false);
-	define('NN_LOGQUERIES', false);
-	define('NN_QUERY_STRIP_WHITESPACE', false);
-	define('NN_RENAME_PAR2', true);
-	define('NN_RENAME_MUSIC_MEDIAINFO', true);
-	define('NN_CACHE_EXPIRY_SHORT', 300);
-	define('NN_CACHE_EXPIRY_MEDIUM', 600);
-	define('NN_CACHE_EXPIRY_LONG', 900);
-	define('NN_FLOOD_CHECK', false);
-	define('NN_FLOOD_WAIT_TIME', 5);
-	define('NN_FLOOD_MAX_REQUESTS_PER_SECOND', 5);
-	define('NN_USE_SQL_TRANSACTIONS', true);
-}
-require_once(WWW_DIR . "/lib/util.php");
-define('HAS_WHICH', Utility::hasWhich() ? true : false);
-
-if (file_exists(__DIR__ . DS . 'config.php')) {
-	require_once __DIR__ . DS . 'config.php';
-}
-
-// Check if they updated config.php for the openssl changes. Only check 1 to save speed.
-if (!defined('NN_SSL_VERIFY_PEER')) {
-	define('NN_SSL_CAFILE', '');
-	define('NN_SSL_CAPATH', '');
-	define('NN_SSL_VERIFY_PEER', '0');
-	define('NN_SSL_VERIFY_HOST', '0');
-	define('NN_SSL_ALLOW_SELF_SIGNED', '1');
-}
diff --git a/lib/copy_this/www/covers/anime/.gitignore b/lib/copy_this/www/covers/anime/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/anime/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/audio/.gitignore b/lib/copy_this/www/covers/audio/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/audio/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/audiosample/.gitignore b/lib/copy_this/www/covers/audiosample/.gitignore
deleted file mode 100644
index cec9082b6..000000000
--- a/lib/copy_this/www/covers/audiosample/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-
-!.gitignore
diff --git a/lib/copy_this/www/covers/book/.gitignore b/lib/copy_this/www/covers/book/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/book/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/console/.gitignore b/lib/copy_this/www/covers/console/.gitignore
deleted file mode 100644
index 172cc9f02..000000000
--- a/lib/copy_this/www/covers/console/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!no-cover.jpg
diff --git a/lib/copy_this/www/covers/console/no-cover.jpg b/lib/copy_this/www/covers/console/no-cover.jpg
deleted file mode 100644
index 2d6359d4e..000000000
Binary files a/lib/copy_this/www/covers/console/no-cover.jpg and /dev/null differ
diff --git a/lib/copy_this/www/covers/games/.gitignore b/lib/copy_this/www/covers/games/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/games/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/movies/.gitignore b/lib/copy_this/www/covers/movies/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/movies/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/music/.gitignore b/lib/copy_this/www/covers/music/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/music/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/preview/.gitignore b/lib/copy_this/www/covers/preview/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/preview/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/sample/.gitignore b/lib/copy_this/www/covers/sample/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/sample/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/tvrage/.gitignore b/lib/copy_this/www/covers/tvrage/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/tvrage/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/video/.gitignore b/lib/copy_this/www/covers/video/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/covers/video/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/covers/xxx/.gitignore b/lib/copy_this/www/covers/xxx/.gitignore
deleted file mode 100644
index 82437b7a0..000000000
--- a/lib/copy_this/www/covers/xxx/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*
-!.gitignore
-!no-cover.jpg
-!no-backdrop.jpg
diff --git a/lib/copy_this/www/covers/xxx/no-backdrop.jpg b/lib/copy_this/www/covers/xxx/no-backdrop.jpg
deleted file mode 100644
index efd5e95f2..000000000
Binary files a/lib/copy_this/www/covers/xxx/no-backdrop.jpg and /dev/null differ
diff --git a/lib/copy_this/www/covers/xxx/no-cover.jpg b/lib/copy_this/www/covers/xxx/no-cover.jpg
deleted file mode 100644
index 158955870..000000000
Binary files a/lib/copy_this/www/covers/xxx/no-cover.jpg and /dev/null differ
diff --git a/lib/copy_this/www/lib/ADE.php b/lib/copy_this/www/lib/ADE.php
deleted file mode 100644
index ea2d80510..000000000
--- a/lib/copy_this/www/lib/ADE.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-
-/**
- * Class adultdvdempire
- */
-class ADE
-{
-	/**
-	 * Define ADE Url here
-	 */
-	const ADE = "http://www.adultdvdempire.com";
-	/**
-	 * If a direct link is given parse it rather then search
-	 *
-	 * @var string
-	 */
-	public $directLink = "";
-	/**
-	 * If a string is found do call back.
-	 *
-	 * @var bool
-	 */
-	public $found = false;
-	/**
-	 * Search keyword
-	 *
-	 * @var string
-	 */
-	public $searchTerm = "";
-	/**
-	 * Direct Url returned in getAll method
-	 *
-	 * @var string
-	 */
-	protected $_directUrl = "";
-
-	/**
-	 * If a url is found that matches the keyword
-	 *
-	 */
-	protected $_urlFound;
-
-	/**
-	 * Sets the title in the getAll method
-	 *
-	 * @var string
-	 */
-	protected $_title = "";
-
-	/** Trailing urls */
-	protected $_dvdQuery = "/dvd/search?q=";
-	protected $_scenes = "/scenes";
-	protected $_boxCover = "/boxcover";
-	protected $_backCover = "/backcover";
-	protected $_reviews = "/reviews";
-	protected $_trailers = "/trailers";
-
-
-	protected $_url;
-	protected $_response;
-	protected $_res = array();
-	protected $_tmpResponse;
-	protected $_html;
-	protected $_edithtml;
-	protected $_ch;
-
-	public function __construct()
-	{
-		$this->_html = new \simple_html_dom();
-		$this->_edithtml = new \simple_html_dom();
-	}
-
-	/**
-	 *
-	 * Remove from memory if they were not removed
-	 *
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		$this->_edithtml->clear();
-		unset($this->_response);
-		unset($this->_tmpResponse);
-	}
-
-	/**
-	 * Gets the direct link information and returns it
-	 * @return array|bool
-	 */
-	public function getDirect()
-	{
-		if (isset($this->directlink)) {
-			if ($this->getUrl() === false) {
-				return false;
-			} else {
-				$this->_html->load($this->_response);
-
-				return $this->getAll();
-			}
-		}
-
-		return false;
-	}
-
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directUrl)) {
-			$results['directurl'] = $this->_directUrl;
-			$results['title'] = $this->_title;
-		}
-		if (is_array($this->sypnosis(true))) {
-			$results = array_merge($results, $this->sypnosis(true));
-		}
-		if (is_array($this->productInfo(true))) {
-			$results = array_merge($results, $this->productInfo(true));
-		}
-		if (is_array($this->cast(true))) {
-			$results = array_merge($results, $this->cast(true));
-		}
-		if (is_array($this->genres())) {
-			$results = array_merge($results, $this->genres());
-		}
-		if (is_array($this->covers())) {
-			$results = array_merge($results, $this->covers());
-		}
-		if (is_array($this->trailers())) {
-			$results = array_merge($results, $this->trailers());
-		}
-		return $results;
-	}
-
-	/**
-	 * Gets the sypnosis and tagline
-	 *
-	 * @param bool $tagline - Include tagline? true/false
-	 *
-	 * @return array - plot,tagline
-	 */
-	public function sypnosis($tagline = false)
-	{
-		if ($tagline === true) {
-			if ($ret = $this->_html->find("p.Tagline", 0)){
-				if (!empty($ret->plaintext)) {
-					$this->_res['tagline'] = trim($ret->plaintext);
-				}
-			}
-		}
-		if ($ret = @$this->_html->find("p.Tagline", 0)->next_sibling()->next_sibling()) {
-			$this->_res['sypnosis'] = trim($ret->innertext);
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets Product Information and/or Features
-	 *
-	 * @param bool $features Include features? true/false
-	 *
-	 * @return array - ProductInfo/Extras = features
-	 */
-	public function productInfo($features = false)
-	{
-		$dofeature = null;
-		$this->_tmpResponse = str_ireplace("Section ProductInfo", "spdinfo", $this->_response);
-		$this->_edithtml->load($this->_tmpResponse);
-		if ($ret = $this->_edithtml->find("div[class=spdinfo]", 0)) {
-			$this->_tmpResponse = trim($ret->outertext);
-			$ret = $this->_edithtml->load($this->_tmpResponse);
-			foreach ($ret->find("text") as $strong) {
-				if (trim($strong->innertext) == "Features") {
-					$dofeature = true;
-				}
-				if ($dofeature != true) {
-					if (trim($strong->innertext) != "&nbsp;") {
-						$this->_res['productinfo'][] = trim($strong->innertext);
-					}
-				} else {
-					if ($features == true) {
-						$this->_res['extras'][] = trim($strong->innertext);
-					}
-				}
-			}
-
-			array_shift($this->_res['productinfo']);
-			array_shift($this->_res['productinfo']);
-			$this->_res['productinfo'] = array_chunk($this->_res['productinfo'], 2, false);
-		}
-		$this->_edithtml->clear();
-		unset($this->_tmpResponse);
-		unset($ret);
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the cast members and/or awards
-	 *
-	 * @param bool $awards - Include Awards? true/false
-	 *
-	 * @return array - cast,awards
-	 */
-	public function cast($awards = false)
-	{
-		$this->_tmpResponse = str_ireplace("Section Cast", "scast", $this->_response);
-		$this->_edithtml->load($this->_tmpResponse);
-
-
-		if ($ret = $this->_edithtml->find("div[class=scast]", 0)) {
-			$this->_tmpResponse = trim($ret->outertext);
-			$ret = $this->_edithtml->load($this->_tmpResponse);
-			foreach ($ret->find("a.PerformerName") as $a) {
-				if ($a->plaintext != "(bio)") {
-					if ($a->plaintext != "(interview)") {
-						$this->_res['cast'][] = trim($a->plaintext);
-					}
-				}
-			}
-			if ($awards == true) {
-				if ($ret->find("ul", 1)) {
-					foreach ($ret->find("ul", 1)->find("li, strong") as $li) {
-						$this->_res['awards'][] = trim($li->plaintext);
-					}
-				}
-			}
-			$this->_edithtml->clear();
-			unset($ret);
-			unset($this->_tmpResponse);
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets categories, if exists return array else return false
-	 * @return mixed array|bool - Categories, false
-	 */
-	public function genres()
-	{
-		$categories = null;
-		$this->_tmpResponse = str_ireplace("Section Categories", "scat", $this->_response);
-		$this->_edithtml->load($this->_tmpResponse);
-		if ($ret = $this->_edithtml->find("div[class=scat]", 0)) {
-			$this->_tmpResponse = trim($ret->outertext);
-			$ret = $this->_edithtml->load($this->_tmpResponse);
-
-			foreach ($ret->find("p, a") as $categories) {
-				$categories = trim($categories->plaintext);
-				if (stristr($categories, ",")) {
-					$categories = explode(",", $categories);
-					break;
-				}
-			}
-			$categories = array_map('trim', $categories);
-			$this->_res['genres'] = $categories;
-		}
-		$this->_edithtml->clear();
-		unset($this->_tmpResponse);
-		unset($ret);
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets cover images for the xxx release
-	 * @return array - Boxcover and backcover
-	 */
-	public function covers()
-	{
-		$this->getUrl($this->_boxCover . $this->_urlFound);
-		$this->_html->load($this->_response);
-		foreach ($this->_html->find("div[id=FrontBoxCover], img[itemprop=image]") as $img) {
-			if (stristr($img->src, "h.jpg")) {
-				$this->_res['boxcover'] = $img->src;
-				break;
-			}
-		}
-		$this->getUrl($this->_backCover . $this->_urlFound);
-		$this->_html->load($this->_response);
-		foreach ($this->_html->find("div[id=BackBoxCover], img[itemprop=image]") as $img) {
-			if (stristr($img->src, "bh.jpg")) {
-				$this->_res['backcover'] = $img->src;
-				break;
-			}
-		}
-
-		if (empty($this->_res['boxcover'])) {
-			if ($ret = $this->_html->find("a[rel=boxcover]", 0)) {
-				if (stristr($ret->href, "h.jpg")) {
-					$this->_res['boxcover'] = $ret->href;
-					$this->_res['backcoer'] = str_ireplace("h.jpg", "bh.jpg", $ret->href);
-				}
-				if (stristr($ret->href, "m.jpg")) {
-					$this->_res['boxcover'] = str_ireplace("m.jpg", "h.jpg", $ret->href);
-					$this->_res['backcoer'] = str_ireplace("m.jpg", "bh.jpg", $ret->href);
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets Trailer Movies
-	 * @return array - url, streamid, basestreamingurl
-	 */
-	public function trailers()
-	{
-		$this->getUrl($this->_trailers . $this->_urlFound);
-		$this->_html->load($this->_response);
-		if (preg_match("/(\"|')(?P<swf>[^\"']+.swf)(\"|')/i", $this->_response, $matches)) {
-			$this->_res['trailers']['url'] = self::ADE . trim(trim($matches['swf']), '"');
-			if (preg_match('#(?:streamID:\s\")(?P<streamid>[0-9A-Z]+)(?:\")#',
-				$this->_response,
-				$matches)
-			) {
-				$this->_res['trailers']['streamid'] = trim($matches['streamid']);
-			}
-			if (preg_match('#(?:BaseStreamingUrl:\s\")(?P<baseurl>[0-9]+.[0-9]+.[0-9]+.[0-9]+)(?:\")#',
-				$this->_response,
-				$matches)
-			) {
-				$this->_res['trailers']['baseurl'] = $matches['baseurl'];
-			}
-		}
-		unset($matches);
-		$this->_html->clear();
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets raw html content using adeurl and any trailing url.
-	 *
-	 * @param null $trailing - required
-	 *
-	 * @return bool - true if page has content
-	 */
-	private function getUrl($trailing = "")
-	{
-		if (!empty($trailing)) {
-			$this->_ch = curl_init(self::ADE . $trailing);
-		}
-		if (!empty($this->directLink)) {
-			$this->_ch = curl_init($this->directLink);
-			$this->directLink = "";
-		}
-		curl_setopt($this->_ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($this->_ch, CURLOPT_HEADER, 0);
-		curl_setopt($this->_ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($this->_ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($this->_ch, CURLOPT_FAILONERROR, 1);
-		$this->_response = curl_exec($this->_ch);
-		if (!$this->_response) {
-			curl_close($this->_ch);
-
-			return false;
-		}
-		curl_close($this->_ch);
-		return true;
-	}
-
-
-
-	/*
-	 * Gets all Information.
-	 *
-	 * @return array
-	 */
-
-	/**
-	 * Searches xxx name.
-	 * @return bool - True if releases has 90% match, else false
-	 */
-	public function search()
-	{
-		if (!isset($this->searchTerm)) {
-			return false;
-		}
-		if ($this->getUrl($this->_dvdQuery . rawurlencode($this->searchTerm)) === false) {
-			return false;
-		} else {
-			$this->_html->load($this->_response);
-			if ($ret = $this->_html->find("a.boxcover", 0)){
-				$title = $ret->title;
-				$title = preg_replace('/XXX/', '', $title);
-				$title = preg_replace('/\(.*?\)|[-._]/i', ' ', $title);
-				$ret = (string)trim($ret->href);
-				similar_text($this->searchTerm, $title, $p);
-				if ($p >= 90) {
-					$this->found = true;
-					$this->_urlFound = $ret;
-					$this->_directUrl = self::ADE . $ret;
-					$this->_title = trim($title);
-					unset($ret);
-					$this->_html->clear();
-					$this->getUrl($this->_urlFound);
-					$this->_html->load($this->_response);
-				} else {
-					$this->found = false;
-
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/ADM.php b/lib/copy_this/www/lib/ADM.php
deleted file mode 100644
index 244fd28a9..000000000
--- a/lib/copy_this/www/lib/ADM.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-
-class ADM
-{
-	/**
-	 * Override if 18 years+ or older
-	 * Define Adult DVD Marketplace url
-	 * Needed Search Queries Constant
-	 */
-	const ADMURL			= "http://www.adultdvdmarketplace.com";
-	const IF18				= "http://www.adultdvdmarketplace.com/xcart/adult_dvd/disclaimer.php?action=enter&site=intl&return_url=";
-	const TRAILINGSEARCH	= "/xcart/adult_dvd/advanced_search.php?sort_by=relev&title=";
-
-	/**
-	 * Define a cookie file location for curl
-	 * @var string string
-	 */
-	public $cookie = "";
-
-	/**
-	 * Direct Link given from outside url doesn't do a search
-	 * @var string
-	 */
-	public $directLink = "";
-
-	/**
-	 * Set this for what you are searching for.
-	 * @var string
-	 */
-	public $searchTerm = "";
-
-	/**
-	 * Sets the directurl for the return results array
-	 * @var string
-	 */
-	protected $_directUrl = "";
-
-	/**
-	 * Simple Html Dom Object
-	 *
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * POST Paramaters for getUrl Method
-	 */
-	protected $_postParams;
-
-	/**
-	 * Results returned from each method
-	 *
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * Curl Raw Html
-	 */
-	protected $_response;
-
-	/**
-	 * Add this to popurl to get results
-	 * @var string
-	 */
-	protected $_trailUrl = "";
-
-	/**
-	 * This is set in the getAll method
-	 *
-	 * @var string
-	 */
-	protected $_title = "";
-
-	public function __construct()
-	{
-		$this->_html = new simple_html_dom();
-		if (isset($this->cookie)) {
-			$this->getUrl();
-		}
-	}
-
-	/**
-	 * Remove from memory.
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->_response);
-		unset($this->_res);
-	}
-
-	/**
-	 * Get Box Cover Images
-	 * @return array - boxcover,backcover
-	 */
-	public function covers()
-	{
-		if ($ret = $this->_html->find('img[rel=license]', 0)) {
-			if (isset($ret->next_sibling()->href)) {
-				if (preg_match('/filename\=(?<covers>(.*))\'/i', $ret->next_sibling()->href, $matches)
-				) {
-					$this->_res['boxcover'] = $matches['covers'];
-					$this->_res['backcover'] = preg_replace('/front/i', 'back', $matches['covers']);
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the sypnosis
-	 * @return array
-	 */
-	public function sypnosis()
-	{
-		if ($ret = $this->_html->find('span[itemprop=description]', 0)) {
-			if(preg_match('/(?<tagline>\<b\>(.*)\<\/b\>)/i', $ret->innertext, $matches)){
-				$this->_res['tagline'] = trim(strip_tags($matches['tagline']));
-				$ret->plaintext = str_replace($matches['tagline'], '', $ret->innertext);
-			}
-			$this->_res['sypnosis'] = trim(strip_tags($ret->plaintext,"<br>"));
-		} else {
-			$this->_res['sypnosis'] = "N/A";
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Get Product Informtion and Director
-	 *
-	 *
-	 * @return array
-	 */
-	public function productInfo()
-	{
-		foreach ($this->_html->find('td.DarkGrayTable') as $category) {
-			switch (trim($category->plaintext)) {
-				case "DIRECTOR":
-					$this->_res['director'] = trim($category->next_sibling()->plaintext);
-					break;
-				case "FORMAT":
-				case "STUDIO":
-				case "RELEASED":
-				case "SKU":
-					$this->_res['productinfo'][$category->plaintext] = trim($category->next_sibling()->plaintext);
-					break;
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the cast members
-	 * @return array
-	 */
-	public function cast()
-	{
-		$cast = array();
-		foreach ($this->_html->find('td.section_heading') as $category) {
-			if (trim($category->plaintext) == "CAST") {
-				foreach ($this->_html->find('td.GrayDialogBody') as $td) {
-					foreach ($td->find('a') as $actor) {
-						if (preg_match_all('/search_performerid/', $actor->href, $matches)) {
-							$cast[] = trim($actor->plaintext);
-						}
-					}
-				}
-			}
-		}
-		$this->_res['cast'] = array_unique($cast);
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets categories
-	 * @return array
-	 */
-	public function genres()
-	{
-		$genres = array();
-		foreach ($this->_html->find('td.DarkGrayTable') as $category) {
-			if (trim($category->plaintext) == "CATEGORY") {
-				foreach ($category->next_sibling()->find('a') as $e) {
-					$genres[] = trim($e->plaintext);
-				}
-				$this->_res['genres'] = & $genres;
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Searches for match against searchterm
-	 * @return bool, true if search = 100%
-	 */
-	public function search()
-	{
-		$result = false;
-		if (isset($this->searchTerm)) {
-			$this->_trailUrl = self::TRAILINGSEARCH . urlencode($this->searchTerm);
-			if ($this->getUrl() !== false) {
-				if ($ret = $this->_html->find('img[rel=license]')) {
-					if (count($ret) > 0) {
-						foreach ($this->_html->find('img[rel=license]') as $ret) {
-							if (isset($ret->alt)) {
-								$title = trim($ret->alt, '"');
-								$title = preg_replace('/XXX/', '', $title);
-								$comparetitle = preg_replace('/[^\w]/', '', $title);
-								$comparesearch = preg_replace('/[^\w]/', '', $this->searchTerm);
-								similar_text($comparetitle, $comparesearch, $p);
-								if ($p == 100) {
-									if(preg_match('/\/(?<sku>\d+)\.jpg/i', $ret->src, $matches)){
-										$this->_title = trim($title);
-										$this->_trailUrl = "/dvd_view_" . (string)$matches['sku'] . ".html";
-										$this->_directUrl = self::ADMURL . $this->_trailUrl;
-										if($this->getUrl() !== false){
-											$result = true;
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Gets all information
-	 * @return array
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directUrl)) {
-			$results['title'] = $this->_title;
-			$results['directurl'] = $this->_directUrl;
-		}
-
-		if (is_array($this->sypnosis())) {
-			$results = array_merge($results, $this->sypnosis());
-		}
-
-		if (is_array($this->productInfo())) {
-			$results = array_merge($results, $this->productInfo());
-		}
-
-		if (is_array($this->cast())) {
-			$results = array_merge($results, $this->cast());
-		}
-
-		if (is_array($this->genres())) {
-			$results = array_merge($results, $this->genres());
-		}
-
-		if (is_array($this->covers())) {
-			$results = array_merge($results, $this->covers());
-		}
-
-		$results = empty($results) ? false : $results;
-		return $results;
-	}
-
-	/**
-	 * Get Raw html of webpage
-	 *
-	 * @param bool $usepost
-	 *
-	 * @return bool
-	 */
-	private function getUrl($usepost = false)
-	{
-		if (isset($this->_trailUrl)) {
-			$ch = curl_init(self::ADMURL . $this->_trailUrl);
-		} else {
-			$ch = curl_init(self::IF18);
-		}
-
-		if($usepost === true){
-			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-			curl_setopt($ch, CURLOPT_POST, 1);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-
-		if (isset($this->cookie)) {
-			curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-
-		curl_setopt_array($ch, Utility::curlSslContextOptions());
-		$this->_response = curl_exec($ch);
-
-		if (!$this->_response) {
-			curl_close($ch);
-			return false;
-		}
-
-		curl_close($ch);
-		$this->_html->load($this->_response);
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/AEBN.php b/lib/copy_this/www/lib/AEBN.php
deleted file mode 100644
index 8988a95e2..000000000
--- a/lib/copy_this/www/lib/AEBN.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-
-class AEBN
-{
-	/**
-	 * Url Constants used within this class
-	 */
-	const AEBNGURL = "http://gay.theater.aebn.net";
-	const AEBNSURL = "http://straight.theater.aebn.net";
-	const IF18 = "http://straight.theater.aebn.net/dispatcher/frontDoor?genreId=101&theaterId=13992&locale=en&refid=AEBN-000001";
-	const TRAILINGSEARCH = "/dispatcher/fts?theaterId=13992&genreId=101&locale=en&count=30&imageType=Large&targetSearchMode=basic&isAdvancedSearch=false&isFlushAdvancedSearchCriteria=false&sortType=Relevance&userQuery=title%3A+%2B";
-	const TRAILERURL = "/dispatcher/previewPlayer?locale=en&theaterId=13992&genreId=101&movieId=";
-	/**
-	 * Cookie File location used in curl
-	 *
-	 * @var string
-	 */
-	public $cookie = "";
-	/**
-	 * Keyword to search
-	 *
-	 * @var string
-	 */
-	public $searchTerm = "";
-	/**
-	 * Sets the current site to search
-	 *
-	 * @var string
-	 */
-	protected $_currentSite = "straight";
-
-	/**
-	 * Direct Url in getAll method
-	 *
-	 * @var string
-	 */
-	protected $_directUrl = "";
-
-	/**
-	 * Simple Html Dom Object
-	 *
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * Post Parameters to use with curl
-	 *
-	 * @var array
-	 */
-	protected $_postParams = array();
-
-	/**
-	 * Raw Html response from curl
-	 *
-	 */
-	protected $_response;
-
-	/**
-	 * Returned results in all methods except search/geturl
-	 *
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * If searchTerm is found
-	 *
-	 * @var bool
-	 */
-	protected $_searchFound = false;
-
-	/**
-	 * Sets title in getAll method
-	 *
-	 * @var string
-	 */
-	protected $_title = "";
-
-	/**
-	 * Trailing Url
-	 *
-	 * @var string
-	 */
-	protected $_trailUrl = "";
-
-	/**
-	 * Used in __construct
-	 *
-	 * @var array - straight, gay
-	 */
-	protected $_whichSite = array();
-
-
-	/**
-	 * Sets the variables that used throughout the class
-	 *
-	 */
-	public function __construct()
-	{
-		$this->_whichSite = array("straight" => self::AEBNSURL, "gay" => self::AEBNGURL);
-		$this->_html = new \simple_html_dom();
-		if (isset($this->cookie)) {
-			$this->getUrl();
-		}
-	}
-
-	/**
-	 * Get Raw html of webpage
-	 *
-	 * @param bool   $usepost
-	 * @param string $site
-	 *
-	 * @return bool
-	 */
-	private function getUrl($usepost = false, $site = "straight")
-	{
-		if (isset($this->_trailUrl)) {
-			$ch = curl_init($this->_whichSite[$site] . $this->_trailUrl);
-		} else {
-			$ch = curl_init(self::IF18);
-		}
-
-		if ($usepost === true) {
-			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-			curl_setopt($ch, CURLOPT_POST, 1);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-		if (isset($this->cookie)) {
-			curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		$this->_response = curl_exec($ch);
-		if (!$this->_response) {
-			curl_close($ch);
-
-			return false;
-		}
-		curl_close($ch);
-		$this->_html->load($this->_response);
-
-		return true;
-	}
-
-	/**
-	 * If they arent' removed from memory. Force them.
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->_response);
-		unset($this->_res);
-	}
-
-	/**
-	 * Searches for a XXX name
-	 *
-	 * @return bool
-	 */
-	public function search()
-	{
-		if (!isset($this->searchTerm)) {
-			return false;
-		}
-		$this->_trailUrl = self::TRAILINGSEARCH . urlencode($this->searchTerm);
-		if ($this->getUrl(false, $this->_currentSite) === false) {
-			return false;
-		} else {
-			if ($count = count($this->_html->find("div.movie"))) {
-				$i = 1;
-				foreach ($this->_html->find("div.movie") as $movie) {
-					$string = "a#FTSMovieSearch_link_title_detail_" . $i;
-					if ($ret = $movie->find($string, 0)) {
-						$title = trim($ret->title);
-						$title = preg_replace('/XXX/', '', $title);
-						$title = preg_replace('/\(.*?\)|[-._]/i', ' ', $title);
-						similar_text($this->searchTerm, $title, $p);
-						if ($p >= 90) {
-							$this->_title = trim($ret->title);
-							$this->_trailUrl = $ret->href;
-							$this->_directUrl = $this->_whichSite[$this->_currentSite] . $this->_trailUrl;
-							$this->getUrl(false, $this->_currentSite);
-
-							return true;
-						} else {
-							continue;
-						}
-					}
-					$i = $i + 1;
-				}
-				if ($i === $count || $count === 0) {
-					if ($this->_currentSite === "gay") {
-						return false;
-					}
-					$this->_currentSite = "gay";
-					$this->search();
-				}
-			} else {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets all the information
-	 *
-	 * @return array|bool
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directUrl)) {
-			$results['title'] = $this->_title;
-			$results['directurl'] = $this->_directUrl;
-		}
-		if (is_array($this->sypnosis())) {
-			$results = array_merge($results, $this->sypnosis());
-		}
-		if (is_array($this->productinfo())) {
-			$results = array_merge($results, $this->productInfo());
-		}
-		if (is_array($this->cast())) {
-			$results = array_merge($results, $this->cast());
-		}
-		if (is_array($this->genres())) {
-			$results = array_merge($results, $this->genres());
-		}
-		if (is_array($this->covers())) {
-			$results = array_merge($results, $this->covers());
-		}
-		if (is_array($this->trailers())) {
-			$results = array_merge($results, $this->trailers());
-		}
-		if (empty($results) === true) {
-			return false;
-		} else {
-			return $results;
-		}
-	}
-
-	/**
-	 * Gets the sypnosis "plot"
-	 *
-	 * @return array
-	 *
-	 */
-	public function sypnosis()
-	{
-		if ($ret = $this->_html->find("span[itemprop=about]", 0)) {
-			if (is_null($ret)) {
-				if ($ret = $this->_html->find("div.movieDetailDescription", 0)) {
-					$this->_res['sypnosis'] = trim($ret->plaintext);
-					$this->_res['sypnosis'] = preg_replace('/Description:\s/', "", $this->_res['plot']);
-				}
-			} else {
-				$this->_res['sypnosis'] = trim($ret->plaintext);
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the product information
-	 *
-	 * @return array
-	 */
-	public function productInfo()
-	{
-		if ($ret = $this->_html->find("div#md-detailsLeft", 0)) {
-			foreach ($ret->find("div") as $div) {
-				foreach ($div->find("span") as $span) {
-					$span->plaintext = rawurldecode($span->plaintext);
-					$span->plaintext = preg_replace("/&nbsp;/", "", $span->plaintext);
-					$this->_res['productinfo'][] = trim($span->plaintext);
-				}
-			}
-			if (false !== $key = array_search("Running Time:", $this->_res['productinfo'])) {
-				unset($this->_res['productinfo'][$key + 2]);
-			}
-			if (false !== $key = array_search("Director:", $this->_res['productinfo'])) {
-				$this->_res['director'] = $this->_res['productinfo'][$key + 1];
-				unset($this->_res['productinfo'][$key]);
-				unset($this->_res['productinfo'][$key + 1]);
-			}
-			$this->_res['productinfo'] = array_chunk($this->_res['productinfo'], 2, false);
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the Cast Members "Stars" and Director if any
-	 *
-	 * @return array
-	 */
-	public function cast()
-	{
-		if ($ret = $this->_html->find("div.starsFull", 0)) {
-			foreach ($ret->find("span[itemprop=name]") as $star) {
-				$this->_res['cast'][] = trim($star->plaintext);
-			}
-		} else {
-			if ($ret = $this->_html->find("div.detailsLink", 0)) {
-				foreach ($ret->find("span") as $star) {
-					if (!preg_match("/More/", $star->plaintext) && !preg_match("/Stars/", $star->plaintext)) {
-						$this->_res['cast'][] = trim($star->plaintext);
-					}
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the Genres "Categories".
-	 *
-	 * @return array
-	 */
-	public function genres()
-	{
-		if ($ret = $this->_html->find("div.md-detailsCategories", 0)) {
-			foreach ($ret->find("a[itemprop=genre]") as $genre) {
-				$this->_res['genres'][] = trim($genre->plaintext);
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the front and back cover of the box
-	 *
-	 * @return array
-	 */
-	public function covers()
-	{
-		if ($ret = $this->_html->find("img#boxImage, img[itemprop=thumbnailUrl]", 1)) {
-			$ret = trim($ret->src);
-			$this->_res['boxcover'] = str_ireplace("160w.jpg", "xlf.jpg", $ret);
-			$this->_res['backcover'] = str_ireplace("160w.jpg", "xlb.jpg", $ret);
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets Trailer URL .. will be processed in XXX insertswf
-	 *
-	 * @return array|bool
-	 */
-	public function trailers()
-	{
-		if ($ret = $this->_html->find("a[itemprop=trailer]", 0)) {
-			if (preg_match('/movieId=(?<movieid>\d+)&/', trim($ret->href), $matches)) {
-				$movieid = $matches['movieid'];
-				$this->_res['trailers']['url'] = $this->_whichSite[$this->_currentSite] . self::TRAILERURL . $movieid;;
-			}
-		}
-
-		return $this->_res;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Books.php b/lib/copy_this/www/lib/Books.php
deleted file mode 100644
index 63890280c..000000000
--- a/lib/copy_this/www/lib/Books.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/amazon.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-require_once(NN_TMUX . 'lib' . DS . 'Enzebe.php');
-
-/*
- * Class for processing book info.
- */
-class Books
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $pubkey;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $privkey;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $asstag;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $bookqty;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $sleeptime;
-
-	/**
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $bookreqids;
-
-	/**
-	 * @var string
-	 */
-	public $renamed;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->pubkey = $this->site->amazonpubkey;
-		$this->privkey = $this->site->amazonprivkey;
-		$this->asstag = $this->site->amazonassociatetag;
-		$this->bookqty = ($this->site->maxbooksprocessed != '') ? $this->site->maxbooksprocessed : 300;
-		$this->sleeptime = ($this->site->amazonsleep != '') ? $this->site->amazonsleep : 1000;
-		$this->imgSavePath = NN_COVERS . 'book' . DS;
-		$this->bookreqids = ($this->site->book_reqids == null || $this->site->book_reqids == "") ? 7010 : $this->site->book_reqids;
-		$this->renamed = '';
-		if ($this->site->lookupbooks == 2) {
-			$this->renamed = 'AND isrenamed = 1';
-		}
-	}
-
-	public function getBookInfo($id)
-	{
-		return $this->pdo->queryOneRow(sprintf('SELECT bookinfo.* FROM bookinfo WHERE bookinfo.id = %d', $id));
-	}
-
-	public function getBookInfoByName($author, $title)
-	{
-		$pdo = $this->pdo;
-		$like = 'ILIKE';
-		if ($pdo->dbSystem() === 'mysql') {
-			$like = 'LIKE';
-		}
-
-		//only used to get a count of words
-		$searchwords = $searchsql = '';
-		$ft = $pdo->queryDirect("SHOW INDEX FROM bookinfo WHERE key_name = 'ix_bookinfo_author_title_ft'");
-		if ($ft->rowCount() !== 2) {
-			$searchsql .= sprintf(" author LIKE %s AND title %s %s'", $pdo->escapeString('%' . $author . '%'), $like, $pdo->escapeString('%' . $title . '%'));
-		} else {
-			$title = preg_replace('/( - | -|\(.+\)|\(|\))/', ' ', $title);
-			$title = preg_replace('/[^\w ]+/', '', $title);
-			$title = trim(preg_replace('/\s\s+/i', ' ', $title));
-			$title = trim($title);
-			$words = explode(' ', $title);
-
-			foreach ($words as $word) {
-				$word = trim(rtrim(trim($word), '-'));
-				if ($word !== '' && $word !== '-') {
-					$word = '+' . $word;
-					$searchwords .= sprintf('%s ', $word);
-				}
-			}
-			$searchwords = trim($searchwords);
-			$searchsql .= sprintf(" MATCH(author, title) AGAINST(%s IN BOOLEAN MODE)", $pdo->escapeString($searchwords));
-		}
-		return $pdo->queryOneRow(sprintf("SELECT * FROM bookinfo WHERE %s", $searchsql));
-	}
-
-
-	public function getRange($start, $num)
-	{
-		if ($start === false) {
-			$limit = '';
-		} else {
-			$limit = ' LIMIT ' . $num . ' OFFSET ' . $start;
-		}
-
-		return $this->pdo->query('SELECT * FROM bookinfo ORDER BY createddate DESC' . $limit);
-	}
-
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow('SELECT COUNT(id) AS num FROM bookinfo');
-		return $res['num'];
-	}
-
-	public function getBookCount($cat, $maxage = -1, $excludedcats = array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-
-		if ($maxage > 0) {
-			$maxage = sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxage);
-		} else {
-			$maxage = '';
-		}
-
-		$exccatlist = '';
-		if (count($excludedcats) > 0) {
-			$exccatlist = ' AND r.categoryid NOT IN (' . implode(',', $excludedcats) . ')';
-		}
-
-		$res = $this->pdo->queryOneRow(
-			sprintf(
-				"SELECT COUNT(DISTINCT r.bookinfoid) AS num FROM releases r "
-				. "INNER JOIN bookinfo boo ON boo.id = r.bookinfoid AND boo.title != '' and boo.cover = 1 "
-				. "WHERE r.nzbstatus = 1 AND  r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') "
-				. "AND %s %s %s %s", $browseby, $catsrch, $maxage, $exccatlist
-			)
-		);
-		return $res['num'];
-	}
-
-	public function getBookRange($cat, $start, $num, $orderby, $excludedcats = array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false) {
-			$limit = '';
-		} else {
-			$limit = ' LIMIT ' . $num . ' OFFSET ' . $start;
-		}
-
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$maxage = '';
-		if ($maxage > 0) {
-			$maxage = sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxage);
-		}
-
-		$exccatlist = '';
-		if (count($excludedcats) > 0) {
-			$exccatlist = ' AND r.categoryid NOT IN (' . implode(',', $excludedcats) . ')';
-		}
-
-		$order = $this->getBookOrder($orderby);
-		$sql = sprintf(
-			"SELECT GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, "
-			. "GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, "
-			. "GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, "
-			. "GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, "
-			. "GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, "
-			. "GROUP_CONCAT(rn.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, "
-			. "GROUP_CONCAT(groups.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, "
-			. "GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, "
-			. "GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, "
-			. "GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, "
-			. "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, "
-			. "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, "
-			. "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, "
-			. "boo.*, r.bookinfoid, groups.name AS group_name, rn.id as nfoid FROM releases r "
-			. "LEFT OUTER JOIN groups ON groups.id = r.groupid "
-			. "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id "
-			. "INNER JOIN bookinfo boo ON boo.id = r.bookinfoid "
-			. "WHERE r.nzbstatus = 1 AND boo.cover = 1 AND boo.title != '' AND "
-			. "r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') AND %s %s %s %s "
-			. "GROUP BY boo.id ORDER BY %s %s" . $limit, $browseby, $catsrch, $maxage, $exccatlist, $order[0], $order[1]
-		);
-
-		return $this->pdo->queryDirect($sql);
-	}
-
-	public function getBookOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode('_', $order);
-		switch ($orderArr[0]) {
-			case 'title':
-				$orderfield = 'boo.title';
-				break;
-			case 'author':
-				$orderfield = 'boo.author';
-				break;
-			case 'publishdate':
-				$orderfield = 'boo.publishdate';
-				break;
-			case 'size':
-				$orderfield = 'r.size';
-				break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	public function getBookOrdering()
-	{
-		return array(
-			'title_asc',
-			'title_desc',
-			'posted_asc',
-			'posted_desc',
-			'size_asc',
-			'size_desc',
-			'files_asc',
-			'files_desc',
-			'stats_asc',
-			'stats_desc',
-			'releasedate_asc',
-			'releasedate_desc',
-			'author_asc',
-			'author_desc'
-		);
-	}
-
-	public function getBrowseByOptions()
-	{
-		return array('author' => 'author', 'title' => 'title');
-	}
-
-	public function getBrowseBy()
-	{
-		$like = 'LIKE';
-
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		foreach ($browsebyArr as $bbk => $bbv) {
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk])) {
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				$browseby .= 'boo.' . $bbv . ' ' . $this->pdo->likeString($bbs, true, true) . ' AND ';
-			}
-		}
-		return $browseby;
-	}
-
-	public function fetchAmazonProperties($title)
-	{
-		$obj = new \AmazonProductAPI($this->pubkey, $this->privkey, $this->asstag);
-		try {
-			$result = $obj->searchProducts($title, \AmazonProductAPI::BOOKS, 'TITLE');
-		} catch (Exception $e) {
-			$result = false;
-		}
-		return $result;
-	}
-
-	/**
-	 * Process book releases, 1 category at a time.
-	 */
-	public function processBookReleases()
-	{
-		$bookids = array();
-		if (preg_match('/^\d+$/', $this->bookreqids)) {
-			$bookids[] = $this->bookreqids;
-		} else {
-			$bookids = explode(', ', $this->bookreqids);
-		}
-
-		$total = count($bookids);
-		if ($total > 0) {
-			for ($i = 0; $i < $total; $i++) {
-				$this->processBookReleasesHelper(
-					$this->pdo->queryDirect(
-						sprintf('
-						SELECT searchname, id, categoryid
-						FROM releases
-						WHERE nzbstatus = 1 %s
-						AND bookinfoid IS NULL
-						AND categoryid in (%s)
-						ORDER BY postdate
-						DESC LIMIT %d', $this->renamed, $bookids[$i], $this->bookqty)
-					), $bookids[$i]
-				);
-			}
-		}
-	}
-
-	/**
-	 * Process book releases.
-	 *
-	 * @param \PDOStatement|bool $res      Array containing unprocessed book SQL data set.
-	 * @param int                $categoryID The category id.
-	 * @void
-	 */
-	protected function processBookReleasesHelper($res, $categoryID)
-	{
-		if ($res instanceof \Traversable && $res->rowCount() > 0) {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header("\nProcessing " . $res->rowCount() . ' book release(s) for category id ' . $categoryID));
-			}
-
-			foreach ($res as $arr) {
-				$startTime = microtime(true);
-				$usedAmazon = false;
-				// audiobooks are also books and should be handled in an identical manor, even though it falls under a music category
-				if ($arr['categoryid'] == '3030') {
-					// audiobook
-					$bookInfo = $this->parseTitle($arr['searchname'], $arr['id'], 'audiobook');
-				} else {
-					// ebook
-					$bookInfo = $this->parseTitle($arr['searchname'], $arr['id'], 'ebook');
-				}
-
-				if ($bookInfo !== false) {
-					if ($this->echooutput) {
-						$this->pdo->log->doEcho($this->pdo->log->headerOver('Looking up: ') . $this->pdo->log->primary($bookInfo));
-					}
-
-					// Do a local lookup first
-					$bookCheck = $this->getBookInfoByName('', $bookInfo);
-
-					if ($bookCheck === false) {
-						$bookId = $this->updateBookInfo($bookInfo);
-						$usedAmazon = true;
-						if ($bookId === false) {
-							$bookId = -2;
-						}
-					} else {
-						$bookId = $bookCheck['id'];
-					}
-
-					// Update release.
-					$this->pdo->queryExec(sprintf('UPDATE releases SET bookinfoid = %d WHERE id = %d', $bookId, $arr['id']));
-				} else { // Could not parse release title.
-					$this->pdo->queryExec(sprintf('UPDATE releases SET bookinfoid = %d WHERE id = %d', -2, $arr['id']));
-					if ($this->echooutput) {
-						echo '.';
-					}
-				}
-				// Sleep to not flood amazon.
-				$diff = floor((microtime(true) - $startTime) * 1000000);
-				if ($this->sleeptime * 1000 - $diff > 0 && $usedAmazon === true) {
-					usleep($this->sleeptime * 1000 - $diff);
-				}
-			}
-		} else if ($this->echooutput) {
-			$this->pdo->log->doEcho($this->pdo->log->header('No book releases to process for category id ' . $categoryID));
-		}
-	}
-
-	public function parseTitle($release_name, $releaseID, $releasetype)
-	{
-		$a = preg_replace('/\d{1,2} \d{1,2} \d{2,4}|(19|20)\d\d|anybody got .+?[a-z]\? |[-._ ](Novel|TIA)([-._ ]|$)|( |\.)HQ(-|\.| )|[\(\)\.\-_ ](AVI|AZW3?|DOC|EPUB|LIT|MOBI|NFO|RETAIL|(si)?PDF|RTF|TXT)[\)\]\.\-_ ](?![a-z0-9])|compleet|DAGSTiDNiNGEN|DiRFiX|\+ extra|r?e ?Books?([\.\-_ ]English|ers)?|azw3?|ePu(b|p)s?|html|mobi|^NEW[\.\-_ ]|PDF([\.\-_ ]English)?|Please post more|Post description|Proper|Repack(fix)?|[\.\-_ ](Chinese|English|French|German|Italian|Retail|Scan|Swedish)|^R4 |Repost|Skytwohigh|TIA!+|TruePDF|V413HAV|(would someone )?please (re)?post.+? "|with the authors name right/i', '', $release_name);
-		$b = preg_replace('/^(As Req |conversion |eq |Das neue Abenteuer \d+|Fixed version( ignore previous post)?|Full |Per Req As Found|(\s+)?R4 |REQ |revised |version |\d+(\s+)?$)|(COMPLETE|INTERNAL|RELOADED| (AZW3|eB|docx|ENG?|exe|FR|Fix|gnv64|MU|NIV|R\d\s+\d{1,2} \d{1,2}|R\d|Req|TTL|UC|v(\s+)?\d))(\s+)?$/i', '', $a);
-
-		//remove book series from title as this gets more matches on amazon
-		$c = preg_replace('/ - \[.+\]|\[.+\]/', '', $b);
-
-		//remove any brackets left behind
-		$d = preg_replace('/(\(\)|\[\])/', '', $c);
-		$releasename = trim(preg_replace('/\s\s+/i', ' ', $d));
-
-		// the default existing type was ebook, this handles that in the same manor as before
-		if ($releasetype == 'ebook') {
-			if (preg_match('/^([a-z0-9] )+$|ArtofUsenet|ekiosk|(ebook|mobi).+collection|erotica|Full Video|ImwithJamie|linkoff org|Mega.+pack|^[a-z0-9]+ (?!((January|February|March|April|May|June|July|August|September|O(c|k)tober|November|De(c|z)ember)))[a-z]+( (ebooks?|The))?$|NY Times|(Book|Massive) Dump|Sexual/i', $releasename)) {
-
-				if ($this->echooutput) {
-					$this->pdo->log->doEcho(
-						$this->pdo->log->headerOver('Changing category to misc books: ') . $this->pdo->log->primary($releasename)
-					);
-				}
-				$this->pdo->queryExec(sprintf('UPDATE releases SET categoryid = %d WHERE id = %d', 7050, $releaseID));
-				return false;
-			} else if (preg_match('/^([a-z0-9ü!]+ ){1,2}(N|Vol)?\d{1,4}(a|b|c)?$|^([a-z0-9]+ ){1,2}(Jan( |unar|$)|Feb( |ruary|$)|Mar( |ch|$)|Apr( |il|$)|May(?![a-z0-9])|Jun( |e|$)|Jul( |y|$)|Aug( |ust|$)|Sep( |tember|$)|O(c|k)t( |ober|$)|Nov( |ember|$)|De(c|z)( |ember|$))/i', $releasename) && !preg_match('/Part \d+/i', $releasename)) {
-
-				if ($this->echooutput) {
-					$this->pdo->log->doEcho(
-						$this->pdo->log->headerOver('Changing category to magazines: ') . $this->pdo->log->primary($releasename)
-					);
-				}
-				$this->pdo->queryExec(sprintf('UPDATE releases SET categoryid = %d WHERE id = %d', 7030, $releaseID));
-				return false;
-			} else if (!empty($releasename) && !preg_match('/^[a-z0-9]+$|^([0-9]+ ){1,}$|Part \d+/i', $releasename)) {
-				return $releasename;
-			} else {
-				return false;
-			}
-		} else if ($releasetype == 'audiobook') {
-			if (!empty($releasename) && !preg_match('/^[a-z0-9]+$|^([0-9]+ ){1,}$|Part \d+/i', $releasename)) {
-				// we can skip category for audiobooks, since we already know it, so as long as the release name is valid return it so that it is postprocessed by amazon.  In the future, determining the type of audiobook could be added (Lecture or book), since we can skip lookups on lectures, but for now handle them all the same way
-				return $releasename;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	public function updateBookInfo($bookInfo = '', $amazdata = null)
-	{
-		$ri = new \ReleaseImage($this->pdo);
-
-		$book = array();
-
-		$amaz = false;
-		if ($bookInfo != '') {
-			$amaz = $this->fetchAmazonProperties($bookInfo);
-		} else if ($amazdata != null) {
-			$amaz = $amazdata;
-		}
-
-		if (!$amaz) {
-			return false;
-		}
-
-		$book['title'] = (string)$amaz->Items->Item->ItemAttributes->Title;
-		$book['author'] = (string)$amaz->Items->Item->ItemAttributes->Author;
-		$book['asin'] = (string)$amaz->Items->Item->ASIN;
-		$book['isbn'] = (string)$amaz->Items->Item->ItemAttributes->ISBN;
-		if ($book['isbn'] == '') {
-			$book['isbn'] = 'null';
-		}
-
-		$book['ean'] = (string)$amaz->Items->Item->ItemAttributes->EAN;
-		if ($book['ean'] == '') {
-			$book['ean'] = 'null';
-		}
-
-		$book['url'] = (string)$amaz->Items->Item->DetailPageURL;
-		$book['url'] = str_replace("%26tag%3Dws", "%26tag%3Dopensourceins%2D21", $book['url']);
-
-		$book['salesrank'] = (string)$amaz->Items->Item->SalesRank;
-		if ($book['salesrank'] == '') {
-			$book['salesrank'] = 'null';
-		}
-
-		$book['publisher'] = (string)$amaz->Items->Item->ItemAttributes->Publisher;
-		if ($book['publisher'] == '') {
-			$book['publisher'] = 'null';
-		}
-
-		$book['publishdate'] = date('Y-m-d', strtotime((string)$amaz->Items->Item->ItemAttributes->PublicationDate));
-		if ($book['publishdate'] == '') {
-			$book['publishdate'] = 'null';
-		}
-
-		$book['pages'] = (string)$amaz->Items->Item->ItemAttributes->NumberOfPages;
-		if ($book['pages'] == '') {
-			$book['pages'] = 'null';
-		}
-
-		if (isset($amaz->Items->Item->EditorialReviews->EditorialReview->Content)) {
-			$book['overview'] = strip_tags((string)$amaz->Items->Item->EditorialReviews->EditorialReview->Content);
-			if ($book['overview'] == '') {
-				$book['overview'] = 'null';
-			}
-		} else {
-			$book['overview'] = 'null';
-		}
-
-		if (isset($amaz->Items->Item->BrowseNodes->BrowseNode->Name)) {
-			$book['genre'] = (string)$amaz->Items->Item->BrowseNodes->BrowseNode->Name;
-			if ($book['genre'] == '') {
-				$book['genre'] = 'null';
-			}
-		} else {
-			$book['genre'] = 'null';
-		}
-
-		$book['coverurl'] = (string)$amaz->Items->Item->LargeImage->URL;
-		if ($book['coverurl'] != '') {
-			$book['cover'] = 1;
-		} else {
-			$book['cover'] = 0;
-		}
-
-		$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM bookinfo WHERE asin = %s', $this->pdo->escapeString($book['asin'])));
-		if ($check === false) {
-			$bookId = $this->pdo->queryInsert(
-				sprintf("
-								INSERT INTO bookinfo
-									(title, author, asin, isbn, ean, url, salesrank, publisher, publishdate, pages,
-									overview, genre, cover, createddate, updateddate)
-								VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, now(), now())",
-					$this->pdo->escapeString($book['title']), $this->pdo->escapeString($book['author']),
-					$this->pdo->escapeString($book['asin']), $this->pdo->escapeString($book['isbn']),
-					$this->pdo->escapeString($book['ean']), $this->pdo->escapeString($book['url']),
-					$book['salesrank'], $this->pdo->escapeString($book['publisher']),
-					$this->pdo->escapeString($book['publishdate']), $book['pages'],
-					$this->pdo->escapeString($book['overview']), $this->pdo->escapeString($book['genre']),
-					$book['cover']
-				)
-			);
-		} else {
-			$bookId = $check['id'];
-			$this->pdo->queryExec(
-				sprintf('
-							UPDATE bookinfo
-							SET title = %s, author = %s, asin = %s, isbn = %s, ean = %s, url = %s, salesrank = %s, publisher = %s,
-								publishdate = %s, pages = %s, overview = %s, genre = %s, cover = %d, updateddate = NOW()
-							WHERE id = %d',
-					$this->pdo->escapeString($book['title']), $this->pdo->escapeString($book['author']),
-					$this->pdo->escapeString($book['asin']), $this->pdo->escapeString($book['isbn']),
-					$this->pdo->escapeString($book['ean']), $this->pdo->escapeString($book['url']),
-					$book['salesrank'], $this->pdo->escapeString($book['publisher']),
-					$this->pdo->escapeString($book['publishdate']), $book['pages'],
-					$this->pdo->escapeString($book['overview']), $this->pdo->escapeString($book['genre']),
-					$book['cover'], $bookId
-				)
-			);
-		}
-
-		if ($bookId) {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header("Added/updated book: "));
-				if ($book['author'] !== '') {
-					$this->pdo->log->doEcho($this->pdo->log->alternateOver("   Author: ") . $this->pdo->log->primary($book['author']));
-				}
-				echo $this->pdo->log->alternateOver("   Title: ") . $this->pdo->log->primary(" " . $book['title']);
-				if ($book['genre'] !== 'null') {
-					$this->pdo->log->doEcho($this->pdo->log->alternateOver("   Genre: ") . $this->pdo->log->primary(" " . $book['genre']));
-				}
-			}
-
-			$book['cover'] = $ri->saveImage($bookId, $book['coverurl'], $this->imgSavePath, 250, 250);
-		} else {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->header('Nothing to update: ') .
-					$this->pdo->log->header($book['author'] .
-						' - ' .
-						$book['title'])
-				);
-			}
-		}
-		return $bookId;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Categorize.php b/lib/copy_this/www/lib/Categorize.php
deleted file mode 100644
index 872b41802..000000000
--- a/lib/copy_this/www/lib/Categorize.php
+++ /dev/null
@@ -1,1365 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/site.php");
-
-/**
- * Categorizing of releases by name/group.
- *
- * Class Categorize
- */
-class Categorize extends Category
-{
-	/**
-	 * @var bool
-	 */
-	protected $categorizeForeign;
-
-	/**
-	 * @var bool
-	 */
-	protected $catWebDL;
-
-	/**
-	 * Temporary category while we sort through the name.
-	 * @var int
-	 */
-	protected $tmpCat = \Category::CAT_MISC_OTHER;
-
-	/**
-	 * Release name to sort through.
-	 * @var string
-	 */
-	public $releaseName;
-
-	/**
-	 * Group id of the releasename we are sorting through.
-	 * @var int|string
-	 */
-	public $groupID;
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options Class instances.
-	 */
-	public function __construct(array $options = array())
-	{
-		//parent::__construct($options);
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->pdo = new DB();
-		$this->categorizeForeign = ($this->site->categorizeforeign == "0") ? false : true;
-		$this->catWebDL = ($this->site->catwebdl == "0") ? false : true;
-	}
-
-	/**
-	 * Look up the site to see which language of categorizing to use.
-	 * Then work out which category is applicable for either a group or a binary.
-	 * Returns Category::CAT_MISC_OTHER if no category is appropriate.
-	 *
-	 * @param string     $releaseName The name to parse.
-	 * @param int|string $groupID     The groupid.
-	 *
-	 * @return int The categoryid.
-	 */
-	public function determineCategory($groupID, $releaseName = '')
-	{
-		$this->releaseName = $releaseName;
-		$this->groupID     = $groupID;
-		$this->tmpCat      = \Category::CAT_MISC_OTHER;
-
-		switch (true) {
-			case $this->isMisc():
-				// Note that in byGroup() some overrides occur...
-			case $this->byGroup():
-				//Try against all functions, if still nothing, return Cat Misc.
-			case $this->isPC():
-			case $this->isXXX():
-			case $this->isTV():
-			case $this->isMusic():
-			case $this->isMovie():
-			case $this->isConsole():
-			case $this->isBook():
-				return $this->tmpCat;
-		}
-		return $this->tmpCat;
-	}
-
-	/**
-	 * Determine category by group name.
-	 *
-	 * @return bool
-	 */
-	public function byGroup()
-	{
-		$group = $this->pdo->queryOneRow(sprintf('SELECT LOWER(name) AS name FROM groups WHERE id = %d', $this->groupID));
-		if ($group !== false) {
-			$group = $group['name'];
-			switch (true) {
-				case $group === 'alt.binaries.0day.stuffz':
-					switch (true) {
-						case $this->isBook():
-						case $this->isConsole():
-						case $this->isPC():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_PC_0DAY;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.audio.warez':
-					$this->tmpCat = \Category::CAT_PC_0DAY;
-					break;
-				case preg_match('/alt\.binaries\.(multimedia\.erotica\.|cartoons\.french\.|dvd\.|multimedia\.)?anime(\.highspeed|\.repost|s-fansub|\.german)?/', $group):
-					$this->tmpCat = \Category::CAT_TV_ANIME;
-					break;
-				case $group === 'alt.binaries.british.drama':
-					switch (true) {
-						case $this->isHDTV():
-						case $this->isSDTV():
-						case $this->isPC():
-							break;
-						default:
-							return false;
-					}
-					break;
-				case $this->categorizeForeign && $group === 'alt.binaries.cartoons.french':
-					$this->tmpCat = \Category::CAT_TV_FOREIGN;
-					break;
-				case $group === 'alt.binaries.cd.image.linux':
-					$this->tmpCat = \Category::CAT_PC_0DAY;
-					break;
-				case $group === 'alt.binaries.cd.lossless':
-					if ($this->categorizeForeign && $this->isMusicForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MUSIC_LOSSLESS;
-					break;
-				case $group === 'alt.binaries.classic.tv.shows':
-					$this->tmpCat = \Category::CAT_TV_SD;
-					break;
-				case preg_match('/alt\.binaries\.(comics\.dcp|pictures\.comics\.(complete|dcp|reposts?))/', $group):
-					if ($this->categorizeForeign && $this->isBookForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_BOOK_COMICS;
-					break;
-				case $group === 'alt.binaries.console.ps3':
-					if ($this->isGamePS4()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_GAME_PS3;
-					break;
-				case $group === 'alt.binaries.cores':
-					if ($this->isXxx()) {
-						break;
-					}
-					return false;
-				case preg_match('/alt\.binaries(\.(19\d0s|country|sounds?(\.country|\.19\d0s)?))?\.mp3(\.[a-z]+)?/i', $group):
-					if ($this->isMusic()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MUSIC_MP3;
-					break;
-				case $group === 'alt.binaries.triballs':
-					switch (true) {
-						case $this->isMusic():
-						case $this->isPCGame():
-						case $this->isMovie():
-						break;
-						default:
-							$this->tmpCat = \Category::CAT_MISC_OTHER;
-							break;
-					}
-					break;
-				case preg_match('/alt\.binaries\.dvd(\-?r)?(\.(movies|))?$/i', $group):
-					if ($this->isMovie()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MISC_OTHER;
-					break;
-				case preg_match('/alt\.binaries\.(dvdnordic\.org|nordic\.(dvdr?|xvid))|dk\.(binaer|binaries)\.film(\.divx)?/', $group):
-					if ($this->categorizeForeign && $this->isMovieForeign()) {
-						break;
-					}
-					if ($this->isMovie()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MOVIE_FOREIGN;
-					break;
-				case $group === 'alt.binaries.documentaries':
-					$this->tmpCat = \Category::CAT_TV_DOCU;
-					break;
-				case $group === 'alt.binaries.dreamcast':
-					$this->tmpCat = \Category::CAT_GAME_OTHER;
-					break;
-				case preg_match('/alt\.binaries\.e\-?books?((\.|\-)(technical|textbooks))/', $group):
-					if ($this->categorizeForeign && $this->isBookForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_BOOK_TECHNICAL;
-					break;
-				case $group === 'alt.binaries.e-book.magazines':
-					if ($this->categorizeForeign && $this->isBookForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_BOOK_MAGS;
-					break;
-				case $group === 'alt.binaries.e-book.rpg':
-					switch (true) {
-						case $this->is0day():
-						case $this->isPCGame():
-						case $this->isConsole():
-						case $this->isBook():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_BOOK_OTHER;
-							break;
-					}
-					break;
-				case preg_match('/alt\.binaries\.e\-?book(\.[a-z]+)?/', $group):
-					switch (true) {
-						case $this->is0day():
-						case $this->isPCGame():
-						case $this->isConsole():
-						case $this->isBook():
-						case $this->categorizeForeign && $this->isBookForeign():
-							break;
-						case preg_match('/[a-z0-9 \',]+ - \[? ?[a-z0-9 \']+ ?\]? - [a-z0-9 \']+/i', $this->releaseName):
-							$this->tmpCat = \Category::CAT_BOOK_EBOOK;
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_MISC_OTHER;
-							break;
-					}
-					break;
-				case preg_match('/alt\.binaries\..*(erotica|ijsklontje|xxx)/', $group):
-					if ($this->isXxx()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_XXX_OTHER;
-					break;
-				case $group == 'alt.binaries.cd.image.sega-saturn':
-				case $group === 'alt.binaries.gamecube':
-					$this->tmpCat = \Category::CAT_GAME_OTHER;
-					break;
-				case preg_match('/alt.binaries.games.(dox|adventures)/', $group):
-					switch (true) {
-						case $this->is0day():
-						case $this->isConsole():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_PC_GAMES;
-							break;
-					}
-					break;
-				case preg_match('/alt.binaries.cd.images?.games/', $group):
-					switch (true) {
-						case $this->isConsole():
-						case $this->isBook():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_PC_GAMES;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.pcgame':
-					switch (true) {
-						case $this->is0day():
-						case $this->isConsole():
-						case $this->isTV():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_PC_GAMES;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.games.nintendo3ds':
-					if ($this->isGameNDS()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_GAME_3DS;
-					break;
-				case preg_match('/alt\.binaries\.(games|emulators)?\.?nintendo[\.-]?ds/', $group):
-					if ($this->isGame3DS()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_GAME_NDS;
-					break;
-				case $group === 'alt.binaries.games.wii':
-					switch (true) {
-						case $this->isGameWiiWare():
-						case $this->isGameWiiU():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_GAME_WII;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.games.xbox':
-					switch (true) {
-						case $this->isGameXBOX360DLC():
-						case $this->isGameXBOX360():
-						case $this->isGameXBOXONE():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_GAME_XBOX;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.games.xbox360':
-					switch (true) {
-						case $this->isGameXBOX360DLC():
-						case $this->isGameXBOXONE():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_GAME_XBOX360;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.inner-sanctum':
-					switch (true) {
-						case $this->isMusic():
-							break;
-						case preg_match('/-+(19|20)\d\d-\(?(album.*?|back|cover|front)\)?-+/i', $this->releaseName):
-						case preg_match('/(19|20)\d\d$/', $this->releaseName) && ctype_lower(preg_replace('/[^a-z]/i', '', $this->releaseName)):
-							$this->tmpCat = \Category::CAT_MUSIC_OTHER;
-							break;
-						default:
-							return false;
-					}
-					break;
-				case preg_match('/alt\.binaries\.ipod\.videos\.tvshows/', $group):
-					$this->tmpCat = \Category::CAT_TV_OTHER;
-					break;
-				case $group === 'alt.binaries.mac':
-					$this->tmpCat = \Category::CAT_PC_MAC;
-					break;
-				case $group === 'alt.binaries.mma':
-					if ($this->is0day()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_TV_SPORT;
-					break;
-				case $group === 'alt.binaries.moovee':
-					switch (true) {
-						case $this->isTV():  // Check if it's TV first as some tv posted in moovee
-						case $this->isMovieHD():  // Check the movie isn't an HD release before blindly assigning SD
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_MOVIE_SD;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.mpeg.video.music':
-					if ($this->categorizeForeign && $this->isMusicForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MUSIC_VIDEO;
-					break;
-				case $group === 'alt.binaries.multimedia.documentaries':
-					$this->tmpCat = \Category::CAT_TV_DOCU;
-					break;
-				case preg_match('/alt\.binaries\.multimedia\.sports(\.boxing)?/', $group):
-					$this->tmpCat = \Category::CAT_TV_SPORT;
-					break;
-				case $group === 'alt.binaries.music.opera':
-					switch (true) {
-						case $this->categorizeForeign && $this->isMusicForeign():
-							break;
-						case preg_match('/720p|[-._ ]mkv/i', $this->releaseName):
-							$this->tmpCat = \Category::CAT_MUSIC_VIDEO;
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_MUSIC_MP3;
-							break;
-					}
-					break;
-				case preg_match('/alt\.binaries\.music/', $group):
-					switch (true) {
-						case $this->categorizeForeign && $this->isMusicForeign():
-						case $this->isMusic():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_MUSIC_MP3;
-							break;
-					}
-					break;
-				case preg_match('/audiobook/', $group):
-					if ($this->categorizeForeign && $this->isMusicForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MUSIC_AUDIOBOOK;
-					break;
-				case $group === 'alt.binaries.pro-wrestling':
-					$this->tmpCat = \Category::CAT_TV_SPORT;
-					break;
-				case preg_match('/alt\.binaries\.sounds\.(flac(\.jazz)?|jpop|lossless(\.[a-z0-9]+)?)|alt\.binaries\.(cd\.lossless|music\.flac)/i', $group):
-					switch (true) {
-						case $this->categorizeForeign && $this->isMusicForeign():
-						case $this->isMusic():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_MUSIC_LOSSLESS;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.sounds.whitburn.pop':
-					switch (true) {
-						case $this->categorizeForeign && $this->isMusicForeign():
-							break;
-						case !preg_match('/[-._ ]scans[-._ ]/i', $this->releaseName):
-							$this->tmpCat = \Category::CAT_MUSIC_MP3;
-							break;
-						default:
-							return false;
-					}
-					break;
-				case $group === 'alt.binaries.sounds.ogg':
-					if ($this->categorizeForeign && $this->isMusicForeign()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_MUSIC_OTHER;
-					break;
-				case $group === 'alt.binaries.sony.psp':
-					if ($this->isGamePSVita()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_GAME_PSP;
-					break;
-				case $group === 'alt.binaries.sony.psvita':
-					$this->tmpCat = \Category::CAT_GAME_PSVITA;
-					break;
-				case $group === 'alt.binaries.warez':
-					switch (true) {
-						case $this->isTV():
-						case $this->isMovie():
-						case $this->isPC():
-						case $this->isConsole():
-							break;
-						default:
-							$this->tmpCat = \Category::CAT_PC_0DAY;
-							break;
-					}
-					break;
-				case $group === 'alt.binaries.warez.games':
-					$this->tmpCat = \Category::CAT_PC_GAMES;
-					break;
-				case $group === 'alt.binaries.warez.smartphone':
-					if ($this->isPhone()) {
-						break;
-					}
-					$this->tmpCat = \Category::CAT_PC_MOBILEOTHER;
-					break;
-				case $this->categorizeForeign && $group === 'db.binaer.tv':
-					$this->tmpCat = \Category::CAT_TV_FOREIGN;
-					break;
-				default:
-					return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	//
-	// Beginning of functions to determine category by release name.
-	//
-
-	//	TV.
-	public function isTV()
-	{
-//		if (/*!preg_match('/s\d{1,3}[-._ ]?[ed]\d{1,3}|season|episode/i', $this->releaseName) &&*/ preg_match('/part[-._ ]?\d/i', $this->releaseName)) {
-//			return false;
-//		}
-
-		if (preg_match('/Daily[-_\.]Show|Nightly News|^\[[a-zA-Z\.\-]+\].*[-_].*\d{1,3}[-_. ]((\[|\()(h264-)?\d{3,4}(p|i)(\]|\))\s?(\[AAC\])?|\[[a-fA-F0-9]{8}\]|(8|10)BIT|hi10p)(\[[a-fA-F0-9]{8}\])?|(\d\d-){2}[12]\d{3}|[12]\d{3}(\.\d\d){2}|\d+x\d+|\.e\d{1,3}\.|s\d{1,3}[-._ ]?[ed]\d{1,3}([ex]\d{1,3}|[-.\w ])|[-._ ](\dx\d\d|C4TV|Complete[-._ ]Season|DSR|(D|H|P|S)DTV|EP[-._ ]?\d{1,3}|S\d{1,3}.+Extras|SUBPACK|Season[-._ ]\d{1,2})([-._ ]|$)|TVRIP|TV[-._ ](19|20)\d\d|TrollHD/i', $this->releaseName)
-			&& !preg_match('/[-._ ](flac|imageset|mp3|xxx)[-._ ]|[ .]exe$/i', $this->releaseName)) {
-			switch (true) {
-				case $this->isOtherTV():
-				case $this->categorizeForeign && $this->isForeignTV():
-				case $this->isSportTV():
-				case $this->isDocumentaryTV():
-				case $this->catWebDL && $this->isWEBDL():
-				case $this->isAnimeTV():
-				case $this->isHDTV():
-				case $this->isSDTV():
-				case $this->isOtherTV2():
-					return true;
-				default:
-					$this->tmpCat = \Category::CAT_TV_OTHER;
-					return true;
-			}
-		}
-
-		if (preg_match('/[-._ ]((19|20)\d\d[-._ ]\d{1,2}[-._ ]\d{1,2}[-._ ]VHSRip|Indy[-._ ]?Car|(iMPACT|Smoky[-._ ]Mountain|Texas)[-._ ]Wrestling|Moto[-._ ]?GP|NSCS[-._ ]ROUND|NECW[-._ ]TV|(Per|Post)\-Show|PPV|WrestleMania|WCW|WEB[-._ ]HD|WWE[-._ ](Monday|NXT|RAW|Smackdown|Superstars|WrestleMania))[-._ ]/i', $this->releaseName)) {
-			if ($this->isSportTV()) {
-				return true;
-			}
-			$this->tmpCat = \Category::CAT_TV_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	public function isOtherTV()
-	{
-		if (preg_match('/[-._ ]S\d{1,3}.+(EP\d{1,3}|Extras|SUBPACK)[-._ ]|News/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_TV_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	public function isForeignTV()
-	{
-		switch (true) {
-			case preg_match('/[-._ ](NHL|stanley.+cup)[-._ ]/', $this->releaseName):
-				return false;
-			case preg_match('/[-._ ](chinese|dk|fin|french|ger?|heb|ita|jap|kor|nor|nordic|nl|pl|swe)[-._ ]?(sub|dub)(ed|bed|s)?|<German>/i', $this->releaseName):
-			case preg_match('/[-._ ](brazilian|chinese|croatian|danish|deutsch|dutch|estonian|flemish|finnish|french|german|greek|hebrew|icelandic|italian|ita|latin|mandarin|nordic|norwegian|polish|portuguese|japenese|japanese|russian|serbian|slovenian|spanish|spanisch|swedish|thai|turkish).+(720p|1080p|Divx|DOKU|DUB(BED)?|DLMUX|NOVARIP|RealCo|Sub(bed|s)?|Web[-._ ]?Rip|WS|Xvid|x264)[-._ ]/i', $this->releaseName):
-			case preg_match('/[-._ ](720p|1080p|Divx|DOKU|DUB(BED)?|DLMUX|NOVARIP|RealCo|Sub(bed|s)?|Web[-._ ]?Rip|WS|Xvid).+(brazilian|chinese|croatian|danish|deutsch|dutch|estonian|flemish|finnish|french|german|greek|hebrew|icelandic|italian|ita|latin|mandarin|nordic|norwegian|polish|portuguese|japenese|japanese|russian|serbian|slovenian|spanish|spanisch|swedish|thai|turkish)[-._ ]/i', $this->releaseName):
-			case preg_match('/(S\d\d[EX]\d\d|DOCU(MENTAIRE)?|TV)?[-._ ](FRENCH|German|Dutch)[-._ ](720p|1080p|dv(b|d)r(ip)?|LD|HD\-?TV|TV[-._ ]?RIP|x264)[-._ ]/i', $this->releaseName):
-			case preg_match('/[-._ ]FastSUB|NL|nlvlaams|patrfa|RealCO|Seizoen|slosinh|Videomann|Vostfr|xslidian[-._ ]|x264\-iZU/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_TV_FOREIGN;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isSportTV()
-	{
-		switch (true) {
-			case preg_match('/s\d{1,3}[-._ ]?[ed]\d{1,3}([ex]\d{1,3}|[-.\w ])/i', $this->releaseName):
-				return false;
-			case preg_match('/[-._ ]?(Bellator|bundesliga|EPL|ESPN|FIA|la[-._ ]liga|MMA|motogp|NFL|NCAA|PGA|red[-._ ]bull.+race|Sengoku|Strikeforce|supercup|uefa|UFC|wtcc|WWE)[-._ ]/i', $this->releaseName):
-			case preg_match('/[-._ ]?(DTM|FIFA|formula[-._ ]1|indycar|Rugby|NASCAR|NBA|NHL|NRL|netball[-._ ]anz|ROH|SBK|Superleague|The[-._ ]Ultimate[-._ ]Fighter|TNA|V8[-._ ]Supercars|WBA|WrestleMania)[-._ ]/i', $this->releaseName):
-			case preg_match('/[-._ ]?(AFL|Grand Prix|Indy[-._ ]Car|(iMPACT|Smoky[-._ ]Mountain|Texas)[-._ ]Wrestling|Moto[-._ ]?GP|NSCS[-._ ]ROUND|NECW|Poker|PWX|Rugby|WCW)[-._ ]/i', $this->releaseName):
-			case preg_match('/[-._ ]?(Horse)[-._ ]Racing[-._ ]/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_TV_SPORT;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isDocumentaryTV()
-	{
-		if (preg_match('/[-._ ](Docu|Documentary)[-._ ]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_TV_DOCU;
-			return true;
-		}
-		return false;
-	}
-
-	public function isWEBDL()
-	{
-		if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_TV_WEBDL;
-			return true;
-		}
-		return false;
-	}
-
-	public function isAnimeTV()
-	{
-		if (preg_match('/[-._ ]Anime[-._ ]|^\[[a-zA-Z\.\-]+\].*[-_].*\d{1,3}[-_. ]((\[|\()((\d{1,4}x\d{1,4})|(h264-)?\d{3,4}(p|i))(\]|\))\s?(\[AAC\])?|\[[a-fA-F0-9]{8}\]|(8|10)BIT|hi10p)(\[[a-fA-F0-9]{8}\])?/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_TV_ANIME;
-			return true;
-		}
-		return false;
-	}
-
-	public function isHDTV()
-	{
-		if (preg_match('/1080(i|p)|720p|bluray/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_TV_HD;
-			return true;
-		}
-		if ($this->catWebDL == false) {
-			if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_TV_HD;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isSDTV()
-	{
-		switch (true) {
-			case preg_match('/(360|480|576)p|Complete[-._ ]Season|dvdr(ip)?|dvd5|dvd9|\.pdtv|SD[-._ ]TV|TVRip|NTSC|BDRip|hdtv|xvid/i', $this->releaseName):
-			case preg_match('/((H|P)D[-._ ]?TV|DSR|WebRip)[-._ ]x264/i', $this->releaseName):
-			case preg_match('/s\d{1,3}[-._ ]?[ed]\d{1,3}([ex]\d{1,3}|[-.\w ])|\s\d{3,4}\s/i', $this->releaseName) && preg_match('/(H|P)D[-._ ]?TV|BDRip[-._ ]x264/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_TV_SD;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isOtherTV2()
-	{
-		if (preg_match('/[-._ ]s\d{1,3}[-._ ]?(e|d(isc)?)\d{1,3}([-._ ]|$)/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_TV_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	//  Movies.
-	public function isMovie()
-	{
-		if (preg_match('/[-._ ]AVC|[-._ ]|[BH][DR]RIP|Bluray|BD[-._ ]?(25|50)?|\bBR\b|Camrip|[-._ ]\d{4}[-._ ].+(720p|1080p|Cam|HDTS)|DIVX|[-._ ]DVD[-._ ]|DVD-?(5|9|R|Rip)|Untouched|VHSRip|XVID|[-._ ](DTS|TVrip)[-._ ]/i', $this->releaseName) && !preg_match('/auto(cad|desk)|divx[-._ ]plus|[-._ ]exe$|[-._ ](jav|XXX)[-._ ]|SWE6RUS|\wXXX(1080p|720p|DVD)|Xilisoft/i', $this->releaseName)) {
-			switch (true) {
-				case $this->categorizeForeign && $this->isMovieForeign():
-				case $this->isMovieDVD():
-				case $this->catWebDL && $this->isMovieWEBDL():
-				case $this->isMovieSD():
-				case $this->isMovie3D():
-				case $this->isMovieBluRay():
-				case $this->isMovieHD():
-				case $this->isMovieOther():
-					return true;
-				default:
-					return false;
-			}
-		}
-		return false;
-	}
-
-	public function isMovieForeign()
-	{
-		switch (true) {
-			case $this->isConsole():
-				return true;
-			case preg_match('/(danish|flemish|Deutsch|dutch|french|german|nl[-._ ]?sub(bed|s)?|\.NL|norwegian|swedish|swesub|spanish|Staffel)[-._ ]|\(german\)|Multisub/i', $this->releaseName):
-			case preg_match('/Castellano/i', $this->releaseName):
-			case preg_match('/(720p|1080p|AC3|AVC|DIVX|DVD(5|9|RIP|R)|XVID)[-._ ](Dutch|French|German|ITA)|\(?(Dutch|French|German|ITA)\)?[-._ ](720P|1080p|AC3|AVC|DIVX|DVD(5|9|RIP|R)|HD[-._ ]|XVID)/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_MOVIE_FOREIGN;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isMovieDVD()
-	{
-		if (preg_match('/(dvd\-?r|[-._ ]dvd|dvd9|dvd5|[-._ ]r5)[-._ ]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_DVD;
-			return true;
-		}
-		return false;
-	}
-
-	public function isMovieSD()
-	{
-		if (preg_match('/(divx|dvdscr|extrascene|dvdrip|\.CAM|HDTS(-LINE)?|vhsrip|xvid(vd)?)[-._ ]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_SD;
-			return true;
-		}
-		return false;
-	}
-
-	public function isMovie3D()
-	{
-		if (preg_match('/[-._ ]3D\s?[\.\-_\[ ](1080p|(19|20)\d\d|AVC|BD(25|50)|Blu[-._ ]?ray|CEE|Complete|GER|MVC|MULTi|SBS|H(-)?SBS)[-._ ]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_3D;
-			return true;
-		}
-		return false;
-	}
-
-	public function isMovieBluRay()
-	{
-		if (preg_match('/bluray\-|[-._ ]bd?[-._ ]?(25|50)|blu-ray|Bluray\s\-\sUntouched|[-._ ]untouched[-._ ]/i', $this->releaseName)
-			&& !preg_match('/SecretUsenet\.com/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_BLURAY;
-			return true;
-		}
-		return false;
-	}
-
-	public function isMovieHD()
-	{
-		if (preg_match('/720p|1080p|AVC|VC1|VC\-1|web\-dl|wmvhd|x264|XvidHD|bdrip/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_HD;
-			return true;
-		}
-		if ($this->catWebDL == false) {
-			if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_MOVIE_HD;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isMovieOther()
-	{
-		if (preg_match('/[-._ ]cam[-._ ]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	public function isMovieWEBDL()
-	{
-		if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MOVIE_WEBDL;
-			return true;
-		}
-		return false;
-	}
-
-	//  PC.
-	public function isPC()
-	{
-		switch (true) {
-			case preg_match('/s\d{1,3}[-._ ]?[ed]\d{1,3}([ex]\d{1,3}|[-.\w ])|[^a-z0-9](FLAC|Imageset|PICTURESET|MP3|Nintendo|PDTV|PS[23P]|SWE6RUS|UMD(RIP)?|WII|x264|XBOX(360|DVD|ONE)?|XXX)[^a-z0-9]/i', $this->releaseName):
-				return false;
-			case $this->isPhone():
-			case $this->isMac():
-			case $this->isISO():
-			case $this->isPCGame():
-			case $this->is0day():
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isPhone()
-	{
-		switch (true) {
-			case preg_match('/[^a-z0-9](IPHONE|ITOUCH|IPAD)[-._ ]/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_PC_MOBILEIOS;
-				break;
-			case preg_match('/[-._ ]?(ANDROID)[-._ ]/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_PC_MOBILEANDROID;
-				break;
-			case preg_match('/[^a-z0-9](symbian|xscale|wm5|wm6)[-._ ]/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_PC_MOBILEOTHER;
-				break;
-			default:
-				return false;
-		}
-		return true;
-	}
-
-	public function isISO()
-	{
-		if (preg_match('/[-._ ]([a-zA-Z]{2,10})?iso[ _.-]|[-. ]([a-z]{2,10})?iso$/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_PC_ISO;
-			return true;
-		}
-		return false;
-	}
-
-	public function is0day()
-	{
-		switch (true) {
-			case preg_match('/[-._ ]exe$|[-._ ](utorrent|Virtualbox)[-._ ]|\b0DAY\b|incl.+crack| DRM$|>DRM</i', $this->releaseName):
-			case preg_match('/[-._ ]((32|64)bit|converter|i\d86|key(gen|maker)|freebsd|GAMEGUiDE|hpux|irix|linux|multilingual|Patch|Pro v\d{1,3}|portable|regged|software|solaris|template|unix|win2kxp2k3|win64|win(2k|32|64|all|dows|nt(2k)?(xp)?|xp)|win9x(me|nt)?|x(32|64|86))[-._ ]/i', $this->releaseName):
-			case preg_match('/\b(Adobe|auto(cad|desk)|-BEAN|Cracked|Cucusoft|CYGNUS|Divx[-._ ]Plus|\.(deb|exe)|DIGERATI|FOSI|-FONT|Key(filemaker|gen|maker)|Lynda\.com|lz0|MULTiLANGUAGE|Microsoft\s*(Office|Windows|Server)|MultiOS|-(iNViSiBLE|SPYRAL|SUNiSO|UNION|TE)|v\d{1,3}.*?Pro|[-._ ]v\d{1,3}[-._ ]|\(x(64|86)\)|Xilisoft)\b/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_PC_0DAY;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isMac()
-	{
-		if (preg_match('/(\b|[-._ ])mac(\.|\s)?osx(\b|[-_. ])/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_PC_MAC;
-			return true;
-		}
-		return false;
-	}
-
-	public function isPCGame()
-	{
-		if (preg_match('/[^a-z0-9](0x0007|ALiAS|BACKLASH|BAT|CLONECD|CPY|FAS(DOX|iSO)|FLT([-._ ]|COGENT)|-FLT(DOX)?|PC GAMES?|\(?(Game(s|z)|GAME(S|Z))\)? ?(\((C|c)\))|GENESIS|-GOG|-HATRED|HI2U|INLAWS|JAGUAR|MAZE|MONEY|OUTLAWS|PPTCLASSiCS|PC Game|PROPHET|RAiN|Razor1911|RELOADED|RiTUELYPOGEiOS|[rR][iI][pP]-[uU][nN][lL][eE][aA][sS][hH][eE][dD]|Steam(\b)?Rip|SKIDROW|TiNYiSO|CODEX)[^a-z0-9]?/', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_PC_GAMES;
-			return true;
-		}
-		return false;
-	}
-
-	//	XXX.
-	public function isXxx()
-	{
-		switch (true) {
-			case !preg_match('/\bXXX\b|(a\.b\.erotica|ClubSeventeen|Cum(ming|shot)|Err?oticax?|Porn(o|lation)?|Imageset|PICTURESET|JAV Uncensored|lesb(ians?|os?)|mastur(bation|e?bate)|My_Stepfather_Made_Me|nympho?|OLDER ANGELS|pictures\.erotica\.anime|sexontv|slut|Squirt|SWE6RUS|Transsexual|whore)/i', $this->releaseName):
-				return false;
-			case $this->isXxxPack():
-			case $this->IsXxxClipHD():
-			case $this->isXxxClipSD():
-			case $this->catWebDL && $this->isXxxWEBDL():
-			case $this->isXxx264():
-			case $this->isXxxXvid():
-			case $this->isXxxImageset():
-			case $this->isXxxWMV():
-			case $this->isXxxDVD():
-			case $this->isXxxOther():
-			case $this->isXxxSD():
-
-				return true;
-			default:
-				$this->tmpCat = \Category::CAT_XXX_OTHER;
-				return true;
-		}
-	}
-
-	public function isXxx264()
-	{
-		if (preg_match('/720p|1080(hd|[ip])|[xh][^a-z0-9]?264/i', $this->releaseName) && !preg_match('/\bwmv\b/i', $this->releaseName) && !preg_match('/SDX264XXX/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_X264;
-			return true;
-		}
-		if ($this->catWebDL == false) {
-			if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_XXX_X264;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isXxxClipHD()
-	{
-		if (preg_match('/^[\w-.]+(\d{2}\.\d{2}\.\d{2})[\w-.]+(M[PO][V4]-(KTR|GUSH|FaiLED|SEXORS|hUSHhUSH|YAPG))/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_CLIPHD;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxWMV()
-	{
-		if (preg_match('/(\d{2}\.\d{2}\.\d{2})|([ex]\d{2,})|[^a-z0-9](f4v|flv|isom|(issue\.\d{2,})|mov|mp(4|eg)|multiformat|pack-|realmedia|uhq|wmv)[^a-z0-9]/i', $this->releaseName) && !preg_match('/SDX264XXX/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_WMV;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxXvid()
-	{
-		if (preg_match('/(b[dr]|dvd)rip|detoxication|divx|nympho|pornolation|swe6|tesoro|xvid/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_XVID;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxDVD()
-	{
-		if (preg_match('/dvdr[^i]|dvd[59]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_DVD;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxImageset()
-	{
-		if (preg_match('/IMAGESET|PICTURESET|ABPEA/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_IMAGESET;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxPack()
-	{
-		if (preg_match('/[ .]PACK[ .]/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_PACK;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxOther()
-	{
-		// If nothing else matches, then try these words.
-		if (preg_match('/[-._ ]Brazzers|Creampie|[-._ ]JAV[-._ ]|North\.Pole|^Nubiles|She[-._ ]?Male|Transsexual|OLDER ANGELS/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxClipSD()
-	{
-		if (preg_match('/^[\w.]+(\d{2}\.\d{2}\.\d{2})[\w.]+(MP4-(SDX264XXX|XXX\.HR\.))/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_CLIPSD;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxSD()
-	{
-		if (preg_match('/^[\w.]+(\d{2}\.\d{2}\.\d{2})[\w.]+(MP4-\w+)/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_SD;
-			return true;
-		}
-		return false;
-	}
-
-	public function isXxxWEBDL()
-	{
-		if (preg_match('/web[-._ ]dl|web-?rip/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_XXX_WEBDL;
-			return true;
-		}
-		return false;
-	}
-
-	//	Console.
-	public function isConsole()
-	{
-		switch (true) {
-			case $this->isGameNDS():
-			case $this->isGame3DS():
-			case $this->isGamePS3():
-			case $this->isGamePS4():
-			case $this->isGamePSP():
-			case $this->isGamePSVita():
-			case $this->isGameWiiWare():
-			case $this->isGameWiiU():
-			case $this->isGameWii():
-			case $this->isGameNGC():
-			case $this->isGameXBOX360DLC():
-			case $this->isGameXBOX360():
-			case $this->isGameXBOXONE():
-			case $this->isGameXBOX():
-			case $this->isGameOther():
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isGameNDS()
-	{
-		if (preg_match('/^NDS|[^a-zA-Z0-9]NDS|[\._-](nds|NDS)|nintendo.+[^3]n?dsi?/', $this->releaseName)) {
-			if (preg_match('/\((DE|DSi(\sEnhanched)?|_NDS-|EUR?|FR|GAME|HOL|JP|JPN|NL|NTSC|PAL|KS|USA?)\)/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_NDS;
-				return true;
-			}
-			if (preg_match('/EUR|FR|GAME|HOL|JP|JPN|NL|NTSC|PAL|KS|USA|\bROMS?(et)?\b/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_NDS;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGame3DS()
-	{
-		if (preg_match('/\b3DS\b[^max]|[\._-]3ds|nintendo.+3ds|[_\.]3DS-/i', $this->releaseName) && !preg_match('/3ds max/i', $this->releaseName)) {
-			if (preg_match('/(EUR|FR|GAME|HOL|JP|JPN|NL|NTSC|PAL|KS|USA|ASIA)/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_3DS;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGameNGC()
-	{
-		if (preg_match('/[\._-]N?G(AME)?C(UBE)?-/i', $this->releaseName)) {
-			if (preg_match('/_(EUR?|FR|GAME|HOL|JP|JPN|NL|NTSC|PAL|KS|USA?)_/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_OTHER;
-				return true;
-			}
-			if (preg_match('/-(((STAR|DEATH|STINKY|MOON|HOLY|G)?CUBE(SOFT)?)|(DARKFORCE|DNL|GP|ICP|iNSOMNIA|JAY|LaKiTu|METHS|NOMIS|QUBiSM|PANDORA|REACT0R|SUNSHiNE|SAVEPOiNT|SYNDiCATE|WAR3X|WRG))/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_OTHER;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGamePS3()
-	{
-		if (preg_match('/[^e]PS3/i', $this->releaseName)) {
-			if (preg_match('/ANTiDOTE|DLC|DUPLEX|EUR?|Googlecus|GOTY|\-HR|iNSOMNi|JAP|JPN|KONDIOS|\[PS3\]|PSN/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_PS3;
-				return true;
-			}
-			if (preg_match('/AGENCY|APATHY|Caravan|MULTi|NRP|NTSC|PAL|SPLiT|STRiKE|USA?|ZRY/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_PS3;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGamePS4()
-	{
-		if (preg_match('/[ \(_.-]PS4[ \)_.-]/i', $this->releaseName)) {
-			if (preg_match('/ANTiDOTE|DLC|DUPLEX|EUR?|Googlecus|GOTY|\-HR|iNSOMNi|JAP|JPN|KONDIOS|\[PS4\]/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_PS4;
-				return true;
-			}
-			if (preg_match('/AGENCY|APATHY|Caravan|MULTi|NRP|NTSC|PAL|SPLiT|STRiKE|USA?|WaYsTeD|ZRY/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_PS4;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGamePSP()
-	{
-		if (preg_match('/PSP/i', $this->releaseName)) {
-			if (preg_match('/[-._ ](BAHAMUT|Caravan|EBOOT|EMiNENT|EUR?|EvoX|GAME|GHS|Googlecus|HandHeld|\-HR|JAP|JPN|KLOTEKLAPPERS|KOR|NTSC|PAL)/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_PSP;
-				return true;
-			}
-			if (preg_match('/[-._ ](Dynarox|HAZARD|ITALIAN|KLB|KuDoS|LIGHTFORCE|MiRiBS|POPSTATiON|(PLAY)?ASiA|PSN|PSX2?PSP|SPANiSH|SUXXORS|UMD(RIP)?|USA?|YARR)/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_PSP;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGamePSVita()
-	{
-		if (preg_match('/PS ?Vita/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_GAME_PSVITA;
-			return true;
-		}
-		return false;
-	}
-
-	public function isGameWiiWare()
-	{
-		if (preg_match('/(Console|DLC|VC).+[-._ ]WII|(Console|DLC|VC)[-._ ]WII|WII[-._ ].+(Console|DLC|VC)|WII[-._ ](Console|DLC|VC)|WIIWARE/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_GAME_WIIWARE;
-			return true;
-		}
-		return false;
-	}
-
-	public function isGameWiiU()
-	{
-		switch (true) {
-			case !preg_match('/WII-?U/i', $this->releaseName):
-				return false;
-			case preg_match('/[-._ ](Allstars|BiOSHOCK|dumpTruck|DNi|iCON|JAP|NTSC|PAL|ProCiSiON|PROPER|RANT|REV0|SUNSHiNE|SUSHi|TMD|USA?)/i', $this->releaseName):
-			case preg_match('/[-._ ](APATHY|BAHAMUT|DMZ|ERD|GAME|JPN|LoCAL|MULTi|NAGGERS|OneUp|PLAYME|PONS|Scrubbed|VORTEX|ZARD|ZER0)/i', $this->releaseName):
-			case preg_match('/[-._ ](ALMoST|AMBITION|Caravan|CLiiCHE|DRYB|HaZMaT|KOR|LOADER|MARVEL|PROMiNENT|LaKiTu|LOCAL|QwiiF|RANT)/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_GAME_WIIU;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isGameWii()
-	{
-		switch (true) {
-			case !preg_match('/WII/i', $this->releaseName):
-				return false;
-			case preg_match('/[-._ ](Allstars|BiOSHOCK|dumpTruck|DNi|iCON|JAP|NTSC|PAL|ProCiSiON|PROPER|RANT|REV0|SUNSHiNE|SUSHi|TMD|USA?)/i', $this->releaseName):
-			case preg_match('/[-._ ](APATHY|BAHAMUT|DMZ|ERD|GAME|JPN|LoCAL|MULTi|NAGGERS|OneUp|PLAYME|PONS|Scrubbed|VORTEX|ZARD|ZER0)/i', $this->releaseName):
-			case preg_match('/[-._ ](ALMoST|AMBITION|Caravan|CLiiCHE|DRYB|HaZMaT|KOR|LOADER|MARVEL|PROMiNENT|LaKiTu|LOCAL|QwiiF|RANT)/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_GAME_WII;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isGameXBOX360DLC()
-	{
-		if (preg_match('/DLC.+xbox360|xbox360.+DLC|XBLA.+xbox360|xbox360.+XBLA/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_GAME_XBOX360DLC;
-			return true;
-		}
-		return false;
-	}
-
-	public function isGameXBOX360()
-	{
-		if (preg_match('/XBOX360/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_GAME_XBOX360;
-			return true;
-		}
-		if (preg_match('/x360/i', $this->releaseName)) {
-			if (preg_match('/Allstars|ASiA|CCCLX|COMPLEX|DAGGER|GLoBAL|iMARS|JAP|JPN|MULTi|NTSC|PAL|REPACK|RRoD|RF|SWAG|USA?/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_XBOX360;
-				return true;
-			}
-			if (preg_match('/DAMNATION|GERMAN|GOTY|iNT|iTA|JTAG|KINECT|MARVEL|MUX360|RANT|SPARE|SPANISH|VATOS|XGD/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_XBOX360;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isGameXBOXONE()
-	{
-		if (preg_match('/XBOXONE|XBOX\.ONE/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_GAME_XBOXONE;
-			return true;
-		}
-		return false;
-	}
-
-	public function isGameXBOX()
-	{
-		if (preg_match('/XBOX/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_GAME_XBOX;
-			return true;
-		}
-		return false;
-	}
-
-	public function isGameOther()
-	{
-		if (preg_match('/\b(PS(1)X|PS2|SNES|NES|SEGA\s(GENESIS|CD)|GB(A|C)|Dreamcast|SEGA\sSaturn|Atari\s(Jaguar)?|3DO)\b/i', $this->releaseName)) {
-			if (preg_match('/EUR|FR|GAME|HOL|\bISO\b|JP|JPN|NL|NTSC|PAL|KS|USA|ROMS?(et)?/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_GAME_OTHER;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	//	Music.
-	public function isMusic()
-	{
-		switch (true) {
-			//They Knew What They Wanted (1940).480p.DVDRIP.MP3-NoGroup -- prevents movies matches with MP3 audio codec in the title
-			case preg_match('/\d{3,4}(p|i)\.DVD(RIP)?\.MP3[-\.].*|WEB(-DL|-?RIP)/i', $this->releaseName):
-				return false;
-			case $this->isMusicVideo():
-			case $this->isAudiobook():
-			case $this->isMusicLossless():
-			case $this->isMusicMP3():
-			case $this->isMusicOther():
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isMusicForeign()
-	{
-		if ($this->categorizeForeign) {
-			if (preg_match('/[ \-\._](brazilian|chinese|croatian|danish|deutsch|dutch|estonian|flemish|finnish|french|german|greek|hebrew|icelandic|italian|ita|latin|mandarin|nordic|norwegian|polish|portuguese|japenese|japanese|russian|serbian|slovenian|spanish|spanisch|swedish|thai|turkish|bl|cz|de|es|fr|ger|heb|hu|hun|it(a| 19|20\d\d)|jap|ko|kor|nl|pl|se)[ \-\._]/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_MUSIC_FOREIGN;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isAudiobook()
-	{
-		if ($this->categorizeForeign) {
-			if (preg_match('/Audiobook/i', $this->releaseName)) {
-				$this->tmpCat = \Category::CAT_MUSIC_FOREIGN;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isMusicVideo()
-	{
-		if (preg_match('/(720P|x264)\-(19|20)\d\d\-[a-z0-9]{1,12}/i', $this->releaseName)) {
-			if ($this->isMusicForeign()) {
-				return true;
-			} else {
-				$this->tmpCat = \Category::CAT_MUSIC_VIDEO;
-				return true;
-			}
-		}
-		if (preg_match('/[a-z0-9]{1,12}\-(19|20)\d\d\-(720P|x264)/i', $this->releaseName)) {
-			if ($this->isMusicForeign()) {
-				return true;
-			} else {
-				$this->tmpCat = \Category::CAT_MUSIC_VIDEO;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isMusicLossless()
-	{
-		if (preg_match('/\[(19|20)\d\d\][-._ ]\[FLAC\]|(\(|\[)flac(\)|\])|FLAC\-(19|20)\d\d\-[a-z0-9]{1,12}|\.flac"|(19|20)\d\d\sFLAC|[-._ ]FLAC.+(19|20)\d\d[-._ ]| FLAC$/i', $this->releaseName)) {
-			if ($this->isMusicForeign()) {
-				return true;
-			} else {
-				$this->tmpCat = \Category::CAT_MUSIC_LOSSLESS;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isMusicMP3()
-	{
-		if (preg_match('/[a-z0-9]{1,12}\-(19|20)\d\d\-[a-z0-9]{1,12}|[\.\-\(\[_ ]\d{2,3}k[\.\-\)\]_ ]|\((192|256|320)\)|(320|cd|eac|vbr).+mp3|(cd|eac|mp3|vbr).+320|FIH\_INT|\s\dCDs|[-._ ]MP3[-._ ]|MP3\-\d{3}kbps|\.(m3u|mp3)"|NMR\s\d{2,3}\skbps|\(320\)\.|\-\((Bootleg|Promo)\)|\.mp3$|\-\sMP3\s(19|20)\d\d|\(vbr\)|rip(192|256|320)|[-._ ](CDR|SBD|WEB).+(19|20)\d\d/i', $this->releaseName)) {
-			if ($this->isMusicForeign()) {
-				return true;
-			} else {
-				$this->tmpCat = \Category::CAT_MUSIC_MP3;
-				return true;
-			}
-		}
-		if (preg_match('/\s(19|20)\d\d\s([a-z0-9]{3}|[a-z]{2,})$|\-(19|20)\d\d\-(C4|MTD)(\s|\.)|[-._ ]FM.+MP3[-._ ]|-web-(19|20)\d\d(\.|\s|$)|[-._ ](SAT|SBD|WEB).+(19|20)\d\d([-._ ]|$)|[-._ ](19|20)\d\d.+(SAT|WEB)([-._ ]|$)| MP3$/i', $this->releaseName)) {
-			if ($this->isMusicForeign()) {
-				return true;
-			} else {
-				$this->tmpCat = \Category::CAT_MUSIC_MP3;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public function isMusicOther()
-	{
-		if (preg_match('/(19|20)\d\d\-(C4)$|[-._ ]\d?CD[-._ ](19|20)\d\d|\(\d\-?CD\)|\-\dcd\-|\d[-._ ]Albums|Albums.+(EP)|Bonus.+Tracks|Box.+?CD.+SET|Discography|D\.O\.M|Greatest\sSongs|Live.+(Bootleg|Remastered)|Music.+Vol|(\(|\[|\s)NMR(\)|\]|\s)|Promo.+CD|Reggaeton|Tiesto.+Club|Vinyl\s2496|\WV\.A\.|^\(VA\s|^VA[-._ ]/i', $this->releaseName)) {
-			switch (true) {
-				case $this->isMusicForeign():
-					break;
-				default:
-					$this->tmpCat = \Category::CAT_MUSIC_OTHER;
-					break;
-			}
-			return true;
-		} else if (preg_match('/\(pure_fm\)|-+\(?(2lp|cd[ms]([-_ .][a-z]{2})?|cover|ep|ltd_ed|mix|original|ost|.*?(edit(ion)?|remix(es)?|vinyl)|web)\)?-+((19|20)\d\d|you$)/i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_MUSIC_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	//	Books.
-	public function isBook()
-	{
-		switch (true) {
-			case preg_match('/AVI[-._ ]PDF|\.exe|Full[-._ ]Video/i', $this->releaseName):
-				return false;
-			case $this->isComic():
-			case $this->isTechnicalBook():
-			case $this->isMagazine():
-			case $this->isBookOther():
-			case $this->isEBook():
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isBookForeign()
-	{
-		switch (true) {
-			case $this->categorizeForeign === false:
-				return false;
-			case preg_match('/[ \-\._](brazilian|chinese|croatian|danish|deutsch|dutch|estonian|flemish|finnish|french|german|greek|hebrew|icelandic|italian|ita|latin|mandarin|nordic|norwegian|polish|portuguese|japenese|japanese|russian|serbian|slovenian|spanish|spanisch|swedish|thai|turkish)[-._ ]/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_BOOK_FOREIGN;
-				return true;
-			default:
-				return false;
-		}
-	}
-
-	public function isComic()
-	{
-		switch (true) {
-			case !preg_match('/[\. ](cbr|cbz)|[\( ]c2c|cbr|cbz[\) ]|comix|^\(comic|[\.\-_\(\[ ]comics?[-._ ]|comic.+book|covers.+digital|DC.+(Adventures|Universe)|digital.+(son|zone)|Graphic.+Novel|[\.\-_h ]manga|Total[-._ ]Marvel/i', $this->releaseName):
-				return false;
-			case $this->isBookForeign():
-				break;
-			default:
-				$this->tmpCat = \Category::CAT_BOOK_COMICS;
-				break;
-		}
-		return true;
-	}
-
-	public function isTechnicalBook()
-	{
-		switch (true) {
-			case !preg_match('/^\(?(atz|bb|css|c ?t|Drawing|Gabler|IOS|Iphone|Lynda|Manning|Medic(al|ine)|MIT|No[-._ ]Starch|Packt|Peachpit|Pragmatic|Revista|Servo|SmartBooks|Spektrum|Strata|Sybex|Syngress|Vieweg|Wiley|Woods|Wrox)[-._ ]|[-._ ](Ajax|CSS|DIY|Javascript|(My|Postgre)?SQL|XNA)[-._ ]|3DS\.\-_ ]Max|Academic|Adobe|Algebra|Analysis|Appleworks|Archaeology|Bitdefender|Birkhauser|Britannica|[-._ ]C\+\+|C[-._ ](\+\+|Sharp|Plus)|Chemistry|Circuits|Cook(book|ing)|(Beginners?|Complete|Communications|Definitive|Essential|Hackers?|Practical|Professionals?)[-._ ]Guide|Developer|Diagnostic|Disassembl(er|ing|y)|Debugg(er|ing)|Dreamweaver|Economics|Education|Electronics|Enc(i|y)clopedia|Engineer(ing|s)|Essays|Exercizes|For.+Beginners|Focal[-._ ]Press|For[-._ ]Dummies|FreeBSD|Fundamentals[-._ ]of[-._ ]|(Galileo|Island)[-._ ]Press|Geography|Grammar|Guide[-._ ](For|To)|Hacking|Google|Handboo?k|How[-._ ](It|To)|Intoduction[-._ ]to|Iphone|jQuery|Lessons[-._ ]In|Learning|LibreOffice|Linux|Manual|Marketing|Masonry|Mathematic(al|s)?|Medical|Microsoft|National[-._ ]Academies|Nero[-._ ]\d+|OReilly|OS[-._ ]X[-._ ]|Official[-._ ]Guide|Open(GL|Office)|Pediatric|Periodic.+Table|Photoshop|Physics|Power(PC|Point|Shell)|Programm(ers?|ier||ing)|Raspberry.+Pi|Remedies|Service\s?Manual|SitePoint|Sketching|Statistics|Stock.+Market|Students|Theory|Training|Tutsplus|Ubuntu|Understanding[-._ ](and|Of|The)|Visual[-._ ]Studio|Textbook|VMWare|wii?max|Windows[-._ ](8|7|Vista|XP)|^Wood[-._ ]|Woodwork|WordPress|Work(book|shop)|Youtube/i', $this->releaseName):
-				return false;
-			case $this->isBookForeign():
-				break;
-			default:
-				$this->tmpCat = \Category::CAT_BOOK_TECHNICAL;
-				break;
-		}
-		return true;
-	}
-
-	public function isMagazine()
-	{
-		switch (true) {
-			case !preg_match('/[a-z\-\._ ][-._ ](January|February|March|April|May|June|July|August|September|October|November|December)[-._ ](\d{1,2},)?20\d\d[-._ ]|^\(.+[ .]\d{1,2}[ .]20\d\d[ .].+\.scr|[-._ ](Catalogue|FHM|NUTS|Pictorial|Tatler|XXX)[-._ ]|^\(?(Allehanda|Club|Computer([a-z0-9]+)?|Connect \d+|Corriere|ct|Diario|Digit(al)?|Esquire|FHM|Gadgets|Galileo|Glam|GQ|Infosat|Inked|Instyle|io|Kicker|Liberation|New Scientist|NGV|Nuts|Popular|Professional|Reise|Sette(tv)?|Springer|Stuff|Studentlitteratur|Vegetarian|Vegetable|Videomarkt|Wired)[-._ ]|Brady(.+)?Games|Catalog|Columbus.+Dispatch|Correspondenten|Corriere[-._ ]Della[-._ ]Sera|Cosmopolitan|Dagbladet|Digital[-._ ]Guide|Economist|Eload ?24|ExtraTime|Fatto[-._ ]Quotidiano|Flight[-._ ](International|Journal)|Finanzwoche|France.+Football|Foto.+Video|Games?(Master|Markt|tar|TM)|Gardening|Gazzetta|Globe[-._ ]And[-._ ]Mail|Guitar|Heimkino|Hustler|La.+(Lettura|Rblica|Stampa)|Le[-._ ](Monde|Temps)|Les[-._ ]Echos|e?Magazin(es?)?|Mac(life|welt)|Marie.+Claire|Maxim|Men.+(Health|Fitness)|Motocross|Motorcycle|Mountain[-._ ]Bike|MusikWoche|National[-._ ]Geographic|New[-._ ]Yorker|PC([-._ ](Gamer|Welt|World)|Games|Go|Tip)|Penthouse|Photograph(er|ic)|Playboy|Posten|Quotidiano|(Golf|Readers?).+Digest|SFX[-._ ]UK|Recipe(.+Guide|s)|SkyNews|Sport[-._ ]?Week|Strategy.+Guide|TabletPC|Tattoo[-._ ]Life|The[-._ ]Guardian|Tageszeitung|Tid(bits|ning)|Top[-._ ]Gear[-._ ]|Total[-._ ]Guitar|Travel[-._ ]Guides?|Tribune[-._ ]De[-._ ]|US[-._ ]Weekly|USA[-._ ]Today|TruePDF|Vogue|Verlag|Warcraft|Web.+Designer|What[-._ ]Car|Zeitung/i', $this->releaseName):
-				return false;
-			case $this->isBookForeign():
-				break;
-			default:
-				$this->tmpCat = \Category::CAT_BOOK_MAGS;
-				break;
-		}
-		return true;
-	}
-
-	public function isBookOther()
-	{
-		if (preg_match('/"\d\d-\d\d-20\d\d\./i', $this->releaseName)) {
-			$this->tmpCat = \Category::CAT_BOOK_OTHER;
-			return true;
-		}
-		return false;
-	}
-
-	public function isEBook()
-	{
-		switch (true) {
-			case !preg_match('/^ePub|[-._ ](Ebook|E?\-book|\) WW|Publishing)|[\.\-_\(\[ ](azw|epub|html|mobi|pdf|rtf|tif|txt)[\.\-_\)\] ]|[\. ](azw|doc|epub|mobi|pdf)(?![\w .])|\.ebook-\w$/i', $this->releaseName):
-				return false;
-			case $this->isBookForeign():
-				break;
-			default:
-				$this->tmpCat = \Category::CAT_BOOK_EBOOK;
-				break;
-		}
-		return true;
-	}
-
-	//	Misc, all hash/misc go in other misc.
-	public function isMisc()
-	{
-		switch (true) {
-			case preg_match('/[^a-z0-9]((480|720|1080)[ip]|s\d{1,3}[-._ ]?[ed]\d{1,3}([ex]\d{1,3}|[-.\w ]))[^a-z0-9]/i', $this->releaseName):
-				return false;
-			case preg_match('/[a-f0-9]{32,64}/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_MISC_HASHED;
-				break;
-			case preg_match('/[a-z0-9]{20,}/i', $this->releaseName):
-			case preg_match('/^[A-Z0-9]{1,}$/i', $this->releaseName):
-				$this->tmpCat = \Category::CAT_MISC_OTHER;
-				break;
-			default:
-				return false;
-		}
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/ColorCLI.php b/lib/copy_this/www/lib/ColorCLI.php
deleted file mode 100644
index 8dd88985e..000000000
--- a/lib/copy_this/www/lib/ColorCLI.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-// Original taken from https://gist.github.com/donatj/1315354 by Jesse Donat.
-// Modified by ThePeePs.
-
-class ColorCLI
-{
-	static $foreground_colors = array(
-		'Black' => '30',
-		'Blue' => '34',
-		'Green' => '32',
-		'Cyan' => '36',
-		'Red' => '31',
-		'Purple' => '35',
-		'Yellow' => '33',
-		'Gray' => '37',
-	);
-	// Feel free to add any other colors that you like here.
-	static $colors256 = array(
-		'Gray' => '008', 'Red' => '009',
-		'Green' => '010', 'Yellow' => '011',
-		'Blue' => '012', 'Purple' => '013',
-		'Cyan' => '014', 'White' => '015',
-		'Grey1' => '016', 'NavyBlue' => '017',
-		'DarkBlue' => '018', 'Blue2' => '019',
-		'Blue3' => '020', 'Blue1' => '021',
-		'DarkGreen' => '022', 'DeepSkyBlue5' => '023',
-		'DeepSkyBlue6' => '024', 'DeepSkyBlue7' => '025',
-		'DodgerBlue2' => '026', 'DodgerBlue1' => '027',
-		'Green4' => '028', 'SpringGreen5' => '029',
-		'Turquoise1' => '030', 'DeepSkyBlue2' => '031',
-		'DeepSkyBlue3' => '032', 'DodgerBlue' => '033',
-		'Green2' => '034', 'SpringGreen3' => '035',
-		'DarkCyan' => '036', 'LightSeaGreen' => '037',
-		'DeepSkyBlue1' => '038', 'DeepSkyBlue' => '039',
-		'Green3' => '040', 'SpringGreen4' => '041',
-		'SpringGreen1' => '042', 'Cyan3' => '043',
-		'DarkTurquoise' => '044', 'Turquoise' => '045',
-		'Green1' => '046', 'SpringGreen2' => '047',
-		'SpringGreen' => '048', 'MediumSpringGreen' => '049',
-		'Cyan2' => '050', 'Cyan1' => '051',
-		'DarkRed' => '052', 'DeepPink5' => '053',
-		'Purple4' => '054', 'Purple5' => '055',
-		'Purple3' => '056', 'BlueViolet' => '057',
-		'Orange2' => '058', 'Grey2' => '059',
-		'MediumPurple6' => '060', 'SlateBlue1' => '061',
-		'SlateBlue2' => '062', 'RoyalBlue1' => '063',
-		'Chartreuse5' => '064', 'DarkSeaGreen7' => '065',
-		'PaleTurquoise1' => '066', 'SteelBlue' => '067',
-		'SteelBlue3' => '068', 'CornflowerBlue' => '069',
-		'Chartreuse3' => '070', 'DarkSeaGreen8' => '071',
-		'CadetBlue' => '072', 'CadetBlue1' => '073',
-		'SkyBlue2' => '074', 'SteelBlue1' => '075',
-		'Chartreuse4' => '076', 'PaleGreen2' => '077',
-		'SeaGreen3' => '078', 'Aquamarine2' => '079',
-		'MediumTurquoise' => '080', 'SteelBlue2' => '081',
-		'Chartreuse1' => '082', 'SeaGreen2' => '083',
-		'SeaGreen' => '084', 'SeaGreen1' => '085',
-		'Aquamarine' => '086', 'DarkSlateGray1' => '087',
-		'DarkRed1' => '088', 'DeepPink6' => '089',
-		'DarkMagenta' => '090', 'DarkMagenta1' => '091',
-		'DarkViolet' => '092', 'Purple1' => '093',
-		'Orange3' => '094', 'LightPink2' => '095',
-		'Plum3' => '096', 'MediumPurple4' => '097',
-		'MediumPurple5' => '098', 'SlateBlue' => '099',
-		'Yellow5' => '100', 'Wheat1' => '101',
-		'Grey3' => '102', 'LightSlateGrey' => '103',
-		'MediumPurple' => '104', 'LightSlateBlue' => '105',
-		'Yellow6' => '106', 'DarkOliveGreen3' => '107',
-		'DarkSeaGreen' => '108', 'LightSkyBlue1' => '109',
-		'LightSkyBlue2' => '110', 'SkyBlue1' => '111',
-		'Chartreuse2' => '112', 'DarkOliveGreen4' => '113',
-		'PaleGreen3' => '114', 'DarkSeaGreen5' => '115',
-		'DarkSlateGray2' => '116', 'SkyBlue' => '117',
-		'Chartreuse' => '118', 'LightGreen' => '119',
-		'LightGreen1' => '120', 'PaleGreen' => '121',
-		'Aquamarine1' => '122', 'DarkSlateGray' => '123',
-		'Red2' => '124', 'DeepPink7' => '125',
-		'MediumVioletRed' => '126', 'Magenta4' => '127',
-		'DarkViolet1' => '128', 'Purple2' => '129',
-		'DarkOrange1' => '130', 'IndianRed' => '131',
-		'HotPink3' => '132', 'MediumOrchid3' => '133',
-		'MediumOrchid' => '134', 'MediumPurple2' => '135',
-		'DarkGoldenrod' => '136', 'LightSalmon1' => '137',
-		'RosyBrown' => '138', 'Grey4' => '139',
-		'MediumPurple3' => '140', 'MediumPurple1' => '141',
-		'Gold1' => '142', 'DarkKhaki' => '143',
-		'NavajoWhite1' => '144', 'Grey5' => '145',
-		'LightSteelBlue2' => '146', 'LightSteelBlue' => '147',
-		'Yellow3' => '148', 'DarkOliveGreen5' => '149',
-		'DarkSeaGreen6' => '150', 'DarkSeaGreen3' => '151',
-		'LightCyan2' => '152', 'LightSkyBlue' => '153',
-		'GreenYellow' => '154', 'DarkOliveGreen2' => '155',
-		'PaleGreen1' => '156', 'DarkSeaGreen4' => '157',
-		'DarkSeaGreen1' => '158', 'PaleTurquoise' => '159',
-		'Red3' => '160', 'DeepPink3' => '161',
-		'DeepPink4' => '162', 'Magenta5' => '163',
-		'Magenta6' => '164', 'Magenta2' => '165',
-		'DarkOrange2' => '166', 'IndianRed1' => '167',
-		'HotPink4' => '168', 'HotPink2' => '169',
-		'Orchid' => '170', 'MediumOrchid1' => '171',
-		'Orange1' => '172', 'LightSalmon2' => '173',
-		'LightPink1' => '174', 'Pink1' => '175',
-		'Plum2' => '176', 'Violet' => '177',
-		'Gold2' => '178', 'LightGoldenrod4' => '179',
-		'Tan' => '180', 'MistyRose1' => '181',
-		'Thistle1' => '182', 'Plum1' => '183',
-		'Yellow4' => '184', 'Khaki1' => '185',
-		'LightGoldenrod1' => '186', 'LightYellow' => '187',
-		'Grey6' => '188', 'LightSteelBlue1' => '189',
-		'Yellow2' => '190', 'DarkOliveGreen' => '191',
-		'DarkOliveGreen1' => '192', 'DarkSeaGreen2' => '193',
-		'Honeydew' => '194', 'LightCyan1' => '195',
-		'Red1' => '196', 'DeepPink2' => '197',
-		'DeepPink' => '198', 'DeepPink1' => '199',
-		'Magenta3' => '200', 'Magenta1' => '201',
-		'OrangeRed' => '202', 'IndianRed2' => '203',
-		'IndianRed3' => '204', 'HotPink' => '205',
-		'HotPink1' => '206', 'MediumOrchid2' => '207',
-		'DarkOrange' => '208', 'Salmon' => '209',
-		'LightCoral' => '210', 'PaleVioletRed' => '211',
-		'Orchid2' => '212', 'Orchid1' => '213',
-		'Orange' => '214', 'SandyBrown' => '215',
-		'LightSalmon' => '216', 'LightPink' => '217',
-		'Pink' => '218', 'Plum' => '219',
-		'Gold' => '220', 'LightGoldenrod2' => '221',
-		'LightGoldenrod3' => '222', 'NavajoWhite' => '223',
-		'MistyRose' => '224', 'Thistle' => '225',
-		'Yellow1' => '226', 'LightGoldenrod' => '227',
-		'Khaki' => '228', 'Wheat' => '229',
-		'Cornsilk' => '230', 'Grey7' => '231',
-		'Grey8' => '232', 'Grey9' => '233',
-		'Grey10' => '234', 'Grey11' => '235',
-		'Grey12' => '236', 'Grey13' => '237',
-		'Grey14' => '238', 'Grey15' => '239',
-		'Grey16' => '240', 'Grey17' => '241',
-		'Grey18' => '242', 'Grey19' => '243',
-		'Grey20' => '244', 'Grey21' => '245',
-		'Grey22' => '246', 'Grey23' => '247',
-		'Grey24' => '248', 'Grey25' => '249',
-		'Grey26' => '250', 'Grey27' => '251',
-		'Grey28' => '252', 'Grey29' => '253',
-		'Grey30' => '254', 'Grey31' => '255',
-	);
-	static $background_colors = array(
-		'Black' => '40', 'Red' => '41',
-		'Green' => '42', 'Yellow' => '43',
-		'Blue' => '44', 'Purple' => '45',
-		'Cyan' => '46', 'White' => '47',
-	);
-	static $options = array(
-		'Norm' => '0', 'Bold' => '1',
-		'Dim' => '2', 'Uline' => '4',
-		'Blink' => '5', 'Rev' => '7',
-		'Hidden' => '8', 'Crossout' => '9',
-	);
-
-	public static function bell($count = 1)
-	{
-		echo str_repeat("\007", $count);
-	}
-
-	public static function setColor($fg, $opt = "None", $bg = "None")
-	{
-		$colored_string = "\033[" . self::$foreground_colors[$fg];
-		if (isset(self::$options[$opt])) {
-			$colored_string .= ";" . self::$options[$opt];
-		}
-		if (isset(self::$background_colors[$bg])) {
-			$colored_string .= ";" . self::$background_colors[$bg];
-		}
-		$colored_string .= "m";
-		return $colored_string;
-	}
-
-	public static function set256($fg, $opt = "None", $bg = "None")
-	{
-		$colored_string = "\033[38;5;" . self::$colors256[$fg];
-		if (isset(self::$options[$opt]) && $opt != 'Norm') {
-			$colored_string .= ";" . self::$options[$opt];
-		}
-		if (isset(self::$background_colors[$bg])) {
-			$colored_string .= ";48;5;" . self::$colors256[$bg];
-		}
-		$colored_string .= "m";
-		return $colored_string;
-	}
-
-	public static function debug($str)
-	{
-		$debugstring = "\033[" . self::$foreground_colors['Gray'] . "mDebug: $str\033[0m\n";
-		return $debugstring;
-	}
-
-	public static function info($str)
-	{
-		$infostring = "\033[" . self::$foreground_colors['Purple'] . "mInfo: $str\033[0m\n";
-		return $infostring;
-	}
-
-	public static function notice($str)
-	{
-		$noticstring = "\033[38;5;" . self::$colors256['Blue'] . "mNotice: $str\033[0m\n";
-		return $noticstring;
-	}
-
-	public static function warning($str)
-	{
-		$warnstring = "\033[" . self::$foreground_colors['Yellow'] . "mWarning: $str\033[0m\n";
-		return $warnstring;
-	}
-
-	public static function error($str)
-	{
-		$errorstring = "\033[" . self::$foreground_colors['Red'] . "mError: $str\033[0m\n";
-		return $errorstring;
-	}
-
-	public static function primary($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['Green'] . "m$str\033[0m\n";
-		return $str;
-	}
-
-	public static function header($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['Yellow'] . "m$str\033[0m\n";
-		return $str;
-	}
-
-	public static function alternate($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['DeepPink1'] . "m$str\033[0m\n";
-		return $str;
-	}
-
-	public static function tmuxOrange($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['Orange'] . "m$str\033[0m\n";
-		return $str;
-	}
-
-	public static function primaryOver($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['Green'] . "m$str\033[0m";
-		return $str;
-	}
-
-	public static function headerOver($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['Yellow'] . "m$str\033[0m";
-		return $str;
-	}
-
-	public static function alternateOver($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['DeepPink1'] . "m$str\033[0m";
-		return $str;
-	}
-
-	public static function warningOver($str)
-	{
-		$str = "\033[38;5;" . self::$colors256['Red'] . "m";
-		return $str;
-	}
-
-	public static function rsetColor()
-	{
-		return "\033[0m";
-	}
-
-	/**
-	 * Echo message to CLI.
-	 *
-	 * @param string $message The message.
-	 * @param bool $nl Add a new line?
-	 * @void
-	 */
-	public static function doEcho($message, $nl = false)
-	{
-		echo $message . ($nl ? PHP_EOL : '');
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/ConsoleTools.php b/lib/copy_this/www/lib/ConsoleTools.php
deleted file mode 100644
index 859120767..000000000
--- a/lib/copy_this/www/lib/ConsoleTools.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-require_once("ColorCLI.php");
-
-/**
- * Class ConsoleTools
- */
-class ConsoleTools
-{
-
-	/**
-	 * @var ColorCLI
-	 */
-	public $cli;
-
-	/**
-	 * @var int
-	 */
-	public $lastMessageLength;
-
-	/**
-	 * Construct.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'ColorCLI' => null
-		];
-		$options += $defaults;
-
-		$this->cli = ($options['ColorCLI'] instanceof ColorCLI ? $options['ColorCLI'] : new ColorCLI());
-
-		$this->lastMessageLength = 0;
-	}
-
-	/**
-	 * @param string $message
-	 * @param bool   $reset
-	 */
-	public function overWriteHeader($message, $reset = False)
-	{
-		if ($reset)
-			$this->lastMessageLength = 0;
-
-		echo str_repeat(chr(8), $this->lastMessageLength);
-		echo str_repeat(" ", $this->lastMessageLength);
-		echo str_repeat(chr(8), $this->lastMessageLength);
-
-		$this->lastMessageLength = strlen($message);
-		echo $this->cli->headerOver($message);
-	}
-
-	/**
-	 * @param string $message
-	 * @param bool   $reset
-	 */
-	public function overWritePrimary($message, $reset = False)
-	{
-		if ($reset) {
-			$this->lastMessageLength = 0;
-		}
-
-		echo str_repeat(chr(8), $this->lastMessageLength);
-		echo str_repeat(" ", $this->lastMessageLength);
-		echo str_repeat(chr(8), $this->lastMessageLength);
-
-		$this->lastMessageLength = strlen($message);
-		echo $this->cli->primaryOver($message);
-	}
-
-	/**
-	 * @param string $message
-	 * @param bool   $reset
-	 */
-	public function overWrite($message, $reset = False)
-	{
-		if ($reset) {
-			$this->lastMessageLength = 0;
-		}
-
-		echo str_repeat(chr(8), $this->lastMessageLength);
-		echo str_repeat(" ", $this->lastMessageLength);
-		echo str_repeat(chr(8), $this->lastMessageLength);
-
-		$this->lastMessageLength = strlen($message);
-		echo $message;
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function appendWrite($message)
-	{
-		echo $message;
-		$this->lastMessageLength = $this->lastMessageLength + strlen($message);
-	}
-
-	/**
-	 * @param int $cur
-	 * @param int $total
-	 *
-	 * @return string
-	 */
-	public function percentString($cur, $total)
-	{
-		$percent = 100 * $cur / $total;
-		$formatString = "% " . strlen($total) . "d/%d (% 2d%%)";
-		return sprintf($formatString, $cur, $total, $percent);
-	}
-
-	/**
-	 * @param int $first
-	 * @param int $last
-	 * @param int $total
-	 *
-	 * @return string
-	 */
-	public function percentString2($first, $last, $total)
-	{
-		$percent1 = 100 * ($first - 1) / $total;
-		$percent2 = 100 * $last / $total;
-		$formatString = "% " . strlen($total) . "d-% " . strlen($total) . "d/%d (% 2d%%-% 3d%%)";
-		return sprintf($formatString, $first, $last, $total, $percent1, $percent2);
-	}
-
-	/**
-	 * Convert seconds to minutes or hours, appending type at the end.
-	 *
-	 * @param int $seconds
-	 *
-	 * @return string
-	 */
-	public function convertTime($seconds)
-	{
-
-		if ($seconds > 3600) {
-			return round($seconds / 3600) . " hour(s)";
-		} else if ($seconds > 60) {
-			return round($seconds / 60) . " minute(s)";
-		} else {
-			return $seconds . " second(s)";
-		}
-	}
-
-	/**
-	 * Convert seconds to a timer, 00h:00m:00s
-	 *
-	 * @param int $seconds
-	 *
-	 * @return string
-	 */
-	public function convertTimer($seconds)
-	{
-		return " " . sprintf("%02dh:%02dm:%02ds", floor($seconds / 3600), floor(($seconds / 60) % 60), $seconds % 60);
-	}
-
-	/**
-	 * Sleep for x seconds, printing timer on screen.
-	 *
-	 * @param int $seconds
-	 */
-	public function showSleep($seconds)
-	{
-		for ($i = $seconds; $i >= 0; $i--) {
-			$this->overWriteHeader("Sleeping for " . $i . " seconds.");
-			sleep(1);
-		}
-		echo PHP_EOL;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Desura.php b/lib/copy_this/www/lib/Desura.php
deleted file mode 100644
index 69a5ef8fe..000000000
--- a/lib/copy_this/www/lib/Desura.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-require_once(WWW_DIR."/lib/util.php");
-
-class Desura
-{
-
-	/**
-	 * @var
-	 */
-	public $cookie;
-
-	/**
-	 * @var
-	 */
-	public $searchTerm;
-
-	const DESURAURL = "http://www.desura.com";
-
-	/**
-	 * @var
-	 */
-	protected $_ch;
-
-	/**
-	 * @var string
-	 */
-	protected $_directURL = '';
-
-	/**
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * @var array
-	 */
-	protected $_postParams = array();
-
-	/**
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * @var
-	 */
-	protected $_response;
-
-	/**
-	 * @var
-	 */
-	protected $_ret;
-
-	/**
-	 * @var
-	 */
-	protected $_desuraGameID;
-
-	/**
-	 * @var string
-	 */
-	protected $_title = '';
-
-
-	public function __construct()
-	{
-		$this->_html = new simple_html_dom();
-		if (isset($this->cookie)) {
-			$this->getUrl(self::DESURAURL);
-		}
-	}
-
-	/**
-	 * Remove object/resources from memory
-	 *
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->_response);
-	}
-
-	/**
-	 * Game Description
-	 *
-	 * @return array
-	 */
-	public function gameDescription()
-	{
-			if ($this->_ret = $this->_html->find("div.headernormalbox, div.inner, div.body", 4)) {
-				$this->_res['description'] = trim($this->_ret->plaintext);
-			}
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the Rating
-	 *
-	 * @return array
-	 */
-	public function rating()
-	{
-		if (isset($this->_response) && isset($this->_title)) {
-			if ($this->_ret = $this->_html->find("div.score", 0)) {
-				$this->_res['rating'] = $this->_ret->plaintext;
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the (cover image)
-	 *
-	 * @return array
-	 */
-	public function images()
-	{
-			if ($this->_ret = $this->_html->find("img[alt=Boxshot]", 0)) {
-				$this->_ret->src = preg_replace('#cache/#', '', $this->_ret->src);
-				$this->_ret->src = preg_replace('#thumb_150x150/#','',$this->_ret->src);
-				$this->_res['cover'] = $this->_ret->src;
-			}
-
-			// backcover will be with trailers where it will get loaded last
-		return $this->_res;
-	}
-
-	/**
-	 * Get Details of the game (Genre, Platform(s), Developer, Publisher)
-	 *
-	 * @return array
-	 */
-	public function details()
-	{
-		if ($this->_ret = $this->_html->find("div.info", 0)) {
-			foreach ($this->_ret->find("div.row") as $row) {
-				if ($this->_ret = $row->find("h5", 0)) {
-					switch (trim($this->_ret->plaintext)) {
-						case "Genre" :
-						case "Platform" :
-						case "Platforms" :
-						case "Developer" :
-						case "Publisher" :
-							$this->_res['gamedetails'][$this->_ret->plaintext] = trim($this->_ret->next_sibling()->plaintext);
-							break;
-					}
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the Video and backdrop image for the game
-	 *
-	 * @return array
-	 */
-	public function trailer()
-	{
-		if ($this->getUrl(self::DESURAURL . '/games/' . $this->searchTerm . '/videos') !== false) {
-			if (preg_match('#"file": "(?<trailerurl>.*)",#i', $this->_response, $matches)) {
-				$this->_res['trailer'] = trim($matches['trailerurl']);
-			}
-		}
-
-		if ($this->getUrl(self::DESURAURL . '/games/' . $this->searchTerm . '/images') !== false) {
-			if ($this->_ret = $this->_html->find("div.holder", 0)) {
-				if ($this->_ret = $this->_ret->find("img", 0)) {
-					$this->_res['backdrop'] = trim($this->_ret->src);
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Goes directly to site if site doesn't return error, search is found.
-	 *
-	 * @return bool
-	 */
-	public function search()
-	{
-		$result = false;
-		if (!empty($this->searchTerm)) {
-			$this->_title = $this->searchTerm;
-			// Remove periods, underscored, anything between parenthesis.
-			$this->searchTerm = preg_replace('#\(.*?\)|[-._]#i', ' ', $this->searchTerm);
-			// Remove multiple spaces and trim leading spaces.
-			$this->searchTerm = trim(preg_replace('#\s{2,}#', ' ', $this->searchTerm));
-			// Replace whitespace with a - for desura game urls
-			$this->searchTerm = preg_replace('#\s#', '-', strtolower($this->searchTerm));
-			if ($this->getUrl(self::DESURAURL . '/games/' . $this->searchTerm) !== false) {
-				if (!preg_match('#(Games system error)#i', $this->_response)) {
-					if($this->_ret = $this->_html->find("a#watchtoggle", 0)){
-						if(preg_match('#siteareaid=(?<gameid>\d+)#', $this->_ret->href, $matches)){
-							$this->_desuraGameID = $matches['gameid'];
-							$this->_directURL = self::DESURAURL . '/games/' . $this->searchTerm;
-							$result = true;
-						}
-					}
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Gets all Information for the game.
-	 *
-	 * @return array
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directURL)) {
-			$results['desuragameid'] = $this->_desuraGameID;
-			$results['directurl'] = $this->_directURL;
-			$results['title'] = $this->_title;
-		}
-		if (is_array($this->gameDescription())) {
-			$results = array_merge($results, $this->gameDescription());
-		}
-		if (is_array($this->details())) {
-			$results = array_merge($results, $this->details());
-		}
-		if (is_array($this->rating())) {
-			$results = array_merge($results, $this->rating());
-		}
-		if (is_array($this->images())) {
-			$results = array_merge($results, $this->images());
-		}
-		if (is_array($this->trailer())) {
-			$results = array_merge($results, $this->trailer());
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Gets Raw Html
-	 *
-	 * @param string $fetchURL
-	 * @param bool $usePost
-	 *
-	 * @return bool
-	 */
-	private function getUrl($fetchURL, $usePost = false)
-	{
-		if (isset($fetchURL)) {
-			$this->_ch = curl_init($fetchURL);
-		}
-		if ($usePost === true) {
-			curl_setopt($this->_ch, CURLOPT_POST, 1);
-			curl_setopt($this->_ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-			curl_setopt($this->_ch, CURLOPT_RETURNTRANSFER, 1);
-			curl_setopt($this->_ch, CURLOPT_HEADER, 0);
-			curl_setopt($this->_ch, CURLOPT_VERBOSE, 0);
-			curl_setopt($this->_ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-			curl_setopt($this->_ch, CURLOPT_FAILONERROR, 0);
-		if (isset($this->cookie)) {
-			curl_setopt($this->_ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($this->_ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		curl_setopt_array($this->_ch, Utility::curlSslContextOptions());
-		$this->_response = curl_exec($this->_ch);
-		if (!$this->_response) {
-			curl_close($this->_ch);
-
-			return false;
-		}
-		curl_close($this->_ch);
-		$this->_html->load($this->_response);
-
-		return true;
-	}
-}
diff --git a/lib/copy_this/www/lib/Games.php b/lib/copy_this/www/lib/Games.php
deleted file mode 100644
index 789783fbb..000000000
--- a/lib/copy_this/www/lib/Games.php
+++ /dev/null
@@ -1,1006 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR . "lib/GiantBombAPI.php");
-require_once(WWW_DIR . "lib/Tmux.php");
-require_once(WWW_DIR . "lib/GiantBombAPI.php");
-require_once(WWW_DIR . "lib/category.php");
-require_once(WWW_DIR . "lib/genres.php");
-require_once(WWW_DIR . "lib/releaseimage.php");
-require_once(WWW_DIR . "lib/Steam.php");
-require_once(WWW_DIR . "lib/Greenlight.php");
-require_once(WWW_DIR . "lib/Desura.php");
-require_once(WWW_DIR . "lib/Logger.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-
-class Games
-{
-	const REQID_FOUND 		= 1; // Request id found and release was updated.
-	const REQID_NO_LOCAL	= -1; // Request id was not found via local lookup.
-	const REQID_NONE		= -3; // The Request id was not found locally or via web lookup.
-	const REQID_UNPROCESSED	= 0; // Release has not been processed.
-	const REQID_ZERO		= -2; // The Request id was 0.
-
-	/**
-	 * @var string
-	 */
-	public $cookie;
-
-	/**
-	 * @var bool
-	 */
-	public $echoOutput;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $gameQty;
-
-	/**
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var int
-	 */
-	public $matchPercentage;
-
-	/**
-	 * @var bool
-	 */
-	public $maxHitRequest;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $publicKey;
-
-	/**
-	 * @var string
-	 */
-	public $renamed;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $sleepTime;
-
-	/**
-	 * @var string
-	 */
-	protected $_classUsed;
-
-	/**
-	 * @var string
-	 */
-	protected $_gameID;
-
-	/**
-	 * @var array
-	 */
-	protected $_gameResults;
-
-	/**
-	 * @var object
-	 */
-	protected $_getGame;
-
-	/**
-	 * @var int
-	 */
-	protected $_resultsFound = 0;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'ColorCLI' => null,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->echoOutput = ($options['Echo'] && NN_ECHOCLI);
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-
-		$this->publicKey = $this->site->giantbombkey;
-		$this->gameQty = ($this->site->maxgamesprocessed != '') ? $this->site->maxgamesprocessed : 150;
-		$this->sleepTime = ($this->site->amazonsleep != '') ? $this->site->amazonsleep : 1000;
-		$this->imgSavePath = NN_COVERS . 'games' . DS;
-		$this->renamed = '';
-		$this->matchPercentage = 60;
-		$this->maxHitRequest = false;
-		$this->cookie = NN_TMP . 'xxx.cookie';
-		if ($this->site->lookupgames == 2) {
-			$this->renamed = 'AND isrenamed = 1';
-		}
-		//$this->cleangames = ($this->site->('lookupgames') == 2) ? 'AND isrenamed = 1' : '';
-	}
-
-	public function getGamesInfo($id)
-	{
-		return $this->pdo->queryOneRow(
-			sprintf("
-				SELECT gamesinfo.*, genres.title AS genres
-				FROM gamesinfo
-				LEFT OUTER JOIN genres ON genres.id = gamesinfo.genre_id
-				WHERE gamesinfo.id = %d",
-				$id
-			)
-		);
-	}
-
-	public function getGamesInfoByName($title)
-	{
-		return $this->pdo->queryOneRow(
-			sprintf("
-				SELECT *
-				FROM gamesinfo
-				WHERE title = %s",
-				$this->pdo->escapeString($title)
-			)
-		);
-	}
-
-	public function getRange($start, $num)
-	{
-		return $this->pdo->query(
-			sprintf(
-				"SELECT gi.*, g.title AS genretitle FROM gamesinfo gi INNER JOIN genres g ON gi.genre_id = g.id ORDER BY createddate DESC %s",
-				($start === false ? '' : 'LIMIT ' . $num . ' OFFSET ' . $start)
-			)
-		);
-	}
-
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow("SELECT COUNT(id) AS num FROM gamesinfo");
-		return ($res === false ? 0 : $res["num"]);
-	}
-
-	public function getGamesCount($cat, $maxage = -1, $excludedcats = array())
-	{
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$res = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT COUNT(DISTINCT r.gamesinfo_id) AS num
-				FROM releases r
-				INNER JOIN gamesinfo con ON con.id = r.gamesinfo_id
-				WHERE r.nzbstatus = 1
-				AND con.title != ''
-				AND con.cover = 1
-				AND r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease')
-				AND %s %s %s %s",
-				$this->getBrowseBy(),
-				$catsrch,
-				($maxage > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxage) : ''),
-				(count($excludedcats) > 0 ? " AND r.categoryid NOT IN (" . implode(",", $excludedcats) . ")" : '')
-			)
-		);
-
-		return ($res === false ? 0 : $res["num"]);
-	}
-
-	public function getGamesRange($cat, $start, $num, $orderby, $maxage = -1, $excludedcats = array())
-	{
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false) {
-			$limit = "";
-		} else {
-			$limit = " LIMIT " . $num . " OFFSET " . $start;
-		}
-
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		if ($maxage > 0) {
-			$maxage = sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxage);
-		} else {
-			$maxage = '';
-		}
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0) {
-			$exccatlist = " AND r.categoryid NOT IN (" . implode(",", $excludedcats) . ")";
-		}
-
-		$order = $this->getGamesOrder($orderby);
-
-		return $this->pdo->query(
-			sprintf(
-				"SELECT GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, "
-				. "GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, "
-				. "GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, "
-				. "GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, "
-				. "GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, "
-				. "GROUP_CONCAT(rn.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, "
-				. "GROUP_CONCAT(groups.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, "
-				. "GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, "
-				. "GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, "
-				. "GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, "
-				. "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, "
-				. "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, "
-				. "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, "
-				. "con.*, YEAR (con.releasedate) as year, r.gamesinfo_id, groups.name AS group_name,
-				rn.id as nfoid FROM releases r "
-				. "LEFT OUTER JOIN groups ON groups.id = r.groupid "
-				. "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id "
-				. "INNER JOIN gamesinfo con ON con.id = r.gamesinfo_id "
-				. "WHERE r.nzbstatus = 1 AND con.title != '' AND "
-				. "r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') AND %s %s %s %s "
-				. "GROUP BY con.id ORDER BY %s %s" . $limit,
-				$browseby,
-				$catsrch,
-				$maxage,
-				$exccatlist,
-				$order[0],
-				$order[1]
-			)
-		);
-	}
-
-	public function getGamesOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode("_", $order);
-		switch ($orderArr[0]) {
-			case 'title':
-				$orderfield = 'con.title';
-				break;
-			case 'releasedate':
-				$orderfield = 'con.releasedate';
-				break;
-			case 'genre':
-				$orderfield = 'con.genre_id';
-				break;
-			case 'size':
-				$orderfield = 'r.size';
-				break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-
-		return array($orderfield, $ordersort);
-	}
-
-	public function getGamesOrdering()
-	{
-		return array(
-			'title_asc', 'title_desc', 'posted_asc', 'posted_desc', 'size_asc', 'size_desc',
-			'files_asc', 'files_desc', 'stats_asc', 'stats_desc',
-			'releasedate_asc', 'releasedate_desc', 'genre_asc', 'genre_desc'
-		);
-	}
-
-	public function getBrowseByOptions()
-	{
-		return array('title' => 'title', 'genre' => 'genre_id', 'year' => 'year');
-	}
-
-	public function getBrowseBy()
-	{
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		$like = 'LIKE';
-
-		foreach ($browsebyArr as $bbk => $bbv) {
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk])) {
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				if ($bbk === 'year') {
-					$browseby .= 'YEAR (con.releasedate) ' . $like . ' (' . $this->pdo->escapeString('%' . $bbs . '%') . ') AND ';
-				} else {
-					$browseby .= 'con.' . $bbv . ' ' . $like . ' (' . $this->pdo->escapeString('%' . $bbs . '%') . ') AND ';
-				}
-			}
-		}
-
-		return $browseby;
-	}
-
-	public function makeFieldLinks($data, $field)
-	{
-		$tmpArr = explode(', ', $data[$field]);
-		$newArr = array();
-		$i = 0;
-		foreach ($tmpArr as $ta) {
-			// Only use first 6.
-			if ($i > 5) {
-				break;
-			}
-			$newArr[] =
-				'<a href="' . WWW_TOP . '/games?' . $field . '=' . urlencode($ta) . '" title="' .
-				$ta . '">' . $ta . '</a>';
-			$i++;
-		}
-
-		return implode(', ', $newArr);
-	}
-
-	/**
-	 * Updates the game for game-edit.php
-	 *
-	 * @param $id
-	 * @param $title
-	 * @param $asin
-	 * @param $url
-	 * @param $publisher
-	 * @param $releasedate
-	 * @param $esrb
-	 * @param $cover
-	 * @param $trailerurl
-	 * @param $genreID
-	 */
-	public function update($id, $title, $asin, $url, $publisher, $releasedate, $esrb, $cover, $trailerurl, $genreID)
-	{
-
-		$this->pdo->queryExec(
-			sprintf("
-				UPDATE gamesinfo
-				SET title = %s, asin = %s, url = %s, publisher = %s,
-					releasedate = %s, esrb = %s, cover = %d, trailer = %s, genre_id = %d, updateddate = NOW()
-				WHERE id = %d",
-				$this->pdo->escapeString($title),
-				$this->pdo->escapeString($asin),
-				$this->pdo->escapeString($url),
-				$this->pdo->escapeString($publisher),
-				$this->pdo->escapeString($releasedate),
-				$this->pdo->escapeString($esrb),
-				$cover,
-				$this->pdo->escapeString($trailerurl),
-				$genreID,
-				$id
-			)
-		);
-	}
-
-	/**
-	 * Process each game, updating game information from Giantbomb
-	 *
-	 * @param $gameInfo
-	 *
-	 * @return bool
-	 */
-	public function updateGamesInfo($gameInfo)
-	{
-		$gen = new \Genres(['Settings' => $this->pdo]);
-		$ri = new \ReleaseImage($this->pdo);
-
-		$con = array();
-
-		// Process Steam first before giantbomb
-		// Steam has more details
-		$this->_gameResults = [];
-		$this->_getGame = new \Steam();
-		$this->_classUsed = "steam";
-		$this->_getGame->cookie = $this->cookie;
-		$this->_getGame->searchTerm = $gameInfo['title'];
-		if($this->_getGame->search() !== false){
-			$this->_gameResults = $this->_getGame->getAll();
-		}
-		if (count($this->_gameResults) < 1) {
-			$this->_getGame = new \Desura();
-			$this->_classUsed = "desura";
-			$this->_getGame->cookie = $this->cookie;
-			$this->_getGame->searchTerm = $gameInfo['title'];
-			if ($this->_getGame->search() !== false) {
-				$this->_gameResults = $this->_getGame->getAll();
-			}
-		}
-		if (count($this->_gameResults) < 1) {
-			$this->_getGame = new \Greenlight();
-			$this->_classUsed = "gl";
-			$this->_getGame->cookie = $this->cookie;
-			$this->_getGame->searchTerm = $gameInfo['title'];
-			if ($this->_getGame->search() !== false) {
-				$this->_gameResults = $this->_getGame->getAll();
-			}
-		}
-		if (count($this->_gameResults) < 1) {
-			$this->_gameResults = (array)$this->fetchGiantBombID($gameInfo['title']);
-			if ($this->maxHitRequest === true) {
-				return false;
-			}
-		}
-		if(empty($this->_gameResults['title'])){
-			return false;
-		}
-		if(!is_array($this->_gameResults)){
-			return false;
-		}
-		if (count($this->_gameResults) > 1) {
-			$genreName = '';
-			switch ($this->_classUsed) {
-
-				case "desura":
-					if (isset($this->_gameResults['cover'])) {
-						$con['coverurl'] = (string)$this->_gameResults['cover'];
-					}
-
-					if (isset($this->_gameResults['backdrop'])) {
-						$con['backdropurl'] = (string)$this->_gameResults['backdrop'];
-					}
-
-					$con['title'] = (string)$this->_gameResults['title'];
-					$con['asin'] = $this->_gameResults['desuragameid'];
-					$con['url'] = (string)$this->_gameResults['directurl'];
-
-					if (isset($this->_gameResults['gamedetails']['Publisher'])) {
-						$con['publisher'] = (string)$this->_gameResults['gamedetails']['Publisher'];
-					} else {
-						$con['publisher'] = "Unknown";
-					}
-
-					if (isset($this->_gameResults['rating'])) {
-						$con['esrb'] = (string)$this->_gameResults['rating'];
-					} else {
-						$con['esrb'] = "Not Rated";
-					}
-
-					if (isset($this->_gameResults['description'])) {
-						$con['review'] = trim(strip_tags((string)$this->_gameResults['description']));
-					}
-
-					if (isset($this->_gameResults['trailer'])) {
-						$con['trailer'] = (string)$this->_gameResults['trailer'];
-					}
-
-					if (isset($this->_gameResults['gamedetails']['Genre'])) {
-						$genres = (string)$this->_gameResults['gamedetails']['Genre'];
-						$genreName = $this->_matchGenre($genres);
-					}
-					break;
-
-				case "gb":
-					$con['coverurl'] = (string)$this->_gameResults['image']['super_url'];
-					$con['title'] = (string)$this->_gameResults['name'];
-					$con['asin'] = $this->_gameID;
-					$con['url'] = (string)$this->_gameResults['site_detail_url'];
-					if (is_array($this->_gameResults['publishers'])) {
-						while (list($key) = each($this->_gameResults['publishers'])) {
-							if ($key == 0) {
-								$con['publisher'] = (string)$this->_gameResults['publishers'][$key]['name'];
-							}
-						}
-					} else {
-						$con['publisher'] = "Unknown";
-					}
-
-					if (is_array($this->_gameResults['original_game_rating'])) {
-						$con['esrb'] = (string)$this->_gameResults['original_game_rating'][0]['name'];
-					} else {
-						$con['esrb'] = (string)$this->_gameResults['original_game_rating']['name'];
-					}
-					$con['releasedate'] = (string)$this->_gameResults['original_release_date'];
-
-					if (isset($this->_gameResults['description'])) {
-						$con['review'] = trim(strip_tags((string)$this->_gameResults['description']));
-					}
-					if (isset($this->_gameResults['genres'][0]['name'])) {
-						$genres = (string)$this->_gameResults['genres'][0]['name'];
-						$genreName = $this->_matchGenre($genres);
-					}
-					break;
-				case "gl":
-					if (isset($this->_gameResults['cover'])) {
-						$con['coverurl'] = (string)$this->_gameResults['cover'];
-					}
-
-					if (isset($this->_gameResults['backdrop'])) {
-						$con['backdropurl'] = (string)$this->_gameResults['backdrop'];
-					}
-
-					$con['title'] = (string)$this->_gameResults['title'];
-					$con['asin'] = $this->_gameResults['greenlightgameid'];
-					$con['url'] = (string)$this->_gameResults['directurl'];
-					$con['publisher'] = "Unknown";
-					$con['esrb'] = "Not Rated";
-
-					if (isset($this->_gameResults['description'])) {
-						$con['review'] = trim(strip_tags((string)$this->_gameResults['description']));
-					}
-
-					if (isset($this->_gameResults['trailer'])) {
-						$con['trailer'] = (string)$this->_gameResults['trailer'];
-					}
-
-					if (isset($this->_gameResults['gamedetails']['Genre'])) {
-						$genres = (string)$this->_gameResults['gamedetails']['Genre'];
-						$genreName = $this->_matchGenre($genres);
-					}
-					break;
-				case "steam":
-					if (isset($this->_gameResults['cover'])) {
-						$con['coverurl'] = (string)$this->_gameResults['cover'];
-					}
-
-					if (isset($this->_gameResults['backdrop'])) {
-						$con['backdropurl'] = (string)$this->_gameResults['backdrop'];
-					}
-
-					$con['title'] = (string)$this->_gameResults['title'];
-					$con['asin'] = $this->_gameResults['steamgameid'];
-					$con['url'] = (string)$this->_gameResults['directurl'];
-
-					if (isset($this->_gameResults['gamedetails']['Publisher'])) {
-						$con['publisher'] = (string)$this->_gameResults['gamedetails']['Publisher'];
-					} else {
-						$con['publisher'] = "Unknown";
-					}
-
-					if (isset($this->_gameResults['rating'])) {
-						$con['esrb'] = (string)$this->_gameResults['rating'];
-					} else {
-						$con['esrb'] = "Not Rated";
-					}
-
-					if (!empty($this->_gameResults['gamedetails']['Release Date'])) {
-						$dateReleased = $this->_gameResults['gamedetails']['Release Date'];
-						if (!preg_match('#^\s*(?P<month>\w+)\s+(?P<day>\d{1,2}),?\s+(?P<year>\d{4})\s*$#',
-							$dateReleased)) {
-							if (preg_match('#^\s*(?P<month>\w+)\s+(?P<year>\d{4})\s*$#',
-								$dateReleased, $matches)) {
-								$dateReleased = "{$matches['month']} 1, {$matches['year']}";
-							}
-						}
-
-						$date = \DateTime::createFromFormat('M/j/Y', $dateReleased);
-						if ($date instanceof \DateTime) {
-							$con['releasedate'] = (string)$date->format('Y-m-d');
-						}
-					}
-
-					if (isset($this->_gameResults['description'])) {
-						$con['review'] = trim(strip_tags((string)$this->_gameResults['description']));
-					}
-
-					if (isset($this->_gameResults['trailer'])) {
-						$con['trailer'] = (string)$this->_gameResults['trailer'];
-					}
-
-					if (isset($this->_gameResults['gamedetails']['Genre'])) {
-						$genres = (string)$this->_gameResults['gamedetails']['Genre'];
-						$genreName = $this->_matchGenre($genres);
-					}
-
-					break;
-				default:
-					return false;
-			}
-		} else {
-			return false;
-		}
-		// Load genres.
-		$defaultGenres = $gen->getGenres(\Genres::GAME_TYPE);
-		$genreassoc = array();
-		foreach ($defaultGenres as $dg) {
-			$genreassoc[$dg['id']] = strtolower($dg['title']);
-		}
-
-		// Prepare database values.
-		if (isset($con['coverurl'])) {
-			$con['cover'] = 1;
-		} else {
-			$con['cover'] = 0;
-		}
-		if (isset($con['backdropurl'])) {
-			$con['backdrop'] = 1;
-		} else {
-			$con['backdrop'] = 0;
-		}
-		if (!isset($con['trailer'])) {
-			$con['trailer'] = 0;
-		}
-		if (empty($con['title'])) {
-			$con['title'] = $gameInfo['title'];
-		}
-		if(!isset($con['releasedate'])){
-			$con['releasedate'] = "";
-		}
-
-		if ($con['releasedate'] == "''") {
-			$con['releasedate'] = "";
-		}
-		if(!isset($con['review'])){
-			$con['review'] = 'No Review';
-		}
-		$con['classused'] = $this->_classUsed;
-
-		if (empty($genreName)) {
-			$genreName = 'Unknown';
-		}
-
-		if (in_array(strtolower($genreName), $genreassoc)) {
-			$genreKey = array_search(strtolower($genreName), $genreassoc);
-		} else {
-			$genreKey = $this->pdo->queryInsert(
-				sprintf("
-					INSERT INTO genres (title, type)
-					VALUES (%s, %d)",
-					$this->pdo->escapeString($genreName),
-					\Genres::GAME_TYPE
-				)
-			);
-		}
-
-		$con['gamesgenre'] = $genreName;
-		$con['gamesgenreID'] = $genreKey;
-
-		$check = $this->pdo->queryOneRow(
-			sprintf('
-				SELECT id
-				FROM gamesinfo
-				WHERE asin = %s',
-				$this->pdo->escapeString($con['asin'])
-			)
-		);
-		if ($check === false) {
-			$gamesId = $this->pdo->queryInsert(
-				sprintf("
-					INSERT INTO gamesinfo
-						(title, asin, url, publisher, genre_id, esrb, releasedate, review, cover, backdrop, trailer, classused, createddate, updateddate)
-					VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %d, %d, %s, %s, NOW(), NOW())",
-					$this->pdo->escapeString($con['title']),
-					$this->pdo->escapeString($con['asin']),
-					$this->pdo->escapeString($con['url']),
-					$this->pdo->escapeString($con['publisher']),
-					($con['gamesgenreID'] == -1 ? "null" : $con['gamesgenreID']),
-					$this->pdo->escapeString($con['esrb']),
-					($con['releasedate'] != "" ? $this->pdo->escapeString($con['releasedate']) : "null"),
-					$this->pdo->escapeString(substr($con['review'], 0, 3000)),
-					$con['cover'],
-					$con['backdrop'],
-					$this->pdo->escapeString($con['trailer']),
-					$this->pdo->escapeString($con['classused'])
-				)
-			);
-		} else {
-			$gamesId = $check['id'];
-			$this->pdo->queryExec(
-				sprintf('
-					UPDATE gamesinfo
-					SET
-						title = %s, asin = %s, url = %s, publisher = %s, genre_id = %s,
-						esrb = %s, releasedate = %s, review = %s, cover = %d, backdrop = %d, trailer = %s, classused = %s, updateddate = NOW()
-					WHERE id = %d',
-					$this->pdo->escapeString($con['title']),
-					$this->pdo->escapeString($con['asin']),
-					$this->pdo->escapeString($con['url']),
-					$this->pdo->escapeString($con['publisher']),
-					($con['gamesgenreID'] == -1 ? "null" : $con['gamesgenreID']),
-					$this->pdo->escapeString($con['esrb']),
-					($con['releasedate'] != "" ? $this->pdo->escapeString($con['releasedate']) : "null"),
-					$this->pdo->escapeString(substr($con['review'], 0, 3000)),
-					$con['cover'],
-					$con['backdrop'],
-					$this->pdo->escapeString($con['trailer']),
-					$this->pdo->escapeString($con['classused']),
-					$gamesId
-				)
-			);
-		}
-
-		if ($gamesId) {
-			if ($this->echoOutput) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->header("Added/updated game: ") .
-					$this->pdo->log->alternateOver("   Title:    ") .
-					$this->pdo->log->primary($con['title'])
-				);
-			}
-			if($con['cover'] === 1){
-				$con['cover'] = $ri->saveImage($gamesId, $con['coverurl'], $this->imgSavePath, 250, 250);
-			}
-			if($con['backdrop'] === 1){
-				$con['backdrop'] = $ri->saveImage($gamesId . '-backdrop', $con['backdropurl'], $this->imgSavePath, 1920, 1024);
-			}
-		} else {
-			if ($this->echoOutput) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->headerOver("Nothing to update: ") .
-					$this->pdo->log->primary($con['title'] . ' (PC)' )
-				);
-			}
-		}
-
-		return $gamesId;
-	}
-
-	/**
-	 * Get Giantbomb id from title
-	 *
-	 * @param string $title
-	 *
-	 * @return bool|mixed Array if no result False
-	 */
-
-	public function fetchGiantBombID($title = '')
-	{
-		$obj = new \GiantBomb($this->publicKey);
-		try {
-			$fields = array(
-				"api_detail_url", "name"
-			);
-			$result = json_decode(json_encode($obj->search($title, $fields, 10, 1, array("game"))), true);
-			// We hit the maximum request.
-			if (empty($result)) {
-				$this->maxHitRequest = true;
-				return false;
-			}
-			if (!is_array($result['results']) || (int)$result['number_of_total_results'] === 0) {
-				$result = false;
-			} else {
-				$this->_resultsFound = count($result['results']) - 1;
-				if ($this->_resultsFound !== 0) {
-					for ($i = 0; $i <= $this->_resultsFound; $i++) {
-						similar_text(strtolower($result['results'][$i]['name']), strtolower($title), $p);
-						if ($p > 77) {
-							$result = $result['results'][$i];
-							preg_match('/\/\d+\-(?<asin>\d+)\//', $result['api_detail_url'], $matches);
-							$this->_gameID = (string)$matches['asin'];
-							$result = $this->fetchGiantBombArray();
-							$this->_classUsed = "gb";
-							break;
-						}
-						if ($i === $this->_resultsFound) {
-							return false;
-						}
-					}
-
-				} else {
-					return false;
-				}
-			}
-		} catch (Exception $e) {
-			$result = false;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Fetch Giantbomb results from GameID
-	 *
-	 * @return bool|mixed
-	 */
-	public function fetchGiantBombArray()
-	{
-		$obj = new \GiantBomb($this->publicKey);
-		try {
-			$fields = array(
-				"deck", "description", "original_game_rating", "api_detail_url", "image", "genres",
-				"name", "publishers", "original_release_date", "reviews",
-				"site_detail_url"
-			);
-			$result = json_decode(json_encode($obj->game($this->_gameID, $fields)), true);
-			$result = $result['results'];
-		} catch (Exception $e) {
-			$result = false;
-		}
-
-		return $result;
-	}
-
-	public function processGamesReleases()
-	{
-		$res = $this->pdo->queryDirect(
-			sprintf('
-				SELECT searchname, id
-				FROM releases
-				WHERE nzbstatus = 1 %s
-				AND gamesinfo_id = 0
-				AND categoryid = 4050
-				ORDER BY postdate DESC
-				LIMIT %d',
-				$this->renamed,
-				$this->gameQty
-			)
-		);
-
-		if ($res instanceof \Traversable && $res->rowCount() > 0) {
-			if ($this->echoOutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header("Processing " . $res->rowCount() . ' games release(s).'));
-			}
-
-			foreach ($res as $arr) {
-
-				// Reset maxhitrequest
-				$this->maxHitRequest = false;
-				$startTime = microtime(true);
-				$usedgb = false;
-				$gameInfo = $this->parseTitle($arr['searchname']);
-				if ($gameInfo !== false) {
-
-					if ($this->echoOutput) {
-						$this->pdo->log->doEcho(
-							$this->pdo->log->headerOver('Looking up: ') .
-							$this->pdo->log->primary($gameInfo['title'] . ' (PC)' )
-						);
-					}
-
-					// Check for existing games entry.
-					$gameCheck = $this->getGamesInfoByName($gameInfo['title']);
-
-					if ($gameCheck === false) {
-						$gameId = $this->updateGamesInfo($gameInfo);
-						$usedgb = true;
-						if ($gameId === false) {
-							$gameId = -2;
-
-							// Leave gamesinfo_id 0 to parse again
-							if($this->maxHitRequest === true){
-								$gameId = 0;
-							}
-						}
-
-					} else {
-						$gameId = $gameCheck['id'];
-					}
-					// Update release.
-					$this->pdo->queryExec(sprintf('UPDATE releases SET gamesinfo_id = %d WHERE id = %d', $gameId, $arr['id']));
-				} else {
-					// Could not parse release title.
-					$this->pdo->queryExec(sprintf('UPDATE releases SET gamesinfo_id = %d WHERE id = %d', -2, $arr['id']));
-
-					if ($this->echoOutput) {
-						echo '.';
-					}
-				}
-
-				// Sleep to not flood giantbomb.
-				$diff = floor((microtime(true) - $startTime) * 1000000);
-				if ($this->sleepTime * 1000 - $diff > 0 && $usedgb === true) {
-					usleep($this->sleepTime * 1000 - $diff);
-				}
-			}
-		} else {
-			if ($this->echoOutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header('No games releases to process.'));
-			}
-		}
-	}
-
-	/**
-	 * Parse the game release title
-	 *
-	 * @param string $releasename
-	 *
-	 * @return array|bool
-	 */
-	public function parseTitle($releasename)
-	{
-		// Get name of the game from name of release.
-		if (preg_match(
-			'/^(.+((EFNet|EFNet\sFULL|FULL\sabgxEFNet|abgx\sFULL|abgxbox360EFNet)\s|illuminatenboard\sorg|' .
-			'Place2(hom|us)e.net|united-forums? co uk|\(\d+\)))?(?P<title>.*?)[\.\-_ \:](v\.?\d\.\d|RIP|ADDON|' .
-			'EUR|USA|JP|ASIA|JAP|JPN|AUS|MULTI(\.?\d{1,2})?|PATCHED|FULLDVD|DVD5|DVD9|DVDRIP|\(GAMES\)\s*\(C\)|PROPER|REPACK|RETAIL|' .
-			'DEMO|DISTRIBUTION|BETA|REGIONFREE|READ\.?NFO|NFOFIX|Update|BWClone|CRACKED|Remastered|Fix|LINUX|x86|x64|Windows|Steam|Patch|GoG|Dox|No\.Intro|' .
-			// Group names, like Reloaded, CPY, Razor1911, etc
-			'[a-z0-9]{2,}$)/i',
-			preg_replace('/\sMulti\d?\s/i', '', $releasename), $matches)) {
-
-			// Replace dots, underscores, colons, or brackets with spaces.
-			$result = array();
-			$result['title'] = str_replace(' RF ', ' ', preg_replace('/(\-|\:|\.|_|\%20|\[|\])/', ' ', $matches['title']));
-			// Replace any foreign words at the end of the release
-			$result['title'] = preg_replace('/(brazilian|chinese|croatian|danish|deutsch|dutch|english|estonian|flemish|finnish|french|german|greek|hebrew|icelandic|italian|latin|nordic|norwegian|polish|portuguese|japenese|japanese|russian|serbian|slovenian|spanish|spanisch|swedish|thai|turkish)$/i', '', $result['title']);
-			// Remove PC ISO) ( from the beginning bad regex from Games category?
-			$result['title'] = preg_replace('/^(PC\sISO\)\s\()/i', '', $result['title']);
-			// Finally remove multiple spaces and trim leading spaces.
-			$result['title'] = trim(preg_replace('/\s{2,}/', ' ', $result['title']));
-			// Needed to add code to handle DLC Properly.
-			if (stripos($result['title'], 'dlc') !== false) {
-				$result['dlc'] = '1';
-				if (stripos($result['title'], 'Rock Band Network') !== false) {
-					$result['title'] = 'Rock Band';
-				} else if (stripos($result['title'], '-') !== false) {
-					$dlc = explode("-", $result['title']);
-					$result['title'] = $dlc[0];
-				} else if (preg_match('/(.*? .*?) /i', $result['title'], $dlc)) {
-					$result['title'] = $dlc[0];
-				}
-			}
-			if(empty($result['title'])){
-				return false;
-			}
-			$browseNode = '94';
-			$result['node'] = $browseNode;
-			$result['release'] = $releasename;
-
-			return array_map("trim", $result);
-		}
-
-		return false;
-	}
-
-	/**
-	 * See if genre name exists
-	 *
-	 * @param $nodeName
-	 *
-	 * @return bool|string
-	 */
-	public function matchBrowseNode($nodeName)
-	{
-		$str = '';
-
-		//music nodes above mp3 download nodes
-		switch ($nodeName) {
-			case 'Action':
-			case 'Adventure':
-			case 'Arcade':
-			case 'Board Games':
-			case 'Cards':
-			case 'Casino':
-			case 'Flying':
-			case 'Puzzle':
-			case 'Racing':
-			case 'Rhythm':
-			case 'Role-Playing':
-			case 'Simulation':
-			case 'Sports':
-			case 'Strategy':
-			case 'Trivia':
-				$str = $nodeName;
-				break;
-		}
-
-		return ($str !== '') ? $str : false;
-	}
-
-	/**
-	 * Matches Genres
-	 *
-	 * @param string $genre
-	 *
-	 * @return string
-	 */
-	protected function _matchGenre($genre = '')
-	{
-		$genreName = '';
-		$a = str_replace('-', ' ', $genre);
-		$tmpGenre = explode(',', $a);
-		if (is_array($tmpGenre)) {
-			foreach ($tmpGenre as $tg) {
-				$genreMatch = $this->matchBrowseNode(ucwords($tg));
-				if ($genreMatch !== false) {
-					$genreName = (string)$genreMatch;
-					break;
-				}
-			}
-			if(empty($genreName)){
-				$genreName = $tmpGenre[0];
-			}
-		} else {
-			$genreName = $genre;
-		}
-
-		return $genreName;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/GiantBombAPI.php b/lib/copy_this/www/lib/GiantBombAPI.php
deleted file mode 100644
index 5034ed0a0..000000000
--- a/lib/copy_this/www/lib/GiantBombAPI.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-
-/**
- * GiantBomb PHP wrapper is a simple class written in PHP to
- * make interactions with GiantBomb api easier.
- *
- * @package GiantBomb api PHP wrapper
- * @version 0.4
- * @author  Amal Francis
- * @author  Koroban
- * @license MIT License
- */
-class GiantBomb
-{
-
-	/**
-	 * The api key
-	 *
-	 * @access private
-	 * @type string
-	 */
-	private $api_key = "";
-
-	/**
-	 * The api response type : json/xml
-	 *
-	 * @access private
-	 * @type string
-	 */
-	private $resp_type = "json";
-
-	/**
-	 * A variable to hold the formatted result of
-	 * last api request
-	 *
-	 * @access public
-	 * @type array
-	 */
-	public $result = array();
-
-	/**
-	 * api endpoint
-	 * prefix for all API cals
-	 *
-	 * @access protected
-	 * @type string
-	 */
-	protected $endpoint = 'http://www.giantbomb.com/api/';
-
-	/**
-	 * curl instance
-	 *
-	 * @access protected
-	 * @type handle
-	 */
-	protected $ch = null;
-
-	/**
-	 * Constructor of class
-	 *
-	 * @param string $key  string API key to use
-	 * @param string $resp type Type of respone to request
-	 *
-	 * @void
-	 */
-	public function __construct($key, $resp = "json")
-	{
-		// Set the api key
-		$this->api_key = $key;
-
-		// Now set the api response type, Default to json
-		$this->resp_type = $resp;
-
-		// Init new instance of curl
-		$this->ch = curl_init();
-
-		// set default options for curl
-		curl_setopt_array(
-			$this->ch,
-			array(
-				CURLOPT_HEADER         => false,
-				CURLOPT_RETURNTRANSFER => true,
-				CURLOPT_NOPROGRESS     => true,
-				CURLOPT_USERAGENT      => 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.64 Safari/537.31'
-			)
-		);
-	}
-
-	/**
-	 * Destructor
-	 * deletes curl instance
-	 *
-	 * @void
-	 */
-	public function __destruct()
-	{
-		// Close request to clear up some resources
-		if (!is_null($this->ch)) {
-			curl_close($this->ch);
-		}
-	}
-
-	/**
-	 * Send call to API
-	 *
-	 * @param string $module string name of url suffix
-	 * @param array $params array get parameters to send to API
-	 *
-	 * @return mixed|array response of API
-	 * @throws GiantBombException
-	 */
-	private function call($module, $params = array())
-	{
-		// set api data
-		$params['api_key'] = $this->api_key;
-		$params['format']  = $this->resp_type;
-
-		// build URL
-		$url = $this->endpoint . $module . '?' . http_build_query($params);
-
-		// Set URL
-		curl_setopt($this->ch, CURLOPT_URL, $url);
-
-		// Send the request & save response to $resp
-		$resp = array();
-		$resp["data"] = curl_exec($this->ch);
-		if (curl_errno($this->ch)) {
-			throw new GiantBombException('API call failed: ' . curl_error($this->ch));
-		}
-
-		// save http response code
-		$resp["httpCode"] = curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
-
-		if (!$resp || !$resp["data"]) {
-			throw new GiantBombException("Couldn't get information from API");
-		}
-
-		return $resp;
-	}
-
-	/**
-	 * Format filter array to string
-	 *
-	 * @param $filters array list of filters
-	 *
-	 * @return string combined filter string
-	 */
-	private function format_filter($filters = array())
-	{
-		$filters_merged = array();
-		foreach ($filters as $ky => $vl) {
-			$filters_merged[] = $ky . ':' . $vl;
-		}
-
-		return implode(',', $filters_merged);
-	}
-
-	/**
-	 * Get information about given object type
-	 *
-	 * @param string $type
-	 * @param string $id         string id to request
-	 * @param array $field_list array list of fields to response
-	 *
-	 * @return array response
-	 * @throws GiantBombException
-	 */
-	public function get_object($type, $id, $field_list = array())
-	{
-		$resp = $this->call($type . '/' . $id . '/',
-			array('field_list' => implode(',', $field_list)));
-
-		// No game with given game id found
-		if ($resp["httpCode"] == 404) {
-			throw new GiantBombException('Couldn\'t find ' . $type . ' with game id "' . $id . '"');
-		}
-
-		return $this->parse_result($resp["data"]);
-	}
-
-	/**
-	 * Get list of objects by given filters
-	 *
-	 * @param $type
-	 * @param $filter     array filter by given values - no "," accepted
-	 * @param $limit      integer limit result count by given limit
-	 * @param $offset     integer offset of results
-	 * @param $platform   integer id of platform to limit
-	 * @param $sort       array list of keys to sort, format key => asc/desc,
-	 * @param $field_list array list of field to result
-	 *
-	 * @return mixed|array response
-	 */
-	public function get_objects($type, $filter = array(), $limit = 100, $offset = 0,
-								$platform = null, $sort = array(), $field_list = array())
-	{
-		$resp = $this->call($type . '/',
-			array(
-				'field_list' => implode(',', $field_list),
-				'limit'      => $limit,
-				'offset'     => $offset,
-				'platforms'  => $platform,
-				'sort'       => $this->format_filter($sort),
-				'filter'     => $this->format_filter($filter)
-			));
-
-		return $this->parse_result($resp["data"]);
-	}
-
-	/**
-	 * Get information about a game
-	 *
-	 * @param $id         string id to request
-	 * @param $field_list array list of fields to response
-	 *
-	 * @return array response
-	 */
-	public function game($id, $field_list = array())
-	{
-		return $this->get_object('game', $id, $field_list);
-	}
-
-	/**
-	 * List games by filters
-	 *
-	 * @param $filter     array filter by given values - no "," accepted
-	 * @param $limit      integer limit result count by given limit
-	 * @param $offset     integer offset of results
-	 * @param $platform   integer id of platform to limit
-	 * @param $sort       array list of keys to sort, format key => asc/desc,
-	 * @param $field_list array list of field to result
-	 *
-	 * @return array list of games
-	 */
-	public function games($filter = array(), $limit = 100, $offset = 0, $platform = null,
-						  $sort = array(), $field_list = array())
-	{
-		return $this->get_objects('games', $filter, $limit, $offset, $platform, $sort, $field_list);
-	}
-
-	/**
-	 * Get review by id
-	 *
-	 * @param $review_id         string id to request
-	 * @param $field_list array list of fields to response
-	 *
-	 * @return array response
-	 */
-	public function review($review_id, $field_list = array())
-	{
-		return $this->get_object('review', $review_id, $field_list);
-	}
-
-	/**
-	 * Get game_rating by id
-	 *
-	 * @param $rating_id         string id to request
-	 * @param $field_list array list of fields to response
-	 *
-	 * @return array response
-	 */
-	public function game_rating($rating_id, $field_list = array())
-	{
-		return $this->get_object('game_rating', $rating_id, $field_list);
-	}
-
-	/**
-	 * Get company by id
-	 *
-	 * @param $company_id         string id to request
-	 * @param $field_list array list of fields to response
-	 *
-	 * @return array response
-	 */
-	public function company($company_id, $field_list = array())
-	{
-		return $this->get_object('company', $company_id, $field_list);
-	}
-
-	/**
-	 * Get character by id
-	 *
-	 * @param $character_id         string id to request
-	 * @param $field_list array list of fields to response
-	 *
-	 * @return array response
-	 */
-	public function character($character_id, $field_list = array())
-	{
-		return $this->get_object('character', $character_id, $field_list);
-	}
-
-	/**
-	 * Perform a search with given keyword
-	 *
-	 * @param $query      string keyword to search
-	 * @param $field_list array list of fields to response
-	 * @param $limit      integer limit result count by given limit
-	 * @param $page
-	 * @param $resources
-	 *
-	 * @return array response
-	 */
-	public function search($query, $field_list = array(), $limit = 100, $page = 0, $resources = array())
-	{
-		if (!is_array($field_list)) {
-			$field_list = (array)$field_list;
-		}
-		if (!is_array($resources)) {
-			$resources = (array)$resources;
-		}
-
-		$resp = $this->call(
-			'search/',
-			array(
-				'field_list' => implode(',', $field_list),
-				'limit'      => $limit,
-				'page'       => $page,
-				'query'      => $query,
-				'resources'  => implode(',', $resources)
-			)
-		);
-
-		return $this->parse_result($resp['data']);
-	}
-
-	/**
-	 * List genres
-	 *
-	 * @param $field_list array list of field to result
-	 * @param $limit      integer limit result count by given limit
-	 * @param $offset     integer offset of results
-	 *
-	 * @return array list of games
-	 */
-	public function genres($field_list = array(), $limit = 100, $offset = 0)
-	{
-		$resp = $this->call(
-			'genres/',
-			array(
-				'field_list' => implode(',', $field_list),
-				'limit'      => $limit,
-				'offset'     => $offset
-			)
-		);
-
-		return $this->parse_result($resp['data']);
-	}
-
-	/**
-	 * List platforms by filter
-	 *
-	 * @param $field_list array list of field to result
-	 * @param $limit      integer limit result count by given limit
-	 * @param $offset     integer offset of results
-	 * @param $filter     array filter by given values - no "," accepted
-	 * @param $sort       array list of keys to sort, format key => asc/desc,
-	 *
-	 * @return array list of games
-	 */
-	public function platforms($field_list = array(), $limit = 100, $offset = 0, $filter = array(),
-							  $sort = array())
-	{
-		$resp = $this->call(
-			'platforms/',
-			array(
-				'field_list' => implode(',', $field_list),
-				'limit'      => $limit,
-				'offset'     => $offset,
-				'sort'       => $this->format_filter($sort),
-				'filter'     => $this->format_filter($filter)
-			)
-		);
-
-		return $this->parse_result($resp["data"]);
-	}
-
-	/**
-	 * Return parsed result of api response
-	 *
-	 * @param $data string result of API
-	 *
-	 * @return mixed|SimpleXMLElement parsed version of input string(object)
-	 * @throws GiantBombException
-	 */
-	private function parse_result($data)
-	{
-		try {
-			if ($this->resp_type == "json") {
-				$result = @json_decode($data);
-			} else {
-				$result = @simplexml_load_string($data);
-			}
-		} catch (Exception $e) {
-			throw new GiantBombException("Parse error occoured", null, $e);
-		}
-
-		if (empty($result) || !empty($result->error) && strtoupper($result->error) != "OK") {
-			throw new GiantBombException("Following error encountered: " . $result->error);
-		}
-
-		return $result;
-	}
-}
-
-/**
- * Define a custom exception class for api wrapper
- */
-class GiantBombException extends Exception
-{
-
-	/**
-	 * Redefine the exception so message isn't optional
-	 *
-	 * @param $message  string message to set in exception
-	 * @param $code     integer error code
-	 * @param $previous Exception previous Exception to save
-	 *
-	 * @void
-	 */
-	public function __construct($message, $code = 0, Exception $previous = null)
-	{
-		// make sure everything is assigned properly
-		parent::__construct($message, $code, $previous);
-	}
-
-	/**
-	 * convert exception to string
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Greenlight.php b/lib/copy_this/www/lib/Greenlight.php
deleted file mode 100644
index 2fa60f1d7..000000000
--- a/lib/copy_this/www/lib/Greenlight.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-require_once(WWW_DIR."/lib/util.php");
-
-class Greenlight
-{
-
-	public $searchTerm = null;
-	public $cookie = null;
-
-
-	const GREENLIGHTURL = "http://steamcommunity.com/greenlight/";
-	const GREENLIGHTVARS = "&childpublishedfileid=0&section=items&appid=765&browsesort=textsearch";
-	const AGECHECKURL = "http://store.steampowered.com/agecheck/app/";
-	const DIRECTGAMEURL = "http://steamcommunity.com/sharedfiles/filedetails/?id=";
-
-	/**
-	 * @var
-	 */
-	protected $_ch;
-
-	/**
-	 * @var string
-	 */
-	protected $_directURL = '';
-
-	/**
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * @var array
-	 */
-	protected $_postParams = array();
-
-	/**
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * @var
-	 */
-	protected $_response;
-
-	/**
-	 * @var
-	 */
-	protected $_ret;
-
-	/**
-	 * @var
-	 */
-	protected $_greenlightGameID;
-
-	/**
-	 * @var string
-	 */
-	protected $_title = '';
-
-	public function __construct()
-	{
-		$this->_html = new simple_html_dom();
-		if (isset($this->cookie)) {
-			$this->getUrl(self::GREENLIGHTURL);
-		}
-	}
-
-	/**
-	 * Free up memory prevent memory leaks
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->_response);
-	}
-
-	/**
-	 * Gets the game description of the game.
-	 *
-	 * @return array
-	 */
-	public function gameDescription()
-	{
-		if ($ret = $this->_html->find("div.workshopItemDescription", 0)) {
-			$this->_res['description'] = trim(html_entity_decode($ret->plaintext));
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the images - cover and backdrop
-	 *
-	 * @return array
-	 */
-	public function images()
-	{
-			if ($ret = $this->_html->find("div.workshopItemPreviewImageMain", 0)) {
-				if(preg_match('#\'(?<largeimage>.*)\'#i', $ret->outertext, $matches)){
-				$this->_res['cover'] = trim($matches['largeimage']);
-				}else{
-				$this->_res['cover'] = $this->_html->find("img#previewImageMain", 0)->src;
-				}
-			}
-			if ($ret = $this->_html->find("div.screenshot_holder", 0)) {
-				if ($ret = $ret->find("a", 0)) {
-					if(preg_match('#\'(?<backdropimage>.*)\'#', $ret->outertext, $matches)){
-					$this->_res['backdrop'] = trim($matches['backdropimage']);
-					}
-				}
-			}
-		return $this->_res;
-	}
-
-	/**
-	 * Return game details - Genre, Platform, Players
-	 *
-	 * @return array
-	 */
-	public function details()
-	{
-		if ($this->_html->find("div.workshopTags", 0)) {
-			foreach ($this->_html->find("div.workshopTags") as $detail) {
-				if ($ret = $detail->find("span.workshopTagsTitle", 0)) {
-					$ret2 = trim($ret->next_sibling()->innertext);
-					$ret = str_ireplace("&nbsp;", "", $ret->plaintext);
-					$ret = rtrim(trim($ret), ":");
-					if ($ret != "Languages") {
-						if (count($detail->find("a")) > 1) {
-							$ret3 = array();
-							foreach ($detail->find("a") as $a) {
-								$ret3[] = trim($a->innertext);
-							}
-							$joinedmultiple = join(",", $ret3);
-							$this->_res['gamedetails'][$ret] = $joinedmultiple;
-						} else {
-							$this->_res['gamedetails'][$ret] = $ret2;
-						}
-					}
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the trailer for the game
-	 *
-	 * @return array
-	 */
-	public function trailer()
-	{
-			if (preg_match('#youtube_video_id: "(?<youtubeid>.*)",#i', $this->_response, $matches)) {
-				$this->_res['trailer'] = "https://www.youtube.com/watch?v=" . trim($matches['youtubeid']);
-			}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Searches for a 100% match.
-	 *
-	 * @return bool
-	 */
-	public function search()
-	{
-		$result = false;
-		if (!empty($this->searchTerm)) {
-			$this->searchTerm = trim($this->searchTerm);
-			if ($this->getUrl(self::GREENLIGHTURL . '?searchtext=' . urlencode($this->searchTerm) . self::GREENLIGHTVARS) !== false) {
-				if ($ret = $this->_html->find("div.workshopItemTitle")) {
-					if (count($ret) > 0) {
-						foreach ($this->_html->find("div.workshopItemTitle") as $ret) {
-							$this->_title = trim($ret->plaintext);
-							//Sanitize both searchTerm and title for a positive 100% match
-							if ($this->cleanTitles(strtolower($this->_title), strtolower($this->searchTerm)) === true) {
-								if ($ret->parent()->outertext) {
-									preg_match('#id?=(?<gameid>\d+)#', $ret->parent()->outertext, $matches);
-									$this->_greenlightGameID = $matches['gameid'];
-								}
-								$this->_directURL = self::DIRECTGAMEURL . $this->_greenlightGameID;
-								if ($this->getUrl($this->_directURL) !== false) {
-									$result = true;
-									break;
-								}
-							}else{
-							$result = false;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Gets all Information
-	 *
-	 * @return array
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (!empty($this->_directURL)) {
-			$results['greenlightgameid'] = $this->_greenlightGameID;
-			$results['directurl'] = $this->_directURL;
-			$results['title'] = $this->_title;
-		}
-		if (is_array($this->gameDescription())) {
-			$results = array_merge($results, $this->gameDescription());
-		}
-		if (is_array($this->details())) {
-			$results = array_merge($results, $this->details());
-		}
-		if (is_array($this->images())) {
-			$results = array_merge($results, $this->images());
-		}
-		if (is_array($this->trailer())) {
-			$results = array_merge($results, $this->trailer());
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Gets the raw html to parse
-	 *
-	 * @param string $fetchurl
-	 * @param bool $usepost
-	 *
-	 * @return bool
-	 */
-	private function getUrl($fetchurl = "", $usepost = false)
-	{
-		if (!empty($fetchurl)) {
-			$this->_ch = curl_init($fetchurl);
-		}
-		if ($usepost === true) {
-			curl_setopt($this->_ch, CURLOPT_CUSTOMREQUEST, "POST");
-			curl_setopt($this->_ch, CURLOPT_POST, 1);
-			curl_setopt($this->_ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-		curl_setopt($this->_ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($this->_ch, CURLOPT_REFERER, self::GREENLIGHTURL);
-		curl_setopt($this->_ch, CURLOPT_HEADER, 0);
-		curl_setopt($this->_ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($this->_ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($this->_ch, CURLOPT_FAILONERROR, 1);
-		if (isset($this->cookie)) {
-			curl_setopt($this->_ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($this->_ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		curl_setopt_array($this->_ch, Utility::curlSslContextOptions());
-		$this->_response = curl_exec($this->_ch);
-		if (!$this->_response) {
-			curl_close($this->_ch);
-
-			return false;
-		}
-		curl_close($this->_ch);
-		$this->_html->load($this->_response);
-
-		return true;
-	}
-
-	/**
-	 * Removes all but alphanumeric only and does a 100% match check
-	 *
-	 * @param string $title
-	 * @param string $searchtitle
-	 *
-	 * @return bool
-	 */
-	protected function cleanTitles($title = "", $searchtitle = "")
-	{
-		$title = preg_replace('/[^\w]/', '', $title);
-		$searchtitle = preg_replace('/[^\w]/', '', $searchtitle);
-	    similar_text($title , $searchtitle, $p);
-		if ($p == 100) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/lib/copy_this/www/lib/Hotmovies.php b/lib/copy_this/www/lib/Hotmovies.php
deleted file mode 100644
index 04c98ad1e..000000000
--- a/lib/copy_this/www/lib/Hotmovies.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-
-class Hotmovies
-{
-
-	/**
-	 * Constant Urls used within this class
-	 * Needed Search Queries Variables
-	 */
-	const EXTRASEARCH = "&complete=on&search_in=video_title";
-	const HMURL = "http://www.hotmovies.com";
-	const IF18 = true;
-	const TRAILINGSEARCH = "/search.php?words=";
-	/**
-	 * Keyword Search.
-	 *
-	 * @var string
-	 */
-	public $searchTerm = "";
-	/**
-	 * Define a cookie location
-	 *
-	 * @var string
-	 */
-	public $cookie = "";
-	/**
-	 * If a direct link is set parse it instead of search for it.
-	 *
-	 * @var string
-	 */
-	public $directLink = "";
-	/**
-	 * Sets the direct url in the getAll method
-	 *
-	 * @var string
-	 */
-	protected $_directUrl = "";
-
-	/**
-	 * Sets the link to get in curl
-	 *
-	 * @var string
-	 */
-	protected $_getLink = "";
-
-	/**
-	 * Simple Html Dom Object
-	 *
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * POST parameters used with curl
-	 *
-	 * @var array
-	 */
-	protected $_postParams = array();
-
-	/**
-	 * Results return from some methods
-	 *
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * Raw Html from Curl
-	 *
-	 */
-	protected $_response;
-
-	/**
-	 * Sets the title in the getAll method
-	 *
-	 * @var string
-	 */
-	protected $_title = "";
-
-
-
-	public function __construct()
-	{
-		$this->_html = new \simple_html_dom();
-
-		// Set a cookie to override +18 warning.
-		if (isset($this->cookie)) {
-			@$this->getUrl();
-		}
-	}
-
-	/*
-	 * Remove from memory if it still exists
-	 */
-
-	/**
-	 * Get Raw html of webpage
-	 *
-	 * @param bool $usepost
-	 *
-	 * @return bool
-	 */
-	private function getUrl($usepost = false)
-	{
-		if (isset($this->_getLink)) {
-			$ch = curl_init($this->_getLink);
-		} else {
-			$ch = curl_init(self::HMURL);
-		}
-		if (isset($this->directLink)) {
-			$ch = curl_init($this->directLink);
-			$this->directLink = "";
-		}
-		if ($usepost === true){
-			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-			curl_setopt($ch, CURLOPT_POST, 1);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-		if (isset($this->cookie)) {
-			curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		$this->_response = curl_exec($ch);
-		if (!$this->_response) {
-			curl_close($ch);
-
-			return false;
-		}
-		$this->_html->load($this->_response);
-		curl_close($ch);
-		return true;
-	}
-
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->_response);
-		unset($this->_res);
-	}
-
-	/**
-	 * Directly gets the link if directlink is set, and parses it.
-	 *
-	 * @return array
-	 */
-	public function getDirect()
-	{
-		if (isset($this->directLink)) {
-			if ($this->getUrl() === false) {
-				return false;
-			} else {
-				return $this->getAll();
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Gets all information
-	 * @return array
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directUrl)) {
-			$results['title'] = $this->_title;
-			$results['directurl'] = $this->_directUrl;
-		}
-		if (is_array($this->sypnosis())) {
-			$results = array_merge($results, $this->sypnosis());
-		}
-		if (is_array($this->productInfo())) {
-			$results = array_merge($results, $this->productInfo());
-		}
-		if (is_array($this->cast())) {
-			$results = array_merge($results, $this->cast());
-		}
-		if (is_array($this->genres())) {
-			$results = array_merge($results, $this->genres());
-		}
-		if (is_array($this->covers())) {
-			$results = array_merge($results, $this->covers());
-		}
-
-		if (empty($results) === true){
-			return false;
-		}else{
-			return $results;
-		}
-	}
-
-	/**
-	 * Gets the sypnosis
-	 *
-	 * @return array
-	 */
-	public function sypnosis()
-	{
-		if ($this->_html->find('.desc_link', 0)) {
-			preg_match("/var descfullcontent = (?<content>.*)/", $this->_response,$matches);
-			if (is_array($matches)) {
-				$this->_res['sypnosis'] = rawurldecode($matches['content']);
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**Process ProductInfo
-	 *
-	 * @return array
-	 */
-	public function productInfo()
-	{
-		$studio = false;
-		$director = false;
-		if ($ret = $this->_html->find('div.page_video_info', 0)) {
-			foreach ($ret->find("text") as $e) {
-				$e = trim($e->innertext);
-				$e = str_replace(",", "", $e);
-				$e = str_replace("...", "", $e);
-				$e = str_replace("&nbsp;", "", $e);
-				if (stristr($e, "Studio:")) {
-					$studio = true;
-				}
-				if (stristr($e, "Director:")) {
-					$director = true;
-					$e = null;
-				}
-				if ($studio === true) {
-					if (!stristr($e, "Custodian of Records")) {
-						if (!stristr($e, "Description")) {
-
-							if ($director === true && !empty($e)) {
-								$this->_res['director'] = $e;
-								$e = null;
-								$director = false;
-							}
-							if (!empty($e)) {
-								$this->_res['productinfo'][] = $e;
-							}
-						} else {
-							break;
-						}
-					} else {
-						break;
-					}
-				}
-			}
-		}
-		if (is_array($this->_res['productinfo'])) {
-			$this->_res['productinfo'] = array_chunk($this->_res['productinfo'], 2, false);
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the cast members and director
-	 *
-	 *@return array
-	 */
-	public function cast()
-	{
-		$cast = null;
-		if ($this->_html->find('a[itemprop=actor]')) {
-			foreach ($this->_html->find('a[itemprop=actor]') as $e) {
-				$e = trim($e->title);
-				$e = preg_replace('/\((.*)\)/',"",$e);
-				$cast[] = trim($e);
-			}
-			$this->_res['cast'] = & $cast;
-
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets categories
-	 *
-	 *@return array
-	 */
-	public function genres()
-	{
-		$genres = array();
-		if ($ret = $this->_html->find('div.categories',0)) {
-			foreach ($ret->find('a') as $e) {
-				if (stristr($e->title, "->")) {
-					$e = explode("->",$e->plaintext);
-					$genres[] = trim($e[1]);
-				}
-			}
-			$this->_res['genres'] = & $genres;
-
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Get Box Cover Images
-	 * @return array - boxcover,backcover
-	 */
-	public function covers()
-	{
-		if ($ret = $this->_html->find('div#large_cover, img#cover', 1)) {
-			$this->_res['boxcover'] = trim($ret->src);
-			$this->_res['backcover'] = str_ireplace(".cover", ".back", trim($ret->src));
-		}else{
-			return false;
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Searches for match against searchterm
-	 * @return bool, true if search >= 90%
-	 */
-	public function search()
-	{
-		if (!isset($this->searchTerm)) {
-			return false;
-		}
-		$this->_getLink = self::HMURL . self::TRAILINGSEARCH . urlencode($this->searchTerm) . self::EXTRASEARCH;
-		if ($this->getUrl() === false) {
-			return false;
-		} else {
-			if ($ret = $this->_html->find('h3[class=title]', 0)) {
-				if ($ret->find('a[title]',0)){
-					$ret = $ret->find('a[title]', 0);
-					$title = trim($ret->title);
-					$title = preg_replace('/XXX/', '', $title);
-					$title = preg_replace('/\(.*?\)|[-._]/i', ' ', $title);
-					$this->_getLink = trim($ret->href);
-					$this->_directUrl = trim($ret->href);
-				}
-			} else {
-				return false;
-			}
-			if (isset($title)) {
-				similar_text($this->searchTerm, $title, $p);
-				if ($p >= 90) {
-					$this->_title = $title;
-					// 90$ match found, load the url to start parsing
-					$this->getUrl();
-					unset($ret);
-
-					return true;
-				} else {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/IAFD.php b/lib/copy_this/www/lib/IAFD.php
deleted file mode 100644
index 8369b7c20..000000000
--- a/lib/copy_this/www/lib/IAFD.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-
-class IAFD
-{
-
-
-	const ADE = "Adult DVD Empire";
-	const IAFDSEARCHURL = "http://iafd.com.prx.proxyunblocker.org/results.asp?searchtype=title&searchstring=";
-	const IAFDURL = "http://iafd.com.prx.proxyunblocker.org";
-	const HM = "Hot Movies";
-	public $classUsed = "";
-	public $cookie = "";
-	public $directUrl;
-	public $searchTerm = "";
-	public $title = "";
-	protected $_dvdFound = false;
-	protected $_doSearch = false;
-	protected $_getRedirect;
-	protected $_html;
-	protected $_res = array();
-	protected $_response;
-
-
-	public function __construct()
-	{
-		$this->_html = new \simple_html_dom();
-		if (isset($this->cookie)) {
-			@$this->getUrl();
-		}
-	}
-
-	private function getUrl()
-	{
-		if ($this->_doSearch === true) {
-			$ch = curl_init(self::IAFDSEARCHURL . urlencode($this->searchTerm));
-		} else {
-			if (empty($this->_getRedirect)) {
-				$ch = curl_init(self::IAFDURL);
-			} else {
-				$ch = curl_init($this->_getRedirect);
-			}
-		}
-
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-		if (isset($this->cookie)) {
-			curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		$this->_response = curl_exec($ch);
-		if (!empty($this->_getRedirect)) {
-			$this->_getRedirect = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-			curl_close($ch);
-
-			return $this->_getRedirect;
-		}
-		if (!$this->_response) {
-			curl_close($ch);
-
-			return false;
-		}
-		curl_close($ch);
-		if ($this->_doSearch === true) {
-			$this->_html->load($this->_response);
-			$this->_doSearch = false;
-		}
-		return true;
-	}
-
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->response);
-		unset($this->res);
-	}
-
-	public function findme()
-	{
-		if ($this->search() === true) {
-			if ($this->_html->find("div#commerce", 0)) {
-				foreach ($this->_html->find("div#commerce") as $e) {
-					foreach ($e->find("h4, p.item") as $h4) {
-						//echo ($h4->innertext) ."\n";
-						if (trim($h4->plaintext) == "DVD") {
-							$this->_dvdFound = true;
-							$h4 = null;
-						}
-						if ($this->_dvdFound === true && isset($h4)) {
-							foreach ($h4->find("a") as $alink) {
-								$compare = trim($alink->innertext);
-								if ($compare === self::ADE && !empty($compare)) {
-									$this->classUsed = "ade";
-									$this->_getRedirect = self::IAFDURL . trim($alink->href);
-									$this->directUrl = $this->getUrl();
-									$this->directUrl = preg_replace('/\?(.*)/', '', $this->directUrl);
-									$this->_dvdFound = false;
-									break;
-								}
-								if ($compare === self::HM && !empty($compare)) {
-									$this->classUsed = "hm";
-									$this->_getRedirect = self::IAFDURL . trim($alink->href);
-									$this->directUrl = $this->getUrl();
-									$this->directUrl = preg_replace('/\?(.*)/', '', $this->directUrl);
-									$this->directUrl = false;
-									break;
-								}
-							}
-						}
-					}
-				}
-			}
-			if (!isset($this->classUsed)) {
-				return false;
-			} else {
-				return true;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	private function search()
-	{
-
-		if (!isset($this->searchTerm)) {
-			return false;
-		}
-		$this->_doSearch = true;
-		if ($this->getUrl() === false) {
-			return false;
-		} else {
-			$firsttitle = null;
-			$secondtitle = null;
-			if ($ret = $this->_html->find("div#moviedata, h2, dt", 0)) {
-				if ($ret->find("h2", 0)) {
-					$firsttitle = $ret->find("h2", 0)->innertext;
-					if (preg_match("/Movie Titles/", $firsttitle)) {
-						return false;
-					}
-				}
-				if ($ret->find("dt", 0)) {
-					$secondtitle = $ret->find("dd", 0)->innertext;
-				}
-				unset($ret);
-				if (isset($secondtitle) || isset($firsttitle)) {
-					$firsttitle = preg_replace('/\(([0-9]+)\)/', "", $firsttitle);
-					$firsttitle = preg_replace('/XXX/', '', $firsttitle);
-					$firsttitle = preg_replace('/\(.*?\)|[-._]/i', ' ', $firsttitle);
-					$secondtitle = preg_replace('/\(([0-9]+)\)/', "", $secondtitle);
-					$secondtitle = preg_replace('/XXX/', '', $secondtitle);
-					$secondtitle = preg_replace('/\(.*?\)|[-._]/i', ' ', $secondtitle);
-					similar_text($this->searchTerm, trim($firsttitle), $p);
-					if ($p >= 90) {
-						$this->title = trim($firsttitle);
-						return true;
-					} else {
-						similar_text($this->searchTerm, trim($secondtitle), $p);
-						if ($p >= 90) {
-							$this->title = trim($secondtitle);
-							return true;
-						} else {
-							return false;
-						}
-					}
-				} else {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-
-	}
-
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Logger.php b/lib/copy_this/www/lib/Logger.php
deleted file mode 100644
index b12fe39ac..000000000
--- a/lib/copy_this/www/lib/Logger.php
+++ /dev/null
@@ -1,760 +0,0 @@
-<?php
-/**
- * Show log message to CLI/Web and log it to a file.
- * Turn these on in automated.config.php
- *
- * @example usage:
- *
- *          (in method, LOG_INFO would be the severity of your error, see below)
- *          $this->Logger->start("MyClassName", "MyMethodName", "My debug message.", LOG_INFO);
- */
-class Logger
-{
-	// You can use these constants when using the start method.
-	const LOG_FATAL   = 1; // Fatal error, the program exited.
-	const LOG_ERROR   = 2; // Recoverable error.
-	const LOG_WARNING = 3; // Warnings.
-	const LOG_NOTICE  = 4; // Notices.
-	const LOG_INFO    = 5; // Info message, not important.
-	const LOG_SQL     = 6; // Full SQL query when it fails.
-
-	/**
-	 * Name of class we are currently logging.
-	 * @var string
-	 * @access private
-	 */
-	private $class;
-
-	/**
-	 * Name of method we are currently logging.
-	 * @var string
-	 * @access private
-	 */
-	private $method;
-
-	/**
-	 * The log message.
-	 * @var string
-	 * @access private
-	 */
-	private $logMessage = '';
-
-	/**
-	 * Severity level.
-	 * @var string
-	 * @access private
-	 */
-	private $severity = '';
-
-	/**
-	 * Class instance of colorCLI
-	 * @var object
-	 * @access private
-	 */
-	private $colorCLI;
-
-	/**
-	 * Should we echo to CLI or web?
-	 * @var bool
-	 * @access private
-	 */
-	private $outputCLI = true;
-
-	/**
-	 * Cache of the date.
-	 * @var string
-	 * @access private
-	 */
-	private $dateCache = '';
-
-	/**
-	 * Cache of unix time.
-	 * @var int
-	 * @access private
-	 */
-	private $timeCache;
-
-	/**
-	 * Is this the windows O/S?
-	 * @var bool
-	 * @access private
-	 */
-	private $isWindows;
-
-	/**
-	 * Unix time instance was created.
-	 * @var int
-	 * @access private
-	 */
-	private $timeStart;
-
-	/**
-	 * @var resource|null Resource for log file.
-	 * @access private
-	 */
-	private $resource = null;
-
-	/**
-	 * How many old logs can we have max in the logs folder.
-	 * (per log type, ex.: debug can have x logs, not_yEnc can have x logs, etc)
-	 * @var int
-	 * @access private
-	 */
-	private $maxLogs;
-
-	/**
-	 * Max log size in MegaBytes.
-	 * @var int
-	 * @access private
-	 */
-	private $maxLogSize;
-
-	/**
-	 * Full path to the log file.
-	 * @var string
-	 * @access private
-	 */
-	private $logPath;
-
-	/**
-	 * Current name of the log file.
-	 * @var string
-	 * @access private
-	 */
-	private $currentLogName;
-
-	/**
-	 * Current folder to store log files.
-	 * @var string
-	 * @access private
-	 */
-	private $currentLogFolder;
-
-	/**
-	 * Show memory usage in log/cli out?
-	 * @var bool
-	 * @access private
-	 */
-	private $showMemoryUsage;
-
-	/**
-	 * Show CPU load in log/cli out?
-	 * @var bool
-	 * @access private
-	 */
-	private $showCPULoad;
-
-	/**
-	 * Show running time of script on log/cli out?
-	 * @var bool
-	 * @access private
-	 */
-	private $showRunningTime;
-
-	/**
-	 * Show resource usages on log/cli out?.
-	 * @var bool
-	 * @access private
-	 */
-	private $showResourceUsage;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param array $options (Optional) Class instances.
-	 *                       (Optional) Folder to store log files in.
-	 *                       (Optional) Filename of log, must be alphanumeric (a-z 0-9) and contain no file extensions.
-	 *
-	 * @access public
-	 * @throws LoggerException
-	 */
-	public function __construct(array $options = [])
-	{
-		if (!NN_LOGGING && !NN_DEBUG) {
-			return;
-		}
-
-		$defaults = [
-			'ColorCLI'    => null,
-			'LogFolder'   => '',
-			'LogFileName' => ''
-		];
-		$options += $defaults;
-
-		$this->colorCLI = ($options['ColorCLI'] instanceof ColorCLI ? $options['ColorCLI'] : new ColorCLI());
-
-		$this->getSettings();
-
-		$this->currentLogFolder = (
-			!empty($options['LogFolder'])
-				? $options['LogFolder']
-				: $this->currentLogFolder
-		);
-
-		$this->currentLogName = (
-			!empty($options['LogFileName'])
-				? $options['LogFileName']
-				: $this->currentLogName
-		) . '.log';
-
-		$this->setLogFile();
-
-		$this->outputCLI = (strtolower(PHP_SAPI) === 'cli');
-		$this->isWindows = (strtolower(substr(PHP_OS, 0, 3)) === 'win');
-		$this->timeStart = time();
-	}
-
-	/**
-	 * Close the log file resource.
-	 *
-	 * @access public
-	 */
-	public function __destruct()
-	{
-		$this->closeFile();
-	}
-
-	/**
-	 * Public method for logging and/or echoing log messages.
-	 *
-	 * @param string $class    The name of the class.
-	 * @param string $method   The method this is coming from.
-	 * @param string $message  The message to log/echo.
-	 * @param int    $severity How severe is this message?
-	 *               1 Fatal    - The program had to stop (exit).
-	 *               2 Error    - Something went very wrong but we recovered.
-	 *               3 Warning  - Not an error, but something we can probably fix.
-	 *               4 Notice   - User errors - the user did not enable any groups for example.
-	 *               5 Info     - General info, like we logged in to usenet for example.
-	 *               6 Query    - Failed SQL queries. (the full query).
-	 *
-	 * @access public
-	 */
-	public function log($class, $method, $message, $severity)
-	{
-		// Check if echo debugging or logging is on.
-		if (!NN_DEBUG && !NN_LOGGING) {
-			return;
-		}
-
-		$this->severity = $severity;
-		// Check the severity of the message, if disabled return, if enabled create part of the log message.
-		if (!$this->checkSeverity()) {
-			return;
-		}
-
-		$this->class = $class;
-		$this->method = $method;
-		$this->logMessage = $message;
-
-		$this->formLogMessage();
-		$this->echoMessage();
-		$this->logMessage();
-	}
-
-	/**
-	 * Return current/peak memory usage or difference between current/peak memory usage and previous usage.
-	 *
-	 * @param int  $oldUsage  Output from a previous memory_get_usage().
-	 * @param bool $realUsage Use (true)system memory usage or (false)emalloc() usage, use emalloc() for debugging.
-	 * @param bool $peak      Get peak memory usage.
-	 *
-	 * @return string
-	 *
-	 * @access public
-	 */
-	public function showMemUsage($oldUsage = 0, $realUsage = false, $peak = false)
-	{
-		$currentUsage = ($peak ? memory_get_peak_usage($realUsage)  : memory_get_usage($realUsage));
-		$actualUsage = ($oldUsage > 0 ? $currentUsage - $oldUsage : $currentUsage);
-
-		$units = [
-			'B ',
-			'KB',
-			'MB',
-			'GB',
-			'TB',
-			'PB'
-		];
-		return
-			str_pad(
-				number_format(
-					round(
-						$actualUsage
-						/
-						pow(
-							1024,
-							($i =
-								floor(
-									log(
-										$actualUsage,
-										1024
-									)
-								)
-							)
-						), 2
-					)
-				), 4, '~~~', STR_PAD_LEFT
-			) .
-			$units[(int)$i];
-	}
-
-	/**
-	 * Get resource usage string.
-	 *
-	 * @return bool|string
-	 *
-	 * @access public
-	 */
-	public function getResUsage()
-	{
-		if (!$this->isWindows) {
-			$usage = getrusage();
-
-			return
-				'USR: '  . $this->formatTimeString($usage['ru_utime.tv_sec']) .
-				' SYS: ' . $this->formatTimeString($usage['ru_stime.tv_sec']) .
-				' FAULTS: ' . $usage['ru_majflt'] .
-				' SWAPS: ' . $usage['ru_nswap'];
-		}
-		return false;
-	}
-
-	/**
-	 * Get system load.
-	 *
-	 * @return string|bool
-	 *
-	 * @access public
-	 */
-	public function getSystemLoad()
-	{
-		if (!$this->isWindows) {
-			$string = '';
-			// Fix for single digits (2) or single float (2.1).
-			foreach(sys_getloadavg() as $load) {
-				$strLen = strlen($load);
-				if ($strLen === 1) {
-					$string .= $load . '.00,';
-				} elseif ($strLen === 3) {
-					$string .= str_pad($load, 4, '0', STR_PAD_RIGHT) . ',';
-				} else {
-					$string .= $load . ',';
-				}
-			}
-			return substr($string, 0, -1);
-		}
-		return false;
-	}
-
-	/**
-	 * Changes the location of the log file.
-	 *
-	 * @param string $folder   Folder where the log should be stored.
-	 * @param string $fileName Name of the file (must be alphanumeric and contain no file extensions).
-	 * @access public
-	 */
-	public function changeLogFileLocation($folder, $fileName)
-	{
-		$this->currentLogFolder = $folder;
-		$this->currentLogName = $fileName;
-		$this->setLogFile();
-	}
-
-	/**
-	 * Get the log folder, log name and full path to the default log.
-	 *
-	 * @return array
-	 * @access public
-	 * @static
-	 */
-	static public function getDefaultLogPaths()
-	{
-		$defaultLogName = (defined('NN_LOGGING_LOG_NAME') ? NN_LOGGING_LOG_NAME : 'newznab');
-		$defaultLogName = (ctype_alnum($defaultLogName) ? $defaultLogName : 'newznab');
-		$defaultLogFolder = (defined('NN_LOGGING_LOG_FOLDER') && is_dir(NN_LOGGING_LOG_FOLDER) ? NN_LOGGING_LOG_FOLDER : NN_LOGS);
-		$defaultLogFolder = (in_array(substr($defaultLogFolder, -1), ['/', '\\']) ? $defaultLogFolder : $defaultLogFolder . DS);
-		return [
-			'LogFolder' => $defaultLogFolder,
-			'LogName'   => $defaultLogName,
-			'LogPath'   => $defaultLogFolder . $defaultLogName . '.log'
-		];
-	}
-
-	/**
-	 * Sets the path and name for the log file.
-	 *
-	 * @throws LoggerException
-	 * @access private
-	 */
-	private function setLogFile()
-	{
-		// Only run this if NN_LOGGING is on.
-		if (!NN_LOGGING) {
-			return;
-		}
-
-		$this->closeFile();
-
-		$this->logPath = $this->currentLogFolder . $this->currentLogName;
-
-		if (!is_dir($this->currentLogFolder)) {
-			$this->createFolder();
-		}
-
-		$this->initiateLog();
-
-		// Check if we need to rotate the log if it exceeds max size..
-		$this->rotateLog();
-
-		$this->openFile();
-	}
-
-	/**
-	 * Get/set all settings.
-	 * @access private
-	 */
-	private function getSettings()
-	{
-		$this->maxLogs = (defined('NN_LOGGING_MAX_LOGS') ? NN_LOGGING_MAX_LOGS : 20);
-		$this->maxLogs = ($this->maxLogs < 1 ? 20 : $this->maxLogs);
-		$this->maxLogSize = (defined('NN_LOGGING_MAX_SIZE') ? NN_LOGGING_MAX_SIZE : 30);
-		$this->maxLogSize = ($this->maxLogSize < 1 ? 30 : $this->maxLogSize);
-		$this->showMemoryUsage = (bool)(defined('NN_LOGGING_LOG_MEMORY_USAGE') ? NN_LOGGING_LOG_MEMORY_USAGE : true);
-		$this->showCPULoad = (bool)(defined('NN_LOGGING_LOG_CPU_LOAD') ? NN_LOGGING_LOG_CPU_LOAD : true);
-		$this->showRunningTime = (bool)(defined('NN_LOGGING_LOG_RUNNING_TIME') ? NN_LOGGING_LOG_RUNNING_TIME : true);
-		$this->showResourceUsage = (bool)(defined('NN_LOGGING_LOG_RESOURCE_USAGE') ? NN_LOGGING_LOG_RESOURCE_USAGE : false);
-		$paths = self::getDefaultLogPaths();
-		$this->currentLogName = $paths['LogName'];
-		$this->currentLogFolder = $paths['LogFolder'];
-	}
-
-	/**
-	 * Close the file resource.
-	 *
-	 * @access private
-	 */
-	private function closeFile()
-	{
-		if (is_resource($this->resource)) {
-			@fclose($this->resource);
-		}
-		$this->resource = null;
-	}
-
-	/**
-	 * Opens the log file.
-	 *
-	 * @throws LoggerException
-	 */
-	private function openFile()
-	{
-		if (!is_resource($this->resource)) {
-			$this->resource = @fopen($this->logPath, 'ab');
-
-			if (!$this->resource) {
-				throw new LoggerException('Unable to open log file ' . $this->logPath);
-			}
-		}
-	}
-
-	/**
-	 * Log message to file.
-	 *
-	 * @access private
-	 */
-	private function logMessage()
-	{
-		// Check if debug logging is on.
-		if (!NN_LOGGING) {
-			return;
-		}
-
-		clearstatcache(true, $this->logPath);
-
-		// Check if we should rotate the logs.
-		$this->rotateLog();
-
-		// If another process deleted the file, try to re-open it.
-		if (!is_file($this->logPath)) {
-			$this->setLogFile();
-		}
-
-		@fwrite($this->resource, $this->logMessage . PHP_EOL);
-	}
-
-	/**
-	 * Get the date and cache it.
-	 *
-	 * @return string
-	 *
-	 * @access private
-	 */
-	private function getDate()
-	{
-		// Cache the date, update it every 1 minute, since date() is extremely slow and time() is extremely fast.
-		if ($this->dateCache === '' || $this->timeCache < (time() - 60)) {
-			$this->dateCache = date('d/M/Y H:i');
-			$this->timeCache = time();
-		}
-
-		return $this->dateCache;
-	}
-
-	/**
-	 * Check if the log folder exists, if not create it.
-	 *
-	 * @access private
-	 * @throws LoggerException
-	 */
-	private function createFolder()
-	{
-		// Check if the log folder exists, create it if not.
-		if (!is_dir($this->currentLogFolder)) {
-			$old = umask(0777);
-			if (!mkdir($this->currentLogFolder)) {
-				throw new LoggerException('Unable to create log file folder ' . $this->currentLogFolder);
-			}
-			chmod($this->currentLogFolder, 0777);
-			umask($old);
-		}
-	}
-
-	/**
-	 * Initiate a log file.
-	 *
-	 * @access private
-	 * @throws LoggerException
-	 */
-	private function initiateLog()
-	{
-		if (!is_file($this->logPath)) {
-			if (!file_put_contents(
-					$this->logPath,
-					'[' . $this->getDate() . '] [INIT]   [Initiating new log file.]' . PHP_EOL)
-			) {
-				throw new LoggerException('Unable to create new log file ' . $this->logPath);
-			}
-			chmod($this->logPath, 0664);
-		}
-	}
-
-	/**
-	 * Rotate log file if it exceeds a certain size.
-	 *
-	 * @access private
-	 */
-	private function rotateLog()
-	{
-		// Check if we need to rotate the log if it exceeds max size..
-		$logSize = filesize($this->logPath);
-		if ($logSize === false) {
-			return;
-		} else if ($logSize >= ($this->maxLogSize * 1024 * 1024)) {
-			$this->closeFile();
-			$this->compressLog();
-			$this->initiateLog();
-			$this->pruneLogs();
-			$this->openFile();
-		}
-	}
-
-	/**
-	 * Compress the old log using GZip.
-	 *
-	 * @access private
-	 */
-	private function compressLog()
-	{
-		$handle = @fopen($this->logPath, 'rb');
-		$zipHandle = @gzopen(str_replace('.log', '', $this->logPath) . '.' . time() . '.gz', 'w6');
-		if (!$handle || !$zipHandle) {
-			return;
-		}
-
-		while (!feof($handle)) {
-			$data = @fread($handle, 32768);
-			@gzwrite($zipHandle, $data);
-		}
-
-		@fclose($handle);
-		@gzclose($zipHandle);
-
-		// Delete the original uncompressed log file.
-		unlink($this->logPath);
-	}
-
-	/**
-	 * Delete old logs (if we have more than $this->maxLogs).
-	 *
-	 * @access private
-	 */
-	private function pruneLogs()
-	{
-		// Get all the logs with the name.
-		$logs = glob(str_replace('.log', '', $this->logPath) . '.[0-9]*.gz');
-
-		// If there are no old logs or less than maxLogs return false.
-		if (!$logs || (count($logs) < $this->maxLogs)) {
-			return;
-		}
-
-		// Sort the logs alphabetically, so the oldest ones are at the top, the new at the bottom.
-		asort($logs);
-
-		// Remove all new logs from array (all elements under the last 51 elements of the array).
-		array_splice($logs, -$this->maxLogs+1);
-
-		// Delete all the logs left in the array.
-		array_map('unlink', $logs);
-	}
-
-	/**
-	 * Echo log message to CLI or web.
-	 *
-	 * @access private
-	 */
-	private function echoMessage()
-	{
-		if (!NN_DEBUG) {
-			return;
-		}
-
-		// Check if this is CLI or web.
-		if ($this->outputCLI) {
-			echo $this->colorCLI->debug($this->logMessage);
-		} else {
-			echo '<pre>' . $this->logMessage . '</pre><br />';
-		}
-	}
-
-	/**
-	 * Creates the message object for the log message.
-	 *
-	 * @access private
-	 */
-	private function formLogMessage()
-	{
-		$pid = getmypid();
-
-		$this->logMessage =
-			// Current date/time ; [02/Mar/2014 14:50 EST
-			'[' . $this->getDate() . '] ' .
-
-			// The severity.
-			$this->severity .
-
-			// Average system load.
-			(($this->showCPULoad && !$this->isWindows) ? ' [' . $this->getSystemLoad() . ']' : '') .
-
-			// Script running time.
-			($this->showRunningTime ? ' [' . $this->formatTimeString(time() - $this->timeStart) . ']' : '') .
-
-			// PHP memory usage.
-			($this->showMemoryUsage ? ' [MEM:' . $this->showMemUsage(0, true) . ']' : '') .
-
-			// Resource usage (user time, system time, major page faults, memory swaps).
-			(($this->showResourceUsage && !$this->isWindows) ? ' [' . $this->getResUsage() . ']' : '') .
-
-			// Running process id.
-			($pid ? ' [PID:' . $pid . ']' : '') .
-
-			// The class/function.
-			' [' . $this->class . '.' . $this->method . ']' .
-
-			' [' .
-
-			// Now reformat the log message, first stripping leading spaces.
-			trim(
-
-				// Removing 2 or more spaces.
-				preg_replace('/\s{2,}/', ' ',
-
-					// Removing new lines and carriage returns.
-					str_replace(["\n", '\n', "\r", '\r'], ' ', $this->logMessage)
-				)
-			) .
-
-			']';
-	}
-
-	/**
-	 * Convert seconds to hours minutes seconds string.
-	 *
-	 * @param int $seconds
-	 *
-	 * @return string
-	 *
-	 * @access private
-	 */
-	private function formatTimeString($seconds)
-	{
-		$time = '';
-		if ($seconds > 3600) {
-			$time .= str_pad(round((($seconds % 86400) / 3600)), 2, '0', STR_PAD_LEFT) . 'H:';
-		} else {
-			$time .= '00H:';
-		}
-		if ($seconds > 60) {
-			$time .= str_pad(round((($seconds % 3600) / 60)), 2 , '0', STR_PAD_LEFT) . 'M:';
-		} else {
-			$time .= '00M:';
-		}
-		$time .= str_pad($seconds % 60, 2 , '0', STR_PAD_LEFT) . 'S';
-		return $time;
-	}
-
-	/**
-	 * Check if the user wants to echo or log this message, form part of the log message at the same time.
-	 *
-	 * @return bool
-	 *
-	 * @access private
-	 */
-	private function checkSeverity()
-	{
-		switch ($this->severity) {
-			case self::LOG_FATAL:
-				if (NN_LOGFATAL) {
-					$this->severity = '[FATAL] ';
-					return true;
-				}
-				return false;
-			case self::LOG_ERROR:
-				if (NN_LOGERROR) {
-					$this->severity = '[ERROR] ';
-					return true;
-				}
-				return false;
-			case self::LOG_WARNING:
-				if (NN_LOGWARNING) {
-					$this->severity = '[WARN]  ';
-					return true;
-				}
-				return false;
-			case self::LOG_NOTICE:
-				if (NN_LOGNOTICE) {
-					$this->severity = '[NOTICE]';
-					return true;
-				}
-				return false;
-			case self::LOG_INFO:
-				if (NN_LOGINFO) {
-					$this->severity = '[INFO]  ';
-					return true;
-				}
-				return false;
-			case self::LOG_SQL:
-				if (NN_LOGQUERIES) {
-					$this->severity = '[SQL]   ';
-					return true;
-				}
-				return false;
-			default:
-				return false;
-		}
-	}
-
-}
-
-class LoggerException extends Exception {}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Musik.php b/lib/copy_this/www/lib/Musik.php
deleted file mode 100644
index ad6c515fe..000000000
--- a/lib/copy_this/www/lib/Musik.php
+++ /dev/null
@@ -1,827 +0,0 @@
-<?php
-require_once NN_LIB . 'amazon.php';
-require_once NN_LIB . 'util.php';
-require_once NN_LIB . 'category.php';
-require_once NN_LIB . 'releaseimage.php';
-require_once NN_LIB . 'framework' . DS . 'db.php';
-
-
-
-/**
- * Class Musik
- */
-class Musik
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $pubkey;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $privkey;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $asstag;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $musicqty;
-
-	/**
-	 * @var array|bool|int|string
-	 */
-	public $sleeptime;
-
-	/**
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var string
-	 */
-	public $renamed;
-
-	/**
-	 * @param array $options Class instances/ echo to CLI.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->pubkey = $this->site->amazonpubkey;
-		$this->privkey = $this->site->amazonprivkey;
-		$this->asstag = $this->site->amazonassociatetag;
-		$this->musicqty = ($this->site->maxmusicprocessed != '') ? $this->site->maxmusicprocessed : 150;
-		$this->sleeptime = ($this->site->amazonsleep != '') ? $this->site->amazonsleep : 1000;
-		$this->imgSavePath = NN_COVERS . 'music' . DS;
-		$this->renamed = '';
-		if ($this->site->lookupmusic == 2) {
-			$this->renamed = 'AND isrenamed = 1';
-		}
-	}
-
-	/**
-	 * @param $id
-	 *
-	 * @return array|bool
-	 */
-	public function getMusicInfo($id)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT musicinfo.*, genres.title AS genres FROM musicinfo LEFT OUTER JOIN genres ON genres.id = musicinfo.genreID WHERE musicinfo.id = %d ", $id));
-	}
-
-	/**
-	 * @param $artist
-	 * @param $album
-	 *
-	 * @return array|bool
-	 */
-	public function getMusicInfoByName($artist, $album)
-	{
-		$pdo = $this->pdo;
-		$like = 'ILIKE';
-		if ($pdo->dbSystem() === 'mysql') {
-			$like = 'LIKE';
-		}
-
-		//only used to get a count of words
-		$searchwords = $searchsql = '';
-		$ft = $pdo->queryDirect("SHOW INDEX FROM musicinfo WHERE key_name = 'ix_musicinfo_artist_title_ft'");
-		if ($ft->rowCount() !== 2) {
-			$searchsql .= sprintf(" artist LIKE %s AND title %s %s'", $pdo->escapeString('%' . $artist . '%'), $like, $pdo->escapeString('%' . $album . '%'));
-		} else {
-			$album = preg_replace('/( - | -|\(.+\)|\(|\))/', ' ', $album);
-			$album = preg_replace('/[^\w ]+/', '', $album);
-			$album = preg_replace('/(WEB|FLAC|CD)/', '', $album);
-			$album = trim(preg_replace('/\s\s+/i', ' ', $album));
-			$album = trim($album);
-			$words = explode(' ', $album);
-
-			foreach ($words as $word) {
-				$word = trim(rtrim(trim($word), '-'));
-				if ($word !== '' && $word !== '-') {
-					$word = '+' . $word;
-					$searchwords .= sprintf('%s ', $word);
-				}
-			}
-			$searchwords = trim($searchwords);
-			$searchsql .= sprintf(" MATCH(artist, title) AGAINST(%s IN BOOLEAN MODE)", $pdo->escapeString($searchwords));
-		}
-		return $pdo->queryOneRow(sprintf("SELECT * FROM musicinfo WHERE %s", $searchsql));
-	}
-
-	/**
-	 * @param $start
-	 * @param $num
-	 *
-	 * @return array
-	 */
-	public function getRange($start, $num)
-	{
-
-
-		if ($start === false) {
-			$limit = "";
-		} else {
-			$limit = " LIMIT " . $num . " OFFSET " . $start;
-		}
-
-		return $this->pdo->query(" SELECT * FROM musicinfo ORDER BY createddate DESC" . $limit);
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getCount()
-	{
-
-		$res = $this->pdo->queryOneRow("SELECT COUNT(id) AS num FROM musicinfo");
-		return $res["num"];
-	}
-
-	/**
-	 * @param       $cat
-	 * @param       $maxage
-	 * @param array $excludedcats
-	 *
-	 * @return mixed
-	 */
-	public function getMusicCount($cat, $maxage = -1, $excludedcats = array())
-	{
-
-
-		$browseby = $this->getBrowseBy();
-
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		if ($maxage > 0) {
-			$maxage = sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxage);
-		} else {
-			$maxage = '';
-		}
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0) {
-			$exccatlist = " AND r.categoryid NOT IN (" . implode(",", $excludedcats) . ")";
-		}
-
-		$sql = sprintf("SELECT COUNT(DISTINCT r.musicinfoid) AS num FROM releases r INNER JOIN musicinfo m ON m.id = r.musicinfoid AND m.title != '' AND m.cover = 1 WHERE nzbstatus = 1 AND r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') AND %s %s %s %s", $browseby, $catsrch, $maxage, $exccatlist);
-		$res = $this->pdo->queryOneRow($sql);
-		return $res["num"];
-	}
-
-	/**
-	 * @param       $cat
-	 * @param       $start
-	 * @param       $num
-	 * @param       $orderby
-	 * @param array $excludedcats
-	 *
-	 * @return array
-	 */
-	public function getMusicRange($cat, $start, $num, $orderby, $excludedcats = array())
-	{
-
-
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false) {
-			$limit = "";
-		} else {
-			$limit = " LIMIT " . $num . " OFFSET " . $start;
-		}
-
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0) {
-			$exccatlist = " AND r.categoryid NOT IN (" . implode(",", $excludedcats) . ")";
-		}
-
-		$order = $this->getMusicOrder($orderby);
-		return $this->pdo->query(sprintf("SELECT GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id, "
-					. "GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount, "
-					. "GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview, "
-					. "GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password, "
-					. "GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid, "
-					. "GROUP_CONCAT(rn.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid, "
-					. "GROUP_CONCAT(groups.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname, "
-					. "GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name, "
-					. "GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate, "
-					. "GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size, "
-					. "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, "
-					. "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, "
-					. "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, "
-					. "m.*, r.musicinfoid, groups.name AS group_name, rn.id as nfoid FROM releases r "
-					. "LEFT OUTER JOIN groups ON groups.id = r.groupid "
-					. "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id "
-					. "INNER JOIN musicinfo m ON m.id = r.musicinfoid "
-					. "WHERE r.nzbstatus = 1 AND m.title != '' AND "
-					. "r.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') AND %s %s %s "
-					. "GROUP BY m.id ORDER BY %s %s" . $limit, $browseby, $catsrch, $exccatlist, $order[0], $order[1]));
-	}
-
-	/**
-	 * @param $orderby
-	 *
-	 * @return array
-	 */
-	public function getMusicOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode("_", $order);
-		switch ($orderArr[0]) {
-			case 'artist':
-				$orderfield = 'm.artist';
-				break;
-			case 'size':
-				$orderfield = 'r.size';
-				break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-				break;
-			case 'year':
-				$orderfield = 'm.year';
-				break;
-			case 'genre':
-				$orderfield = 'm.genreID';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getMusicOrdering()
-	{
-		return array('artist_asc', 'artist_desc', 'posted_asc', 'posted_desc', 'size_asc', 'size_desc', 'files_asc', 'files_desc', 'stats_asc', 'stats_desc', 'year_asc', 'year_desc', 'genre_asc', 'genre_desc');
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getBrowseByOptions()
-	{
-		return array('artist' => 'artist', 'title' => 'title', 'genre' => 'genreID', 'year' => 'year');
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getBrowseBy()
-	{
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		foreach ($browsebyArr as $bbk => $bbv) {
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk])) {
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				if (preg_match('/id/i', $bbv)) {
-					$browseby .= 'm.' . $bbv . ' = ' . $bbs . ' AND ';
-				} else {
-					$browseby .= 'm.' . $bbv . ' ' . $this->pdo->likeString($bbs, true, true) . ' AND ';
-				}
-			}
-		}
-		return $browseby;
-	}
-
-	/**
-	 * @param $data
-	 * @param $field
-	 *
-	 * @return string
-	 */
-	public function makeFieldLinks($data, $field)
-	{
-		$tmpArr = explode(', ', $data[$field]);
-		$newArr = array();
-		$i = 0;
-		foreach ($tmpArr as $ta) {
-			if ($i > 5) {
-				break;
-			} //only use first 6
-			$newArr[] = '<a href="' . WWW_TOP . '/music?' . $field . '=' . urlencode($ta) . '" title="' . $ta . '">' . $ta . '</a>';
-			$i++;
-		}
-		return implode(', ', $newArr);
-	}
-
-	/**
-	 * @param $id
-	 * @param $title
-	 * @param $asin
-	 * @param $url
-	 * @param $salesrank
-	 * @param $artist
-	 * @param $publisher
-	 * @param $releasedate
-	 * @param $year
-	 * @param $tracks
-	 * @param $cover
-	 * @param $genreID
-	 */
-	public function update($id, $title, $asin, $url, $salesrank, $artist, $publisher, $releasedate, $year, $tracks, $cover, $genreID)
-	{
-		$this->pdo->queryExec(
-					sprintf("
-						UPDATE musicinfo
-						SET title = %s, asin = %s, url = %s, salesrank = %s, artist = %s, publisher = %s, releasedate = %s,
-							year = %s, tracks = %s, cover = %d, genreID = %d, updateddate = NOW()
-						WHERE id = %d",
-						$this->pdo->escapeString($title), $this->pdo->escapeString($asin),
-						$this->pdo->escapeString($url), $salesrank, $this->pdo->escapeString($artist),
-						$this->pdo->escapeString($publisher), $this->pdo->escapeString($releasedate),
-						$this->pdo->escapeString($year), $this->pdo->escapeString($tracks), $cover, $genreID, $id
-					)
-		);
-	}
-
-	/**
-	 * @param      $title
-	 * @param      $year
-	 * @param null $amazdata
-	 *
-	 * @return bool
-	 */
-	public function updateMusicInfo($title, $year, $amazdata = null)
-	{
-		$gen = new \Genres(['Settings' => $this->pdo]);
-		$ri = new \ReleaseImage($this->pdo);
-		$titlepercent = 0;
-
-		$mus = array();
-		if ($title != '') {
-			$amaz = $this->fetchAmazonProperties($title);
-		} else if ($amazdata != null) {
-			$amaz = $amazdata;
-		} else {
-			$amaz = false;
-		}
-
-		if (!$amaz) {
-			return false;
-		}
-
-		if (isset($amaz->Items->Item->ItemAttributes->Title)) {
-			$mus['title'] = (string)$amaz->Items->Item->ItemAttributes->Title;
-			if (empty($mus['title'])) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-
-		// Load genres.
-		$defaultGenres = $gen->getGenres(\Genres::MUSIC_TYPE);
-		$genreassoc = array();
-		foreach ($defaultGenres as $dg) {
-			$genreassoc[$dg['id']] = strtolower($dg['title']);
-		}
-
-		// Get album properties.
-		$mus['coverurl'] = (string)$amaz->Items->Item->LargeImage->URL;
-		if ($mus['coverurl'] != "") {
-			$mus['cover'] = 1;
-		} else {
-			$mus['cover'] = 0;
-		}
-
-		$mus['asin'] = (string)$amaz->Items->Item->ASIN;
-
-		$mus['url'] = (string)$amaz->Items->Item->DetailPageURL;
-		$mus['url'] = str_replace("%26tag%3Dws", "%26tag%3Dopensourceins%2D21", $mus['url']);
-
-		$mus['salesrank'] = (string)$amaz->Items->Item->SalesRank;
-		if ($mus['salesrank'] == "") {
-			$mus['salesrank'] = 'null';
-		}
-
-		$mus['artist'] = (string)$amaz->Items->Item->ItemAttributes->Artist;
-		if (empty($mus['artist'])) {
-			$mus['artist'] = (string)$amaz->Items->Item->ItemAttributes->Creator;
-			if (empty($mus['artist'])) {
-				$mus['artist'] = "";
-			}
-		}
-
-		$mus['publisher'] = (string)$amaz->Items->Item->ItemAttributes->Publisher;
-
-		$mus['releasedate'] = $this->pdo->escapeString((string)$amaz->Items->Item->ItemAttributes->ReleaseDate);
-		if ($mus['releasedate'] == "''") {
-			$mus['releasedate'] = 'null';
-		}
-
-		$mus['review'] = "";
-		if (isset($amaz->Items->Item->EditorialReviews)) {
-			$mus['review'] = trim(strip_tags((string)$amaz->Items->Item->EditorialReviews->EditorialReview->Content));
-		}
-
-		$mus['year'] = $year;
-		if ($mus['year'] == "") {
-			$mus['year'] = ($mus['releasedate'] != 'null' ? substr($mus['releasedate'], 1, 4) : date("Y"));
-		}
-
-		$mus['tracks'] = "";
-		if (isset($amaz->Items->Item->Tracks)) {
-			$tmpTracks = (array)$amaz->Items->Item->Tracks->Disc;
-			$tracks = $tmpTracks['Track'];
-			$mus['tracks'] = (is_array($tracks) && !empty($tracks)) ? implode('|', $tracks) : '';
-		}
-
-		similar_text($mus['artist'] . " " . $mus['title'], $title, $titlepercent);
-		if ($titlepercent < 60) {
-			return false;
-		}
-
-		$genreKey = -1;
-		$genreName = '';
-		if (isset($amaz->Items->Item->BrowseNodes)) {
-			// Had issues getting this out of the browsenodes obj.
-			// Workaround is to get the xml and load that into its own obj.
-			$amazGenresXml = $amaz->Items->Item->BrowseNodes->asXml();
-			$amazGenresObj = simplexml_load_string($amazGenresXml);
-			$amazGenres = $amazGenresObj->xpath("//BrowseNodeId");
-
-			foreach ($amazGenres as $amazGenre) {
-				$currNode = trim($amazGenre[0]);
-				if (empty($genreName)) {
-					$genreMatch = $this->matchBrowseNode($currNode);
-					if ($genreMatch !== false) {
-						$genreName = $genreMatch;
-						break;
-					}
-				}
-			}
-
-			if (in_array(strtolower($genreName), $genreassoc)) {
-				$genreKey = array_search(strtolower($genreName), $genreassoc);
-			} else {
-				$genreKey = $this->pdo->queryInsert(
-									sprintf("
-										INSERT INTO genres (title, type)
-										VALUES (%s, %d)",
-										$this->pdo->escapeString($genreName),
-										\Genres::MUSIC_TYPE
-									)
-				);
-			}
-		}
-		$mus['musicgenre'] = $genreName;
-		$mus['musicgenreid'] = $genreKey;
-
-		$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM musicinfo WHERE asin = %s', $this->pdo->escapeString($mus['asin'])));
-		if ($check === false) {
-			$musicId = $this->pdo->queryInsert(sprintf("INSERT INTO musicinfo (title, asin, url, salesrank, artist, publisher, "
-					. "releasedate, review, year, genreID, tracks, cover, createddate, updateddate) VALUES "
-					. "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, now(), now())", $this->pdo->escapeString($mus['title']), $this->pdo->escapeString($mus['asin']), $this->pdo->escapeString($mus['url']), $mus['salesrank'], $this->pdo->escapeString($mus['artist']), $this->pdo->escapeString($mus['publisher']), $mus['releasedate'], $this->pdo->escapeString($mus['review']), $this->pdo->escapeString($mus['year']), ($mus['musicgenreid'] == -1 ? "null" : $mus['musicgenreid']), $this->pdo->escapeString($mus['tracks']), $mus['cover']));
-		} else {
-			$musicId = $check['id'];
-			$this->pdo->queryExec(sprintf('UPDATE musicinfo SET title = %s, asin = %s, url = %s, salesrank = %s, artist = %s, '
-					. 'publisher = %s, releasedate = %s, review = %s, year = %s, genreID = %s, tracks = %s, cover = %s, '
-					. 'updateddate = NOW() WHERE id = %d', $this->pdo->escapeString($mus['title']), $this->pdo->escapeString($mus['asin']), $this->pdo->escapeString($mus['url']), $mus['salesrank'], $this->pdo->escapeString($mus['artist']), $this->pdo->escapeString($mus['publisher']), $mus['releasedate'], $this->pdo->escapeString($mus['review']), $this->pdo->escapeString($mus['year']), ($mus['musicgenreid'] == -1 ? "null" : $mus['musicgenreid']), $this->pdo->escapeString($mus['tracks']), $mus['cover'], $musicId));
-		}
-
-		if ($musicId) {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->header("\nAdded/updated album: ") .
-					$this->pdo->log->alternateOver("   Artist: ") .
-					$this->pdo->log->primary($mus['artist']) .
-					$this->pdo->log->alternateOver("   Title:  ") .
-					$this->pdo->log->primary($mus['title']) .
-					$this->pdo->log->alternateOver("   Year:   ") .
-					$this->pdo->log->primary($mus['year'])
-				);
-			}
-			$mus['cover'] = $ri->saveImage($musicId, $mus['coverurl'], $this->imgSavePath, 250, 250);
-		} else {
-			if ($this->echooutput) {
-				if ($mus["artist"] == "") {
-					$artist = "";
-				} else {
-					$artist = "Artist: " . $mus['artist'] . ", Album: ";
-				}
-				$this->pdo->log->doEcho(
-					$this->pdo->log->headerOver("Nothing to update: ") .
-					$this->pdo->log->primaryOver(
-						$artist .
-						$mus['title'] .
-						" (" .
-						$mus['year'] .
-						")"
-					)
-				);
-			}
-		}
-
-		return $musicId;
-	}
-
-	/**
-	 * @param $title
-	 *
-	 * @return bool|mixed
-	 */
-	public function fetchAmazonProperties($title)
-	{
-		$result = false;
-		$obj = new \AmazonProductAPI($this->pubkey, $this->privkey, $this->asstag);
-		// Try Music category.
-		try {
-			$result = $obj->searchProducts($title, \AmazonProductAPI::MUSIC, "TITLE");
-		} catch (Exception $e) {
-			// Empty because we try another method.
-		}
-
-		// Try MP3 category.
-		if ($result === false) {
-			usleep(700000);
-			try {
-				$result = $obj->searchProducts($title, \AmazonProductAPI::MP3, "TITLE");
-			} catch (Exception $e) {
-				// Empty because we try another method.
-			}
-		}
-
-		// Try Digital Music category.
-		if ($result === false) {
-			usleep(700000);
-			try {
-				$result = $obj->searchProducts($title, \AmazonProductAPI::DIGITALMUS, "TITLE");
-			} catch (Exception $e) {
-				// Empty because we try another method.
-			}
-		}
-
-		// Try Music Tracks category.
-		if ($result === false) {
-			usleep(700000);
-			try {
-				$result = $obj->searchProducts($title, \AmazonProductAPI::MUSICTRACKS, "TITLE");
-			} catch (Exception $e) {
-				// Empty because we exhausted all possibilities.
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 *
-	 */
-	public function processMusicReleases($local = false)
-	{
-		$res = $this->pdo->queryDirect(sprintf('SELECT searchname, id FROM releases '
-				. 'WHERE musicinfoid IS NULL AND nzbstatus = 1 %s AND categoryid IN (3010, 3040, 3050) '
-				. 'ORDER BY postdate DESC LIMIT %d', $this->renamed, $this->musicqty));
-		if ($res instanceof \Traversable && $res->rowCount() > 0) {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->header("Processing " . $res->rowCount() .' music release(s).'
-					)
-				);
-			}
-
-			foreach ($res as $arr) {
-				$startTime = microtime(true);
-				$usedAmazon = false;
-				$album = $this->parseArtist($arr['searchname']);
-				if ($album !== false) {
-					$newname = $album["name"] . ' (' . $album["year"] . ')';
-
-					if ($this->echooutput) {
-						$this->pdo->log->doEcho($this->pdo->log->headerOver('Looking up: ') . $this->pdo->log->primary($newname));
-					}
-
-					// Do a local lookup first
-					$musicCheck = $this->getMusicInfoByName('', $album["name"]);
-
-					if ($musicCheck === false && $local === false) {
-						$albumId = $this->updateMusicInfo($album["name"], $album['year']);
-						$usedAmazon = true;
-						if ($albumId === false) {
-							$albumId = -2;
-						}
-					} else {
-						$albumId = $musicCheck['id'];
-					}
-
-					// Update release.
-					$this->pdo->queryExec(sprintf("UPDATE releases SET musicinfoid = %d WHERE id = %d", $albumId, $arr["id"]));
-				} // No album found.
-				else {
-					$this->pdo->queryExec(sprintf("UPDATE releases SET musicinfoid = %d WHERE id = %d", -2, $arr["id"]));
-					echo '.';
-				}
-
-				// Sleep to not flood amazon.
-				$diff = floor((microtime(true) - $startTime) * 1000000);
-				if ($this->sleeptime * 1000 - $diff > 0 && $usedAmazon === true) {
-					usleep($this->sleeptime * 1000 - $diff);
-				}
-			}
-
-			if ($this->echooutput) {
-				echo "\n";
-			}
-
-		} else {
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header('No music releases to process.'));
-			}
-		}
-	}
-
-	/**
-	 * @param $releasename
-	 *
-	 * @return array|bool
-	 */
-	public function parseArtist($releasename)
-	{
-		if (preg_match('/(.+?)(\d{1,2} \d{1,2} )?\(?(19\d{2}|20[0-1][0-9])\b/', $releasename, $name)) {
-			$result = array();
-			$result["year"] = $name[3];
-
-			$a = preg_replace('/ (\d{1,2} \d{1,2} )?(Bootleg|Boxset|Clean.+Version|Compiled by.+|\dCD|Digipak|DIRFIX|DVBS|FLAC|(Ltd )?(Deluxe|Limited|Special).+Edition|Promo|PROOF|Reissue|Remastered|REPACK|RETAIL(.+UK)?|SACD|Sampler|SAT|Summer.+Mag|UK.+Import|Deluxe.+Version|VINYL|WEB)/i', ' ', $name[1]);
-			$b = preg_replace('/ ([a-z]+[0-9]+[a-z]+[0-9]+.+|[a-z]{2,}[0-9]{2,}?.+|3FM|B00[a-z0-9]+|BRC482012|H056|UXM1DW086|(4WCD|ATL|bigFM|CDP|DST|ERE|FIM|MBZZ|MSOne|MVRD|QEDCD|RNB|SBD|SFT|ZYX) \d.+)/i', ' ', $a);
-			$c = preg_replace('/ (\d{1,2} \d{1,2} )?([A-Z])( ?$)|\(?[0-9]{8,}\)?| (CABLE|FREEWEB|LINE|MAG|MCD|YMRSMILES)|\(([a-z]{2,}[0-9]{2,}|ost)\)|-web-/', ' ', $b);
-			$d = preg_replace('/VA( |-)/', 'Various Artists ', $c);
-			$e = preg_replace('/ (\d{1,2} \d{1,2} )?(DAB|DE|DVBC|EP|FIX|IT|Jap|NL|PL|(Pure )?FM|SSL|VLS) /i', ' ', $d);
-			$f = preg_replace('/ (\d{1,2} \d{1,2} )?(CABLE|CD(A|EP|M|R|S)?|QEDCD|SAT|SBD) /i', ' ', $e);
-			$g = str_replace(array('_', '-'), ' ', $f);
-			$h = trim(preg_replace('/\s\s+/', ' ', $g));
-			$newname = trim(preg_replace('/ [a-z]{2}$| [a-z]{3} \d{2,}$|\d{5,} \d{5,}$|-WEB$/i', '', $h));
-
-			if (!preg_match('/^[a-z0-9]+$/i', $newname) && strlen($newname) > 10) {
-				$result["name"] = $newname;
-				return $result;
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param bool $activeOnly
-	 *
-	 * @return array
-	 */
-	public function getGenres($activeOnly = false)
-	{
-		if ($activeOnly) {
-			return $this->pdo->query("SELECT musicgenre.* FROM musicgenre INNER JOIN (SELECT DISTINCT musicgenreid FROM musicinfo) x ON x.musicgenreID = musicgenre.id ORDER BY title");
-		} else {
-			return $this->pdo->query("SELECT * FROM musicgenre ORDER BY title");
-		}
-	}
-
-	/**
-	 * @param $nodeId
-	 *
-	 * @return bool|string
-	 */
-	public function matchBrowseNode($nodeId)
-	{
-		$str = '';
-
-		//music nodes above mp3 download nodes
-		switch ($nodeId) {
-			case '163420':
-				$str = 'Music Video & Concerts';
-				break;
-			case '30':
-			case '624869011':
-				$str = 'Alternative Rock';
-				break;
-			case '31':
-			case '624881011':
-				$str = 'Blues';
-				break;
-			case '265640':
-			case '624894011':
-				$str = 'Broadway & Vocalists';
-				break;
-			case '173425':
-			case '624899011':
-				$str = "Children's Music";
-				break;
-			case '173429': //christian
-			case '2231705011': //gospel
-			case '624905011': //christian & gospel
-				$str = 'Christian & Gospel';
-				break;
-			case '67204':
-			case '624916011':
-				$str = 'Classic Rock';
-				break;
-			case '85':
-			case '624926011':
-				$str = 'Classical';
-				break;
-			case '16':
-			case '624976011':
-				$str = 'Country';
-				break;
-			case '7': //dance & electronic
-			case '624988011': //dance & dj
-				$str = 'Dance & Electronic';
-				break;
-			case '32':
-			case '625003011':
-				$str = 'Folk';
-				break;
-			case '67207':
-			case '625011011':
-				$str = 'Hard Rock & Metal';
-				break;
-			case '33': //world music
-			case '625021011': //international
-				$str = 'World Music';
-				break;
-			case '34':
-			case '625036011':
-				$str = 'Jazz';
-				break;
-			case '289122':
-			case '625054011':
-				$str = 'Latin Music';
-				break;
-			case '36':
-			case '625070011':
-				$str = 'New Age';
-				break;
-			case '625075011':
-				$str = 'Opera & Vocal';
-				break;
-			case '37':
-			case '625092011':
-				$str = 'Pop';
-				break;
-			case '39':
-			case '625105011':
-				$str = 'R&B';
-				break;
-			case '38':
-			case '625117011':
-				$str = 'Rap & Hip-Hop';
-				break;
-			case '40':
-			case '625129011':
-				$str = 'Rock';
-				break;
-			case '42':
-			case '625144011':
-				$str = 'Soundtracks';
-				break;
-			case '35':
-			case '625061011':
-				$str = 'Miscellaneous';
-				break;
-		}
-		return ($str != '') ? $str : false;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/NZBImport.php b/lib/copy_this/www/lib/NZBImport.php
deleted file mode 100644
index 581a2953b..000000000
--- a/lib/copy_this/www/lib/NZBImport.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/Categorize.php");
-require_once(NN_TMUX . 'lib' . DS . 'ReleaseCleaner.php');
-require_once(NN_TMUX . 'lib' . DS . 'Enzebe.php');
-
-/**
- * Import NZB files into the database.
- * Class NZBImport
- */
-class NZBImport
-{
-	/**
-	 * @var \DB
-	 * @access protected
-	 */
-	protected $pdo;
-
-	/**
-	 * @var Binaries
-	 * @access protected
-	 */
-	protected $binaries;
-
-	/**
-	 * @var ReleaseCleaning
-	 * @access protected
-	 */
-	protected $releaseCleaner;
-
-	/**
-	 * @var bool|stdClass
-	 * @access protected
-	 */
-	protected $site;
-
-	/**
-	 * @var int
-	 * @access protected
-	 */
-	protected $crossPostt;
-
-	/**
-	 * @var Categorize
-	 * @access protected
-	 */
-	protected $category;
-
-	/**
-	 * List of all the group names/ids in the DB.
-	 * @var array
-	 * @access protected
-	 */
-	protected $allGroups;
-
-	/**
-	 * Was this run from the browser?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $browser;
-
-	/**
-	 * Return value for browser.
-	 * @var string
-	 * @access protected
-	 */
-	protected $retVal;
-
-	/**
-	 * Guid of the current releases.
-	 * @var string
-	 * @access protected
-	 */
-	protected $relGuid;
-
-	/**
-	 * @var bool
-	 */
-	public $echoCLI;
-
-	/**
-	 * @var NZB
-	 */
-	public $nzb;
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options Class instances / various options.
-	 *
-	 * @access public
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Browser'          => false, // Was this started from the browser?
-			'Echo'             => true,  // Echo to CLI?
-			'Binaries'         => null,
-			'Categorize'       => null,
-			'NZB'              => null,
-			'ReleaseCleaning'  => null,
-			'Releases'         => null,
-			'Settings'         => null,
-		];
-		$options += $defaults;
-
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->echoCLI = (!$this->browser && NN_ECHOCLI && $options['Echo']);
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->binaries = ($options['Binaries'] instanceof \Binaries ? $options['Binaries'] : new \Binaries(['Settings' => $this->pdo, 'Echo' => $this->echoCLI]));
-		$this->category = ($options['Categorize'] instanceof \Categorize ? $options['Categorize'] : new \Categorize(['Settings' => $this->pdo]));
-		$this->nzb = ($options['NZB'] instanceof \NZB ? $options['NZB'] : new \NZB($this->pdo));
-		$this->releaseCleaner = ($options['ReleaseCleaning'] instanceof \ReleaseCleaning ? $options['ReleaseCleaning'] : new \ReleaseCleaning($this->pdo));
-		$this->releases = ($options['Releases'] instanceof \Releases ? $options['Releases'] : new \Releases(['settings' => $this->pdo]));
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->crossPostt = ($this->site->crossposttime != '') ? $this->site->crossposttime : 2;
-		$this->browser = $options['Browser'];
-		$this->retVal = '';
-	}
-
-	/**
-	 * @param array $filesToProcess List of NZB files to import.
-	 * @param bool|string $useNzbName Use the NZB file name as release name?
-	 * @param bool $delete Delete the NZB when done?
-	 * @param bool $deleteFailed Delete the NZB if failed importing?
-	 *
-	 * @return string|bool
-	 *
-	 * @access public
-	 */
-	public function beginImport($filesToProcess, $useNzbName = false, $delete = true, $deleteFailed = true)
-	{
-		// Get all the groups in the DB.
-		if (!$this->getAllGroups()) {
-			if ($this->browser) {
-				return $this->retVal;
-			} else {
-				return false;
-			}
-		}
-
-		$start = date('Y-m-d H:i:s');
-		$nzbsImported = $nzbsSkipped = 0;
-
-		// Loop over the file names.
-		foreach ($filesToProcess as $nzbFile) {
-
-			// Check if the file is really there.
-			if (is_file($nzbFile)) {
-
-				// Get the contents of the NZB file as a string.
-				if (strtolower(substr($nzbFile, -7)) === '.nzb.gz') {
-					$nzbString = Utility::unzipGzipFile($nzbFile);
-				} else {
-					$nzbString = file_get_contents($nzbFile);
-				}
-
-				if ($nzbString === false) {
-					$this->echoOut('ERROR: Unable to read: ' . $nzbFile);
-
-					if ($deleteFailed) {
-						@unlink($nzbFile);
-					}
-					$nzbsSkipped++;
-					continue;
-				}
-
-				// Load it as a XML object.
-				$nzbXML = @simplexml_load_string($nzbString);
-				if ($nzbXML === false || strtolower($nzbXML->getName()) != 'nzb') {
-					$this->echoOut('ERROR: Unable to load NZB XML data: ' . $nzbFile);
-
-					if ($deleteFailed) {
-						@unlink($nzbFile);
-					}
-					$nzbsSkipped++;
-					continue;
-				}
-
-				// Try to insert the NZB details into the DB.
-				$inserted = $this->scanNZBFile($nzbXML, ($useNzbName ? str_ireplace('.nzb', '', basename($nzbFile)) : false));
-
-				if ($inserted) {
-
-					// Try to copy the NZB to the NZB folder.
-					$path = $this->nzb->getNZBPath($this->relGuid, '', true);
-
-					// Try to compress the NZB file in the NZB folder.
-					$fp = gzopen ($path, 'w5');
-					gzwrite ($fp, $nzbString);
-					gzclose($fp);
-
-					if (!is_file($path)) {
-						$this->echoOut('ERROR: Problem compressing NZB file to: ' . $path);
-
-						// Remove the release.
-						$this->pdo->queryExec(
-							sprintf("DELETE FROM releases WHERE guid = %s", $this->pdo->escapeString($this->relGuid))
-						);
-
-						if ($deleteFailed) {
-							@unlink($nzbFile);
-						}
-						$nzbsSkipped++;
-						continue;
-
-					} else {
-
-						if ($delete) {
-							// Remove the nzb file.
-							@unlink($nzbFile);
-						}
-
-						$nzbsImported++;
-						continue;
-					}
-
-				} else {
-					if ($deleteFailed) {
-						@unlink($nzbFile);
-					}
-					$nzbsSkipped++;
-					continue;
-				}
-
-			} else {
-				$this->echoOut('ERROR: Unable to fetch: ' . $nzbFile);
-				$nzbsSkipped++;
-				continue;
-			}
-		}
-		$this->echoOut(
-			'Proccessed ' .
-			$nzbsImported .
-			' NZBs in ' .
-			(strtotime(date('Y-m-d H:i:s')) - strtotime($start)) .
-			' seconds, ' .
-			$nzbsSkipped .
-			' NZBs were skipped.'
-		);
-
-		if ($this->browser) {
-			return $this->retVal;
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * @param object $nzbXML Reference of simpleXmlObject with NZB contents.
-	 * @param bool|string $useNzbName Use the NZB file name as release name?
-	 * @return bool
-	 *
-	 * @access protected
-	 */
-	protected function scanNZBFile(&$nzbXML, $useNzbName = false)
-	{
-		$totalFiles = $totalSize = $groupID = 0;
-		$isBlackListed = $groupName = $firstName = $posterName = $postDate = false;
-
-		// Go through the NZB, get the details, look if it's blacklisted, look if we have the groups.
-		foreach ($nzbXML->file as $file) {
-
-			$totalFiles++;
-			$groupID = -1;
-
-			// Get the nzb info.
-			if ($firstName === false ) {
-				$firstName =(string) $file->attributes()->subject;
-			}
-			if ($posterName === false) {
-				$posterName = (string) $file->attributes()->poster;
-			}
-			if ($postDate === false) {
-				$postDate = date("Y-m-d H:i:s", (string) $file->attributes()->date);
-			}
-
-			// Make a fake message array to use to check the blacklist.
-			$msg = array("Subject" => (string) $file->attributes()->subject, "From" => (string) $file->attributes()->poster, "Message-ID" => "");
-
-			// Get the group names, groupid, check if it's blacklisted.
-			$groupArr = array();
-			foreach ($file->groups->group as $group) {
-				$group = (string) $group;
-
-				// If groupid is -1 try to get a groupid.
-				if ($groupID === -1) {
-					if (array_key_exists($group, $this->allGroups)) {
-						$groupID = $this->allGroups[$group];
-						if (!$groupName) {
-							$groupName = $group;
-						}
-					}
-				}
-				// Add all the found groups to an array.
-				$groupArr[] = $group;
-
-				// Check if this NZB is blacklisted.
-				if ($this->binaries->isBlacklisted($msg, $group)) {
-					$isBlackListed = true;
-					break;
-				}
-			}
-
-			// If we found a group and it's not blacklisted.
-			if ($groupID !== -1 && !$isBlackListed) {
-
-				// Get the size of the release.
-				if (count($file->segments->segment) > 0) {
-					foreach ($file->segments->segment as $segment) {
-						$totalSize += (int)$segment->attributes()->bytes;
-					}
-				}
-
-			} else {
-				if ($isBlackListed) {
-					$errorMessage = "Subject is blacklisted: " . utf8_encode(trim($firstName));
-				} else {
-					$errorMessage = "No group found for " . $firstName . " (one of " . implode(', ', $groupArr) . " are missing";
-				}
-				$this->echoOut($errorMessage);
-
-				return false;
-			}
-		}
-
-		// Try to insert the NZB details into the DB.
-		return $this->insertNZB(
-			array(
-				'subject'    => $firstName,
-				'useFName'   => $useNzbName,
-				'postDate'   => (empty($postDate) ? date("Y-m-d H:i:s") : $postDate),
-				'from'       => (empty($posterName) ? '' : $posterName),
-				'groupid'    => $groupID,
-				'groupName'  => $groupName,
-				'totalFiles' => $totalFiles,
-				'totalSize'  => $totalSize
-			)
-		);
-	}
-
-	/**
-	 * Insert the NZB details into the database.
-	 *
-	 * @param $nzbDetails
-	 *
-	 * @return bool
-	 *
-	 * @access protected
-	 */
-	protected function insertNZB($nzbDetails)
-	{
-		// Make up a GUID for the release.
-		$this->relGuid = $this->releases->createGUID();
-
-		// Remove part count from subject.
-		$partLess = preg_replace('/(\(\d+\/\d+\))*$/', 'yEnc', $nzbDetails['subject']);
-		// Remove added yEnc from above and anything after.
-		$subject = utf8_encode(trim(preg_replace('/yEnc.*$/i', 'yEnc', $partLess)));
-
-		$renamed = 0;
-		if ($nzbDetails['useFName']) {
-			// If the user wants to use the file name.. use it.
-			$cleanName = $nzbDetails['useFName'];
-			$renamed = 1;
-		} else {
-			// Pass the subject through release cleaner to get a nicer name.
-			$cleanName = $this->releaseCleaner->releaseCleaner($subject, $nzbDetails['from'], $nzbDetails['totalSize'], $nzbDetails['groupName']);
-			if (isset($cleanName['properlynamed'])) {
-				$cleanName = $cleanName['cleansubject'];
-				$renamed = (isset($cleanName['properlynamed']) && $cleanName['properlynamed'] === true ? 1 : 0);
-			}
-		}
-
-		$escapedSubject = $this->pdo->escapeString($subject);
-		$escapedFromName = $this->pdo->escapeString($nzbDetails['from']);
-
-		// Look for a duplicate on name, poster and size.
-		$dupeCheck = $this->pdo->queryOneRow(
-			sprintf(
-				'SELECT id FROM releases WHERE name = %s AND fromname = %s AND size BETWEEN %s AND %s',
-				$escapedSubject,
-				$escapedFromName,
-				$this->pdo->escapeString($nzbDetails['totalSize'] * 0.99),
-				$this->pdo->escapeString($nzbDetails['totalSize'] * 1.01)
-			)
-		);
-
-		if ($dupeCheck === false) {
-			$escapedSearchName = $this->pdo->escapeString($cleanName);
-			// Insert the release into the DB.
-			$relID = $this->releases->insertRelease(
-				[
-					'name' => $escapedSubject,
-					'searchname' => $escapedSearchName,
-					'totalpart' => $nzbDetails['totalFiles'],
-					'groupid' => $nzbDetails['groupid'],
-					'guid' => $this->pdo->escapeString($this->relGuid),
-					'regexid' => NULL,
-					'postdate' => $this->pdo->escapeString($nzbDetails['postDate']),
-					'fromname' => $escapedFromName,
-					'reqid' => NULL,
-					'passwordstatus' => ($this->site->checkpasswordedrar > 0 ? -1 : 0),
-					'size' => $this->pdo->escapeString($nzbDetails['totalSize']),
-					'categoryid' => $this->category->determineCategory($nzbDetails['groupid'], $cleanName),
-					'isrenamed' => $renamed,
-					'reqidstatus' => 0,
-					'prehashid' => 0,
-					'nzbstatus' => \Enzebe::NZB_ADDED
-				]
-			);
-		} else {
-			//$this->echoOut('This release is already in our DB so skipping: ' . $subject);
-			return false;
-		}
-
-		if (isset($relID) && $relID === false) {
-			$this->echoOut('ERROR: Problem inserting: ' . $subject);
-			return false;
-		}
-		return true;
-	}
-	/**
-	 * Get all groups in the DB.
-	 * @return bool
-	 *
-	 * @access protected
-	 */
-	protected function getAllGroups()
-	{
-		$this->allGroups = [];
-		$groups = $this->pdo->query("SELECT id, name FROM groups");
-		foreach ($groups as $group) {
-			$this->allGroups[$group["name"]] = $group["id"];
-		}
-
-		if (count($this->allGroups) === 0) {
-			$this->echoOut('You have no groups in your database!');
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Echo message to browser or CLI.
-	 * @param $message
-	 *
-	 * @access protected
-	 */
-	protected function echoOut($message)
-	{
-		if ($this->browser) {
-			$this->retVal .= $message . "<br />";
-		} elseif ($this->echoCLI) {
-			echo $message . PHP_EOL;
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Net_NNTP/LICENSE b/lib/copy_this/www/lib/Net_NNTP/LICENSE
deleted file mode 100644
index cee19f91e..000000000
--- a/lib/copy_this/www/lib/Net_NNTP/LICENSE
+++ /dev/null
@@ -1,48 +0,0 @@
-+-----------------------------------------------------------------------+
-|                                                                       |
-| W3C® SOFTWARE NOTICE AND LICENSE                                      |
-| http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231   |
-|                                                                       |
-| This work (and included software, documentation such as READMEs,      |
-| or other related items) is being provided by the copyright holders    |
-| under the following license. By obtaining, using and/or copying       |
-| this work, you (the licensee) agree that you have read, understood,   |
-| and will comply with the following terms and conditions.              |
-|                                                                       |
-| Permission to copy, modify, and distribute this software and its      |
-| documentation, with or without modification, for any purpose and      |
-| without fee or royalty is hereby granted, provided that you include   |
-| the following on ALL copies of the software and documentation or      |
-| portions thereof, including modifications:                            |
-|                                                                       |
-| 1. The full text of this NOTICE in a location viewable to users       |
-|    of the redistributed or derivative work.                           |
-|                                                                       |
-| 2. Any pre-existing intellectual property disclaimers, notices,       |
-|    or terms and conditions. If none exist, the W3C Software Short     |
-|    Notice should be included (hypertext is preferred, text is         |
-|    permitted) within the body of any redistributed or derivative      |
-|    code.                                                              |
-|                                                                       |
-| 3. Notice of any changes or modifications to the files, including     |
-|    the date changes were made. (We recommend you provide URIs to      |
-|    the location from which the code is derived.)                      |
-|                                                                       |
-| THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT    |
-| HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,    |
-| INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR        |
-| FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE    |
-| OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,           |
-| COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.                               |
-|                                                                       |
-| COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,        |
-| SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE        |
-| SOFTWARE OR DOCUMENTATION.                                            |
-|                                                                       |
-| The name and trademarks of copyright holders may NOT be used in       |
-| advertising or publicity pertaining to the software without           |
-| specific, written prior permission. Title to copyright in this        |
-| software and any associated documentation will at all times           |
-| remain with copyright holders.                                        |
-|                                                                       |
-+-----------------------------------------------------------------------+
diff --git a/lib/copy_this/www/lib/Net_NNTP/NNTP/Client.php b/lib/copy_this/www/lib/Net_NNTP/NNTP/Client.php
deleted file mode 100644
index 8ca7b96f0..000000000
--- a/lib/copy_this/www/lib/Net_NNTP/NNTP/Client.php
+++ /dev/null
@@ -1,1393 +0,0 @@
-<?php
-
-/**
- *
- *
- * PHP versions 4 and 5
- *
- * <pre>
- * +-----------------------------------------------------------------------+
- * |                                                                       |
- * | W3C® SOFTWARE NOTICE AND LICENSE                                      |
- * | http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231   |
- * |                                                                       |
- * | This work (and included software, documentation such as READMEs,      |
- * | or other related items) is being provided by the copyright holders    |
- * | under the following license. By obtaining, using and/or copying       |
- * | this work, you (the licensee) agree that you have read, understood,   |
- * | and will comply with the following terms and conditions.              |
- * |                                                                       |
- * | Permission to copy, modify, and distribute this software and its      |
- * | documentation, with or without modification, for any purpose and      |
- * | without fee or royalty is hereby granted, provided that you include   |
- * | the following on ALL copies of the software and documentation or      |
- * | portions thereof, including modifications:                            |
- * |                                                                       |
- * | 1. The full text of this NOTICE in a location viewable to users       |
- * |    of the redistributed or derivative work.                           |
- * |                                                                       |
- * | 2. Any pre-existing intellectual property disclaimers, notices,       |
- * |    or terms and conditions. If none exist, the W3C Software Short     |
- * |    Notice should be included (hypertext is preferred, text is         |
- * |    permitted) within the body of any redistributed or derivative      |
- * |    code.                                                              |
- * |                                                                       |
- * | 3. Notice of any changes or modifications to the files, including     |
- * |    the date changes were made. (We recommend you provide URIs to      |
- * |    the location from which the code is derived.)                      |
- * |                                                                       |
- * | THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT    |
- * | HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,    |
- * | INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR        |
- * | FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE    |
- * | OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,           |
- * | COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.                               |
- * |                                                                       |
- * | COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,        |
- * | SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE        |
- * | SOFTWARE OR DOCUMENTATION.                                            |
- * |                                                                       |
- * | The name and trademarks of copyright holders may NOT be used in       |
- * | advertising or publicity pertaining to the software without           |
- * | specific, written prior permission. Title to copyright in this        |
- * | software and any associated documentation will at all times           |
- * | remain with copyright holders.                                        |
- * |                                                                       |
- * +-----------------------------------------------------------------------+
- * </pre>
- *
- * @category   Net
- * @package    Net_NNTP
- * @author     Heino H. Gehlsen <heino@gehlsen.dk>
- * @copyright  2002-2011 Heino H. Gehlsen <heino@gehlsen.dk>. All Rights Reserved.
- * @license    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 W3C® SOFTWARE NOTICE AND LICENSE
- * @version    SVN: $Id: Client.php 317347 2011-09-26 20:26:12Z janpascal $
- * @link       http://pear.php.net/package/Net_NNTP
- * @see
- *
- * @filesource
- */
-
-require_once 'Protocol/Client.php';
-
-// {{{ Net_NNTP_Client
-
-/**
- * Implementation of the client side of NNTP (Network News Transfer Protocol)
- *
- * The Net_NNTP_Client class is a frontend class to the Net_NNTP_Protocol_Client class.
- *
- * @category   Net
- * @package    Net_NNTP
- * @version    package: 1.5.0 (stable)
- * @version    api: 0.9.0 (alpha)
- * @access     public
- * @see        Net_NNTP_Protocol_Client
- */
-class Net_NNTP_Client extends Net_NNTP_Protocol_Client
-{
-	// {{{ properties
-
-	/**
-	 * Information summary about the currently selected group.
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected $_selectedGroupSummary = null;
-
-	/**
-	 * Cache of the "Over/xOver" header format.
-	 *
-	 * @var array
-	 * @access protected
-	 * @since 1.3.0
-	 */
-	protected $_overviewFormatCache = null;
-
-	/**
-	 * Constructor
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/constructor.php}
-	 *
-	 * @access public
-	 */
-	public function Net_NNTP_Client()
-	{
-		// Init parent construct.
-		parent::Net_NNTP_Protocol_Client();
-	}
-
-	/**
-	 * Connect to a server.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/connect.php}
-	 *
-	 * @param string $host                   (optional) The address of the NNTP-server to connect to, defaults to 'localhost'.
-	 * @param mixed  $encryption             (optional) Use TLS/SSL on the connection?
-	 *                                       (string) 'tcp'                 => Use no encryption.
-	 *                                       'ssl', 'sslv3', 'tls' => Use encryption.
-	 *                                       (null)|(false) Use no encryption.
-	 * @param int    $port                   (optional) The port number to connect to, defaults to 119.
-	 * @param int    $timeout                (optional) How many seconds to wait before giving up when connecting.
-	 * @param int    $socketTimeout          (optional) How many seconds to wait before timing out the (blocked) socket.
-	 *
-	 * @return mixed <br>
-	 *  - (bool)   True when posting allowed, otherwise false
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::disconnect()
-	 * @see Net_NNTP_Client::authenticate()
-	 */
-	public function connect($host = null, $encryption = null, $port = null, $timeout = 15, $socketTimeout = 120)
-	{
-		// v1.0.x API
-		if (is_int($encryption)) {
-			trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: connect() !', E_USER_NOTICE);
-			$port = $encryption;
-			$encryption = null;
-		}
-
-		return parent::connect($host, $encryption, $port, $timeout, $socketTimeout);
-	}
-
-	/**
-	 * Reset some properties.
-	 * @voic
-	 * @access protected
-	 */
-	protected function _resetProperties()
-	{
-		$this->_selectedGroupSummary = null;
-		$this->_overviewFormatCache = null;
-	}
-
-	/**
-	 * Disconnect from server.
-	 *
-	 * @return mixed <br>
-	 *  - (bool)   True on success.
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::connect()
-	 */
-	public function disconnect()
-	{
-		$this->_resetProperties();
-		return parent::disconnect();
-	}
-
-	/**
-	 * Authenticate.
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/authenticate.php}
-	 *
-	 * @param string $user The username
-	 * @param string $pass The password
-	 *
-	 * @return mixed <br>
-	 *  - (bool)   True on successful authentification, otherwise false
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::connect()
-	 */
-	public function authenticate($user, $pass)
-	{
-		// Username is required.
-		if ($user == null) {
-			return $this->throwError('No username supplied', null);
-		}
-
-		return $this->cmdAuthinfo($user, $pass);
-	}
-
-	/**
-	 * Selects a group.
-	 *
-	 * Moves the servers 'currently selected group' pointer to the group
-	 * a new group, and returns summary information about it.
-	 *
-	 * <b>Non-standard!</b><br>
-	 * When using the second parameter,
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/selectGroup.php}
-	 *
-	 * @param string $group    Name of the group to select
-	 * @param mixed  $articles (optional) experimental! When true the article numbers is returned in 'articles'
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Summary about the selected group
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getGroups()
-	 * @see Net_NNTP_Client::group()
-	 * @see Net_NNTP_Client::first()
-	 * @see Net_NNTP_Client::last()
-	 * @see Net_NNTP_Client::count()
-	 */
-	public function selectGroup($group, $articles = false)
-	{
-		// Select group (even if $articles is set, since many servers do not select groups when the listgroup command is run)
-		$summary = $this->cmdGroup($group);
-		if ($this->isError($summary)) {
-			return $summary;
-		}
-
-		// Store group info in the object.
-		$this->_selectedGroupSummary = $summary;
-
-		if ($articles !== false) {
-			$summary2 = $this->cmdListgroup($group, ($articles === true ? null : $articles));
-			if ($this->isError($summary2)) {
-				return $summary2;
-			}
-
-			// Make sure the summary array is correct.
-			if ($summary2['group'] == $group) {
-				$summary = $summary2;
-
-				// ... even if server does not include summary in status response.
-			} else {
-				$summary['articles'] = $summary2['articles'];
-			}
-		}
-
-		return $summary;
-	}
-
-	/**
-	 * Select the previous article.
-	 *
-	 * Select the previous article in current group.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/selectPreviousArticle.php}
-	 *
-	 * @param int $_ret (optional) Experimental
-	 *
-	 * @return mixed <br>
-	 *  - (integer) Article number, if $ret=0 (default)
-	 *  - (string)  Message-ID, if $ret=1
-	 *  - (array)   Both article number and message-id, if $ret=-1
-	 *  - (bool)    False if no previous article exists
-	 *  - (object)  Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::selectArticle()
-	 * @see Net_NNTP_Client::selectNextArticle()
-	 */
-	public function selectPreviousArticle($_ret = 0)
-	{
-		$response = $this->cmdLast();
-
-		if ($this->isError($response)) {
-			return false;
-		}
-
-		switch ($_ret) {
-			case -1:
-				return array('Number' => (int)$response[0], 'Message-ID' => (string)$response[1]);
-			case 0:
-				return (int)$response[0];
-			case 1:
-				return (string)$response[1];
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Select the next article.
-	 *
-	 * Select the next article in current group.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/selectNextArticle.php}
-	 *
-	 * @param int $_ret (optional) Experimental
-	 *
-	 * @return mixed <br>
-	 *  - (integer) Article number, if $ret=0 (default)
-	 *  - (string)  Message-ID, if $ret=1
-	 *  - (array)   Both article number and message-id, if $ret=-1
-	 *  - (bool)    False if no further articles exist
-	 *  - (object)  Pear_Error on unexpected failure
-	 * @access public
-	 * @see Net_NNTP_Client::selectArticle()
-	 * @see Net_NNTP_Client::selectPreviousArticle()
-	 */
-	public function selectNextArticle($_ret = 0)
-	{
-		$response = $this->cmdNext();
-
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($_ret) {
-			case -1:
-				return array('Number' => (int)$response[0], 'Message-ID' => (string)$response[1]);
-			case 0:
-				return (int)$response[0];
-			case 1:
-				return (string)$response[1];
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Selects an article by article message-number.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/selectArticle.php}
-	 *
-	 * @param mixed $article The message-number (on the server) of the article to select as current article.
-	 * @param int   $_ret    (optional) Experimental
-	 *
-	 * @return mixed <br>
-	 *  - (integer) Article number
-	 *  - (bool)    False if article doesn't exists
-	 *  - (object)  Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::selectNextArticle()
-	 * @see Net_NNTP_Client::selectPreviousArticle()
-	 */
-	public function selectArticle($article = null, $_ret = 0)
-	{
-		$response = $this->cmdStat($article);
-
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($_ret) {
-			case -1:
-				return array('Number' => (int)$response[0], 'Message-ID' => (string)$response[1]);
-				break;
-			case 0:
-				return (int)$response[0];
-				break;
-			case 1:
-				return (string)$response[1];
-				break;
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Fetch article into transfer object.
-	 *
-	 * Select an article based on the arguments, and return the entire
-	 * article (raw data).
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getArticle.php}
-	 *
-	 * @param mixed $article (optional) Either the message-id or the  message-number on the server of the article to fetch.
-	 * @param bool  $implode (optional) When true the result array is imploded to a string, defaults to false.
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Complete article (when $implode is false)
-	 *  - (string) Complete article (when $implode is true)
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getHeader()
-	 * @see Net_NNTP_Client::getBody()
-	 */
-	public function getArticle($article = null, $implode = false)
-	{
-		// v1.1.x API
-		if (is_string($implode)) {
-			trigger_error('You are using deprecated API v1.1 in Net_NNTP_Client: getHeader() !', E_USER_NOTICE);
-
-			$class = $implode;
-			$implode = false;
-
-			if (!class_exists($class)) {
-				return $this->throwError("Class '$class' does not exist!");
-			}
-		}
-
-		$data = $this->cmdArticle($article);
-		if ($this->isError($data)) {
-			return $data;
-		}
-
-		if ($implode == true) {
-			$data = implode("\r\n", $data);
-		}
-
-		// v1.1.x API
-		if (isset($class)) {
-			return $obj = new $class($data);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Fetch article header.
-	 *
-	 * Select an article based on the arguments, and return the article
-	 * header (raw data).
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getHeader.php}
-	 *
-	 * @param mixed $article (optional) Either message-id or message number of the article to fetch.
-	 * @param bool  $implode (optional) When true the result array is imploded to a string, defaults to false.
-	 *
-	 * @return mixed <br>
-	 *  - (bool)    False if article does not exist
-	 *  - (array)   Header fields (when $implode is false)
-	 *  - (string)  Header fields (when $implode is true)
-	 *  - (object)  Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getArticle()
-	 * @see Net_NNTP_Client::getBody()
-	 */
-	public function getHeader($article = null, $implode = false)
-	{
-		// v1.1.x API
-		if (is_string($implode)) {
-			trigger_error('You are using deprecated API v1.1 in Net_NNTP_Client: getHeader() !', E_USER_NOTICE);
-
-			$class = $implode;
-			$implode = false;
-
-			if (!class_exists($class)) {
-				return $this->throwError("Class '$class' does not exist!");
-			}
-		}
-
-		$data = $this->cmdHead($article);
-		if ($this->isError($data)) {
-			return $data;
-		}
-
-		if ($implode == true) {
-			$data = implode("\r\n", $data);
-		}
-
-		// v1.1.x API
-		if (isset($class)) {
-			return $obj = new $class($data);
-		}
-
-		//
-		return $data;
-	}
-
-	/**
-	 * Fetch article body.
-	 *
-	 * Select an article based on the arguments, and return the article
-	 * body (raw data).
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getBody.php}
-	 *
-	 * @param mixed $article (optional) Either the message-id or the message-number on the server of the article to fetch.
-	 * @param bool  $implode (optional) When true the result array is imploded to a string, defaults to false.
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Message body (when $implode is false)
-	 *  - (string) Message body (when $implode is true)
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getHeader()
-	 * @see Net_NNTP_Client::getArticle()
-	 */
-	public function getBody($article = null, $implode = false)
-	{
-		// v1.1.x API
-		if (is_string($implode)) {
-			trigger_error('You are using deprecated API v1.1 in Net_NNTP_Client: getHeader() !', E_USER_NOTICE);
-
-			$class = $implode;
-			$implode = false;
-
-			if (!class_exists($class)) {
-				return $this->throwError("Class '$class' does not exist!");
-			}
-		}
-
-		$data = $this->cmdBody($article);
-		if ($this->isError($data)) {
-			return $data;
-		}
-
-		if ($implode == true) {
-			$data = implode("\r\n", $data);
-		}
-
-		// v1.1.x API
-		if (isset($class)) {
-			return $obj = new $class($data);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Post a raw article to a number of groups.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/post.php}
-	 *
-	 * @param mixed $article <br>
-	 *  - (string) Complete article in a ready to send format (lines terminated by LFCR etc.)
-	 *  - (array)  First key is the article header, second key is article body - any further keys are ignored !!!
-	 *  - (mixed)  Something 'callable' (which must return otherwise acceptable data as replacement)
-	 *
-	 * @return mixed <br>
-	 *  - (string) Server response
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @ignore
-	 */
-	public function post($article)
-	{
-		// API v1.0
-		if (func_num_args() >= 4) {
-
-			trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: post() !', E_USER_NOTICE);
-
-			$groups = func_get_arg(0);
-			$subject = func_get_arg(1);
-			$body = func_get_arg(2);
-			$from = func_get_arg(3);
-			$additional = func_get_arg(4);
-
-			return $this->mail($groups, $subject, $body, "From: $from\r\n" . $additional);
-		}
-
-		// Only accept $article if array or string.
-		if (!is_array($article) && !is_string($article)) {
-			return $this->throwError('Ups', null, 0);
-		}
-
-		// Check if server will receive an article.
-		$post = $this->cmdPost();
-		if ($this->isError($post)) {
-			return $post;
-		}
-
-		// Get article data from callback function.
-		if (is_callable($article)) {
-			$article = call_user_func($article);
-		}
-
-		// Actually send the article.
-		return $this->cmdPost2($article);
-	}
-
-	/**
-	 * Post an article to a number of groups - using same parameters as PHP's mail() function.
-	 *
-	 * Among the additional headers you might think of adding could be:
-	 * "From: <author-email-address>", which should contain the e-mail address
-	 * of the author of the article.
-	 * Or "Organization: <org>" which contain the name of the organization
-	 * the post originates from.
-	 * Or "NNTP-Posting-Host: <ip-of-author>", which should contain the IP-address
-	 * of the author of the post, so the message can be traced back to him.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/mail.php}
-	 *
-	 * @param string $groups     The groups to post to.
-	 * @param string $subject    The subject of the article.
-	 * @param string $body       The body of the article.
-	 * @param string $additional (optional) Additional header fields to send.
-	 *
-	 * @return mixed <br>
-	 *  - (string) Server response
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 */
-	public function mail($groups, $subject, $body, $additional = null)
-	{
-		// Check if server will receive an article.
-		$post = $this->cmdPost();
-		if ($this->isError($post)) {
-			return $post;
-		}
-
-		// Construct header.
-		$header = "Newsgroups: $groups\r\n";
-		$header .= "Subject: $subject\r\n";
-		$header .= "X-poster: PEAR::Net_NNTP v1.5.0 (stable)\r\n";
-		if ($additional !== null) {
-			$header .= $additional;
-		}
-		$header .= "\r\n";
-
-		// Actually send the article.
-		return $this->cmdPost2(array($header, $body));
-	}
-
-	/**
-	 * Get the server's internal date
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getDate.php}
-	 *
-	 * @param int $format (optional) Determines the format of returned date:
-	 *     - 0: return string
-	 *     - 1: return integer/timestamp
-	 *     - 2: return an array('y'=>year, 'm'=>month,'d'=>day)
-	 *
-	 * @return mixed <br>
-	 *  - (mixed)
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 */
-	public function getDate($format = 1)
-	{
-		$date = $this->cmdDate();
-		if ($this->isError($date)) {
-			return $date;
-		}
-
-		switch ($format) {
-			case 0:
-				return $date;
-				break;
-			case 1:
-				return strtotime(substr($date, 0, 8) . ' ' . substr($date, 8, 2) . ':' . substr($date, 10, 2) . ':' . substr($date, 12, 2));
-				break;
-			case 2:
-				return array('y' => substr($date, 0, 4),
-							 'm' => substr($date, 4, 2),
-							 'd' => substr($date, 6, 2)
-				);
-				break;
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Get new groups since a date.
-	 *
-	 * Returns a list of groups created on the server since the specified date
-	 * and time.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getNewGroups.php}
-	 *
-	 * @param mixed $time <br>
-	 *                    - (integer) A timestamp
-	 *                    - (string)  Something that can be parsed by strtotime() like '-1 week'
-	 * @param string $distributions (optional)
-	 *
-	 * @return mixed <br>
-	 *  - (array)
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 */
-	public function getNewGroups($time, $distributions = null)
-	{
-		switch (true) {
-			case is_integer($time):
-				break;
-			case is_string($time):
-				$time = strtotime($time);
-				if ($time === false || ($time === -1 && version_compare(phpversion(), '5.1.0', '<'))) {
-					return $this->throwError('$time could not be converted into a timestamp!', null, 0);
-				}
-				break;
-			default:
-				trigger_error('$time must be either a string or an integer/timestamp!', E_USER_ERROR);
-		}
-
-		return $this->cmdNewgroups($time, $distributions);
-	}
-
-	/**
-	 * Get new articles since a date.
-	 *
-	 * Returns a list of message-ids of new articles (since the specified date and time) in the groups whose names match the wild mat.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getNewArticles.php}
-	 *
-	 * @param mixed $time <br>
-	 *                    - (integer) A timestamp
-	 *                    - (string)  Something that can be parsed by strtotime() like '-1 week'
-	 * @param string $groups       (optional)
-	 * @param string $distribution (optional)
-	 *
-	 * @return mixed <br>
-	 *  - (array)
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @since 1.3.0
-	 */
-	public function getNewArticles($time, $groups = '*', $distribution = null)
-	{
-		switch (true) {
-			case is_integer($time):
-				break;
-			case is_string($time):
-				$time = strtotime($time);
-				if ($time === false || ($time === -1 && version_compare(phpversion(), '5.1.0', '<'))) {
-					return $this->throwError('$time could not be converted into a timestamp!', null, 0);
-				}
-				break;
-			default:
-				trigger_error('$time must be either a string or an integer/timestamp!', E_USER_ERROR);
-		}
-
-		return $this->cmdNewnews($time, $groups, $distribution);
-	}
-
-	/**
-	 * Fetch valid groups.
-	 *
-	 * Returns a list of valid groups (that the client is permitted to select) and associated information.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getGroups.php}
-	 *
-	 * @param string $wildMat (optional)
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Nested array with information about every valid group
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getDescriptions()
-	 * @see Net_NNTP_Client::selectGroup()
-	 */
-	public function getGroups($wildMat = null)
-	{
-		$backup = false;
-
-		// Get groups
-		$groups = $this->cmdListActive($wildMat);
-		if ($this->isError($groups)) {
-			switch ($groups->getCode()) {
-				case NET_NNTP_PROTOCOL_RESPONSECODE_UNKNOWN_COMMAND:
-				case NET_NNTP_PROTOCOL_RESPONSECODE_SYNTAX_ERROR:
-				$backup = true;
-				break;
-				default:
-					return $groups;
-			}
-		}
-
-		if ($backup == true) {
-
-			if (!is_null($wildMat)) {
-				return $this->throwError(
-					"The server does not support the 'LIST ACTIVE' command, and the 'LIST' command does not support the wildmat parameter!",
-					null,
-					null
-				);
-			}
-
-			$groups2 = $this->cmdList();
-			if ($this->isError($groups2)) {
-				// Ignore...
-			} else {
-				$groups = $groups2;
-			}
-		}
-
-		if ($this->isError($groups)) {
-			return $groups;
-		}
-
-		return $groups;
-	}
-
-
-	/**
-	 * Fetch all known group descriptions.
-	 *
-	 * Fetches a list of known group descriptions - including groups which
-	 * the client is not permitted to select.
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getDescriptions.php}
-	 *
-	 * @param mixed $wildMat (optional)
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Associated array with descriptions of known groups
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getGroups()
-	 */
-	public function getDescriptions($wildMat = null)
-	{
-		if (is_array($wildMat)) {
-			$wildMat = implode(',', $wildMat);
-		}
-
-		// Get group descriptions
-		$descriptions = $this->cmdListNewsgroups($wildMat);
-		if ($this->isError($descriptions)) {
-			return $descriptions;
-		}
-
-		// TODO: add xgtitle as backup
-
-		return $descriptions;
-	}
-
-	/**
-	 * Fetch an overview of article(s) in the currently selected group.
-	 *
-	 * Returns the contents of all the fields in the database for a number
-	 * of articles specified by either article-number range, a message-id,
-	 * or nothing (indicating currently selected article).
-	 *
-	 * The first 8 fields per article is always as follows:
-	 *   - 'Number' - '0' or the article number of the currently selected group.
-	 *   - 'Subject' - header content.
-	 *   - 'From' - header content.
-	 *   - 'Date' - header content.
-	 *   - 'Message-ID' - header content.
-	 *   - 'References' - header content.
-	 *   - ':bytes' - metadata item.
-	 *   - ':lines' - metadata item.
-	 *
-	 * The server may send more fields form it's database...
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getOverview.php}
-	 *
-	 * @param mixed   $range    (optional)
-	 *                          - '<message number>'
-	 *                          - '<message number>-<message number>'
-	 *                          - '<message number>-'
-	 *                          - '<message-id>'
-	 * @param boolean $_names   (optional) experimental parameter! Use field names as array keys
-	 * @param boolean $_forceNames (optional) experimental parameter!
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Nested array of article overview data
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getHeaderField()
-	 * @see Net_NNTP_Client::getOverviewFormat()
-	 */
-	public function getOverview($range = null, $_names = true, $_forceNames = true)
-	{
-		// API v1.0
-		switch (true) {
-			// API v1.3
-			case func_num_args() != 2:
-			case is_bool(func_get_arg(1)):
-			case!is_int(func_get_arg(1)) || (is_string(func_get_arg(1)) && ctype_digit(func_get_arg(1))):
-			case!is_int(func_get_arg(0)) || (is_string(func_get_arg(0)) && ctype_digit(func_get_arg(0))):
-				break;
-
-			default:
-				trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: getOverview() !', E_USER_NOTICE);
-
-				// Fetch overview via API v1.3
-				$overview = $this->getOverview(func_get_arg(0) . '-' . func_get_arg(1), true, false);
-				if ($this->isError($overview)) {
-					return $overview;
-				}
-
-				// Create and return API v1.0 compliant array
-				$articles = array();
-				foreach ($overview as $article) {
-
-					// Rename 'Number' field into 'number'
-					$article = array_merge(array('number' => array_shift($article)), $article);
-
-					// Use 'Message-ID' field as key
-					$articles[$article['Message-ID']] = $article;
-				}
-				return $articles;
-		}
-
-		// Fetch overview from server
-		$overview = $this->cmdXOver($range);
-		if ($this->isError($overview)) {
-			return $overview;
-		}
-
-		// Use field names from overview format as keys?
-		if ($_names) {
-
-			// Already cached?
-			if (is_null($this->_overviewFormatCache)) {
-				// Fetch overview format
-				$format = $this->getOverviewFormat($_forceNames, true);
-				if ($this->isError($format)) {
-					return $format;
-				}
-
-				// Prepend 'Number' field
-				$format = array_merge(array('Number' => false), $format);
-
-				// Cache format
-				$this->_overviewFormatCache = $format;
-
-			} else {
-				$format = $this->_overviewFormatCache;
-			}
-
-			// Loop through all articles
-			foreach ($overview as $key => $article) {
-
-				// Copy $format
-				$f = $format;
-
-				// Field counter
-				$i = 0;
-
-				// Loop through field names in format.
-				foreach ($f as $tag => $full) {
-
-					//
-					$f[$tag] = $article[$i++];
-
-					// If prefixed by field name, remove it.
-					if ($full === true) {
-						$f[$tag] = ltrim(substr($f[$tag], strpos($f[$tag], ':') + 1), " \t");
-					}
-				}
-
-				// Replace article
-				$overview[$key] = $f;
-			}
-		}
-
-		switch (true) {
-
-			// Expect one article.
-			case is_null($range);
-			case is_int($range);
-			case is_string($range) && ctype_digit($range):
-			case is_string($range) && substr($range, 0, 1) == '<' && substr($range, -1, 1) == '>':
-				if (count($overview) == 0) {
-					return false;
-				} else {
-					return reset($overview);
-				}
-				break;
-
-			// Expect multiple articles.
-			default:
-				return $overview;
-		}
-	}
-
-	/**
-	 * Fetch names of fields in overview database
-	 *
-	 * Returns a description of the fields in the database for which it is consistent.
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getOveriewFormat.php}
-	 *
-	 * @param bool $_forceNames
-	 * @param bool $_full
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Overview field names
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getOverview()
-	 */
-	public function getOverviewFormat($_forceNames = true, $_full = false)
-	{
-		$format = $this->cmdListOverviewFmt();
-		if ($this->isError($format)) {
-			return $format;
-		}
-
-		// Force name of first seven fields
-		if ($_forceNames) {
-			array_splice($format, 0, 7);
-			$format = array_merge(
-				array(
-					'Subject'    => false,
-					'From'       => false,
-					'Date'       => false,
-					'Message-ID' => false,
-					'References' => false,
-					':bytes'     => false,
-					':lines'     => false
-				),
-				$format
-			);
-		}
-
-		if ($_full) {
-			return $format;
-		} else {
-			return array_keys($format);
-		}
-	}
-
-	/**
-	 * Fetch content of a header field from message(s).
-	 *
-	 * Retrieves the content of specific header field from a number of messages.
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getHeaderField.php}
-	 *
-	 * @param string $field       The name of the header field to retrieve
-	 * @param mixed  $range       (optional)
-	 *                            '<message number>'
-	 *                            '<message number>-<message number>'
-	 *                            '<message number>-'
-	 *                            '<message-id>'
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Nested array of
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getOverview()
-	 * @see Net_NNTP_Client::getReferences()
-	 */
-	public function getHeaderField($field, $range = null)
-	{
-		$fields = $this->cmdXHdr($field, $range);
-		if ($this->isError($fields)) {
-			return $fields;
-		}
-
-		switch (true) {
-
-			// Expect one article.
-			case is_null($range);
-			case is_int($range);
-			case is_string($range) && ctype_digit($range):
-			case is_string($range) && substr($range, 0, 1) == '<' && substr($range, -1, 1) == '>':
-				if (count($fields) == 0) {
-					return false;
-				} else {
-					return reset($fields);
-				}
-				break;
-
-			// Expect multiple articles.
-			default:
-				return $fields;
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getGroupArticles.php}
-	 *
-	 * @param mixed $range (optional) Experimental!
-	 *
-	 * @return mixed <br>
-	 *  - (array)
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @since 1.3.0
-	 */
-	public function getGroupArticles($range = null)
-	{
-		$summary = $this->cmdListgroup();
-		if ($this->isError($summary)) {
-			return $summary;
-		}
-
-		// Update summary cache if group was also 'selected'.
-		if ($summary['group'] !== null) {
-			$this->_selectedGroupSummary = $summary;
-		}
-
-		return $summary['articles'];
-	}
-
-	/**
-	 * Fetch reference header field of message(s).
-	 *
-	 * Retrieves the content of the references header field of messages via
-	 * either the XHDR ord the XROVER command.
-	 *
-	 * Identical to getHeaderField('References').
-	 *
-	 * <b>Non-standard!</b><br>
-	 * This method uses non-standard commands, which is not part
-	 * of the original RFC977, but has been formalized in RFC2890.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/getReferences.php}
-	 *
-	 * @param mixed $range        (optional)
-	 *                            '<message number>'
-	 *                            '<message number>-<message number>'
-	 *                            '<message number>-'
-	 *                            '<message-id>'
-	 *
-	 * @return mixed <br>
-	 *  - (array)  Nested array of references
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::getHeaderField()
-	 */
-	public function getReferences($range = null)
-	{
-		$backup = false;
-
-		$references = $this->cmdXHdr('References', $range);
-		if ($this->isError($references)) {
-			switch ($references->getCode()) {
-				case NET_NNTP_PROTOCOL_RESPONSECODE_UNKNOWN_COMMAND:
-				case NET_NNTP_PROTOCOL_RESPONSECODE_SYNTAX_ERROR:
-				$backup = true;
-				break;
-
-				default:
-					return $references;
-			}
-		}
-
-		if (true && (is_array($references) && count($references) == 0)) {
-			$backup = true;
-		}
-
-		if ($backup == true) {
-			$references2 = $this->cmdXROver($range);
-			if ($this->isError($references2)) {
-				// Ignore...
-			} else {
-				$references = $references2;
-			}
-		}
-
-		if ($this->isError($references)) {
-			return $references;
-		}
-
-		if (is_array($references)) {
-			foreach ($references as $key => $val) {
-				$references[$key] = preg_split("/ +/", trim($val), -1, PREG_SPLIT_NO_EMPTY);
-			}
-		}
-
-		switch (true) {
-
-			// Expect one article.
-			case is_null($range);
-			case is_int($range);
-			case is_string($range) && ctype_digit($range):
-			case is_string($range) && substr($range, 0, 1) == '<' && substr($range, -1, 1) == '>':
-				if (count($references) == 0) {
-					return false;
-				} else {
-					return reset($references);
-				}
-				break;
-
-			// Expect multiple articles.
-			default:
-				return $references;
-		}
-	}
-
-	/**
-	 * Number of articles in currently selected group.
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/count.php}
-	 *
-	 * @return mixed <br>
-	 *  - (string) the number of article in group
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::group()
-	 * @see Net_NNTP_Client::first()
-	 * @see Net_NNTP_Client::last()
-	 * @see Net_NNTP_Client::selectGroup()
-	 * @ignore
-	 */
-	public function count()
-	{
-		return $this->_selectedGroupSummary['count'];
-	}
-
-	/**
-	 * Maximum article number in currently selected group
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/last.php}
-	 *
-	 * @return mixed <br>
-	 *  - (string) the last article's number
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::first()
-	 * @see Net_NNTP_Client::group()
-	 * @see Net_NNTP_Client::count()
-	 * @see Net_NNTP_Client::selectGroup()
-	 * @ignore
-	 */
-	public function last()
-	{
-		return $this->_selectedGroupSummary['last'];
-	}
-
-	/**
-	 * Minimum article number in currently selected group
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/first.php}
-	 *
-	 * @return mixed <br>
-	 *  - (string) the first article's number
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::last()
-	 * @see Net_NNTP_Client::group()
-	 * @see Net_NNTP_Client::count()
-	 * @see Net_NNTP_Client::selectGroup()
-	 * @ignore
-	 */
-	public function first()
-	{
-		return $this->_selectedGroupSummary['first'];
-	}
-
-	/**
-	 * Currently selected group
-	 *
-	 * <b>Usage example:</b>
-	 * {@example docs/examples/phpdoc/group.php}
-	 *
-	 * @return mixed <br>
-	 *  - (string) group name
-	 *  - (object) Pear_Error on failure
-	 * @access public
-	 * @see Net_NNTP_Client::first()
-	 * @see Net_NNTP_Client::last()
-	 * @see Net_NNTP_Client::count()
-	 * @see Net_NNTP_Client::selectGroup()
-	 * @ignore
-	 */
-	public function group()
-	{
-		return $this->_selectedGroupSummary['group'];
-	}
-
-	/**
-	 * Test whether a connection is currently open or closed.
-	 *
-	 * @return bool True if connected, otherwise false
-	 * @access public
-	 * @see    Net_NNTP_Client::connect()
-	 * @see    Net_NNTP_Client::quit()
-	 * @deprecated since v1.3.0 due to use of protected method: Net_NNTP_Protocol_Client::isConnected()
-	 * @ignore
-	 */
-	public function isConnected()
-	{
-		trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: isConnected() !', E_USER_NOTICE);
-		return parent::_isConnected();
-	}
-
-	/**
-	 * Deprecated alias for getArticle()
-	 *
-	 * @deprecated
-	 * @ignore
-	 */
-	public function getArticleRaw($article, $implode = false)
-	{
-		trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: getArticleRaw() !', E_USER_NOTICE);
-		return $this->getArticle($article, $implode);
-	}
-
-	/**
-	 * Deprecated alias for getHeader()
-	 *
-	 * @deprecated
-	 * @ignore
-	 */
-	public function getHeaderRaw($article = null, $implode = false)
-	{
-		trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: getHeaderRaw() !', E_USER_NOTICE);
-		return $this->getHeader($article, $implode);
-	}
-
-	/**
-	 * Deprecated alias for getBody()
-	 *
-	 * @deprecated
-	 * @ignore
-	 */
-	public function getBodyRaw($article = null, $implode = false)
-	{
-		trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: getBodyRaw() !', E_USER_NOTICE);
-		return $this->getBody($article, $implode);
-	}
-
-	/**
-	 * Deprecated alias for getNewArticles()
-	 *
-	 * @deprecated
-	 * @ignore
-	 */
-	public function getNewNews($time, $groups = '*', $distribution = null)
-	{
-		trigger_error('You are using deprecated API v1.1 in Net_NNTP_Client: getNewNews() !', E_USER_NOTICE);
-		return $this->getNewArticles($time, $groups, $distribution);
-	}
-
-	/**
-	 * Deprecated alias for getReferences()
-	 *
-	 * @deprecated
-	 * @ignore
-	 */
-	public function getReferencesOverview($first, $last)
-	{
-		trigger_error('You are using deprecated API v1.0 in Net_NNTP_Client: getReferencesOverview() !', E_USER_NOTICE);
-		return $this->getReferences($first . '-' . $last);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php b/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php
deleted file mode 100644
index 9f360dd70..000000000
--- a/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Client.php
+++ /dev/null
@@ -1,1993 +0,0 @@
-<?php
-
-/**
- *
- *
- * PHP versions 4 and 5
- *
- * <pre>
- * +-----------------------------------------------------------------------+
- * |                                                                       |
- * | W3C® SOFTWARE NOTICE AND LICENSE                                      |
- * | http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231   |
- * |                                                                       |
- * | This work (and included software, documentation such as READMEs,      |
- * | or other related items) is being provided by the copyright holders    |
- * | under the following license. By obtaining, using and/or copying       |
- * | this work, you (the licensee) agree that you have read, understood,   |
- * | and will comply with the following terms and conditions.              |
- * |                                                                       |
- * | Permission to copy, modify, and distribute this software and its      |
- * | documentation, with or without modification, for any purpose and      |
- * | without fee or royalty is hereby granted, provided that you include   |
- * | the following on ALL copies of the software and documentation or      |
- * | portions thereof, including modifications:                            |
- * |                                                                       |
- * | 1. The full text of this NOTICE in a location viewable to users       |
- * |    of the redistributed or derivative work.                           |
- * |                                                                       |
- * | 2. Any pre-existing intellectual property disclaimers, notices,       |
- * |    or terms and conditions. If none exist, the W3C Software Short     |
- * |    Notice should be included (hypertext is preferred, text is         |
- * |    permitted) within the body of any redistributed or derivative      |
- * |    code.                                                              |
- * |                                                                       |
- * | 3. Notice of any changes or modifications to the files, including     |
- * |    the date changes were made. (We recommend you provide URIs to      |
- * |    the location from which the code is derived.)                      |
- * |                                                                       |
- * | THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT    |
- * | HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,    |
- * | INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR        |
- * | FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE    |
- * | OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,           |
- * | COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.                               |
- * |                                                                       |
- * | COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,        |
- * | SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE        |
- * | SOFTWARE OR DOCUMENTATION.                                            |
- * |                                                                       |
- * | The name and trademarks of copyright holders may NOT be used in       |
- * | advertising or publicity pertaining to the software without           |
- * | specific, written prior permission. Title to copyright in this        |
- * | software and any associated documentation will at all times           |
- * | remain with copyright holders.                                        |
- * |                                                                       |
- * +-----------------------------------------------------------------------+
- * </pre>
- *
- * @category   Net
- * @package    Net_NNTP
- * @author     Heino H. Gehlsen <heino@gehlsen.dk>
- * @copyright  2002-2011 Heino H. Gehlsen <heino@gehlsen.dk>. All Rights Reserved.
- * @license    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- *             W3C® SOFTWARE NOTICE AND LICENSE
- * @version    SVN: $Id: Client.php 330426 2013-05-31 14:41:46Z janpascal $
- * @link       http://pear.php.net/package/Net_NNTP
- * @see
- */
-
-
-require_once 'PEAR.php';
-require_once 'Responsecode.php';
-
-// {{{ constants
-
-/**
- * Default host
- *
- * @access     public
- * @ignore
- */
-define('NET_NNTP_PROTOCOL_CLIENT_DEFAULT_HOST', 'localhost');
-
-/**
- * Default port
- *
- * @access     public
- * @ignore
- */
-define('NET_NNTP_PROTOCOL_CLIENT_DEFAULT_PORT', '119');
-
-// }}}
-// {{{ Net_NNTP_Protocol_Client
-
-/**
- * Low level NNTP Client
- *
- * Implements the client part of the NNTP standard according to:
- *  - RFC 977,
- *  - RFC 2980,
- *  - RFC 850/1036, and
- *  - RFC 822/2822
- *
- * Each NNTP command is represented by a method: cmd*()
- *
- * WARNING: The Net_NNTP_Protocol_Client class is considered an internal
- *          class (and should therefore currently not be extended
- *          directly outside of the Net_NNTP package). Therefore its
- *          API is NOT required to be fully stable, for as long as such
- *          changes do not affect the public API of
- *          the Net_NNTP_Client class, which is considered stable.
- *
- * TODO: cmdListActiveTimes()
- *       cmdDistribPats()
- *
- * @category   Net
- * @package    Net_NNTP
- * @author     Heino H. Gehlsen <heino@gehlsen.dk>
- * @version    package: 1.5.0 (stable)
- * @version    api: 0.9.0 (alpha)
- * @access     private
- * @see        Net_NNTP_Client
- */
-class Net_NNTP_Protocol_Client extends PEAR
-{
-	// {{{ properties
-
-	/**
-	 * The socket resource being used to connect to the NNTP server.
-	 *
-	 * @var resource
-	 * @access protected
-	 */
-	protected $_socket = null;
-
-	/**
-	 * Contains the last received status response code and text.
-	 *
-	 * @var array
-	 * @access protected
-	 */
-	protected $_currentStatusResponse = null;
-
-	/**
-	 * Optional logger class to use for debugging.
-	 *
-	 * @var     object
-	 * @access  private
-	 */
-	private $_logger = null;
-
-	/**
-	 * Seconds to wait for the blocking socket to timeout.
-	 *
-	 * @var int
-	 */
-	protected $_socketTimeout = 120;
-
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 */
-	public function Net_NNTP_Protocol_Client()
-	{
-		// Init PEAR.
-		parent::PEAR();
-	}
-
-	/**
-	 * Get current package version.
-	 *
-	 * @access public
-	 */
-	public function getPackageVersion()
-	{
-		return '1.5.0';
-	}
-
-	/**
-	 * Get current API version.
-	 *
-	 * @access public
-	 */
-	public function getApiVersion()
-	{
-		return '0.9.0';
-	}
-
-	/**
-	 * Set the debug logger instance object.
-	 *
-	 * @param object $logger
-	 *
-	 * @access protected
-	 */
-	protected function setLogger($logger)
-	{
-		$this->_logger = $logger;
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function setDebug($debug = true)
-	{
-		trigger_error(
-			'You are using deprecated API v1.0 in Net_NNTP_Protocol_Client: setDebug() ! Debugging in now automatically handled when a logger is given.',
-			E_USER_NOTICE
-		);
-	}
-
-	/**
-	 * Send a command to usenet.
-	 *
-	 * Send a command to the server. A carriage return / linefeed
-	 * (CRLF) sequence will be appended to each command string before it is sent to the IMAP server.
-	 *
-	 * @param string $cmd The command to launch, ie: "ARTICLE 1004853"
-	 *
-	 * @return mixed (int)    response code on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function _sendCommand($cmd)
-	{
-		// NNTP/RFC977 only allows command up to 512 (-2) chars.
-		if (strlen($cmd) > 510) {
-			return $this->throwError('Failed writing to socket! (Command to long - max 510 chars)');
-		}
-
-		/***************************************************************
-		 * Credit:                                                     *
-		 *    Thanks to Brendan Coles <bcoles@gmail.com>               *
-		 *    (http://itsecuritysolutions.org)                         *
-		 *    For pointing out possibility to inject pipelined NNTP    *
-		 *    commands into pretty much any Net_NNTP command-sending   *
-		 *    function with user input, by appending a new line        *
-		 *    character followed by the injection.                     *
-		 ***************************************************************
-
-		 * Prevent new line (and possible future) characters in the NNTP
-		 * commands Net_NNTP does not support pipelined commands.
-		 * Inserting a new line character allows sending multiple
-		 * commands and thereby making the communication between
-		 * NET_NNTP and the server out of sync...
-		 */
-		if (preg_match_all('/\r?\n/', $cmd, $matches, PREG_PATTERN_ORDER)) {
-			if ($this->_logger) {
-				foreach ($matches[0] as $match) {
-					$this->_logger->debug(
-						"Illegal character in command: " . htmlentities(str_replace(array("\r", "\n"),
-								array("'Carriage Return'", "'New Line'"), $match
-							)
-						)
-					);
-				}
-			}
-			return $this->throwError("Illegal character(s) in NNTP command!");
-		}
-
-		// Check if connected.
-		if (!$this->_isConnected()) {
-			return $this->throwError('Failed to write to socket! (connection lost!)');
-		}
-
-		// Send the command.
-		if (@fwrite($this->_socket, $cmd . "\r\n") === false) {
-			return $this->throwError('Failed to write to socket!');
-		}
-
-		// Log sent message.
-		if ($this->_logger && $this->_logger->_isMasked(PEAR_LOG_DEBUG)) {
-			$this->_logger->debug('C: ' . $cmd);
-		}
-
-		return $this->_getStatusResponse();
-	}
-
-	/**
-	 * Get servers status response after a command.
-	 *
-	 * @return mixed (int)    response code on success
-	 *               (object) pear_error on failure
-	 * @access private
-	 */
-	private function _getStatusResponse()
-	{
-		// Retrieve a line (terminated by "\r\n") from the server.  RFC says max is 510, but IETF says "be liberal in what you accept"...
-		$response = @fgets($this->_socket, 4096);
-
-		if ($response === false) {
-			return $this->throwError('Failed to read from socket...!');
-		}
-
-		// Log incoming message.
-		if ($this->_logger && $this->_logger->_isMasked(PEAR_LOG_DEBUG)) {
-			$this->_logger->debug('S: ' . rtrim($response, "\r\n"));
-		}
-
-		// Trim the start of the response in case of misplaced whitespace (should not be needed).
-		$response = ltrim($response);
-
-		// Store the response in an array, 0 => response code, 1 => response message.
-		$this->_currentStatusResponse = array((int)substr($response, 0, 3), (string)rtrim(substr($response, 4)));
-
-		return $this->_currentStatusResponse[0];
-	}
-
-	/**
-	 * Retrieve textural data
-	 *
-	 * Get data until a line with only a '.' in it is read and return data.
-	 *
-	 * @return mixed (array) text response on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function _getTextResponse()
-	{
-		// Buffer to hold the received lines.
-		$data = array();
-
-		$debug = ($this->_logger && $this->_logger->_isMasked(PEAR_LOG_DEBUG));
-
-		// Continue until connection is lost.
-		while (!feof($this->_socket)) {
-
-			// Retrieve and append up to 1024 characters from the server.
-			$line = @fgets($this->_socket, 1024);
-
-			if ($line === false) {
-				return $this->throwError('Failed to read line from socket.', null);
-			}
-
-			// Continue if the line is not terminated by CR LF.
-			if (substr($line, -2) !== "\r\n" || strlen($line) < 2) {
-				continue;
-			}
-
-			// Remove CR LF from the end of the line.
-			$line = substr($line, 0, -2);
-
-			// Check if the line terminates the text response.
-			if ($line === '.') {
-
-				if ($this->_logger) {
-					$this->_logger->debug('T: ' . $line);
-				}
-
-				// Return all previous lines.
-				return $data;
-			}
-
-			// If 1st char is '.' it's doubled (NNTP/RFC977 2.4.1).
-			if (substr($line, 0, 2) === '..') {
-				$line = substr($line, 1);
-			}
-
-			if ($debug) {
-				$this->_logger->debug('T: ' . $line);
-			}
-
-			// Add the line to the array of lines.
-			$data[] = $line;
-		}
-
-		if ($this->_logger) {
-			$this->_logger->warning('Broke out of reception loop! This souldn\'t happen unless connection has been lost?');
-		}
-
-		return $this->throwError('End of stream! Connection lost?', null);
-	}
-
-	/**
-	 * Send an article to usenet.
-	 *
-	 * @note Data should be in the format specified by RFC850.
-	 *
-	 * @access private
-	 */
-	private function _sendArticle($article)
-	{
-		switch (true) {
-			case is_string($article):
-				@fwrite($this->_socket, $article);
-				@fwrite($this->_socket, "\r\n.\r\n");
-
-				if ($this->_logger && $this->_logger->_isMasked(PEAR_LOG_DEBUG)) {
-					foreach (explode("\r\n", $article) as $line) {
-						$this->_logger->debug('D: ' . $line);
-					}
-					$this->_logger->debug('D: .');
-				}
-				break;
-
-			case is_array($article):
-				//
-				$header = reset($article);
-				$body = next($article);
-
-				/* Experimental...
-								// If header is an array, implode it.
-								if (is_array($header)) {
-									$header = implode("\r\n", $header) . "\r\n";
-								}
-				*/
-
-				// Send header (including separation line)
-				@fwrite($this->_socket, $header);
-				@fwrite($this->_socket, "\r\n");
-
-				if ($this->_logger && $this->_logger->_isMasked(PEAR_LOG_DEBUG)) {
-					foreach (explode("\r\n", $header) as $line) {
-						$this->_logger->debug('D: ' . $line);
-					}
-				}
-
-
-				/* Experimental...
-								// If body is an array, implode it.
-								if (is_array($body)) {
-									$header = implode("\r\n", $body) . "\r\n";
-								}
-				*/
-
-				// Send body
-				@fwrite($this->_socket, $body);
-				@fwrite($this->_socket, "\r\n.\r\n");
-
-				if ($this->_logger && $this->_logger->_isMasked(PEAR_LOG_DEBUG)) {
-					foreach (explode("\r\n", $body) as $line) {
-						$this->_logger->debug('D: ' . $line);
-					}
-					$this->_logger->debug('D: .');
-				}
-				break;
-
-			default:
-				return $this->throwError('Ups...', null, null);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Return the last received response message.
-	 *
-	 * @return string The response message.
-	 * @access private
-	 */
-	private function _currentStatusResponse()
-	{
-		return $this->_currentStatusResponse[1];
-	}
-
-	/* Session administration commands */
-
-	/**
-	 * Connect to a NNTP server
-	 *
-	 * @param string $host                   (optional) The address of the NNTP-server to connect to, defaults to 'localhost'.
-	 * @param mixed  $encryption             (optional) Use TLS/SSL on the connection?
-	 *                                       (string) 'tcp'                 => Use no encryption.
-	 *                                       'ssl', 'sslv3', 'tls' => Use encryption.
-	 *                                       (null)|(false) Use no encryption.
-	 * @param int    $port                   (optional) The port number to connect to, defaults to 119.
-	 * @param int    $timeout                (optional) How many seconds to wait before giving up when connecting.
-	 * @param int    $socketTimeout          (optional) How many seconds to wait before timing out the (blocked) socket.
-	 *
-	 * @return mixed (bool)   On success: True when posting allowed, otherwise false.
-	 *               (object) On failure: pear_error
-	 * @access protected
-	 */
-	protected function connect($host = null, $encryption = null, $port = null, $timeout = 15, $socketTimeout = 120)
-	{
-		if ($this->_isConnected() ) {
-			return $this->throwError('Already connected, disconnect first!', null);
-		}
-
-		// v1.0.x API
-		if (is_int($encryption)) {
-			trigger_error('You are using deprecated API v1.0 in Net_NNTP_Protocol_Client: connect() !', E_USER_NOTICE);
-			$port = $encryption;
-			$encryption = false;
-		}
-
-		if (is_null($host)) {
-			$host = 'localhost';
-		}
-
-		// Choose transport based on encryption, and if no port is given, use default for that encryption.
-		switch ($encryption) {
-			case null:
-			case 'tcp':
-			case false:
-				$transport = 'tcp';
-				$port = is_null($port) ? 119 : $port;
-				break;
-
-			case 'sslv3':
-			case 'ssl':
-			case 'tls':
-				$transport = $encryption;
-				$port = is_null($port) ? 563 : $port;
-				break;
-
-			default:
-				$message = '$encryption parameter must be either tcp, tls, ssl or sslv3.';
-				trigger_error($message, E_USER_ERROR);
-				return $this->throwError($message);
-		}
-
-		// Attempt to connect to usenet.
-		$socket = @stream_socket_client(
-			$transport . '://' . $host . ':' . $port, $errorNumber, $errorString, $timeout
-		);
-
-		if ($socket === false) {
-
-			$message = "Connection to $transport://$host:$port failed.";
-
-			if (preg_match('/tls|ssl/', $transport)) {
-				$message .= ' Try disabling SSL/TLS, and/or try a different port.';
-			}
-
-			$message .= ' [ERROR ' . $errorNumber . ': ' . $errorString . ']';
-
-			if ($this->_logger) {
-				$this->_logger->notice($message);
-			}
-			return $this->throwError($message);
-		}
-
-		// Store the socket resource as property.
-		$this->_socket = $socket;
-
-		$this->_socketTimeout = (is_numeric($socketTimeout) ? $socketTimeout : $this->_socketTimeout);
-
-		// Set the socket timeout.
-		stream_set_timeout($this->_socket, $this->_socketTimeout);
-
-		if ($this->_logger) {
-			$this->_logger->info("Connection to $transport://$host:$port has been established.");
-		}
-
-		// Retrieve the server's initial response.
-		$response = $this->_getStatusResponse();
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 200, Posting allowed
-			case NET_NNTP_PROTOCOL_RESPONSECODE_READY_POSTING_ALLOWED:
-				// TODO: Set some variable before return
-				return true;
-
-			// 201, Posting NOT allowed
-			case NET_NNTP_PROTOCOL_RESPONSECODE_READY_POSTING_PROHIBITED:
-				if ($this->_logger) {
-					$this->_logger->info('Posting not allowed!');
-				}
-
-				// TODO: Set some variable before return
-				return false;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Returns servers capabilities
-	 *
-	 * @return mixed (array)  list of capabilities on success or
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdCapabilities()
-	{
-		$response = $this->_sendCommand('CAPABILITIES');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 101, Draft: 'Capability list follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_CAPABILITIES_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * @return mixed (bool)   true when posting allowed, false when  posting disallowed
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdModeReader()
-	{
-		$response = $this->_sendCommand('MODE READER');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 200, RFC2980: 'Hello, you can post'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_READY_POSTING_ALLOWED:
-				// TODO: Set some variable before return
-				return true;
-
-			// 201, RFC2980: 'Hello, you can't post'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_READY_POSTING_PROHIBITED:
-				if ($this->_logger) {
-					$this->_logger->info('Posting not allowed!');
-				}
-				// TODO: Set some variable before return
-				return false;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Alias for cmdQuit()
-	 *
-	 * @access protected
-	 */
-	protected function disconnect()
-	{
-		return $this->cmdQuit();
-	}
-
-	/**
-	 * Disconnect from the NNTP server
-	 *
-	 * @return mixed (bool)   true on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdQuit()
-	{
-		$response = $this->_sendCommand('QUIT');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// RFC977: 'closing connection - goodbye!'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_DISCONNECTING_REQUESTED:
-				// If socket is still open, close it.
-				$disconnected = true;
-				if ($this->_isConnected(false)) {
-					$disconnected = (bool)stream_socket_shutdown($this->_socket, STREAM_SHUT_RDWR);
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info('Connection closed.');
-				}
-				$this->_currentStatusResponse = null;
-				$this->_socket = null;
-
-				return $disconnected;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-	/**
-	 * Request TLS encryption to the news server.
-	 *
-	 * @return mixed (bool) on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdStartTLS()
-	{
-		$response = $this->_sendCommand('STARTTLS');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// RFC4642: 'continue with TLS negotiation'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TLS_AUTHENTICATION_CONTINUE:
-				$encrypted = stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
-				switch (true) {
-					case $encrypted === true:
-						if ($this->_logger) {
-							$this->_logger->info('TLS encryption started.');
-						}
-						return true;
-
-					case $encrypted === false:
-						if ($this->_logger) {
-							$this->_logger->info('TLS encryption failed.');
-						}
-
-						return $this->throwError('Could not initiate TLS negotiation', $response, $this->_currentStatusResponse());
-
-					case is_int($encrypted):
-						return $this->throwError('TLS encryption failed.', $response, $this->_currentStatusResponse());
-
-					default:
-						return $this->throwError(
-							'Internal error - unknown response from stream_socket_enable_crypto()',
-							$response,
-							$this->_currentStatusResponse()
-						);
-				}
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/* Group and article selection */
-
-	/**
-	 * Selects a news group (issue a GROUP command to the server)
-	 *
-	 * @param string $newsgroup The newsgroup name
-	 *
-	 * @return mixed (array)  group info on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdGroup($newsgroup)
-	{
-		$response = $this->_sendCommand('GROUP '.$newsgroup);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 211, RFC977: 'n f l s group selected'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_GROUP_SELECTED:
-				$response_arr = explode(' ', trim($this->_currentStatusResponse()));
-
-				if ($this->_logger) {
-					$this->_logger->info('Group selected: ' . $response_arr[3]);
-				}
-
-				return array(
-					'group' => $response_arr[3],
-					'first' => $response_arr[1],
-					'last'  => $response_arr[2],
-					'count' => $response_arr[0]
-				);
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Gets a group overview.
-	 *
-	 * @param string $newsgroup (optional)
-	 * @param mixed  $range     (optional)
-	 *
-	 * @return mixed (array)             On success
-	 *               (object) pear_error On failure
-	 * @access protected
-	 */
-	protected function cmdListgroup($newsgroup = null, $range = null)
-	{
-		if (is_null($newsgroup)) {
-			$command = 'LISTGROUP';
-		} else {
-			if (is_null($range)) {
-				$command = 'LISTGROUP ' . $newsgroup;
-			} else {
-				$command = 'LISTGROUP ' . $newsgroup . ' ' . $range;
-			}
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 211, RFC2980: 'list of article numbers follow'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_GROUP_SELECTED:
-
-				$articles = $this->_getTextResponse();
-				if ($this->isError($articles)) {
-					return $articles;
-				}
-
-				$response_arr = explode(' ', trim($this->_currentStatusResponse()), 4);
-
-				// If server does not return group summary in status response, return null array.
-				if (!is_numeric($response_arr[0]) ||
-					!is_numeric($response_arr[1]) ||
-					!is_numeric($response_arr[2]) ||
-					empty($response_arr[3])
-				) {
-					return array(
-						'group'    => null,
-						'first'    => null,
-						'last'     => null,
-						'count'    => null,
-						'articles' => $articles
-					);
-				}
-
-				return array(
-					'group'    => $response_arr[3],
-					'first'    => $response_arr[1],
-					'last'     => $response_arr[2],
-					'count'    => $response_arr[0],
-					'articles' => $articles
-				);
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Select the previous article in current group.
-	 *
-	 * @return mixed (array) or (string) or (int) On success
-	 *               (object) pear_error          On failure
-	 * @access protected
-	 */
-	protected function cmdLast()
-	{
-		$response = $this->_sendCommand('LAST');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 223, RFC977: 'n a article retrieved - request text separately (n = article number, a = unique article id)'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_ARTICLE_SELECTED:
-				$response_arr = explode(' ', trim($this->_currentStatusResponse()));
-
-				if ($this->_logger) {
-					$this->_logger->info('Selected previous article: ' . $response_arr[0] . ' - ' . $response_arr[1]);
-				}
-
-				return array($response_arr[0], (string) $response_arr[1]);
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Select the next article in current group.
-	 *
-	 * @return mixed (array) or (string) or (int) On success
-	 *               (object) pear_error          On failure
-	 * @access protected
-	 */
-	protected function cmdNext()
-	{
-		$response = $this->_sendCommand('NEXT');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 223, RFC977: 'n a article retrieved - request text separately (n = article number, a = unique article id)'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_ARTICLE_SELECTED:
-				$response_arr = explode(' ',
-					trim($this->_currentStatusResponse()));
-
-				if ($this->_logger) {
-					$this->_logger->info('Selected previous article: ' . $response_arr[0] . ' - ' . $response_arr[1]);
-				}
-
-				return array($response_arr[0], (string) $response_arr[1]);
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/* Retrieval of articles and article sections */
-
-	/**
-	 * Get an article from the currently open connection.
-	 *
-	 * @param mixed $article Either a message-id or a message-number of the article to fetch.
-	 *                       If null or '', then use current article.
-	 *
-	 * @return mixed (array) article on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdArticle($article = null)
-	{
-		if (is_null($article)) {
-			$command = 'ARTICLE';
-		} else {
-			$command = 'ARTICLE ' . $article;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 220, RFC977: 'n <a> article retrieved - head and body follow (n = article number, <a> = message-id)'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_ARTICLE_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info(($article == null ? 'Fetched current article' : 'Fetched article: ' . $article));
-				}
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Get the headers of an article from the currently open connection.
-	 *
-	 * @param mixed $article Either a message-id or a message-number of the article to fetch the headers from.
-	 *                       If null or '', then use current article.
-	 *
-	 * @return mixed (array)  headers on success or
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdHead($article = null)
-	{
-		if (is_null($article)) {
-			$command = 'HEAD';
-		} else {
-			$command = 'HEAD ' . $article;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 221, RFC977: 'n <a> article retrieved - head follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_HEAD_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info(($article == null ? 'Fetched current article header' : 'Fetched article header for article: ' . $article));
-				}
-
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Get the body of an article from the currently open connection.
-	 *
-	 * @param mixed $article Either a message-id or a message-number of  the article to fetch the body from.
-	 *                       If null or '', then use current article.
-	 *
-	 * @return mixed (array) body on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdBody($article = null)
-	{
-		if (is_null($article)) {
-			$command = 'BODY';
-		} else {
-			$command = 'BODY ' . $article;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 222, RFC977: 'n <a> article retrieved - body follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_BODY_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info(($article == null ? 'Fetched current article body' : 'Fetched article body for article: ' . $article));
-				}
-
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Selects an article by article message-number.
-	 *
-	 * @param mixed $article
-	 *
-	 * @return mixed (array) or (string) or (int) on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdStat($article = null)
-	{
-		if (is_null($article)) {
-			$command = 'STAT';
-		} else {
-			$command = 'STAT ' . $article;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			/* 223, RFC977: 'n <a> article retrieved - request text
-			 * separately' (actually not documented, but copied
-			 * from the ARTICLE command)
-			 */
-			case NET_NNTP_PROTOCOL_RESPONSECODE_ARTICLE_SELECTED:
-				$response_arr = explode(' ',
-					trim($this->_currentStatusResponse()));
-
-				if ($this->_logger) {
-					$this->_logger->info('Selected article: ' . $response_arr[0] . ' - ' . $response_arr[1]);
-				}
-
-				return array($response_arr[0], (string) $response_arr[1]);
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/* Article posting */
-
-	/**
-	 * Post an article to a newsgroup.
-	 *
-	 * @return mixed (bool) true on success
-	 *               (object) pear_error on failure
-	 * @access public
-	 */
-	public function cmdPost()
-	{
-		$response = $this->_sendCommand('POST');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 340, RFC977: 'send article to be posted. End with <CR-LF>.<CR-LF>'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_SEND:
-				return true;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-
-	}
-
-	/**
-	 * Post an article to a newsgroup.
-	 *
-	 * @note Should be presented in the format specified by RFC850.
-	 *
-	 * @param mixed $article (string/array)
-	 *
-	 * @return mixed (bool) true on success
-	 *               (object) pear_error on failure
-	 * @access public
-	 */
-	public function cmdPost2($article)
-	{
-		$this->_sendArticle($article);
-
-		// Retrieve server's response.
-		$response = $this->_getStatusResponse();
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 240, RFC977: 'article posted ok'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_SUCCESS:
-				return true;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Tell the news server we want to upload an article, the server will check if it has the message-id first.
-	 *
-	 * @param string $id Message-ID.
-	 *
-	 * @return mixed (bool) true on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdIhave($id)
-	{
-		$response = $this->_sendCommand('IHAVE ' . $id);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 335, RFC997: 'Send article to be transferred'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_SEND:
-			return true;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Tell the news server we have an article to upload, the server will check if it has it first.
-	 *
-	 * @note Should be presented in the format specified by RFC850.
-	 *
-	 * @param mixed $article (string/array)
-	 *
-	 * @return mixed (bool) true on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdIhave2($article)
-	{
-		$this->_sendArticle($article);
-
-		// Retrieve server's response.
-		$response = $this->_getStatusResponse();
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 235, RFC977: 'Article transferred OK'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_SUCCESS:
-			return true;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/* Information commands */
-
-	/**
-	 * Get the date from the news server.
-	 *
-	 * @return mixed (string) or (int) 'YYYYMMDDhhmmss', timestamp on success
-	 *                        (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdDate()
-	{
-		$response = $this->_sendCommand('DATE');
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 111, RFC2980: '(string of numbers representing the date and time)'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_SERVER_DATE:
-				return $this->_currentStatusResponse();
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Returns the server's help text.
-	 *
-	 * @return mixed (array) help text on success or
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdHelp()
-	{
-		$response = $this->_sendCommand('HELP');
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		switch ($response) {
-			// 100, RFC977: 'Help text follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_HELP_FOLLOWS:
-			$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Fetches a list of all newsgroups created since a specified date.
-	 *
-	 * @param int    $time          Last time you checked for groups (timestamp).
-	 * @param string $distributions (optional) (deprecaded in rfc draft)
-	 *
-	 * @return mixed (array) nested array with informations about existing newsgroups on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdNewgroups($time, $distributions = null)
-	{
-		$date = gmdate('ymd His', $time);
-
-		if (is_null($distributions)) {
-			$command = 'NEWGROUPS ' . $date . ' GMT';
-		} else {
-			$command = 'NEWGROUPS ' . $date . ' GMT <' . $distributions . '>';
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 231, REF977: 'list of new newsgroups follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NEW_GROUPS_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$groups = array();
-				foreach($data as $line) {
-					$arr = explode(' ', trim($line));
-
-					$group = array(
-						'group'   => $arr[0],
-						'last'    => $arr[1],
-						'first'   => $arr[2],
-						'posting' => $arr[3]
-					);
-
-					$groups[$group['group']] = $group;
-				}
-				return $groups;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * @param int   $time       Unix timestamp.
-	 * @param mixed $newsgroups (string or array of strings)
-	 * @param mixed $distribution (string or array of strings)
-	 *
-	 * @return mixed
-	 * @access protected
-	 */
-	protected function cmdNewnews($time, $newsgroups, $distribution = null)
-	{
-		$date = gmdate('ymd His', $time);
-
-		if (is_array($newsgroups)) {
-			$newsgroups = implode(',', $newsgroups);
-		}
-
-		if (is_null($distribution)) {
-			$command = 'NEWNEWS ' . $newsgroups . ' ' . $date . ' GMT';
-		} else {
-
-			if (is_array($distribution)) {
-				$distribution = implode(',', $distribution);
-			}
-
-			$command = 'NEWNEWS ' . $newsgroups . ' ' . $date . ' GMT <' . $distribution . '>';
-		}
-
-		// TODO: the length of the request string may not exceed 510 chars.
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 230, RFC977: 'list of new articles by message-id follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NEW_ARTICLES_FOLLOW:
-				$messages = array();
-				foreach($this->_getTextResponse() as $line) {
-					$messages[] = $line;
-				}
-				return $messages;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/* The LIST commands */
-
-	/**
-	 * Fetches a list of all available newsgroups.
-	 *
-	 * @return mixed (array) nested array with informations about existing newsgroups on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdList()
-	{
-		$response = $this->_sendCommand('LIST');
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 215, RFC977: 'list of newsgroups follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_GROUPS_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$groups = array();
-				foreach($data as $line) {
-					$arr = explode(' ', trim($line));
-
-					$group = array(
-						'group'   => $arr[0],
-						'last'    => $arr[1],
-						'first'   => $arr[2],
-						'posting' => $arr[3]
-					);
-
-					$groups[$group['group']] = $group;
-				}
-				return $groups;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Fetches a list of all available newsgroups.
-	 *
-	 * @param string $wildMat
-	 *
-	 * @return mixed (array)  nested array with informations about existing newsgroups on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdListActive($wildMat = null)
-	{
-		if (is_null($wildMat)) {
-			$command = 'LIST ACTIVE';
-		} else {
-			$command = 'LIST ACTIVE ' . $wildMat;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 215, RFC977: 'list of newsgroups follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_GROUPS_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$groups = array();
-				foreach($data as $line) {
-					$arr = explode(' ', trim($line));
-
-					$group = array(
-						'group'   => $arr[0],
-						'last'    => $arr[1],
-						'first'   => $arr[2],
-						'posting' => $arr[3]
-					);
-
-					$groups[$group['group']] = $group;
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info('Fetched list of available groups');
-				}
-
-				return $groups;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Fetches a list of (all) avaible newsgroup descriptions.
-	 *
-	 * @param string $wildMat Wildmat of the groups, that is to be listed, defaults to null;
-	 *
-	 * @return mixed (array)  nested array with description of existing newsgroups on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdListNewsgroups($wildMat = null)
-	{
-		if (is_null($wildMat)) {
-			$command = 'LIST NEWSGROUPS';
-		} else {
-			$command = 'LIST NEWSGROUPS ' . $wildMat;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 215, RFC2980: 'information follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_GROUPS_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$groups = array();
-
-				foreach($data as $line) {
-					if (preg_match('/^(\S+)\s+(.*)$/', ltrim($line), $matches)) {
-						$groups[$matches[1]] = (string) $matches[2];
-					} else if ($this->_logger) {
-						$this->_logger->warning("Recieved non-standard line: '$line'");
-					}
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info('Fetched group descriptions');
-				}
-
-				return $groups;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/* Article field access commands */
-
-	/**
-	 * Fetch message header from message number $first until $last
-	 *
-	 * @info The format of the returned array is: $messages[][header_name]
-	 *
-	 * @param string $range (optional) articles to fetch
-	 *
-	 * @return mixed (array) nested array of message and there headers on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdOver($range = null)
-	{
-		if (is_null($range)) {
-			$command = 'OVER';
-		} else {
-			$command = 'OVER ' . $range;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 224, RFC2980: 'Overview information follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_OVERVIEW_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				foreach ($data as $key => $value) {
-					$data[$key] = explode("\t", trim($value));
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info('Fetched overview ' . ($range == null ? 'for current article' : 'for range: ' . $range));
-				}
-
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Fetch message header from message number $first until $last
-	 *
-	 * @info The format of the returned array is: $messages[message_id][header_name]
-	 *
-	 * @param string $range (optional) articles to fetch
-	 *
-	 * @return mixed (array) nested array of message and there headers on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdXOver($range = null)
-	{
-		// Deprecated API (the code _is_ still in alpha state).
-		if (func_num_args() > 1) {
-			exit('The second parameter in cmdXOver() has been deprecated! Use x-y instead...');
-		}
-
-		if (is_null($range)) {
-			$command = 'XOVER';
-		} else {
-			$command = 'XOVER ' . $range;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 224, RFC2980: 'Overview information follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_OVERVIEW_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				foreach ($data as $key => $value) {
-					$data[$key] = explode("\t", trim($value));
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info('Fetched overview ' . ($range == null ? 'for current article' : 'for range: ' . $range));
-				}
-
-				return $data;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Returns a list of available headers which are sent from tge news server to the client for every news message.
-	 *
-	 * @return mixed (array) of header names on success or
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdListOverviewFmt()
-	{
-		$response = $this->_sendCommand('LIST OVERVIEW.FMT');
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 215, RFC2980: 'information follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_GROUPS_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$format = array();
-
-				foreach ($data as $line) {
-
-					// Check if post fixed by ':full' (case-insensitive)
-					if (0 == strcasecmp(substr($line, -5, 5), ':full')) {
-						// ':full' is _not_ included in tag, but value set to true
-						$format[substr($line, 0, -5)] = true;
-					} else {
-						// ':' is _not_ included in tag; value set to false
-						$format[substr($line, 0, -1)] = false;
-					}
-				}
-
-				if ($this->_logger) {
-					$this->_logger->info('Fetched overview format');
-				}
-				return $format;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * The format of the returned array is:
-	 * $messages[message_id]
-	 *
-	 * @param string $field (optional)
-	 * @param string $range (optional) articles to fetch
-	 *
-	 * @return mixed (array) nested array of message and there header on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdXHdr($field, $range = null)
-	{
-		if (is_null($range)) {
-			$command = 'XHDR ' . $field;
-		} else {
-			$command = 'XHDR ' . $field . ' ' . $range;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 221, RFC2980: 'Header follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_HEAD_FOLLOWS:
-			$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$return = array();
-				foreach($data as $line) {
-					$line = explode(' ', trim($line), 2);
-					$return[$line[0]] = $line[1];
-				}
-
-				return $return;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Fetches a list of (all) available newsgroup descriptions.
-	 * Deprecated as of RFC2980.
-	 *
-	 * @param string $wildMat Wildmat of the groups, that is to be listed, defaults to '*';
-	 *
-	 * @return mixed (array) nested array with description of existing newsgroups on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdXGTitle($wildMat = '*')
-	{
-		$response = $this->_sendCommand('XGTITLE ' . $wildMat);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// RFC2980: 'list of groups and descriptions follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_XGTITLE_GROUPS_FOLLOW:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$groups = array();
-
-				foreach($data as $line) {
-					preg_match('/^(.*?)\s(.*?$)/', trim($line), $matches);
-					$groups[$matches[1]] = (string) $matches[2];
-				}
-
-				return $groups;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Fetch message references from message number $first to $last
-	 *
-	 * @param string $range (optional) articles to fetch
-	 *
-	 * @return mixed (array) assoc. array of message references on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdXROver($range = null)
-	{
-		// Warn about deprecated API (the code _is_ still in alpha state)
-		if (func_num_args() > 1 ) {
-			exit('The second parameter in cmdXROver() has been deprecated! Use x-y instead...');
-		}
-
-		if (is_null($range)) {
-			$command = 'XROVER';
-		} else {
-			$command = 'XROVER ' . $range;
-		}
-
-		$response = $this->_sendCommand($command);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			// 224, RFC2980: 'Overview information follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_OVERVIEW_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$return = array();
-				foreach($data as $line) {
-					$line = explode(' ', trim($line), 2);
-					$return[$line[0]] = $line[1];
-				}
-				return $return;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 *
-	 *
-	 * @param string $field
-	 * @param string $range
-	 * @param mixed  $wildMat
-	 *
-	 * @return mixed (array)  nested array of message and there headers on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdXPat($field, $range, $wildMat)
-	{
-		if (is_array($wildMat)) {
-			$wildMat = implode(' ', $wildMat);
-		}
-
-		$response = $this->_sendCommand('XPAT ' . $field . ' ' . $range . ' ' . $wildMat);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		switch ($response) {
-			case 221: // 221, RFC2980: 'Header follows'
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-
-				$return = array();
-				foreach($data as $line) {
-					$line = explode(' ', trim($line), 2);
-					$return[$line[0]] = $line[1];
-				}
-
-				return $return;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Authenticate using 'original' method
-	 *
-	 * @param string $user The username to authenticate as.
-	 * @param string $pass The password to authenticate with.
-	 *
-	 * @return mixed (bool) true on success or
-	 *               (object) pear_error on failure
-	 *
-	 * @access protected
-	 */
-	protected function cmdAuthinfo($user, $pass)
-	{
-		// Send the username
-		$response = $this->_sendCommand('AUTHINFO user '.$user);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		// Send the password, if the server asks
-		if (($response == 381) && ($pass !== null)) {
-			// Send the password
-			$response = $this->_sendCommand('AUTHINFO pass '.$pass);
-			if ($this->isError($response)) {
-				return $response;
-			}
-		}
-
-		switch ($response) {
-			case 281: // RFC2980: 'Authentication accepted'
-				if ($this->_logger) {
-					$this->_logger->info("Authenticated (as user '$user')");
-				}
-
-				// TODO: Set some variable before return
-
-				return true;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Authenticate using 'simple' method
-	 *
-	 * @param string $user The username to authenticate as.
-	 * @param string $pass The password to authenticate with.
-	 *
-	 * @return mixed (bool) true on success or (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdAuthinfoSimple($user, $pass)
-	{
-		return $this->throwError("The auth mode: 'simple' is has not been implemented yet", null);
-	}
-
-	/**
-	 * Authenticate using 'generic' method
-	 *
-	 * @param string $user The username to authenticate as.
-	 * @param string $pass The password to authenticate with.
-	 *
-	 * @return mixed (bool)   true on success
-	 *               (object) pear_error on failure
-	 * @access protected
-	 */
-	protected function cmdAuthinfoGeneric($user, $pass)
-	{
-		return $this->throwError("The auth mode: 'generic' is has not been implemented yet", null);
-	}
-
-	/**
-	 * Test whether we are connected or not.
-	 *
-	 * @param bool $feof Check for the end of file pointer.
-	 *
-	 * @return bool true or false
-	 * @access protected
-	 */
-	protected function _isConnected($feof = true)
-	{
-		return (is_resource($this->_socket) && ($feof ? !feof($this->_socket) : true));
-	}
-
-	/**
-	 * Verify NNTP error code and return PEAR error.
-	 *
-	 * @param int $response NET_NNTP Response code
-	 *
-	 * @return object PEAR error
-	 * @access protected
-	 */
-	protected function _handleErrorResponse(&$response)
-	{
-		switch ($response) {
-
-			// 381, RFC2980: 'More authentication information required'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_AUTHENTICATION_CONTINUE:
-				return $this->throwError('More authentication information required', $response, $this->_currentStatusResponse());
-
-			// 400, RFC977: 'Service discontinued'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_DISCONNECTING_FORCED:
-				return $this->throwError('Server refused connection', $response, $this->_currentStatusResponse());
-
-			// 411, RFC977: 'no such news group'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_SUCH_GROUP:
-				return $this->throwError('No such news group on server', $response, $this->_currentStatusResponse());
-
-			// 412, RFC2980: 'No news group current selected'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_GROUP_SELECTED:
-				return $this->throwError('No news group current selected', $response, $this->_currentStatusResponse());
-
-			// 420, RFC2980: 'Current article number is invalid'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_ARTICLE_SELECTED:
-				return $this->throwError('Current article number is invalid', $response, $this->_currentStatusResponse());
-
-			// 421, RFC977: 'no next article in this group'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_NEXT_ARTICLE:
-				return $this->throwError('No next article in this group', $response, $this->_currentStatusResponse());
-
-			// 422, RFC977: 'no previous article in this group'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_PREVIOUS_ARTICLE:
-				return $this->throwError('No previous article in this group', $response, $this->_currentStatusResponse());
-
-			// 423, RFC977: 'No such article number in this group'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_SUCH_ARTICLE_NUMBER:
-				return $this->throwError('No such article number in this group', $response, $this->_currentStatusResponse());
-
-			// 430, RFC977: 'No such article found'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NO_SUCH_ARTICLE_ID:
-				return $this->throwError('No such article found', $response, $this->_currentStatusResponse());
-
-			// 435, RFC977: 'Article not wanted'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_UNWANTED:
-				return $this->throwError('Article not wanted', $response, $this->_currentStatusResponse());
-
-			// 436, RFC977: 'Transfer failed - try again later'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_FAILURE:
-				return $this->throwError('Transfer failed - try again later', $response, $this->_currentStatusResponse());
-
-			// 437, RFC977: 'Article rejected - do not try again'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_REJECTED:
-				return $this->throwError('Article rejected - do not try again', $response, $this->_currentStatusResponse());
-
-			// 440, RFC977: 'posting not allowed'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_PROHIBITED:
-				return $this->throwError('Posting not allowed', $response, $this->_currentStatusResponse());
-
-			// 441, RFC977: 'posting failed'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_FAILURE:
-				return $this->throwError('Posting failed', $response, $this->_currentStatusResponse());
-
-			// 481, RFC2980: 'Groups and descriptions unavailable'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_XGTITLE_GROUPS_UNAVAILABLE:
-				return $this->throwError('Groups and descriptions unavailable', $response, $this->_currentStatusResponse());
-
-			// 482, RFC2980: 'Authentication rejected'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_AUTHENTICATION_REJECTED:
-				return $this->throwError('Authentication rejected', $response, $this->_currentStatusResponse());
-
-			// 500, RFC977: 'Command not recognized'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_UNKNOWN_COMMAND:
-				return $this->throwError('Command not recognized', $response, $this->_currentStatusResponse());
-
-			// 501, RFC977: 'Command syntax error'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_SYNTAX_ERROR:
-				return $this->throwError('Command syntax error', $response, $this->_currentStatusResponse());
-
-			// 502, RFC2980: 'No permission'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NOT_PERMITTED:
-				return $this->throwError('No permission', $response, $this->_currentStatusResponse());
-
-			// 503, RFC2980: 'Program fault - command not performed'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_NOT_SUPPORTED:
-				return $this->throwError('Internal server error, function not performed', $response, $this->_currentStatusResponse());
-
-			// RFC4642: 'Can not initiate TLS negotiation'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_TLS_FAILED_NEGOTIATION:
-				return $this->throwError('Can not initiate TLS negotiation', $response, $this->_currentStatusResponse());
-
-			default:
-				$text = $this->_currentStatusResponse();
-				return $this->throwError("Unexpected response: '$text'", $response, $text);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Responsecode.php b/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Responsecode.php
deleted file mode 100644
index 54dcee6ad..000000000
--- a/lib/copy_this/www/lib/Net_NNTP/NNTP/Protocol/Responsecode.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
-
-/**
- *
- *
- * PHP versions 4 and 5
- *
- * <pre>
- * +-----------------------------------------------------------------------+
- * |                                                                       |
- * | W3C® SOFTWARE NOTICE AND LICENSE                                      |
- * | http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231   |
- * |                                                                       |
- * | This work (and included software, documentation such as READMEs,      |
- * | or other related items) is being provided by the copyright holders    |
- * | under the following license. By obtaining, using and/or copying       |
- * | this work, you (the licensee) agree that you have read, understood,   |
- * | and will comply with the following terms and conditions.              |
- * |                                                                       |
- * | Permission to copy, modify, and distribute this software and its      |
- * | documentation, with or without modification, for any purpose and      |
- * | without fee or royalty is hereby granted, provided that you include   |
- * | the following on ALL copies of the software and documentation or      |
- * | portions thereof, including modifications:                            |
- * |                                                                       |
- * | 1. The full text of this NOTICE in a location viewable to users       |
- * |    of the redistributed or derivative work.                           |
- * |                                                                       |
- * | 2. Any pre-existing intellectual property disclaimers, notices,       |
- * |    or terms and conditions. If none exist, the W3C Software Short     |
- * |    Notice should be included (hypertext is preferred, text is         |
- * |    permitted) within the body of any redistributed or derivative      |
- * |    code.                                                              |
- * |                                                                       |
- * | 3. Notice of any changes or modifications to the files, including     |
- * |    the date changes were made. (We recommend you provide URIs to      |
- * |    the location from which the code is derived.)                      |
- * |                                                                       |
- * | THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT    |
- * | HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,    |
- * | INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR        |
- * | FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE    |
- * | OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,           |
- * | COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.                               |
- * |                                                                       |
- * | COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,        |
- * | SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE        |
- * | SOFTWARE OR DOCUMENTATION.                                            |
- * |                                                                       |
- * | The name and trademarks of copyright holders may NOT be used in       |
- * | advertising or publicity pertaining to the software without           |
- * | specific, written prior permission. Title to copyright in this        |
- * | software and any associated documentation will at all times           |
- * | remain with copyright holders.                                        |
- * |                                                                       |
- * +-----------------------------------------------------------------------+
- * </pre>
- *
- * @category   Net
- * @package    Net_NNTP
- * @author     Heino H. Gehlsen <heino@gehlsen.dk>
- * @copyright  2002-2011 Heino H. Gehlsen <heino@gehlsen.dk>. All Rights Reserved.
- * @license    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 W3C® SOFTWARE NOTICE AND LICENSE
- * @version    SVN: $Id: Responsecode.php 306619 2010-12-24 12:16:07Z heino $
- * @link       http://pear.php.net/package/Net_NNTP
- * @see
- * @since      File available since release 1.3.0
- */
-
-
-
-// {{{ Constants: Connection
-
-/**
- * 'Server ready - posting allowed' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_READY_POSTING_ALLOWED', 200);
-
-/**
- * 'Server ready - no posting allowed' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_READY_POSTING_PROHIBITED', 201);
-
-
-/**
- * 'Closing connection - goodbye!' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_DISCONNECTING_REQUESTED', 205);
-
-/**
- * 'Service discontinued' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_DISCONNECTING_FORCED', 400);
-
-
-/**
- * 'Slave status noted' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_SLAVE_RECOGNIZED', 202);
-
-
-
-
-// }}}
-// {{{ Constants: Common errors
-
-
-
-/**
- * 'Command not recognized' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_UNKNOWN_COMMAND', 500);
-
-/**
- * 'Command syntax error' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_SYNTAX_ERROR', 501);
-
-/**
- * 'Access restriction or permission denied' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NOT_PERMITTED', 502);
-
-/**
- * 'Program fault - command not performed' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NOT_SUPPORTED', 503);
-
-
-
-// }}}
-// {{{ Constants: Group selection
-
-
-
-/**
- * 'Group selected' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_GROUP_SELECTED', 211);
-
-/**
- * 'No such news group' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_SUCH_GROUP', 411);
-
-/**
- * 'Groups and descriptions unavailable'
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_XGTITLE_GROUPS_UNAVAILABLE', 481);
-
-// }}}
-// {{{ Constants: Article retrieval
-
-
-/**
- * 'Article retrieved - head and body follow' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_ARTICLE_FOLLOWS', 220);
-
-/**
- * 'Article retrieved - head follows' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_HEAD_FOLLOWS', 221);
-
-/**
- * 'Article retrieved - body follows' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_BODY_FOLLOWS', 222);
-
-/**
- * 'Article retrieved - request text separately' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_ARTICLE_SELECTED', 223);
-
-
-
-
-
-/**
- * 'No newsgroup has been selected' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_GROUP_SELECTED', 412);
-
-
-/**
- * 'No current article has been selected' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_ARTICLE_SELECTED', 420);
-
-/**
- * 'No next article in this group' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_NEXT_ARTICLE', 421);
-
-/**
- * 'No previous article in this group' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_PREVIOUS_ARTICLE', 422);
-
-
-/**
- * 'No such article number in this group' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_SUCH_ARTICLE_NUMBER', 423);
-
-/**
- * 'No such article found' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NO_SUCH_ARTICLE_ID', 430);
-
-/**
- * 'List of groups and descriptions follows' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_XGTITLE_GROUPS_FOLLOW', 482);
-
-
-// }}}
-// {{{ Constants: Transferring
-
-
-
-/**
- * 'Send article to be transferred' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_SEND', 335);
-
-/**
- * 'Article transferred ok' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_SUCCESS', 235);
-
-/**
- * 'Article not wanted - do not send it' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_UNWANTED', 435);
-
-/**
- * 'Transfer failed - try again later' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_FAILURE', 436);
-
-/**
- * 'Article rejected - do not try again' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TRANSFER_REJECTED', 437);
-
-
-
-// }}}
-// {{{ Constants: Posting
-
-
-
-/**
- * 'Send article to be posted' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_SEND', 340);
-
-/**
- * 'Article posted ok' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_SUCCESS', 240);
-
-/**
- * 'Posting not allowed' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_PROHIBITED', 440);
-
-/**
- * 'Posting failed' (RFC977)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_POSTING_FAILURE', 441);
-
-
-
-
-// }}}
-// {{{ Constants: Authorization
-
-
-
-/**
- * 'Authorization required for this command' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHORIZATION_REQUIRED', 450);
-
-/**
- * 'Continue with authorization sequence' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHORIZATION_CONTINUE', 350);
-
-/**
- * 'Authorization accepted' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHORIZATION_ACCEPTED', 250);
-
-/**
- * 'Authorization rejected' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHORIZATION_REJECTED', 452);
-
-
-
-
-// }}}
-// {{{ Constants: Authentication
-
-
-
-/**
- * 'Authentication required' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHENTICATION_REQUIRED', 480);
-
-/**
- * 'More authentication information required' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHENTICATION_CONTINUE', 381);
-
-/**
- * 'Continue with TLS negotiation' (RFC4642)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TLS_AUTHENTICATION_CONTINUE', 382);
-
-/**
- * 'Authentication accepted' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHENTICATION_ACCEPTED', 281);
-
-/**
- * 'Authentication rejected' (RFC2980)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_AUTHENTICATION_REJECTED', 482);
-
-
-// }}}
-// {{{ Constants: Misc
-
-
-
-/**
- * 'Help text follows' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_HELP_FOLLOWS', 100);
-
-/**
- * 'Capabilities list follows' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_CAPABILITIES_FOLLOW', 101);
-
-/**
- * 'Server date and time' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_SERVER_DATE', 111);
-
-/**
- * 'Information follows' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_GROUPS_FOLLOW', 215);
-
-/**
- * 'Overview information follows' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_OVERVIEW_FOLLOWS', 224);
-
-/**
- * 'Headers follow' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_HEADERS_FOLLOW', 225);
-
-/**
- * 'List of new articles follows' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NEW_ARTICLES_FOLLOW', 230);
-
-/**
- * 'List of new newsgroups follows' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_NEW_GROUPS_FOLLOW', 231);
-
-/**
- * 'The server is in the wrong mode; the indicated capability should be used to change the mode' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_WRONG_MODE', 401);
-
-/**
- * 'Internal fault or problem preventing action being taken' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_INTERNAL_FAULT', 403);
-
-/**
- * 'Command unavailable until suitable privacy has been arranged' (Draft)
- *
- * (the client must negotiate appropriate privacy protection on the connection.
- * This will involve the use of a privacy extension such as [NNTP-TLS].)
- *
- * @access     public
- * @since      ?
- */
-//define('NET_NNTP_PROTOCOL_RESPONSECODE_ENCRYPTION_REQUIRED', 483);
-
-/**
- * 'Error in base64-encoding [RFC3548] of an argument' (Draft)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_BASE64_ENCODING_ERROR', 504);
-
-/**
- * 'Can not initiate TLS negotiation' (RFC4642)
- *
- * @access     public
- */
-define('NET_NNTP_PROTOCOL_RESPONSECODE_TLS_FAILED_NEGOTIATION', 580);
-
-
-// }}}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Popporn.php b/lib/copy_this/www/lib/Popporn.php
deleted file mode 100644
index 7d3c5007b..000000000
--- a/lib/copy_this/www/lib/Popporn.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-
-class Popporn
-{
-
-	/**
-	 * Override if 18 years+ or older
-	 * Define Popporn url
-	 * Needed Search Queries Constant
-	 */
-	const IF18 = "http://www.popporn.com/popporn/4";
-	const POPURL = "http://www.popporn.com";
-	const TRAILINGSEARCH = "/results/index.cfm?v=4&g=0&searchtext=";
-	/**
-	 * Define a cookie file location for curl
-	 * @var string string
-	 */
-	public $cookie = "";
-	/**
-	 * Set this for what you are searching for.
-	 *
-	 * @var string
-	 */
-	public $searchTerm = "";
-	/**
-	 * Sets the directurl for the return results array
-	 * @var string
-	 */
-	protected $_directUrl = "";
-
-	/**
-	 * Simple Html Dom Object
-	 *
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * POST Paramaters for Trailers Method
-	 */
-	protected $_postParams;
-
-	/**
-	 * Curl Raw Html
-	 */
-	protected $_response;
-
-	/**
-	 * Results returned from each method
-	 *
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * This is set in the getAll method
-	 *
-	 * @var string
-	 */
-	protected $_title = "";
-
-	/**
-	 * Add this to popurl to get results
-	 *
-	 * @var string
-	 */
-	protected $_trailUrl = "";
-
-	public function __construct()
-	{
-		$this->_html = new \simple_html_dom();
-		if (isset($this->cookie)) {
-			$this->getUrl();
-		}
-	}
-
-	/**
-	 * Get Raw html of webpage
-	 *
-	 * @param bool $usepost
-	 *
-	 * @return bool
-	 */
-	private function getUrl($usepost = false)
-	{
-		if (isset($this->_trailUrl)) {
-			$ch = curl_init(self::POPURL . $this->_trailUrl);
-		} else {
-			$ch = curl_init(self::IF18);
-		}
-
-		if ($usepost === true) {
-			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-			curl_setopt($ch, CURLOPT_POST, 1);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-		if (isset($this->cookie)) {
-			curl_setopt($ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		$this->_response = curl_exec($ch);
-		if (!$this->_response) {
-			curl_close($ch);
-
-			return false;
-		}
-		curl_close($ch);
-		$this->_html->load($this->_response);
-
-		return true;
-	}
-
-	/**
-	 * Remove from memory.
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		unset($this->_response);
-		unset($this->_res);
-	}
-
-	/**
-	 * Searches for match against searchterm
-	 *
-	 * @return bool, true if search >= 90%
-	 */
-	public function search()
-	{
-		if (!isset($this->searchTerm)) {
-			return false;
-		}
-		$this->_trailUrl = self::TRAILINGSEARCH . urlencode($this->searchTerm);
-		if ($this->getUrl() === false) {
-			return false;
-		} else {
-			if ($ret = $this->_html->find('h2[class=title]', 0)) {
-				$title = trim($ret->innertext);
-				$title = preg_replace('/XXX/', '', $title);
-			} else {
-				if ($ret = $this->_html->find('div.product-info, div.title', 1)) {
-					$title = trim($ret->plaintext);
-					$title = preg_replace('/XXX/', '', $title);
-					$title = preg_replace('/\(.*?\)|[-._]/i', ' ', $title);
-					if ($ret = $ret->find('a', 0)) {
-						$this->_trailUrl = trim($ret->href);
-						@$this->getUrl();
-					}
-
-				} else {
-					return false;
-				}
-			}
-
-			if ($ret = $this->_html->find('#link-to-this', 0)) {
-				$ret = trim($ret->href);
-				$this->_directUrl = $ret;
-			}
-			if (isset($title)) {
-				similar_text($this->searchTerm, $title, $p);
-				if ($p >= 90) {
-					$this->_title = $title;
-					unset($ret);
-
-					return true;
-				} else {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * Gets all information
-	 *
-	 * @return array
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directUrl)) {
-			$results['title'] = $this->_title;
-			$results['directurl'] = $this->_directUrl;
-		}
-		if (is_array($this->sypnosis())) {
-			$results = array_merge($results, $this->sypnosis());
-		}
-		if (is_array($this->productInfo(true))) {
-			$results = array_merge($results, $this->productInfo(true));
-		}
-		if (is_array($this->cast())) {
-			$results = array_merge($results, $this->cast());
-		}
-		if (is_array($this->genres())) {
-			$results = array_merge($results, $this->genres());
-		}
-		if (is_array($this->covers())) {
-			$results = array_merge($results, $this->covers());
-		}
-		if (is_array($this->trailers())) {
-			$results = array_merge($results, $this->trailers());
-		}
-		if (empty($results) === true) {
-			return false;
-		} else {
-			return $results;
-		}
-	}
-
-	/**
-	 * Gets the sypnosis
-	 * @return array|bool
-	 */
-	public function sypnosis()
-	{
-		if ($ret = $this->_html->find('div[id=product-info] ,h3[class=highlight]', 1)) {
-			if ($ret->next_sibling()->plaintext) {
-				if (!stristr(trim($ret->next_sibling()->plaintext), "POPPORN EXCLUSIVE")) {
-					$this->_res['sypnosis'] = trim($ret->next_sibling()->plaintext);
-				} else {
-					if ($ret->next_sibling()->next_sibling()->next_sibling()->plaintext) {
-						$this->_res['sypnosis'] = trim($ret->next_sibling()->next_sibling()->next_sibling()->plaintext);
-					} else {
-						$this->_res['sypnosis'] = "N/A";
-					}
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Process ProductInfo And/or Extras
-	 *
-	 * @param bool $extras
-	 *
-	 * @return array|bool
-	 */
-	public function productInfo($extras = true)
-	{
-		$country = false;
-		if ($ret = $this->_html->find('div#lside', 0)) {
-			foreach ($ret->find("text") as $e) {
-				$e = trim($e->innertext);
-				$e = str_replace(",", "", $e);
-				$e = str_replace("...", "", $e);
-				$e = str_replace("&nbsp;", "", $e);
-				if (stristr($e, "Country:")) {
-					$country = true;
-				}
-				if ($country === true) {
-					if (!stristr($e, "addthis_config")) {
-						if (!empty($e)) {
-							$this->_res['productinfo'][] = $e;
-						}
-					} else {
-						break;
-					}
-				}
-			}
-		}
-
-		$this->_res['productinfo'] = array_chunk($this->_res['productinfo'], 2, false);
-
-		if ($extras === true) {
-			$features = false;
-			if ($this->_html->find('ul.stock-information', 0)) {
-				foreach ($this->_html->find('ul.stock-information') as $ul) {
-					foreach ($ul->find('li') as $e) {
-						$e = trim($e->plaintext);
-						if ($e == "Features:") {
-							$features = true;
-							$e = null;
-						}
-						if ($features == true) {
-							if (!empty($e)) {
-								$this->_res['extras'][] = $e;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the cast members and director
-	 * @return array|bool
-	 */
-	public function cast()
-	{
-		$cast = false;
-		$director = false;
-		$er = array();
-		if ($ret = $this->_html->find('div#lside', 0)) {
-			foreach ($ret->find("text") as $e) {
-				$e = trim($e->innertext);
-				$e = str_replace(",", "", $e);
-				$e = str_replace("&nbsp;", "", $e);
-				if (stristr($e, "Cast")) {
-					$cast = true;
-				}
-				$e = str_replace("Cast:", "", $e);
-				if ($cast === true) {
-					if (stristr($e, "Director:")) {
-						$director = true;
-						$e = null;
-					}
-
-					if ($director === true) {
-						if (!empty($e)) {
-							$this->_res['director'] = $e;
-							$director = false;
-							$e = null;
-						}
-					}
-					if (!stristr($e, "Country:")) {
-						if (!empty($e)) {
-							$er[] = $e;
-						}
-					} else {
-						break;
-					}
-				}
-			}
-			$this->_res['cast'] = & $er;
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets categories
-	 *
-	 * @return array
-	 */
-	public function genres()
-	{
-		$genres = array();
-		if ($ret = $this->_html->find('div[id=thekeywords], p[class=keywords]', 1)) {
-			foreach ($ret->find('a') as $e) {
-				$genres[] = trim($e->plaintext);
-			}
-			$this->_res['genres'] = & $genres;
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Get Box Cover Images
-	 *
-	 * @return array - boxcover,backcover
-	 */
-	public function covers()
-	{
-		if ($ret = $this->_html->find('div[id=box-art], a[rel=box-art]', 1)) {
-			$this->_res['boxcover'] = trim($ret->href);
-			if (stristr(trim($ret->href), "_aa")) {
-				$this->_res['backcover'] = str_ireplace("_aa", "_bb", trim($ret->href));
-			} else {
-				$this->_res['backcover'] = str_ireplace(".jpg", "_b.jpg", trim($ret->href));
-			}
-		} else {
-			if ($ret = $this->_html->find('img.front', 0)) {
-				$this->_res['boxcover'] = $ret->src;
-			}
-			if ($ret = $this->_html->find('img.back', 0)) {
-				$this->_res['backcover'] = $ret->src;
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets trailer video
-	 * @return array|bool
-	 */
-	public function trailers()
-	{
-		if ($ret = $this->_html->find('input#thickbox-trailer-link', 0)) {
-			$ret->value = trim($ret->value);
-			$ret->value = str_replace("..", "", $ret->value);
-			$tmprsp = $this->_response;
-			$this->_trailUrl = $ret->value;
-			$this->getUrl();
-			if (preg_match_all('/productID="\+(?<id>[0-9]+),/', $this->_response, $matches)) {
-				$productid = $matches['id'][0];
-				$random = ((float)rand() / (float)getrandmax()) * 5400000000000000;
-				$this->_trailUrl = "/com/tlavideo/vod/FlvAjaxSupportService.cfc?random=" . $random;
-				$this->_postParams = "method=pipeStreamLoc&productID=" . $productid;
-				$this->getUrl(true);
-				$ret = json_decode(json_decode($this->_response, true), true);
-				$this->_res['trailers']['baseurl'] = self::POPURL . "/flashmediaserver/trailerPlayer.swf";
-				$this->_res['trailers']['flashvars'] = "subscribe=false&image=&file=" . self::POPURL . "/" . $ret['LOC'] . "&autostart=false";
-				unset($this->_response);
-				$this->_response = $tmprsp;
-			}
-		}
-
-		return $this->_res;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/ReleaseSearch.php b/lib/copy_this/www/lib/ReleaseSearch.php
deleted file mode 100644
index 2a79cf7cf..000000000
--- a/lib/copy_this/www/lib/ReleaseSearch.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/framework/db.php");
-class ReleaseSearch
-{
-	const FULLTEXT = 0;
-	const LIKE     = 1;
-	const SPHINX   = 2;
-
-	/***
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * Array where keys are the column name, and value is the search string.
-	 * @var array
-	 */
-	private $searchOptions;
-
-	/**
-	 * Sets the string to join the releases table to the release search table if using full text.
-	 * @var string
-	 */
-	private $fullTextJoinString;
-
-	/**
-	 * @param DB $settings
-	 */
-	public function __construct(DB $settings)
-	{
-		switch (NN_RELEASE_SEARCH_TYPE) {
-			case self::LIKE:
-				$this->fullTextJoinString = '';
-				break;
-			case self::SPHINX:
-				$this->fullTextJoinString = 'INNER JOIN releases_se rse ON rse.id = r.id';
-				break;
-			case self::FULLTEXT:
-			default:
-			$this->fullTextJoinString = 'INNER JOIN releasesearch rs on rs.releaseid = r.id';
-				break;
-		}
-
-		$this->pdo = ($settings instanceof DB ? $settings : new DB());
-	}
-
-	/**
-	 * Create part of a SQL query for searching releases.
-	 *
-	 * @param array $options   Array where keys are the column name, and value is the search string.
-	 * @param bool  $forceLike Force a "like" search on the column.
-	 *
-	 * @return string
-	 */
-	public function getSearchSQL($options = [], $forceLike = false)
-	{
-		$this->searchOptions = $options;
-
-		if ($forceLike) {
-			return $this->likeSQL();
-		}
-
-		switch (NN_RELEASE_SEARCH_TYPE) {
-			case self::LIKE:
-				$SQL = $this->likeSQL();
-				break;
-			case self::SPHINX:
-				$SQL = $this->sphinxSQL();
-				break;
-			case self::FULLTEXT:
-			default:
-				$SQL = $this->fullTextSQL();
-				break;
-		}
-		return $SQL;
-	}
-
-	/**
-	 * Returns the string for joining the release search table to the releases table.
-	 * @return string
-	 */
-	public function getFullTextJoinString()
-	{
-		return $this->fullTextJoinString;
-	}
-
-	/**
-	 * Create SQL sub-query for full text searching.
-	 *
-	 * @return string
-	 */
-	private function fullTextSQL()
-	{
-		$return = '';
-		foreach ($this->searchOptions as $columnName => $searchString) {
-			$searchWords = '';
-
-			// At least 1 search term needs to be mandatory.
-			$words = explode(' ', (!preg_match('/[+!^]/', $searchString) ? '+' : '') . $searchString);
-			foreach ($words as $word) {
-				$word = str_replace("'", "\\'", str_replace(['!', '^'], '+', trim($word, "\n\t\r\0\x0B- ")));
-
-				if ($word !== '' && $word !== '-' && strlen($word) > 1) {
-					$searchWords .= ($word . ' ');
-				}
-			}
-			$searchWords = trim($searchWords);
-			if ($searchWords !== '') {
-				$return .= sprintf(" AND MATCH(rs.%s) AGAINST('%s' IN BOOLEAN MODE)", $columnName, $searchWords);
-			}
-
-		}
-		// If we didn't get anything, try the LIKE method.
-		if ($return === '') {
-			return ($this->likeSQL());
-		} else {
-			return $return;
-		}
-	}
-
-	/**
-	 * Create SQL sub-query for standard search.
-	 *
-	 * @return string
-	 */
-	private function likeSQL()
-	{
-		$return = '';
-		foreach ($this->searchOptions as $columnName => $searchString) {
-			$wordCount = 0;
-			$words = explode(' ', $searchString);
-			foreach ($words as $word) {
-				if ($word != '') {
-					$word = trim($word, "-\n\t\r\0\x0B ");
-					if ($wordCount == 0 && (strpos($word, '^') === 0)) {
-						$return .= sprintf(' AND r.%s %s', $columnName, $this->pdo->likeString(substr($word, 1), false));
-					} else if (substr($word, 0, 2) == '--') {
-						$return .= sprintf(' AND r.%s NOT %s', $columnName, $this->pdo->likeString(substr($word, 2)));
-					} else {
-						$return .= sprintf(' AND r.%s %s', $columnName, $this->pdo->likeString($word));
-					}
-					$wordCount++;
-				}
-			}
-		}
-		return $return;
-	}
-	/**
-	 * Create SQL sub-query using sphinx full text search.
-	 *
-	 * @return string
-	 */
-	private function sphinxSQL()
-	{
-		$return = '';
-		foreach ($this->searchOptions as $columnName => $searchString) {
-			$searchWords = '';
-			$words = explode(' ', $searchString);
-			foreach ($words as $word) {
-				$word = str_replace("'", "\\'", trim($word, "\n\t\r\0\x0B "));
-
-				if ($word !== '') {
-					$searchWords .= ($word . ' ');
-				}
-			}
-			$searchWords = rtrim($searchWords, "\n\t\r\0\x0B ");
-			if ($searchWords !== '') {
-				$return .= sprintf("@%s %s ", $columnName, $searchWords);
-			}
-		}
-		if ($return === '') {
-			return $this->likeSQL();
-		} else {
-			return sprintf(
-				" AND rse.query = '%s;limit=10000;maxmatches=10000;sort=relevance;mode=extended'",
-				trim($return)
-			);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/RequestID.php b/lib/copy_this/www/lib/RequestID.php
deleted file mode 100644
index 2ae04a8c0..000000000
--- a/lib/copy_this/www/lib/RequestID.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once (NN_LIB . 'Categorize.php');
-require_once (NN_LIB . 'groups.php');
-require_once (NN_LIB . 'ConsoleTools.php');
-require_once (NN_LIB . 'SphinxSearch.php');
-
-abstract class RequestID
-{
-	// Request id.
-	const REQID_OLD    = -4; // We rechecked the web a second time and didn't find a title so don't process it again.
-	const REQID_NONE   = -3; // The Request id was not found locally or via web lookup.
-	const REQID_ZERO   = -2; // The Request id was 0.
-	const REQID_NOLL   = -1; // Request id was not found via local lookup.
-	const REQID_UPROC  =  0; // Release has not been processed.
-	const REQID_FOUND  =  1; // Request id found and release was updated.
-
-	/**
-	 * @var Groups
-	 */
-	public $groups;
-
-	/**
-	 * @param array $options Class instances / Echo to cli?
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'         => true,
-			'Categorize'   => null,
-			'ConsoleTools' => null,
-			'Groups'       => null,
-			'Settings'     => null,
-			'SphinxSearch' => null,
-		];
-		$options += $defaults;
-
-		$this->echoOutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->category = ($options['Categorize'] instanceof \Categorize ? $options['Categorize'] : new \Categorize(['Settings' => $this->pdo]));
-		$this->groups = ($options['Groups'] instanceof \Groups ? $options['Groups'] : new \Groups(['Settings' => $this->pdo]));
-		$this->consoleTools = ($options['ConsoleTools'] instanceof \ConsoleTools ? $options['ConsoleTools'] : new \ConsoleTools(['ColorCLI' => $this->pdo->log]));
-		$this->sphinx = ($options['SphinxSearch'] instanceof \SphinxSearch ? $options['SphinxSearch'] : new \SphinxSearch());
-	}
-
-	/**
-	 * Look up request id's for releases.
-	 *
-	 * @param array $options
-	 *
-	 * @return int Quantity of releases matched to a request id.
-	 */
-	public function lookupRequestIDs(array $options = array())
-	{
-		$curOptions = [
-			'charGUID'      => '',
-			'GroupID'       => '',
-			'limit'         => '',
-			'show'          => 1,
-			'time'          => 0,
-		];
-		$curOptions = array_replace($curOptions, $options);
-
-		$startTime = time();
-		$renamed = 0;
-
-		$this->_charGUID = $curOptions['charGUID'];
-		$this->_groupID = $curOptions['GroupID'];
-		$this->_show = $curOptions['show'];
-		$this->_maxTime = $curOptions['time'];
-		$this->_limit = $curOptions['limit'];
-
-		$this->_getReleases();
-
-		if ($this->_releases !== false && $this->_releases->rowCount() > 0) {
-			$this->_totalReleases = $this->_releases->rowCount();
-			$this->pdo->log->doEcho($this->pdo->log->primary('Processing ' . $this->_totalReleases . " releases for RequestID's."));
-			$renamed = $this->_processReleases();
-			if ($this->echoOutput) {
-				echo $this->pdo->log->header(
-					"\nRenamed " . number_format($renamed) . " releases in " . $this->consoleTools->convertTime(time() - $startTime) . "."
-				);
-			}
-		} elseif ($this->echoOutput) {
-			$this->pdo->log->doEcho($this->pdo->log->primary("No RequestID's to process."));
-		}
-
-		return $renamed;
-	}
-
-	/**
-	 * Fetch releases with requestid's from MySQL.
-	 */
-	protected function _getReleases() { }
-
-	/**
-	 * Process releases for requestid's.
-	 *
-	 * @return int How many did we rename?
-	 */
-	protected function _processReleases() { }
-
-	/**
-	 * No request id was found, update the release.
-	 *
-	 * @param int $releaseID
-	 * @param int $status
-	 */
-	protected function _requestIdNotFound($releaseID, $status)
-	{
-		if ($releaseID == 0) {
-			return;
-		}
-
-		$this->pdo->queryExec(
-			sprintf('
-				UPDATE releases SET reqidstatus = %d WHERE id = %d',
-				$status, $releaseID
-			)
-		);
-	}
-
-	/**
-	 * Get a new title / pre id for a release.
-	 *
-	 * @return array|bool
-	 */
-	protected function _getNewTitle() { }
-
-	/**
-	 * Find a RequestID in a usenet subject.
-	 *
-	 * @return int
-	 */
-	protected function _siftReqId()
-	{
-		$requestID = array();
-		switch (true) {
-			case preg_match('/\[\s*#?scnzb@?efnet\s*\]\[(\d+)\]/', $this->_release['name'], $requestID):
-			case preg_match('/\[\s*(\d+)\s*\]/', $this->_release['name'], $requestID):
-			case preg_match('/^REQ\s*(\d{4,6})/i', $this->_release['name'], $requestID):
-			case preg_match('/^(\d{4,6})-\d{1}\[/', $this->_release['name'], $requestID):
-			case preg_match('/(\d{4,6}) -/',$this->_release['name'], $requestID):
-				if ((int) $requestID[1] > 0) {
-					return (int) $requestID[1];
-				}
-		}
-		return self::REQID_ZERO;
-	}
-
-	/**
-	 * @var bool Echo to CLI?
-	 */
-	protected $echoOutput;
-
-	/**
-	 * @var Categorize
-	 */
-	protected $category;
-
-	/**
-	 * @var DB
-	 */
-	protected $pdo;
-
-	/**
-	 * @var ConsoleTools
-	 */
-	protected $consoleTools;
-
-	/**
-	 * @var ColorCLI
-	 */
-	protected $colorCLI;
-
-	/**
-	 * The found request id for the release.
-	 * @var int
-	 */
-	protected $_requestID = self::REQID_ZERO;
-
-	/**
-	 * The title found from a request id lookup.
-	 * @var bool|string|array
-	 */
-	protected $_newTitle = false;
-
-	/**
-	 * Releases with potential Request id's we can work on.
-	 * @var \PDOStatement|bool
-	 */
-	protected $_releases;
-
-	/**
-	 * Total amount of releases we will be working on.
-	 * @var int
-	 */
-	protected $_totalReleases;
-
-	/**
-	 * Release we are currently working on.
-	 * @var array
-	 */
-	protected $_release;
-
-	/**
-	 * @var int To show the result or not.
-	 */
-	protected $_show = 0;
-
-	/**
-	 * GroupID, which is optional, to limit query results.
-	 * @var string
-	 */
-	protected $_groupID;
-
-	/**
-	 * First character of a release GUID, which is optional, to limit query results.
-	 * @var string
-	 */
-	protected $_charGUID;
-
-	protected $_limit;
-
-	protected $_maxTime;
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/RequestIDLocal.php b/lib/copy_this/www/lib/RequestIDLocal.php
deleted file mode 100644
index 5f3abe373..000000000
--- a/lib/copy_this/www/lib/RequestIDLocal.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-require_once (NN_LIB . 'RequestID.php');
-
-/**
- * Attempts to find a PRE name for a release using a request id from our local pre database,
- * or internet request id database using a Standalone -- more intensive methods
- *
- * Class RequestIDLocal
- */
-class RequestIDLocal extends RequestID
-{
-	/**
-	 * @param array $options Class instances / Echo to cli?
-	 */
-	public function __construct(array $options = array())
-	{
-		parent::__construct($options);
-	}
-
-	/**
-	 * Fetch releases with requestid's from MySQL.
-	 */
-	protected function _getReleases()
-	{
-		$query = (
-			'SELECT r.id, r.name, r.categoryid, r.reqidstatus, g.name AS groupname, g.id as gid
-			FROM releases r
-			INNER JOIN groups g ON r.groupid = g.id
-			WHERE r.nzbstatus = 1
-			AND r.prehashid = 0
-			AND r.isrequestID = 1'
-		);
-
-		$query .= ($this->_charGUID === '' ? '' : ' AND r.guid ' . $this->pdo->likeString($this->_charGUID, false, true));
-		$query .= ($this->_groupID === '' ? '' : ' AND r.groupid = ' . $this->_groupID);
-		$query .= ($this->_maxTime === 0 ? '' : sprintf(' AND r.adddate > NOW() - INTERVAL %d HOUR', $this->_maxTime));
-
-		switch ($this->_limit) {
-			case 'full':
-				$query .= sprintf(
-					" AND r.isrenamed = 0 AND r.reqidstatus in (%d, %d, %d)",
-					self::REQID_UPROC,
-					self::REQID_NOLL,
-					self::REQID_NONE
-				);
-				break;
-			case is_numeric($this->_limit):
-				$query .= sprintf(
-					" AND r.isrenamed = 0 AND r.reqidstatus in (%d, %d, %d) ORDER BY r.postdate DESC LIMIT %d",
-					self::REQID_UPROC,
-					self::REQID_NOLL,
-					self::REQID_NONE,
-					$this->_limit
-				);
-				break;
-			case 'all':
-			default:
-				break;
-		}
-		$this->_releases = $this->pdo->queryDirect($query);
-	}
-
-	/**
-	 * Process releases for requestid's.
-	 *
-	 * @return int How many did we rename?
-	 */
-	protected function _processReleases()
-	{
-		$renamed = $checked = 0;
-		if ($this->_releases instanceof \Traversable) {
-			foreach ($this->_releases as $this->_release) {
-				$this->_requestID = $this->_siftReqId();
-
-				// Do a local lookup using multiple possible methods
-				$this->_newTitle = $this->_getNewTitle();
-
-				if ($this->_newTitle !== false && isset($this->_newTitle['title'])) {
-					$this->_updateRelease();
-					$renamed++;
-				} else {
-					$this->_requestIdNotFound($this->_release['id'], ($this->_release['reqidstatus'] == self::REQID_UPROC ? self::REQID_NOLL : self::REQID_NONE));
-				}
-
-				if ($this->echoOutput && $this->_show === 0) {
-					$this->consoleTools->overWritePrimary(
-						"Checked Releases: [" . number_format($checked) . "] " .
-						$this->consoleTools->percentString(++$checked, $this->_totalReleases)
-					);
-				}
-
-			}
-		}
-
-		return $renamed;
-	}
-
-	/**
-	 * Get a new title / pre id for a release.
-	 *
-	 * @return array|bool
-	 */
-	protected function _getNewTitle()
-	{
-		if ($this->_requestID === -2) {
-			return $this->_multiLookup();
-		}
-
-		$check = $this->pdo->queryDirect(
-			sprintf(
-				'SELECT id, title FROM prehash WHERE requestid = %d AND groupid = %d',
-				$this->_requestID,
-				$this->_release['gid']
-			)
-		);
-
-		if ($check instanceof \Traversable) {
-			if ($check->rowCount() == 1) {
-				foreach ($check as $row) {
-					if (preg_match('/s\d+/i', $row['title']) && !preg_match('/s\d+e\d+/i', $row['title'])) {
-						return false;
-					}
-					return array('title' => $row['title'], 'id' => $row['id']);
-				}
-			} else {
-				//Prevents multiple releases with the same request id/group from being renamed to the same Pre.
-				return $this->_multiLookup();
-			}
-		} else {
-			$result = $this->_singleAltLookup();
-			if (is_array($result) && is_numeric($result['id']) && $result['title'] !== '') {
-				return $result;
-			} else {
-				return $this->_multiLookup();
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Sub function that attempts to match RequestID Releases
-	 * by preg_matching the title from the usenet name
-	 *
-	 * @return array|bool
-	 */
-	protected function _multiLookup()
-	{
-		$regex1 =
-				'/^\[\s*\d+\s*\][ -]+(\[(ISO|FULL|PART|MP3|0DAY|android)\][ -]+)?\[(alt-?bin| ?#?a[a-z0-9. -]+)((@?ef{1,2})?net)? ?\]' .
-				'[ -]+(\[(ISO|FULL|PART|MP3|0DAY|android)\][ -]+)?(\[\s*\d+\s*\][ -]+)?(\[\d+\/\d+\][ -]+)?(\"|\[)\s*' .
-				'(?P<title>.+?)(\.+(vol\d+\+\d+\.)?(-cd\d\.)?(avi|jpg|nzb|m3u|mkv|par2|part\d+|nfo|sample|sfv|rar|r?\d{1,3}|\d+|zip)*)?\s*(\"|\])' .
-				'[ -]*(\[\d+\/\d+\][ -]*)?((\"\s*(?P<filename1>.+?)([-.]sample)?([-.]cd(\d|[ab]))?(\.+(vol\d+\+\d+\.)?([-.]d\d\.)?([-.]part\d+)?' .
-				'(avi|jpg|nzb|m3u|mkv|par2|nfo|sample|sfv|rar|r?\d{1,3}|\d+|zip)*)?\s*\")| - (?P<filename2>.+?) (yEnc|\(\d+\/\d+\)))?.*/i'
-		;
-
-		$regex2 =
-				'/^\[\s*\d+\s*\].*' .
-				'\"\s*(?P<title>.+?)(\.+(vol\d+\+\d+\.)?(-cd\d\.)?' .
-				'(avi|jpg|nzb|m3u|mkv|par2|part\d+|nfo|sample|sfv|rar|r?\d{1,3}|\d+|zip)*)\s*\".*/i'
-		;
-
-		$matches = array();
-		switch (true) {
-			case preg_match($regex1, $this->_release['name'], $matches):
-			case preg_match($regex2, $this->_release['name'], $matches):
-				$check = $this->pdo->queryOneRow(
-					sprintf(
-						"SELECT id, title FROM prehash WHERE title = %s OR filename = %s %s",
-						$this->pdo->escapeString($matches['title']),
-						$this->pdo->escapeString($matches['title']),
-						(
-							isset($matches['filename1']) && $matches['filename1'] !== ''
-							? 'OR filename = ' . $this->pdo->escapeString($matches['filename1'])
-							:
-							(
-								isset($matches['filename2']) && $matches['filename2'] !== ''
-								? 'OR filename = ' . $this->pdo->escapeString($matches['filename2'])
-								: ''
-							)
-						)
-					)
-				);
-				if ($check !== false) {
-					return array('title' => $check['title'], 'id' => $check['id']);
-				}
-				continue;
-			default:
-				return false;
-		}
-		return false;
-	}
-
-	private $groupIDCache = array();
-
-	/**
-	 * Attempts to remap the release groupid by extracting the new group name from the release usenet name.
-	 *
-	 * @return array|bool
-	 */
-	protected function _singleAltLookup()
-	{
-		switch (true) {
-			case $this->_release['name'] == 'alt.binaries.etc':
-				$groupName = 'alt.binaries.teevee';
-				break;
-			case strpos($this->_release['name'], 'teevee') !== false:
-				$groupName = 'alt.binaries.teevee';
-				break;
-			case strpos($this->_release['name'], 'moovee') !== false:
-				$groupName = 'alt.binaries.moovee';
-				break;
-			case strpos($this->_release['name'], 'erotica') !== false:
-				$groupName = 'alt.binaries.erotica';
-				break;
-			case strpos($this->_release['name'], 'foreign') !== false:
-				$groupName = 'alt.binaries.mom';
-				break;
-			case strpos($this->_release['name'], 'inner-sanctum') !== false:
-				$groupName = 'alt.binaries.inner-sanctum';
-				break;
-			case strpos($this->_release['name'], 'sounds.flac') !== false:
-				$groupName = 'alt.binaries.sounds.flac';
-				break;
-			case strpos($this->_release['name'], 'scnzb') !== false:
-				$groupName = 'alt.binaries.boneless';
-				break;
-			case strpos($this->_release['name'], 'hdtv.x264') !== false:
-				$groupName = 'alt.binaries.hdtv.x264';
-				break;
-			default:
-				return false;
-		}
-		if (isset($this->groupIDCache[$groupName])) {
-			$groupID = $this->groupIDCache[$groupName];
-		} else {
-			$groupID = $this->groups->getIDByName($groupName);
-		}
-		$check = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT id, title FROM prehash WHERE requestid = %d AND groupid = %d",
-				$this->_requestID,
-				($groupID === '' ? 0 : $groupID)
-			)
-		);
-		if ($check !== false) {
-			return array('title' => $check['title'], 'id' => $check['id']);
-		}
-		return false;
-	}
-
-	/**
-	 * Updates release information when a proper Request id match is found.
-	 */
-	protected function _updateRelease()
-	{
-		$determinedCat = $this->category->determineCategory($this->_release['gid'], $this->_newTitle['title']);
-		if ($determinedCat == $this->_release['categoryid']) {
-			$newTitle = $this->pdo->escapeString($this->_newTitle['title']);
-			$this->pdo->queryExec(
-				sprintf('
-					UPDATE releases
-					SET prehashid = %d, reqidstatus = %d, isrenamed = 1, iscategorized = 1, searchname = %s
-					WHERE id = %d',
-					$this->_newTitle['id'],
-					self::REQID_FOUND,
-					$newTitle,
-					$this->_release['id']
-				)
-			);
-			$this->sphinx->updateReleaseSearchName($this->_release['id'], $newTitle);
-		} else {
-			$newTitle = $this->pdo->escapeString($this->_newTitle['title']);
-			$this->pdo->queryExec(
-				sprintf('
-					UPDATE releases SET
-						rageid = -1, seriesfull = NULL, season = NULL, episode = NULL, tvtitle = NULL,
-						tvairdate = NULL, imdbid = NULL, musicinfoid = NULL, consoleinfoid = NULL,
-						bookinfoid = NULL, anidbid = NULL, prehashid = %d, reqidstatus = %d, isrenamed = 1,
-						iscategorized = 1, searchname = %s, categoryid = %d
-					WHERE id = %d',
-					$this->_newTitle['id'],
-					self::REQID_FOUND,
-					$newTitle,
-					$determinedCat,
-					$this->_release['id']
-				)
-			);
-			$this->sphinx->updateReleaseSearchName($this->_release['id'], $newTitle);
-		}
-
-		if ($this->_release['name'] !== $this->_newTitle['title'] && $this->_show == 1) {
-			\NameFixer::echoChangedReleaseName(
-				array(
-					'new_name'     => $this->_newTitle['title'],
-					'old_name'     => $this->_release['name'],
-					'new_category' => $this->category->getNameByID($determinedCat),
-					'old_category' => $this->category->getNameByID($this->_release['categoryid']),
-					'group'        => $this->_release['groupname'],
-					'release_id'   => $this->_release['id'],
-					'method'       => 'RequestIDLocal'
-				)
-			);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/RequestIDWeb.php b/lib/copy_this/www/lib/RequestIDWeb.php
deleted file mode 100644
index 32da3832b..000000000
--- a/lib/copy_this/www/lib/RequestIDWeb.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-
-require_once (NN_LIB . 'util.php');
-require_once (NN_LIB . 'RequestID.php');
-
-/**
- * Attempts to find a PRE name for a release using a request id from our local pre database,
- * or internet request id database.
- *
- * Class RequestIDWeb
- */
-class RequestIDWeb extends RequestID
-{
-	const MAX_WEB_LOOKUPS = 75; // Please don't exceed this, not to be to harsh on the Request id server.
-
-	/**
-	 * The id of the PRE entry the found request id belongs to.
-	 * @var bool|int
-	 */
-	protected $_preDbID = false;
-
-	/**
-	 * @var int
-	 */
-	protected $_request_hours;
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options Class instances / Echo to cli?
-	 */
-	public function __construct(array $options = array())
-	{
-		parent::__construct($options);
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->_request_hours = ($this->site->request_hours != '') ? (int)$this->site->request_hours : 1;
-	}
-
-	/**
-	 * Get all results from the releases table that have request id's to be processed.
-	 */
-	protected function _getReleases()
-	{
-		$this->_releases = $this->pdo->queryDirect(
-			sprintf ('
-				SELECT r.id, r.name, r.searchname, g.name AS groupname, r.groupid, r.categoryid
-				FROM releases r
-				INNER JOIN groups g ON r.groupid = g.id
-				WHERE r.nzbstatus = 1
-				AND r.prehashid = 0
-				AND r.isrequestid = 1
-				AND (
-					r.reqidstatus = %d
-					OR (r.reqidstatus = %d AND r.adddate < NOW() - INTERVAL %d HOUR)
-				)
-				%s %s %s
-				ORDER BY r.postdate DESC
-				LIMIT %d',
-				self::REQID_NOLL,
-				self::REQID_NONE,
-				$this->_request_hours,
-				(empty($this->_groupID) ? '' : ('AND r.groupid = ' . $this->_groupID)),
-				$this->_getReqIdGroups(),
-				($this->_maxTime === 0 ? '' : sprintf(' AND r.adddate > NOW() - INTERVAL %d HOUR', $this->_maxTime)),
-				(empty($this->_limit) || $this->_limit > 1000 ? 1000 : $this->_limit)
-			)
-		);
-	}
-
-	/**
-	 * Create "AND" part of query for request id groups.
-	 * Less load on the request id web server, by limiting results.
-	 *
-	 * @return string
-	 */
-	protected function _getReqIdGroups()
-	{
-		return (
-			"AND g.name IN (
-				'alt.binaries.boneless',
-				'alt.binaries.cd.image',
-				'alt.binaries.console.ps3',
-				'alt.binaries.erotica',
-				'alt.binaries.games.nintendods',
-				'alt.binaries.games.wii',
-				'alt.binaries.games.xbox360',
-				'alt.binaries.inner-sanctum',
-				'alt.binaries.mom',
-				'alt.binaries.moovee',
-				'alt.binaries.movies.divx',
-				'alt.binaries.sony.psp',
-				'alt.binaries.sounds.mp3.complete_cd',
-				'alt.binaries.sounds.flac',
-				'alt.binaries.teevee',
-				'alt.binaries.warez'," .
-
-				// Extra groups we will need to remap later, etc is teevee for example.
-				"'alt.binaries.etc'
-			)"
-		);
-	}
-
-	/**
-	 * Process releases for requestid's.
-	 *
-	 * @return int How many did we rename?
-	 */
-	protected function _processReleases()
-	{
-		// Array to store results.
-		$requestArray = array();
-
-		if ($this->_releases instanceof \Traversable) {
-			// Loop all the results.
-			foreach($this->_releases as $release) {
-
-				$this->_release['name'] = $release['name'];
-				// Try to find a request id for the release.
-				$requestId = $this->_siftReqId();
-
-				// If there's none, update the release and continue.
-				if ($requestId === self::REQID_ZERO) {
-					$this->_requestIdNotFound($release['id'], self::REQID_NONE);
-					if ($this->echoOutput) {
-						echo '-';
-					}
-					continue;
-				}
-
-				// Change etc to teevee.
-				if ($release['groupname'] === 'alt.binaries.etc') {
-					$release['groupname'] = 'alt.binaries.teevee';
-				}
-
-				// Send the release id so we can track the return data.
-				$requestArray[$release['id']] = array(
-					'reqid' => $requestId,
-					'ident' => $release['id'],
-					'group' => $release['groupname'],
-					'sname' => $release['searchname']
-				);
-			}
-		}
-
-		// Check if we requests to send to the web.
-		if (count($requestArray) < 1) {
-			return 0;
-		}
-
-		// Mock array for isset check on server.
-		$requestArray[0] = ['ident' => 0, 'group' => 'none', 'reqid' => 0];
-
-		// Do a web lookup.
-		$returnXml = Utility::getUrl([
-				'url' => $this->site->request_url,
-				'method' => 'post',
-				'postdata' => 'data=' . serialize($requestArray),
-				'verifycert' => false,
-			]
-		);
-
-		$renamed = 0;
-		// Change the release titles and insert the PRE's if they don't exist.
-		if ($returnXml !== false) {
-			$returnXml = @simplexml_load_string($returnXml);
-			if ($returnXml !== false) {
-
-				// Store the returned identifiers so we can check which releases we didn't find a request id.
-				$returnedIdentifiers = [];
-
-				$groupIDArray = [];
-				foreach($returnXml->request as $result) {
-					if (isset($result['name']) && isset($result['ident']) && (int)$result['ident'] > 0) {
-						$this->_newTitle['title'] = (string)$result['name'];
-						$this->_requestID = (int)$result['reqid'];
-						$this->_release['id'] = (int)$result['ident'];
-
-						// Buffer groupid queries.
-						$this->_release['groupname'] = $requestArray[(int)$result['ident']]['group'];
-						if (isset($groupIDarray[$this->_release['groupname']])) {
-							$this->_release['groupid'] = $groupIDArray[$this->_release['groupname']];
-						} else {
-							$this->_release['groupid'] = $this->groups->getIDByName($this->_release['groupname']);
-							$groupIDArray[$this->_release['groupname']] = $this->_release['groupid'];
-						}
-						$this->_release['gid'] = $this->_release['groupid'];
-
-						$this->_release['searchname'] = $requestArray[(int)$result['ident']]['sname'];
-						$this->_insertIntoPreDB();
-						if ($this->_preDbID === false) {
-							$this->_preDbID = 0;
-						}
-						$this->_newTitle['id'] = $this->_preDbID;
-						$this->_updateRelease();
-						$renamed++;
-						if ($this->echoOutput) {
-							echo '+';
-						}
-						$returnedIdentifiers[] = (string)$result['ident'];
-					}
-				}
-
-				// Check if the WEB didn't send back some titles, update the release.
-				if (count($returnedIdentifiers) > 0) {
-					foreach ($returnedIdentifiers as $identifier) {
-						if (array_key_exists($identifier, $requestArray)) {
-							unset($requestArray[$identifier]);
-						}
-					}
-				}
-
-				unset($requestArray[0]);
-				foreach ($requestArray as $request) {
-
-					$addDate = $this->pdo->queryOneRow(
-						sprintf(
-							'SELECT UNIX_TIMESTAMP(adddate) AS adddate FROM releases WHERE id = %d', $request['ident']
-						)
-					);
-
-					$status = self::REQID_NONE;
-					if ($addDate !== false && !empty($addDate['adddate'])) {
-						if ((bool) (intval((time() - (int)$addDate['adddate']) / 3600) > $this->_request_hours)) {
-							$status = self::REQID_OLD;
-						}
-					} else {
-						$status = self::REQID_OLD;
-					}
-
-					$this->_requestIdNotFound(
-						$request['ident'],
-						$status
-					);
-					if ($this->echoOutput) {
-						echo '-';
-					}
-				}
-			}
-		}
-		return $renamed;
-	}
-
-	/**
-	 * If we found a request id on the internet, check if our PRE database has it, insert it if not.
-	 */
-	protected function _insertIntoPreDB()
-	{
-		$dupeCheck = $this->pdo->queryOneRow(
-			sprintf('
-				SELECT id AS prehashid, requestid, groupid
-				FROM prehash
-				WHERE title = %s',
-				$this->pdo->escapeString($this->_newTitle['title'])
-			)
-		);
-
-		if ($dupeCheck === false) {
-			$this->_preDbID = (int)$this->pdo->queryInsert(
-				sprintf("
-					INSERT INTO prehash (title, source, requestid, groupid, predate)
-					VALUES (%s, %s, %d, %d, NOW())",
-					$this->pdo->escapeString($this->_newTitle['title']),
-					$this->pdo->escapeString('requestWEB'),
-					$this->_requestID,
-					$this->_release['groupid']
-				)
-			);
-		} else {
-			$this->_preDbID = $dupeCheck['prehashid'];
-			$this->pdo->queryExec(
-				sprintf('
-					UPDATE prehash
-					SET requestid = %d, groupid = %d
-					WHERE id = %d',
-					$this->_requestID,
-					$this->_release['groupid'],
-					$this->_preDbID
-				)
-			);
-		}
-	}
-
-	/**
-	 * If we found a PRE name, update the releases name and reset post processing.
-	 */
-	protected function _updateRelease()
-	{
-		$determinedCategory = $this->category->determineCategory($this->_release['groupid'], $this->_newTitle['title']);
-		$newTitle = $this->pdo->escapeString($this->_newTitle['title']);
-		$this->pdo->queryExec(
-			sprintf('
-				UPDATE releases
-				SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL, tvtitle = NULL,
-				tvairdate = NULL, imdbid = NULL, musicinfoid = NULL, consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL,
-				reqidstatus = %d, isrenamed = 1, proc_files = 1, searchname = %s, categoryid = %d,
-				prehashid = %d
-				WHERE id = %d',
-				self::REQID_FOUND,
-				$newTitle,
-				$determinedCategory,
-				$this->_preDbID,
-				$this->_release['id']
-			)
-		);
-		$this->sphinx->updateReleaseSearchName($this->_release['id'], $newTitle);
-
-		if ($this->echoOutput) {
-			\NameFixer::echoChangedReleaseName(array(
-					'new_name' => $this->_newTitle['title'],
-					'old_name' => $this->_release['searchname'],
-					'new_category' => $this->category->getNameByID($determinedCategory),
-					'old_category' => '',
-					'group' => $this->_release['groupname'],
-					'release_id' => $this->_release['id'],
-					'method' => 'RequestID->updateRelease<web>'
-				)
-			);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/SmartyUtils.php b/lib/copy_this/www/lib/SmartyUtils.php
deleted file mode 100644
index 16730520b..000000000
--- a/lib/copy_this/www/lib/SmartyUtils.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * 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 3 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 (see LICENSE.txt in the base directory.  If
- * not, see:
- *
- * @link <http://www.gnu.org/licenses/>.
- * @author niel
- * @copyright 2014 nZEDb
- */
-
-// Function inspired by c0r3@newznabforums adds country flags on the browse page.
-function release_flag ($x, $t)
-{
-	$y = $d = "";
-
-	if (preg_match('/\bCzech\b/i', $x)) {
-		$y = "cz";
-		$d = "Czech";
-	} else if (preg_match('/Chinese|Mandarin|\bc[hn]\b/i', $x)) {
-		$y = "cn";
-		$d = "Chinese";
-	} else if (preg_match('/German(bed)?|\bger\b/i', $x)) {
-		$y = "de";
-		$d = "German";
-	} else if (preg_match('/Danish/i', $x)) {
-		$y = "dk";
-		$d = "Danish";
-	} else if (preg_match('/English|\beng?\b/i', $x)) {
-		$y = "en";
-		$d = "English";
-	} else if (preg_match('/Spanish/i', $x)) {
-		$y = "es";
-		$d = "Spanish";
-	} else if (preg_match('/Finnish/i', $x)) {
-		$y = "fi";
-		$d = "Finnish";
-	} else if (preg_match('/French|Vostfr/i', $x)) {
-		$y = "fr";
-		$d = "French";
-	} else if (preg_match('/\bGreek\b/i', $x)) {
-		$y = "gr";
-		$d = "Greek";
-	} else if (preg_match('/Hungarian|\bhun\b/i', $x)) {
-		$y = "hu";
-		$d = "Hungarian";
-	} else if (preg_match('/Hebrew|Yiddish/i', $x)) {
-		$y = "il";
-		$d = "Hebrew";
-	} else if (preg_match('/\bHindi\b/i', $x)) {
-		$y = "in";
-		$d = "Hindi";
-	} else if (preg_match('/Italian|\bita\b/i', $x)) {
-		$y = "it";
-		$d = "Italian";
-	} else if (preg_match('/Japanese|\bjp\b/i', $x)) {
-		$y = "jp";
-		$d = "Japanese";
-	} else if (preg_match('/Korean|\bkr\b/i', $x)) {
-		$y = "kr";
-		$d = "Korean";
-	} else if (preg_match('/Flemish|\b(Dutch|nl)\b|NlSub/i', $x)) {
-		$y = "nl";
-		$d = "Dutch";
-	} else if (preg_match('/Norwegian/i', $x)) {
-		$y = "no";
-		$d = "Norwegian";
-	} else if (preg_match('/Tagalog|Filipino/i', $x)) {
-		$y = "ph";
-		$d = "Tagalog|Filipino";
-	} else if (preg_match('/Arabic/i', $x)) {
-		$y = "pk";
-		$d = "Arabic";
-	} else if (preg_match('/Polish/i', $x)) {
-		$y = "pl";
-		$d = "Polish";
-	} else if (preg_match('/Portugese/i', $x)) {
-		$y = "pt";
-		$d = "Portugese";
-	} else if (preg_match('/Romanian/i', $x)) {
-		$y = "ro";
-		$d = "Romanian";
-	} else if (preg_match('/Russian/i', $x)) {
-		$y = "ru";
-		$d = "Russian";
-	} else if (preg_match('/Swe(dish|sub)/i', $x)) {
-		$y = "se";
-		$d = "Swedish";
-	} else if (preg_match('/\bThai\b/i', $x)) {
-		$y = "th";
-		$d = "Thai";
-	} else if (preg_match('/Turkish/i', $x)) {
-		$y = "tr";
-		$d = "Turkish";
-	} else if (preg_match('/Cantonese/i', $x)) {
-		$y = "tw";
-		$d = "Cantonese";
-	} else if (preg_match('/Vietnamese/i', $x)) {
-		$y = "vn";
-		$d = "Vietnamese";
-	}
-	if ($y !== "" && $t == "browse") {
-		$www = WWW_TOP;
-		if (!in_array(substr($www, -1), array('\\', '/'))) {
-			$www .= DS;
-		}
-
-		return
-			'<img title=' . $d . ' src="' . $www . 'templates/nntmux/images/flags/' . $y . '.png" />';
-	} else if ($t == "search") {
-		if ($y == "") {
-			return false;
-		} else {
-			return $y;
-		}
-	}
-	return '';
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/SphinxSearch.php b/lib/copy_this/www/lib/SphinxSearch.php
deleted file mode 100644
index 8a89bd5b1..000000000
--- a/lib/copy_this/www/lib/SphinxSearch.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-require_once (NN_LIB . 'ReleaseSearch.php');
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-
-class SphinxSearch
-{
-	/**
-	 * SphinxQL connection.
-	 * @var DB
-	 */
-	public $sphinxQL = null;
-
-	/**
-	 * Establish connection to SphinxQL.
-	 */
-	public function __construct()
-	{
-		if (NN_RELEASE_SEARCH_TYPE == \ReleaseSearch::SPHINX) {
-			if (!defined('NN_SPHINXQL_HOST_NAME')) {
-				define('NN_SPHINXQL_HOST_NAME', '0');
-			}
-			if (!defined('NN_SPHINXQL_PORT')) {
-				define('NN_SPHINXQL_PORT', 9306);
-			}
-			if (!defined('NN_SPHINXQL_SOCK_FILE')) {
-				define('NN_SPHINXQL_SOCK_FILE', '');
-			}
-			$this->sphinxQL = new DB(
-				[
-					'dbname' => '',
-					'dbport' => NN_SPHINXQL_PORT,
-					'dbhost' => NN_SPHINXQL_HOST_NAME,
-					'dbsock' => NN_SPHINXQL_SOCK_FILE
-				]
-			);
-		}
-	}
-
-	/**
-	 * Insert release into Sphinx RT table.
-	 * @param $parameters
-	 */
-	public function insertRelease($parameters)
-	{
-		if (!is_null($this->sphinxQL) && $parameters['id']) {
-			$this->sphinxQL->queryExec(
-				sprintf(
-					'REPLACE INTO releases_rt (id, guid, name, searchname, fromname) VALUES (%s, %s, %s, %s, %s)',
-					$parameters['id'],
-					$parameters['guid'],
-					$parameters['name'],
-					$parameters['searchname'],
-					$parameters['fromname']
-				)
-			);
-		}
-	}
-
-	/**
-	 * Delete release from Sphinx RT table.
-	 * @param array $identifiers ['g' => Release GUID(mandatory), 'id => ReleaseID(optional, pass false)]
-	 * @param DB $pdo
-	 */
-	public function deleteRelease($identifiers, DB $pdo)
-	{
-		if (!is_null($this->sphinxQL)) {
-			if ($identifiers['i'] === false) {
-				$identifiers['i'] = $pdo->queryOneRow(
-					sprintf('SELECT id FROM releases WHERE guid = %s', $pdo->escapeString($identifiers['g']))
-				);
-				if ($identifiers['i'] !== false) {
-					$identifiers['i'] = $identifiers['i']['id'];
-				}
-			}
-			if ($identifiers['i'] !== false) {
-				$this->sphinxQL->queryExec(sprintf('DELETE FROM releases_rt WHERE id = %s', $identifiers['i']));
-			}
-		}
-	}
-
-	public static function escapeString($string)
-	{
-		$from = array ('\\', '(',')','|','---','--','-','!','@','~','"','&', '/', '^', '$', '=', "'", "\x00", "\n", "\r", "\x1a");
-		$to = array ('\\\\\\\\','\\\\\\\\(','\\\\\\\\)','\\\\\\\\|','-','-','\\\\\\\\-','\\\\\\\\!','\\\\\\\\@','\\\\\\\\~',
-				'\\\\\\\\"', '\\\\\\\\&', '\\\\\\\\/', '\\\\\\\\^', '\\\\\\\\$', '\\\\\\\\=', "\\'", "\\x00", "\\n", "\\r", "\\x1a");
-		return str_replace($from, $to, $string);
-	}
-
-	/**
-	 * Update the search name of a release.
-	 *
-	 * @param int $releaseID
-	 * @param string $searchName
-	 */
-	public function updateReleaseSearchName($releaseID, $searchName)
-	{
-		if (!is_null($this->sphinxQL)) {
-			$old = $this->sphinxQL->queryOneRow(sprintf('SELECT * FROM releases_rt WHERE id = %s', $releaseID));
-			if ($old !== false) {
-				$this->insertRelease(
-					[
-						'id' => $releaseID,
-						'guid' => $this->sphinxQL->escapeString($old['guid']),
-						'name' => $this->sphinxQL->escapeString($old['name']),
-						'searchname' => $searchName,
-						'fromname' => $this->sphinxQL->escapeString($old['fromname'])
-					]
-				);
-			}
-		}
-	}
-
-	/**
-	 * Truncate a RT index.
-	 * @param string $indexName
-	 */
-	public function truncateRTIndex($indexName)
-	{
-		if (!is_null($this->sphinxQL)) {
-			$this->sphinxQL->queryExec(sprintf('TRUNCATE RTINDEX %s', $indexName));
-		}
-	}
-
-	/**
-	 * Optimize a RT index.
-	 * @param string $indexName
-	 */
-	public function optimizeRTIndex($indexName)
-	{
-		if (!is_null($this->sphinxQL)) {
-			$this->sphinxQL->queryExec(sprintf('OPTIMIZE INDEX %s', $indexName));
-		}
-	}
-}
diff --git a/lib/copy_this/www/lib/Steam.php b/lib/copy_this/www/lib/Steam.php
deleted file mode 100644
index 32d541c80..000000000
--- a/lib/copy_this/www/lib/Steam.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/simple_html_dom.php");
-require_once(WWW_DIR . "lib/util.php");
-
-class Steam
-{
-
-	/**
-	 * @var
-	 */
-	public $cookie;
-
-	/**
-	 * @var
-	 */
-	public $searchTerm;
-
-	const AGECHECKURL = "http://store.steampowered.com/agecheck/app/";
-	const CDNURL = "http://cdn.akamai.steamstatic.com/steam/apps/";
-	const GAMEURL = "http://store.steampowered.com/app/";
-	const STEAMURL = "http://store.steampowered.com";
-	const STEAMVARS = "/search/?category1=998&os=win&sort_order=ASC&page=1&term=";
-
-	/**
-	 * @var bool
-	 */
-	protected $_ageCheckSet = false;
-
-	/**
-	 * @var bool
-	 */
-	protected $_birthTime = false;
-
-	/**
-	 * @var
-	 */
-	protected $_ch;
-
-	/**
-	 * @var string
-	 */
-	protected $_directURL = '';
-
-	/**
-	 * @var
-	 */
-	protected $_editHtml;
-
-	/**
-	 * @var simple_html_dom
-	 */
-	protected $_html;
-
-	/**
-	 * @var string
-	 */
-	protected $_indirectURL = '';
-
-	/**
-	 * @var bool
-	 */
-	protected $_lastAgeCheck = false;
-
-	/**
-	 * @var array
-	 */
-	protected $_postParams = array();
-
-	/**
-	 * @var array
-	 */
-	protected $_res = array();
-
-	/**
-	 * @var
-	 */
-	protected $_response;
-
-	/**
-	 * @var
-	 */
-	protected $_ret;
-
-	/**
-	 * @var
-	 */
-	protected $_steamGameID;
-
-	/**
-	 * @var string
-	 */
-	protected $_title = '';
-
-	/**
-	 * @var int
-	 */
-	protected $_totalResults = 0;
-
-	public function __construct()
-	{
-		$this->_html = new simple_html_dom();
-		$this->_editHtml = new simple_html_dom();
-		if (isset($this->cookie)) {
-			$this->getUrl(self::STEAMURL);
-		}
-	}
-
-	/**
-	 *
-	 * Remove from memory
-	 *
-	 */
-	public function __destruct()
-	{
-		$this->_html->clear();
-		$this->_editHtml->clear();
-		unset($this->_response);
-	}
-
-	/**
-	 * Get Details of the game (Studio,Release Date, Developer)
-	 *
-	 * @return array
-	 */
-	public function details()
-	{
-		if ($this->_ret = $this->_html->find("div.details_block", 0)) {
-			$textarr = array();
-			foreach ($this->_ret->find('text') as $text) {
-				$text = trim($text->plaintext);
-				if (!empty($text)) {
-					$textarr[] = rtrim($text, ":");
-				}
-			}
-			$totaldetails = count($textarr) - 1;
-			for ($i = 0; $i <= $totaldetails;) {
-				if ($textarr[$i] == "Release Date") {
-					$pregmatchdate = $textarr[$i+1];
-					if (preg_match_all('#(?P<day>[0-3]?\d)[^\d]|(?P<month>Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)|(?P<year>(19|20)\d{2})#i',
-						$pregmatchdate,
-						$matches)) {
-
-						$matches    = array_map('array_filter', $matches);
-						$matches    = array_map('array_values', $matches);
-						$matchday   = isset($matches['day'][0]) ? $matches['day'][0] : '1';
-						$matchmonth = isset($matches['month'][0]) ? $matches['month'][0] : '';
-						$matchyear  = isset($matches['year'][0]) ? $matches['year'][0] : '';
-						if (!empty($matchday) && !empty($matchmonth) && !empty($matchyear)) {
-							$textarr[$i + 1] = $matchmonth . '/' . $matchday . '/' . $matchyear;
-						}
-					}
-				}
-				$this->_res['gamedetails'][$textarr[$i]] = $textarr[$i+1];
-				$i = $i+2;
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Game Description Snippet
-	 *
-	 * @return array
-	 */
-	public function gameDescription()
-	{
-		if ($this->_ret = $this->_html->find("div.game_description_snippet", 0)) {
-			$this->_res['description'] = trim($this->_ret->plaintext);
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets all Information for the game.
-	 *
-	 * @return array
-	 */
-	public function getAll()
-	{
-		$results = array();
-		if (isset($this->_directURL)) {
-			$results['steamgameid'] = $this->_steamGameID;
-			$results['directurl'] = $this->_directURL;
-			$results['title'] = $this->_title;
-		}
-		if (is_array($this->gameDescription())) {
-			$results = array_merge($results, $this->gameDescription());
-		}
-		if (is_array($this->details())) {
-			$results = array_merge($results, $this->details());
-		}
-		if (is_array($this->rating())) {
-			$results = array_merge($results, $this->rating());
-		}
-		if (is_array($this->images())) {
-			$results = array_merge($results, $this->images());
-		}
-		if (is_array($this->trailer())) {
-			$results = array_merge($results, $this->trailer());
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Gets the (cover and backdrop image)
-	 *
-	 * @return array
-	 */
-	public function images()
-	{
-		if ($this->_ret = $this->_html->find("img.game_header_image_full", 0)) {
-			$this->_res['cover'] = $this->_ret->src;
-		}
-		if ($this->_ret = $this->_html->find("div.screenshot_holder", 0)) {
-			if ($this->_ret = $this->_ret->find("a", 0)) {
-				if(preg_match('/\?url\=(?<imgurl>.*)/', $this->_ret->href, $matches)){
-					$this->_res['backdrop'] = trim($matches['imgurl']);
-				}else{
-					$this->_res['backdrop'] = trim($this->_ret->href);
-				}
-
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Gets the metacritic Rating
-	 *
-	 * @return array
-	 */
-	public function rating()
-	{
-		if ($this->_ret = $this->_html->find("div#game_area_metascore", 0)) {
-			$this->_res['rating'] = (int)$this->_ret->plaintext;
-		}
-		return $this->_res;
-	}
-
-	/**
-	 * Searches for a game for a 90% match
-	 *
-	 * @return bool
-	 */
-	public function search()
-	{
-		if (!isset($this->searchTerm)) {
-			return false;
-		}
-
-		if ($this->getUrl(self::STEAMURL . self::STEAMVARS . rawurlencode($this->searchTerm)) !== false) {
-			$title = null;
-			if ($this->_ret = $this->_html->find("div.search_pagination_left", 0)) {
-				if (preg_match('/\d+ of (?<total>\d+)/', trim($this->_ret->plaintext), $matches)) {
-					$this->_totalResults = (int)$matches['total'];
-				}
-				if ($this->_totalResults > 0) {
-					foreach ($this->_html->find("a.search_result_row") as $result) {
-						foreach ($result->find("span.title") as $searchtitle) {
-							$title = (string)trim($searchtitle->innertext);
-						}
-						if (isset($title)) {
-							similar_text(strtolower($title), strtolower($this->searchTerm), $p);
-							if ($p > 90) {
-								$this->_title = $title;
-								if (isset($result->href)) {
-									preg_match('/\/app\/(?<id>\d+)\//', $result->href, $matches);
-									$this->_steamGameID = $matches['id'];
-									$this->_directURL = self::GAMEURL . $this->_steamGameID . '/';
-									$this->getUrl($result->href);
-									$this->ageCheck();
-									return true;
-								} else {
-									return false;
-								}
-							}
-						}
-					}
-					if (empty($this->_title)) {
-						return false;
-					}
-				} else {
-					return false;
-				}
-			} else {
-				return false;
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the Video for the game
-	 *
-	 * @return array
-	 */
-	public function trailer()
-	{
-		if (preg_match('/store.steampowered.com\/video\//', $this->_response)) {
-			$this->_res['trailer'] = self::STEAMURL . '/video/' . $this->_steamGameID;
-			$this->getUrl($this->_res['trailer']);
-			if (preg_match('@FILENAME\:\s+(?<videourl>\"\b(([\w-]+://?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/)))")@', $this->_response, $matches)
-			) {
-				if (isset($matches['videourl'])) {
-					$this->_res['trailer'] = trim($matches['videourl'], '"');
-				}
-			}
-		} else {
-			if (preg_match('/movie480.webm\?t\=(?<videoidentifier>\d+)/', $this->_response, $matches)
-			) {
-				$this->_res['trailer'] = self::CDNURL . $this->_steamGameID . '/movie480.webm?t=' . trim($matches['videoidentifier'], '"');
-			}
-		}
-
-		return $this->_res;
-	}
-
-	/**
-	 * Sets agecheck, retreive agecheck cookie information
-	 *
-	 */
-	private function ageCheck()
-	{
-		if (isset($this->cookie)) {
-			$this->extractCookies(file_get_contents($this->cookie));
-			if($this->_ageCheckSet === false) {
-				$this->_postParams = array(
-					"snr" => "1_agecheck_agecheck__age-gate",
-					"ageDay" => "1",
-					"ageMonth" => "May",
-					"ageYear" => "1966"
-				);
-
-				$this->getUrl(self::AGECHECKURL . $this->_steamGameID . '/', true);
-			}
-		}
-		$this->getUrl(self::GAMEURL . $this->_steamGameID . '/');
-	}
-
-	/**
-	 * Gets Raw Html
-	 *
-	 * @param string $fetchURL
-	 * @param bool $usePost
-	 *
-	 * @return bool
-	 */
-	private function getUrl($fetchURL, $usePost = false)
-	{
-		if (isset($fetchURL)) {
-			$this->_ch = curl_init($fetchURL);
-		}
-		if ($usePost === true) {
-			curl_setopt($this->_ch, CURLOPT_POST, 1);
-			curl_setopt($this->_ch, CURLOPT_POSTFIELDS, $this->_postParams);
-		}
-		curl_setopt($this->_ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($this->_ch, CURLOPT_HEADER, 0);
-		curl_setopt($this->_ch, CURLOPT_VERBOSE, 0);
-		curl_setopt($this->_ch, CURLOPT_USERAGENT, "Firefox/2.0.0.1");
-		curl_setopt($this->_ch, CURLOPT_FAILONERROR, 1);
-		if (isset($this->cookie)) {
-			curl_setopt($this->_ch, CURLOPT_COOKIEJAR, $this->cookie);
-			curl_setopt($this->_ch, CURLOPT_COOKIEFILE, $this->cookie);
-		}
-		curl_setopt_array($this->_ch, Utility::curlSslContextOptions());
-		$this->_response = curl_exec($this->_ch);
-		if (!$this->_response) {
-			curl_close($this->_ch);
-
-			return false;
-		}
-		curl_close($this->_ch);
-		$this->_html->load($this->_response);
-
-		return true;
-	}
-
-	/**
-	 * Extract values from a cookie and sets the values needed with the information.
-	 *
-	 * @param string $string The contents of the cookie file.
-	 *
-	 * @return bool True/False if lastagecheckage and birthtime exists.
-	 */
-	private function extractCookies($string)
-	{
-		$lines = explode("\n", $string);
-
-		// iterate over lines
-		foreach ($lines as $line) {
-
-			// we only care for valid cookie def lines
-			if (isset($line[0]) && substr_count($line, "\t") == 6) {
-
-				// get tokens in an array
-				$tokens = explode("\t", $line);
-
-				// trim the tokens
-				$tokens = array_map('trim', $tokens);
-
-				// Extract the data
-				if ($tokens[0] == "store.steampowered.com") {
-					if ($tokens[5] == 'birthtime') {
-						$this->_birthTime = true;
-					}
-					if ($tokens[5] == 'lastagecheckage') {
-						$this->_lastAgeCheck = true;
-					}
-				}
-			}
-		}
-		if ($this->_birthTime === true && $this->_lastAgeCheck === true) {
-			$this->_ageCheckSet = true;
-		} else {
-			$this->_ageCheckSet = false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/TMDb.php b/lib/copy_this/www/lib/TMDb.php
deleted file mode 100644
index 6893e2a86..000000000
--- a/lib/copy_this/www/lib/TMDb.php
+++ /dev/null
@@ -1,1195 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/util.php");
-
-/**
- * TMDb PHP API class - API 'themoviedb.org'
- * API Documentation: http://help.themoviedb.org/kb/api/
- * Documentation and usage in README file
- *
- * @author Jonas De Smet - Glamorous
- * @since 09.11.2009
- * @date 05.11.2013
- * @copyright Jonas De Smet - Glamorous
- * @version 1.6
- * @license BSD http://www.opensource.org/licenses/bsd-license.php
- */
-class TMDb
-{
-	const POST = 'post';
-	const GET = 'get';
-	const HEAD = 'head';
-
-	const IMAGE_BACKDROP = 'backdrop';
-	const IMAGE_POSTER = 'poster';
-	const IMAGE_PROFILE = 'profile';
-
-	const API_VERSION = '3';
-	const API_URL = 'api.themoviedb.org';
-	const API_SCHEME = 'http://';
-	const API_SCHEME_SSL = 'https://';
-
-	const VERSION = '1.6.0';
-	// Request limitation
-	// http://help.themoviedb.org/kb/general/api-request-limits
-	//  30 requests every 10 seconds per IP
-	// http://www.themoviedb.org/talk/512921ea19c2951d8124fb17
-	//  4 requests every 1 second per IP
-	const REQUEST_LIMIT = 4;
-	const REQUEST_TIMESPAN = 1.0;
-
-	/**
-	 * The API-key
-	 *
-	 * @var string
-	 */
-	protected $_apikey;
-
-	/**
-	 * The default language
-	 *
-	 * @var string
-	 */
-	protected $_lang;
-
-	/**
-	 * The TMDb-config
-	 *
-	 * @var object
-	 */
-	protected $_config;
-
-	/**
-	 * Stored Session Id
-	 *
-	 * @var string
-	 */
-	protected $_session_id;
-
-	/**
-	 * API Scheme
-	 *
-	 * @var string
-	 */
-	protected $_apischeme;
-
-	/**
-	 * Request counter
-	 *
-	 * @var integer
-	 */
-	protected $_requests = 0;
-
-	/**
-	 * Array of request timestamps
-	 *
-	 * @var array of double values
-	 */
-	protected $_timestamps;
-
-	/**
-	 * Oldest timestamp for debugging only
-	 *
-	 * @var double value
-	 */
-	protected $_timestamp;
-
-	/**
-	 * Retry counter
-	 *
-	 * @var integer
-	 */
-	protected $_retries = 0;
-
-	/**
-	 * Default constructor
-	 *
-	 * @param string $apikey			API-key recieved from TMDb
-	 * @param string $defaultLang		Default language (ISO 3166-1)
-	 * @param boolean $config			Load the TMDb-config
-	 * @return void
-	 */
-	public function __construct($apikey, $default_lang = 'en', $config = FALSE, $scheme = TMDb::API_SCHEME)
-	{
-		$this->_timestamps = array_fill(0, TMDB::REQUEST_LIMIT, 0.0);
-
-		$this->_apikey = (string) $apikey;
-		$this->_apischeme = ($scheme == TMDb::API_SCHEME) ? TMDb::API_SCHEME : TMDb::API_SCHEME_SSL;
-		$this->setLang($default_lang);
-
-		if($config === TRUE)
-		{
-			$this->getConfiguration();
-		}
-	}
-
-	/**
-	 * Increment request counter and handle request limitation
-	 *
-	 * @return void
-	 */
-	protected function incRequests(){
-
-		/* Increment request counter */
-		$this->_requests += 1;
-
-		/* Calculate index for the oldest timestamp in the timestamps array */
-		$idx = $this->_requests % TMDB::REQUEST_LIMIT;
-
-		/* Save the oldest timestamp for debugging */
-		$this->_timestamp = $this->_timestamps[ $idx ];
-
-		/* Calculate elapsed time */
-		$timediff = microtime(true) - $this->_timestamp;
-		//$timediff = ( floor(microtime(true)*10) - ceil($this->_timestamp*10) ) / 10;
-
-		/* Compare the elapsed time against the specified timespan */
-		if ( $timediff < TMDB::REQUEST_TIMESPAN ){
-			/* Calculate delay * 1 second and sleep */
-			usleep( (TMDB::REQUEST_TIMESPAN - $timediff) *1000000 );
-		}
-
-		/* Save new timestamp */
-		$this->_timestamps[ $idx ] = microtime(true);
-	}
-
-	/**
-	 * Search a movie by querystring
-	 *
-	 * @param string $text				Query to search after in the TMDb database
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param bool $adult				Whether of not to include adult movies in the results (default FALSE)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function searchMovie($query, $page = 1, $adult = FALSE, $year = NULL, $lang = NULL)
-	{
-		$params = array(
-			'query' => $query,
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-			'include_adult' => (bool) $adult,
-			'year' => $year,
-		);
-		return $this->_makeCall('search/movie', $params);
-	}
-
-	/**
-	 * Search a tv show by querystring
-	 *
-	 * @param string $text              Query to search after in the TMDb database
-	 * @param int $page                 Number of the page with results (default first page)
-	 * @param bool $air_date_year       Filter results that have air date with value (default NULL)
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function searchTV($query, $page = 1, $air_date_year = NULL, $lang = NULL)
-	{
-		$params = array(
-			'query' => $query,
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-			'air_date_year' => $air_date_year
-		);
-		return $this->_makeCall('search/tv', $params);
-	}
-
-	/**
-	 * Search a person by querystring
-	 *
-	 * @param string $text				Query to search after in the TMDb database
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param bool $adult				Whether of not to include adult movies in the results (default FALSE)
-	 * @return TMDb result array
-	 */
-	public function searchPerson($query, $page = 1, $adult = FALSE)
-	{
-		$params = array(
-			'query' => $query,
-			'page' => (int) $page,
-			'include_adult' => (bool) $adult,
-		);
-		return $this->_makeCall('search/person', $params);
-	}
-
-	/**
-	 * Search a company by querystring
-	 *
-	 * @param string $text				Query to search after in the TMDb database
-	 * @param int $page					Number of the page with results (default first page)
-	 * @return TMDb result array
-	 */
-	public function searchCompany($query, $page = 1)
-	{
-		$params = array(
-			'query' => $query,
-			'page' => $page,
-		);
-		return $this->_makeCall('search/company', $params);
-	}
-
-	/**
-	 * Retrieve all basic information for a particular tv show
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTV($id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id, $params);
-	}
-
-	/**
-	 * Retrieve all basic information for a particular tv show season
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param int $season_id            Season Id to query
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTVSeason($id, $season_id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id.'/season/'.$season_id, $params);
-	}
-
-	/**
-	 * Retrieve cast and credits for a particular tv show season
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param int $season_id            Season Id to query
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTVSeasonCredits($id, $season_id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id.'/season/'.$season_id.'/credits', $params);
-	}
-
-	/**
-	 * Retrieve images for a particular tv show season
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param int $season_id            Season Id to query
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTVSeasonImages($id, $season_id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id.'/season/'.$season_id.'/images', $params);
-	}
-
-	/**
-	 * Retrieve all basic information for a particular tv show episode
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param int $season_id            Season Id to query
-	 * @param int $episode_id           Episode Id to query
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTVEpisode($id, $season_id, $episode_id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id.'/season/'.$season_id.'/episode/'.$episode_id, $params);
-	}
-
-	/**
-	 * Retrieve cast and credits for a particular tv show episode
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param int $season_id            Season Id to query
-	 * @param int $episode_id           Episode Id to query
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTVEpisodeCredits($id, $season_id, $episode_id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id.'/season/'.$season_id.'/episode/'.$episode_id.'/credits', $params);
-	}
-
-	/**
-	 * Retrieve images for a particular tv show episode
-	 *
-	 * @param mixed $id                 TMDb-id or IMDB-id
-	 * @param int $season_id            Season Id to query
-	 * @param int $episode_id           Episode Id to query
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTVEpisodeImages($id, $season_id, $episode_id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('tv/'.$id.'/season/'.$season_id.'/episode/'.$episode_id.'/images', $params);
-	}
-
-	/**
-	 * Retrieve information about a collection
-	 *
-	 * @param int $id					Id from a collection (retrieved with getMovie)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getCollection($id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('collection/'.$id, $params);
-	}
-
-	/**
-	 * Retrieve all basic information for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getMovie($id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('movie/'.$id, $params);
-	}
-
-	/**
-	 * Retrieve alternative titles for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @param string $country			Only include titles for a particular country (ISO 3166-1)
-	 * @return TMDb result array
-	 */
-	public function getMovieTitles($id, $country = NULL)
-	{
-		$params = array(
-			'country' => $country,
-		);
-		return $this->_makeCall('movie/'.$id.'/alternative_titles', $params);
-	}
-
-	/**
-	 * Retrieve all of the movie crew information for a particular movie.
-	 *
-	 * @see http://docs.themoviedb.apiary.io/#movies
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @return array TMDb result
-	 */
-	public function getMovieCredits($id)
-	{
-		return $this->_makeCall('movie/'.$id.'/credits');
-	}
-
-	/**
-	 * Retrieve all of the movie cast information for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @return TMDb result array
-	 */
-	public function getMovieCast($id)
-	{
-		return $this->_makeCall('movie/'.$id.'/casts');
-	}
-
-	/**
-	 * Retrieve all of the keywords for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @return TMDb result array
-	 */
-	public function getMovieKeywords($id)
-	{
-		return $this->_makeCall('movie/'.$id.'/keywords');
-	}
-
-	/**
-	 * Retrieve all the release and certification data for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @return TMDb result array
-	 */
-	public function getMovieReleases($id)
-	{
-		return $this->_makeCall('movie/'.$id.'/releases');
-	}
-
-	/**
-	 * Retrieve available translations for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @return TMDb result array
-	 */
-	public function getMovieTranslations($id)
-	{
-		return $this->_makeCall('movie/'.$id.'/translations');
-	}
-
-	/**
-	 * Retrieve available trailers for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getMovieTrailers($id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('movie/'.$id.'/trailers', $params);
-	}
-
-	/**
-	 * Retrieve all images for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getMovieImages($id, $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('movie/'.$id.'/images', $params);
-	}
-
-	/**
-	 * Retrieve similar movies for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getSimilarMovies($id, $page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('movie/'.$id.'/similar_movies', $params);
-	}
-
-	/**
-	 * Retrieve newest movie added to TMDb
-	 *
-	 * @return TMDb result array
-	 */
-	public function getLatestMovie()
-	{
-		return $this->_makeCall('movie/latest');
-	}
-
-	/**
-	 * Retrieve movies arriving to theatres within the next few weeks
-	 *
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getUpcomingMovies($page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('movie/upcoming', $params);
-	}
-
-	/**
-	 * Retrieve movies currently in theatres
-	 *
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getNowPlayingMovies($page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('movie/now_playing', $params);
-	}
-
-	/**
-	 * Retrieve popular content (list is updated daily)
-	 *
-	 * @param string $type              Type of content to search ('movie' or 'tv'; default movie)
-	 * @param int $page                 Number of the page with results (default first page)
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getPopular($type = 'movie', $page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall($type.'/popular', $params);
-	}
-
-	/**
-	 * Retrieve top-rated content
-	 *
-	 * @param string $type              Type of content to search ('movie' or 'tv'; default movie)
-	 * @param int $page                 Number of the page with results (default first page)
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getTopRated($type = 'movie', $page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall($type.'/top_rated', $params);
-	}
-
-	/**
-	 * Retrieve changes for a particular movie
-	 *
-	 * @param mixed $id					TMDb-id or IMDB-id
-	 * @return TMDb result array
-	 */
-	public function getMovieChanges($id)
-	{
-		return $this->_makeCall('movie/'.$id.'/changes');
-	}
-
-	/**
-	 * Retrieve all id's from changed movies
-	 *
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param string $start_date		String start date as YYYY-MM-DD
-	 * @param string $end_date			String end date as YYYY-MM-DD (not inclusive)
-	 * @return TMDb result array
-	 */
-	public function getChangedMovies($page = 1, $start_date = NULL, $end_date = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'start_date' => $start_date,
-			'end_date' => $end_date,
-		);
-		return $this->_makeCall('movie/changes', $params);
-	}
-
-	/**
-	 * Retrieve all basic information for a particular person
-	 *
-	 * @param int $id					TMDb person-id
-	 * @return TMDb result array
-	 */
-	public function getPerson($id)
-	{
-		return $this->_makeCall('person/'.$id);
-	}
-
-	/**
-	 * Retrieve all cast and crew information for a particular person
-	 *
-	 * @param int $id                   TMDb person-id
-	 * @param string $type              Type of content to search ('combined', movie' or 'tv'; default combined)
-	 * @param mixed $lang               Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getPersonCredits($id, $type = 'combined', $lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('person/'.$id.'/'.$type.'_credits', $params);
-	}
-
-	/**
-	 * Retrieve all images for a particular person
-	 *
-	 * @param mixed $id					TMDb person-id
-	 * @return TMDb result array
-	 */
-	public function getPersonImages($id)
-	{
-		return $this->_makeCall('person/'.$id.'/images');
-	}
-
-	/**
-	 * Retrieve changes for a particular person
-	 *
-	 * @param mixed $id					TMDb person-id
-	 * @return TMDb result array
-	 */
-	public function getPersonChanges($id)
-	{
-		return $this->_makeCall('person/'.$id.'/changes');
-	}
-
-	/**
-	 * Retrieve all id's from changed persons
-	 *
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param string $start_date		String start date as YYYY-MM-DD
-	 * @param string $end_date			String end date as YYYY-MM-DD (not inclusive)
-	 * @return TMDb result array
-	 */
-	public function getChangedPersons($page = 1, $start_date = NULL, $end_date = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'start_date' => $start_date,
-			'start_date' => $end_date,
-		);
-		return $this->_makeCall('person/changes', $params);
-	}
-
-	/**
-	 * Retrieve all basic information for a particular production company
-	 *
-	 * @param int $id					TMDb company-id
-	 * @return TMDb result array
-	 */
-	public function getCompany($id)
-	{
-		return $this->_makeCall('company/'.$id);
-	}
-
-	/**
-	 * Retrieve movies for a particular production company
-	 *
-	 * @param int $id					TMDb company-id
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getMoviesByCompany($id, $page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('company/'.$id.'/movies', $params);
-	}
-
-	/**
-	 * Retrieve a list of genres used on TMDb
-	 *
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getGenres($lang = NULL)
-	{
-		$params = array(
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('genre/list', $params);
-	}
-
-	/**
-	 * Retrieve movies for a particular genre
-	 *
-	 * @param int $id					TMDb genre-id
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Filter the result with a language (ISO 3166-1) other then default, use FALSE to retrieve results from all languages
-	 * @return TMDb result array
-	 */
-	public function getMoviesByGenre($id, $page = 1, $lang = NULL)
-	{
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : $this->getLang(),
-		);
-		return $this->_makeCall('genre/'.$id.'/movies', $params);
-	}
-
-	/**
-	 * Authentication: retrieve authentication token
-	 * More information about the authentication process: http://help.themoviedb.org/kb/api/user-authentication
-	 *
-	 * @return TMDb result array
-	 */
-	public function getAuthToken()
-	{
-		$result = $this->_makeCall('authentication/token/new');
-
-		if( ! isset($result['request_token']))
-		{
-			if($this->getDebugMode())
-			{
-				throw new TMDbException('No valid request token from TMDb');
-			}
-			else
-			{
-				return FALSE;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Authentication: retrieve authentication session and set it to the class
-	 * More information about the authentication process: http://help.themoviedb.org/kb/api/user-authentication
-	 *
-	 * @param string $token
-	 * @return TMDb result array
-	 */
-	public function getAuthSession($token)
-	{
-		$params = array(
-			'request_token' => $token,
-		);
-
-		$result = $this->_makeCall('authentication/session/new', $params);
-
-		if(isset($result['session_id']))
-		{
-			$this->setAuthSession($result['session_id']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Authentication: set retrieved session id in the class for authenticated requests
-	 * More information about the authentication process: http://help.themoviedb.org/kb/api/user-authentication
-	 *
-	 * @param string $session_id
-	 */
-	public function setAuthSession($session_id)
-	{
-		$this->_session_id = $session_id;
-	}
-
-	/**
-	 * Retrieve basic account information
-	 *
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @return TMDb result array
-	 */
-	public function getAccount($session_id = NULL)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		return $this->_makeCall('account', NULL, $session_id);
-	}
-
-	/**
-	 * Retrieve favorite movies for a particular account
-	 *
-	 * @param int $account_id			TMDb account-id
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Get result in other language then default for this user account (ISO 3166-1)
-	 * @return TMDb result array
-	 */
-	public function getAccountFavoriteMovies($account_id, $session_id = NULL, $page = 1, $lang = FALSE)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : '',
-		);
-		return $this->_makeCall('account/'.$account_id.'/favorite_movies', $params, $session_id);
-	}
-
-	/**
-	 * Retrieve rated movies for a particular account
-	 *
-	 * @param int $account_id			TMDb account-id
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Get result in other language then default for this user account (ISO 3166-1)
-	 * @return TMDb result array
-	 */
-	public function getAccountRatedMovies($account_id, $session_id = NULL, $page = 1, $lang = FALSE)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : '',
-		);
-		return $this->_makeCall('account/'.$account_id.'/rated_movies', $params, $session_id);
-	}
-
-	/**
-	 * Retrieve movies that have been marked in a particular account watchlist
-	 *
-	 * @param int $account_id			TMDb account-id
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @param int $page					Number of the page with results (default first page)
-	 * @param mixed $lang				Get result in other language then default for this user account (ISO 3166-1)
-	 * @return TMDb result array
-	 */
-	public function getAccountWatchlistMovies($account_id, $session_id = NULL, $page = 1, $lang = FALSE)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		$params = array(
-			'page' => (int) $page,
-			'language' => ($lang !== NULL) ? $lang : '',
-		);
-		return $this->_makeCall('account/'.$account_id.'/movie_watchlist', $params, $session_id);
-	}
-
-	/**
-	 * Add a movie to the account favorite movies
-	 *
-	 * @param int $account_id			TMDb account-id
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @param int $movie_id				TMDb movie-id
-	 * @param bool $favorite			Add to favorites or remove from favorites (default TRUE)
-	 * @return TMDb result array
-	 */
-	public function addFavoriteMovie($account_id, $session_id = NULL, $movie_id = 0, $favorite = TRUE)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		$params = array(
-			'movie_id' => (int) $movie_id,
-			'favorite' => (bool) $favorite,
-		);
-		return $this->_makeCall('account/'.$account_id.'/favorite', $params, $session_id, TMDb::POST);
-	}
-
-	/**
-	 * Add a movie to the account watchlist
-	 *
-	 * @param int $account_id			TMDb account-id
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @param int $movie_id				TMDb movie-id
-	 * @param bool $watchlist			Add to watchlist or remove from watchlist (default TRUE)
-	 * @return TMDb result array
-	 */
-	public function addMovieToWatchlist($account_id, $session_id = NULL, $movie_id = 0, $watchlist = TRUE)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		$params = array(
-			'movie_id' => (int) $movie_id,
-			'movie_watchlist' => (bool) $watchlist,
-		);
-		return $this->_makeCall('account/'.$account_id.'/movie_watchlist', $params, $session_id, TMDb::POST);
-	}
-
-	/**
-	 * Add a rating to a movie
-	 *
-	 * @param string $session_id		Set session_id for the account you want to retrieve information from
-	 * @param int $movie_id				TMDb movie-id
-	 * @param float $value				Value between 1 and 10
-	 * @return TMDb result array
-	 */
-	public function addMovieRating($session_id = NULL, $movie_id = 0, $value = 0)
-	{
-		$session_id = ($session_id === NULL) ? $this->_session_id : $session_id;
-		$params = array(
-			'value' => is_numeric($value) ? floatval($value) : 0,
-		);
-		return $this->_makeCall('movie/'.$movie_id.'/rating', $params, $session_id, TMDb::POST);
-	}
-
-	/**
-	 * Get configuration from TMDb
-	 *
-	 * @return TMDb result array
-	 */
-	public function getConfiguration()
-	{
-		$config = $this->_makeCall('configuration');
-
-		if( ! empty($config))
-		{
-			$this->setConfig($config);
-		}
-
-		return $config;
-	}
-
-	/**
-	 * Get Image URL
-	 *
-	 * @param string $filepath			Filepath to image
-	 * @param const $imagetype			Image type: TMDb::IMAGE_BACKDROP, TMDb::IMAGE_POSTER, TMDb::IMAGE_PROFILE
-	 * @param string $size				Valid size for the image
-	 * @return string
-	 */
-	public function getImageUrl($filepath, $imagetype, $size)
-	{
-		$config = $this->getConfig();
-
-		if(isset($config['images']))
-		{
-			$base_url = $config['images']['base_url'];
-			$available_sizes = $this->getAvailableImageSizes($imagetype);
-
-			if(in_array($size, $available_sizes))
-			{
-				return $base_url.$size.$filepath;
-			}
-			else
-			{
-				throw new TMDbException('The size "'.$size.'" is not supported by TMDb');
-			}
-		}
-		else
-		{
-			throw new TMDbException('No configuration available for image URL generation');
-		}
-	}
-
-	/**
-	 * Get available image sizes for a particular image type
-	 *
-	 * @param const $imagetype			Image type: TMDb::IMAGE_BACKDROP, TMDb::IMAGE_POSTER, TMDb::IMAGE_PROFILE
-	 * @return array
-	 */
-	public function getAvailableImageSizes($imagetype)
-	{
-		$config = $this->getConfig();
-
-		if(isset($config['images'][$imagetype.'_sizes']))
-		{
-			return $config['images'][$imagetype.'_sizes'];
-		}
-		else
-		{
-			throw new TMDbException('No configuration available to retrieve available image sizes');
-		}
-	}
-
-	/**
-	 * Get ETag to keep track of state of the content
-	 *
-	 * @param string $uri				Use an URI to know the version of it. For example: 'movie/550'
-	 * @return string
-	 */
-	public function getVersion($uri)
-	{
-		$headers = $this->_makeCall($uri, NULL, NULL, TMDb::HEAD);
-		return isset($headers['Etag']) ? $headers['Etag'] : '';
-	}
-
-	/**
-	 * Makes the call to the API
-	 *
-	 * @param string $function			API specific function name for in the URL
-	 * @param array $params				Unencoded parameters for in the URL
-	 * @param string $session_id		Session_id for authentication to the API for specific API methods
-	 * @param const $method				TMDb::GET or TMDb:POST (default TMDb::GET)
-	 * @return TMDb result array
-	 */
-	private function _makeCall($function, $params = NULL, $session_id = NULL, $method = TMDb::GET)
-	{
-		$params = ( ! is_array($params)) ? array() : $params;
-		$auth_array = array('api_key' => $this->_apikey);
-
-		if($session_id !== NULL)
-		{
-			$auth_array['session_id'] = $session_id;
-		}
-
-		$url = $this->_apischeme.TMDb::API_URL.'/'.TMDb::API_VERSION.'/'.$function.'?'.http_build_query($auth_array, '', '&');
-
-		if($method === TMDb::GET)
-		{
-			if(isset($params['language']) AND $params['language'] === FALSE)
-			{
-				unset($params['language']);
-			}
-
-			if(isset($params['include_adult']))
-			{
-				$params['include_adult'] = ($params['include_adult'] ? 'true' : 'false');
-			}
-
-			$url .= ( ! empty($params)) ? '&'.http_build_query($params, '', '&') : '';
-		}
-
-		$results = '{}';
-
-		if (extension_loaded('curl'))
-		{
-			$headers = array(
-				'Accept: application/json',
-			);
-
-			$ch = curl_init();
-
-			if($method == TMDB::POST)
-			{
-				$json_string = json_encode($params);
-				curl_setopt($ch,CURLOPT_POST, 1);
-				curl_setopt($ch,CURLOPT_POSTFIELDS, $json_string);
-				$headers[] = 'Content-Type: application/json';
-				$headers[] = 'Content-Length: '.strlen($json_string);
-			}
-			elseif($method == TMDb::HEAD)
-			{
-				curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD');
-				curl_setopt($ch, CURLOPT_NOBODY, 1);
-			}
-
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-			curl_setopt($ch, CURLOPT_HEADER, 1);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-			$this->incRequests();
-			curl_setopt_array($ch, Utility::curlSslContextOptions());
-			$response = curl_exec($ch);
-
-			$header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-			$header = substr($response, 0, $header_size);
-			$body = substr($response, $header_size);
-
-			$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			$error_number = curl_errno($ch);
-			$error_message = curl_error($ch);
-
-			// If temp banned, you need to wait for 10 sec
-			if($http_status == 503 or $http_status == 0)
-			{
-				if ( $this->_retries < 3 )
-				{
-					$this->_retries += 1;
-					echo "\nTMDB limits exceeded, sleeping for 10 seconds.";
-					usleep( 10 *1000*1000 );
-					return $this->_makeCall($function, $params, $session_id, $method);
-				}
-			}
-			$this->_retries = 0;
-
-			if($error_number > 0)
-			{
-				throw new TMDbException('Method failed: '.$function.' - HTTP Status '.$http_status.' Curl Errno '.$error_number.' Curl Error '.$error_message);
-			}
-
-			curl_close($ch);
-		}
-		else
-		{
-			throw new TMDbException('CURL-extension not loaded');
-		}
-
-		$results = json_decode($body, TRUE);
-
-		if(strpos($function, 'authentication/token/new') !== FALSE)
-		{
-			$parsed_headers = $this->_http_parse_headers($header);
-			$results['Authentication-Callback'] = $parsed_headers['Authentication-Callback'];
-		}
-
-		if($results !== NULL)
-		{
-			return $results;
-		}
-		elseif($method == TMDb::HEAD)
-		{
-			return $this->_http_parse_headers($header);
-		}
-		else
-		{
-			throw new TMDbException('Server error on "'.$url.'": '.$response);
-		}
-	}
-
-	/**
-	 * Setter for the default language
-	 *
-	 * @param string $lang		(ISO 3166-1)
-	 * @return void
-	 */
-	public function setLang($lang)
-	{
-		$this->_lang = $lang;
-	}
-
-	/**
-	 * Setter for the TMDB-config
-	 *
-	 * $param array $config
-	 * @return void
-	 */
-	public function setConfig($config)
-	{
-		$this->_config = $config;
-	}
-
-	/**
-	 * Getter for the default language
-	 *
-	 * @return string
-	 */
-	public function getLang()
-	{
-		return $this->_lang;
-	}
-
-	/**
-	 * Getter for the TMDB-config
-	 *
-	 * @return array
-	 */
-	public function getConfig()
-	{
-		if(empty($this->_config))
-		{
-			$this->_config = $this->getConfiguration();
-		}
-
-		return $this->_config;
-	}
-
-	/*
-	 * Internal function to parse HTTP headers because of lack of PECL extension installed by many
-	 *
-	 * @param string $header
-	 * @return array
-	 */
-	protected function _http_parse_headers($header)
-	{
-		$return = array();
-		$fields = explode("\r\n", preg_replace('/\x0D\x0A[\x09\x20]+/', ' ', $header));
-		foreach($fields as $field)
-		{
-			if(preg_match('/([^:]+): (.+)/m', $field, $match))
-			{
-				$match[1] = preg_replace('/(?<=^|[\x09\x20\x2D])./e', 'strtoupper("\0")', strtolower(trim($match[1])));
-				if( isset($return[$match[1]]) )
-				{
-					$return[$match[1]] = array($return[$match[1]], $match[2]);
-				}
-				else
-				{
-					$return[$match[1]] = trim($match[2]);
-				}
-			}
-		}
-		return $return;
-	}
-}
-
-/**
- * TMDb Exception class
- *
- * @author Jonas De Smet - Glamorous
- */
-class TMDbException extends Exception
-{
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/Tmux.php b/lib/copy_this/www/lib/Tmux.php
deleted file mode 100644
index 0743d1b5c..000000000
--- a/lib/copy_this/www/lib/Tmux.php
+++ /dev/null
@@ -1,479 +0,0 @@
-<?php
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once (NN_LIB . 'site.php');
-require_once (NN_TMUX . 'lib' . DS . 'Info.php');
-
-
-class Tmux
-{
-	/**
-	 * @var \DB
-	 */
-	public $pdo;
-
-	public $tmux_session;
-
-	function __construct(DB $pdo = null)
-	{
-		$this->pdo = (empty($pdo) ? new DB() : $pdo);
-		$s = new Sites;
-		$this->site = $s->get();
-	}
-
-	public function version()
-	{
-		return $this->site->dbversion;
-	}
-
-	public function update($form)
-	{
-		$pdo = $this->pdo;
-		$tmux = $this->row2Object($form);
-
-		$sql = $sqlKeys = [];
-		foreach ($form as $settingK => $settingV) {
-			if (is_array($settingV)) {
-				$settingV = implode(', ', $settingV);
-			}
-			$sql[] = sprintf("WHEN %s THEN %s", $pdo->escapeString($settingK), $pdo->escapeString($settingV));
-			$sqlKeys[] = $pdo->escapeString($settingK);
-		}
-
-		$pdo->queryExec(sprintf("UPDATE tmux SET value = CASE setting %s END WHERE setting IN (%s)", implode(' ', $sql), implode(', ', $sqlKeys)));
-
-		return $tmux;
-	}
-
-	public function get($setting = '')
-	{
-		$pdo = $this->pdo;
-		$where = ($setting !== '' ? sprintf('WHERE setting = %s', $pdo->escapeString($setting)) : '');
-
-		$rows = $pdo->query(sprintf("SELECT * FROM tmux %s", $where));
-
-		if ($rows === false) {
-			return false;
-		}
-
-		return $this->rows2Object($rows);
-	}
-
-	public function getConnectionsInfo($constants)
-	{
-		$runVar = array();
-		$runVar['connections']['port_a'] = $runVar['connections']['host_a'] = $runVar['connections']['ip_a'] = false;
-
-		if ($constants['nntpproxy'] == 0) {
-			$runVar['connections']['port'] = NNTP_PORT;
-			$runVar['connections']['host'] = NNTP_SERVER;
-			$runVar['connections']['ip'] = gethostbyname($runVar['connections']['host']);
-			if ($constants['alternate_nntp'] === '1') {
-				$runVar['connections']['port_a'] = NNTP_PORT_A;
-				$runVar['connections']['host_a'] = NNTP_SERVER_A;
-				$runVar['connections']['ip_a'] = gethostbyname($runVar['connections']['host_a']);
-			}
-		} else {
-			$filename = NN_MISC . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf";
-			$fp = fopen($filename, "r") || die("Couldn't open $filename");
-			while (!feof($fp)) {
-				$line = fgets($fp);
-				if (preg_match('/"host": "(.+)",$/', $line, $match)) {
-					$runVar['connections']['host'] = $match[1];
-				}
-				if (preg_match('/"port": (.+),$/', $line, $match)) {
-					$runVar['connections']['port'] = $match[1];
-					break;
-				}
-			}
-			if ($constants['alternate_nntp']) {
-				$filename = NN_MISC . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy_a.conf";
-				$fp = fopen($filename, "r") || die("Couldn't open $filename");
-				while (!feof($fp)) {
-					$line = fgets($fp);
-					if (preg_match('/"host": "(.+)",$/', $line, $match)) {
-						$runVar['connections']['host_a'] = $match[1];
-					}
-					if (preg_match('/"port": (.+),$/', $line, $match)) {
-						$runVar['connections']['port_a'] = $match[1];
-						break;
-					}
-				}
-			}
-			$runVar['connections']['ip'] = gethostbyname($runVar['connections']['host']);
-			if ($constants['alternate_nntp'] === '1') {
-				$runVar['connections']['ip_a'] = gethostbyname($runVar['connections']['host_a']);
-			}
-		}
-		return $runVar['connections'];
-	}
-
-	public function getUSPConnections($which, $connections)
-	{
-
-		switch ($which) {
-			case 'alternate':
-					$ip = 'ip_a';
-					$port = 'port_a';
-					break;
-			case 'primary':
-			default:
-				$ip = 'ip';
-				$port = 'port';
-				break;
-		}
-		$runVar = array();
-
-		$runVar['conncounts'][$which]['active'] = $runVar['conncounts'][$which]['total'] = 0;
-
-		$runVar['conncounts'][$which]['active'] = str_replace("\n", '', shell_exec("ss -n | grep " . $connections[$ip] . ":" . $connections[$port] . " | grep -c ESTAB"));
-		$runVar['conncounts'][$which]['total'] = str_replace("\n", '', shell_exec("ss -n | grep -c " . $connections[$ip] . ":" . $connections[$port]));
-
-		if ($runVar['conncounts'][$which]['active'] == 0 && $runVar['conncounts'][$which]['total'] == 0) {
-				$runVar['conncounts'][$which]['active'] = str_replace("\n", '', shell_exec("ss -n | grep " . $connections[$ip] . ":https | grep -c ESTAB"));
-				$runVar['conncounts'][$which]['total'] = str_replace("\n", '', shell_exec("ss -n | grep -c " . $connections[$ip] . ":https"));
-		}
-		if ($runVar['conncounts'][$which]['active'] == 0 && $runVar['conncounts'][$which]['total'] == 0) {
-			$runVar['conncounts'][$which]['active'] = str_replace("\n", '', shell_exec("ss -n | grep " . $connections[$port] . " | grep -c ESTAB"));
-			$runVar['conncounts'][$which]['total'] = str_replace("\n", '', shell_exec("ss -n | grep -c " . $connections[$port]));
-		}
-		if ($runVar['conncounts'][$which]['active'] == 0 && $runVar['conncounts'][$which]['total'] == 0) {
-			$runVar['conncounts'][$which]['active'] = str_replace("\n", '', shell_exec("ss -n | grep " . $connections[$ip] . " | grep -c ESTAB"));
-			$runVar['conncounts'][$which]['total'] = str_replace("\n", '', shell_exec("ss -n | grep -c " . $connections[$ip]));
-		}
-		return ($runVar['conncounts']);
-	}
-
-	public function getListOfPanes($constants)
-	{
-		$panes = ['zero' => '', 'one' => '', 'two' => ''];
-		switch ($constants['sequential']) {
-			case 0:
-				$panes_win_1 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:0 -F '#{pane_title}'`");
-				$panes['zero'] = str_replace("\n", '', explode(" ", $panes_win_1));
-				$panes_win_2 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:1 -F '#{pane_title}'`");
-				$panes['one'] = str_replace("\n", '', explode(" ", $panes_win_2));
-				$panes_win_3 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:2 -F '#{pane_title}'`");
-				$panes['two'] = str_replace("\n", '', explode(" ", $panes_win_3));
-				break;
-			case 1:
-				$panes_win_1 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:0 -F '#{pane_title}'`");
-				$panes['zero'] = str_replace("\n", '', explode(" ", $panes_win_1));
-				$panes_win_2 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:1 -F '#{pane_title}'`");
-				$panes['one'] = str_replace("\n", '', explode(" ", $panes_win_2));
-				$panes_win_3 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:2 -F '#{pane_title}'`");
-				$panes['two'] = str_replace("\n", '', explode(" ", $panes_win_3));
-				break;
-			case 2:
-				$panes_win_1 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:0 -F '#{pane_title}'`");
-				$panes['zero'] = str_replace("\n", '', explode(" ", $panes_win_1));
-				$panes_win_2 = shell_exec("echo `tmux list-panes -t {$constants['tmux_session']}:1 -F '#{pane_title}'`");
-				$panes['one'] = str_replace("\n", '', explode(" ", $panes_win_2));
-				break;
-		}
-		return $panes;
-	}
-
-	public function getConstantSettings()
-	{
-		$tmuxstr = 'SELECT value FROM tmux WHERE setting =';
-		$settstr = 'SELECT value FROM site WHERE setting =';
-
-		$sql = sprintf(
-				"SELECT
-					(%1\$s 'sequential') AS sequential,
-					(%1\$s 'tmux_session') AS tmux_session,
-					(%1\$s 'scrape') AS run_ircscraper,
-					(%2\$s 'sqlpatch') AS sqlpatch,
-					(%2\$s 'alternate_nntp') AS alternate_nntp,
-					(%2\$s 'tablepergroup') AS tablepergroup,
-					(%2\$s 'nntpproxy') AS nntpproxy",
-					$tmuxstr,
-					$settstr
-		);
-		return $sql;
-	}
-
-	public function getMonitorSettings()
-	{
-		$tmuxstr = 'SELECT value FROM tmux WHERE setting =';
-		$settstr = 'SELECT value FROM site WHERE setting =';
-
-		$sql = sprintf(
-				"SELECT
-					(%1\$s 'monitor_delay') AS monitor,
-					(%1\$s 'binaries') AS binaries_run,
-					(%1\$s 'backfill') AS backfill,
-					(%1\$s 'backfill_qty') AS backfill_qty,
-					(%1\$s 'import') AS import,
-					(%1\$s 'nzbs') AS nzbs,
-					(%1\$s 'post') AS post,
-					(%1\$s 'releases') AS releases_run,
-					(%1\$s 'releases_threaded') AS releases_threaded,
-					(%1\$s 'fix_names') AS fix_names,
-					(%1\$s 'seq_timer') AS seq_timer,
-					(%1\$s 'bins_timer') AS bins_timer,
-					(%1\$s 'back_timer') AS back_timer,
-					(%1\$s 'import_count') AS import_count,
-					(%1\$s 'import_timer') AS import_timer,
-					(%1\$s 'rel_timer') AS rel_timer,
-					(%1\$s 'fix_timer') AS fix_timer,
-					(%1\$s 'post_timer') AS post_timer,
-					(%1\$s 'postprocess_kill') AS postprocess_kill,
-					(%1\$s 'crap_timer') AS crap_timer,
-					(%1\$s 'fix_crap') AS fix_crap,
-					(%1\$s 'fix_crap_opt') AS fix_crap_opt,
-					(%1\$s 'tv_timer') AS tv_timer,
-					(%1\$s 'update_tv') AS update_tv,
-					(%1\$s 'post_kill_timer') AS post_kill_timer,
-					(%1\$s 'monitor_path') AS monitor_path,
-					(%1\$s 'monitor_path_a') AS monitor_path_a,
-					(%1\$s 'monitor_path_b') AS monitor_path_b,
-					(%1\$s 'progressive') AS progressive,
-					(%1\$s 'dehash') AS dehash,
-					(%1\$s 'dehash_timer') AS dehash_timer,
-					(%1\$s 'backfill_days') AS backfilldays,
-					(%1\$s 'post_amazon') AS post_amazon,
-					(%1\$s 'post_timer_amazon') AS post_timer_amazon,
-					(%1\$s 'post_non') AS post_non,
-					(%1\$s 'post_timer_non') AS post_timer_non,
-					(%1\$s 'colors_start') AS colors_start,
-					(%1\$s 'colors_end') AS colors_end,
-					(%1\$s 'colors_exc') AS colors_exc,
-					(%1\$s 'showquery') AS show_query,
-					(%1\$s 'running') AS is_running,
-					(%1\$s 'run_sharing') AS run_sharing,
-					(%1\$s 'sharing_timer') AS sharing_timer,
-					(%2\$s 'lookupbooks') AS processbooks,
-					(%2\$s 'lookupmusic') AS processmusic,
-					(%2\$s 'lookupgames') AS processgames,
-					(%2\$s 'lookupxxx') AS processxxx,
-					(%2\$s 'lookupimdb') AS processmovies,
-					(%2\$s 'lookuptvrage') AS processtvrage,
-					(%2\$s 'lookupanidb') AS processanime,
-					(%2\$s 'lookupnfo') AS processnfo,
-					(%2\$s 'lookuppar2') AS processpar2,
-					(%2\$s 'nzbthreads') AS nzbthreads,
-					(%2\$s 'tmpunrarpath') AS tmpunrar,
-					(%2\$s 'compressedheaders') AS compressed,
-					(%2\$s 'book_reqids') AS book_reqids,
-					(%2\$s 'request_hours') AS request_hours",
-					$tmuxstr,
-					$settstr
-		);
-		return $sql;
-	}
-
-	public function rows2Object($rows)
-	{
-		$obj = new stdClass;
-		foreach ($rows as $row) {
-			$obj->{$row['setting']} = $row['value'];
-		}
-
-		$obj->{'version'} = $this->version();
-		return $obj;
-	}
-
-	public function row2Object($row)
-	{
-		$obj = new stdClass;
-		$rowKeys = array_keys($row);
-		foreach ($rowKeys as $key) {
-			$obj->{$key} = $row[$key];
-		}
-		return $obj;
-	}
-
-	public function updateItem($setting, $value)
-	{
-		$pdo = $this->pdo;
-		$sql = sprintf("UPDATE tmux SET value = %s WHERE setting = %s", $pdo->escapeString($value), $pdo->escapeString($setting));
-		return $pdo->queryExec($sql);
-	}
-
-	//get microtime
-	public function microtime_float()
-	{
-		list($usec, $sec) = explode(" ", microtime());
-		return ((float)$usec + (float)$sec);
-	}
-
-	public function decodeSize($bytes)
-	{
-		$types = ['B', 'KB', 'MB', 'GB', 'TB'];
-		for ($i = 0; $bytes >= 1024 && $i < (count($types) - 1); $bytes /= 1024, $i++);
-		return (round($bytes, 2) . " " . $types[$i]);
-	}
-
-	public function writelog($pane)
-	{
-		$path = NN_LOGS;
-		$getdate = gmDate("Ymd");
-		$tmux = $this->get();
-		$logs = (isset($tmux->write_logs)) ? $tmux->write_logs : 0;
-		if ($logs == 1) {
-			return "2>&1 | tee -a $path/$pane-$getdate.log";
-		} else {
-			return "";
-		}
-	}
-
-	public function get_color($colors_start, $colors_end, $colors_exc)
-	{
-		$exception = str_replace(".", ".", $colors_exc);
-		$exceptions = explode(",", $exception);
-		sort($exceptions);
-		$number = mt_rand($colors_start, $colors_end - count($exceptions));
-		foreach ($exceptions as $exception) {
-			if ($number >= $exception) {
-				$number++;
-			} else {
-				break;
-			}
-		}
-		return $number;
-	}
-
-	// Returns random bool, weighted by $chance
-	public function rand_bool($loop, $chance = 60)
-	{
-		$tmux = $this->get();
-		$usecache = (isset($tmux->usecache)) ? $tmux->usecache : 0;
-		if ($loop == 1 || $usecache == 0) {
-			return false;
-		} else {
-			return (mt_rand(1, 100) <= $chance);
-		}
-	}
-
-	public function relativeTime($_time)
-	{
-		$d = array();
-		$d[0] = [1, "sec"];
-		$d[1] = [60, "min"];
-		$d[2] = [3600, "hr"];
-		$d[3] = [86400, "day"];
-		$d[4] = [31104000, "yr"];
-
-		$w = [];
-
-		$return = '';
-		$now = time();
-		$diff = ($now - ($_time >= $now ? $_time - 1 : $_time));
-		$secondsLeft = $diff;
-
-		for ($i = 4; $i > -1; $i--) {
-			$w[$i] = intval($secondsLeft / $d[$i][0]);
-			$secondsLeft -= ($w[$i] * $d[$i][0]);
-			if ($w[$i] != 0) {
-				$return .= $w[$i] . " " . $d[$i][1] . (($w[$i] > 1) ? 's' : '') . " ";
-			}
-		}
-		return $return;
-	}
-
-	public function command_exist($cmd)
-	{
-		$returnVal = shell_exec("which $cmd 2>/dev/null");
-		return (empty($returnVal) ? false : true);
-	}
-
-	public function proc_query($qry, $bookreqids, $request_hours, $db_name)
-	{
-		switch ((int) $qry) {
-			case 1:
-				return sprintf("SELECT
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid BETWEEN 5000 AND 5999 AND rageid = -1) AS processtvrage,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid = 5070 AND anidbid IS NULL) AS processanime,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid BETWEEN 2000 AND 2999 AND imdbid IS NULL) AS processmovies,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid IN (3010, 3040, 3050) AND musicinfoid IS NULL) AS processmusic,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid BETWEEN 1000 AND 1999 AND consoleinfoid IS NULL) AS processconsole,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid IN (%s) AND bookinfoid IS NULL) AS processbooks,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid = 4050 AND gamesinfo_id = 0) AS processgames,
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND categoryid BETWEEN 6000 AND 6040 AND xxxinfo_id = 0) AS processxxx,
-					(SELECT COUNT(*) FROM releases r WHERE 1=1 %s) AS processnfo", $bookreqids, \Info::NfoQueryString($this->pdo));
-			case 2:
-				return "SELECT
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND nfostatus = 1) AS nfo,
-					(SELECT COUNT(*) FROM releases r
-						INNER JOIN category c ON c.id = r.categoryid
-						WHERE r.nzbstatus = 1
-						AND r.passwordstatus BETWEEN -6 AND -1 AND r.haspreview = -1 AND c.disablepreview = 0
-					) AS work,
-					(SELECT COUNT(*) FROM groups WHERE active = 1) AS active_groups,
-					(SELECT COUNT(*) FROM groups WHERE name IS NOT NULL) AS all_groups";
-			case 3:
-				return sprintf("SELECT
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND isrequestid = 1 AND prehashid = 0 AND reqidstatus = 0) +
-					(SELECT COUNT(*) FROM releases WHERE nzbstatus = 1 AND isrequestid = 1 AND prehashid = 0 AND reqidstatus = -1) +
-					(SELECT COUNT(*) FROM releases
-						WHERE nzbstatus = 1
-						AND isrequestid = 1 AND prehashid = 0 AND reqidstatus = -3 AND adddate > NOW() - INTERVAL %s HOUR
-					) AS requestid_inprogress,
-					(SELECT COUNT(*) FROM releases WHERE prehashid > 0 AND nzbstatus = 1 AND isrequestid = 1 AND reqidstatus = 1) AS requestid_matched,
-					(SELECT COUNT(*) FROM releases WHERE prehashid > 0 AND searchname IS NOT NULL) AS prehash_matched,
-					(SELECT COUNT(*) FROM releases WHERE preid > 0 AND searchname IS NOT NULL) AS predb_matched,
-					(SELECT COUNT(DISTINCT(preid)) FROM releases WHERE preid > 0 AND searchname IS NOT NULL) AS distinct_predb_matched,
-					(SELECT COUNT(DISTINCT(prehashid)) FROM releases WHERE prehashid > 0 AND searchname IS NOT NULL) AS distinct_prehash_matched", $request_hours);
-			case 4:
-				return sprintf("
-					SELECT
-					(SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'predb' AND TABLE_SCHEMA = %1\$s) AS predb,
-					(SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'prehash' AND TABLE_SCHEMA = %1\$s) AS prehash,
-					(SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'partrepair' AND TABLE_SCHEMA = %1\$s) AS partrepair_table,
-					(SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'parts' AND TABLE_SCHEMA = %1\$s) AS parts_table,
-					(SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'binaries' AND TABLE_SCHEMA = %1\$s) AS binaries_table,
-					(SELECT TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'releases' AND TABLE_SCHEMA = %1\$s) AS releases,
-					(SELECT COUNT(*) FROM groups WHERE first_record IS NOT NULL AND backfill = 1
-						AND (now() - INTERVAL backfill_target DAY) < first_record_postdate
-					) AS backfill_groups_days,
-					(SELECT COUNT(*) FROM groups WHERE first_record IS NOT NULL AND backfill = 1 AND (now() - INTERVAL datediff(curdate(),
-					(SELECT VALUE FROM site WHERE setting = 'safebackfilldate')) DAY) < first_record_postdate) AS backfill_groups_date",
-					$this->pdo->escapeString($db_name)
-				);
-			case 6:
-				return "SELECT
-					(SELECT searchname FROM releases ORDER BY id DESC LIMIT 1) AS newestrelname,
-					(SELECT UNIX_TIMESTAMP(MAX(predate)) FROM prehash) AS newestprehash,
-					(SELECT UNIX_TIMESTAMP(MAX(ctime)) FROM predb) AS newestpredb,
-					(SELECT UNIX_TIMESTAMP(adddate) FROM releases ORDER BY id DESC LIMIT 1) AS newestrelease";
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * @return bool true if tmux is running, false otherwise.
-	 */
-	public function isRunning()
-	{
-		return ($this->get()->running == 1);
-	}
-
-	/**
-	 * Check if Tmux is running, if it is, stop it.
-	 *
-	 * @return bool		true if scripts were running, false otherwise.
-	 * @access public
-	 */
-	public function stopIfRunning()
-	{
-		if ($this->isRunning() == 1) {
-			$this->pdo->queryExec("UPDATE tmux SET value = '0' WHERE setting = 'RUNNING'");
-			$sleep = $this->get()->monitor_delay;
-			echo $this->pdo->log->header("Stopping tmux scripts and waiting $sleep seconds for all panes to shutdown");
-			sleep($sleep);
-			return true;
-		}
-		return false;
-	}
-
-	public function startRunning()
-	{
-		if (!$this->isRunning()) {
-			return $this->pdo->queryExec("UPDATE tmux SET value = '1' WHERE setting = 'RUNNING'");
-		}
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/TmuxOutput.php b/lib/copy_this/www/lib/TmuxOutput.php
deleted file mode 100644
index bc4c70de5..000000000
--- a/lib/copy_this/www/lib/TmuxOutput.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-
-require_once (NN_LIB . 'Tmux.php');
-require_once (NN_LIB . 'site.php');
-
-
-/**
- * Tmux output functions for printing monitor data
- *
- * Class TmuxOutput
- */
-class TmuxOutput extends Tmux
-{
-
-	/**
-	 * @var Versions
-	 */
-	protected $_vers;
-
-	private $runVar;
-	/**
-	 * @var array of current format masks to use.
-	 */
-	private $tmpMasks;
-
-
-	/**
-	 * @param DB $pdo
-	 */
-	public function __construct(DB $pdo = null)
-	{
-		parent::__construct($pdo);
-
-		$s = new Sites();
-		$site = $s->get();
-		$t = new Tmux();
-		$tmux = $t->get();
-		$this->_vers = $site->dbversion;
-		$this->_tvers = $tmux->sqlpatch;
-
-
-		$this->_setColourMasks();
-	}
-
-	public function updateMonitorPane(&$runVar)
-	{
-		$this->runVar = $runVar;
-		$this->tmpMasks = $this->_getFormatMasks($runVar['settings']['compressed']);
-
-		$buffer = $this->_getHeader();
-
-		if ($runVar['settings']['monitor'] > 0) {
-			$buffer .= $this->_getMonitor();
-		}
-
-		if ($runVar['settings']['show_query'] == 1) {
-			$buffer .= $this->_getQueries();
-		}
-
-		//begin update display with screen clear
-		passthru('clear');
-		echo $buffer;
-	}
-
-	protected function _getBackfill()
-	{
-		$buffer = sprintf($this->tmpMasks[3], "Groups", "Active", "Backfill");
-		$buffer .= $this->_getSeparator();
-
-		if ($this->runVar['settings']['backfilldays'] == "1") {
-			$buffer .= sprintf($this->tmpMasks[4],
-				   "Activated",
-				   sprintf(
-					   "%d(%d)",
-					   $this->runVar['counts']['now']['active_groups'],
-					   $this->runVar['counts']['now']['all_groups']
-				   ),
-				   sprintf(
-					   "%d(%d)",
-					   $this->runVar['counts']['now']['backfill_groups_days'],
-					   $this->runVar['counts']['now']['all_groups']
-				   )
-			);
-		} else {
-			$buffer .= sprintf($this->tmpMasks[4],
-				   "Activated",
-				   sprintf(
-					   "%d(%d)",
-					   $this->runVar['counts']['now']['active_groups'],
-					   $this->runVar['counts']['now']['all_groups']
-				   ),
-				   sprintf(
-					   "%d(%d)",
-					   $this->runVar['counts']['now']['backfill_groups_date'],
-					   $this->runVar['counts']['now']['all_groups']
-				   )
-			);
-		}
-
-		return $buffer;
-	}
-
-	protected function _getFormatMasks($compressed)
-	{
-		$index = $compressed == 1 ? 2.1 : 2.0;
-		return array(
-			1 => &$this->_colourMasks[1],
-			2 => &$this->_colourMasks[$index],
-			3 => &$this->_colourMasks[3],
-			4 => &$this->_colourMasks[4],
-			5 => &$this->_colourMasks[5],
-		);
-	}
-
-	protected function _getHeader()
-	{
-		$buffer = '';
-		$state = ($this->runVar['settings']['is_running'] == 1) ? 'Running' : 'Disabled';
-		//$version = $this->_tvers . 'r' . $this->_vers;
-		$tversion = '0.5r01259';
-
-		$buffer .= sprintf($this->tmpMasks[2],
-					"Monitor $state v$tversion @ $this->_tvers [" . $this->_vers ."]: ",
-					$this->relativeTime($this->runVar['timers']['timer1'])
-		);
-
-		$buffer .= sprintf($this->tmpMasks[1],
-					"USP Connections:",
-					sprintf(
-						"%d active (%d total) - %s:%d",
-						$this->runVar['conncounts']['primary']['active'],
-						$this->runVar['conncounts']['primary']['total'],
-						$this->runVar['connections']['host'],
-						$this->runVar['connections']['port']
-					)
-		);
-
-		if ($this->runVar['constants']['alternate_nntp']) {
-			$buffer .= sprintf($this->tmpMasks[1],
-					"USP Alternate:",
-					sprintf(
-						"%d active (%d total) - %s:%d)",
-						$this->runVar['conncounts']['alternate']['active'],
-						$this->runVar['conncounts']['alternate']['total'],
-						$this->runVar['connections']['host_a'],
-						$this->runVar['connections']['port_a']
-					)
-			);
-		}
-
-		$buffer .= sprintf($this->tmpMasks[1],
-				"Newest Release:",
-				$this->runVar['timers']['newOld']['newestrelname']
-		);
-		$buffer .= sprintf($this->tmpMasks[1],
-				"Release Added:",
-				sprintf(
-					"%s ago",
-					(isset($this->runVar['timers']['newOld']['newestrelease'])
-						? $this->relativeTime($this->runVar['timers']['newOld']['newestrelease'])
-						: 0)
-				)
-		);
-		$buffer .= sprintf($this->tmpMasks[1],
-			"Prehash Updated:",
-			sprintf(
-				"%s ago",
-				(isset($this->runVar['timers']['newOld']['newestprehash'])
-					? $this->relativeTime($this->runVar['timers']['newOld']['newestprehash'])
-					: 0)
-			)
-		);
-
-		if (($this->runVar['settings']['post'] == "1" || $this->runVar['settings']['post'] == "3") && $this->runVar['constants']['sequential'] != 2) {
-			$buffer .= sprintf($this->tmpMasks[1],
-					"Postprocess:",
-					"stale for " . $this->relativeTime($this->runVar['timers']['timer3'])
-			);
-		}
-
-		return $buffer . PHP_EOL;
-	}
-
-	protected function _getMonitor()
-	{
-		$buffer = $this->_getTableCounts();
-		$buffer .= $this->_getPaths();
-
-		$buffer .= sprintf($this->tmpMasks[3], "PPA Lists", "Unmatched", "Matched");
-		$buffer .= $this->_getSeparator();
-
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "NFO's",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processnfo']),
-							   $this->runVar['counts']['diff']['processnfo']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['nfo']),
-							   $this->runVar['counts']['percent']['nfo']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-			"predb",
-			sprintf(
-				"%s(%s)",
-				number_format($this->runVar['counts']['now']['predb'] -
-					$this->runVar['counts']['now']['distinct_predb_matched']),
-				$this->runVar['counts']['diff']['distinct_predb_matched']
-			),
-			sprintf(
-				"%s(%d%%)",
-				number_format($this->runVar['counts']['now']['predb_matched']),
-				$this->runVar['counts']['percent']['predb_matched']
-			)
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-							"prehash",
-							sprintf(
-								"%s(%s)",
-							number_format($this->runVar['counts']['now']['prehash'] -
-								$this->runVar['counts']['now']['distinct_prehash_matched']),
-							$this->runVar['counts']['diff']['distinct_prehash_matched']
-							),
-							sprintf(
-								"%s(%d%%)",
-								number_format($this->runVar['counts']['now']['prehash_matched']),
-								$this->runVar['counts']['percent']['prehash_matched']
-							)
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "requestid",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['requestid_inprogress']),
-							   $this->runVar['counts']['diff']['requestid_inprogress']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['requestid_matched']),
-							   $this->runVar['counts']['percent']['requestid_matched']
-						   )
-		);
-
-		$buffer .= PHP_EOL;
-		$buffer .= sprintf($this->tmpMasks[3], "Category", "In Process", "In Database");
-		$buffer .= $this->_getSeparator();
-
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Audio",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processmusic']),
-							   $this->runVar['counts']['diff']['processmusic']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['audio']),
-							   $this->runVar['counts']['percent']['audio']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Books",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processbooks']),
-							   $this->runVar['counts']['diff']['processbooks']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['books']),
-							   $this->runVar['counts']['percent']['books']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Console",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processconsole']),
-							   $this->runVar['counts']['diff']['processconsole']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['console']),
-							   $this->runVar['counts']['percent']['console']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Misc",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['work']),
-							   $this->runVar['counts']['diff']['work']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['misc']),
-							   $this->runVar['counts']['percent']['misc']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Movie",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processmovies']),
-							   $this->runVar['counts']['diff']['processmovies']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['movies']),
-							   $this->runVar['counts']['percent']['movies']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "PC",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processgames']),
-							   $this->runVar['counts']['diff']['processgames']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['pc']),
-							   $this->runVar['counts']['percent']['pc']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "TV",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processtvrage']),
-							   $this->runVar['counts']['diff']['processtvrage']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['tv']),
-							   $this->runVar['counts']['percent']['tv']
-						   )
-		);
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "XXX",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['processxxx']),
-							   $this->runVar['counts']['diff']['processxxx']
-						   ),
-						   sprintf(
-							   "%s(%d%%)",
-							   number_format($this->runVar['counts']['now']['xxx']),
-							   $this->runVar['counts']['percent']['xxx']
-						   )
-		);
-
-		$buffer .= $this->_getSeparator();
-
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Total",
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['total_work']),
-							   $this->runVar['counts']['diff']['total_work']
-						   ),
-						   sprintf(
-							   "%s(%s)",
-							   number_format($this->runVar['counts']['now']['releases']),
-							   $this->runVar['counts']['diff']['releases']
-						   )
-		);
-		$buffer .= PHP_EOL;
-
-		$buffer .= $this->_getBackfill();
-
-		return $buffer;
-	}
-
-	protected function _getPaths()
-	{
-		$buffer = '';
-
-		// assign timers from tmux table
-		$monitor_path = $this->runVar['settings']['monitor_path'];
-		$monitor_path_a = $this->runVar['settings']['monitor_path_a'];
-		$monitor_path_b = $this->runVar['settings']['monitor_path_b'];
-
-		if (((isset($monitor_path)) && (file_exists($monitor_path)))
-			|| ((isset($monitor_path_a)) && (file_exists($monitor_path_a)))
-				|| ((isset($monitor_path_b)) && (file_exists($monitor_path_b)))) {
-
-			$buffer .= "\n";
-			$buffer .= sprintf($this->tmpMasks[3], "File System", "Used", "Free");
-			$buffer .= $this->_getSeparator();
-
-			if (isset($monitor_path) && $monitor_path != "" && file_exists($monitor_path)) {
-				$disk_use = $this->decodeSize(disk_total_space($monitor_path) - disk_free_space($monitor_path));
-				$disk_free = $this->decodeSize(disk_free_space($monitor_path));
-				if (basename($monitor_path) == "") {
-					$show = "/";
-				} else {
-					$show = basename($monitor_path);
-				}
-				$buffer .= sprintf($this->tmpMasks[4], $show, $disk_use, $disk_free);
-			}
-
-			if (isset($monitor_path_a) && $monitor_path_a != "" && file_exists($monitor_path_a)) {
-				$disk_use = $this->decodeSize(disk_total_space($monitor_path_a) - disk_free_space($monitor_path_a));
-				$disk_free = $this->decodeSize(disk_free_space($monitor_path_a));
-				if (basename($monitor_path_a) == "") {
-					$show = "/";
-				} else {
-					$show = basename($monitor_path_a);
-				}
-				$buffer .= sprintf($this->tmpMasks[4], $show, $disk_use, $disk_free);
-			}
-
-			if (isset($monitor_path_b) && $monitor_path_b != "" && file_exists($monitor_path_b)) {
-				$disk_use = $this->decodeSize(disk_total_space($monitor_path_b) - disk_free_space($monitor_path_b));
-				$disk_free = $this->decodeSize(disk_free_space($monitor_path_b));
-				if (basename($monitor_path_b) == "") {
-					$show = "/";
-				} else {
-					$show = basename($monitor_path_b);
-				}
-				$buffer .= sprintf($this->tmpMasks[4], $show, $disk_use, $disk_free);
-			}
-		}
-		return $buffer . PHP_EOL;
-	}
-
-	protected function _getQueries()
-	{
-		$buffer = PHP_EOL;
-		$buffer .= sprintf($this->tmpMasks[3], "Query Block", "Time", "Cumulative");
-		$buffer .= $this->_getSeparator();
-		$buffer .= sprintf($this->tmpMasks[4],
-						   "Combined",
-						   sprintf(
-							   "%d %d %d %d %d %d %d",
-							   $this->runVar['timers']['query']['tmux_time'],
-							   $this->runVar['timers']['query']['split_time'],
-							   $this->runVar['timers']['query']['init_time'],
-							   $this->runVar['timers']['query']['proc1_time'],
-							   $this->runVar['timers']['query']['proc2_time'],
-							   $this->runVar['timers']['query']['proc3_time'],
-							   $this->runVar['timers']['query']['tpg_time']
-						   ),
-						   sprintf(
-							   "%d %d %d %d %d %d %d",
-							   $this->runVar['timers']['query']['tmux_time'],
-							   $this->runVar['timers']['query']['split1_time'],
-							   $this->runVar['timers']['query']['init1_time'],
-							   $this->runVar['timers']['query']['proc11_time'],
-							   $this->runVar['timers']['query']['proc21_time'],
-							   $this->runVar['timers']['query']['proc31_time'],
-							   $this->runVar['timers']['query']['tpg1_time']
-						   )
-		);
-
-		$pieces = explode(" ", $this->pdo->getAttribute(\PDO::ATTR_SERVER_INFO));
-		$buffer .= $this->pdo->log->primaryOver("\nThreads = ") .
-				   $this->pdo->log->headerOver($pieces[4]) .
-				   $this->pdo->log->primaryOver(', Opens = ') .
-				   $this->pdo->log->headerOver($pieces[14]) .
-				   $this->pdo->log->primaryOver(', Tables = ') .
-				   $this->pdo->log->headerOver($pieces[22]) .
-				   $this->pdo->log->primaryOver(', Slow = ') .
-				   $this->pdo->log->headerOver($pieces[11]) .
-				   $this->pdo->log->primaryOver(', QPS = ') .
-				   $this->pdo->log->header($pieces[28]);
-
-		return $buffer;
-	}
-
-	protected function _getSeparator()
-	{
-		return sprintf($this->tmpMasks[3],
-					   "======================================",
-					   "=========================",
-					   "======================================");
-	}
-
-	protected function _getTableCounts()
-	{
-		$buffer = sprintf($this->tmpMasks[3], "Binaries", "Parts", "Parts in repair");
-		$buffer .= $this->_getSeparator();
-		$buffer .= sprintf($this->tmpMasks[5],
-			   number_format($this->runVar['counts']['now']['binaries_table']),
-			   number_format($this->runVar['counts']['now']['parts_table']),
-				number_format($this->runVar['counts']['now']['partrepair_table'])
-		);
-
-		return $buffer;
-	}
-
-	protected function _SetColourMasks()
-	{
-		$this->_colourMasks[1]   =
-			$this->pdo->log->headerOver("%-18s") . " " . $this->pdo->log->tmuxOrange("%-48.48s");
-		$this->_colourMasks[2.0] =
-			$this->pdo->log->alternateOver("%-20s") . " " . $this->pdo->log->tmuxOrange("%-33.33s");
-		$this->_colourMasks[2.1] =
-			$this->pdo->log->headerOver("%-20s") . " " . $this->pdo->log->tmuxOrange("%-33.33s");
-		$this->_colourMasks[3]   = $this->pdo->log->header("%-16.16s %25.25s %25.25s");;
-		$this->_colourMasks[4] = $this->pdo->log->primaryOver("%-16.16s") .
-								 " " . $this->pdo->log->tmuxOrange("%25.25s %25.25s");;
-		$this->_colourMasks[5] = $this->pdo->log->tmuxOrange("%-16.16s %25.25s %25.25s");
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/TmuxRun.php b/lib/copy_this/www/lib/TmuxRun.php
deleted file mode 100644
index 60cbb7327..000000000
--- a/lib/copy_this/www/lib/TmuxRun.php
+++ /dev/null
@@ -1,709 +0,0 @@
-<?php
-require_once(NN_LIB . 'Tmux.php');
-
-
-/**
- * Tmux pane shell exec functions for pane respawning
- *
- * Class TmuxRun
- */
-class TmuxRun extends Tmux
-{
-	protected $_dateFormat;
-
-	/**
-	 * @param DB $pdo
-	 */
-	public function __construct(DB $pdo = null)
-	{
-		parent::__construct($pdo);
-		$this->_dateFormat = '%Y-%m-%d %T';
-
-	}
-
-	// main switch for running tmux panes
-	public function runPane($cmdParam, &$runVar)
-	{
-		switch ((int) $runVar['constants']['sequential']) {
-			case 0:
-				switch ((string) $cmdParam) {
-					case 'amazon':
-						$this->_runAmazon($runVar);
-						break;
-					case 'dehash':
-						$this->_runDehash($runVar);
-						break;
-					case 'fixnames':
-						$this->_runFixReleaseNames($runVar);
-						break;
-					case 'import':
-						$this->_runNZBImport($runVar);
-						break;
-					case 'main':
-						$this->_runMainNon($runVar);
-						break;
-					case 'nonamazon':
-						$this->_runNonAmazon($runVar);
-						break;
-					case 'notrunning':
-						$this->_notRunningNon($runVar);
-						break;
-					case 'ppadditional':
-						$this->_runPPAdditional($runVar);
-						break;
-					case 'removecrap':
-						$this->_runRemoveCrap($runVar);
-						break;
-					case 'scraper':
-						$this->_runIRCScraper(3, $runVar);
-						break;
-					case 'sharing':
-						$this->_runSharing(($runVar['constants']['nntpproxy'] == 1 ? 5 : 4), $runVar);
-						break;
-					case 'updatetv':
-						$this->_runUpdateTv($runVar);
-						break;
-				}
-				break;
-			case 1:
-				switch ($cmdParam) {
-					case 'amazon':
-						$this->_runAmazon($runVar);
-						break;
-					case 'dehash':
-						$this->_runDehash($runVar);
-						break;
-					case 'fixnames':
-						$this->_runFixReleaseNames($runVar);
-						break;
-					case 'import':
-						$this->_runNZBImport($runVar);
-						break;
-					case 'main':
-						$this->_runMainBasic($runVar);
-						break;
-					case 'nonamazon':
-						$this->_runNonAmazon($runVar);
-						break;
-					case 'notrunning':
-						$this->_notRunningBasic($runVar);
-						break;
-					case 'ppadditional':
-						$this->_runPPAdditional($runVar);
-						break;
-					case 'removecrap':
-						$this->_runRemoveCrap($runVar);
-						break;
-					case 'scraper':
-						$this->_runIRCScraper(3, $runVar);
-						break;
-					case 'sharing':
-						$this->_runSharing(($runVar['constants']['nntpproxy'] == 1 ? 5 : 4), $runVar);
-						break;
-					case 'updatetv':
-						$this->_runUpdateTv($runVar);
-						break;
-				}
-				break;
-			case 2:
-				switch ($cmdParam) {
-					case 'amazon':
-						$this->_runAmazonFull($runVar);
-						break;
-					case 'import':
-						$this->_runNZBImport($runVar);
-						break;
-					case 'main':
-						$this->_runMainFull($runVar);
-						break;
-					case 'notrunning':
-						$this->_notRunningFull($runVar);
-						break;
-					case 'scraper':
-						$this->_runIRCScraper(2, $runVar);
-						break;
-					case 'sharing':
-						$this->_runSharing(($runVar['constants']['nntpproxy'] == 1 ? 4 : 3), $runVar);
-						break;
-					case 'updatetv':
-						$this->_runUpdateTvFull($runVar);
-						break;
-				}
-				break;
-		}
-	}
-
-	protected function _runDehash(&$runVar)
-	{
-		switch ($runVar['settings']['dehash']) {
-			case 1:
-				$log = $this->writelog($runVar['panes']['one'][3]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/decrypt_hashes.php 1000 $log; \
-					date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null"
-				);
-				break;
-			case 2:
-				$log = $this->writelog($runVar['panes']['one'][3]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/update_predb.php true $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \
-					date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null"
-				);
-				break;
-			case 3:
-				$log = $this->writelog($runVar['panes']['one'][3]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.3 ' \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/update_predb.php true $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/postprocess_pre.php {$runVar['constants']['pre_lim']} $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/decrypt_hashes.php 1000 $log; \
-					date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['dehash_timer']}' 2>&1 1> /dev/null"
-				);
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.3 'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][3]} has been disabled/terminated by Decrypt Hashes\"'");
-		}
-	}
-
-	protected function _runFixReleaseNames(&$runVar)
-	{
-		switch ($runVar['settings']['fix_names']) {
-			case 1:
-				$log = $this->writelog($runVar['panes']['one'][0]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.0 ' \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/fixrelnames.php md5 $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/fixrelnames.php filename $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/fixrelnames.php nfo $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/fixrelnames.php par2 $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/fixrelnames.php miscsorter $log; \
-					{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/fixrelnames.php predbft $log; date +\"{$this->_dateFormat}\"; \
-					{$runVar['commands']['_sleep']} {$runVar['settings']['fix_timer']}' 2>&1 1> /dev/null"
-				);
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.0 'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][0]} has been disabled/terminated by Fix Release Names\"'");
-		}
-	}
-
-	protected function _runAmazon(&$runVar)
-	{
-		switch (true) {
-			case $runVar['settings']['post_amazon'] == 1 && ($runVar['counts']['now']['processmusic'] > 0
-					|| $runVar['counts']['now']['processbooks'] > 0 || $runVar['counts']['now']['processconsole'] > 0
-						|| $runVar['counts']['now']['processgames'] > 0 || $runVar['counts']['now']['processxxx'] > 0)
-							&& ($runVar['settings']['processbooks'] == 1 || $runVar['settings']['processmusic'] == 1
-								|| $runVar['settings']['processgames'] == 1  || $runVar['settings']['processxxx'] == 1):
-
-				$log = $this->writelog($runVar['panes']['two'][2]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.2 ' \
-						{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/bin/postprocess.php amazon true $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer_amazon']}' 2>&1 1> /dev/null"
-				);
-				break;
-			case $runVar['settings']['post_amazon'] == 1 && $runVar['settings']['processbooks'] == 0
-					&& $runVar['settings']['processmusic'] == 0 && $runVar['settings']['processgames'] == 0
-						&& $runVar['settings']['processxxx'] == 0:
-
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.2 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][2]} has been disabled/terminated in Admin Disable Music/Books/Console/XXX\"'");
-				break;
-			case $runVar['settings']['post_amazon'] == 1 && $runVar['counts']['now']['processmusic'] == 0 && $runVar['counts']['now']['processbooks'] == 0 && $runVar['counts']['now']['processconsole'] == 0 && $runVar['counts']['now']['processgames'] == 0 && $runVar['counts']['now']['processxxx'] == 0:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.2 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][2]} has been disabled/terminated by No Music/Books/Console/Games/XXX to process\"'");
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.2 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][2]} has been disabled/terminated by Postprocess Amazon\"'");
-		}
-	}
-
-	protected function _runAmazonFull(&$runVar)
-	{
-		switch (true) {
-			case ($runVar['settings']['post_amazon'] == 1) && (($runVar['counts']['now']['processmusic'] > 0)
-					|| ($runVar['counts']['now']['processbooks'] > 0) || ($runVar['counts']['now']['processconsole'] > 0)
-						|| ($runVar['counts']['now']['processgames'] > 0) || ($runVar['counts']['now']['processxxx'] > 0))
-							&& (($runVar['settings']['processbooks'] != 0) || ($runVar['settings']['processconsole'] != 0)
-								|| ($runVar['settings']['processmusic'] != 0) || ($runVar['settings']['processgames'] != 0)
-									|| ($runVar['settings']['processxxx'] != 0)):
-
-				$log = $this->writelog($runVar['panes']['one'][1]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.1 ' \
-						{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix/scripts/tmux/bin/postprocess.php amazon true $log; \
-						date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer_amazon']}' 2>&1 1> /dev/null"
-				);
-				break;
-			case ($runVar['settings']['post_amazon'] == 1) && ($runVar['settings']['processbooks'] == 0)
-					&& ($runVar['counts']['now']['processconsole'] = 0) && ($runVar['settings']['processmusic'] == 0)
-						&& ($runVar['settings']['processgames'] == 0):
-
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.1 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][1]} has been disabled/terminated in Admin Disable Music/Books/Console/XXX\"'"
-				);
-				break;
-			case ($runVar['settings']['post_amazon'] == 1) && ($runVar['counts']['now']['processmusic'] == 0)
-					&& ($runVar['counts']['now']['processbooks'] == 0) && ($runVar['counts']['now']['processconsole'] == 0)
-						&& ($runVar['counts']['now']['processgames'] == 0) && ($runVar['counts']['now']['processxxx'] == 0):
-
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.1 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][1]} has been disabled/terminated by No Music/Books/Console/Games/XXX to process\"'"
-				);
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.1 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][1]} has been disabled/terminated by Postprocess Amazon\"'"
-				);
-		}
-	}
-
-	protected function _runNonAmazon(&$runVar)
-	{
-		switch (true) {
-			case $runVar['settings']['post_non'] != 0 && ($runVar['counts']['now']['processmovies'] > 0 || $runVar['counts']['now']['processtvrage'] > 0 || $runVar['counts']['now']['processanime'] > 0):
-				$log = $this->writelog($runVar['panes']['two'][1]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.1 ' \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/postprocess.php tv {$runVar['modsettings']['clean']} $log; \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/postprocess.php mov {$runVar['modsettings']['clean']} $log; \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/bin/postprocess.php anime true $log; \
-						date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer_non']}' 2>&1 1> /dev/null"
-				);
-				break;
-			case $runVar['settings']['post_non'] != 0 && $runVar['counts']['now']['processmovies'] == 0 && $runVar['counts']['now']['processtvrage'] == 0 && $runVar['counts']['now']['processanime'] == 0:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.1 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][1]} has been disabled/terminated by No Movies/TV/Anime to process\"'");
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.1 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][1]} has been disabled/terminated by Postprocess Non-Amazon\"'");
-		}
-	}
-
-	protected function _runNonUpdateBinaries(&$runVar)
-	{
-		//run update_binaries
-		//$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-		if (($runVar['settings']['binaries_run'] != 0) && ($runVar['killswitch']['pp'] == false)) {
-			$log = $this->writelog($runVar['panes']['zero'][2]);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 ' \
-					{$runVar['scripts']['binaries']} $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['bins_timer']}' 2>&1 1> /dev/null"
-			);
-		} else if ($runVar['killswitch']['pp'] == true) {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.2 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][2]} has been disabled/terminated by Exceeding Limits\"'");
-		} else {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.2 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][2]} has been disabled/terminated by Binaries\"'");
-		}
-	}
-
-	protected function _runNonBackfill(&$runVar)
-	{
-		//run backfill
-		$backsleep = ($runVar['settings']['progressive'] == 1 && floor($runVar['counts']['now']['binaries_table'] / 500) > $runVar['settings']['back_timer']
-					? floor($runVar['counts']['now']['binaries_table'] / 500)
-					: $runVar['settings']['back_timer']
-		);
-
-		if (($runVar['settings']['backfill'] != 0) && ($runVar['killswitch']['pp'] == false)) {
-			$log = $this->writelog($runVar['panes']['zero'][3]);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.3 ' \
-				{$runVar['scripts']['backfill']} $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} $backsleep' 2>&1 1> /dev/null"
-			);
-		} else if ($runVar['killswitch']['pp'] == true) {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.3 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][3]} has been disabled/terminated by Exceeding Limits\"'");
-		} else {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.3 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][3]} has been disabled/terminated by Backfill\"'");
-		}
-	}
-
-	protected function _runNonUpdateReleases(&$runVar)
-	{
-		//run update_releases
-		if ($runVar['settings']['releases_run'] != 0) {
-			$log = $this->writelog($runVar['panes']['zero'][4]);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.4 ' \
-					{$runVar['scripts']['releases']} $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['rel_timer']}' 2>&1 1> /dev/null"
-			);
-		} else {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.4 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][4]} has been disabled/terminated by Releases\"'");
-		}
-	}
-
-	protected function _runNZBImport(&$runVar)
-	{
-		switch ($runVar['settings']['import']) {
-			case 1:
-				$useFilenames = 'false';
-				break;
-			case 2:
-				$useFilenames = 'true';
-				break;
-			default:
-				$useFilenames = 'false';
-		}
-
-		if (($runVar['settings']['import'] != 0) && ($runVar['killswitch']['pp'] == false)) {
-			$log = $this->writelog($runVar['panes']['zero'][1]);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.1 ' \
-				{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/import.php {$runVar['settings']['nzbs']} {$runVar['settings']['nzbthreads']} true true {$useFilenames} {$runVar['settings']['import_count']} $log; \
-				date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['import_timer']}' 2>&1 1> /dev/null"
-			);
-
-		} else if ($runVar['killswitch']['pp'] == true) {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.1 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][1]} has been disabled/terminated by Exceeding Limits\"'");
-
-		} else {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.1 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][1]} has been disabled/terminated by Import\"'");
-		}
-	}
-
-	protected function _runPPAdditional(&$runVar)
-	{
-		//run postprocess_releases additional
-		switch (true) {
-			case ($runVar['settings']['post'] == 1) && ($runVar['counts']['now']['work'] > 0):
-				$log = $this->writelog($runVar['panes']['two'][0]);
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.0 'echo \"\033[38;5;${color}m\"; \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/postprocess.php add $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null"
-				);
-				$runVar['timers']['timer3'] = time();
-				break;
-			case ($runVar['settings']['post'] == 2) && ($runVar['counts']['now']['processnfo'] > 0):
-				$log = $this->writelog($runVar['panes']['two'][0]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.0 ' \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/postprocess.php nfo $log; date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null"
-				);
-				$runVar['timers']['timer3'] = time();
-				break;
-			case ($runVar['settings']['post'] == 3) && (($runVar['counts']['now']['processnfo'] > 0) || ($runVar['counts']['now']['work'] > 0)):
-				//run postprocess_releases additional
-				$log = $this->writelog($runVar['panes']['two'][0]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:2.0 ' \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/postprocess.php add $log; \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/postprocess.php nfo $log; \
-						date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['post_timer']}' 2>&1 1> /dev/null"
-				);
-				$runVar['timers']['timer3'] = time();
-				break;
-			case ($runVar['settings']['post'] != 0) && ($runVar['counts']['now']['processnfo'] == 0) && ($runVar['counts']['now']['work'] == 0):
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.0 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][0]} has been disabled/terminated by No Misc/Nfo to process\"'");
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.0 'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][0]} has been disabled/terminated by Postprocess Additional\"'");
-		}
-	}
-
-	protected function _runRemoveCrap(&$runVar)
-	{
-		switch ($runVar['settings']['fix_crap_opt']) {
-
-			// Do all types up to 2 hours.
-			case 'All':
-				$log = $this->writelog($runVar['panes']['one'][1]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.1 ' \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/removeCrapReleases.php true 2 $log; \
-						date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['crap_timer']}' 2>&1 1> /dev/null"
-				);
-				break;
-			// The user has specified custom types.
-			case 'Custom':
-				$log = $this->writelog($runVar['panes']['one'][1]);
-
-				// Check how many types the user picked.
-				$runVar['modsettings']['fc']['max'] = count($runVar['modsettings']['fix_crap']);
-
-				// Make sure the user actually selected some.
-				if ($runVar['modsettings']['fc']['max'] > 0) {
-
-					// If this is the first run, do a full run, else run on last 2 hours of releases.
-					$runVar['modsettings']['fc']['time'] = '4';
-					if ((($runVar['counts']['iterations'] == 1) || $runVar['modsettings']['fc']['firstrun'])) {
-						$runVar['modsettings']['fc']['time'] = 'full';
-					}
-
-					//Check to see if the pane is dead, if so respawn it.
-					if (shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:1 | grep ^1 | grep -c dead") == 1) {
-
-						// Run remove crap releases.
-						shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.1 ' \
-							echo \"Running removeCrapReleases for {$runVar['modsettings']['fix_crap'][$runVar['modsettings']['fc']['num']]}\"; \
-							{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/removeCrapReleases.php true  \
-							{$runVar['modsettings']['fc']['time']} {$runVar['modsettings']['fix_crap'][$runVar['modsettings']['fc']['num']]} $log; \
-							date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['crap_timer']}' 2>&1 1> /dev/null"
-						);
-
-						// Increment so we know which type to run next.
-						$runVar['modsettings']['fc']['num']++;
-					}
-
-					// If we reached the end, reset the type.
-					if ($runVar['modsettings']['fc']['num'] == $runVar['modsettings']['fc']['max']) {
-						$runVar['modsettings']['fc']['num'] = 0;
-						// And say we are not on the first run, so we run 2 hours the next times.
-						$runVar['modsettings']['fc']['firstrun'] = false;
-					}
-				}
-				break;
-			case 'Disabled':
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.1 'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][1]} has been disabled/terminated by Remove Crap Releases\"'");
-		}
-	}
-
-	protected function _runUpdateTv(&$runVar)
-	{
-		switch (true) {
-			case ($runVar['settings']['update_tv'] == 1 && (time() - $runVar['timers']['timer4'] >= $runVar['settings']['tv_timer'])) || ($runVar['counts']['iterations'] == 1):
-				$log = $this->writelog($runVar['panes']['one'][3]);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.2 ' \
-						{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/update_theaters.php $log; \
-						{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/testing/PostProc/populate_tvrage.php true $log; \
-						{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/update_tvschedule.php $log; \
-						{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateTvRage.php $log; date +\"{$this->_dateFormat}\"' 2>&1 1> /dev/null"
-				);
-				$runVar['timers']['timer4'] = time();
-				break;
-			case $runVar['settings']['update_tv'] == 1:
-				$run_time = $this->relativeTime($runVar['settings']['tv_timer'] + $runVar['timers']['timer4']);
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.2 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][2]} will run in T[ $run_time]\"' 2>&1 1> /dev/null");
-				break;
-			default:
-				$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-				shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.2 \
-					'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][2]} has been disabled/terminated by Update TV/Theater\"'");
-		}
-	}
-
-	protected function _runUpdateTvFull(&$runVar)
-	{
-		if (($runVar['settings']['update_tv'] == 1) && ((time() - $runVar['timers']['timer4'] >= $runVar['settings']['tv_timer']) || ($runVar['counts']['iterations'] == 1))) {
-			$log = $this->writelog($runVar['panes']['one'][0]);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.0 ' \
-				{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/update_theaters.php $log; \
-				{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/testing/PostProc/populate_tvrage.php true $log; \
-				{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/update_tvschedule.php $log; \
-				{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateTvRage.php $log; date +\"{$this->_dateFormat}\"' 2>&1 1> /dev/null"
-			);
-			$runVar['timers']['timer4'] = time();
-
-		} else if ($runVar['settings']['update_tv'] == 1) {
-			$run_time = $this->relativeTime($runVar['settings']['tv_timer'] + $runVar['timers']['timer4']);
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:1.0 \
-				'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][0]} will run in T[ $run_time]\"' 2>&1 1> /dev/null");
-
-		} else {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.0 \
-				'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][0]} has been disabled/terminated by Update TV/Theater\"'");
-		}
-	}
-
-	protected function _runMainNon(&$runVar)
-	{
-		$this->_runNonUpdateBinaries($runVar);
-		$this->_runNonUpdateReleases($runVar);
-		$this->_runNonBackfill($runVar);
-	}
-
-	protected function _runMainBasic(&$runVar)
-	{
-		$log = $this->writelog($runVar['panes']['zero'][2]);
-		if (($runVar['killswitch']['pp'] == false) && (time() - $runVar['timers']['timer5'] <= 4800)) {
-
-			$date = 'date +"%Y-%m-%d %T";';
-			$sleep = sprintf(
-				'%s %s;',
-				$runVar['commands']['_sleep'],
-				$runVar['settings']['seq_timer']
-			);
-
-			switch ($runVar['settings']['binaries_run']) {
-				case 0:
-					$binaries = 'echo "\nbinaries has been disabled/terminated by Binaries"';
-					break;
-				case 1:
-				case 2:
-					$binaries = sprintf(
-						'%s %s;',
-						$runVar['scripts']['binaries'],
-						$log
-					);
-					break;
-				default:
-					$binaries = '';
-			}
-
-			switch ($runVar['settings']['backfill']) {
-				case 0:
-					$backfill = 'echo "backfill is disabled in settings";';
-					break;
-				case 1:
-					$backfill = sprintf(
-						'%s %s %s;',
-						$runVar['scripts']['backfill'],
-						$runVar['settings']['backfill_qty'],
-						$log
-					);
-					break;
-				case 2:
-					$backfill = sprintf(
-						'%s %s %s;',
-						$runVar['scripts']['backfill'],
-						'group',
-						$log
-					);
-					break;
-				case 4:
-					$backfill = sprintf(
-						'%s %s;',
-						$runVar['scripts']['backfill'],
-						$log
-					);
-					break;
-				default:
-					$backfill = '';
-			}
-
-			switch ($runVar['settings']['releases_run']) {
-				case 0:
-					$releases = 'echo "\nreleases have been disabled/terminated by Releases"';
-					break;
-				case 1:
-				case 2:
-					$releases = sprintf(
-						'%s %s;',
-						$runVar['scripts']['releases'],
-						$log
-					);
-					break;
-				default:
-					$releases = '';
-			}
-
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 '$binaries $backfill $releases $date $sleep' 2>&1 1> /dev/null");
-
-		} else if (($runVar['killswitch']['pp'] == false) && (time() - $runVar['timers']['timer5'] >= 4800)) {
-			//run backfill all once and resets the timer
-			if ($runVar['settings']['backfill'] != 0) {
-				shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 ' \
-					{$runVar['commands']['_python']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux//python/backfill_threaded.py all $log; \
-					date +\"{$this->_dateFormat}\"; {$runVar['commands']['_sleep']} {$runVar['settings']['seq_timer']}' 2>&1 1> /dev/null"
-				);
-				$runVar['timers']['timer5'] = time();
-			}
-			$runVar['timers']['timer5'] = time();
-
-		} else if ((($runVar['killswitch']['pp'] == true)) && ($runVar['settings']['releases_run'] != 0)) {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 'echo \"\033[38;5;${color}m\"; \
-				echo \"\nbinaries and backfill has been disabled/terminated by Exceeding Limits\"; \
-				{$runVar['scripts']['releases']} $log; date +\"{$this->_dateFormat}\"; echo \"\nbinaries and backfill has been disabled/terminated by Exceeding Limits\"; \
-				{$runVar['commands']['_sleep']} {$runVar['settings']['seq_timer']}' 2>&1 1> /dev/null"
-			);
-
-		} else if ($runVar['killswitch']['pp'] == true) {
-			$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][2]} has been disabled/terminated by Exceeding Limits\"'");
-		}
-	}
-
-	protected function _runMainFull(&$runVar)
-	{
-		$log = $this->writelog($runVar['panes']['zero'][2]);
-		shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:0.2 ' \
-				{$runVar['paths']['misc']}update_scripts/nix_scripts/screen/sequential/user_threaded.sh true $log; date +\"{$this->_dateFormat}\"' 2>&1 1> /dev/null"
-		);
-	}
-
-	protected function _notRunningNon(&$runVar)
-	{
-		$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-		for ($g = 1; $g <= 4; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][$g]} has been disabled/terminated by Running\"'");
-		}
-		for ($g = 0; $g <= 3; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][$g]} has been disabled/terminated by Running\"'");
-		}
-		for ($g = 0; $g <= 2; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][$g]} has been disabled/terminated by Running\"'");
-		}
-	}
-
-	protected function _notRunningBasic(&$runVar)
-	{
-		$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-		for ($g = 1; $g <= 2; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][$g]} has been disabled/terminated by Running\"'");
-		}
-		for ($g = 0; $g <= 3; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][$g]} has been disabled/terminated by Running\"'");
-		}
-		for ($g = 0; $g <= 2; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:2.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['two'][$g]} has been disabled/terminated by Running\"'");
-		}
-	}
-
-	protected function _notRunningFull(&$runVar)
-	{
-		$color = $this->get_color($runVar['settings']['colors_start'], $runVar['settings']['colors_end'], $runVar['settings']['colors_exc']);
-		for ($g = 1; $g <= 2; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:0.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['zero'][$g]} has been disabled/terminated by Running\"'");
-		}
-		for ($g = 0; $g <= 1; $g++) {
-			shell_exec("tmux respawnp -k -t{$runVar['constants']['tmux_session']}:1.$g 'echo \"\033[38;5;${color}m\n{$runVar['panes']['one'][$g]} has been disabled/terminated by Running\"'");
-		}
-	}
-
-	protected function _runIRCScraper($pane, &$runVar)
-	{
-		if ($runVar['constants']['run_ircscraper'] == 1) {
-			//Check to see if the pane is dead, if so respawn it.
-			if (shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) {
-				shell_exec(
-					"tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 ' \
-					{$runVar['commands']['_phpn']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/lib//IRCScraper/scrape.php true'"
-				);
-			}
-		} else {
-			shell_exec("tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 'echo \"\nIRCScraper has been disabled/terminated by IRCSCraper\"'");
-		}
-	}
-
-	protected function _runSharing($pane, &$runVar)
-	{
-		$sharing = $this->pdo->queryOneRow('SELECT enabled, posting, fetching FROM sharing');
-
-		if ($runVar['settings']['run_sharing'] == 1 && $sharing['enabled'] == 1 && ($sharing['posting'] == 1 || $sharing['fetching'] == 1)) {
-			if (shell_exec("tmux list-panes -t{$runVar['constants']['tmux_session']}:${pane} | grep ^0 | grep -c dead") == 1) {
-				shell_exec(
-					"tmux respawnp -t{$runVar['constants']['tmux_session']}:${pane}.0 ' \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}/update_scripts/nix_scripts/tmux/bin/postprocess.php spotnab true; \
-						{$runVar['commands']['_php']} {$runVar['paths']['misc']}/update_scripts/nix_scripts/tmux/bin/postprocess.php sharing true; \
-						{$runVar['commands']['_sleep']} {$runVar['settings']['sharing_timer']}' 2>&1 1> /dev/null"
-				);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/XXX.php b/lib/copy_this/www/lib/XXX.php
deleted file mode 100644
index 5803aabbc..000000000
--- a/lib/copy_this/www/lib/XXX.php
+++ /dev/null
@@ -1,785 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/IAFD.php");
-require_once(WWW_DIR . "/lib/ADM.php");
-require_once(WWW_DIR . "/lib/ADE.php");
-require_once(WWW_DIR . "/lib/AEBN.php");
-require_once(WWW_DIR . "/lib/Hotmovies.php");
-require_once(WWW_DIR . "/lib/Popporn.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/Logger.php");
-
-
-/**
- * Class XXX
- */
-class XXX
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * What scraper class did we use -- used for template and trailer information
-	 *
-	 * @var string
-	 */
-	protected $whichclass = '';
-
-	/**
-	 * Current title being passed through various sites/api's.
-	 * @var string
-	 */
-	protected $currentTitle = '';
-
-	/**
-	 * @var Logger
-	 */
-	protected $debugging;
-
-	/**
-	 * @var bool
-	 */
-	protected $debug;
-
-	/**
-	 * @var ReleaseImage
-	 */
-	protected $releaseImage;
-
-	protected $currentRelID;
-
-	protected $movieqty;
-
-	protected $showPasswords;
-
-	protected $cookie;
-
-	/**
-	 * @param array $options Echo to cli / Class instances.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'         => false,
-			'ReleaseImage' => null,
-			'Settings'     => null,
-		];
-		$options += $defaults;
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->releaseImage = ($options['ReleaseImage'] instanceof \ReleaseImage ? $options['ReleaseImage'] : new \ReleaseImage($this->pdo));
-
-		$this->movieqty = ($this->site->maxxxxprocessed != '') ? $this->site->maxxxxprocessed : 100;
-		$this->showPasswords = ($this->site->showpasswordedrelease != '') ? $this->site->showpasswordedrelease : 0;
-		$this->debug = NN_DEBUG;
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->imgSavePath = NN_COVERS . 'xxx' . DS;
-		$this->cookie = NN_TMP . 'xxx.cookie';
-
-		if (NN_DEBUG || NN_LOGGING) {
-			$this->debug = true;
-			try {
-				$this->debugging = new \Logger();
-			} catch (\LoggerException $error) {
-				$this->_debug = false;
-			}
-		}
-	}
-
-	/**
-	 * Get info for a xxx id.
-	 *
-	 * @param int $xxxid
-	 *
-	 * @return array|bool
-	 */
-	public function getXXXInfo($xxxid)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT *, UNCOMPRESS(plot) AS plot FROM xxxinfo WHERE id = %d", $xxxid));
-	}
-
-	/**
-	 * Get movies for movie-list admin page.
-	 *
-	 * @param int $start
-	 * @param int $num
-	 *
-	 * @return array
-	 */
-	public function getRange($start, $num)
-	{
-		return $this->pdo->query(
-			sprintf('
-				SELECT *,
-				UNCOMPRESS(plot) AS plot
-				FROM xxxinfo
-				ORDER BY createddate DESC %s',
-				($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
-			)
-		);
-	}
-
-	/**
-	 * Get count of movies for movie-list admin page.
-	 *
-	 * @return int
-	 */
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow('SELECT COUNT(id) AS num FROM xxxinfo');
-		return ($res === false ? 0 : $res['num']);
-	}
-
-	/**
-	 * Get count of movies for movies browse page.
-	 *
-	 * @param       $cat
-	 * @param       $maxAge
-	 * @param array $excludedCats
-	 *
-	 * @return int
-	 */
-	public function getXXXCount($cat, $maxAge = -1, $excludedCats = array())
-	{
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$res = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT COUNT(DISTINCT r.xxxinfo_id) AS num
-				FROM releases r
-				INNER JOIN xxxinfo xxx ON xxx.id = r.xxxinfo_id
-				WHERE r.nzbstatus = 1
-				AND xxx.title != ''
-				AND r.passwordstatus <= %d
-				AND %s %s %s %s ",
-				$this->showPasswords,
-				$this->getBrowseBy(),
-				$catsrch,
-				($maxAge > 0
-					? 'AND r.postdate > NOW() - INTERVAL ' . $maxAge . 'DAY '
-					: ''
-				),
-				(count($excludedCats) > 0 ? ' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')' : '')
-			)
-		);
-		return ($res === false ? 0 : $res['num']);
-	}
-
-	/**
-	 * Get movie releases with covers for xxx browse page.
-	 *
-	 * @param       $cat
-	 * @param       $start
-	 * @param       $num
-	 * @param       $orderBy
-	 * @param       $maxAge
-	 * @param array $excludedCats
-	 *
-	 * @return array
-	 */
-	public function getXXXRange($cat, $start, $num, $orderBy, $maxAge = -1, $excludedCats = array())
-	{
-		$catsrch = '';
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = (new \Category(['Settings' => $this->pdo]))->getCategorySearch($cat);
-		}
-
-		$order = $this->getXXXOrder($orderBy);
-		$sql = sprintf("
-			SELECT
-			GROUP_CONCAT(r.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_id,
-			GROUP_CONCAT(r.rarinnerfilecount ORDER BY r.postdate DESC SEPARATOR ',') as grp_rarinnerfilecount,
-			GROUP_CONCAT(r.haspreview ORDER BY r.postdate DESC SEPARATOR ',') AS grp_haspreview,
-			GROUP_CONCAT(r.passwordstatus ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_password,
-			GROUP_CONCAT(r.guid ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_guid,
-			GROUP_CONCAT(rn.id ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_nfoid,
-			GROUP_CONCAT(groups.name ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grpname,
-			GROUP_CONCAT(r.searchname ORDER BY r.postdate DESC SEPARATOR '#') AS grp_release_name,
-			GROUP_CONCAT(r.postdate ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_postdate,
-			GROUP_CONCAT(r.size ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_size,
-			GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts,
-			GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments,
-			GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs,
-			xxx.*, UNCOMPRESS(xxx.plot) AS plot, groups.name AS group_name, rn.id as nfoid FROM releases r
-			LEFT OUTER JOIN groups ON groups.id = r.groupid
-			LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id
-			INNER JOIN xxxinfo xxx ON xxx.id = r.xxxinfo_id
-			WHERE r.nzbstatus = 1
-			AND xxx.title != ''
-			AND r.passwordstatus <= %d AND %s %s %s %s
-			GROUP BY xxx.id ORDER BY %s %s %s",
-			$this->showPasswords,
-			$this->getBrowseBy(),
-			$catsrch,
-			($maxAge > 0
-				? 'AND r.postdate > NOW() - INTERVAL ' . $maxAge . 'DAY '
-				: ''
-			),
-			(count($excludedCats) > 0 ? ' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')' : ''),
-			$order[0],
-			$order[1],
-			($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
-		);
-		return $this->pdo->query($sql);
-	}
-
-	/**
-	 * Get the order type the user requested on the movies page.
-	 *
-	 * @param $orderBy
-	 *
-	 * @return array
-	 */
-	protected function getXXXOrder($orderBy)
-	{
-		$orderArr = explode('_', (($orderBy == '') ? 'MAX(r.postdate)' : $orderBy));
-		switch ($orderArr[0]) {
-			case 'title':
-				$orderField = 'xxx.title';
-				break;
-			case 'posted':
-			default:
-				$orderField = 'MAX(r.postdate)';
-				break;
-		}
-
-		return array($orderField, ((isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc'));
-	}
-
-	/**
-	 * Order types for xxx page.
-	 *
-	 * @return array
-	 */
-	public function getXXXOrdering()
-	{
-		return array('title_asc', 'title_desc');
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getBrowseBy()
-	{
-		$browseBy = ' ';
-		$browseByArr = array('title', 'director', 'actors', 'genre', 'id');
-		foreach ($browseByArr as $bb) {
-			if (isset($_REQUEST[$bb]) && !empty($_REQUEST[$bb])) {
-				$bbv = stripslashes($_REQUEST[$bb]);
-				if ($bb == "genre") {
-					$bbv = $this->getgenreid($bbv);
-				}
-				if ($bb == 'id') {
-					$browseBy .= 'xxx.' . $bb . '=' . $bbv . ' AND ';
-				} else {
-					$browseBy .= 'xxx.' . $bb . ' ' . $this->pdo->likeString($bbv, true, true) . ' AND ';
-				}
-			}
-		}
-		return $browseBy;
-	}
-
-	/**
-	 * Create click-able links to actors/genres/directors/etc..
-	 *
-	 * @param $data
-	 * @param $field
-	 *
-	 * @return string
-	 */
-	public function makeFieldLinks($data, $field)
-	{
-		if (!isset($data[$field]) || $data[$field] == '') {
-			return '';
-		}
-
-		$tmpArr = explode(',', $data[$field]);
-		$newArr = array();
-		$i = 0;
-		foreach ($tmpArr as $ta) {
-			if ($field == "genre" ) {
-				$ta = $this->getGenres(true,$ta);
-				$ta = $ta["title"];
-			}
-			if ($i > 7) {
-				break;
-			} //only use first 8
-			$newArr[] = '<a href="' . WWW_TOP . '/xxx?' . $field . '=' . urlencode($ta) . '" title="' . $ta . '">' . $ta . '</a>';
-			$i++;
-		}
-		return implode(', ', $newArr);
-	}
-
-	/**
-	 * Update XXX Information from getXXXCovers.php in misc/testing/PostProc
-	 *
-	 * @param string $id
-	 * @param string $title
-	 * @param string $tagLine
-	 * @param string $plot
-	 * @param string $genre
-	 * @param string $director
-	 * @param string $actors
-	 * @param string $extras
-	 * @param string $productInfo
-	 * @param string $trailers
-	 * @param string $directUrl
-	 * @param string $classUsed
-	 * @param string $cover
-	 * @param string $backdrop
-	 */
-	public function update(
-		$id = '', $title = '', $tagLine = '', $plot = '', $genre = '', $director = '',
-		$actors = '', $extras = '', $productInfo = '', $trailers = '', $directUrl = '', $classUsed = '', $cover = '', $backdrop = ''
-	)
-	{
-		if (!empty($id)) {
-
-			$this->pdo->queryExec(
-				sprintf("UPDATE xxxinfo	SET title = %s, tagline = %s, plot = COMPRESS(%s), genre = %s, director = %s,
-					actors = %s, extras = %s, productinfo = %s, trailers = %s, directurl = %s,
-					classused = %s, cover = %d, backdrop = %d, updateddate = NOW()
-					WHERE id = %d",
-					$this->pdo->escapeString($title),
-					$this->pdo->escapeString($tagLine),
-					$this->pdo->escapeString($plot),
-					$this->pdo->escapeString(substr($genre, 0, 64)),
-					$this->pdo->escapeString($director),
-					$this->pdo->escapeString($actors),
-					$this->pdo->escapeString($extras),
-					$this->pdo->escapeString($productInfo),
-					$this->pdo->escapeString($trailers),
-					$this->pdo->escapeString($directUrl),
-					$this->pdo->escapeString($classUsed),
-					(empty($cover) ? 0 : $cover),
-					(empty($backdrop) ? 0 : $backdrop),
-					$id
-				)
-			);
-		}
-	}
-
-	/**
-	 * Fetch xxx info for the movie.
-	 *
-	 * @param $xxxmovie
-	 *
-	 * @return bool
-	 */
-	public function updateXXXInfo($xxxmovie)
-	{
-
-		$res = false;
-		$this->whichclass = '';
-
-		$iafd = new \IAFD();
-		$iafd->searchTerm = $xxxmovie;
-
-		if ($iafd->findme() !== false) {
-
-			switch($iafd->classUsed) {
-				case "ade":
-					$mov = new \ADE();
-					$mov->directLink = (string)$iafd->directUrl;
-					$res = $mov->getDirect();
-					$res['title'] = $iafd->title;
-					$res['directurl'] = (string)$iafd->directUrl;
-					$this->whichclass = $iafd->classUsed;
-					$this->pdo->log->doEcho($this->pdo->log->primary("Fetching XXX info from IAFD -> Adult DVD Empire"));
-					break;
-			}
-		}
-
-		if ($res === false) {
-
-			$this->whichclass = "aebn";
-			$mov = new \AEBN();
-			$mov->cookie = $this->cookie;
-			$mov->searchTerm = $xxxmovie;
-			$res = $mov->search();
-
-			if ($res === false) {
-				$this->whichclass = "ade";
-				$mov = new \ADE();
-				$mov->searchTerm = $xxxmovie;
-				$res = $mov->search();
-			}
-
-			if ($res === false) {
-				$this->whichclass = "pop";
-				$mov = new \Popporn();
-				$mov->cookie = $this->cookie;
-				$mov->searchTerm = $xxxmovie;
-				$res = $mov->search();
-			}
-
-			// Last in list as it doesn't have trailers
-			if ($res === false) {
-				$this->whichclass = "adm";
-				$mov = new \ADM();
-				$mov->cookie = $this->cookie;
-				$mov->searchTerm = $xxxmovie;
-				$res = $mov->search();
-			}
-
-
-			// If a result is true getAll information.
-			if ($res !== false) {
-				if ($this->echooutput) {
-
-					switch ($this->whichclass) {
-						case "aebn":
-							$fromstr = "Adult Entertainment Broadcast Network";
-							break;
-						case "ade":
-							$fromstr = "Adult DVD Empire";
-							break;
-						case "pop":
-							$fromstr = "PopPorn";
-							break;
-						case "adm":
-							$fromstr = "Adult DVD Marketplace";
-							break;
-						default:
-							$fromstr = null;
-					}
-					$this->pdo->log->doEcho($this->pdo->log->primary("Fetching XXX info from: " . $fromstr));
-				}
-				$res = $mov->getAll();
-			} else {
-				// Nothing was found, go ahead and set to -2
-				return -2;
-			}
-		}
-
-		$mov = array();
-
-		$mov['trailers'] = (isset($res['trailers'])) ? serialize($res['trailers']) : '';
-		$mov['extras'] = (isset($res['extras'])) ? serialize($res['extras']) : '';
-		$mov['productinfo'] = (isset($res['productinfo'])) ? serialize($res['productinfo']) : '';
-		$mov['backdrop'] = (isset($res['backcover'])) ? $res['backcover'] : 0;
-		$mov['cover'] = (isset($res['boxcover'])) ? $res['boxcover'] : 0;
-		$res['cast'] = (isset($res['cast'])) ? join(",", $res['cast']) : '';
-		$res['genres'] = (isset($res['genres'])) ? $this->getgenreid($res['genres']) : '';
-		$mov['title'] = html_entity_decode($res['title'], ENT_QUOTES, 'UTF-8');
-		$mov['plot'] = (isset($res['sypnosis'])) ? html_entity_decode($res['sypnosis'], ENT_QUOTES, 'UTF-8') : '';
-		$mov['tagline'] = (isset($res['tagline'])) ? html_entity_decode($res['tagline'], ENT_QUOTES, 'UTF-8') : '';
-		$mov['genre'] = html_entity_decode($res['genres'], ENT_QUOTES, 'UTF-8');
-		$mov['director'] = (isset($res['director'])) ? html_entity_decode($res['director'], ENT_QUOTES, 'UTF-8') : '';
-		$mov['actors'] = html_entity_decode($res['cast'], ENT_QUOTES, 'UTF-8');
-		$mov['directurl'] = html_entity_decode($res['directurl'], ENT_QUOTES, 'UTF-8');
-		$mov['classused'] = $this->whichclass;
-
-		$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM xxxinfo WHERE title = %s',	$this->pdo->escapeString($mov['title'])));
-		$xxxID = 0;
-		if(isset($check['id'])){
-			$xxxID = $check['id'];
-		}
-
-		if($check === false || $xxxID > 0){
-
-			// Update Current XXX Information - getXXXCovers.php
-			if($xxxID > 0){
-				$this->update($check['id'], $mov['title'], $mov['tagline'], $mov['plot'], $mov['genre'], $mov['director'], $mov['actors'], $mov['extras'], $mov['productinfo'], $mov['trailers'], $mov['directurl'], $mov['classused']);
-				$xxxID = $check['id'];
-			}
-
-			// Insert New XXX Information
-			if($check === false){
-				$xxxID = $this->pdo->queryInsert(
-					sprintf("
-					INSERT INTO xxxinfo
-						(title, tagline, plot, genre, director, actors, extras, productinfo, trailers, directurl, classused, cover, backdrop, createddate, updateddate)
-					VALUES
-						(%s, %s, COMPRESS(%s), %s, %s, %s, %s, %s, %s, %s, %s, 0, 0, NOW(), NOW())",
-						$this->pdo->escapeString($mov['title']),
-						$this->pdo->escapeString($mov['tagline']),
-						$this->pdo->escapeString($mov['plot']),
-						$this->pdo->escapeString(substr($mov['genre'], 0, 64)),
-						$this->pdo->escapeString($mov['director']),
-						$this->pdo->escapeString($mov['actors']),
-						$this->pdo->escapeString($mov['extras']),
-						$this->pdo->escapeString($mov['productinfo']),
-						$this->pdo->escapeString($mov['trailers']),
-						$this->pdo->escapeString($mov['directurl']),
-						$this->pdo->escapeString($mov['classused'])
-					)
-				);
-			}
-
-			if ($xxxID > 0) {
-
-				// BoxCover.
-				if (isset($mov['cover'])) {
-					$mov['cover'] = $this->releaseImage->saveImage($xxxID . '-cover', $mov['cover'], $this->imgSavePath);
-				}
-
-				// BackCover.
-				if (isset($mov['backdrop'])) {
-					$mov['backdrop'] = $this->releaseImage->saveImage($xxxID . '-backdrop', $mov['backdrop'], $this->imgSavePath, 1920, 1024);
-				}
-
-				$this->pdo->queryExec(sprintf('UPDATE xxxinfo SET cover = %d, backdrop = %d  WHERE id = %d', $mov['cover'], $mov['backdrop'], $xxxID));
-
-			} else {
-				$xxxID = -2;
-			}
-
-		}
-
-		if ($this->echooutput) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->headerOver(($xxxID !== false ? 'Added/updated XXX movie: ' : 'Nothing to update for XXX movie: ')) .
-				$this->pdo->log->primary($mov['title'])
-			);
-		}
-
-		return $xxxID;
-	}
-
-	/**
-	 * Process XXX releases where xxxinfo is 0
-	 *
-	 */
-	public function processXXXReleases()
-	{
-		$res = $this->pdo->query(sprintf("
-				SELECT r.searchname, r.id
-				FROM releases r
-				WHERE r.nzbstatus = 1
-				AND r.xxxinfo_id = 0
-				AND r.categoryid IN (6010, 6020, 6030, 6040, 6041, 6042, 6080, 6090)
-				LIMIT %d",
-				$this->movieqty
-			)
-		);
-		$movieCount = count($res);
-
-		if ($movieCount > 0) {
-
-			if ($this->echooutput) {
-				$this->pdo->log->doEcho($this->pdo->log->header("Processing " . $movieCount . " XXX releases."));
-			}
-
-			// Loop over releases.
-			foreach ($res as $arr) {
-
-				$idcheck = -2;
-
-				// Try to get a name.
-				if ($this->parseXXXSearchName($arr['searchname']) !== false) {
-					$check = $this->checkXXXInfoExists($this->currentTitle);
-					if ($check === false) {
-						$this->currentRelID = $arr['id'];
-						$movieName = $this->currentTitle;
-						if ($this->debug && $this->echooutput) {
-							$this->pdo->log->doEcho("DB name: " . $arr['searchname'], true);
-						}
-						if ($this->echooutput) {
-							$this->pdo->log->doEcho($this->pdo->log->primaryOver("Looking up: ") . $this->pdo->log->headerOver($movieName), true);
-						}
-
-						$idcheck = $this->updateXXXInfo($movieName);
-					} else {
-						$idcheck = (int)$check['id'];
-					}
-				} else {
-					$this->pdo->log->doEcho(".", true);
-				}
-				$this->pdo->queryExec(sprintf('UPDATE releases SET xxxinfo_id = %d WHERE id = %d', $idcheck, $arr['id']));
-			}
-		} elseif ($this->echooutput) {
-			$this->pdo->log->doEcho($this->pdo->log->header('No xxx releases to process.'));
-		}
-	}
-
-	/**
-	 * Checks xxxinfo to make sure releases exist
-	 *
-	 * @param $releaseName
-	 *
-	 * @return array|bool
-	 */
-	protected function checkXXXInfoExists($releaseName)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT id, title FROM xxxinfo WHERE title LIKE %s", "'". $releaseName . "%'"));
-	}
-
-	/**
-	 * Cleans up a searchname to make it easier to scrape.
-	 *
-	 * @param string $releaseName
-	 *
-	 * @return bool
-	 */
-	protected function parseXXXSearchName($releaseName)
-	{
-		$name = '';
-		$followingList = '[^\w]((2160|1080|480|720)(p|i)|AC3D|Directors([^\w]CUT)?|DD5\.1|(DVD|BD|BR)(Rip)?|BluRay|divx|HDTV|iNTERNAL|LiMiTED|(Real\.)?Proper|RE(pack|Rip)|Sub\.?(fix|pack)|Unrated|WEB-DL|(x|H)[-._ ]?264|xvid|[Dd][Ii][Ss][Cc](\d+|\s*\d+|\.\d+)|XXX|BTS|DirFix|Trailer|WEBRiP|NFO|(19|20)\d\d)[^\w]';
-
-		if (preg_match('/([^\w]{2,})?(?P<name>[\w .-]+?)' . $followingList . '/i', $releaseName, $matches)) {
-			$name = $matches['name'];
-		}
-
-		// Check if we got something.
-		if ($name !== '') {
-
-			// If we still have any of the words in $followingList, remove them.
-			$name = preg_replace('/' . $followingList . '/i', ' ', $name);
-			// Remove periods, underscored, anything between parenthesis.
-			$name = preg_replace('/\(.*?\)|[-._]/i', ' ', $name);
-			// Finally remove multiple spaces and trim leading spaces.
-			$name = trim(preg_replace('/\s{2,}/', ' ', $name));
-			// Remove Private Movies {d} from name better matching.
-			$name = trim(preg_replace('/^Private\s(Specials|Blockbusters|Blockbuster|Sports|Gold|Lesbian|Movies|Classics|Castings|Fetish|Stars|Pictures|XXX|Private|Black\sLabel|Black)\s\d+/i', '', $name));
-			// Remove Foreign Words at the end of the name.
-			$name = trim(preg_replace('/(brazilian|chinese|croatian|danish|deutsch|dutch|estonian|flemish|finnish|french|german|greek|hebrew|icelandic|italian|latin|nordic|norwegian|polish|portuguese|japenese|japanese|russian|serbian|slovenian|spanish|spanisch|swedish|thai|turkish)$/i', '', $name));
-
-			// Check if the name is long enough and not just numbers and not file (d) of (d) and does not contain Episodes and any dated 00.00.00 which are site rips..
-			if (strlen($name) > 5 && !preg_match('/^\d+$/', $name) && !preg_match('/( File \d+ of \d+|\d+.\d+.\d+)/',$name) && !preg_match('/(E\d+)/',$name) && !preg_match('/\d\d\.\d\d.\d\d/', $name)) {
-				$this->currentTitle = $name;
-				return true;
-			} else {
-				$this->pdo->log->doEcho(".", false);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get all genres for search-filter.tpl
-	 *
-	 * @param bool $activeOnly
-	 *
-	 * @return array|null
-	 */
-	public function getAllGenres($activeOnly = false) {
-		$res = $ret = null;
-
-		if ($activeOnly) {
-			$res = $this->pdo->query("SELECT title FROM genres WHERE disabled = 0 AND type = 6000 ORDER BY title");
-		} else {
-			$res = $this->pdo->query("SELECT title FROM genres WHERE disabled = 1 AND type = 6000 ORDER BY title");
-		}
-
-		foreach ($res as $arr => $value) {
-			$ret[] = $value['title'];
-		}
-		return $ret;
-	}
-
-	/**
-	 * Get Genres for activeonly and/or an id
-	 *
-	 * @param bool $activeOnly
-	 * @param null $gid
-	 *
-	 * @return array|bool
-	 */
-	public function getGenres($activeOnly = false, $gid = null)
-	{
-		if (isset($gid)) {
-			$gid = " AND id = ". $this->pdo->escapeString($gid) . " ORDER BY title";
-		} else {
-			$gid = " ORDER BY title";
-		}
-
-		if ($activeOnly) {
-			return $this->pdo->queryOneRow("SELECT title FROM genres WHERE disabled = 0 AND type = 6000" . $gid);
-		} else {
-			return $this->pdo->queryOneRow("SELECT title FROM genres WHERE disabled = 1 AND type = 6000" . $gid);
-		}
-	}
-
-	/**
-	 * Get Genre id's Of the title
-	 *
-	 * @param $arr - Array or String
-	 *
-	 * @return string - If array .. 1,2,3,4 if string .. 1
-	 */
-	private function getGenreID($arr)
-	{
-		$ret = null;
-
-		if (!is_array($arr)) {
-			$res = $this->pdo->queryOneRow("SELECT id FROM genres WHERE title = " . $this->pdo->escapeString($arr));
-			if ($res !== false) {
-				return $res["id"];
-			}
-		}
-
-		foreach ($arr as $key => $value) {
-			$res = $this->pdo->queryOneRow("SELECT id FROM genres WHERE title = " . $this->pdo->escapeString($value));
-			if ($res !== false) {
-				$ret .= "," . $res["id"];
-			} else {
-				$ret .= "," . $this->insertGenre($value);
-			}
-		}
-
-		$ret = ltrim($ret,",");
-		return ($ret);
-	}
-
-	/**
-	 * Inserts Genre and returns last affected row (Genre id)
-	 *
-	 * @param $genre
-	 *
-	 * @return bool
-	 */
-	private function insertGenre($genre)
-	{
-		$res = '';
-		if (isset($genre)) {
-			$res = $this->pdo->queryInsert(sprintf("INSERT INTO genres (title, type, disabled) VALUES (%s ,%d ,%d)",$this->pdo->escapeString($genre), 6000, 0));
-		}
-		return $res;
-	}
-
-	/**
-	 * Inserts Trailer Code by Class
-	 *
-	 * @param $whichclass
-	 * @param $res
-	 *
-	 * @return string
-	 */
-	public function insertSwf($whichclass, $res)
-	{
-		$ret = '';
-		if ($whichclass === "ade") {
-			if (!empty($res)) {
-				$trailers = unserialize($res);
-				$ret .="<object width='360' height='240' type='application/x-shockwave-flash' id='EmpireFlashPlayer' name='EmpireFlashPlayer' data='".	$trailers['url'] . "'>";
-				$ret .= "<param name='flashvars' value= 'streamID=" . $trailers['streamid'] . "&amp;autoPlay=false&amp;BaseStreamingUrl=" . $trailers['baseurl'] . "'>";
-				$ret .= "</object>";
-
-				return ($ret);
-			}
-		}
-		if ($whichclass === "pop") {
-			if (!empty($res)) {
-				$trailers = unserialize($res);
-				$ret .= "<embed id='trailer' width='480' height='360'";
-				$ret .= "flashvars='" .	$trailers['flashvars'] . "' allowfullscreen='true' allowscriptaccess='always' quality='high' name='trailer' style='undefined'";
-				$ret .= "src='" . $trailers['baseurl'] . "' type='application/x-shockwave-flash'>";
-
-				return ($ret);
-			}
-		}
-
-		return $ret;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/adminpage.php b/lib/copy_this/www/lib/adminpage.php
deleted file mode 100644
index 21af64cf0..000000000
--- a/lib/copy_this/www/lib/adminpage.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once("config.php");
-require_once(WWW_DIR."/lib/framework/basepage.php");
-require_once(WWW_DIR."/lib/users.php");
-
-/**
- * All admin pages implement this class. Enforces admin role for requesting user.
- */
-class AdminPage extends BasePage
-{
-	/**
-	 * Default constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$tplpaths = [];
-		if ($this->site->style != "default")
-			$tplpaths["style_admin"] = WWW_DIR.'templates/'.$this->site->style.'/views/admin';
-		$tplpaths["admin"] = WWW_DIR.'templates/default/views/admin';
-		$tplpaths["frontend"] = WWW_DIR.'templates/default/views/frontend';
-		$this->smarty->setTemplateDir($tplpaths);
-
-		$users = new Users();
-		if (!$users->isLoggedIn() || !isset($this->userdata["role"]) || $this->userdata["role"] != Users::ROLE_ADMIN)
-			$this->show403(true);
-
-	}
-
-	/**
-	 * Output a page using the admin template.
-	 */
-	public function render()
-	{
-		$this->smarty->assign('page',$this);
-
-		$admin_menu = $this->smarty->fetch('adminmenu.tpl');
-		$this->smarty->assign('admin_menu',$admin_menu);
-
-		$this->page_template = "baseadminpage.tpl";
-
-		parent::render();
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/amazon.php b/lib/copy_this/www/lib/amazon.php
deleted file mode 100644
index f5c10616c..000000000
--- a/lib/copy_this/www/lib/amazon.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-
-/*
-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.
-
-http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/BasicAuthProcess.html
-
-*/
-
-/**
- * Class to access Amazons Product Advertising API
- * @author Sameer Borate
- * @link http://www.codediesel.com
- * @version 1.0
- * All requests are not implemented here. You can easily
- * implement the others from the ones given below.
- */
-class AmazonProductAPI
-{
-	/**
-	 * Your Amazon Access Key Id
-	 * @access private
-	 * @var string
-	 */
-	private $public_key     = "";
-
-	/**
-	 * Your Amazon Secret Access Key
-	 * @access private
-	 * @var string
-	 */
-	private $private_key    = "";
-
-	/**
-	 * Your Amazon Secret Access Key
-	 * @access private
-	 * @var string
-	 */
-	private $associate_tag    = "";
-
-	/**
-	 * Constants for product types
-	 * @access public
-	 * @var string
-	 */
-
-	/*
-		Only three categories are listed here.
-		More categories can be found here:
-		http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/APPNDX_SearchIndexValues.html
-	*/
-	const BOOKS      = "Books";
-	const DIGITALMUS = "DigitalMusic";
-	const DVD        = "DVD";
-	// This can be DigitalDownloads as well.
-	const GAMES       = "VideoGames";
-	const MP3         = "MP3Downloads";
-	const MUSICTRACKS = "MusicTracks";
-	const MUSIC       = "Music";
-
-
-	public function __construct($pubk, $privk, $asstag = "")
-	{
-		$this->public_key = (string) $pubk;
-		$this->private_key = (string) $privk;
-		$this->associate_tag = (string) $asstag;
-	}
-
-	/**
-	 * Check if the xml received from Amazon is valid
-	 *
-	 * @param mixed $response xml response to check
-	 *
-	 * @return bool false if the xml is invalid
-	 * @throws Exception
-	 */
-	private function verifyXmlResponse($response)
-	{
-		if ($response === False)
-		{
-			throw new Exception("Could not connect to Amazon");
-		}
-		else
-		{
-			if (isset($response->Items->Item->ItemAttributes->Title))
-			{
-				return ($response);
-			}
-			else
-			{
-				throw new Exception("Invalid xml response.");
-			}
-		}
-	}
-
-
-	/**
-	 * Query Amazon with the issued parameters
-	 *
-	 * @param array $parameters parameters to query around
-	 * @return simpleXmlObject xml query response
-	 */
-	private function queryAmazon($parameters)
-	{
-		return aws_signed_request("com", $parameters, $this->public_key, $this->private_key, $this->associate_tag);
-	}
-
-
-	/**
-	 * Return details of products searched by various types
-	 *
-	 * @param string $search search term
-	 * @param string $category search category
-	 * @param string $searchType type of search
-	 * @return mixed simpleXML object
-	 */
-	public function searchProducts($search, $category, $searchType = "UPC", $searchNode="")
-	{
-		$allowedTypes = array("UPC", "TITLE", "ARTIST", "KEYWORD", "NODE");
-		$allowedCategories = array("Music", "DVD", "VideoGames", "MP3Downloads");
-
-		switch($searchType)
-		{
-			case "UPC" :    $parameters = array("Operation"     => "ItemLookup",
-												"ItemId"        => $search,
-												"SearchIndex"   => $category,
-												"IdType"        => "UPC",
-												"ResponseGroup" => "Medium");
-							break;
-
-			case "TITLE" :  $parameters = array("Operation"     => "ItemSearch",
-												//"Title"      	=> $search,
-												"Keywords"     	=> $search,
-												"SearchIndex"   => $category,
-												"ResponseGroup" => "Large");
-							break;
-
-			//same as TITLE but add BrowseNodeID param
-			case "NODE" :  $parameters = array("Operation"     	=> "ItemSearch",
-												//"Title"      	=> $search,
-												"Keywords"     	=> $search,
-												"SearchIndex"   => $category,
-												"BrowseNode"	=> $searchNode,
-												"ResponseGroup" => "Large");
-							break;
-
-		}
-
-		$xml_response = $this->queryAmazon($parameters);
-
-		return $this->verifyXmlResponse($xml_response);
-
-	}
-
-
-	/**
-	 * Return details of a product searched by UPC
-	 *
-	 * @param int $upc_code UPC code of the product to search
-	 * @param string $product_type type of the product
-	 * @return mixed simpleXML object
-	 */
-	public function getItemByUpc($upc_code, $product_type)
-	{
-		$parameters = array("Operation"     => "ItemLookup",
-							"ItemId"        => $upc_code,
-							"SearchIndex"   => $product_type,
-							"IdType"        => "UPC",
-							"ResponseGroup" => "Medium");
-
-		$xml_response = $this->queryAmazon($parameters);
-
-		return $this->verifyXmlResponse($xml_response);
-
-	}
-
-
-	/**
-	 * Return details of a product searched by ASIN
-	 *
-	 * @param int $asin_code ASIN code of the product to search
-	 * @return mixed simpleXML object
-	 */
-	public function getItemByAsin($asin_code)
-	{
-		$parameters = array("Operation"     => "ItemLookup",
-							"ItemId"        => $asin_code,
-							"ResponseGroup" => "Medium");
-
-		$xml_response = $this->queryAmazon($parameters);
-
-		return $this->verifyXmlResponse($xml_response);
-	}
-
-
-	/**
-	 * Return details of a product searched by keyword
-	 *
-	 * @param string $keyword keyword to search
-	 * @param string $product_type type of the product
-	 * @return mixed simpleXML object
-	 */
-	public function getItemByKeyword($keyword, $product_type)
-	{
-		$parameters = array("Operation"   => "ItemSearch",
-							"Keywords"    => $keyword,
-							"SearchIndex" => $product_type);
-
-		$xml_response = $this->queryAmazon($parameters);
-
-		return $this->verifyXmlResponse($xml_response);
-	}
-
-}
-
-
-function  aws_signed_request($region, $params, $public_key, $private_key, $associate_tag = "")
-{
-
-	$method = "GET";
-	$host = "ecs.amazonaws.".$region; // must be in small case
-	$uri = "/onca/xml";
-
-
-	$params["Service"]          = "AWSECommerceService";
-	$params["AWSAccessKeyId"]   = $public_key;
-	if ($associate_tag != "")
-		$params["AssociateTag"] = $associate_tag;
-
-	$params["Timestamp"]        = gmdate("Y-m-d\TH:i:s\Z");
-	$params["Version"]          = "2009-03-31";
-
-	/* The params need to be sorted by the key, as Amazon does this at
-	  their end and then generates the hash of the same. If the params
-	  are not in order then the generated hash will be different thus
-	  failing the authetication process.
-	*/
-	ksort($params);
-
-	$canonicalized_query = array();
-
-	foreach ($params as $param=>$value)
-	{
-		$param = str_replace("%7E", "~", rawurlencode($param));
-		$value = str_replace("%7E", "~", rawurlencode($value));
-		$canonicalized_query[] = $param."=".$value;
-	}
-
-	$canonicalized_query = implode("&", $canonicalized_query);
-
-	$string_to_sign = $method."\n".$host."\n".$uri."\n".$canonicalized_query;
-
-	/* calculate the signature using HMAC with SHA256 and base64-encoding.
-	   The 'hash_hmac' function is only available from PHP 5 >= 5.1.2.
-	*/
-	$signature = base64_encode(hash_hmac("sha256", $string_to_sign, $private_key, True));
-
-	/* encode the signature for the request */
-	$signature = str_replace("%7E", "~", rawurlencode($signature));
-
-	/* create request */
-	$request = "http://".$host.$uri."?".$canonicalized_query."&Signature=".$signature;
-	//echo $request;die();
-
-	/* I prefer using CURL */
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL,$request);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-	curl_setopt($ch, CURLOPT_TIMEOUT, 15);
-	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-
-	$xml_response = curl_exec($ch);
-
-	/* If cURL doesn't work for you, then use the 'file_get_contents'
-	   function as given below.
-	*/
-	//$xml_response = file_get_contents($request);
-
-	if ($xml_response === False)
-	{
-		return False;
-	}
-	else
-	{
-		/* parse XML */
-		$parsed_xml = @simplexml_load_string($xml_response);
-		return ($parsed_xml === False) ? False : $parsed_xml;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/anidb.php b/lib/copy_this/www/lib/anidb.php
deleted file mode 100644
index 78bc00af4..000000000
--- a/lib/copy_this/www/lib/anidb.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-class AniDB
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-	}
-
-	/**
-	 * Updates stored AniDB entries in the database
-	 *
-	 * @param int $anidbID
-	 * @param string $type
-	 * @param string $startdate
-	 * @param string $enddate
-	 * @param string $related
-	 * @param string $similar
-	 * @param string $creators
-	 * @param string $description
-	 * @param string $rating
-	 * @param string $categories
-	 * @param string $characters
-	 */
-	public function updateTitle($anidbID, $type, $startdate, $enddate, $related, $similar, $creators, $description, $rating, $categories, $characters)
-	{
-		// FIXME fix  the missing variables for this query
-		$this->pdo->queryExec(
-			sprintf('
-						UPDATE anidb_titles AS at INNER JOIN anidb_info ai USING (anidbid) SET title = %s, type = %s, startdate = %s, enddate = %s,
-							related = %s, similar = %s, creators = %s, description = %s, rating = %s,
-							categories = %s, characters = %s, epnos = %s, airdates = %s,
-							episodetitles = %s, unixtime = %d WHERE anidbid = %d',
-				$this->pdo->escapeString($title),
-				$this->pdo->escapeString($type),
-				$this->pdo->escapeString($startdate),
-				$this->pdo->escapeString($enddate),
-				$this->pdo->escapeString($related),
-				$this->pdo->escapeString($similar),
-				$this->pdo->escapeString($creators),
-				$this->pdo->escapeString($description),
-				$this->pdo->escapeString($rating),
-				$this->pdo->escapeString($categories),
-				$this->pdo->escapeString($characters),
-				$this->pdo->escapeString($epnos),
-				$this->pdo->escapeString($airdates),
-				$this->pdo->escapeString($episodetitles),
-				$anidbID,
-				time()
-			)
-		);
-	}
-
-	/**
-	 * Deletes stored AniDB entries in the database
-	 *
-	 * @param int $anidbID
-	 */
-	public function deleteTitle($anidbID)
-	{
-		$this->pdo->queryExec(
-			sprintf('
-						DELETE at, ai, ae
-						FROM anidb_titles AS at
-						LEFT OUTER JOIN anidb_info ai USING (anidbid)
-						LEFT OUTER JOIN anidb_episodes ae USING (anidbid)
-						WHERE anidbid = %d',
-				$anidbID
-			)
-		);
-	}
-
-	/**
-	 * Retrieves a list of Anime titles, optionally filtered by starting character and title
-	 *
-	 * @param string $letter
-	 * @param string $animetitle
-	 * @return array|bool
-	 */
-	public function getAnimeList($letter = '', $animetitle = '')
-	{
-		$regex = 'REGEXP';
-		$rsql = '';
-
-		if ($letter != '') {
-			if ($letter == '0-9') {
-				$letter = '[0-9]';
-			}
-			$rsql .= sprintf('AND at.title %s %s', $regex, $this->pdo->escapeString('^' . $letter));
-		}
-
-		$tsql = '';
-		if ($animetitle != '') {
-			$tsql .= sprintf('AND at.title %s', $this->pdo->likeString($animetitle, true, true));
-		}
-
-		return $this->pdo->queryDirect(
-			sprintf('SELECT at.anidbid, at.title, ai.type, ai.categories, ai.rating, ai.startdate, ai.enddate
-					FROM anidb_titles AS at LEFT JOIN anidb_info AS ai USING (anidbid)
-					WHERE at.anidbid > 0 %s %s
-					GROUP BY at.anidbid
-					ORDER BY at.title ASC',
-				$rsql,
-				$tsql
-			)
-		);
-	}
-
-	/**
-	 * Retrieves a range of Anime titles for site display
-	 *
-	 * @param int $start
-	 * @param int $num
-	 * @param string $animetitle
-	 * @return array|bool
-	 */
-	public function getAnimeRange($start, $num, $animetitle = '')
-	{
-		if ($start === false) {
-			$limit = '';
-		} else {
-			$limit = ' LIMIT ' . $num . ' OFFSET ' . $start;
-		}
-
-		$rsql = '';
-		if ($animetitle != '') {
-			$rsql = sprintf('AND at.title %s', $this->pdo->likeString($animetitle, true, true));
-		}
-
-		return $this->pdo->query(
-			sprintf('SELECT at.anidbid, at.title, ai.description
-					FROM anidb_titles AS at LEFT JOIN anidb_info AS ai USING (anidbid)
-					WHERE 1=1 %s
-					ORDER BY at.anidbid ASC %s',
-				$rsql,
-				$limit
-			)
-		);
-	}
-
-	/**
-	 * Retrives the count of Anime titles for pager functions optionally filtered by title
-	 *
-	 * @param string $animetitle
-	 * @return int
-	 */
-	public function getAnimeCount($animetitle = '')
-	{
-		$rsql = '';
-		if ($animetitle != '') {
-			$rsql .= sprintf('AND at.title %s', $this->pdo->likeString($animetitle, true, true));
-		}
-
-		$res = $this->pdo->queryOneRow(
-			sprintf('SELECT COUNT(at.anidbid) AS num
-				FROM anidb_titles AS at LEFT JOIN anidb_info AS ai USING (anidbid)
-				WHERE 1=1 %s',
-				$rsql
-			)
-		);
-
-		return $res['num'];
-	}
-
-	/**
-	 * Retrieves all info for a specific AniDB id
-	 *
-	 * @param int $anidbID
-	 * @return
-	 */
-	public function getAnimeInfo($anidbID)
-	{
-		$animeInfo = $this->pdo->query(
-			sprintf('SELECT at.anidbid, at.lang, at.title,
-				ai.startdate, ai.enddate, ai.updated, ai.related, ai.creators, ai.description,
-				ai.rating, ai.picture, ai.categories, ai.characters, ai.type
-				FROM anidb_titles AS at LEFT JOIN anidb_info ai USING (anidbid)
-				WHERE at.anidbid = %d',
-				$anidbID
-			)
-		);
-		return isset($animeInfo[0]) ? $animeInfo[0] : false;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/backfill.php b/lib/copy_this/www/lib/backfill.php
deleted file mode 100644
index b7653680e..000000000
--- a/lib/copy_this/www/lib/backfill.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/groups.php");
-require_once(WWW_DIR."/lib/nntp.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/binaries.php");
-require_once(WWW_DIR."/lib/ColorCLI.php");
-require_once(WWW_DIR."/lib/Logger.php");
-
-class Backfill
-{
-	/**
-	 * Instance of class Settings
-	 *
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var Binaries
-	 */
-	protected $_binaries;
-
-	/**
-	 * Instance of class ColorCLI.
-	 *
-	 * @var ColorCLI
-	 */
-	protected $_colorCLI;
-
-	/**
-	 * Instance of class debugging.
-	 *
-	 * @var Logger
-	 */
-	protected $_debugging;
-
-	/**
-	 * @var Groups
-	 */
-	protected $_groups;
-
-	/**
-	 * @var NNTP
-	 */
-	protected $_nntp;
-	/**
-	 * Should we use compression for headers?
-	 *
-	 * @var bool
-	 */
-	protected $_compressedHeaders;
-
-	/**
-	 * Log and or echo debug.
-	 * @var bool
-	 */
-	protected $_debug = false;
-
-	/**
-	 * Echo to cli?
-	 * @var bool
-	 */
-	protected $_echoCLI;
-
-	/**
-	 * Should we use tpg?
-	 *
-	 * @var bool
-	 */
-	protected $_tablePerGroup;
-
-	/**
-	 * How far back should we go on safe back fill?
-	 *
-	 * @var string
-	 */
-	protected $_safeBackFillDate;
-
-	/**
-	 * @var string
-	 */
-	protected $_safePartRepair;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param array $options Class instances / Echo to cli?
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'      => true,
-			'Logger'    => null,
-			'Groups'    => null,
-			'NNTP'      => null,
-			'Settings'  => null
-		];
-		$options += $defaults;
-
-		$this->_echoCLI = ($options['Echo'] && NN_ECHOCLI);
-
-		$this->pdo = ($options['Settings'] instanceof \DB ? $options['Settings'] : new \DB());
-		$this->_groups = ($options['Groups'] instanceof \Groups ? $options['Groups'] : new \Groups(['Settings' => $this->pdo]));
-		$this->_nntp = ($options['NNTP'] instanceof \NNTP
-			? $options['NNTP'] : new \NNTP(['Settings' => $this->pdo])
-		);
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->_debug = (NN_LOGGING || NN_DEBUG);
-		if ($this->_debug) {
-			try {
-				$this->_debugging = ($options['Logger'] instanceof \Logger ? $options['Logger'] : new \Logger(['ColorCLI' => $this->pdo->log]));
-			} catch (\LoggerException $error) {
-				$this->_debug = false;
-			}
-		}
-
-		$this->_compressedHeaders = ($this->site->compressedheaders == 1 ? true : false);
-		$this->_safeBackFillDate = ($this->site->safebackfilldate != '') ? (string)$this->site->safebackfilldate : '2008-08-14';
-		$this->_safePartRepair = ($this->site->safepartrepair == 1 ? 'update' : 'backfill');
-		$this->_tablePerGroup = ($this->site->tablepergroup == 1 ? true : false);
-	}
-
-	/**
-	 * Backfill all the groups up to user specified time/date.
-	 *
-	 * @param string $groupName
-	 * @param string|int $articles
-	 * @param string $type
-	 *
-	 * @return void
-	 */
-	public function backfillAllGroups($groupName = '', $articles ='', $type = '')
-	{
-		$res = [];
-		if ($groupName !== '') {
-			$grp = $this->_groups->getByName($groupName);
-			if ($grp) {
-				$res = [$grp];
-			}
-		} else {
-			if ($type === 'normal' || $type === '') {
-				$res = $this->_groups->getActiveBackfill();
-			} else if ($type === 'date') {
-				$res = $this->_groups->getActiveByDateBackfill();
-			}
-		}
-
-		$groupCount = count($res);
-		if ($groupCount > 0) {
-			$counter = 1;
-			$allTime = microtime(true);
-			$dMessage = (
-				'Backfilling: ' .
-				$groupCount .
-				' group(s) - Using compression? ' .
-				($this->_compressedHeaders ? 'Yes' : 'No')
-			);
-			if ($this->_debug) {
-				$this->_debugging->log('Backfill', "backfillAllGroups", $dMessage, \Logger::LOG_INFO);
-			}
-
-			if ($this->_echoCLI) {
-				$this->pdo->log->doEcho($this->pdo->log->header($dMessage), true);
-			}
-
-			$this->_binaries = new \Binaries(
-				['NNTP' => $this->_nntp, 'Echo' => $this->_echoCLI, 'Settings' => $this->pdo, 'Groups' => $this->_groups]
-			);
-
-			if ($articles !== '' && !is_numeric($articles)) {
-				$articles = 20000;
-			}
-
-			// Loop through groups.
-			foreach ($res as $groupArr) {
-				if ($groupName === '') {
-					$dMessage = "Starting group " . $counter . ' of ' . $groupCount;
-					if ($this->_debug) {
-						$this->_debugging->log('Backfill', "backfillAllGroups", $dMessage, \Logger::LOG_INFO);
-					}
-
-					if ($this->_echoCLI) {
-						$this->pdo->log->doEcho($this->pdo->log->header($dMessage), true);
-					}
-				}
-				$this->backfillGroup($groupArr, $groupCount - $counter, $articles);
-				$counter++;
-			}
-
-			$dMessage = 'Backfilling completed in ' . number_format(microtime(true) - $allTime, 2) . " seconds.";
-			if ($this->_debug) {
-				$this->_debugging->log('Backfill', "backfillAllGroups", $dMessage, \Logger::LOG_INFO);
-			}
-
-			if ($this->_echoCLI) {
-				$this->pdo->log->doEcho($this->pdo->log->primary($dMessage));
-			}
-		} else {
-			$dMessage = "No groups specified. Ensure groups are added to newznab's database for updating.";
-			if ($this->_debug) {
-				$this->_debugging->log('Backfill', "backfillAllGroups", $dMessage, \Logger::LOG_FATAL);
-			}
-
-			if ($this->_echoCLI) {
-				$this->pdo->log->doEcho($this->pdo->log->warning($dMessage), true);
-			}
-		}
-	}
-
-	/**
-	 * Backfill single group.
-	 *
-	 * @param array $groupArr
-	 * @param int $left
-	 * @param int|string $articles
-	 *
-	 * @return void
-	 */
-	public function backfillGroup($groupArr, $left, $articles = '')
-	{
-		// Start time for this group.
-		$startGroup = microtime(true);
-		$groupName = str_replace('alt.binaries', 'a.b', $groupArr['name']);
-
-		// If our local oldest article 0, it means we never ran update_binaries on the group.
-		if ($groupArr['first_record'] <= 0) {
-			$dMessage =
-				"You need to run update_binaries on " .
-				$groupName .
-				". Otherwise the group is dead, you must disable it.";
-			if ($this->_debug) {
-				$this->_debugging->log('Backfill', "backfillGroup", $dMessage, \Logger::LOG_ERROR);
-			}
-
-			if ($this->_echoCLI) {
-				$this->pdo->log->doEcho($this->pdo->log->error($dMessage));
-			}
-			return;
-		}
-
-		// Select group, here, only once
-		$data = $this->_nntp->selectGroup($groupArr['name']);
-		if ($this->_nntp->isError($data)) {
-			$data = $this->_nntp->dataError($this->_nntp, $groupArr['name']);
-			if ($this->_nntp->isError($data)) {
-				return;
-			}
-		}
-
-		if ($this->_echoCLI) {
-			$this->pdo->log->doEcho($this->pdo->log->primary('Processing ' . $groupName), true);
-		}
-
-		// Check if this is days or post backfill.
-		$postCheck = ($articles === '' ? false : true);
-
-		// Get target post based on date or user specified number.
-		$targetpost = (string)($postCheck
-			?
-			round($groupArr['first_record'] - $articles)
-			:
-			$this->_binaries->daytopost($groupArr['backfill_target'], $data)
-		);
-
-		// Check if target post is smaller than server's oldest, set it to oldest if so.
-		if ($targetpost < $data['first']) {
-			$targetpost = $data['first'];
-		}
-
-		// Check if our target post is newer than our oldest post or if our local oldest article is older than the servers oldest.
-		if ($targetpost >= $groupArr['first_record'] || $groupArr['first_record'] <= $data['first']) {
-			$dMessage =
-				"We have hit the maximum we can backfill for " .
-				$groupName .
-				", skipping it, consider disabling backfill on it.";
-			if ($this->_debug) {
-				$this->_debugging->log('Backfill', "backfillGroup", $dMessage, \Logger::LOG_NOTICE);
-			}
-
-			if ($this->_echoCLI) {
-				$this->pdo->log->doEcho($this->pdo->log->notice($dMessage), true);
-			}
-			return;
-		}
-
-		if ($this->_echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					'Group ' .
-					$groupName .
-					"'s oldest article is " .
-					number_format($data['first']) .
-					', newest is ' .
-					number_format($data['last']) .
-					".\nOur target article is " .
-					number_format($targetpost) .
-					'. Our oldest article is article ' .
-					number_format($groupArr['first_record']) .
-					'.'
-				)
-			);
-		}
-
-		// Set first and last, moving the window by max messages.
-		$last = (string)($groupArr['first_record'] - 1);
-		// Set the initial "chunk".
-		$first = (string)($last - $this->_binaries->messageBuffer + 1);
-
-		// Just in case this is the last chunk we needed.
-		if ($targetpost > $first) {
-			$first = $targetpost;
-		}
-
-		$done = false;
-		while ($done === false) {
-
-			if ($this->_echoCLI) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->set256('Yellow') .
-					"\nGetting " .
-					(number_format($last - $first + 1)) .
-					" articles from " .
-					$groupName .
-					", " .
-					$left .
-					" group(s) left. (" .
-					(number_format($first - $targetpost)) .
-					" articles in queue)." .
-					$this->pdo->log->rsetColor(), true
-				);
-			}
-
-			flush();
-			$lastMsg = $this->_binaries->scan($groupArr, $first, $last, $this->_safePartRepair);
-
-			// Get the oldest date.
-			if (isset($lastMsg['firstArticleDate'])) {
-				// Try to get it from the oldest pulled article.
-				$newdate = strtotime($lastMsg['firstArticleDate']);
-			} else {
-				// If above failed, try to get it with postdate method.
-				$newdate = $this->_binaries->postdate($first, $data);
-			}
-
-			$this->pdo->queryExec(
-				sprintf('
-					UPDATE groups
-					SET first_record_postdate = %s, first_record = %s, last_updated = NOW()
-					WHERE id = %d',
-					$this->pdo->from_unixtime($newdate),
-					$this->pdo->escapeString($first),
-					$groupArr['id'])
-			);
-			if ($first == $targetpost) {
-				$done = true;
-			} else {
-				// Keep going: set new last, new first, check for last chunk.
-				$last = (string)($first - 1);
-				$first = (string)($last - $this->_binaries->messageBuffer + 1);
-				if ($targetpost > $first) {
-					$first = $targetpost;
-				}
-			}
-		}
-
-		if ($this->_echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					PHP_EOL .
-					'Group ' .
-					$groupName .
-					' processed in ' .
-					number_format(microtime(true) - $startGroup, 2) .
-					" seconds."
-				), true
-			);
-		}
-	}
-
-	/**
-	 * Safe backfill using posts. Going back to a date specified by the user on the site settings.
-	 * This does 1 group for x amount of parts until it reaches the date.
-	 *
-	 * @param string $articles
-	 *
-	 * @return void
-	 */
-	public function safeBackfill($articles = '')
-	{
-		$groupname = $this->pdo->queryOneRow(
-			sprintf('
-				SELECT name FROM groups
-				WHERE first_record_postdate BETWEEN %s AND NOW()
-				AND backfill = 1
-				ORDER BY name ASC',
-				$this->pdo->escapeString($this->_safeBackFillDate)
-			)
-		);
-
-		if (!$groupname) {
-			$dMessage =
-				'No groups to backfill, they are all at the target date ' .
-				$this->_safeBackFillDate .
-				", or you have not enabled them to be backfilled in the groups page.\n";
-			if ($this->_debug) {
-				$this->_debugging->log('Backfill', "safeBackfill", $dMessage, \Logger::LOG_FATAL);
-			}
-			exit($dMessage);
-		} else {
-			$this->backfillAllGroups($groupname['name'], $articles);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/binaries.php b/lib/copy_this/www/lib/binaries.php
deleted file mode 100644
index 82e191e1e..000000000
--- a/lib/copy_this/www/lib/binaries.php
+++ /dev/null
@@ -1,1424 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/backfill.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/Logger.php");
-
-/**
- * This class manages the downloading of binaries and parts from usenet, and the
- * managing of data in the binaries and parts tables.
- *
-*/
-class Binaries
-{
-	const OPT_BLACKLIST = 1;
-	const OPT_WHITELIST = 2;
-
-	const BLACKLIST_DISABLED = 0;
-	const BLACKLIST_ENABLED = 1;
-
-	const BLACKLIST_FIELD_SUBJECT = 1;
-	const BLACKLIST_FIELD_FROM = 2;
-	const BLACKLIST_FIELD_MESSAGEID = 3;
-
-	/**
-	 * How many headers do we download per loop?
-	 *
-	 * @var int
-	 */
-	public $messageBuffer;
-
-	/**
-	 * @var ColorCLI
-	 */
-	protected $_colorCLI;
-
-	/**
-	 * @var Logger
-	 */
-	protected $_debugging;
-
-	/**
-	 * @var Groups
-	 */
-	protected $_groups;
-
-	/**
-	 * @var NNTP
-	 */
-	protected $_nntp;
-
-	/**
-	 * Should we use part repair?
-	 *
-	 * @var bool
-	 */
-	protected $_partRepair;
-
-	/**
-	 * @var DB
-	 */
-	protected $_pdo;
-
-	/**
-	 * How many days to go back on a new group?
-	 *
-	 * @var bool
-	 */
-	protected $_newGroupScanByDays;
-
-	/**
-	 * How many headers to download on new groups?
-	 *
-	 * @var int
-	 */
-	protected $_newGroupMessagesToScan;
-
-	/**
-	 * How many days to go back on new groups?
-	 *
-	 * @var int
-	 */
-	protected $_newGroupDaysToScan;
-
-	/**
-	 * How many headers to download per run of part repair?
-	 *
-	 * @var int
-	 */
-	protected $_partRepairLimit;
-
-	/**
-	 * Should we use table per group?
-	 *
-	 * @var bool
-	 */
-	protected $_tablePerGroup;
-
-	/**
-	 * Echo to cli?
-	 *
-	 * @var bool
-	 */
-	protected $_echoCLI;
-
-	/**
-	 * @var bool
-	 */
-	protected $_debug = false;
-
-	/**
-	 * Max tries to download headers.
-	 * @var int
-	 */
-	protected $_partRepairMaxTries;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param array $options Class instances / echo to CLI?
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'                => true,
-			'ColorCLI'            => null,
-			'Logger'              => null,
-			'Groups'              => null,
-			'NNTP'                => null,
-			'Settings'            => null,
-		];
-		$options += $defaults;
-
-		$this->_colorCLI = ($options['ColorCLI'] instanceof \ColorCLI ? $options['ColorCLI'] : new \ColorCLI());
-		$this->_echoCLI = ($options['Echo'] && NN_ECHOCLI);
-		$this->_pdo = ($options['Settings'] instanceof \DB ? $options['Settings'] : new \DB());
-		$this->_nntp = ($options['NNTP'] instanceof \NNTP ? $options['NNTP'] : new \NNTP(['Echo' => $this->_colorCLI, 'Settings' => $this->_pdo, 'ColorCLI' => $this->_colorCLI]));
-		$this->_groups = ($options['Groups'] instanceof \Groups ? $options['Groups'] : new \Groups(['Settings' => $this->_pdo]));
-
-		$this->_debug = (NN_DEBUG || NN_LOGGING);
-		if ($this->_debug) {
-			try {
-				$this->_debugging = new \Logger(['ColorCLI' => $this->_colorCLI]);
-			} catch (\LoggerException $error) {
-				$this->_debug = false;
-			}
-		}
-
-		$this->n = "\n";
-
-		$s = new Sites();
-		$site = $s->get();
-		$this->messageBuffer = ($site->maxmssgs != '') ? $site->maxmssgs : 20000;
-		$this->_compressedHeaders = ($site->compressedheaders == "1") ? true : false;
-		$this->MaxMsgsPerRun = (!empty($site->maxmsgsperrun)) ? $site->maxmsgsperrun : 200000;
-		$this->_newGroupScanByDays = ($site->newgroupscanmethod == "1") ? true : false;
-		$this->_newGroupMessagesToScan = (!empty($site->newgroupmsgstoscan)) ? $site->newgroupmsgstoscan : 50000;
-		$this->_newGroupDaysToScan = (!empty($site->newgroupdaystoscan)) ? $site->newgroupdaystoscan : 3;
-		$this->_tablePerGroup = ($site->tablepergroup == 1 ? true : false);
-		$this->_partRepair = ($site->partrepair == 0 ? false : true);
-		$this->_partRepairLimit = ($site->maxpartrepair != '') ? (int)$site->maxpartrepair : 15000;
-		$this->_partRepairMaxTries = ($site->partrepairmaxtries != '' ? (int)$site->partrepairmaxtries : 3);
-
-		$this->blackList = array(); //cache of our black/white list
-		$this->blackList_by_group = array();
-		$this->message = array();
-		$this->startUpdate = microtime(true);
-		$this->startLoop = microtime(true);
-		$this->startHeaders = microtime(true);
-
-		$this->onlyProcessRegexBinaries = false;
-	}
-
-	/**
-	 * Download new headers for all active groups.
-	 *
-	 * @param int $maxHeaders (Optional) How many headers to download max.
-	 *
-	 * @return void
-	 */
-	public function updateAllGroups($maxHeaders = 0)
-	{
-		$groups = $this->_groups->getActive();
-
-		$groupCount = count($groups);
-		if ($groupCount > 0) {
-			$counter = 1;
-			$allTime = microtime(true);
-
-			$this->log(
-				'Updating: ' . $groupCount . ' group(s) - Using compression? ' . ($this->_compressedHeaders ? 'Yes' : 'No'),
-				'updateAllGroups',
-				\Logger::LOG_INFO,
-				'header'
-			);
-
-			// Loop through groups.
-			foreach ($groups as $group) {
-				$this->log(
-					'Starting group ' . $counter . ' of ' . $groupCount,
-					'updateAllGroups',
-					\Logger::LOG_INFO,
-					'header'
-				);
-				$this->updateGroup($group, $maxHeaders);
-				$counter++;
-			}
-
-			$this->log(
-				'Updating completed in ' . number_format(microtime(true) - $allTime, 2) . ' seconds.',
-				'updateAllGroups',
-				\Logger::LOG_INFO,
-				'primary'
-			);
-		} else {
-			$this->log(
-				'No groups specified. Ensure groups are added to newznab\'s database for updating.',
-				'updateAllGroups',
-				\Logger::LOG_NOTICE,
-				'warning'
-			);
-		}
-	}
-
-	/**
-	 * Download new headers for a single group.
-	 *
-	 * @param array $groupMySQL Array of MySQL results for a single group.
-	 * @param int   $maxHeaders (Optional) How many headers to download max.
-	 *
-	 * @return void
-	 */
-	public function updateGroup($groupMySQL, $maxHeaders = 0)
-	{
-		$startGroup = microtime(true);
-
-		// Select the group on the NNTP server, gets the latest info on it.
-		$groupNNTP = $this->_nntp->selectGroup($groupMySQL['name']);
-		if ($this->_nntp->isError($groupNNTP)) {
-			$groupNNTP = $this->_nntp->dataError($this->_nntp, $groupMySQL['name']);
-			if ($this->_nntp->isError($groupNNTP)) {
-				return;
-			}
-		}
-
-		if ($this->_echoCLI) {
-			$this->_colorCLI->doEcho($this->_colorCLI->primary('Processing ' . $groupMySQL['name']), true);
-		}
-		if ($groupMySQL['regexmatchonly'] == 1)
-		{
-			$this->onlyProcessRegexBinaries = true;
-			if ($this->_echoCLI) {
-				$this->_colorCLI->doEcho($this->_colorCLI->primary('Note: Discarding parts that do not match a regex', true));
-			}
-		}
-		else
-		{
-			$this->onlyProcessRegexBinaries = false;
-		}
-
-		// Attempt to repair any missing parts before grabbing new ones.
-		if ($groupMySQL['last_record'] != 0) {
-			if ($this->_partRepair) {
-				if ($this->_echoCLI) {
-					$this->_colorCLI->doEcho($this->_colorCLI->primary('Part repair enabled. Checking for missing parts.'), true);
-				}
-				$this->partRepair($groupMySQL);
-			} else if ($this->_echoCLI) {
-				$this->_colorCLI->doEcho($this->_colorCLI->primary('Part repair disabled by user.'), true);
-			}
-		}
-
-		// Generate postdate for first record, for those that upgraded.
-		if (is_null($groupMySQL['first_record_postdate']) && $groupMySQL['first_record'] != 0) {
-
-			$groupMySQL['first_record_postdate'] = $this->postdate($groupMySQL['first_record'], $groupNNTP);
-
-			$this->_pdo->queryExec(
-				sprintf('
-					UPDATE groups
-					SET first_record_postdate = %s
-					WHERE id = %d',
-					$this->_pdo->from_unixtime($groupMySQL['first_record_postdate']),
-					$groupMySQL['id']
-				)
-			);
-		}
-
-		// Get first article we want aka the oldest.
-		if ($groupMySQL['last_record'] == 0) {
-			if ($this->_newGroupScanByDays) {
-				// For new newsgroups - determine here how far we want to go back using date.
-				$first = $this->daytopost($this->_newGroupDaysToScan, $groupNNTP);
-			} else if ($groupNNTP['first'] >= ($groupNNTP['last'] - ($this->_newGroupMessagesToScan + $this->messageBuffer))) {
-				// If what we want is lower than the groups first article, set the wanted first to the first.
-				$first = $groupNNTP['first'];
-			} else {
-				// Or else, use the newest article minus how much we should get for new groups.
-				$first = (string)($groupNNTP['last'] - ($this->_newGroupMessagesToScan + $this->messageBuffer));
-			}
-
-			// We will use this to subtract so we leave articles for the next time (in case the server doesn't have them yet)
-			$leaveOver = $this->messageBuffer;
-
-			// If this is not a new group, go from our newest to the servers newest.
-		} else {
-			// Set our oldest wanted to our newest local article.
-			$first = $groupMySQL['last_record'];
-
-			// This is how many articles we will grab. (the servers newest minus our newest).
-			$totalCount = (string)($groupNNTP['last'] - $first);
-
-			// Check if the server has more articles than our loop limit x 2.
-			if ($totalCount > ($this->messageBuffer * 2)) {
-				// Get the remainder of $totalCount / $this->message buffer
-				$leaveOver = round(($totalCount % $this->messageBuffer), 0, PHP_ROUND_HALF_DOWN) + $this->messageBuffer;
-			} else {
-				// Else get half of the available.
-				$leaveOver = round(($totalCount / 2), 0, PHP_ROUND_HALF_DOWN);
-			}
-		}
-
-		// The last article we want, aka the newest.
-		$last = $groupLast = (string)($groupNNTP['last'] - $leaveOver);
-
-		// If the newest we want is older than the oldest we want somehow.. set them equal.
-		if ($last < $first) {
-			$last = $groupLast = $first;
-		}
-
-		// This is how many articles we are going to get.
-		$total = (string)($groupLast - $first);
-		// This is how many articles are available (without $leaveOver).
-		$realTotal = (string)($groupNNTP['last'] - $first);
-
-		// Check if we should limit the amount of fetched new headers.
-		if ($maxHeaders > 0) {
-			if ($maxHeaders < ($groupLast - $first)) {
-				$groupLast = $last = (string)($maxHeaders + $first);
-			}
-			$total = (string)($groupLast - $first);
-		}
-
-		// If total is bigger than 0 it means we have new parts in the newsgroup.
-		if ($total > 0) {
-
-			if ($this->_echoCLI) {
-				$this->_colorCLI->doEcho(
-					$this->_colorCLI->primary(
-						($groupMySQL['last_record'] == 0
-							? 'New group ' . $groupNNTP['group'] . ' starting with ' .
-							($this->_newGroupScanByDays
-								? $this->_newGroupDaysToScan . ' days'
-								: number_format($this->_newGroupMessagesToScan) . ' messages'
-							) . ' worth.'
-							: 'Group ' . $groupNNTP['group'] . ' has ' . number_format($realTotal) . ' new articles.'
-						) .
-						' Leaving ' . number_format($leaveOver) .
-						" for next pass.\nServer oldest: " . number_format($groupNNTP['first']) .
-						' Server newest: ' . number_format($groupNNTP['last']) .
-						' Local newest: ' . number_format($groupMySQL['last_record'])
-					), true
-				);
-			}
-
-			$done = false;
-			// Get all the parts (in portions of $this->messageBuffer to not use too much memory).
-			while ($done === false) {
-
-				// Increment last until we reach $groupLast (group newest article).
-				if ($total > $this->messageBuffer) {
-					$last = (string)($first + $this->messageBuffer) > $groupLast ? $groupLast : (string)($first + $this->messageBuffer);
-				}
-				// Increment first so we don't get an article we already had.
-				$first++;
-
-				if ($this->_echoCLI) {
-					$this->_colorCLI->doEcho(
-						$this->_colorCLI->header(
-							"\nGetting " . number_format($last - $first + 1) . ' articles (' . number_format($first) .
-							' to ' . number_format($last) . ') from ' . $groupMySQL['name'] . " - (" .
-							number_format($groupLast - $last) . " articles in queue)."
-						)
-					);
-				}
-
-				// Get article headers from newsgroup.
-				$scanSummary = $this->scan($groupMySQL, $first, $last);
-
-				// Check if we fetched headers.
-				if (!empty($scanSummary)) {
-
-					// If new group, update first record & postdate
-					if (is_null($groupMySQL['first_record_postdate']) && $groupMySQL['first_record'] == 0) {
-						$groupMySQL['first_record'] = $scanSummary['firstArticleNumber'];
-
-						if (isset($scanSummary['firstArticleDate'])) {
-							$groupMySQL['first_record_postdate'] = strtotime($scanSummary['firstArticleDate']);
-						} else {
-							$groupMySQL['first_record_postdate'] = $this->postdate($groupMySQL['first_record'], $groupNNTP);
-						}
-
-						$this->_pdo->queryExec(
-							sprintf('
-								UPDATE groups
-								SET first_record = %s, first_record_postdate = %s
-								WHERE id = %d',
-								$scanSummary['firstArticleNumber'],
-								$this->_pdo->from_unixtime($this->_pdo->escapeString($groupMySQL['first_record_postdate'])),
-								$groupMySQL['id']
-							)
-						);
-					}
-
-					if (isset($scanSummary['lastArticleDate'])) {
-						$scanSummary['lastArticleDate'] = strtotime($scanSummary['lastArticleDate']);
-					} else {
-						$scanSummary['lastArticleDate'] = $this->postdate($scanSummary['lastArticleNumber'], $groupNNTP);
-					}
-
-					$this->_pdo->queryExec(
-						sprintf('
-							UPDATE groups
-							SET last_record = %s, last_record_postdate = %s, last_updated = NOW()
-							WHERE id = %d',
-							$this->_pdo->escapeString($scanSummary['lastArticleNumber']),
-							$this->_pdo->from_unixtime($scanSummary['lastArticleDate']),
-							$groupMySQL['id']
-						)
-					);
-				} else {
-					// If we didn't fetch headers, update the record still.
-					$this->_pdo->queryExec(
-						sprintf('
-							UPDATE groups
-							SET last_record = %s, last_updated = NOW()
-							WHERE id = %d',
-							$this->_pdo->escapeString($last),
-							$groupMySQL['id']
-						)
-					);
-				}
-
-				if ($last == $groupLast) {
-					$done = true;
-				} else {
-					$first = $last;
-				}
-			}
-
-			if ($this->_echoCLI) {
-				$this->_colorCLI->doEcho(
-					$this->_colorCLI->primary(
-						PHP_EOL . 'Group ' . $groupMySQL['name'] . ' processed in ' .
-						number_format(microtime(true) - $startGroup, 2) . ' seconds.'
-					), true
-				);
-			}
-		} else if ($this->_echoCLI) {
-			$this->_colorCLI->doEcho(
-				$this->_colorCLI->primary(
-					'No new articles for ' . $groupMySQL['name'] . ' (first ' . number_format($first) .
-					', last ' . number_format($last) . ', grouplast ' . number_format($groupMySQL['last_record']) .
-					', total ' . number_format($total) . ")\n" . 'Server oldest: ' . number_format($groupNNTP['first']) .
-					' Server newest: ' . number_format($groupNNTP['last']) . ' Local newest: ' . number_format($groupMySQL['last_record'])
-				), true
-			);
-		}
-	}
-
-	/**
-	 * Download a range of usenet messages. Store binaries with subjects matching a
-	 * specific pattern in the database.
-	 *
-	 * @param        $groupArr
-	 * @param        $first
-	 * @param        $last
-	 * @param string $type
-	 *
-	 * @return array
-	 */
-	function scan($groupArr, $first, $last, $type = 'update')
-	{
-		$db = new Db();
-		$releaseRegex = new ReleaseRegex;
-		$n = $this->n;
-		// Check if MySQL tables exist, create if they do not, get their names at the same time.
-		$tableNames = $this->_groups->getCBPTableNames($this->_tablePerGroup, $groupArr['id']);
-		$partRepair = ($type === 'partrepair');
-		$returnArray = [];
-
-		// Download the headers.
-		if ($partRepair === true) {
-			// This is slower but possibly is better with missing headers.
-			$msgs = $this->_nntp->getOverview($first . '-' . $last, true, false);
-		} else {
-			$msgs = $this->_nntp->getXOVER($first . '-' . $last);
-		}
-
-		// If there was an error, try to reconnect.
-		if ($this->_nntp->isError($msgs)) {
-
-			// Increment if part repair and return false.
-			if ($partRepair === true) {
-				$this->_pdo->queryExec(
-					sprintf(
-						'UPDATE %s SET attempts = attempts + 1 WHERE groupid = %d AND numberid %s',
-						$tableNames['prname'],
-						$groupArr['id'],
-						($first == $last ? '= ' . $first : 'IN (' . implode(',', range($first, $last)) . ')')
-					)
-				);
-				return $returnArray;
-			}
-
-			// This is usually a compression error, so try disabling compression.
-			$this->_nntp->doQuit();
-			if ($this->_nntp->doConnect(false) !== true) {
-				return $returnArray;
-			}
-
-			// Re-select group, download headers again without compression and re-enable compression.
-			$this->_nntp->selectGroup($groupArr['name']);
-			$msgs = $this->_nntp->getXOVER($first . '-' . $last);
-			$this->_nntp->enableCompression();
-
-			// Check if the non-compression headers have an error.
-			if ($this->_nntp->isError($msgs)) {
-				$this->log(
-					"Code {$msgs->code}: {$msgs->message}\nSkipping group: {$groupArr['name']}",
-					'scan',
-					\Logger::LOG_WARNING,
-					'error'
-				);
-				return $returnArray;
-			}
-		}
-
-		$rangerequested = range($first, $last);
-		$msgsreceived = array();
-		$msgsblacklisted = array();
-		$msgsignored = array();
-		$msgsinserted = array();
-		$msgsnotinserted = array();
-
-		$timeHeaders = number_format(microtime(true) - $this->startHeaders, 2);
-
-		if ($this->_nntp->isError($msgs)) {
-			echo "Error {$msgs->code}: {$msgs->message}$n";
-			echo "Skipping group$n";
-
-			return $returnArray;
-		}
-
-		// Check if we got headers.
-		$msgCount = count($msgs);
-
-		if ($msgCount < 1) {
-			return $returnArray;
-		}
-
-		// Get highest and lowest article numbers/dates.
-		$iterator1 = 0;
-		$iterator2 = $msgCount - 1;
-		while (true) {
-			if (!isset($returnArray['firstArticleNumber']) && isset($msgs[$iterator1]['Number'])) {
-				$returnArray['firstArticleNumber'] = $msgs[$iterator1]['Number'];
-				$returnArray['firstArticleDate'] = $msgs[$iterator1]['Date'];
-			}
-
-			if (!isset($returnArray['lastArticleNumber']) && isset($msgs[$iterator2]['Number'])) {
-				$returnArray['lastArticleNumber'] = $msgs[$iterator2]['Number'];
-				$returnArray['lastArticleDate'] = $msgs[$iterator2]['Date'];
-			}
-
-			// Break if we found non empty articles.
-			if (isset($returnArray['firstArticleNumber']) && isset($returnArray['lastArticleNumber'])) {
-				break;
-			}
-
-			// Break out if we couldn't find anything.
-			if ($iterator1++ >= $msgCount - 1 || $iterator2-- <= 0) {
-				break;
-			}
-		}
-
-		if (is_array($msgs)) {
-			//loop headers, figure out parts
-			foreach ($msgs AS $msg) {
-				if (!isset($msg['Number']))
-					continue;
-
-				$msgsreceived[] = $msg['Number'];
-				$msgPart = $msgTotalParts = 0;
-
-				$pattern = '|\((\d+)[\/](\d+)\)|i';
-				preg_match_all($pattern, $msg['Subject'], $matches, PREG_PATTERN_ORDER);
-				$matchcnt = sizeof($matches[0]);
-				for ($i = 0; $i < $matchcnt; $i++) {
-					$msgPart = $matches[1][$i];
-					$msgTotalParts = $matches[2][$i];
-				}
-
-				if (!isset($msg['Subject']) || $matchcnt == 0) // not a binary post most likely.. continue
-				{
-					$msgsignored[] = $msg['Number'];
-					continue;
-				}
-
-				if ((int)$msgPart > 0 && (int)$msgTotalParts > 0) {
-					$subject = utf8_encode(trim(preg_replace('|\(' . $msgPart . '[\/]' . $msgTotalParts . '\)|i', '', $msg['Subject'])));
-
-					if (!isset($this->message[$subject])) {
-						$this->message[$subject] = $msg;
-						$this->message[$subject]['MaxParts'] = (int)$msgTotalParts;
-						$this->message[$subject]['Date'] = strtotime($this->message[$subject]['Date']);
-					}
-					if ((int)$msgPart > 0) {
-						$this->message[$subject]['Parts'][(int)$msgPart] = array('Message-ID' => substr($msg['Message-ID'], 1, -1), 'number' => $msg['Number'], 'part' => (int)$msgPart, 'size' => $msg['Bytes']);
-						$this->message[$subject]['PartNumbers'][(int)$msgPart] = $msg['Number'];
-					}
-				}
-			}
-			unset($msg);
-			unset($msgs);
-			$count = 0;
-			$updatecount = 0;
-			$partcount = 0;
-			$rangenotreceived = array_diff($rangerequested, $msgsreceived);
-
-			if ($type != 'partrepair')
-				echo "Received " . sizeof($msgsreceived) . " articles of " . ($last - $first + 1) . " requested, " . sizeof($msgsignored) . " not binaries $n";
-
-			if ($type == 'update' && sizeof($msgsreceived) == 0) {
-				echo "Error: Server did not return any articles.$n";
-				echo "Skipping group$n";
-
-				return $returnArray;
-			}
-
-			if (sizeof($rangenotreceived) > 0) {
-				switch ($type) {
-					case 'backfill':
-						//don't add missing articles
-						break;
-					case 'partrepair':
-					case 'update':
-					default:
-						$this->addMissingParts($rangenotreceived, $tableNames['prname'], $groupArr['id']);
-						break;
-				}
-				echo "Server did not return " . count($rangenotreceived) . " article(s).$n";
-			}
-
-			if (isset($this->message) && count($this->message)) {
-				$groupRegexes = $releaseRegex->getForGroup($groupArr['name']);
-
-				//insert binaries and parts into database. when binary already exists; only insert new parts
-				foreach ($this->message AS $subject => $data) {
-					//Filter binaries based on black/white list
-					if ($this->isBlackListed($data, $groupArr['name'])) {
-						$msgsblacklisted[] = count($data['Parts']);
-						if ($type == 'partrepair') {
-							$partIds = array();
-							foreach ($data['Parts'] as $partdata)
-								$partIds[] = $partdata['number'];
-							$db->queryExec(sprintf("DELETE FROM %s WHERE numberid IN (%s) AND groupid=%d", $tableNames['prname'], implode(',', $partIds), $groupArr['id']));
-						}
-						continue;
-					}
-
-					if (isset($data['Parts']) && count($data['Parts']) > 0 && $subject != '') {
-						//Check for existing binary
-						$binaryID = 0;
-						$binaryHash = md5($subject . $data['From'] . $groupArr['id']);
-						$res = $db->queryOneRow(sprintf("SELECT id FROM %s WHERE binaryhash = %s", $tableNames['bname'], $db->escapeString($binaryHash)));
-						if (!$res) {
-
-							//Apply Regexes
-							$regexMatches = array();
-							foreach ($groupRegexes as $groupRegex) {
-								$regexCheck = $releaseRegex->performMatch($groupRegex, $subject);
-								if ($regexCheck !== false) {
-									$regexMatches = $regexCheck;
-									break;
-								}
-							}
-
-							$sql = '';
-							if (!empty($regexMatches)) {
-								$relparts = explode("/", $regexMatches['parts']);
-								$sql = sprintf('INSERT INTO %s (name, fromname, date, xref, totalparts, groupid, procstat, categoryid, regexid, reqid, relpart, reltotalpart, binaryhash, relname, dateadded) VALUES (%s, %s, FROM_UNIXTIME(%s), %s, %s, %d, %d, %s, %d, %s, %d, %d, %s, %s, now())', $tableNames['bname'], $db->escapeString($subject), $db->escapeString(utf8_encode($data['From'])), $db->escapeString($data['Date']), $db->escapeString($data['Xref']), $db->escapeString($data['MaxParts']), $groupArr['id'], Releases::PROCSTAT_TITLEMATCHED, $regexMatches['regcatid'], $regexMatches['regexid'], $db->escapeString($regexMatches['reqid']), $relparts[0], $relparts[1], $db->escapeString($binaryHash), $db->escapeString(str_replace('_', ' ', $regexMatches['name'])));
-							} elseif ($this->onlyProcessRegexBinaries === false) {
-								$sql = sprintf('INSERT INTO %s (name, fromname, date, xref, totalparts, groupid, binaryhash, dateadded) VALUES (%s, %s, FROM_UNIXTIME(%s), %s, %s, %d, %s, now())', $tableNames['bname'], $db->escapeString($subject), $db->escapeString(utf8_encode($data['From'])), $db->escapeString($data['Date']), $db->escapeString($data['Xref']), $db->escapeString($data['MaxParts']), $groupArr['id'], $db->escapeString($binaryHash));
-							} //onlyProcessRegexBinaries is true, there was no regex match and we are doing part repair so delete them
-							elseif ($type == 'partrepair') {
-								$partIds = array();
-								foreach ($data['Parts'] as $partdata)
-									$partIds[] = $partdata['number'];
-								$db->queryExec(sprintf('DELETE FROM %s WHERE numberid IN (%s) AND groupid = %d', $tableNames['prname'], implode(',', $partIds), $groupArr['id']));
-								continue;
-							}
-							if ($sql != '') {
-								$binaryID = $db->queryInsert($sql);
-								$count++;
-								//if ($count % 500 == 0) echo "$count bin adds...";
-							}
-						} else {
-							$binaryID = $res["id"];
-							$updatecount++;
-							//if ($updatecount % 500 == 0) echo "$updatecount bin updates...";
-						}
-
-						if ($binaryID != 0) {
-							$partParams = array();
-							$partNumbers = array();
-							foreach ($data['Parts'] AS $partdata) {
-								$partcount++;
-
-								$partParams[] = sprintf('(%d, %s, %s, %s, %s)', $binaryID, $db->escapeString($partdata['Message-ID']), $db->escapeString($partdata['number']), $db->escapeString(round($partdata['part'])), $db->escapeString($partdata['size']));
-								$partNumbers[] = $partdata['number'];
-							}
-
-							$partSql = ('INSERT INTO ' . $tableNames['pname'] . ' (binaryid, messageid, number, partnumber, size) VALUES '.implode(', ', $partParams));
-							$pidata = $db->queryInsert($partSql);
-							if (!$pidata) {
-								$msgsnotinserted = array_merge($msgsnotinserted, $partNumbers);
-							} else {
-								$msgsinserted = array_merge($msgsinserted, $partNumbers);
-							}
-						}
-					}
-				}
-				//TODO: determine whether to add to missing articles if insert failed
-				if (sizeof($msgsnotinserted) > 0) {
-					echo 'WARNING: ' . count($msgsnotinserted) . ' Parts failed to insert' . $n;
-					$this->addMissingParts($msgsnotinserted, $tableNames['prname'], $groupArr['id']);
-				}
-				if (($count >= 500) || ($updatecount >= 500)) {
-					echo $n;
-				} //line break for bin adds output
-			}
-
-			$timeUpdate = number_format(microtime(true) - $this->startUpdate, 2);
-			$timeLoop = number_format(microtime(true) - $this->startLoop, 2);
-
-			if (sizeof($msgsblacklisted) > 0)
-				echo "Blacklisted " . array_sum($msgsblacklisted) . " parts in " . sizeof($msgsblacklisted) . " binaries" . $n;
-
-			if ($type != 'partrepair') {
-				if ($this->_echoCLI) {
-					$this->_colorCLI->doEcho(
-						$this->_colorCLI->alternateOver(number_format($count)).
-						$this->_colorCLI->primaryOver(' new, ') .
-						$this->_colorCLI->alternateOver(number_format($updatecount)).
-						$this->_colorCLI->primaryOver(' updated, ') .
-						$this->_colorCLI->alternateOver(number_format($partcount)).
-						$this->_colorCLI->primaryOver(' parts, ') .
-						$this->_colorCLI->alternateOver($timeHeaders . 's') .
-						$this->_colorCLI->primaryOver(' to download articles, ') .
-						$this->_colorCLI->alternateOver($timeUpdate . 's') .
-						$this->_colorCLI->primaryOver(' to insert binaries/parts, ') .
-						$this->_colorCLI->alternateOver($timeLoop . 's') .
-						$this->_colorCLI->primary(' total.')
-					);
-				}
-			}
-			unset($this->message);
-			unset($data);
-
-			return $returnArray;
-		} else {
-			echo "Error: Can't get parts from server (msgs not array) $n";
-			echo "Skipping group$n";
-
-			return $returnArray;
-		}
-	}
-
-	/**
-	 * Attempt to get missing article headers.
-	 *
-	 * @param array $groupArr The info for this group from mysql.
-	 *
-	 * @return void
-	 */
-	public function partRepair($groupArr)
-	{
-		$tableNames = $this->_groups->getCBPTableNames($this->_tablePerGroup, $groupArr['id']);
-		// Get all parts in partrepair table.
-		$missingParts = $this->_pdo->query(
-			sprintf('
-				SELECT * FROM %s
-				WHERE groupid = %d AND attempts < %d
-				ORDER BY numberid ASC LIMIT %d',
-				$tableNames['prname'],
-				$groupArr['id'],
-				$this->_partRepairMaxTries,
-				$this->_partRepairLimit
-			)
-		);
-
-		$missingCount = count($missingParts);
-		if ($missingCount > 0) {
-			if ($this->_echoCLI) {
-				$this->_colorCLI->doEcho(
-					$this->_colorCLI->primary(
-						'Attempting to repair ' .
-						number_format($missingCount) .
-						' parts.'
-					), true
-				);
-			}
-
-			// Loop through each part to group into continuous ranges with a maximum range of messagebuffer/4.
-			$ranges = $partList = [];
-			$firstPart = $lastNum = $missingParts[0]['numberid'];
-
-			foreach ($missingParts as $part) {
-				if (($part['numberid'] - $firstPart) > ($this->messageBuffer / 4)) {
-
-					$ranges[] = [
-						'partfrom' => $firstPart,
-						'partto'   => $lastNum,
-						'partlist' => $partList
-					];
-
-					$firstPart = $part['numberid'];
-					$partList = [];
-				}
-				$partList[] = $part['numberid'];
-				$lastNum = $part['numberid'];
-			}
-
-			$ranges[] = [
-				'partfrom' => $firstPart,
-				'partto'   => $lastNum,
-				'partlist' => $partList
-			];
-
-			// Download missing parts in ranges.
-			foreach ($ranges as $range) {
-
-				$partFrom = $range['partfrom'];
-				$partTo   = $range['partto'];
-				$partList = $range['partlist'];
-
-				if ($this->_echoCLI) {
-					echo chr(rand(45,46)) . "\r";
-				}
-
-				// Get article headers from newsgroup.
-				$this->scan($groupArr, $partFrom, $partTo, 'partrepair', $partList);
-			}
-
-			// Calculate parts repaired
-			$result = $this->_pdo->queryOneRow(
-				sprintf('
-					SELECT COUNT(id) AS num
-					FROM %s
-					WHERE groupid = %d
-					AND numberid <= %d',
-					$tableNames['prname'],
-					$groupArr['id'],
-					$missingParts[$missingCount - 1]['numberid']
-				)
-			);
-
-			$partsRepaired = 0;
-			if ($result !== false) {
-				$partsRepaired = ($missingCount - $result['num']);
-			}
-
-			// Update attempts on remaining parts for active group
-			if (isset($missingParts[$missingCount - 1]['id'])) {
-				$this->_pdo->queryExec(
-					sprintf('
-						UPDATE %s
-						SET attempts = attempts + 1
-						WHERE groupid = %d
-						AND numberid <= %d',
-						$tableNames['prname'],
-						$groupArr['id'],
-						$missingParts[$missingCount - 1]['numberid']
-					)
-				);
-			}
-
-			if ($this->_echoCLI) {
-				$this->_colorCLI->doEcho(
-					$this->_colorCLI->primary(
-						PHP_EOL .
-						number_format($partsRepaired) .
-						' parts repaired.'
-					), true
-				);
-			}
-		}
-
-		// Remove articles that we cant fetch after x attempts.
-		$this->_pdo->queryExec(
-			sprintf(
-				'DELETE FROM %s WHERE attempts >= %d AND groupid = %d',
-				$tableNames['prname'],
-				$this->_partRepairMaxTries,
-				$groupArr['id']
-			)
-		);
-	}
-
-	/**
-	 * Insert a missing part to the database.
-	 */
-	private function addMissingParts($numbers, $tablename, $groupID)
-	{
-		$db = new DB();
-		$added = false;
-		$insertStr = "INSERT INTO $tablename (numberid, groupid) VALUES ";
-		foreach ($numbers as $number) {
-			if ($number > 0) {
-				$checksql = sprintf("select numberid from $tablename where numberid = %u and groupid = %d", $number, $groupID);
-				$chkrow = $db->queryOneRow($checksql);
-				if ($chkrow) {
-					$updsql = sprintf('update ' . $tablename . ' set attempts = attempts + 1 where numberid = %u and groupid = %d', $number, $groupID);
-					$db->queryExec($updsql);
-				} else {
-					$added = true;
-					$insertStr .= sprintf("(%u, %d), ", $number, $groupID);
-				}
-			}
-		}
-		if ($added) {
-			$insertStr = substr($insertStr, 0, -2);
-
-			return $db->queryInsert($insertStr, false);
-		}
-
-		return -1;
-	}
-
-	/**
-	 * Return internally cached list of binary blacklist patterns.
-	 */
-	public function retrieveBlackList()
-	{
-		if (is_array($this->blackList) && !empty($this->blackList)) {
-			return $this->blackList;
-		}
-		$blackList = $this->getBlacklist(true);
-		$this->blackList = $blackList;
-
-		return $blackList;
-	}
-
-	/**
-	 * Test if a message subject is blacklisted.
-	 */
-	public function isBlackListed($msg, $groupName)
-	{
-		if (empty($this->blackList_by_group[$groupName])) {
-			$main_blackList = $this->retrieveBlackList();
-			$this->blackList_by_group[$groupName] = array();
-			foreach ($main_blackList as $blist) {
-				if (preg_match('/^' . $blist['groupname'] . '$/i', $groupName)) {
-					$this->blackList_by_group[$groupName][] = $blist;
-				}
-			}
-		}
-
-		$blackList = $this->blackList_by_group[$groupName];
-		$field = array();
-		if (isset($msg["Subject"]))
-			$field[Binaries::BLACKLIST_FIELD_SUBJECT] = $msg["Subject"];
-
-		if (isset($msg["From"]))
-			$field[Binaries::BLACKLIST_FIELD_FROM] = $msg["From"];
-
-		if (isset($msg["Message-ID"]))
-			$field[Binaries::BLACKLIST_FIELD_MESSAGEID] = $msg["Message-ID"];
-
-		// if a white list is detected we now are required to
-		// only accept the entry if it matches at least 1 whitelist
-		// while a blacklist will over-ride all
-		$whitelist = array();
-		$matches_whitelist = false;
-
-		foreach ($blackList as $blist) {
-			//blacklist
-			if ($blist['optype'] == Binaries::OPT_BLACKLIST) {
-				if (preg_match('/' . $blist['regex'] . '/i', $field[$blist['msgcol']])) {
-					return true;
-				}
-			} else if ($blist['optype'] == Binaries::OPT_WHITELIST) {
-				$whitelist[] = $blist['regex'];
-				if (preg_match('/' . $blist['regex'] . '/i', $field[$blist['msgcol']])) {
-					// Flag that we matched the white list
-					$matches_whitelist = true;
-				}
-			}
-		}
-
-		# We parsed entire matching list entries at this point.. now we need
-		# to handle the whitelist (if it was enabled)
-		if (count($whitelist) > 0 && !$matches_whitelist) {
-			# We failed to match white list
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Rawsearch. Perform a simple like match on binary subjects matching a pattern.
-	 */
-	public function search($search, $limit = 1000, $excludedcats = array())
-	{
-		$db = new DB();
-
-		//
-		// if the query starts with a ^ it indicates the search is looking for items which start with the term
-		// still do the like match, but mandate that all items returned must start with the provided word
-		//
-		$words = explode(" ", $search);
-		$searchsql = "";
-		$intwordcount = 0;
-		if (count($words) > 0) {
-			foreach ($words as $word) {
-				//
-				// see if the first word had a caret, which indicates search must start with term
-				//
-				if ($intwordcount == 0 && (strpos($word, "^") === 0))
-					$searchsql .= sprintf(" and b.name like %s", $db->escapeString(substr($word, 1) . "%"));
-				else
-					$searchsql .= sprintf(" and b.name like %s", $db->escapeString("%" . $word . "%"));
-
-				$intwordcount++;
-			}
-		}
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and b.categoryid not in (" . implode(",", $excludedcats) . ") ";
-
-		$res = $db->query(sprintf("
-					SELECT b.*,
-					g.name AS group_name,
-					r.guid,
-					(SELECT COUNT(id) FROM parts p where p.binaryid = b.id) as 'binnum'
-					FROM binaries b
-					INNER JOIN groups g ON g.id = b.groupid
-					LEFT OUTER JOIN releases r ON r.id = b.releaseid
-					WHERE 1=1 %s %s order by DATE DESC LIMIT %d ",
-				$searchsql, $exccatlist, $limit
-			)
-		);
-
-		return $res;
-	}
-
-	/**
-	 * Get all binaries for a release.
-	 */
-	public function getForReleaseId($id)
-	{
-		$db = new DB();
-
-		return $db->query(sprintf("select binaries.* from binaries where releaseid = %d order by relpart", $id));
-	}
-
-	/**
-	 * Get a binary row.
-	 */
-	public function getById($id)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select binaries.*, groups.name as groupname from binaries left outer join groups on binaries.groupid = groups.id where binaries.id = %d ", $id));
-	}
-
-	/**
-	 * Get list of blacklists from database.
-	 */
-	public function getBlacklist($activeonly = true)
-	{
-		$db = new DB();
-
-		$where = "";
-		if ($activeonly)
-			$where = " where binaryblacklist.status = 1 ";
-
-		return $db->query("SELECT binaryblacklist.id, binaryblacklist.optype, binaryblacklist.status, binaryblacklist.description, binaryblacklist.groupname AS groupname, binaryblacklist.regex,
-												groups.id AS groupid, binaryblacklist.msgcol FROM binaryblacklist
-												left outer JOIN groups ON groups.name = binaryblacklist.groupname
-												" . $where . "
-												ORDER BY coalesce(groupname,'zzz')"
-		);
-	}
-
-	/**
-	 * Get a blacklist row from database.
-	 */
-	public function getBlacklistByID($id)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select * from binaryblacklist where id = %d ", $id));
-	}
-
-	/**
-	 * Delete a blacklist row from database.
-	 */
-	public function deleteBlacklist($id)
-	{
-		$db = new DB();
-
-		return $db->queryExec(sprintf("DELETE from binaryblacklist where id = %d", $id));
-	}
-
-	/**
-	 * Update a blacklist row.
-	 */
-	public function updateBlacklist($regex)
-	{
-		$db = new DB();
-
-		$groupname = $regex["groupname"];
-		if ($groupname == "")
-			$groupname = "null";
-		else {
-			$groupname = preg_replace("/a\.b\./i", "alt.binaries.", $groupname);
-			$groupname = sprintf("%s", $db->escapeString($groupname));
-		}
-
-		$db->queryExec(sprintf("update binaryblacklist set groupname=%s, regex=%s, status=%d, description=%s, optype=%d, msgcol=%d where id = %d ", $groupname, $db->escapeString($regex["regex"]), $regex["status"], $db->escapeString($regex["description"]), $regex["optype"], $regex["msgcol"], $regex["id"]));
-	}
-
-	/**
-	 * Add a new blacklist row.
-	 */
-	public function addBlacklist($regex)
-	{
-		$db = new DB();
-
-		$groupname = $regex["groupname"];
-		if ($groupname == "")
-			$groupname = "null";
-		else {
-			$groupname = preg_replace("/a\.b\./i", "alt.binaries.", $groupname);
-			$groupname = sprintf("%s", $db->escapeString($groupname));
-		}
-
-		return $db->queryInsert(sprintf("insert into binaryblacklist (groupname, regex, status, description, optype, msgcol) values (%s, %s, %d, %s, %d, %d) ",
-				$groupname, $db->escapeString($regex["regex"]), $regex["status"], $db->escapeString($regex["description"]), $regex["optype"], $regex["msgcol"]
-			)
-		);
-	}
-
-	/**
-	 * Add a new binary row and its associated parts.
-	 */
-	public function delete($id)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from parts where binaryid = %d", $id));
-		$db->queryExec(sprintf("DELETE from binaries where id = %d", $id));
-	}
-
-	# http://php.net/manual/en/function.array-unique.php#97285
-	public function getSuperUniqueArray($array)
-	{
-		$result = array_map("unserialize", array_unique(array_map("serialize", $array)));
-		foreach ($result as $key => $value) {
-			if (is_array($value))
-				$result[$key] = $this->getSuperUniqueArray($value);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Returns article number based on # of days.
-	 *
-	 * @param int   $days      How many days back we want to go.
-	 * @param array $data      Group data from usenet.
-	 *
-	 * @return string
-	 */
-	public function daytopost($days, $data)
-	{
-		$goalTime =          // The time we want =
-			time()           // current unix time (ex. 1395699114)
-			-                // minus
-			(86400 * $days); // 86400 (seconds in a day) times days wanted. (ie 1395699114 - 2592000 (30days)) = 1393107114
-
-		// The servers oldest date.
-		$firstDate = $this->postdate($data['first'], $data);
-		if ($goalTime < $firstDate) {
-			// If the date we want is older than the oldest date in the group return the groups oldest article.
-			return $data['first'];
-		}
-
-		// The servers newest date.
-		$lastDate = $this->postdate($data['last'], $data);
-		if ($goalTime > $lastDate) {
-			// If the date we want is newer than the groups newest date, return the groups newest article.
-			return $data['last'];
-		}
-
-		$totalArticles = (int)($lastDate - $firstDate);
-
-		if ($this->_echoCLI) {
-			$this->_colorCLI->doEcho(
-				$this->_colorCLI->primary(
-					'Searching for an approximate article number for group ' . $data['group'] . ' ' . $days . ' days back.'
-				)
-			);
-		}
-
-		switch (true) {
-			case $totalArticles < 1000000:
-				$matchPercentage = 1.0100;
-				break;
-			case $totalArticles < 10000000:
-				$matchPercentage = 1.0070;
-
-				break;
-			case $totalArticles < 100000000:
-				$matchPercentage = 1.0030;
-				break;
-			case $totalArticles < 500000000:
-				$matchPercentage = 1.0010;
-				break;
-			case $totalArticles < 1000000000:
-				$matchPercentage = 1.0008;
-				break;
-			default:
-				$matchPercentage = 1.0005;
-				break;
-		}
-
-		$wantedArticle = ($data['last'] * (($goalTime - $firstDate) / ($totalArticles)));
-		$articleTime = 0;
-		$percent = 1.01;
-		for ($i = 0; $i < 100; $i++) {
-			$wantedArticle = (int)$wantedArticle;
-
-			if ($wantedArticle <= $data['first'] || $wantedArticle >= $data['last']) {
-				break;
-			}
-
-			$articleTime = $this->postdate($wantedArticle, $data);
-			if ($articleTime >= ($goalTime / $matchPercentage) && $articleTime <= ($goalTime * $matchPercentage)) {
-				break;
-			}
-
-			if ($articleTime > $goalTime) {
-				$wantedArticle /= $percent;
-			} else if ($articleTime < $goalTime) {
-				$wantedArticle *= $percent;
-			}
-			$percent -= 0.001;
-		}
-
-		$wantedArticle = (int)$wantedArticle;
-		if ($this->_echoCLI) {
-			$this->_colorCLI->doEcho(
-				$this->_colorCLI->primary(
-					'Found article #' . $wantedArticle . ' which has a date of ' . date('r', $articleTime) .
-					', vs wanted date of ' . date('r', $goalTime) . '.'
-				)
-			);
-		}
-
-		return $wantedArticle;
-	}
-
-	/**
-	 * Convert unix time to days ago.
-	 *
-	 * @param int $timestamp unix time
-	 *
-	 * @return float
-	 */
-	private function daysOld($timestamp)
-	{
-		return round((time() - (!is_numeric($timestamp) ? strtotime($timestamp) : $timestamp)) / 86400, 1);
-	}
-
-	/**
-	 * Returns unix time for an article number.
-	 *
-	 * @param int    $post      The article number to get the time from.
-	 * @param array  $groupData Usenet group info from NNTP selectGroup method.
-	 *
-	 * @return bool|int
-	 */
-	public function postdate($post, array $groupData)
-	{
-		// Set table names
-		$groupID = $this->_groups->getIDByName($groupData['group']);
-		$group = [];
-		if ($groupID !== '') {
-			$group = $this->_groups->getCBPTableNames($this->_tablePerGroup, $groupID);
-		}
-
-		$currentPost = $post;
-
-		$attempts = $date = 0;
-		do {
-			// Try to get the article date locally first.
-			if ($groupID !== '') {
-				// Try to get locally.
-				$local = $this->_pdo->queryOneRow(
-					sprintf('
-						SELECT b.date AS date
-						FROM %s b, %s p
-						WHERE b.id = p.binaryid
-						AND b.groupid = %s
-						AND p.number = %s LIMIT 1',
-						$group['bname'],
-						$group['pname'],
-						$groupID,
-						$currentPost
-					)
-				);
-				if ($local !== false) {
-					$date = $local['date'];
-					break;
-				}
-			}
-
-			// If we could not find it locally, try usenet.
-			$header = $this->_nntp->getXOVER($currentPost);
-			if (!$this->_nntp->isError($header)) {
-				// Check if the date is set.
-				if (isset($header[0]['Date']) && strlen($header[0]['Date']) > 0) {
-					$date = $header[0]['Date'];
-					break;
-				}
-			}
-
-			// Try to get a different article number.
-			if (abs($currentPost - $groupData['first']) > abs($groupData['last'] - $currentPost)) {
-				$tempPost = round($currentPost / (mt_rand(1005, 1012) / 1000), 0, PHP_ROUND_HALF_UP);
-				if ($tempPost < $groupData['first']) {
-					$tempPost = $groupData['first'];
-				}
-			} else {
-				$tempPost = round((mt_rand(1005, 1012) / 1000) * $currentPost, 0, PHP_ROUND_HALF_UP);
-				if ($tempPost > $groupData['last']) {
-					$tempPost = $groupData['last'];
-				}
-			}
-			// If we got the same article number as last time, give up.
-			if ($tempPost === $currentPost) {
-				break;
-			}
-			$currentPost = $tempPost;
-
-			if ($this->_debug) {
-				$this->_colorCLI->doEcho($this->_colorCLI->debug('Postdate retried ' . $attempts . " time(s)."));
-			}
-		} while ($attempts++ <= 20);
-
-		// If we didn't get a date, set it to now.
-		if (!$date) {
-			$date = time();
-		} else {
-			$date = strtotime($date);
-		}
-
-		if ($this->_debug) {
-			$this->_debugging->log(
-				'Binaries',
-				"postdate",
-				'Article (' .
-				$post .
-				"'s) date is (" .
-				$date .
-				') (' .
-				$this->daysOld($date) .
-				" days old)",
-				\Logger::LOG_INFO
-			);
-		}
-
-		return $date;
-	}
-	/**
-	 * Log / Echo message.
-	 *
-	 * @param string $message Message to log.
-	 * @param string $method  Method that called this.
-	 * @param int    $level   Logger severity level constant.
-	 * @param string $color   ColorCLI method name.
-	 */
-	private function log($message, $method, $level, $color)
-	{
-		if ($this->_echoCLI) {
-			$this->_colorCLI->doEcho(
-				$this->_colorCLI->$color($message), true
-			);
-		}
-
-		if ($this->_debug) {
-			$this->_debugging->log('Binaries', $method, $message, $level);
-		}
-	}
-
-	/**
-	 * Delete all Binaries/Parts for a group id.
-	 *
-	 * @param int $groupID The id of the group.
-	 *
-	 * @note A trigger automatically deletes the parts.
-	 *
-	 * @return void
-	 */
-	public function purgeGroup($groupID)
-	{
-		$this->_pdo->queryExec(sprintf('DELETE b FROM binaries b WHERE b.groupid = %d', $groupID));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/book.php b/lib/copy_this/www/lib/book.php
deleted file mode 100644
index 4ce719927..000000000
--- a/lib/copy_this/www/lib/book.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/amazon.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-
-/**
- * This class manages the lookup of book information and storage/retrieve of book metadata.
- */
-class Book
-{
-	const NUMTOPROCESSPERTIME = 100;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $echooutput
-	 */
-	public function __construct($echooutput = false)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$s = new Sites();
-		$site = $s->get();
-		$this->pubkey = $site->amazonpubkey;
-		$this->privkey = $site->amazonprivkey;
-		$this->asstag = $site->amazonassociatetag;
-		$this->pdo = new DB();
-
-		$this->imgSavePath = WWW_DIR.'covers/book/';
-	}
-
-	/**
-	 * Get bookinfo row for id.
-	 */
-	public function getBookInfo($id)
-	{
-		$query = $this->pdo->queryOneRow(sprintf("SELECT bookinfo.*, genres.title as genres FROM bookinfo left outer join genres on genres.id = bookinfo.genreID where bookinfo.id = %d ", $id));
-		return $query;
-	}
-
-	/**
-	 * Get bookinfo row for title.
-	 */
-	public function getBookInfoByName($author, $title)
-	{
-		$query = $this->pdo->queryOneRow(sprintf("SELECT * FROM bookinfo where author like %s and title like %s", $this->pdo->escapeString("%".$author."%"),  $this->pdo->escapeString("%".$title."%")));
-		return $query;
-	}
-
-	/**
-	 * Get bookinfo rows by limit.
-	 */
-	public function getRange($start, $num)
-	{
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$query = $this->pdo->query(" SELECT * FROM bookinfo ORDER BY createddate DESC".$limit);
-		return $query;
-	}
-
-	/**
-	 * Get count of all bookinfos.
-	 */
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow("select count(id) as num from bookinfo");
-		return $res["num"];
-	}
-
-	/**
-	 * Get count of all bookinfo rows for browse list.
-	 */
-	public function getBookCount($maxage=-1)
-	{
-		$browseby = $this->getBrowseBy();
-
-		if ($maxage > 0)
-			$maxage = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-		else
-			$maxage = "";
-
-		$sql = sprintf("select count(distinct r.bookinfoid) as num from releases r inner join bookinfo b on b.id = r.bookinfoid and b.title != '' where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') %s %s", $browseby, $maxage);
-
-		$res = $this->pdo->queryOneRow($sql, true);
-		return $res["num"];
-	}
-
-	/**
-	 * Get range of bookinfo rows for browse list.
-	 */
-	public function getBookRange($start, $num, $orderby, $maxage=-1)
-	{
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$maxagesql = "";
-		if ($maxage > 0)
-			$maxagesql = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-
-		$order = $this->getBrowseOrder($orderby);
-		$sql = sprintf(" SELECT r.bookinfoid, max(postdate), b.* from releases r inner join bookinfo b on b.id = r.bookinfoid and b.title != '' where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') %s %s group by r.bookinfoid order by %s %s".$limit, $browseby, $maxagesql, $order[0], $order[1]);
-		$rows = $this->pdo->query($sql, true);
-
-		//
-		//get a copy of all the bookinfoids
-		//
-		$ids = "";
-		foreach ($rows as $row)
-			$ids .= $row["bookinfoid"]. ", ";
-
-		if (strlen($ids) > 0)
-		{
-			$ids = substr($ids,0,-2);
-
-			//
-			// get all releases matching these ids
-			//
-			$sql = sprintf("select r.*, releasenfo.id as nfoid, groups.name as grpname from releases r left outer join releasenfo on releasenfo.releaseid = r.id left outer join groups on groups.id = r.groupid where bookinfoid in (%s) %s order by r.postdate desc", $ids, $maxagesql);
-			$allrows = $this->pdo->query($sql, true);
-			$arr = [];
-
-			//
-			// build array indexed by bookinfoid
-			//
-			foreach ($allrows as &$allrow)
-			{
-				$arr[$allrow["bookinfoid"]]["id"] = (isset($arr[$allrow["bookinfoid"]]["id"]) ? $arr[$allrow["bookinfoid"]]["id"] : "") . $allrow["id"] . ",";
-				$arr[$allrow["bookinfoid"]]["rarinnerfilecount"] = (isset($arr[$allrow["bookinfoid"]]["rarinnerfilecount"]) ? $arr[$allrow["bookinfoid"]]["rarinnerfilecount"] : "") . $allrow["rarinnerfilecount"] . ",";
-				$arr[$allrow["bookinfoid"]]["haspreview"] = (isset($arr[$allrow["bookinfoid"]]["haspreview"]) ? $arr[$allrow["bookinfoid"]]["haspreview"] : "") . $allrow["haspreview"] . ",";
-				$arr[$allrow["bookinfoid"]]["passwordstatus"] = (isset($arr[$allrow["bookinfoid"]]["passwordstatus"]) ? $arr[$allrow["bookinfoid"]]["passwordstatus"] : "") . $allrow["passwordstatus"] . ",";
-				$arr[$allrow["bookinfoid"]]["guid"] = (isset($arr[$allrow["bookinfoid"]]["guid"]) ? $arr[$allrow["bookinfoid"]]["guid"] : "") . $allrow["guid"] . ",";
-				$arr[$allrow["bookinfoid"]]["nfoid"] = (isset($arr[$allrow["bookinfoid"]]["nfoid"]) ? $arr[$allrow["bookinfoid"]]["nfoid"] : "") . $allrow["nfoid"] . ",";
-				$arr[$allrow["bookinfoid"]]["grpname"] = (isset($arr[$allrow["bookinfoid"]]["grpname"]) ? $arr[$allrow["bookinfoid"]]["grpname"] : "") . $allrow["grpname"] . ",";
-				$arr[$allrow["bookinfoid"]]["searchname"] = (isset($arr[$allrow["bookinfoid"]]["searchname"]) ? $arr[$allrow["bookinfoid"]]["searchname"] : "") . $allrow["searchname"] . "#";
-				$arr[$allrow["bookinfoid"]]["postdate"] = (isset($arr[$allrow["bookinfoid"]]["postdate"]) ? $arr[$allrow["bookinfoid"]]["postdate"] : "") . $allrow["postdate"] . ",";
-				$arr[$allrow["bookinfoid"]]["size"] = (isset($arr[$allrow["bookinfoid"]]["size"]) ? $arr[$allrow["bookinfoid"]]["size"] : "") . $allrow["size"] . ",";
-				$arr[$allrow["bookinfoid"]]["totalpart"] = (isset($arr[$allrow["bookinfoid"]]["totalpart"]) ? $arr[$allrow["bookinfoid"]]["totalpart"] : "") . $allrow["totalpart"] . ",";
-				$arr[$allrow["bookinfoid"]]["comments"] = (isset($arr[$allrow["bookinfoid"]]["comments"]) ? $arr[$allrow["bookinfoid"]]["comments"] : "") . $allrow["comments"] . ",";
-				$arr[$allrow["bookinfoid"]]["grabs"] = (isset($arr[$allrow["bookinfoid"]]["grabs"]) ? $arr[$allrow["bookinfoid"]]["grabs"] : "") . $allrow["grabs"] . ",";
-				$arr[$allrow["bookinfoid"]]["categoryid"] = (isset($arr[$allrow["bookinfoid"]]["categoryid"]) ? $arr[$allrow["bookinfoid"]]["categoryid"] : "") . $allrow["categoryid"] . ",";
-			}
-
-			//
-			// stuff back into the results set
-			//
-			foreach ($rows as &$row)
-			{
-				$row["grp_release_id"] = substr($arr[$row["bookinfoid"]]["id"], 0, -1);
-				$row["grp_rarinnerfilecount"] = substr($arr[$row["bookinfoid"]]["rarinnerfilecount"], 0, -1);
-				$row["grp_haspreview"] = substr($arr[$row["bookinfoid"]]["haspreview"], 0, -1);
-				$row["grp_release_password"] = substr($arr[$row["bookinfoid"]]["passwordstatus"], 0, -1);
-				$row["grp_release_guid"] = substr($arr[$row["bookinfoid"]]["guid"], 0, -1);
-				$row["grp_release_nfoID"] = substr($arr[$row["bookinfoid"]]["nfoid"], 0, -1);
-				$row["grp_release_grpname"] = substr($arr[$row["bookinfoid"]]["grpname"], 0, -1);
-				$row["grp_release_name"] = substr($arr[$row["bookinfoid"]]["searchname"], 0, -1);
-				$row["grp_release_postdate"] = substr($arr[$row["bookinfoid"]]["postdate"], 0, -1);
-				$row["grp_release_size"] = substr($arr[$row["bookinfoid"]]["size"], 0, -1);
-				$row["grp_release_totalparts"] = substr($arr[$row["bookinfoid"]]["totalpart"], 0, -1);
-				$row["grp_release_comments"] = substr($arr[$row["bookinfoid"]]["comments"], 0, -1);
-				$row["grp_release_grabs"] = substr($arr[$row["bookinfoid"]]["grabs"], 0, -1);
-				$row["grp_release_categoryID"] = substr($arr[$row["bookinfoid"]]["categoryid"], 0, -1);
-			}
-		}
-		return $rows;
-	}
-
-	/**
-	 * Get orderby column for book browse list.
-	 */
-	public function getBrowseOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode("_", $order);
-		switch($orderArr[0]) {
-			case 'artist':
-				$orderfield = 'b.author';
-				break;
-			case 'size':
-				$orderfield = 'r.size';
-				break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	/**
-	 * Get all orderable columns for book browse list.
-	 */
-	public function getBookOrdering()
-	{
-		return array('author_asc', 'author_desc', 'posted_asc', 'posted_desc', 'size_asc', 'size_desc', 'files_asc', 'files_desc', 'stats_asc', 'stats_desc');
-	}
-
-	/**
-	 * Get filter options from browse list.
-	 */
-	public function getBrowseByOptions()
-	{
-		return array('author'=>'author', 'title'=>'title');
-	}
-
-	/**
-	 * Get filter options from user into SQL query.
-	 */
-	public function getBrowseBy()
-	{
-
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		foreach ($browsebyArr as $bbk=>$bbv) {
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk])) {
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				if (preg_match('/id/i', $bbv)) {
-					$browseby .= " and b.{$bbv} = $bbs ";
-				} else {
-					$browseby .= " and b.$bbv LIKE(".$this->pdo->escapeString('%'.$bbs.'%').") ";
-				}
-			}
-		}
-		return $browseby;
-	}
-
-	/**
-	 * Update bookinfo row.
-	 */
-	public function update($id, $title, $asin, $url, $author, $publisher, $publishdate, $cover)
-	{
-		$db = new DB();
-
-		$this->pdo->queryExec(sprintf("update bookinfo SET title=%s, asin=%s, url=%s, author=%s, publisher=%s, publishdate='%s', cover=%d, updateddate=NOW() WHERE id = %d",
-				$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url), $this->pdo->escapeString($author), $this->pdo->escapeString($publisher), $publishdate, $cover, $id));
-	}
-
-	/**
-	 * Determine if a bookinfo can be found locally, if not query amazon, strip out it
-	 * properties and update the database.
-	 */
-	public function updateBookInfo($author, $title)
-	{
-		$ri = new ReleaseImage();
-
-		$amaz = $this->fetchAmazonProperties($author." ".$title);
-		if (!$amaz)
-		{
-			//echo "tried to lookup ".$author." ".$title;
-			return false;
-		}
-		sleep(1);
-
-		//
-		// get album properties
-		//
-		$item = [];
-		$item["asin"] = (string) $amaz->Items->Item->ASIN;
-		$item["url"] = (string) $amaz->Items->Item->DetailPageURL;
-		$item["coverurl"] = (string) $amaz->Items->Item->LargeImage->URL;
-		if ($item['coverurl'] != "")
-			$item['cover'] = 1;
-		else
-			$item['cover'] = 0;
-		$item["author"] = (string) $amaz->Items->Item->ItemAttributes->Author;
-		$item["dewey"] = (string) $amaz->Items->Item->ItemAttributes->DeweyDecimalNumber;
-		$item["ean"] = (string) $amaz->Items->Item->ItemAttributes->EAN;
-		$item["isbn"] = (string) $amaz->Items->Item->ItemAttributes->ISBN;
-		$item["publisher"] = (string) $amaz->Items->Item->ItemAttributes->Publisher;
-		$item["publishdate"] = (string) $amaz->Items->Item->ItemAttributes->PublicationDate;
-		$item["pages"] = (string) $amaz->Items->Item->ItemAttributes->NumberOfPages;
-		$item["title"] = (string) $amaz->Items->Item->ItemAttributes->Title;
-		$item["review"] = "";
-		if (isset($amaz->Items->Item->EditorialReviews))
-			$item["review"] = trim(strip_tags((string) $amaz->Items->Item->EditorialReviews->EditorialReview->Content));
-
-		//This is to verify the result back from amazon was at least somewhat related to what was intended.
-		//If you are debugging releases comment out the following code to show all info
-
-		$match = similar_text($author, $item["author"], $authorpercent);
-		$match = similar_text($title, $item['title'], $titlepercent);
-
-		//If the author is less than 80% album must be 100%
-		if ($authorpercent < '60')
-		{
-			if ($titlepercent != '100')
-			{
-				//echo "\nAuthor Under 80 Title Under 100 \n".$author." - ".$item['author']." - ".$authorpercent."\n";
-				$temptitle = $title;
-				$tempauthor = $author;
-				$title = $tempauthor;
-				$author = $temptitle;
-				$match = similar_text($author, $item['author'], $authorpercent);
-				$match = similar_text($title, $item['title'], $titlepercent);
-				if ($authorpercent < '60')
-				{
-					if ($titlepercent != '100')
-					{
-						//echo "\nAuthor Under 80 Title Under 100 second check\n".$author." - ".$item['author']." - ".$authorpercent."\n";
-						//echo $title." - ".$item['title']." - ".$titlepercent."\n";
-						return false;
-					}
-				}
-			}
-		}
-
-		//If the title is ever under 30%, it's probably not a match.
-		if ($titlepercent < '30')
-		{
-			//echo "Title Under 30 ".$title." - ".$item['title']." - ".$titlepercent;
-			return false;
-		}
-
-		$bookId = $this->addUpdateBookInfo($item['title'], $item['asin'], $item['url'],
-			$item['author'], $item['publisher'], $item['publishdate'], $item['review'],
-			$item['cover'], $item['dewey'], $item['ean'], $item['isbn'], $item['pages'] );
-
-		if ($bookId)
-		{
-			$item['cover'] = $ri->saveImage($bookId, $item['coverurl'], $this->imgSavePath, 250, 250);
-		}
-
-		return $bookId;
-	}
-
-	/**
-	 * Query amazon for a title.
-	 */
-	public function fetchAmazonProperties($title)
-	{
-		$obj = new AmazonProductAPI($this->pubkey, $this->privkey, $this->asstag);
-		try
-		{
-			$result = $obj->searchProducts($title, AmazonProductAPI::BOOKS, "TITLE");
-		}
-		catch(Exception $e)
-		{
-			$result = false;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Process all untagged book releases for additional metadata.
-	 */
-	public function processBookReleases()
-	{
-		$numlookedup = 0;
-
-		$res = $this->pdo->queryDirect(sprintf("SELECT searchname, id from releases where bookinfoid IS NULL and categoryid = %d ORDER BY postdate DESC LIMIT 100", Category::CAT_BOOK_EBOOK));
-		if ($this->pdo->getNumRows($res) > 0)
-		{
-			if ($this->echooutput)
-				echo "BookPrc : Processing " . $this->pdo->getNumRows($res) . " book releases\n";
-
-			while ($arr = $this->pdo->getAssocArray($res))
-			{
-				if ($numlookedup > Book::NUMTOPROCESSPERTIME)
-					return;
-
-				$bookId = -2;
-				$book = $this->parseAuthor($arr['searchname']);
-				if ($book !== false)
-				{
-					if ($this->echooutput)
-						echo 'BookPrc : '.$book["author"].' - '.$book["title"]."\n";
-
-					//check for existing book entry
-					$bookCheck = $this->getBookInfoByName($book["author"], $book["title"]);
-
-					if ($bookCheck === false)
-					{
-						//
-						// get from amazon
-						//
-						$numlookedup++;
-						$ret = $this->updateBookInfo($book["author"], $book["title"]);
-						if ($ret !== false)
-						{
-							$bookId = $ret;
-						}
-					}
-					else
-					{
-						$bookId = $bookCheck["id"];
-					}
-				}
-				$this->pdo->queryExec(sprintf("update releases SET bookinfoid = %d WHERE id = %d", $bookId, $arr["id"]));
-			}
-		}
-	}
-
-	/**
-	 * Strip out author and title name from a release name.
-	 */
-	public function parseAuthor($releasename)
-	{
-		$result = [];
-		$result['releasename'] = $releasename;
-		$newName = $releasename;
-
-		//only process the reasonably named items
-		//if (!preg_match('/epub|mobi|html|lit|prc|djvu|pdf/i', $releasename))
-		//	return false;
-
-		//remove things in brackets and double hyphens
-		$newName = preg_replace("%(\([\w\s-.,]*\)|\[[\w\s-.,]*\]|[0-9])%","",$newName);
-		$newName = preg_replace("%(\-\s.*\-)%","-",$newName);
-
-		$name = explode("-", $newName);
-		$name = array_map("trim", $name);
-
-
-		if (is_array($name) && sizeof($name) > 1)
-		{
-			$result['author'] = trim($name[0]);
-			$result['title'] = trim($name[1]);
-			$result['title'] = preg_replace('/retail/i','',$result['title']);
-			$result['title'] = preg_replace('/\.epub/i','',$result['title']);
-			$result['title'] = preg_replace('/\.mobi/i','',$result['title']);
-			$result['title'] = preg_replace('/\.prc/i','',$result['title']);
-			$result['title'] = preg_replace('/\.lit/i','',$result['title']);
-			$result['title'] = preg_replace('/\.obi/i','',$result['title']);
-			$result['title'] = preg_replace('/\.azw3/i','',$result['title']);
-			$result['title'] = preg_replace('/\.azw/i','',$result['title']);
-			$result['title'] = preg_replace('/\.pdf/i','',$result['title']);
-			$result['title'] = preg_replace('/\.html/i','',$result['title']);
-			$result['title'] = preg_replace('/\./i',' ',$result['title']);
-			$result['title'] = preg_replace('/\d{4}/i','',$result['title']);
-			$result['title'] = preg_replace('/repost/i','',$result['title']);
-			$result['title'] = preg_replace('/ebook/i','',$result['title']);
-			$result['title'] = preg_replace('/\(.*?\) WW/i','',$result['title']);
-			$result['title'] = preg_replace('/ WW/i','',$result['title']);
-			$result['title'] = preg_replace('/\(.*?\)$/i','',$result['title']);
-			$result['title'] = preg_replace('/\:.*?$/i','',$result['title']);
-
-			//echo "author parsed - ".$result['author']."\n";
-			//echo "title parsed - ".$result['title']."\n";
-
-			// switch Cratchett, Bob to Bob Cratchett
-			preg_match_all('/[,]/i', $result['author'], $matches);
-			if (sizeof($matches[0]) == 1)
-			{
-				$pos = strpos($result['author'], ",");
-				if ($pos !== false)
-				{
-					$firstname = substr($result['author'], $pos+1);
-					$surname = substr($result['author'], 0, $pos);
-					$result['author'] = trim($firstname . " " . $surname);
-				}
-			}
-		}
-
-		return (!empty($result['author'])  ? $result : false);
-	}
-
-	/**
-	 * Insert or update a bookinfo row.
-	 */
-	public function addUpdateBookInfo($title, $asin, $url, $author, $publisher, $publishdate, $review, $cover, $dewey, $ean, $isbn, $pages)
-	{
-
-		if ($pages == 0)
-			$pages = "null";
-		else
-			$pages = $pages + 0;
-
-		if ($publishdate == "")
-			$publishdate = "null";
-		elseif (strlen($publishdate) == 4)
-			$publishdate = $this->pdo->escapeString($publishdate."-01-01");
-		elseif (strlen($publishdate) == 7)
-			$publishdate = $this->pdo->escapeString($publishdate."-01");
-		else
-			$publishdate = $this->pdo->escapeString($publishdate);
-
-		$sql = sprintf("INSERT INTO bookinfo  (title, asin, url, author, publisher, publishdate, review, cover, createddate, updateddate, dewey, ean, isbn, pages)
-		VALUES (%s,  %s, %s, %s, %s, %s,  %s, %d, now(), now(), %s, %s, %s, %s)
-			ON DUPLICATE KEY UPDATE  title = %s,  asin = %s,  url = %s,   author = %s,  publisher = %s,  publishdate = %s,  review = %s, cover = %d,  createddate = now(),  updateddate = now(), dewey = %s, ean = %s, isbn = %s, pages = %s",
-			$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url),
-			$this->pdo->escapeString($author), $this->pdo->escapeString($publisher),
-			$publishdate, $this->pdo->escapeString($review), $cover,  $this->pdo->escapeString($dewey), $this->pdo->escapeString($ean), $this->pdo->escapeString($isbn), $pages,
-			$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url),
-			$this->pdo->escapeString($author), $this->pdo->escapeString($publisher),
-			$this->pdo->escapeString($publishdate), $this->pdo->escapeString($review), $cover,  $this->pdo->escapeString($dewey), $this->pdo->escapeString($ean), $this->pdo->escapeString($isbn), $pages );
-
-		$bookId = $this->pdo->queryInsert($sql);
-		return $bookId;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/category.php b/lib/copy_this/www/lib/category.php
deleted file mode 100644
index c95ddb7e2..000000000
--- a/lib/copy_this/www/lib/category.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "lib/Categorize.php");
-
-/**
- * This class manages the site wide categories.
- */
-class Category
-{
-	const CAT_GAME_NDS = 1010;
-	const CAT_GAME_PSP = 1020;
-	const CAT_GAME_WII = 1030;
-	const CAT_GAME_XBOX = 1040;
-	const CAT_GAME_XBOX360 = 1050;
-	const CAT_GAME_WIIWARE = 1060;
-	const CAT_GAME_XBOX360DLC = 1070;
-	const CAT_GAME_PS3 = 1080;
-	const CAT_GAME_OTHER = 1090;
-	const CAT_GAME_3DS = 1110;
-	const CAT_GAME_PSVITA = 1120;
-	const CAT_GAME_WIIU = 1130;
-	const CAT_GAME_XBOXONE = 1140;
-	const CAT_GAME_PS4 = 1180;
-	const CAT_MOVIE_FOREIGN = 2010;
-	const CAT_MOVIE_OTHER = 2020;
-	const CAT_MOVIE_SD = 2030;
-	const CAT_MOVIE_HD = 2040;
-	const CAT_MOVIE_3D = 2050;
-	const CAT_MOVIE_BLURAY = 2060;
-	const CAT_MOVIE_DVD = 2070;
-	const CAT_MOVIE_WEBDL = 2080;
-	const CAT_MUSIC_MP3 = 3010;
-	const CAT_MUSIC_VIDEO = 3020;
-	const CAT_MUSIC_AUDIOBOOK = 3030;
-	const CAT_MUSIC_LOSSLESS = 3040;
-	const CAT_MUSIC_OTHER = 3050;
-	const CAT_MUSIC_FOREIGN = 3060;
-	const CAT_PC_0DAY = 4010;
-	const CAT_PC_ISO = 4020;
-	const CAT_PC_MAC = 4030;
-	const CAT_PC_MOBILEOTHER = 4040;
-	const CAT_PC_GAMES = 4050;
-	const CAT_PC_MOBILEIOS = 4060;
-	const CAT_PC_MOBILEANDROID = 4070;
-	const CAT_TV_WEBDL = 5010;
-	const CAT_TV_FOREIGN = 5020;
-	const CAT_TV_SD = 5030;
-	const CAT_TV_HD = 5040;
-	const CAT_TV_OTHER = 5050;
-	const CAT_TV_SPORT = 5060;
-	const CAT_TV_ANIME = 5070;
-	const CAT_TV_DOCU = 5080;
-	const CAT_XXX_DVD = 6010;
-	const CAT_XXX_WMV = 6020;
-	const CAT_XXX_XVID = 6030;
-	const CAT_XXX_X264 = 6040;
-	const CAT_XXX_CLIPHD = 6041;
-	const CAT_XXX_CLIPSD = 6042;
-	const CAT_XXX_PACK = 6050;
-	const CAT_XXX_IMAGESET = 6060;
-	const CAT_XXX_OTHER = 6070;
-	const CAT_XXX_SD = 6080;
-	const CAT_XXX_WEBDL = 6090;
-	const CAT_BOOK_MAGS = 7010;
-	const CAT_BOOK_EBOOK = 7020;
-	const CAT_BOOK_COMICS = 7030;
-	const CAT_BOOK_TECHNICAL = 7040;
-	const CAT_BOOK_OTHER = 7050;
-	const CAT_BOOK_FOREIGN = 7060;
-	const CAT_MISC_OTHER = 8010;
-	const CAT_MISC_HASHED = 8020;
-	const CAT_PARENT_GAME = 1000;
-	const CAT_PARENT_MOVIE = 2000;
-	const CAT_PARENT_MUSIC = 3000;
-	const CAT_PARENT_PC = 4000;
-	const CAT_PARENT_TV = 5000;
-	const CAT_PARENT_XXX = 6000;
-	const CAT_PARENT_BOOK = 7000;
-	const CAT_PARENT_MISC = 8000;
-	const CAT_NOT_DETERMINED = 7900;
-	const STATUS_INACTIVE = 0;
-	const STATUS_ACTIVE = 1;
-	const STATUS_DISABLED = 2;
-
-	private $tmpCat = 0;
-
-	/**
-	 * Parse category search constraints
-	 *
-	 * @param array $cat
-	 *
-	 * @return string $catsrch
-	 */
-	public function getCategorySearch($cat = array())
-	{
-		$catsrch = ' (';
-
-		foreach ($cat as $category) {
-
-			$chlist = '-99';
-
-			if ($category != -1 && $this->isParent($category)) {
-				$children = $this->getChildren($category);
-
-				foreach ($children as $child) {
-					$chlist .= ', ' . $child['id'];
-				}
-			}
-
-			if ($chlist != '-99') {
-				$catsrch .= ' r.categoryid IN (' . $chlist . ') OR ';
-			} else {
-				$catsrch .= sprintf(' r.categoryid = %d OR ', $category);
-			}
-			$catsrch .= '1=2 )';
-		}
-
-		return $catsrch;
-	}
-
-	/**
-	 * Determine if a category is a parent.
-	 */
-	public function isParent($cid)
-	{
-		$db = new DB();
-		$ret = $db->queryOneRow(sprintf("select count(*) as count from category where id = %d and parentid is null", $cid), true);
-		if ($ret['count'])
-			return true;
-		else
-			return false;
-	}
-
-	/**
-	 * Get a list of all child categories for a parent.
-	 */
-	public function getChildren($cid)
-	{
-		$db = new DB();
-
-		return $db->query(sprintf("select c.* from category c where parentid = %d", $cid), true);
-	}
-
-	/**
-	 * Get a list of categories and their parents.
-	 */
-	public function getFlat($activeonly = false)
-	{
-		$db = new DB();
-		$act = "";
-		if ($activeonly)
-			$act = sprintf(" where c.status = %d ", Category::STATUS_ACTIVE);
-
-		return $db->query("select c.*, (SELECT title FROM category WHERE id=c.parentid) AS parentName from category c " . $act . " ORDER BY c.id");
-	}
-
-	/**
-	 * Get names of enabled parent categories.
-	 *
-	 * @return array
-	 */
-	public function getEnabledParentNames()
-	{
-		$db = new DB();
-
-		return $db->query("SELECT title FROM category WHERE parentid IS NULL AND status = 1");
-	}
-
-	/**
-	 * Returns category id's for site disabled categories.
-	 *
-	 * @return array
-	 */
-	public function getDisabledIDs()
-	{
-		$db = new DB();
-
-		return $db->query("SELECT id FROM category WHERE status = 2 OR parentid IN (SELECT id FROM category WHERE status = 2 AND parentid IS NULL)");
-	}
-	/**
-	 * Get a category row by its id.
-	 */
-	public function getById($id)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("SELECT c.disablepreview, c.id, c.description, c.minsizetoformrelease, c.maxsizetoformrelease, CONCAT(COALESCE(cp.title,'') , CASE WHEN cp.title IS NULL THEN '' ELSE ' > ' END , c.title) as title, c.status, c.parentid from category c left outer join category cp on cp.id = c.parentid where c.id = %d", $id));
-	}
-
-	public function getSizeRangeById($id)
-	{
-		$db = new DB();
-		$res = $db->queryOneRow(sprintf("SELECT c.minsizetoformrelease, c.maxsizetoformrelease, cp.minsizetoformrelease as p_minsizetoformrelease, cp.maxsizetoformrelease as p_maxsizetoformrelease" .
-				" from category c left outer join category cp on cp.id = c.parentid where c.id = %d", $id
-			)
-		);
-		if (!$res)
-			return null;
-
-		$min = intval($res['minsizetoformrelease']);
-		$max = intval($res['maxsizetoformrelease']);
-		if ($min == 0 && $max == 0) {
-			# Size restriction disabled; now check parent
-			$min = intval($res['p_minsizetoformrelease']);
-			$max = intval($res['p_maxsizetoformrelease']);
-			if ($min == 0 && $max == 0) {
-				# no size restriction
-				return null;
-			} else if ($max > 0) {
-				$min = 0;
-				$max = intval($res['p_maxsizetoformrelease']);
-			} else {
-				$min = intval($res['p_minsizetoformrelease']);
-				$max = PHP_INT_MAX;
-			}
-		} else if ($max > 0) {
-			$min = 0;
-			$max = intval($res['maxsizetoformrelease']);
-		} else {
-			$min = intval($res['minsizetoformrelease']);
-			$max = PHP_INT_MAX;
-		}
-
-		# If code reaches here, then content is enabled
-		return array('min' => $min, 'max' => $max);
-	}
-
-	/*
-	* Return min/max size range (in array(min, max)) otherwise, none is returned
-	* if no size restrictions are set
-	*/
-
-	/**
-	 * Get a list of categories by an array of IDs.
-	 */
-	public function getByIds($ids)
-	{
-		$db = new DB();
-
-		return $db->query(sprintf("SELECT concat(cp.title, ' > ',c.title) as title from category c inner join category cp on cp.id = c.parentid where c.id in (%s)", implode(',', $ids)));
-	}
-
-	public function getNameByID($ID)
-	{
-		$db = new DB();
-		$parent = $db->queryOneRow(sprintf("SELECT title FROM category WHERE id = %d", substr($ID, 0, 1) . "000"));
-		$cat = $db->queryOneRow(sprintf("SELECT title FROM category WHERE id = %d", $ID));
-
-		return $parent["title"] . " " . $cat["title"];
-	}
-
-	/**
-	 * Update a category.
-	 */
-	public function update($id, $status, $desc, $disablepreview, $minsize, $maxsize)
-	{
-		$db = new DB();
-
-		return $db->queryExec(sprintf("update category set disablepreview = %d, status = %d, minsizetoformrelease = %d, maxsizetoformrelease = %d, description = %s where id = %d", $disablepreview, $status, $minsize, $maxsize, $db->escapeString($desc), $id));
-	}
-
-	/**
-	 * Get the categories in a format for use by the headermenu.tpl.
-	 */
-	public function getForMenu($excludedcats = array())
-	{
-		$db = new DB();
-		$ret = array();
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and id not in (" . implode(",", $excludedcats) . ")";
-
-		$arr = $db->query(sprintf("select * from category where status = %d %s", Category::STATUS_ACTIVE, $exccatlist), true);
-		foreach ($arr as $a)
-			if ($a["parentid"] == "")
-				$ret[] = $a;
-
-		foreach ($ret as $key => $parent) {
-			$subcatlist = array();
-			$subcatnames = array();
-			foreach ($arr as $a) {
-				if ($a["parentid"] == $parent["id"]) {
-					$subcatlist[] = $a;
-					$subcatnames[] = $a["title"];
-				}
-			}
-
-			if (count($subcatlist) > 0) {
-				array_multisort($subcatnames, SORT_ASC, $subcatlist);
-				$ret[$key]["subcatlist"] = $subcatlist;
-			} else {
-				unset($ret[$key]);
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Return a list of categories for use in a dropdown.
-	 */
-	public function getForSelect($blnIncludeNoneSelected = true)
-	{
-		$categories = $this->get();
-		$temp_array = array();
-
-		if ($blnIncludeNoneSelected) {
-			$temp_array[-1] = "--Please Select--";
-		}
-
-		foreach ($categories as $category)
-			$temp_array[$category["id"]] = $category["title"];
-
-		return $temp_array;
-	}
-
-	/**
-	 * Get a list of categories.
-	 */
-	public function get($activeonly = false, $excludedcats = array())
-	{
-		$db = new DB();
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and c.id not in (" . implode(",", $excludedcats) . ")";
-
-		$act = "";
-		if ($activeonly)
-			$act = sprintf(" where c.status = %d ", Category::STATUS_ACTIVE);
-
-		if ($exccatlist != "")
-			$act .= $exccatlist;
-
-		return $db->query("select c.id, concat(cp.title, ' > ',c.title) as title, cp.id as parentid, c.status from category c inner join category cp on cp.id = c.parentid " . $act . " ORDER BY c.id", true);
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/console.php b/lib/copy_this/www/lib/console.php
deleted file mode 100644
index ae2760326..000000000
--- a/lib/copy_this/www/lib/console.php
+++ /dev/null
@@ -1,714 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/amazon.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/genres.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-
-/**
- * This class looks up metadata about console releases and handles
- * storage/retrieval from the database.
- */
-class Console
-{
-	const NUMTOPROCESSPERTIME = 100;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Default constructor
-	 *
-	 * @param bool $echooutput
-	 */
-	public function __construct($echooutput=false)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$s = new Sites();
-		$site = $s->get();
-		$this->pubkey = $site->amazonpubkey;
-		$this->privkey = $site->amazonprivkey;
-		$this->asstag = $site->amazonassociatetag;
-		$this->pdo = new DB();
-		$this->imgSavePath = WWW_DIR.'covers/console/';
-	}
-
-	/**
-	 * Get consoleinfo row by id.
-	 */
-	public function getConsoleInfo($id)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT consoleinfo.*, genres.title as genres FROM consoleinfo left outer join genres on genres.id = consoleinfo.genreID where consoleinfo.id = %d ", $id));
-	}
-
-	/**
-	 * Get consoleinfo row by name and platform.
-	 */
-	public function getConsoleInfoByName($title, $platform)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM consoleinfo where title like %s and platform like %s", $this->pdo->escapeString("%".$title."%"),  $this->pdo->escapeString("%".$platform."%")));
-	}
-
-	/**
-	 * Get range of consoleinfo row by limit.
-	 */
-	public function getRange($start, $num)
-	{
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		return $this->pdo->query(" SELECT * FROM consoleinfo ORDER BY createddate DESC".$limit);
-	}
-
-	/**
-	 * Get count of all consoleinfo rows.
-	 */
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow("select count(id) as num from consoleinfo");
-		return $res["num"];
-	}
-
-	/**
-	 * Get count of all consoleinfo rows for browse list.
-	 */
-	public function getConsoleCount($cat, $maxage=-1, $excludedcats=array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1)
-		{
-			$catsrch = " (";
-			foreach ($cat as $category)
-			{
-				if ($category != -1)
-				{
-					$categ = new Category();
-					if ($categ->isParent($category))
-					{
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist.=", ".$child["id"];
-
-						if ($chlist != "-99")
-								$catsrch .= " r.categoryid in (".$chlist.") or ";
-					}
-					else
-					{
-						$catsrch .= sprintf(" r.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch.= "1=2 )";
-		}
-
-		if ($maxage > 0)
-			$maxage = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-		else
-			$maxage = "";
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and r.categoryid not in (".implode(",", $excludedcats).")";
-
-		$sql = sprintf("select count(r.id) as num from releases r inner join consoleinfo con on con.id = r.consoleinfoid and con.title != '' where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') and %s %s %s %s", $browseby, $catsrch, $maxage, $exccatlist);
-		$res = $this->pdo->queryOneRow($sql, true);
-		return $res["num"];
-	}
-
-	/**
-	 * Get range of consoleinfo rows for browse list.
-	 */
-	public function getConsoleRange($cat, $start, $num, $orderby, $maxage=-1, $excludedcats=array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1)
-		{
-			$catsrch = " (";
-			foreach ($cat as $category)
-			{
-				if ($category != -1)
-				{
-					$categ = new Category();
-					if ($categ->isParent($category))
-					{
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist.=", ".$child["id"];
-
-						if ($chlist != "-99")
-							$catsrch .= " r.categoryid in (".$chlist.") or ";
-					}
-					else
-					{
-						$catsrch .= sprintf(" r.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch.= "1=2 )";
-		}
-
-		$maxagesql = "";
-		if ($maxage > 0)
-			$maxagesql = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and r.categoryid not in (".implode(",", $excludedcats).")";
-
-		$order = $this->getConsoleOrder($orderby);
-		$sql = sprintf(" SELECT r.*, r.id as releaseid, con.*, g.title as genre, groups.name as group_name, concat(cp.title, ' > ', c.title) as category_name, concat(cp.id, ',', c.id) as category_ids, rn.id as nfoid from releases r left outer join groups on groups.id = r.groupid inner join consoleinfo con on con.id = r.consoleinfoid left outer join releasenfo rn on rn.releaseid = r.id and rn.nfo is not null left outer join category c on c.id = r.categoryid left outer join category cp on cp.id = c.parentid left outer join genres g on g.id = con.genreID where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') and %s %s %s %s order by %s %s".$limit, $browseby, $catsrch, $maxagesql, $exccatlist, $order[0], $order[1]);
-		return $this->pdo->query($sql, true);
-	}
-
-	/**
-	 * Get orderby column for console browse list.
-	 */
-	public function getConsoleOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode("_", $order);
-		switch($orderArr[0]) {
-			case 'title':
-				$orderfield = 'con.title';
-			break;
-			case 'platform':
-				$orderfield = 'con.platform';
-			break;
-			case 'releasedate':
-				$orderfield = 'con.releasedate';
-			break;
-			case 'genre':
-				$orderfield = 'con.genreID';
-			break;
-			case 'size':
-				$orderfield = 'r.size';
-			break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-			break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-			break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-			break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	/**
-	 * Get available orderby columns for console browse list.
-	 */
-	public function getConsoleOrdering()
-	{
-		return array('title_asc', 'title_desc', 'posted_asc', 'posted_desc', 'size_asc', 'size_desc', 'files_asc', 'files_desc', 'stats_asc', 'stats_desc', 'platform_asc', 'platform_desc', 'releasedate_asc', 'releasedate_desc', 'genre_asc', 'genre_desc');
-	}
-
-	/**
-	 * Get available filter columns for console browse list.
-	 */
-	public function getBrowseByOptions()
-	{
-		return array('platform'=>'platform', 'title'=>'title', 'genre'=>'genreID');
-	}
-
-	/**
-	 * Get sql for selected filter columns for console browse list.
-	 */
-	public function getBrowseBy()
-	{
-
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		foreach ($browsebyArr as $bbk=>$bbv) {
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk])) {
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				$browseby .= "con.$bbv LIKE(".$this->pdo->escapeString('%'.$bbs.'%').") AND ";
-			}
-		}
-		return $browseby;
-	}
-
-	/**
-	 * Update consoleinfo row.
-	 */
-	public function update($id, $title, $asin, $url, $salesrank, $platform, $publisher, $releasedate, $esrb, $cover, $genreID)
-	{
-
-		$this->pdo->queryExec(sprintf("update consoleinfo SET title=%s, asin=%s, url=%s, salesrank=%s, platform=%s, publisher=%s, releasedate='%s', esrb=%s, cover=%d, genreID=%d, updateddate=NOW() WHERE id = %d",
-		$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url), $salesrank, $this->pdo->escapeString($platform), $this->pdo->escapeString($publisher), $releasedate, $this->pdo->escapeString($esrb), $cover, $genreID, $id));
-	}
-
-	/**
-	 * Check whether a title is available at Amazon and store its metadata.
-	 */
-	public function updateConsoleInfo($gameInfo)
-	{
-		$gen = new Genres();
-		$ri = new ReleaseImage();
-
-		$con = array();
-		$amaz = $this->fetchAmazonProperties($gameInfo['title'], $gameInfo['node']);
-		if (!$amaz)
-			return false;
-
-		//load genres
-		$defaultGenres = $gen->getGenres(Genres::CONSOLE_TYPE);
-		$genreassoc = array();
-		foreach($defaultGenres as $dg) {
-			$genreassoc[$dg['id']] = strtolower($dg['title']);
-		}
-
-		//
-		// get game properties
-		//
-		$con['coverurl'] = (string) $amaz->Items->Item->LargeImage->URL;
-		if ($con['coverurl'] != "")
-			$con['cover'] = 1;
-		else
-			$con['cover'] = 0;
-
-		$con['title'] = (string) $amaz->Items->Item->ItemAttributes->Title;
-		if (empty($con['title']))
-			$con['title'] = $gameInfo['title'];
-
-		$con['platform'] = (string) $amaz->Items->Item->ItemAttributes->Platform;
-		if (empty($con['platform']))
-			$con['platform'] = $gameInfo['platform'];
-
-		//Beginning of Recheck Code
-		//This is to verify the result back from amazon was at least somewhat related to what was intended.
-
-		//Some of the Platforms don't match Amazon's exactly. This code is needed to facilitate rechecking.
-		if (preg_match('/^X360$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('X360', 'Xbox 360', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^XBOX360$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('XBOX360', 'Xbox 360', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^NDS$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('NDS', 'Nintendo DS', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^PS3$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('PS3', 'PlayStation 3', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^PSP$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('PSP', 'Sony PSP', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^Wii$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('Wii', 'Nintendo Wii', $gameInfo['platform']);    // baseline single quote
-			$gameInfo['platform'] = str_replace('WII', 'Nintendo Wii', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^N64$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('N64', 'Nintendo 64', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/^NES$/i', $gameInfo['platform']))
-		{
-			$gameInfo['platform'] = str_replace('NES', 'Nintendo NES', $gameInfo['platform']);    // baseline single quote
-		}
-		if (preg_match('/Super/i', $con['platform']))
-		{
-			$con['platform'] = str_replace('Super Nintendo', 'SNES', $con['platform']);    // baseline single quote
-			$con['platform'] = str_replace('Nintendo Super NES', 'SNES', $con['platform']);    // baseline single quote
-		}
-		//Remove Online Game Code So Titles Match Properly.
-		if (preg_match('/\[Online Game Code\]/i', $con['title']))
-		{
-			$con['title'] = str_replace(' [Online Game Code]', '', $con['title']);    // baseline single quote
-		}
-
-		//Basically the XBLA names contain crap, this is to reduce the title down far enough to be usable
-		if (preg_match('/xbla/i', $gameInfo['platform']))
-		{
-			 	$gameInfo['title'] = substr($gameInfo['title'],0,10);
-				$con['substr'] = $gameInfo['title'];
-		}
-
-		//This actual compares the two strings and outputs a percentage value.
-		$titlepercent ='';
-		$platformpercent ='';
-		similar_text(strtolower($gameInfo['title']), strtolower($con['title']), $titlepercent);
-		similar_text(strtolower($gameInfo['platform']), strtolower($con['platform']), $platformpercent);
-
-		//Since Wii Ware games and XBLA have inconsistent original platforms, as long as title is 50% its ok.
-		if (preg_match('/(wiiware|xbla)/i', $gameInfo['platform']))
-		{
-			 if ($titlepercent >= 50)
-			 {
-			 	$platformpercent = 100;
-			 }
-		}
-
-		//If the release is DLC matching sucks, so assume anything over 50% is legit.
-		if (isset($gameInfo['dlc']) && $gameInfo['dlc'] == 1)
-		{
-			 if ($titlepercent >= 50)
-			 {
-			 	$titlepercent = 100;
-			 	$platformpercent = 100;
-			 }
-		}
-
-		//Show the Percentages
-		//echo("Matched: Title Percentage: $titlepercent%");
-		//echo("Matched: Platform Percentage: $platformpercent%");
-
-		//If the Title is less than 80% Platform must be 100% unless it is XBLA
-		if ($titlepercent < 70)
-		{
-			if ($platformpercent != 100)
-			{
-				return false;
-			}
-		}
-
-		//If title is less than 80% then its most likely not a match
-		if ($titlepercent < 70)
-		return false;
-
-		//Platform must equal 100%
-		if ($platformpercent != 100)
-			return false;
-
-		$con['asin'] = (string) $amaz->Items->Item->ASIN;
-		$con['url'] = (string) $amaz->Items->Item->DetailPageURL;
-
-		$con['salesrank'] = (string) $amaz->Items->Item->SalesRank;
-		if ($con['salesrank'] == "")
-			$con['salesrank'] = 'null';
-
-		$con['publisher'] = (string) $amaz->Items->Item->ItemAttributes->Publisher;
-
-		$con['esrb'] = (string) $amaz->Items->Item->ItemAttributes->ESRBAgeRating;
-
-		$con['releasedate'] = $this->pdo->escapeString((string) $amaz->Items->Item->ItemAttributes->ReleaseDate);
-		if ($con['releasedate'] == "''")
-			$con['releasedate'] = 'null';
-
-		$con['review'] = "";
-		if (isset($amaz->Items->Item->EditorialReviews))
-			$con['review'] = trim(strip_tags((string) $amaz->Items->Item->EditorialReviews->EditorialReview->Content));
-
-		$genreKey = -1;
-		$genreName = '';
-		if (isset($amaz->Items->Item->BrowseNodes) || isset($amaz->Items->Item->ItemAttributes->Genre))
-		{
-			if (isset($amaz->Items->Item->BrowseNodes))
-			{
-				//had issues getting this out of the browsenodes obj
-				//workaround is to get the xml and load that into its own obj
-				$amazGenresXml = $amaz->Items->Item->BrowseNodes->asXml();
-				$amazGenresObj = simplexml_load_string($amazGenresXml);
-				$amazGenres = $amazGenresObj->xpath("//Name");
-				foreach($amazGenres as $amazGenre)
-				{
-					$currName = trim($amazGenre[0]);
-					if (empty($genreName))
-					{
-						$genreMatch = $this->matchBrowseNode($currName);
-						if ($genreMatch !== false)
-						{
-							$genreName = $genreMatch;
-							break;
-						}
-					}
-				}
-			}
-
-			if (empty($genreName) && isset($amaz->Items->Item->ItemAttributes->Genre))
-			{
-				$tmpGenre = (string) $amaz->Items->Item->ItemAttributes->Genre;
-				$tmpGenre = str_replace('-', ' ', $tmpGenre);
-				$tmpGenre = explode(' ', $tmpGenre);
-				foreach($tmpGenre as $tg)
-				{
-					$genreMatch = $this->matchBrowseNode(ucwords($tg));
-					if ($genreMatch !== false)
-					{
-						$genreName = $genreMatch;
-						break;
-					}
-				}
-			}
-		}
-
-		if (empty($genreName))
-		{
-			$genreName = 'Unknown';
-		}
-
-		if (in_array(strtolower($genreName), $genreassoc)) {
-			$genreKey = array_search(strtolower($genreName), $genreassoc);
-		} else {
-			$genreKey = $this->pdo->queryInsert(sprintf("INSERT INTO genres (`title`, `type`) VALUES (%s, %d)", $this->pdo->escapeString($genreName), Genres::CONSOLE_TYPE));
-		}
-		$con['consolegenre'] = $genreName;
-		$con['consolegenreID'] = $genreKey;
-
-		$query = sprintf("
-		INSERT INTO consoleinfo  (`title`, `asin`, `url`, `salesrank`, `platform`, `publisher`, `genreID`, `esrb`, `releasedate`, `review`, `cover`, `createddate`, `updateddate`)
-		VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, now(), now())
-			ON DUPLICATE KEY UPDATE  `title` = %s,  `asin` = %s,  `url` = %s,  `salesrank` = %s,  `platform` = %s,  `publisher` = %s,  `genreID` = %s,  `esrb` = %s,  `releasedate` = %s,  `review` = %s, `cover` = %d,  createddate = now(),  updateddate = now()",
-		$this->pdo->escapeString($con['title']), $this->pdo->escapeString($con['asin']), $this->pdo->escapeString($con['url']),
-		$con['salesrank'], $this->pdo->escapeString($con['platform']), $this->pdo->escapeString($con['publisher']), ($con['consolegenreID']==-1?"null":$con['consolegenreID']), $this->pdo->escapeString($con['esrb']),
-		$con['releasedate'], $this->pdo->escapeString($con['review']), $con['cover'],
-		$this->pdo->escapeString($con['title']), $this->pdo->escapeString($con['asin']), $this->pdo->escapeString($con['url']),
-		$con['salesrank'], $this->pdo->escapeString($con['platform']), $this->pdo->escapeString($con['publisher']), ($con['consolegenreID']==-1?"null":$con['consolegenreID']), $this->pdo->escapeString($con['esrb']),
-		$con['releasedate'], $this->pdo->escapeString($con['review']), $con['cover'] );
-
-		$consoleId = $this->pdo->queryInsert($query);
-
-		if ($consoleId)
-		{
-			$con['cover'] = $ri->saveImage($consoleId, $con['coverurl'], $this->imgSavePath, 250, 250);
-		}
-
-		return $consoleId;
-	}
-
-	/**
-	 * Retrieve properties for an item from Amazon.
-	 */
-	public function fetchAmazonProperties($title, $node)
-	{
-		$obj = new AmazonProductAPI($this->pubkey, $this->privkey, $this->asstag);
-		try
-		{
-			$result = $obj->searchProducts($title, AmazonProductAPI::GAMES, "NODE", $node);
-		}
-		catch(Exception $e)
-		{
-			$result = false;
-		}
-		return $result;
-	}
-
-	/**
-	 * Check all untagged console releases for their extended metadata.
-	 */
-	public function processConsoleReleases()
-	{
-		$ret = 0;
-		$numlookedup = 0;
-
-		$res = $this->pdo->queryDirect(sprintf("SELECT searchname, id from releases where consoleinfoid IS NULL and categoryid in ( select id from category where parentid = %d ) ORDER BY postdate DESC LIMIT 100", Category::CAT_PARENT_GAME));
-		if ( $this->pdo->getNumRows($res) > 0)
-		{
-			if ($this->echooutput)
-				echo "ConsPrc : Processing " . $this->pdo->getNumRows($res) . " console releases\n";
-
-			while ($arr = $this->pdo->getAssocArray($res))
-			{
-				if ($numlookedup > Console::NUMTOPROCESSPERTIME)
-					return;
-
-				$gameInfo = $this->parseTitle($arr['searchname']);
-				if ($gameInfo !== false)
-				{
-
-					if ($this->echooutput)
-						echo 'ConsPrc : '.$gameInfo["title"].' ('.$gameInfo["platform"].')'."\n";
-
-					//check for existing console entry
-					$gameCheck = $this->getConsoleInfoByName($gameInfo["title"], $gameInfo["platform"]);
-
-					if ($gameCheck === false)
-					{
-						$numlookedup++;
-						$gameId = $this->updateConsoleInfo($gameInfo);
-						if ($gameId === false)
-						{
-							$gameId = -2;
-						}
-					}
-					else
-					{
-						$gameId = $gameCheck["id"];
-					}
-
-					//update release
-					$this->pdo->queryExec(sprintf("update releases SET consoleinfoid = %d WHERE id = %d", $gameId, $arr["id"]));
-
-				}
-				else {
-					//could not parse release title
-					$this->pdo->queryExec(sprintf("update releases SET consoleinfoid = %d WHERE id = %d", -2, $arr["id"]));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Strip a title from a releasename.
-	 */
-	function parseTitle($releasename)
-	{
-		$result = array();
-
-		//get name of the game from name of release
-		preg_match('/^(?P<title>.*?)[\.\-_ ](v\.?\d\.\d|PAL|NTSC|EUR|USA|JP|ASIA|JAP|JPN|AUS|MULTI\.?5|MULTI\.?4|MULTI\.?3|PATCHED|FULLDVD|DVD5|DVD9|DVDRIP|PROPER|REPACK|RETAIL|DEMO|DISTRIBUTION|REGIONFREE|READ\.?NFO|NFOFIX|PS2|PS3|PSP|WII|X\-?BOX|XBLA|X360|NDS|N64|NGC)/i', $releasename, $matches);
-		if (isset($matches['title']))
-		{
-			$title = $matches['title'];
-			//replace dots or underscores with spaces
-			$result['title'] = preg_replace('/(\.|_|\%20)/', ' ', $title);
-			//Needed to add code to handle DLC Properly
-			if (preg_match('/dlc/i', $result['title']))
-			{
-				$result['dlc'] = '1';
-				if (preg_match('/Rock Band Network/i', $result['title']))
-				{
-					$result['title'] = 'Rock Band';
-				}
-				else if (preg_match('/\-/i', $result['title']))
-				{
-					$dlc = explode("-", $result['title']);
-					$result['title'] = $dlc[0];
-				}
-				else
-				{
-					preg_match('/(.*? .*?) /i', $result['title'], $dlc);
-					$result['title'] = $dlc[0];
-				}
-			}
-		}
-
-		//get the platform of the release
-		preg_match('/[\.\-_ ](?P<platform>XBLA|WiiWARE|N64|SNES|NES|PS2|PS3|PS 3|PSP|WII|XBOX360|X\-?BOX|X360|NDS|NGC)/i', $releasename, $matches);
-		if (isset($matches['platform']))
-		{
-			$platform = $matches['platform'];
-			if (preg_match('/^(XBLA)$/i', $platform))
-			{
-				if (preg_match('/DLC/i', $title))
-				{
-					$platform = str_replace('XBLA', 'XBOX360', $platform);	   // baseline single quote
-				}
-			}
-			$browseNode = $this->getBrowseNode($platform);
-			$result['platform'] = $platform;
-			$result['node'] = $browseNode;
-		}
-		$result['release'] = $releasename;
-		array_map("trim", $result);
-		//make sure we got a title and platform otherwise the resulting lookup will probably be shit
-		//other option is to pass the $release->categoryid here if we dont find a platform but that would require an extra lookup to determine the name
-		//in either case we should have a title at the minimum
-		return (isset($result['title']) && !empty($result['title']) && isset($result['platform'])) ? $result : false;
-	}
-
-	/**
-	 * Translate Amazon browse nodes for console types.
-	 */
-	function getBrowseNode($platform)
-	{
-		switch($platform)
-		{
-			case 'PS2':
-				$nodeId = '301712';
-			break;
-			case 'PS3':
-				$nodeId = '14210751';
-			break;
-			case 'PSP':
-				$nodeId = '11075221';
-			break;
-			case 'WII':
-			case 'Wii':
-				$nodeId = '14218901';
-			break;
-			case 'XBOX360':
-			case 'X360':
-				$nodeId = '14220161';
-			break;
-			case 'XBOX':
-			case 'X-BOX':
-				$nodeId = '537504';
-			break;
-			case 'NDS':
-				$nodeId = '11075831';
-			break;
-			case 'N64':
-				$nodeId = '229763';
-			break;
-			case 'SNES':
-				$nodeId = '294945';
-			break;
-			case 'NES':
-				$nodeId = '566458';
-			break;
-			case 'NGC':
-				$nodeId = '541022';
-			break;
-			default:
-				$nodeId = '468642';
-			break;
-		}
-
-		return $nodeId;
-	}
-
-	/**
-	 * Match an Amazon browse node with internal genre types .
-	 */
-	public function matchBrowseNode($nodeName)
-	{
-		$str = '';
-
-		switch($nodeName)
-		{
-			case 'Action':
-			case 'Adventure':
-			case 'Arcade':
-			case 'Board Games':
-			case 'Cards':
-			case 'Casino':
-			case 'Flying':
-			case 'Puzzle':
-			case 'Racing':
-			case 'Rhythm':
-			case 'Role-Playing':
-			case 'Simulation':
-			case 'Sports':
-			case 'Strategy':
-			case 'Trivia':
-				$str = $nodeName;
-				break;
-		}
-		return ($str != '') ? $str : false;
-	}
-}
diff --git a/lib/copy_this/www/lib/content.php b/lib/copy_this/www/lib/content.php
deleted file mode 100644
index 0727348f7..000000000
--- a/lib/copy_this/www/lib/content.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/users.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-
-
-/**
- * This class looks up site content.
- */
-class Contents
-{
-	const TYPEUSEFUL = 1;
-	const TYPEARTICLE = 2;
-	const TYPEINDEX = 3;
-
-	/**
-	 * Validate a content row before insert/update.
-	 */
-	public function validate($content)
-	{
-		if (substr($content["url"],0,1) != '/')
-		{
-			$content["url"] = "/".$content["url"];
-		}
-
-		if (substr($content["url"], strlen($content["url"]) - 1) != '/')
-		{
-			$content["url"] = $content["url"]."/";
-		}
-
-		return $content;
-	}
-
-	/**
-	 * Delete a content row.
-	 */
-	public function delete($id)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("DELETE from content where id=%d", $id));
-	}
-
-	/**
-	 * Update a content row.
-	 */
-	public function update($content)
-	{
-		$db = new DB();
-		$content = $this->validate($content);
-		$db->queryExec(sprintf("update content set	role=%d, title = %s , 	url = %s , 	body = %s , 	metadescription = %s , 	metakeywords = %s , 	contenttype = %d , 	showinmenu = %d , 	status = %d , 	ordinal = %d	where	id = %d ", $content["role"], $db->escapeString($content["title"]), $db->escapeString($content["url"]), $db->escapeString($content["body"]), $db->escapeString($content["metadescription"]), $db->escapeString($content["metakeywords"]), $content["contenttype"], $content["showinmenu"], $content["status"], $content["ordinal"], $content["id"] ));
-	}
-
-	/**
-	 * Add a content row.
-	 */
-	public function add($content)
-	{
-		$db = new DB();
-
-		$content = $this->validate($content);
-
-		return $db->queryInsert(sprintf("insert into content (role, title, url, body, metadescription, metakeywords, 	contenttype, 	showinmenu, 	status, 	ordinal	)	values	(%d, %s, 	%s, 	%s, 	%s, 	%s, 	%d, 	%d, 	%d, 	%d 	)", $content["role"], $db->escapeString($content["title"]),  $db->escapeString($content["url"]),  $db->escapeString($content["body"]),  $db->escapeString($content["metadescription"]),  $db->escapeString($content["metakeywords"]), $content["contenttype"], $content["showinmenu"], $content["status"], $content["ordinal"] ));
-	}
-
-	/**
-	 * Get all active content rows.
-	 */
-	public function get()
-	{
-		$db = new DB();
-		return $db->query(sprintf("select * from content where status = 1 order by contenttype, coalesce(ordinal, 1000000)"));
-	}
-
-	/**
-	 * Get all content rows.
-	 */
-	public function getAll()
-	{
-		$db = new DB();
-		return $db->query(sprintf("select * from content order by contenttype, coalesce(ordinal, 1000000)"));
-	}
-
-	/**
-	 * Get a content row by its id.
-	 */
-	public function getByID($id, $role)
-	{
-		$db = new DB();
-		if ($role == Users::ROLE_ADMIN)
-			$role = "";
-		else
-			$role = sprintf("and (role=%d or role=0)", $role);
-
-		return $db->queryOneRow(sprintf("select * from content where id = %d %s", $id, $role));
-	}
-
-	/**
-	 * Get the index page.
-	 */
-	public function getIndex()
-	{
-		$db = new DB();
-		return $db->queryOneRow(sprintf("select * from content where status=1 and contenttype = %d ", Contents::TYPEINDEX), true);
-	}
-
-	/**
-	 * Get all content rows for a role and menu type, ie useful links.
-	 */
-	public function getForMenuByTypeAndRole($id, $role)
-	{
-		$db = new DB();
-		if ($role == Users::ROLE_ADMIN)
-			$role = "";
-		else
-			$role = sprintf("and (role=%d or role=0)", $role);
-		return $db->query(sprintf("select * from content where showinmenu=1 and status=1 and contenttype = %d %s ", $id, $role));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/episode.php b/lib/copy_this/www/lib/episode.php
deleted file mode 100644
index 00d5d0f59..000000000
--- a/lib/copy_this/www/lib/episode.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-
-/**
- * This class looks up tv episode data.
- */
-class Episode
-{
-	/**
-	 * Get an episodeinfo row by id.
-	 */
-	public function getEpisodeInfoByID($episodeinfoID)
-	{
-		$db = new DB();
-		return $db->queryOneRow(sprintf('SELECT * FROM episodeinfo WHERE id = %d', $episodeinfoID));
-	}
-
-	/**
-	 * Get an episodeinfo row by name.
-	 */
-	public function getEpisodeInfoByName($showtitle, $fullep, $epabsolute='0')
-	{
-		$db = new DB();
-
-		if($epabsolute == '0') //as string - not int.
-			if(!preg_match('/[21]\d{3}\/\d{2}\/\d{2}/', $fullep))
-				$additionalSql = sprintf('AND fullep = %s', $db->escapeString($fullep));
-			else	$additionalSql = sprintf('AND airdate LIKE %s', $db->escapeString($fullep.' %'));
-		else $additionalSql = sprintf('AND epabsolute = %s', $db->escapeString($epabsolute));
-
-		return $db->queryOneRow(sprintf('SELECT * FROM episodeinfo WHERE showtitle = %s %s', $db->escapeString($showtitle), $additionalSql));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/forum.php b/lib/copy_this/www/lib/forum.php
deleted file mode 100644
index 4f7d7ea71..000000000
--- a/lib/copy_this/www/lib/forum.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-
-/**
- * This class handles data access for forum and post data.
- */
-class Forum
-{
-	/**
-	 * Add a forum post.
-	 */
-	public function add($parentid, $userid, $subject, $message, $locked = 0, $sticky = 0, $replies = 0)
-	{
-		$db = new DB();
-
-		if ($message == "")
-			return -1;
-
-		if ($parentid != 0)
-		{
-			$par = $this->getParent($parentid);
-			if ($par == false)
-				return -1;
-
-			$db->queryExec(sprintf("update forumpost set replies = replies + 1, updateddate = now() where id = %d", $parentid));
-		}
-
-		$db->queryInsert(sprintf("INSERT INTO `forumpost` (`forumID`,`parentid`,`userid`,`subject`,`message`, `locked`, `sticky`, `replies`, `createddate`, `updateddate`) VALUES ( 1,  %d, %d,  %s,  %s, %d, %d, %d,NOW(),  NOW())",
-			$parentid, $userid, $db->escapeString($subject)	, $db->escapeString($message), $locked, $sticky, $replies));
-	}
-
-	/**
-	 * Get the top level post in a thread.
-	 */
-	public function getParent($parent)
-	{
-		$db = new DB();
-		return $db->queryOneRow(sprintf(" SELECT forumpost.*, users.username from forumpost left outer join users on users.id = forumpost.userid where forumpost.id = %d ", $parent));
-	}
-
-	/**
-	 * Get recent posts.
-	 */
-	public function getRecentPosts($limit)
-	{
-		$db = new DB();
-		return $db->query(sprintf("select forumpost.*, users.username from forumpost join (select case when parentid = 0 then id else parentid end as id, max(createddate) from forumpost group by case when parentid = 0 then id else parentid end order by max(createddate) desc) x on x.id = forumpost.id inner join users on userid = users.id limit %d", $limit));
-	}
-
-
-	/**
-	 * Get all child posts for a parent.
-	 */
-	public function getPosts($parent)
-	{
-		$db = new DB();
-		return $db->query(sprintf(" SELECT forumpost.*, CASE WHEN role=%d THEN 1 ELSE 0 END  AS 'isadmin', users.username from forumpost left outer join users on users.id = forumpost.userid where forumpost.id = %d or parentid = %d order by createddate asc limit 250", Users::ROLE_ADMIN, $parent, $parent));
-	}
-
-	/**
-	 * Get a forumpost by its id.
-	 */
-	public function getPost($id)
-	{
-		$db = new DB();
-		return $db->queryOneRow(sprintf(" SELECT * from forumpost where id = %d", $id));
-	}
-
-	/**
-	 * Get a count of all forum posts.
-	 */
-	public function getBrowseCount()
-	{
-		$db = new DB();
-		$res = $db->queryOneRow(sprintf("select count(id) as num from forumpost where parentid = 0"));
-		return $res["num"];
-	}
-
-	/**
-	 * Get a list of forum posts for browse list by limit.
-	 */
-	public function getBrowseRange($start, $num)
-	{
-		$db = new DB();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		return $db->query(sprintf(" SELECT forumpost.*, users.username from forumpost left outer join users on users.id = forumpost.userid where parentid = 0 order by updateddate desc".$limit ));
-	}
-
-	/**
-	 * Delete an entire thread.
-	 */
-	public function deleteParent($parent)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from forumpost where id = %d or parentid = %d", $parent, $parent));
-	}
-
-	/**
-	 * Delete a forumpost row.
-	 */
-	public function deletePost($id)
-	{
-		$db = new DB();
-		$post = $this->getPost($id);
-		if ($post)
-		{
-			if ($post["parentid"] == "0")
-				$this->deleteParent($id);
-			else
-				$db->queryExec(sprintf("DELETE from forumpost where id = %d", $id));
-		}
-	}
-
-	/**
-	 * Delete all forumposts for a user.
-	 */
-	public function deleteUser($id)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from forumpost where userid = %d", $id));
-	}
-
-	/**
-	 * Count of all posts for a user.
-	 */
-	public function getCountForUser($uid)
-	{
-		$db = new DB();
-		$res = $db->queryOneRow(sprintf("select count(id) as num from forumpost where userid = %d", $uid));
-		return $res["num"];
-	}
-
-	/**
-	 * Get forum posts for a user for paged list in profile.
-	 */
-	public function getForUserRange($uid, $start, $num)
-	{
-		$db = new DB();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		return $db->query(sprintf(" SELECT forumpost.*, users.username FROM forumpost LEFT OUTER JOIN users ON users.id = forumpost.userid where userid = %d order by forumpost.createddate desc ".$limit, $uid));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/framework/basepage.php b/lib/copy_this/www/lib/framework/basepage.php
deleted file mode 100644
index 7680415f3..000000000
--- a/lib/copy_this/www/lib/framework/basepage.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-require_once(SMARTY_DIR.'Smarty.class.php');
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/users.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/sabnzbd.php");
-require_once (NN_LIB . 'SmartyUtils.php');
-
-class BasePage
-{
-	public $title = '';
-	public $content = '';
-	public $head = '';
-	public $body = '';
-	public $meta_keywords = '';
-	public $meta_title = '';
-	public $meta_description = '';
-	public $page = '';
-	public $page_template = '';
-	public $smarty = '';
-	public $userdata = array();
-	public $serverurl = '';
-	public $site = '';
-	public $secure_connection = false;
-
-
-	public function __construct()
-	{
-		@session_start();
-
-		if (NN_FLOOD_CHECK) {
-			$this->floodCheck();
-		}
-
-		if ((function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) || ini_get('magic_quotes_sybase')) {
-			$this->stripSlashes($_GET);
-			$this->stripSlashes($_POST);
-			$this->stripSlashes($_REQUEST);
-			$this->stripSlashes($_COOKIE);
-		}
-
-		// set site variable
-		$s = new Sites();
-		$this->site = $s->get();
-
-		// Buffer settings/DB connection.
-		$this->settings = new DB();
-		$this->smarty = new Smarty();
-
-		if ($this->site->style != "default")
-			$this->smarty->addTemplateDir(WWW_DIR.'templates/'.$this->site->style.'/views/frontend', 'style_frontend');
-		$this->smarty->addTemplateDir(WWW_DIR.'templates/default/views/frontend', 'frontend');
-		$this->smarty->setCompileDir(SMARTY_DIR.'templates_c'.DIRECTORY_SEPARATOR);
-		$this->smarty->setConfigDir(SMARTY_DIR.'configs'.DIRECTORY_SEPARATOR);
-		$this->smarty->setCacheDir(SMARTY_DIR.'cache'.DIRECTORY_SEPARATOR);
-		$this->smarty->error_reporting = (E_ALL - E_NOTICE);
-		$this->secure_connection = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ;
-
-		if (file_exists(WWW_DIR.'templates/'.$this->site->style.'/theme.php'))
-			require_once(WWW_DIR.'templates/'.$this->site->style.'/theme.php');
-		$this->smarty->assign('themevars', (isset($themevars) ? $themevars : null));
-
-		$servername = null;
-		if (defined('EXTERNAL_PROXY_IP') && defined('EXTERNAL_HOST_NAME') && isset($_SERVER["REMOTE_ADDR"]) && $_SERVER["REMOTE_ADDR"] == EXTERNAL_PROXY_IP)
-			$servername = EXTERNAL_HOST_NAME;
-		elseif (isset($_SERVER["SERVER_NAME"]))
-			$servername = $_SERVER["SERVER_NAME"];
-
-		if ($servername != "")
-		{
-			$this->serverurl = ($this->secure_connection ? "https://" : "http://").$servername.(($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") ? ":".$_SERVER["SERVER_PORT"] : "").WWW_TOP.'/';
-			$this->smarty->assign('serverroot', $this->serverurl);
-		}
-
-		$this->page = (isset($_GET['page'])) ? $_GET['page'] : 'content';
-
-		$this->users = new Users(['Settings' => $this->settings]);
-		if ($this->users->isLoggedIn())
-		{
-			$this->userdata = $this->users->getById($this->users->currentUserId());
-
-			//
-			// user can still be logged in but have been disabled by admin, so if they are, log them off
-			//
-			if ($this->userdata["role"] == Users::ROLE_DISABLED)
-			{
-				$this->users->logout();
-				$this->show403();
-			}
-
-			$this->userdata["categoryexclusions"] = $this->users->getCategoryExclusion($this->users->currentUserId());
-
-			//update lastlogin every 15 mins
-			if (strtotime($this->userdata['now'])-900 > strtotime($this->userdata['lastlogin']))
-				$this->users->updateSiteAccessed($this->userdata['id']);
-
-			$this->smarty->assign('userdata',$this->userdata);
-			$this->smarty->assign('loggedin',"true");
-
-			if (!empty($this->userdata['nzbvortex_api_key']) && (!empty($this->userdata['nzbvortex_server_url'])))
-				$this->smarty->assign('weHasVortex', true);
-
-			$sab = new SABnzbd($this);
-			$this->smarty->assign('sabintegrated', $sab->integratedBool);
-			if ($sab->integratedBool !== false && $sab->url != '' && $sab->apikey != '') {
-				$this->smarty->assign('sabapikeytype', $sab->apikeytype);
-			}
-			if ($this->userdata["role"] == Users::ROLE_ADMIN)
-				$this->smarty->assign('isadmin',"true");
-
-			if ($this->userdata["hideads"] == "1")
-			{
-				$this->site->adheader="";
-				$this->site->adbrowse="";
-				$this->site->addetail="";
-			}
-
-			$this->floodCheck($this->userdata["role"]);
-		}
-		else
-		{
-			$this->smarty->assign('isadmin',"false");
-			$this->smarty->assign('loggedin',"false");
-			$this->floodCheck();
-		}
-
-		$this->smarty->assign('site', $this->site);
-		$this->smarty->assign('page', $this);
-	}
-
-	/**
-	 * Unquotes quoted strings recursively in an array.
-	 *
-	 * @param $array
-	 */
-	private function stripSlashes(&$array)
-	{
-		foreach ($array as $key => $value) {
-			$array[$key] = (is_array($value) ? array_map('stripslashes', $value) : stripslashes($value));
-		}
-	}
-
-	/**
-	 * Check if the user is flooding.
-	 */
-	public function floodCheck()
-	{
-		$waitTime = (NN_FLOOD_WAIT_TIME < 1 ? 5 : NN_FLOOD_WAIT_TIME);
-		// Check if this is not from CLI.
-		if (empty($argc)) {
-			// If flood wait set, the user must wait x seconds until they can access a page.
-			if (isset($_SESSION['flood_wait_until']) && $_SESSION['flood_wait_until'] > microtime(true)) {
-				$this->showFloodWarning($waitTime);
-			} else {
-				// If user not an admin, they are allowed three requests in FLOOD_THREE_REQUESTS_WITHIN_X_SECONDS seconds.
-				if (!isset($_SESSION['flood_check_hits'])) {
-					$_SESSION['flood_check_hits'] = 1;
-					$_SESSION['flood_check_time'] = microtime(true);
-				} else {
-					if ($_SESSION['flood_check_hits'] >= (NN_FLOOD_MAX_REQUESTS_PER_SECOND < 1 ? 5 : NN_FLOOD_MAX_REQUESTS_PER_SECOND)) {
-						if ($_SESSION['flood_check_time'] + 1 > microtime(true)) {
-							$_SESSION['flood_wait_until'] = microtime(true) + $waitTime;
-							unset($_SESSION['flood_check_hits']);
-							$this->showFloodWarning($waitTime);
-						} else {
-							$_SESSION['flood_check_hits'] = 1;
-							$_SESSION['flood_check_time'] = microtime(true);
-						}
-					} else {
-						$_SESSION['flood_check_hits']++;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Done in html here to reduce any smarty processing burden if a large flood is underway.
-	 *
-	 * @param int $seconds
-	 */
-	public function showFloodWarning($seconds = 5)
-	{
-		header('Retry-After: ' . $seconds);
-		$this->show503(
-			sprintf(
-				'Too many requests!</p><p>You must wait <b>%s seconds</b> before trying again.',
-				$seconds
-			)
-		);
-	}
-
-	//
-	// Inject content into the html head
-	//
-	public function addToHead($headcontent)
-	{
-		$this->head = $this->head."\n".$headcontent;
-	}
-
-	//
-	// Inject js/attributes into the html body tag
-	//
-	public function addToBody($attr)
-	{
-		$this->body = $this->body." ".$attr;
-	}
-
-	public function isPostBack()
-	{
-		return (strtoupper($_SERVER["REQUEST_METHOD"]) === "POST");
-	}
-
-	public function show404()
-	{
-		header("HTTP/1.1 404 Not Found");
-		die();
-	}
-
-	public function show403($from_admin = false)
-	{
-		$redirect_path = ($from_admin) ? str_replace('/admin', '', WWW_TOP) : WWW_TOP;
-		header("Location: $redirect_path/login?redirect=".urlencode($_SERVER["REQUEST_URI"]));
-		die();
-	}
-
-	public function show503($retry='')
-	{
-		header('HTTP/1.1 503 Service Temporarily Unavailable');
-		header('Status: 503 Service Temporarily Unavailable');
-		if ($retry != '')
-			header('Retry-After: '.$retry);
-
-		echo "
-			<html>
-			<head>
-				<title>Service Unavailable</title>
-			</head>
-
-			<body>
-				<h1>Service Unavailable</h1>
-
-				<p>Your maximum api or download limit has been reached for the day</p>
-
-			</body>
-			</html>";
-		die();
-	}
-
-	public function show429($retry='')
-	{
-		header('HTTP/1.1 429 Too Many Requests');
-		if ($retry != '')
-			header('Retry-After: '.$retry);
-
-		echo "
-			<html>
-			<head>
-				<title>Too Many Requests</title>
-			</head>
-
-			<body>
-				<h1>Too Many Requests</h1>
-
-				<p>Wait ".(($retry != '') ? ceil($retry/60).' minutes ' : '')."or risk being temporarily banned.</p>
-
-			</body>
-			</html>";
-		die();
-	}
-
-	public function render()
-	{
-		$this->smarty->display($this->page_template);
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/framework/cache.php b/lib/copy_this/www/lib/framework/cache.php
deleted file mode 100644
index 344111c6f..000000000
--- a/lib/copy_this/www/lib/framework/cache.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * Class Cache
- *
- * Class for connecting to a memcached or redis server to cache data.
- *
- */
-Class Cache
-{
-	const SERIALIZER_PHP      = 0;
-	const SERIALIZER_IGBINARY = 1;
-	const SERIALIZER_NONE     = 2;
-
-	const TYPE_DISABLED  = 0;
-	const TYPE_MEMCACHED = 1;
-	const TYPE_REDIS     = 2;
-
-	/**
-	 * @var Memcached|Redis
-	 */
-	private $server = null;
-
-	/**
-	 * Are we connected to the cache server?
-	 * @var bool
-	 */
-	private $connected = false;
-
-	/**
-	 * Optional socket file location.
-	 * @var bool|string
-	 */
-	private $socketFile;
-
-	/**
-	 * Serializer type.
-	 * @var bool|int
-	 */
-	private $serializerType;
-
-	/**
-	 * Are we using redis or memcached?
-	 * @var bool
-	 */
-	private $isRedis = true;
-
-	/**
-	 * Does the user have igBinary support and wants to use it?
-	 * @var bool
-	 */
-	private $IgBinarySupport = false;
-
-	/**
-	 * Store data on the cache server.
-	 *
-	 * @param string       $key        Key we can use to retrieve the data.
-	 * @param string|array $data       Data to store on the cache server.
-	 * @param int          $expiration Time before the data expires on the cache server.
-	 *
-	 * @return bool Success/Failure.
-	 * @access public
-	 */
-	public function set($key, $data, $expiration)
-	{
-		if ($this->connected === true && $this->ping() === true) {
-			return $this->server->set(
-				$key,
-				($this->isRedis ? ($this->IgBinarySupport ? igbinary_serialize($data) : serialize($data)) : $data),
-				$expiration
-			);
-		}
-		return false;
-	}
-
-	/**
-	 * Attempt to retrieve a value from the cache server, if not set it.
-	 *
-	 * @param string $key Key we can use to retrieve the data.
-	 *
-	 * @return bool|string False on failure or String, data belonging to the key.
-	 * @access public
-	 */
-	public function get($key)
-	{
-		if ($this->connected === true && $this->ping() === true) {
-			$data = $this->server->get($key);
-			return ($this->isRedis ? ($this->IgBinarySupport ? igbinary_unserialize($data) : unserialize($data)) : $data);
-		}
-		return false;
-	}
-
-	/**
-	 * Delete data tied to a key on the cache server.
-	 *
-	 * @param string $key Key we can use to retrieve the data.
-	 *
-	 * @return bool True if deleted, false if not.
-	 * @access public
-	 */
-	public function delete($key)
-	{
-		if ($this->connected === true && $this->ping() === true) {
-			return (bool) $this->server->delete($key);
-		}
-		return false;
-	}
-
-	/**
-	 * Flush all data from the cache server?
-	 */
-	public function flush()
-	{
-		if ($this->connected === true && $this->ping() === true) {
-			if ($this->isRedis === true) {
-				$this->server->flushAll();
-			} else {
-				$this->server->flush();
-			}
-		}
-	}
-
-	/**
-	 * Create a SHA1 hash from a string which can be used to store/retrieve data.
-	 *
-	 * @param string $string
-	 *
-	 * @return string SHA1 hash of the input string.
-	 * @access public
-	 */
-	public function createKey($string)
-	{
-		return sha1($string);
-	}
-
-	/**
-	 * Get cache server statistics.
-	 *
-	 * @return array|string
-	 * @access public
-	 */
-	public function serverStatistics()
-	{
-		if ($this->connected === true && $this->ping() === true) {
-			if ($this->isRedis === true) {
-				return $this->server->info();
-			} else {
-				return $this->server->getStats();
-			}
-		}
-		return array();
-	}
-
-	/**
-	 * Verify the user's cache settings, try to connect to the cache server.
-	 */
-	public function __construct()
-	{
-		if (!defined('NN_CACHE_HOSTS')) {
-			throw new CacheException(
-				'The NN_CACHE_HOSTS is not defined! Define it in settings.php'
-			);
-		}
-
-		if (!defined('NN_CACHE_TIMEOUT')) {
-			throw new CacheException(
-				'The NN_CACHE_TIMEOUT is not defined! Define it in settings.php, it is the time in seconds to time out from your cache server.'
-			);
-		}
-
-		$this->socketFile = false;
-		if (defined('NN_CACHE_SOCKET_FILE') && NN_CACHE_SOCKET_FILE != '') {
-			$this->socketFile = true;
-		}
-
-		$this->serializerType = false;
-		if (defined('NN_CACHE_SERIALIZER')) {
-			$this->serializerType = true;
-		}
-
-		switch(NN_CACHE_TYPE) {
-
-			case self::TYPE_REDIS:
-				if (!extension_loaded('redis')) {
-					throw new CacheException('The redis extension is not loaded!');
-				}
-				$this->server = new Redis();
-				$this->isRedis = true;
-				$this->connect();
-				if ($this->serializerType !== false) {
-					$this->serializerType = $this->verifySerializer();
-					$this->server->setOption(Redis::OPT_SERIALIZER, $this->serializerType);
-				}
-				break;
-
-			case self::TYPE_MEMCACHED:
-				if (!extension_loaded('memcached')) {
-					throw new CacheException('The memcached extension is not loaded!');
-				}
-				$this->server = new Memcached();
-				$this->isRedis = false;
-				if ($this->serializerType !== false) {
-					$this->serializerType = $this->verifySerializer();
-					$this->server->setOption(Memcached::OPT_SERIALIZER, $this->serializerType);
-				}
-				$this->server->setOption(Memcached::OPT_COMPRESSION, (defined('NN_CACHE_COMPRESSION') ? NN_CACHE_COMPRESSION : false));
-				$this->connect();
-				break;
-
-			case self::TYPE_DISABLED:
-			default:
-				return;
-		}
-	}
-
-	/**
-	 * Destroy the connections.
-	 */
-	public function __destruct()
-	{
-		switch(NN_CACHE_TYPE) {
-			case self::TYPE_REDIS:
-				$this->server->close();
-				break;
-			case self::TYPE_MEMCACHED:
-				$this->server->quit();
-				break;
-		}
-	}
-
-	/**
-	 * Connect to the cache server(s).
-	 *
-	 * @throws CacheException
-	 * @access private
-	 */
-	private function connect()
-	{
-		$this->connected = false;
-		if ($this->isRedis === true) {
-			if ($this->socketFile === false) {
-				$servers = unserialize(NN_CACHE_HOSTS);
-				foreach ($servers as $server) {
-					if ($this->server->connect($server['host'], $server['port'], (float)NN_CACHE_TIMEOUT) === false) {
-						throw new CacheException('Error connecting to the Redis server!');
-					} else {
-						$this->connected = true;
-					}
-				}
-			} else {
-				if ($this->server->connect(NN_CACHE_SOCKET_FILE) === false) {
-					throw new CacheException('Error connecting to the Redis server!');
-				} else {
-					$this->connected = true;
-				}
-			}
-		} else {
-			if ($this->socketFile === false) {
-				if ($this->server->addServers(unserialize(NN_CACHE_HOSTS)) === false) {
-					throw new CacheException('Error connecting to the Memcached server!');
-				} else {
-					$this->connected = true;
-				}
-			} else {
-				if ($this->server->addServers(array(array(NN_CACHE_SOCKET_FILE, 'port' => 0))) === false) {
-					throw new CacheException('Error connecting to the Memcached server!');
-				} else {
-					$this->connected = true;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Redis supports ping'ing the server, so use it.
-	 */
-	private function ping()
-	{
-		if ($this->isRedis === true) {
-			try {
-				return (bool) $this->server->ping();
-			} catch (RedisException $error) {
-				$this->connect();
-				return $this->connected;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Verify the user selected serializer, return the memcached or redis appropriate serializer option.
-	 *
-	 * @return int
-	 * @throws CacheException
-	 * @access private
-	 */
-	private function verifySerializer()
-	{
-		switch(NN_CACHE_SERIALIZER) {
-			case self::SERIALIZER_IGBINARY:
-				if (extension_loaded('igbinary')) {
-					$this->IgBinarySupport = true;
-					if ($this->isRedis === true) {
-						return Redis::SERIALIZER_IGBINARY;
-					} else {
-						if (Memcached::HAVE_IGBINARY > 0) {
-							return Memcached::SERIALIZER_IGBINARY;
-						} else {
-							throw new CacheException('Error: You have not compiled Memcached with igbinary support!');
-						}
-					}
-				} else {
-					throw new CacheException('Error: The igbinary extension is not loaded!');
-				}
-			case self::SERIALIZER_NONE:
-				if ($this->isRedis === true) {
-					return Redis::SERIALIZER_NONE;
-				} else {
-					throw new CacheException('Error: Disabled serialization is not available on Memcached!');
-				}
-			case self::SERIALIZER_PHP:
-			default:
-				if ($this->isRedis === true) {
-					return Redis::SERIALIZER_PHP;
-				} else {
-					return Memcached::SERIALIZER_PHP;
-				}
-		}
-	}
-
-}
-
-/**
- * Class CacheException
- *
- */
-Class CacheException extends Exception {}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/framework/db.php b/lib/copy_this/www/lib/framework/db.php
deleted file mode 100644
index d5552bdbe..000000000
--- a/lib/copy_this/www/lib/framework/db.php
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?php
-require_once(WWW_DIR . "lib/framework/cache.php");
-require_once(WWW_DIR . "lib/util.php");
-require_once(WWW_DIR . "lib/ConsoleTools.php");
-require_once(WWW_DIR . "lib/ColorCLI.php");
-require_once(WWW_DIR . "lib/Logger.php");
-
-
-/**
- * Class for handling connection to MySQL database using \PDO.
- *
- * The class extends \PDO, thereby exposing all of \PDO's functionality directly
- * without the need to wrap each and every method here.
- *
- * Exceptions are caught and displayed to the user.
- * Properties are explicitly created, so IDEs can offer autocompletion for them.
- * @extends \PDO
- */
-class DB extends \PDO
-{
-	/**
-	 * @var bool Is this a Command Line Interface instance.
-	 *
-	 * This needs to be revisited when moving to li3. Web pages do not need this class so it shouldn't be included by default.
-	 */
-	public $cli;
-
-	/**
-	 * @var object Instance of ConsoleTools class.
-	 */
-	public $ct;
-
-	/**
-	 * @var ColorCLI	Instance variable for logging object. Currently only ColorCLI supported,
-	 * but expanding for full logging with agnostic API planned.
-	 */
-	public $log;
-
-	/**
-	 * @note Setting this static causes issues when creating multiple instances of this class with different
-	 *       MySQL servers, the next instances re-uses the server of the first instance.
-	 * @var \PDO Instance of \PDO class.
-	 */
-	public $pdo = null;
-
-	/**
-	 * @var bool
-	 */
-	protected $_debug;
-
-	/**
-	 * @var object Class instance debugging.
-	 */
-	private $debugging;
-
-	/**
-	 * @var string Lower-cased name of DBMS in use.
-	 */
-	private $dbSystem;
-
-	/**
-	 * @var string Version of the Db server.
-	 */
-	private $dbVersion;
-
-	/**
-	 * @var string	Stored copy of the dsn used to connect.
-	 */
-	private $dsn;
-
-	/**
-	 * @var array    Options passed into the constructor or defaulted.
-	 */
-	private $opts;
-
-	/**
-	 * @var null Cache
-	 */
-	private $cacheServer = null;
-
-	/**
-	 * @var bool Should we cache the results of the query method?
-	 */
-	private $cacheEnabled = false;
-
-	/**
-	 * Constructor. Sets up all necessary properties. Instantiates a \PDO object
-	 * if needed, otherwise returns the current one.
-	 */
-	public function __construct(array $options = [])
-	{
-		$this->cli = Utility::isCLI();
-
-		$defaults = [
-			'checkVersion'	=> false,
-			'createDb'		=> false, // create dbname if it does not exist?
-			'ct'			=> new \ConsoleTools(),
-			'dbhost'		=> defined('DB_HOST') ? DB_HOST : '',
-			'dbname' 		=> defined('DB_NAME') ? DB_NAME : '',
-			'dbpass' 		=> defined('DB_PASSWORD') ? DB_PASSWORD : '',
-			'dbport'		=> defined('DB_PORT') ? DB_PORT : '',
-			'dbsock'		=> defined('DB_SOCKET') ? DB_SOCKET : '',
-			'dbtype'		=> defined('DB_TYPE') ? DB_TYPE : '',
-			'dbuser' 		=> defined('DB_USER') ? DB_USER : '',
-			'log'			=> new \ColorCLI(),
-			'persist'		=> false,
-		];
-		$options += $defaults;
-
-		if (!$this->cli) {
-			$options['log'] = null;
-		}
-		$this->opts = $options;
-
-		if (!empty($this->opts['dbtype'])) {
-			$this->dbSystem = strtolower($this->opts['dbtype']);
-		}
-
-		if (!($this->pdo instanceof \PDO)) {
-			$this->initialiseDatabase();
-		}
-
-		$this->cacheEnabled = (defined('NN_CACHE_TYPE') && (NN_CACHE_TYPE > 0) ? true : false);
-
-		if ($this->cacheEnabled) {
-			try {
-				$this->cacheServer = new Cache();
-			} catch (CacheException $error) {
-				$this->cacheEnabled = false;
-				$this->echoError($error->getMessage(), '__construct', 4);
-			}
-		}
-
-		$this->ct = $this->opts['ct'];
-		$this->log = $this->opts['log'];
-
-		$this->_debug = (NN_DEBUG || NN_LOGGING);
-		if ($this->_debug) {
-			try {
-				$this->debugging = new \Logger(['ColorCLI' => $this->log]);
-			} catch (\LoggerException $error) {
-				$this->_debug = false;
-			}
-		}
-
-		if ($this->opts['checkVersion']) {
-			$this->fetchDbVersion();
-		}
-
-		return $this->pdo;
-	}
-
-	public function __destruct()
-	{
-		$this->pdo = null;
-	}
-
-	public function checkDbExists ($name = null)
-	{
-		if (empty($name)) {
-			$name = $this->opts['dbname'];
-		}
-
-		$found  = false;
-		$tables = self::getTableList();
-		foreach ($tables as $table) {
-			if ($table['Database'] == $name) {
-				$found = true;
-				break;
-			}
-		}
-		return $found;
-	}
-
-	/**
-	 * Looks up info for index on table.
-	 *
-	 * @param $table string Table to look at.
-	 * @param $index string Index to check.
-	 *
-	 * @return bool|array False on failure, associative array of SHOW data.
-	 */
-	public function checkIndex($table, $index)
-	{
-		$result = $this->pdo->query(
-			sprintf(
-				"SHOW INDEX FROM %s WHERE key_name = '%s'",
-				trim($table),
-				trim($index)
-			)
-		);
-		if ($result === false) {
-			return false;
-		}
-
-		return $result->fetch(\PDO::FETCH_ASSOC);
-	}
-
-	public function checkColumnIndex($table, $column)
-	{
-		$result = $this->pdo->query(
-			sprintf(
-				"SHOW INDEXES IN %s WHERE non_unique = 0 AND column_name = '%s'",
-				trim($table),
-				trim($column)
-			)
-		);
-		if ($result === false) {
-			return false;
-		}
-
-		return $result->fetchAll(\PDO::FETCH_ASSOC);
-	}
-
-	public function debugDisable()
-	{
-		unset($this->debugging);
-		$this->_debug = false;
-	}
-
-	public function debugEnable()
-	{
-		$this->_debug = true;
-		try {
-			$this->debugging = new \Logger(['ColorCLI' => $this->log]);
-		} catch (\LoggerException $error) {
-			$this->_debug = false;
-		}
-	}
-
-	public function getTableList ()
-	{
-		$query  = ($this->opts['dbtype'] === 'mysql' ? 'SHOW DATABASES' : 'SELECT datname AS Database FROM pg_database');
-		$result = $this->pdo->query($query);
-		return $result->fetchAll(\PDO::FETCH_ASSOC);
-	}
-
-	/**
-	 * @return bool Whether the Db is definitely on the local machine.
-	 */
-	public function isLocalDb ()
-	{
-		if (!empty($this->opts['dbsock']) || $this->opts['dbhost'] == 'localhost') {
-			return true;
-		}
-
-		preg_match_all('/inet' . '6?' . ' addr: ?([^ ]+)/', `ifconfig`, $ips);
-
-		// Check for dotted quad - if exists compare against local IP number(s)
-		if (preg_match('#^\d+\.\d+\.\d+\.\d+$#', $this->opts['dbhost'])) {
-			if (in_array($this->opts['dbhost'], $ips[1])) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Init \PDO instance.
-	 */
-	private function initialiseDatabase()
-	{
-
-		if (!empty($this->opts['dbsock'])) {
-			$dsn = $this->dbSystem . ':unix_socket=' . $this->opts['dbsock'];
-		} else {
-			$dsn = $this->dbSystem . ':host=' . $this->opts['dbhost'];
-			if (!empty($this->opts['dbport'])) {
-				$dsn .= ';port=' . $this->opts['dbport'];
-			}
-		}
-		$dsn .= ';charset=utf8';
-
-		$options = [
-			\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
-			\PDO::ATTR_TIMEOUT => 180,
-			\PDO::ATTR_PERSISTENT => $this->opts['persist'],
-			\PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8",
-			\PDO::MYSQL_ATTR_LOCAL_INFILE => true
-		];
-
-		$this->dsn = $dsn;
-		// removed try/catch to let the instantiating code handle the problem (Install for
-		// instance can output a message that connecting failed.
-		$this->pdo = new \PDO($dsn, $this->opts['dbuser'], $this->opts['dbpass'], $options);
-
-		if ($this->opts['dbname'] != '') {
-			if ($this->opts['createDb']) {
-				$found = self::checkDbExists();
-				if ($found) {
-					try {
-						$this->pdo->query("DROP DATABASE " . $this->opts['dbname']);
-					} catch (\Exception $e) {
-						throw new \RuntimeException("Error trying to drop your old database: '{$this->opts['dbname']}'", 2);
-					}
-					$found = self::checkDbExists();
-				}
-
-				if ($found) {
-					var_dump(self::getTableList());
-					throw new \RuntimeException("Could not drop your old database: '{$this->opts['dbname']}'", 2);
-				} else {
-					$this->pdo->query("CREATE DATABASE `{$this->opts['dbname']}`  DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci");
-
-					if (!self::checkDbExists()) {
-						throw new \RuntimeException("Could not create new database: '{$this->opts['dbname']}'", 3);
-					}
-				}
-			}
-			$this->pdo->query("USE {$this->opts['dbname']}");
-		}
-
-		// In case \PDO is not set to produce exceptions (PHP's default behaviour).
-		if ($this->pdo === false) {
-			$this->echoError(
-				"Unable to create connection to the Database!",
-				'initialiseDatabase',
-				1,
-				true
-			);
-		}
-
-		// For backwards compatibility, no need for a patch.
-		$this->pdo->setAttribute(\PDO::ATTR_CASE, \PDO::CASE_LOWER);
-		$this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
-		$this->pdo->setAttribute(\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
-	}
-
-	/**
-	 * Echo error, optionally exit.
-	 *
-	 * @param string     $error    The error message.
-	 * @param string     $method   The method where the error occured.
-	 * @param int        $severity The severity of the error.
-	 * @param bool       $exit     Exit or not?
-	 */
-	protected function echoError($error, $method, $severity, $exit = false)
-	{
-		if ($this->_debug) {
-			$this->debugging->log('DB', $method, $error, $severity);
-
-			echo(
-			($this->cli ? $this->log->error($error) . PHP_EOL : '<div class="error">' . $error . '</div>')
-			);
-		}
-
-		if ($exit) {
-			exit();
-		}
-	}
-
-	/**
-	 * @return string mysql.
-	 */
-	public function DbSystem()
-	{
-		return $this->dbSystem;
-	}
-
-	/**
-	 * Returns a string, escaped with single quotes, false on failure. http://www.php.net/manual/en/pdo.quote.php
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	public function escapeString($str)
-	{
-		if (is_null($str)) {
-			return 'NULL';
-		}
-
-		return $this->pdo->quote($str);
-	}
-
-	/**
-	 * Formats a 'like' string. ex.(LIKE '%chocolate%')
-	 *
-	 * @param string $str    The string.
-	 * @param bool   $left   Add a % to the left.
-	 * @param bool   $right  Add a % to the right.
-	 *
-	 * @return string
-	 */
-	public function likeString($str, $left=true, $right=true)
-	{
-		return (
-			'LIKE ' .
-			$this->escapeString(
-				($left  ? '%' : '') .
-				$str .
-				($right ? '%' : '')
-			)
-		);
-	}
-
-	/**
-	 * Verify if pdo var is instance of \PDO class.
-	 *
-	 * @return bool
-	 */
-	public function isInitialised()
-	{
-		return ($this->pdo instanceof \PDO);
-	}
-
-	/**
-	 * For inserting a row. Returns last insert id. queryExec is better if you do not need the id.
-	 *
-	 * @param string $query
-	 *
-	 * @return bool|int
-	 */
-	public function queryInsert($query)
-	{
-		if (empty($query)) {
-			return false;
-		}
-
-		if (NN_QUERY_STRIP_WHITESPACE) {
-			$query = Utility::collapseWhiteSpace($query);
-		}
-
-		$i = 2;
-		$error = '';
-		while($i < 11) {
-			$result = $this->queryExecHelper($query, true);
-			if (is_array($result) && isset($result['deadlock'])) {
-				$error = $result['message'];
-				if ($result['deadlock'] === true) {
-					$this->echoError("A Deadlock or lock wait timeout has occurred, sleeping.(" . ($i-1) . ")", 'queryInsert', 4);
-					$this->ct->showsleep($i * ($i/2));
-					$i++;
-				} else {
-					break;
-				}
-			} elseif ($result === false) {
-				$error = 'Unspecified error.';
-				break;
-			} else {
-				return $result;
-			}
-		}
-		if ($this->_debug) {
-			$this->echoError($error, 'queryInsert', 4);
-			$this->debugging->log('DB', "queryInsert", $query, \Logger::LOG_SQL);
-		}
-		return false;
-	}
-
-	/**
-	 * Used for deleting, updating (and inserting without needing the last insert id).
-	 *
-	 * @param string $query
-	 * @param bool   $silent Echo or log errors?
-	 *
-	 * @return bool|PDOStatement
-	 */
-	public function queryExec($query, $silent = false)
-	{
-		if (empty($query)) {
-			return false;
-		}
-
-		if (NN_QUERY_STRIP_WHITESPACE) {
-			$query = Utility::collapseWhiteSpace($query);
-		}
-
-		$i = 2;
-		$error = '';
-		while($i < 11) {
-			$result = $this->queryExecHelper($query);
-			if (is_array($result) && isset($result['deadlock'])) {
-				$error = $result['message'];
-				if ($result['deadlock'] === true) {
-					$this->echoError("A Deadlock or lock wait timeout has occurred, sleeping.(" . ($i-1) . ")", 'queryExec', 4);
-					$this->ct->showsleep($i * ($i/2));
-					$i++;
-				} else {
-					break;
-				}
-			} elseif ($result === false) {
-				$error = 'Unspecified error.';
-				break;
-			} else {
-				return $result;
-			}
-		}
-		if ($silent === false && $this->_debug) {
-			$this->echoError($error, 'queryExec', 4);
-			$this->debugging->log('DB', "queryExec", $query, \Logger::LOG_SQL);
-		}
-		return false;
-	}
-
-	/**
-	 * Helper method for queryInsert and queryExec, checks for deadlocks.
-	 *
-	 * @param string $query
-	 * @param bool   $insert
-	 *
-	 * @return array|PDOStatement
-	 */
-	protected function queryExecHelper($query, $insert = false)
-	{
-		try {
-			if ($insert === false ) {
-				$run = $this->pdo->prepare($query);
-				$run->execute();
-				return $run;
-			} else {
-				$ins = $this->pdo->prepare($query);
-				$ins->execute();
-				return $this->pdo->lastInsertId();
-			}
-
-		} catch (\PDOException $e) {
-			// Deadlock or lock wait timeout, try 10 times.
-			if (
-				$e->errorInfo[1] == 1213 ||
-				$e->errorInfo[0] == 40001 ||
-				$e->errorInfo[1] == 1205 ||
-				$e->getMessage() == 'SQLSTATE[40001]: Serialization failure: 1213 Deadlock found when trying to get lock; try restarting transaction'
-			) {
-				return ['deadlock' => true, 'message' => $e->getMessage()];
-			}
-
-			// Check if we lost connection to MySQL.
-			else if ($this->_checkGoneAway($e->getMessage()) !== false) {
-
-				// Reconnect to MySQL.
-				if ($this->_reconnect() === true) {
-
-					// If we reconnected, retry the query.
-					return $this->queryExecHelper($query, $insert);
-
-				}
-			}
-
-			return ['deadlock' => false, 'message' => $e->getMessage()];
-		}
-	}
-
-	/**
-	 * Direct query. Return the affected row count. http://www.php.net/manual/en/pdo.exec.php
-	 *
-	 * @note If not "consumed", causes this error:
-	 *       'SQLSTATE[HY000]: General error: 2014 Cannot execute queries while other unbuffered queries are active.
-	 *        Consider using PDOStatement::fetchAll(). Alternatively, if your code is only ever going to run against mysql,
-	 *        you may enable query buffering by setting the \PDO::MYSQL_ATTR_USE_BUFFERED_QUERY attribute.'
-	 *
-	 * @param string $query
-	 * @param bool   $silent Whether to skip echoing errors to the console.
-	 *
-	 * @return bool|int|PDOStatement
-	 */
-	public function exec($query, $silent = false)
-	{
-		if (empty($query)) {
-			return false;
-		}
-
-		if (NN_QUERY_STRIP_WHITESPACE) {
-			$query = Utility::collapseWhiteSpace($query);
-		}
-
-		try {
-			return $this->pdo->exec($query);
-
-		} catch (\PDOException $e) {
-
-			// Check if we lost connection to MySQL.
-			if ($this->_checkGoneAway($e->getMessage()) !== false) {
-
-				// Reconnect to MySQL.
-				if ($this->_reconnect() === true) {
-
-					// If we reconnected, retry the query.
-					return $this->exec($query, $silent);
-
-				} else {
-					// If we are not reconnected, return false.
-					return false;
-				}
-
-			} else if (!$silent) {
-				$this->echoError($e->getMessage(), 'Exec', 4, false);
-
-				if ($this->_debug) {
-					$this->debugging->log('DB', "Exec", $query, \Logger::LOG_SQL);
-				}
-			}
-
-			return false;
-		}
-	}
-
-	/**
-	 * Returns an array of result (empty array if no results or an error occurs)
-	 * Optional: Pass true to cache the result with a cache server.
-	 *
-	 * @param string $query       SQL to execute.
-	 * @param bool   $cache       Indicates if the query result should be cached.
-	 * @param int    $cacheExpiry The time in seconds before deleting the query result from the cache server.
-	 *
-	 * @return array Array of results (possibly empty) on success, empty array on failure.
-	 */
-	public function query($query, $cache = false, $cacheExpiry = 600)
-	{
-		if (empty($query)) {
-			return false;
-		}
-
-		if (NN_QUERY_STRIP_WHITESPACE) {
-			$query = Utility::collapseWhiteSpace($query);
-		}
-
-		if ($cache === true && $this->cacheEnabled === true) {
-			try {
-				$data = $this->cacheServer->get($this->cacheServer->createKey($query));
-				if ($data !== false) {
-					return $data;
-				}
-			} catch (CacheException $error) {
-				$this->echoError($error->getMessage(), 'query', 4);
-			}
-		}
-
-		$result = $this->queryArray($query);
-
-		if ($result !== false && $cache === true && $this->cacheEnabled === true) {
-			$this->cacheServer->set($this->cacheServer->createKey($query), $result, $cacheExpiry);
-		}
-
-		return ($result === false) ? [] : $result;
-	}
-
-	/**
-	 * Main method for creating results as an array.
-	 *
-	 * @param string $query SQL to execute.
-	 *
-	 * @return array|boolean Array of results on success or false on failure.
-	 */
-	public function queryArray($query)
-	{
-		$result = false;
-		if (!empty($query)) {
-			$result = $this->queryDirect($query);
-
-			if (!empty($result)) {
-				$result = $result->fetchAll();
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Returns all results as an associative array.
-	 *
-	 * Do not use this function for large dat-asets, as it can cripple the Db server and use huge
-	 * amounts of RAM. Instead iterate through the data.
-	 *
-	 * @param string $query The query to execute.
-	 *
-	 * @return array|boolean Array of results on success, false otherwise.
-	 */
-	public function queryAssoc($query)
-	{
-		if ($query == '') {
-			return false;
-		}
-		$mode = $this->pdo->getAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE);
-		if ($mode != \PDO::FETCH_ASSOC) {
-			$this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
-		}
-
-		$result = $this->queryArray($query);
-
-		if ($mode != \PDO::FETCH_ASSOC) {
-			$this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
-		}
-		return $result;
-	}
-
-	/**
-	 * Fetch a assoc row from a result set
-	 *
-	 * @param $result
-	 * @return array|PDOStatement
-	 */
-	public function getAssocArray($result)
-	{
-		return $result->fetch(\PDO::FETCH_ASSOC);
-	}
-
-	/**
-	 * Get the total number of rows in the result set
-	 *
-	 * @param $result
-	 * @return int|PDOStatement
-	 */
-	public function getNumRows($result)
-	{
-		return $result->rowCount();
-	}
-
-	/**
-	 * Query without returning an empty array like our function query(). http://php.net/manual/en/pdo.query.php
-	 *
-	 * @param string $query  The query to run.
-	 * @param bool   $ignore Ignore errors, do not log them?
-	 *
-	 * @return bool|PDOStatement
-	 */
-	public function queryDirect($query, $ignore = false)
-	{
-		if (empty($query)) {
-			return false;
-		}
-
-		if (NN_QUERY_STRIP_WHITESPACE) {
-			$query = Utility::collapseWhiteSpace($query);
-		}
-
-		try {
-			$result = $this->pdo->query($query);
-		} catch (\PDOException $e) {
-
-			// Check if we lost connection to MySQL.
-			if ($this->_checkGoneAway($e->getMessage()) !== false) {
-
-				// Reconnect to MySQL.
-				if ($this->_reconnect() === true) {
-
-					// If we reconnected, retry the query.
-					$result = $this->queryDirect($query);
-
-				} else {
-					// If we are not reconnected, return false.
-					$result = false;
-				}
-
-			} else {
-				if ($ignore === false) {
-					$this->echoError($e->getMessage(), 'queryDirect', 4, false);
-					if ($this->_debug) {
-						$this->debugging->log('DB', "queryDirect", $query, \Logger::LOG_SQL);
-					}
-				}
-				$result = false;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Reconnect to MySQL when the connection has been lost.
-	 *
-	 * @see ping(), _checkGoneAway() for checking the connection.
-	 *
-	 * @return bool
-	 */
-	protected function _reconnect()
-	{
-		$this->initialiseDatabase();
-
-		// Check if we are really connected to MySQL.
-		if ($this->ping() === false) {
-			// If we are not reconnected, return false.
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Verify that we've lost a connection to MySQL.
-	 *
-	 * @param string $errorMessage
-	 *
-	 * @return bool
-	 */
-	protected function _checkGoneAway($errorMessage)
-	{
-		if (stripos($errorMessage, 'MySQL server has gone away') !== false) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the first row of the query.
-	 *
-	 * @param string $query
-	 * @param bool   $appendLimit
-	 *
-	 * @return array|bool
-	 */
-	public function queryOneRow($query, $appendLimit = true)
-	{
-		// Force the query to only return 1 row, so queryArray doesn't potentially run out of memory on a large data set.
-		// First check if query already contains a LIMIT clause.
-		if (preg_match('#\s+LIMIT\s+(?P<lower>\d+)(,\s+(?P<upper>\d+))?(;)?$#i', $query, $matches)) {
-			If (!isset($matches['upper']) && isset($matches['lower']) && $matches['lower'] == 1) {
-				// good it's already correctly set.
-			} else { // We have a limit, but it's not for a single row
-				return false;
-			}
-
-		} else if ($appendLimit) {
-			$query .= ' LIMIT 1';
-		}
-
-		$rows = $this->query($query);
-		if (!$rows || count($rows) == 0) {
-			$rows = false;
-		}
-
-		return is_array($rows) ? $rows[0] : $rows;
-	}
-
-	/**
-	 * Optimises/repairs tables on mysql.
-	 *
-	 * @param bool   $admin    If we are on web, don't echo.
-	 * @param string $type     'full' | '' Force optimize of all tables.
-	 *                         'space'     Optimise tables with 5% or more free space.
-	 *                         'analyze'   Analyze tables to rebuild statistics.
-	 * @param bool  $local     Only analyze local tables. Good if running replication.
-	 * @param array $tableList (optional) Names of tables to analyze.
-	 *
-	 * @return int Quantity optimized/analyzed
-	 */
-	public function optimise($admin = false, $type = '', $local = false, $tableList = [])
-	{
-		$tableAnd = '';
-		if (count($tableList)) {
-			foreach ($tableList as $tableName) {
-				$tableAnd .= ($this->escapeString($tableName) . ',');
-			}
-			$tableAnd = (' AND name IN (' . rtrim($tableAnd, ',') . ')');
-		}
-
-		switch ($type) {
-			case 'space':
-				$tableArray = $this->queryDirect('SHOW TABLE STATUS WHERE Data_free / Data_length > 0.005' . $tableAnd);
-				$myIsamTables = $this->queryDirect("SHOW TABLE STATUS WHERE ENGINE LIKE 'myisam' AND Data_free / Data_length > 0.005" . $tableAnd);
-				break;
-			case 'analyze':
-			case '':
-			case 'full':
-			default:
-				$tableArray = $this->queryDirect('SHOW TABLE STATUS WHERE 1=1' . $tableAnd);
-				$myIsamTables = $this->queryDirect("SHOW TABLE STATUS WHERE ENGINE LIKE 'myisam'" . $tableAnd);
-				break;
-		}
-
-		$optimised = 0;
-		if ($tableArray instanceof \Traversable && $tableArray->rowCount()) {
-
-			$tableNames = '';
-			foreach ($tableArray as $table) {
-				$tableNames .= $table['name'] . ',';
-			}
-			$tableNames = rtrim($tableNames, ',');
-
-			$local = ($local ? 'LOCAL' : '');
-			if ($type === 'analyze') {
-				$this->queryExec(sprintf('ANALYZE %s TABLE %s', $local, $tableNames));
-				$this->logOptimize($admin, 'ANALYZE', $tableNames);
-			} else {
-
-				$this->queryExec(sprintf('OPTIMIZE %s TABLE %s', $local, $tableNames));
-				$this->logOptimize($admin, 'OPTIMIZE', $tableNames);
-
-				if ($myIsamTables instanceof \Traversable && $myIsamTables->rowCount()) {
-					$tableNames = '';
-					foreach ($myIsamTables as $table) {
-						$tableNames .= $table['name'] . ',';
-					}
-					$tableNames = rtrim($tableNames, ',');
-					$this->queryExec(sprintf('REPAIR %s TABLE %s', $local, $tableNames));
-					$this->logOptimize($admin, 'REPAIR', $tableNames);
-				}
-				$this->queryExec(sprintf('FLUSH %s TABLES', $local));
-			}
-			$optimised = $tableArray->rowCount();
-		}
-
-		return $optimised;
-	}
-
-	/**
-	 * Get the amount of found rows after running a SELECT SQL_CALC_FOUND_ROWS query.
-	 *
-	 * @return int
-	 * @access public
-	 */
-	public function get_Found_Rows()
-	{
-		$totalCount = $this->queryOneRow('SELECT FOUND_ROWS() AS total');
-		return ($totalCount === false ? 0 : $totalCount['total']);
-	}
-
-	/**
-	 * Log/echo repaired/optimized/analyzed tables.
-	 *
-	 * @param bool   $web    If we are on web, don't echo.
-	 * @param string $type   ANALYZE|OPTIMIZE|REPAIR
-	 * @param string $tables Table names.
-	 *
-	 * @access private
-	 * @void
-	 */
-	private function logOptimize($web, $type, $tables)
-	{
-		$message = $type . ' (' . $tables . ')';
-		if ($web === false) {
-			echo $this->log->primary($message);
-
-		}
-		if ($this->_debug) {
-			$this->debugging->log('DB', 'optimise', $message, \Logger::LOG_INFO);
-		}
-	}
-
-	/**
-	 * Turns off autocommit until commit() is ran. http://www.php.net/manual/en/pdo.begintransaction.php
-	 *
-	 * @return bool
-	 */
-	public function beginTransaction()
-	{
-		if (NN_USE_SQL_TRANSACTIONS) {
-			return $this->pdo->beginTransaction();
-		}
-		return true;
-	}
-
-	/**
-	 * Commits a transaction. http://www.php.net/manual/en/pdo.commit.php
-	 *
-	 * @return bool
-	 */
-	public function Commit()
-	{
-		if (NN_USE_SQL_TRANSACTIONS) {
-			return $this->pdo->commit();
-		}
-		return true;
-	}
-
-	/**
-	 * Rollback transcations. http://www.php.net/manual/en/pdo.rollback.php
-	 *
-	 * @return bool
-	 */
-	public function Rollback()
-	{
-		if (NN_USE_SQL_TRANSACTIONS) {
-			return $this->pdo->rollBack();
-		}
-		return true;
-	}
-
-	/**
-	 * PHP interpretation of MySQL's from_unixtime method.
-	 * @param int  $utime UnixTime
-	 *
-	 * @return string
-	 */
-	public function from_unixtime($utime)
-	{
-		return 'FROM_UNIXTIME(' . $utime . ')';
-	}
-
-	/**
-	 * PHP interpretation of mysql's unix_timestamp method.
-	 * @param string $date
-	 *
-	 * @return int
-	 */
-	public function unix_timestamp($date)
-	{
-		return strtotime($date);
-	}
-
-	/**
-	 * Get a string for MySQL with a column name in between
-	 * ie: UNIX_TIMESTAMP(column_name) AS outputName
-	 *
-	 * @param string $column     The datetime column.
-	 * @param string $outputName The name to store the SQL data into. (the word after AS)
-	 *
-	 * @return string
-	 */
-	public function unix_timestamp_column($column, $outputName = 'unix_time')
-	{
-		return ('UNIX_TIMESTAMP(' . $column . ') AS ' . $outputName);
-	}
-
-	/**
-	 * Interpretation of mysql's UUID method.
-	 * Return uuid v4 string. http://www.php.net/manual/en/function.uniqid.php#94959
-	 *
-	 * @return string
-	 */
-	public function uuid()
-	{
-		return sprintf(
-			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0x0fff) | 0x4000,
-			mt_rand(0, 0x3fff) | 0x8000,
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff),
-			mt_rand(0, 0xffff)
-		);
-	}
-
-	/**
-	 * Checks whether the connection to the server is working. Optionally restart a new connection.
-	 * NOTE: Restart does not happen if \PDO is not using exceptions (PHP's default configuration).
-	 * In this case check the return value === false.
-	 *
-	 * @param boolean $restart Whether an attempt should be made to reinitialise the Db object on failure.
-	 *
-	 * @return boolean
-	 */
-	public function ping($restart = false)
-	{
-		try {
-			return (bool) $this->pdo->query('SELECT 1+1');
-		} catch (\PDOException $e) {
-			if ($restart == true) {
-				$this->initialiseDatabase();
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Prepares a statement to be run by the Db engine.
-	 * To run the statement use the returned $statement with ->execute();
-	 *
-	 * Ideally the signature would have array before $options but that causes a strict warning.
-	 *
-	 * @param string $query SQL query to run, with optional place holders.
-	 * @param array $options Driver options.
-	 *
-	 * @return false|PDOstatement on success false on failure.
-	 *
-	 * @link http://www.php.net/pdo.prepare.php
-	 */
-	public function Prepare($query, $options = [])
-	{
-		try {
-			$PDOstatement = $this->pdo->prepare($query, $options);
-		} catch (\PDOException $e) {
-			if ($this->_debug) {
-				$this->debugging->log('DB', "Prepare", $e->getMessage(), \Logger::LOG_INFO);
-			}
-			echo $this->log->error("\n" . $e->getMessage());
-			$PDOstatement = false;
-		}
-		return $PDOstatement;
-	}
-
-	/**
-	 * Retrieve db attributes http://us3.php.net/manual/en/pdo.getattribute.php
-	 *
-	 * @param int $attribute
-	 *
-	 * @return bool|mixed
-	 */
-	public function getAttribute($attribute)
-	{
-		$result = false;
-		if ($attribute != '') {
-			try {
-				$result = $this->pdo->getAttribute($attribute);
-			} catch (\PDOException $e) {
-				if ($this->_debug) {
-					$this->debugging->log('DB', "getAttribute", $e->getMessage(), \Logger::LOG_INFO);
-				}
-				echo $this->log->error("\n" . $e->getMessage());
-				$result = false;
-			}
-
-		}
-		return $result;
-	}
-
-	/**
-	 * Returns the stored Db version string.
-	 *
-	 * @return string
-	 */
-	public function getDbVersion ()
-	{
-		return $this->dbVersion;
-	}
-
-	/**
-	 * @param string $requiredVersion The minimum version to compare against
-	 *
-	 * @return bool|null       TRUE if Db version is greater than or eaqual to $requiredVersion,
-	 * false if not, and null if the version isn't available to check against.
-	 */
-	public function isDbVersionAtLeast ($requiredVersion)
-	{
-		if (empty($this->dbVersion)) {
-			return null;
-		}
-		return version_compare($requiredVersion, $this->dbVersion, '<=');
-	}
-
-	/**
-	 * Performs the fetch from the Db server and stores the resulting Major.Minor.Version number.
-	 */
-	private function fetchDbVersion ()
-	{
-		$result = $this->queryOneRow("SELECT VERSION() AS version");
-		if (!empty($result)) {
-			$dummy = explode('-', $result['version'], 2);
-			$this->dbVersion = $dummy[0];
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/genres.php b/lib/copy_this/www/lib/genres.php
deleted file mode 100644
index d97f14729..000000000
--- a/lib/copy_this/www/lib/genres.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/category.php");
-
-class Genres
-{
-	const CONSOLE_TYPE = Category::CAT_PARENT_GAME;
-	const MUSIC_TYPE = Category::CAT_PARENT_MUSIC;
-	const GAME_TYPE = Category::CAT_PARENT_PC;
-
-	const STATUS_ENABLED = 0;
-	const STATUS_DISABLED = 1;
-
-	/**
-	 * @var DB;
-	 */
-	public $pdo;
-
-	/**
-	 * @param array $options Class instances.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Settings' => null
-		];
-		$options += $defaults;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-	}
-
-	public function getGenres($type = '', $activeonly = false)
-	{
-		return $this->pdo->query($this->getListQuery($type, $activeonly));
-	}
-
-	private function getListQuery($type = '', $activeonly = false)
-	{
-		if (!empty($type))
-			$typesql = sprintf(" AND g.type = %d", $type);
-		else
-			$typesql = '';
-
-		if ($activeonly) {
-			$sql = sprintf("
-						SELECT g.*
-						FROM genres g
-						INNER JOIN
-							(SELECT DISTINCT genreID FROM musicinfo) x
-							ON x.genreID = g.id %1\$s
-						UNION
-						SELECT g.*
-						FROM genres g
-						INNER JOIN
-							(SELECT DISTINCT genreID FROM consoleinfo) x
-							ON x.genreID = g.id %1\$s
-						UNION
-						SELECT g.*
-						FROM genres g
-						INNER JOIN
-							(SELECT DISTINCT genre_id FROM gamesinfo) x
-							ON x.genre_id = g.id %1\$s
-							ORDER BY title",
-				$typesql
-			);
-		} else {
-			$sql = sprintf("SELECT g.* FROM genres g WHERE 1 %s ORDER BY g.title", $typesql);
-		}
-
-		return $sql;
-	}
-
-	public function getRange($type = '', $activeonly = false, $start, $num)
-	{
-		$sql = $this->getListQuery($type, $activeonly);
-		$sql .= " LIMIT " . $num . " OFFSET " . $start;
-
-		return $this->pdo->query($sql);
-	}
-
-	public function getCount($type = '', $activeonly = false)
-	{
-		if (!empty($type))
-			$typesql = sprintf(" AND g.type = %d", $type);
-		else
-			$typesql = '';
-
-		if ($activeonly)
-			$sql = sprintf("
-						SELECT COUNT(*) AS num
-						FROM genres g
-						INNER JOIN
-							(SELECT DISTINCT genreID FROM musicinfo) x
-							ON x.genreID = g.id %1\$s
-						+
-						SELECT COUNT(*) AS num
-						FROM genres g
-						INNER JOIN
-							(SELECT DISTINCT genreID FROM consoleinfo) y
-							ON y.genreID = g.id %1\$s
-						+
-						SELECT COUNT(*) AS num
-						FROM genres g
-						INNER JOIN
-							(SELECT DISTINCT genre_id FROM gamesinfo) x
-							ON x.genre_id = g.id %1\$s",
-				$typesql
-			);
-		else
-			$sql = sprintf("SELECT COUNT(g.id) AS num FROM genres g WHERE 1 %s ORDER BY g.title", $typesql);
-
-		$res = $this->pdo->queryOneRow($sql);
-
-		return $res["num"];
-	}
-
-	public function getById($id)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM genres WHERE id = %d", $id));
-	}
-
-	public function update($id, $disabled)
-	{
-		return $this->pdo->queryExec(sprintf("UPDATE genres SET disabled = %d WHERE id = %d", $disabled, $id));
-	}
-
-	public function getDisabledIDs()
-	{
-		return $this->pdo->query("SELECT id FROM genres WHERE disabled = 1");
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/groups.php b/lib/copy_this/www/lib/groups.php
deleted file mode 100644
index 9f597fc06..000000000
--- a/lib/copy_this/www/lib/groups.php
+++ /dev/null
@@ -1,689 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-
-/**
- * This class handles data access for groups.
- */
-class Groups
-{
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options Class instances.
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Settings' => null
-		];
-		$options += $defaults;
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-	}
-	/**
-	 * Get all group rows.
-	 */
-	public function getAll($orderby = null)
-	{
-		$order = ($orderby == null) ? 'name_desc' : $orderby;
-		$orderArr = explode("_", $order);
-		switch ($orderArr[0]) {
-			case 'name':
-				$orderfield = 'groups.name';
-				break;
-			case 'description':
-				$orderfield = 'groups.description';
-				break;
-			case 'releases':
-				$orderfield = 'num_releases';
-				break;
-			case 'updated':
-				$orderfield = 'groups.last_updated';
-				break;
-			default:
-				$orderfield = 'groups.name';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		$orderby = $orderfield . " " . $ordersort;
-
-
-		return $this->pdo->query(sprintf("SELECT groups.*, COALESCE(rel.num, 0) AS num_releases
-							FROM groups
-							LEFT OUTER JOIN
-							( SELECT groupid, COUNT(id) AS num FROM releases group by groupid ) rel ON rel.groupid = groups.id
-							ORDER BY %s", $orderby
-			)
-		);
-	}
-
-	/**
-	 * Get all group rows for use in a select list.
-	 */
-	public function getGroupsForSelect()
-	{
-
-		$categories = $this->pdo->query("SELECT * FROM groups WHERE active = 1 ORDER BY name");
-		$temp_array = array();
-
-		$temp_array[-1] = "--Please Select--";
-
-		foreach ($categories as $category)
-			$temp_array[$category["name"]] = $category["name"];
-
-		return $temp_array;
-	}
-
-	/**
-	 * Get a group row by its id.
-	 */
-	public function getByID($id)
-	{
-
-
-		return $this->pdo->queryOneRow(sprintf("select * from groups where id = %d ", $id));
-	}
-
-	/**
-	 * Get all active group rows.
-	 */
-	public function getActive()
-	{
-
-		return $this->pdo->query("SELECT * FROM groups WHERE active = 1 ORDER BY name");
-	}
-
-	/**
-	 * Get a group row by name.
-	 */
-	public function getByName($grp)
-	{
-
-
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM groups WHERE name = %s", $this->pdo->escapeString($grp)));
-	}
-
-	/**
-	 * Get a group name using its id.
-	 *
-	 * @param int|string $id The group id.
-	 *
-	 * @return string Empty string on failure, groupName on success.
-	 */
-	public function getByNameByID($id)
-	{
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT name FROM groups WHERE id = %d ", $id));
-		return ($res === false ? '' : $res["name"]);
-	}
-
-	/**
-	 * Get a group name using its name.
-	 *
-	 * @param string $name The group name.
-	 *
-	 * @return string Empty string on failure, groupid on success.
-	 */
-	public function getIDByName($name)
-	{
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT id FROM groups WHERE name = %s", $this->pdo->escapeString($name)));
-		return ($res === false ? '' : $res["id"]);
-	}
-
-	/**
-	 * Get count of all groups, filter by name.
-	 */
-	public function getCount($groupname = "", $activeonly = false)
-	{
-
-
-		$grpsql = '';
-		if ($groupname != "")
-			$grpsql .= sprintf("and groups.name like %s ", $this->pdo->escapeString("%" . $groupname . "%"));
-
-		if ($activeonly == true)
-			$grpsql .= "and active=1 ";
-
-		$res = $this->pdo->queryOneRow(sprintf("select count(id) as num from groups where 1=1 %s", $grpsql));
-
-		return $res["num"];
-	}
-
-	/**
-	 * Get groups rows for browse list by limit.
-	 */
-	public function getRange($start, $num, $groupname = "", $activeonly = false)
-	{
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT " . $start . "," . $num;
-
-		$grpsql = '';
-		if ($groupname != "")
-			$grpsql .= sprintf("and groups.name like %s ", $this->pdo->escapeString("%" . $groupname . "%"));
-		if ($activeonly == true)
-			$grpsql .= "and active=1 ";
-
-		$sql = sprintf("SELECT groups.*, COALESCE(rel.num, 0) AS num_releases
-							FROM groups
-							LEFT OUTER JOIN
-							(
-							SELECT groupid, COUNT(id) AS num FROM releases group by groupid
-							) rel ON rel.groupid = groups.id WHERE 1=1 %s ORDER BY groups.name " . $limit, $grpsql
-		);
-
-		return $this->pdo->query($sql);
-	}
-
-	/**
-	 * Update an existing group.
-	 *
-	 * @param Array $group
-	 *
-	 * @return bool
-	 */
-	public function update($group)
-	{
-
-		$minFileString =
-			($group["minfilestoformrelease"] == '' ?
-				"minfilestoformrelease = NULL," :
-				sprintf(" minfilestoformrelease = %d,", $this->formatNumberString($group["minfilestoformrelease"], false))
-			);
-
-		$minSizeString =
-			($group["minsizetoformrelease"] == '' ?
-				"minsizetoformrelease = NULL" :
-				sprintf(" minsizetoformrelease = %d", $this->formatNumberString($group["minsizetoformrelease"], false))
-			);
-
-		return $this->pdo->queryExec(
-			sprintf(
-				"UPDATE groups
-				SET name = %s, description = %s, backfill_target = %s, first_record = %s, last_record = %s,
-				last_updated = NOW(), active = %s, backfill = %s, %s %s, regexmatchonly = %s
-				WHERE id = %d",
-				$this->pdo->escapeString(trim($group["name"])),
-				$this->pdo->escapeString(trim($group["description"])),
-				$this->formatNumberString($group["backfill_target"]),
-				$this->formatNumberString($group["first_record"]),
-				$this->formatNumberString($group["last_record"]),
-				$this->formatNumberString($group["active"]),
-				$this->formatNumberString($group["backfill"]),
-				$minFileString,
-				$minSizeString,
-				$group["regexmatchonly"],
-				$group["id"]
-			)
-		);
-	}
-
-	/**
-	 * Add a new group.
-	 *
-	 * @param array $group
-	 *
-	 * @return bool
-	 */
-	public function add($group)
-	{
-		$minFileString =
-			($group["minfilestoformrelease"] == '' ?
-				"NULL" :
-				sprintf("%d", $this->formatNumberString($group["minfilestoformrelease"], false))
-			);
-
-		$minSizeString =
-			($group["minsizetoformrelease"] == '' ?
-				"NULL" :
-				sprintf("%d", $this->formatNumberString($group["minsizetoformrelease"], false))
-			);
-
-		$regexmatchonly =
-			($group["regexmatchonly"] == '' ?
-				'0' :
-				sprintf("%d", $this->formatNumberString($group["regexmatchonly"], false))
-			);
-
-
-		return $this->pdo->queryInsert(
-			sprintf("
-				INSERT INTO groups
-					(name, description, backfill_target, first_record, last_record, last_updated,
-					active, backfill, minfilestoformrelease, minsizetoformrelease, regexmatchonly)
-				VALUES (%s, %s, %s, %s, %s, NOW(), %s, %s, %s, %s, %s)",
-				$this->pdo->escapeString(trim($group["name"])),
-				$this->pdo->escapeString(trim($group["description"])),
-				$this->formatNumberString($group["backfill_target"]),
-				$this->formatNumberString($group["first_record"]),
-				$this->formatNumberString($group["last_record"]),
-				$this->formatNumberString($group["active"]),
-				$this->formatNumberString($group["backfill"]),
-				$minFileString,
-				$minSizeString,
-				$regexmatchonly
-			)
-		);
-	}
-
-	/**
-	 * Format numeric string when adding/updating groups.
-	 *
-	 * @param string $setting
-	 * @param bool   $escape
-	 *
-	 * @return string|int
-	 */
-	protected function formatNumberString($setting, $escape=true)
-	{
-		$setting = trim($setting);
-		if ($setting === "0" || !is_numeric($setting)) {
-			$setting = '0';
-		}
-
-		return ($escape ? $this->pdo->escapeString($setting) : (int)$setting);
-	}
-
-	/**
-	 * Delete a group.
-	 */
-	public function delete($id)
-	{
-
-		return $this->pdo->queryExec(sprintf("DELETE from groups where id = %d", $id));
-	}
-
-	/**
-	 * Reset a group.
-	 *
-	 * @param string|int $id The group id.
-	 *
-	 * @return bool
-	 */
-	public function reset($id)
-	{
-		// Remove rows from collections / binaries / parts.
-		(new \Binaries(['Groups' => $this, 'Settings' => $this->pdo]))->purgeGroup($id);
-
-		// Remove rows from part repair.
-		$this->pdo->queryExec(sprintf("DELETE FROM partrepair WHERE groupid = %d", $id));
-
-		$this->pdo->queryExec(sprintf('DROP TABLE IF EXISTS binaries_%d', $id));
-		$this->pdo->queryExec(sprintf('DROP TABLE IF EXISTS parts_%d', $id));
-		$this->pdo->queryExec(sprintf('DROP TABLE IF EXISTS partrepair_%d', $id));
-
-		// Reset the group stats.
-		return $this->pdo->queryExec(
-			sprintf("
-				UPDATE groups
-				SET backfill_target = 0, first_record = 0, first_record_postdate = NULL, last_record = 0,
-					last_record_postdate = NULL, last_updated = NULL
-				WHERE id = %d", $id)
-		);
-	}
-
-	/**
-	 * Reset all groups.
-	 *
-	 * @return bool
-	 */
-	public function resetall()
-	{
-		$this->pdo->queryExec("TRUNCATE TABLE binaries");
-		$this->pdo->queryExec("TRUNCATE TABLE parts");
-		$this->pdo->queryExec("TRUNCATE TABLE partrepair");
-		$groups = $this->pdo->query("SELECT id FROM groups");
-		foreach ($groups as $group) {
-			$this->pdo->queryExec('DROP TABLE IF EXISTS binaries_' . $group['id']);
-			$this->pdo->queryExec('DROP TABLE IF EXISTS parts_' . $group['id']);
-			$this->pdo->queryExec('DROP TABLE IF EXISTS partrepair_' . $group['id']);
-		}
-
-		// Reset the group stats.
-		return $this->pdo->queryExec("
-			UPDATE groups
-			SET backfill_target = 0, first_record = 0, first_record_postdate = NULL, last_record = 0,
-				last_record_postdate = NULL, last_updated = NULL, active = 0"
-		);
-	}
-
-
-	/**
-	 * Update the list of newsgroups from nntp provider matching a regex and return an array of messages.
-	 */
-	function addBulk($groupList, $active = 1, $backfill = 1)
-	{
-		require_once(WWW_DIR . "/lib/binaries.php");
-		require_once(WWW_DIR . "/lib/nntp.php");
-
-		$ret = array();
-
-		if ($groupList == "") {
-			$ret[] = "No group list provided.";
-		} else {
-			$nntp = new Nntp(['Echo' => false]);
-			if (!$nntp->doConnect()) {
-				$ret[] = "Failed to get NNTP connection";
-
-				return $ret;
-			}
-			$groups = $nntp->getGroups();
-			$nntp->doQuit();
-
-			$regfilter = "/(" . str_replace(array('.', '*'), array('\.', '.*?'), $groupList) . ")$/";
-
-			foreach ($groups AS $group) {
-				if (preg_match($regfilter, $group['group']) > 0) {
-					$res = $this->pdo->queryOneRow(sprintf("SELECT id FROM groups WHERE name = %s ", $this->pdo->escapeString($group['group'])));
-					if ($res) {
-
-						$this->pdo->queryExec(sprintf("update groups SET active = %d where id = %d", $active, $res["id"]));
-						$ret[] = array('group' => $group['group'], 'msg' => 'Updated');
-					} else {
-						$desc = "";
-						$this->pdo->queryInsert(sprintf("INSERT INTO groups (name, description, active, backfill) VALUES (%s, %s, %d, %s)", $this->pdo->escapeString($group['group']), $this->pdo->escapeString($desc), $active, $backfill));
-						$ret[] = array('group' => $group['group'], 'msg' => 'Created');
-					}
-				}
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * @param     $id
-	 * @param int $status
-	 *
-	 * @return string
-	 */
-	public function updateGroupStatus($id, $status = 0)
-	{
-		$this->pdo->queryExec(sprintf("UPDATE groups SET active = %d WHERE id = %d", $status, $id));
-		return "Group $id has been " . (($status == 0) ? 'deactivated' : 'activated') . '.';
-	}
-
-	/**
-	 * @param     $id
-	 * @param int $status
-	 *
-	 * @return string
-	 */
-	public function updateBackfillStatus($id, $status = 0)
-	{
-		$this->pdo->queryExec(sprintf("UPDATE groups SET backfill = %d WHERE id = %d", $status, $id));
-		return "Group $id has been " . (($status == 0) ? 'deactivated' : 'activated') . '.';
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getActiveBackfill()
-	{
-		return $this->pdo->query("SELECT * FROM groups WHERE backfill = 1 AND last_record != 0 ORDER BY name");
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getActiveByDateBackfill()
-	{
-		return $this->pdo->query("SELECT * FROM groups WHERE backfill = 1 AND last_record != 0 ORDER BY first_record_postdate DESC");
-	}
-
-	/**
-	 * @var array
-	 */
-	private $cbppTableNames;
-
-	/**
-	 * Get the names of the binaries/parts/part repair tables.
-	 * If TPG is on, try to create new tables for the groupid, if we fail, log the error and exit.
-	 *
-	 * @param bool $tpgSetting false, tpg is off in site setting, true tpg is on in site setting.
-	 * @param int  $groupID    id of the group.
-	 *
-	 * @return array The table names.
-	 */
-	public function getCBPTableNames($tpgSetting, $groupID)
-	{
-		$groupKey = ($groupID . '_' . (int) $tpgSetting);
-
-		// Check if buffered and return. Prevents re-querying MySQL when TPG is on.
-		if (isset($this->cbppTableNames[$groupKey])) {
-			return $this->cbppTableNames[$groupKey];
-		}
-
-		$tables = [];
-		$tables['bname']  = 'binaries';
-		$tables['pname']  = 'parts';
-		$tables['prname'] = 'partrepair';
-
-		if ($tpgSetting === true) {
-			if ($groupID == '') {
-				exit('Error: You must use .../misc/update_scripts/nix_scripts/multiprocessing/releases.php since you have enabled TPG!');
-			}
-
-			if ($this->createNewTPGTables($groupID) === false && NN_ECHOCLI) {
-				exit('There is a problem creating new TPG tables for this group id: ' . $groupID . PHP_EOL);
-			}
-
-			$groupEnding = '_' . $groupID;
-			$tables['bname']  .= $groupEnding;
-			$tables['pname']  .= $groupEnding;
-			$tables['prname'] .= $groupEnding;
-		}
-
-		// Buffer.
-		$this->cbppTableNames[$groupKey] = $tables;
-
-		return $tables;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getActiveIDs()
-	{
-		return $this->pdo->query("SELECT id FROM groups WHERE active = 1 ORDER BY name");
-	}
-
-	/**
-	 * Set the backfill to 0 when the group is backfilled to max.
-	 *
-	 * @param $name
-	 */
-	public function disableForPost($name)
-	{
-		$this->pdo->queryExec(sprintf("UPDATE groups SET backfill = 0 WHERE name = %s", $this->pdo->escapeString($name)));
-	}
-
-	/**
-	 * Check if the tables exists for the group_id, make new tables for table per group.
-	 *
-	 * @param int $groupID
-	 *
-	 * @return bool
-	 */
-	public function createNewTPGTables($groupID)
-	{
-		foreach (['binaries', 'parts', 'partrepair'] as $tableName) {
-			if ($this->pdo->queryExec(sprintf('SELECT * FROM %s_%s LIMIT 1', $tableName, $groupID), true) === false) {
-				if ($this->pdo->queryExec(sprintf('CREATE TABLE %s_%s LIKE %s', $tableName, $groupID, $tableName), true) === false) {
-					return false;
-				} /*else {
-					if ($tableName === 'binaries') {
-						$this->pdo->queryExec(
-							sprintf(
-								'CREATE TRIGGER delete_binaries_%s BEFORE DELETE ON binaries_%s FOR EACH ROW BEGIN' .
-								' DELETE FROM parts_%s WHERE binaryid = OLD.id; END',
-								$groupID, $groupID, $groupID
-							)
-						);
-					}
-				}*/
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Purge a single group or all groups.
-	 *
-	 * @param int|string|bool $id The group id. If false, purge all groups.
-	 */
-	public function purge($id = false)
-	{
-		if ($id === false) {
-			$this->resetall();
-		} else {
-			$this->reset($id);
-		}
-
-		$releaseArray = $this->pdo->queryDirect(
-			sprintf("SELECT id, guid FROM releases %s", ($id === false ? '' : 'WHERE groupid = ' . $id))
-		);
-
-		if ($releaseArray instanceof \Traversable) {
-			$releases = new \Releases(['Settings' => $this->pdo, 'Groups' => $this]);
-			$nzb = new \NZB($this->pdo);
-			$releaseImage = new \ReleaseImage($this->pdo);
-			foreach ($releaseArray as $release) {
-				$releases->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $nzb, $releaseImage);
-			}
-		}
-	}
-
-	/**
-	 * @param string $groupname
-	 *
-	 * @return mixed
-	 */
-	public function getCountActive($groupname="")
-	{
-		$res = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT COUNT(id) AS num
-				FROM groups
-				WHERE 1 = 1 %s
-				AND active = 1",
-				($groupname !== ''
-					?
-					sprintf(
-						"AND groups.name LIKE %s ",
-						$this->pdo->escapeString("%".$groupname."%")
-					)
-					: ''
-				)
-			)
-		);
-		return $res["num"];
-	}
-
-	/**
-	 * @param string $groupname
-	 *
-	 * @return mixed
-	 */
-	public function getCountInactive($groupname="")
-	{
-		$res = $this->pdo->queryOneRow(
-			sprintf("
-				SELECT COUNT(id) AS num
-				FROM groups
-				WHERE 1 = 1 %s
-				AND active = 0",
-				($groupname !== ''
-					?
-					sprintf(
-						"AND groups.name LIKE %s ",
-						$this->pdo->escapeString("%".$groupname."%")
-					)
-					: ''
-				)
-			)
-		);
-		return $res["num"];
-	}
-
-	/**
-	 * @param        $start
-	 * @param        $num
-	 * @param string $groupname
-	 *
-	 * @return mixed
-	 */
-	public function getRangeActive($start, $num, $groupname="")
-	{
-		return $this->pdo->query(
-			sprintf("
-				SELECT groups.*, COALESCE(rel.num, 0) AS num_releases
-				FROM groups
-				LEFT OUTER JOIN
-					(SELECT groupid, COUNT(id) AS num
-						FROM releases
-						GROUP BY groupid
-					) rel
-				ON rel.groupid = groups.id
-				WHERE 1 = 1 %s
-				AND active = 1
-				ORDER BY groups.name " . ($start === false ? '' : " LIMIT " . $num . " OFFSET " .$start),
-				($groupname !== ''
-					?
-					sprintf(
-						"AND groups.name LIKE %s ",
-						$this->pdo->escapeString("%".$groupname."%")
-					)
-					: ''
-				)
-			)
-		);
-	}
-
-	/**
-	 * @param        $start
-	 * @param        $num
-	 * @param string $groupname
-	 *
-	 * @return mixed
-	 */
-	public function getRangeInactive($start, $num, $groupname="")
-	{
-		return $this->pdo->query(
-			sprintf("
-				SELECT groups.*, COALESCE(rel.num, 0) AS num_releases
-				FROM groups
-				LEFT OUTER JOIN
-					(SELECT groupid, COUNT(id) AS num
-						FROM releases
-						GROUP BY groupid
-					) rel
-				ON rel.groupid = groups.id
-				WHERE 1 = 1 %s
-				AND active = 0
-				ORDER BY groups.name " . ($start === false ? '' : " LIMIT ".$num." OFFSET ".$start),
-				($groupname !== ''
-					? sprintf(
-						"AND groups.name LIKE %s ",
-						$this->pdo->escapeString("%".$groupname."%")
-					)
-					: ''
-				)
-			)
-		);
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/install.php b/lib/copy_this/www/lib/install.php
deleted file mode 100644
index 6245855aa..000000000
--- a/lib/copy_this/www/lib/install.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/**
- * Structure for holding data during install.
- */
-class Install
-{
-	public $DB_TYPE;
-	public $DB_HOST = "localhost";
-	public $DB_USER;
-	public $DB_PORT = 3306;
-	public $DB_PASSWORD;
-	public $DB_NAME = "newznab";
-	public $DB_INNODB = "false";
-
-	public $NNTP_USERNAME;
-	public $NNTP_PASSWORD;
-	public $NNTP_SERVER;
-	public $NNTP_PORT = 119;
-	public $NNTP_SSLENABLED = false;
-
-	public $CACHE_TYPE = "none";
-
-	public $WWW_DIR;
-	public $SMARTY_DIR;
-	public $DB_DIR;
-	public $MISC_DIR;
-	public $INSTALL_DIR;
-
-	public $ADMIN_USER;
-	public $ADMIN_PASS;
-	public $ADMIN_EMAIL;
-
-	public $NZB_PATH;
-
-	public $COMPILED_CONFIG;
-
-	public $doCheck = false;
-
-	public $sha1Check;
-	public $mysqlCheck;
-	public $gdCheck;
-	public $curlCheck;
-	public $cacheCheck;
-	public $movieCoversCheck;
-	public $animeCoversCheck;
-	public $musicCoversCheck;
-	public $configCheck;
-	public $lockCheck;
-	public $pearCheck;
-	public $schemaCheck;
-	public $phpCheck;
-	public $timelimitCheck;
-	public $memlimitCheck;
-	public $rewriteCheck;
-	public $opensslCheck;
-	public $timezoneCheck;
-
-	public $dbConnCheck;
-	public $dbNameCheck;
-	public $dbCreateCheck;
-
-	public $nntpCheck;
-	public $adminCheck;
-	public $nzbPathCheck;
-
-	public $saveConfigCheck;
-	public $saveLockCheck;
-
-	/* @public bool $weHasIconv */
-	public $weHasIconv = false;
-
-	public $error = false;
-
-	/**
-	 * Default constructor.
-	 */
-	public function __construct()
-	{
-		$this->WWW_DIR = dirname(realpath('.'));
-		$this->SMARTY_DIR = $this->WWW_DIR.'/lib/smarty';
-		$this->DB_DIR = dirname(realpath('..')).'/db';
-		$this->MISC_DIR = dirname(realpath('..')).'/misc';
-		$this->NZB_PATH = str_replace('\\', '/', dirname(realpath('..'))).'/nzbfiles/';
-		$this->INSTALL_DIR = $this->WWW_DIR.'/install';
-	}
-
-	/**
-	 * Save this structure in session.
-	 */
-	public function setSession()
-	{
-		$_SESSION['cfg'] = serialize($this);
-	}
-
-	/**
-	 * Return this structure from session.
-	 */
-	public function getSession()
-	{
-		$tmpCfg = unserialize($_SESSION['cfg']);
-		$tmpCfg->error = false;
-		$tmpCfg->doCheck = false;
-		return $tmpCfg;
-	}
-
-	/**
-	 * Determine if this structure has been populated.
-	 */
-	public function isInitialized()
-	{
-		return (isset($_SESSION['cfg']) && is_object(unserialize($_SESSION['cfg'])));
-	}
-
-	/**
-	 * Determine if this installation has already been installed, and .lock file is present.
-	 */
-	public function isLocked()
-	{
-		return (file_exists($this->INSTALL_DIR.'/install.lock') ? true : false);
-	}
-
-	/**
-	 * Populate default config values from provided string.
-	 */
-	public function setConfig($tmpCfg)
-	{
-		preg_match_all('/define\((.*?)\)/i', $tmpCfg, $matches);
-		$defines = $matches[1];
-		foreach ($defines as $define)
-		{
-			$define = str_replace('\'', '', $define);
-			list($defName,$defVal) = explode(',', $define);
-			$this->{$defName} = trim($defVal);
-		}
-	}
-
-	/**
-	 * Write the config file to disk.
-	 */
-	public function saveConfig()
-	{
-		$tmpCfg = file_get_contents($this->INSTALL_DIR.'/config.php.tpl');
-		$tmpCfg = str_replace('%%DB_HOST%%', $this->DB_HOST, $tmpCfg);
-		$tmpCfg = str_replace('%%DB_USER%%', $this->DB_USER, $tmpCfg);
-		$tmpCfg = str_replace('%%DB_PORT%%', $this->DB_PORT, $tmpCfg);
-		$tmpCfg = str_replace('%%DB_PASSWORD%%', $this->DB_PASSWORD, $tmpCfg);
-		$tmpCfg = str_replace('%%DB_NAME%%', $this->DB_NAME, $tmpCfg);
-		$tmpCfg = str_replace('%%DB_INNODB%%', $this->DB_INNODB, $tmpCfg);
-
-		$tmpCfg = str_replace('%%NNTP_USERNAME%%', $this->NNTP_USERNAME, $tmpCfg);
-		$tmpCfg = str_replace('%%NNTP_PASSWORD%%', $this->NNTP_PASSWORD, $tmpCfg);
-		$tmpCfg = str_replace('%%NNTP_SERVER%%', $this->NNTP_SERVER, $tmpCfg);
-		$tmpCfg = str_replace('%%NNTP_PORT%%', $this->NNTP_PORT, $tmpCfg);
-		$tmpCfg = str_replace('%%NNTP_SSLENABLED%%', ($this->NNTP_SSLENABLED?"true":"false"), $tmpCfg);
-
-		$tmpCfg = str_replace('%%CACHEOPT_METHOD%%', $this->CACHE_TYPE, $tmpCfg);
-
-		$this->COMPILED_CONFIG = $tmpCfg;
-		return @file_put_contents($this->WWW_DIR.'/config.php', $tmpCfg);
-	}
-
-	/**
-	 * Create the installation lock file.
-	 */
-	public function saveInstallLock()
-	{
-		return @file_put_contents($this->INSTALL_DIR.'/install.lock', '');
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/installpage.php b/lib/copy_this/www/lib/installpage.php
deleted file mode 100644
index 4ad7dd30f..000000000
--- a/lib/copy_this/www/lib/installpage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-require_once('../lib/smarty/Smarty.class.php');
-
-/**
- * This class represents each page during installation.
- */
-class Installpage
-{
-	public $title = '';
-	public $content = '';
-	public $head = '';
-	public $page_template = '';
-	public $smarty = '';
-
-	public $error = false;
-
-	/**
-	 * Default constructor.
-	 */
-	public function __construct()
-	{
-		@session_start();
-
-		$this->smarty = new Smarty();
-
-		$this->smarty->setTemplateDir(realpath('../install/views/'));
-		$this->smarty->setCompileDir(realpath('../lib/smarty/templates_c/'));
-		$this->smarty->setConfigDir(realpath('../lib/smarty/configs/'));
-		$this->smarty->setCacheDir(realpath('../lib/smarty/cache/'));
-	}
-
-	/**
-	 * Writes out the page.
-	 */
-	public function render()
-	{
-		$this->page_template = "installpage.tpl";
-		$this->smarty->display($this->page_template);
-	}
-
-	/**
-	 * Determine if a postback has occurred.
-	 */
-	public function isPostBack()
-	{
-		return (strtoupper($_SERVER["REQUEST_METHOD"]) === "POST");
-	}
-
-	/**
-	 * Determine if an install page has issued a success.
-	 */
-	public function isSuccess()
-	{
-		return isset($_GET['success']);
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/menu.php b/lib/copy_this/www/lib/menu.php
deleted file mode 100644
index b88ff7f16..000000000
--- a/lib/copy_this/www/lib/menu.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/users.php");
-
-/**
- * This class looks up site menu data.
- */
-class Menu
-{
-	/**
-	 * Get all menu rows for a role.
-	 */
-	public function get($role, $serverurl)
-	{
-		$db = new DB();
-
-		$guest = "";
-		if ($role != Users::ROLE_GUEST)
-			$guest = sprintf(" and role != %d ", Users::ROLE_GUEST);
-
-		if ($role != Users::ROLE_ADMIN)
-			$guest .= sprintf(" and role != %d ", Users::ROLE_ADMIN);
-
-		$sql = sprintf("select * from menu where role <= %d %s order by ordinal", $role, $guest);
-
-		$data = $db->query($sql);
-
-		$ret = array();
-		foreach ($data as $d)
-		{
-			if (!preg_match("/http/i", $d["href"]))
-			{
-				$d["href"] = $serverurl.$d["href"];
-				$ret[] = $d;
-			}
-			else
-			{
-				$ret[] = $d;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Get all menu rows.
-	 */
-	public function getAll()
-	{
-		$db = new DB();
-		return $db->query(sprintf("select * from menu order by role, ordinal"));
-	}
-
-	/**
-	 * Get a menu row by its id.
-	 */
-	public function getById($id)
-	{
-		$db = new DB();
-		return $db->queryOneRow(sprintf("select * from menu where id = %d", $id));
-	}
-
-	/**
-	 * Delete a menu row.
-	 */
-	public function delete($id)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("DELETE from menu where id = %d", $id));
-	}
-
-	/**
-	 * Add a menu row.
-	 */
-	public function add($menu)
-	{
-		$db = new DB();
-		return $db->queryInsert(sprintf("INSERT INTO menu (href, title, tooltip, role, ordinal, menueval, newwindow )
-			VALUES (%s, %s, %s, %d, %d, %s, %d) ", $db->escapeString($menu["href"]), $db->escapeString($menu["title"]), $db->escapeString($menu["tooltip"]), $menu["role"] , $menu["ordinal"], $db->escapeString($menu["menueval"]), $menu["newwindow"] ));
-	}
-
-	/**
-	 * Update a menu row.
-	 */
-	public function update($menu)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("update menu set href = %s, title = %s, tooltip = %s, role = %d, ordinal = %d, menueval = %s, newwindow=%d where id = %d	", $db->escapeString($menu["href"]), $db->escapeString($menu["title"]), $db->escapeString($menu["tooltip"]), $menu["role"] , $menu["ordinal"], $db->escapeString($menu["menueval"]), $menu["newwindow"], $menu["id"] ));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/movie.php b/lib/copy_this/www/lib/movie.php
deleted file mode 100644
index 9ccdc0c6a..000000000
--- a/lib/copy_this/www/lib/movie.php
+++ /dev/null
@@ -1,870 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/TMDb.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/nfo.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-require_once(WWW_DIR."/lib/rottentomato.php");
-
-/**
- * This class looks up movie info from external sources and stores/retrieves movieinfo data.
- */
-class Movie
-{
-	const SRC_BOXOFFICE = 1;
-	const SRC_INTHEATRE = 2;
-	const SRC_OPENING = 3;
-	const SRC_UPCOMING = 4;
-	const SRC_DVD = 5;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Language to fetch from IMDB.
-	 * @var string
-	 */
-	protected $lookuplanguage;
-
-	/**
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var array|bool|string
-	 */
-	public $apikey;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $echooutput
-	 */
-	public function __construct($echooutput = false)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$s = new \Sites();
-		$site = $s->get();
-		$this->apikey = $site->tmdbkey;
-		$this->lookuplanguage = $site->lookuplanguage;
-		$this->pdo = new \DB();
-		$this->imgSavePath = WWW_DIR.'covers/movies/';
-	}
-
-	/**
-	 * Get a movieinfo row by its imdbid.
-	 */
-	public function getMovieInfo($imdbId)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM movieinfo where imdbid = %d", $imdbId));
-	}
-
-	/**
-	 * Get movieinfo rows by array of imdbIDs.
-	 */
-	public function getMovieInfoMultiImdb($imdbIds)
-	{
-		$allids = implode(",", array_filter($imdbIds));
-		$sql = sprintf("SELECT DISTINCT movieinfo.*, releases.imdbid AS relimdb FROM movieinfo LEFT OUTER JOIN releases ON releases.imdbid = movieinfo.imdbid WHERE movieinfo.imdbid IN (%s)", $allids);
-		return $this->pdo->query($sql);
-	}
-
-	/**
-	 * Delete movieinfo row by its imdbid.
-	 */
-	public function delete($imdbId)
-	{
-		@unlink($this->imgSavePath.$imdbId.'-cover.jpg');
-		@unlink($this->imgSavePath.$imdbId.'-backdrop.jpg');
-		return $this->pdo->queryOneRow(sprintf("delete FROM movieinfo where imdbid = %d", $imdbId));
-	}
-
-	/**
-	 * Find an imdb URL in an nfo string.
-	 */
-	public function parseImdbFromNfo($str)
-	{
-		preg_match('/imdb.*?(tt|Title\?)(\d{7})/i', $str, $matches);
-		if (isset($matches[2]) && !empty($matches[2]))
-			return trim($matches[2]);
-		return false;
-	}
-
-	/**
-	 * Get movieinfo rows by limit.
-	 */
-	public function getRange($start, $num, $moviename="")
-	{
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$rsql = '';
-		if ($moviename != "")
-			$rsql .= sprintf("and movieinfo.title like %s ", $this->pdo->escapeString("%".$moviename."%"));
-
-		return $this->pdo->query(sprintf(" SELECT * FROM movieinfo where 1=1 %s ORDER BY createddate DESC".$limit, $rsql));
-	}
-
-	/**
-	 * Get count of all movieinfo rows.
-	 */
-	public function getCount($moviename="")
-	{
-
-		$rsql = '';
-		if ($moviename != "")
-			$rsql .= sprintf("and movieinfo.title like %s ", $this->pdo->escapeString("%".$moviename."%"));
-
-		$res = $this->pdo->queryOneRow(sprintf("select count(id) as num from movieinfo where 1=1 %s ", $rsql));
-		return $res["num"];
-	}
-
-	/**
-	 * Get count of all movieinfo rows filter by category.
-	 */
-	public function getMovieCount($cat, $maxage=-1, $excludedcats=array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1)
-		{
-			$catsrch = " (";
-			foreach ($cat as $category)
-			{
-				if ($category != -1)
-				{
-					$categ = new Category();
-					if ($categ->isParent($category))
-					{
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist.=", ".$child["id"];
-
-						if ($chlist != "-99")
-								$catsrch .= " r.categoryid in (".$chlist.") or ";
-					}
-					else
-					{
-						$catsrch .= sprintf(" r.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch.= "1=2 )";
-		}
-		else
-			$catsrch = " 1=1 ";
-
-		if ($maxage > 0)
-			$maxage = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-		else
-			$maxage = "";
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and r.categoryid not in (".implode(",", $excludedcats).")";
-
-		$sql = sprintf("select count(distinct r.imdbid) as num from releases r inner join movieinfo m on m.imdbid = r.imdbid and m.title != '' where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') and %s %s %s %s ", $browseby, $catsrch, $maxage, $exccatlist);
-		$res = $this->pdo->queryOneRow($sql, true);
-		return $res["num"];
-	}
-
-	/**
-	 * Get movieinfo rows for browse list by limit.
-	 */
-	public function getMovieRange($cat, $start, $num, $orderby, $maxage=-1, $excludedcats=array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1)
-		{
-			$catsrch = " (";
-			foreach ($cat as $category)
-			{
-				if ($category != -1)
-				{
-					$categ = new Category();
-					if ($categ->isParent($category))
-					{
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist.=", ".$child["id"];
-
-						if ($chlist != "-99")
-								$catsrch .= " r.categoryid in (".$chlist.") or ";
-					}
-					else
-					{
-						$catsrch .= sprintf(" r.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch.= "1=2 )";
-		}
-		else
-			$catsrch = " 1=1 ";
-
-		$maxagesql = "";
-		if ($maxage > 0)
-			$maxagesql = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and r.categoryid not in (".implode(",", $excludedcats).")";
-
-		$order = $this->getMovieOrder($orderby);
-		$sql = sprintf(" SELECT r.imdbid, max(r.postdate) as postdate, m.* from releases r inner join movieinfo m on m.imdbid = r.imdbid where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') and m.title != '' and r.imdbid != 0000000 and %s %s %s %s group by r.imdbid order by %s %s".$limit, $browseby, $catsrch, $maxagesql, $exccatlist, $order[0], $order[1]);
-		$rows = $this->pdo->query($sql, true);
-
-		//
-		//get a copy of all the imdbs
-		//
-		$imdbds = "";
-		foreach ($rows as $row)
-			$imdbds .= $row["imdbid"]. ", ";
-
-		if (strlen($imdbds) > 0)
-		{
-			$imdbds = substr($imdbds,0,-2);
-
-			//
-			// get all releases matching these ids
-			//
-			$sql = sprintf("select r.*, releasenfo.id as nfoid, groups.name as grpname, concat(cp.title, ' > ', c.title) as categoryname from releases r left outer join category c on c.id = r.categoryid left outer join category cp on cp.id = c.parentid left outer join releasenfo on releasenfo.releaseid = r.id left outer join groups on groups.id = r.groupid where imdbid in (%s) and %s %s %s order by r.postdate desc", $imdbds, $catsrch, $maxagesql, $exccatlist);
-			$allrows = $this->pdo->query($sql, true);
-			$arr = array();
-
-			//
-			// build array indexed by imdbid
-			//
-			foreach ($allrows as &$allrow)
-			{
-				$arr[$allrow["imdbid"]]["id"] = (isset($arr[$allrow["imdbid"]]["id"]) ? $arr[$allrow["imdbid"]]["id"] : "") . $allrow["id"] . ",";
-				$arr[$allrow["imdbid"]]["rarinnerfilecount"] = (isset($arr[$allrow["imdbid"]]["rarinnerfilecount"]) ? $arr[$allrow["imdbid"]]["rarinnerfilecount"] : "") . $allrow["rarinnerfilecount"] . ",";
-				$arr[$allrow["imdbid"]]["haspreview"] = (isset($arr[$allrow["imdbid"]]["haspreview"]) ? $arr[$allrow["imdbid"]]["haspreview"] : "") . $allrow["haspreview"] . ",";
-				$arr[$allrow["imdbid"]]["passwordstatus"] = (isset($arr[$allrow["imdbid"]]["passwordstatus"]) ? $arr[$allrow["imdbid"]]["passwordstatus"] : "") . $allrow["passwordstatus"] . ",";
-				$arr[$allrow["imdbid"]]["guid"] = (isset($arr[$allrow["imdbid"]]["guid"]) ? $arr[$allrow["imdbid"]]["guid"] : "") . $allrow["guid"] . ",";
-				$arr[$allrow["imdbid"]]["nfoid"] = (isset($arr[$allrow["imdbid"]]["nfoid"]) ? $arr[$allrow["imdbid"]]["nfoid"] : "") . $allrow["nfoid"] . ",";
-				$arr[$allrow["imdbid"]]["grpname"] = (isset($arr[$allrow["imdbid"]]["grpname"]) ? $arr[$allrow["imdbid"]]["grpname"] : "") . $allrow["grpname"] . ",";
-				$arr[$allrow["imdbid"]]["searchname"] = (isset($arr[$allrow["imdbid"]]["searchname"]) ? $arr[$allrow["imdbid"]]["searchname"] : "") . $allrow["searchname"] . "#";
-				$arr[$allrow["imdbid"]]["postdate"] = (isset($arr[$allrow["imdbid"]]["postdate"]) ? $arr[$allrow["imdbid"]]["postdate"] : "") . $allrow["postdate"] . ",";
-				$arr[$allrow["imdbid"]]["size"] = (isset($arr[$allrow["imdbid"]]["size"]) ? $arr[$allrow["imdbid"]]["size"] : "") . $allrow["size"] . ",";
-				$arr[$allrow["imdbid"]]["totalpart"] = (isset($arr[$allrow["imdbid"]]["totalpart"]) ? $arr[$allrow["imdbid"]]["totalpart"] : "") . $allrow["totalpart"] . ",";
-				$arr[$allrow["imdbid"]]["comments"] = (isset($arr[$allrow["imdbid"]]["comments"]) ? $arr[$allrow["imdbid"]]["comments"] : "") . $allrow["comments"] . ",";
-				$arr[$allrow["imdbid"]]["grabs"] = (isset($arr[$allrow["imdbid"]]["grabs"]) ? $arr[$allrow["imdbid"]]["grabs"] : "") . $allrow["grabs"] . ",";
-				$arr[$allrow["imdbid"]]["categoryid"] = (isset($arr[$allrow["imdbid"]]["categoryid"]) ? $arr[$allrow["imdbid"]]["categoryid"] : "") . $allrow["categoryid"] . ",";
-				$arr[$allrow["imdbid"]]["categoryname"] = (isset($arr[$allrow["imdbid"]]["categoryname"]) ? $arr[$allrow["imdbid"]]["categoryname"] : "") . $allrow["categoryname"] . ",";
-			}
-
-			//
-			// stuff back into the results set
-			//
-			foreach ($rows as &$row)
-			{
-				$row["grp_release_id"] = substr($arr[$row["imdbid"]]["id"], 0, -1);
-				$row["grp_rarinnerfilecount"] = substr($arr[$row["imdbid"]]["rarinnerfilecount"], 0, -1);
-				$row["grp_haspreview"] = substr($arr[$row["imdbid"]]["haspreview"], 0, -1);
-				$row["grp_release_password"] = substr($arr[$row["imdbid"]]["passwordstatus"], 0, -1);
-				$row["grp_release_guid"] = substr($arr[$row["imdbid"]]["guid"], 0, -1);
-				$row["grp_release_nfoid"] = substr($arr[$row["imdbid"]]["nfoid"], 0, -1);
-				$row["grp_release_grpname"] = substr($arr[$row["imdbid"]]["grpname"], 0, -1);
-				$row["grp_release_name"] = substr($arr[$row["imdbid"]]["searchname"], 0, -1);
-				$row["grp_release_postdate"] = substr($arr[$row["imdbid"]]["postdate"], 0, -1);
-				$row["grp_release_size"] = substr($arr[$row["imdbid"]]["size"], 0, -1);
-				$row["grp_release_totalparts"] = substr($arr[$row["imdbid"]]["totalpart"], 0, -1);
-				$row["grp_release_comments"] = substr($arr[$row["imdbid"]]["comments"], 0, -1);
-				$row["grp_release_grabs"] = substr($arr[$row["imdbid"]]["grabs"], 0, -1);
-				$row["grp_release_categoryid"] = substr($arr[$row["imdbid"]]["categoryid"], 0, -1);
-				$row["grp_release_categoryname"] = substr($arr[$row["imdbid"]]["categoryname"], 0, -1);
-			}
-		}
-		return $rows;
-
-	}
-
-	/**
-	 * Get movieinfo orderby column sql.
-	 */
-	public function getMovieOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'max(r.postdate)' : $orderby;
-		$orderArr = explode("_", $order);
-		switch($orderArr[0]) {
-			case 'title':
-				$orderfield = 'm.title';
-			break;
-			case 'year':
-				$orderfield = 'm.year';
-			break;
-			case 'rating':
-				$orderfield = 'm.rating';
-			break;
-			case 'posted':
-			default:
-				$orderfield = 'max(r.postdate)';
-			break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	/**
-	 * Get movieinfo orderby columns.
-	 */
-	public function getMovieOrdering()
-	{
-		return array('title_asc', 'title_desc', 'year_asc', 'year_desc', 'rating_asc', 'rating_desc');
-	}
-
-	/**
-	 * Get movieinfo filter columns.
-	 */
-	public function getBrowseByOptions()
-	{
-		return array('title', 'director', 'actors', 'genre', 'rating', 'year', 'imdb');
-	}
-
-	/**
-	 * Get movieinfo sql column for users selected filter.
-	 */
-	public function getBrowseBy()
-	{
-		$this->pdo = new Db;
-
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		foreach ($browsebyArr as $bb) {
-			if (isset($_REQUEST[$bb]) && !empty($_REQUEST[$bb])) {
-				$bbv = stripslashes($_REQUEST[$bb]);
-				if ($bb == 'rating') { $bbv .= '.'; }
-				if ($bb == 'imdb') {
-					$browseby .= "m.{$bb}id = $bbv AND ";
-				} else {
-					$browseby .= "m.$bb LIKE(".$this->pdo->escapeString('%'.$bbv.'%').") AND ";
-				}
-			}
-		}
-		return $browseby;
-	}
-
-	/**
-	 * Create links for data like actor/director so used can requery.
-	 */
-	public function makeFieldLinks($data, $field)
-	{
-		if ($data[$field] == "")
-			return "";
-
-		$tmpArr = explode(', ',$data[$field]);
-		$newArr = array();
-		$i = 0;
-		foreach($tmpArr as $ta) {
-			if ($i > 5) { break; } //only use first 6
-			$newArr[] = '<a href="'.WWW_TOP.'/movies?'.$field.'='.urlencode($ta).'" title="'.$ta.'">'.$ta.'</a>';
-			$i++;
-		}
-		return implode(', ', $newArr);
-	}
-
-	/**
-	 * Update movieinfo row.
-	 */
-	public function update($id, $title, $tagline, $plot, $year, $rating, $genre, $director, $actors, $language, $cover, $backdrop)
-	{
-
-		$this->pdo->queryExec(sprintf("update movieinfo SET title=%s, tagline=%s, plot=%s, year=%s, rating=%s, genre=%s, director=%s, actors=%s, language=%s, cover=%d, backdrop=%d, updateddate=NOW() WHERE imdbid = %d",
-			$this->pdo->escapeString($title), $this->pdo->escapeString($tagline), $this->pdo->escapeString($plot), $this->pdo->escapeString($year), $this->pdo->escapeString($rating), $this->pdo->escapeString($genre), $this->pdo->escapeString($director), $this->pdo->escapeString($actors), $this->pdo->escapeString($language), $cover, $backdrop, $id));
-	}
-
-	/**
-	 * Update movieinfo row by querying external sources and updating known properties/images.
-	 */
-	public function updateMovieInfo($imdbId)
-	{
-
-		if ($imdbId + 0 == 0)
-		{
-			return;
-		}
-
-		$ri = new ReleaseImage();
-
-		//check themoviedb for imdb info
-		$tmdb = $this->fetchTmdbProperties($imdbId);
-
-		//check imdb for movie info
-		$imdb = $this->fetchImdbProperties($imdbId);
-
-		if (!$imdb && !$tmdb) {
-			return false;
-		}
-
-		$mov = array();
-		$mov['imdb_id'] = $imdbId;
-		$mov['tmdb_id'] = (!isset($tmdb['tmdb_id']) || $tmdb['tmdb_id'] == '') ? "NULL" : $tmdb['tmdb_id'];
-
-		//prefer tmdb cover over imdb cover
-		$mov['cover'] = 0;
-		if (isset($tmdb['cover']) && $tmdb['cover'] != '') {
-			$mov['cover'] = $ri->saveImage($imdbId.'-cover', $tmdb['cover'], $this->imgSavePath);
-		} elseif (isset($imdb['cover']) && $imdb['cover'] != '') {
-			$mov['cover'] = $ri->saveImage($imdbId.'-cover', $imdb['cover'], $this->imgSavePath);
-		}
-
-		$mov['backdrop'] = 0;
-		if (isset($tmdb['backdrop']) && $tmdb['backdrop'] != '') {
-			$mov['backdrop'] = $ri->saveImage($imdbId.'-backdrop', $tmdb['backdrop'], $this->imgSavePath, 1024, 768);
-		}
-
-		$mov['title'] = '';
-		if (isset($tmdb['title']) && $tmdb['title'] != '') {
-			$mov['title'] = $tmdb['title'];
-		} elseif (isset($imdb['title']) && $imdb['title'] != '') {
-			$mov['title'] = $imdb['title'];
-		}
-		$mov['title'] = html_entity_decode($mov['title'], ENT_QUOTES, 'UTF-8');
-
-        $mov['trailer'] = '';
-        if (isset($tmdb['trailer']) && $tmdb['trailer'] != '') {
-            $mov['trailer'] = $tmdb['trailer'];
-        }
-
-        $mov['rating'] = '';
-		if (isset($imdb['rating']) && $imdb['rating'] != '') {
-			$mov['rating'] = $imdb['rating'];
-		} elseif (isset($tmdb['rating']) && $tmdb['rating'] != '') {
-			$mov['rating'] = $tmdb['rating'];
-		}
-		$mov['rating'] = str_replace(',','.',$mov['rating']);
-
-		$mov['tagline'] = '';
-		if (isset($tmdb['tagline']) && $tmdb['tagline'] != '') {
-			$mov['tagline'] = $tmdb['tagline'];
-		} elseif (isset($imdb['tagline']) && $imdb['tagline'] != '') {
-			$mov['tagline'] = $imdb['tagline'];
-		}
-		$mov['tagline'] = html_entity_decode($mov['tagline'], ENT_QUOTES, 'UTF-8');
-
-		$mov['plot'] = '';
-		if (isset($tmdb['plot']) && $tmdb['plot'] != '') {
-			$mov['plot'] = $tmdb['plot'];
-		} elseif (isset($imdb['plot']) && $imdb['plot'] != '') {
-			$mov['plot'] = $imdb['plot'];
-		}
-		$mov['plot'] = html_entity_decode($mov['plot'], ENT_QUOTES, 'UTF-8');
-
-		$mov['year'] = '';
-		if (isset($imdb['year']) && $imdb['year'] != '') {
-			$mov['year'] = $imdb['year'];
-		} elseif (isset($tmdb['year']) && $tmdb['year'] != '') {
-			$mov['year'] = $tmdb['year'];
-		}
-
-		$mov['genre'] = '';
-		if (isset($tmdb['genre']) && $tmdb['genre'] != '') {
-			$mov['genre'] = $tmdb['genre'];
-		} elseif (isset($imdb['genre']) && $imdb['genre'] != '') {
-			$mov['genre'] = $imdb['genre'];
-		}
-		if (is_array($mov['genre'])) {
-			$mov['genre'] = implode(', ', array_unique($mov['genre']));
-		}
-		$mov['genre'] = html_entity_decode($mov['genre'], ENT_QUOTES, 'UTF-8');
-
-		$mov['director'] = '';
-		if (isset($imdb['director']) && $imdb['director'] != '') {
-			$mov['director'] = (is_array($imdb['director'])) ? implode(', ', array_unique($imdb['director'])) : $imdb['director'];
-		}
-		$mov['director'] = html_entity_decode($mov['director'], ENT_QUOTES, 'UTF-8');
-
-		$mov['actors'] = '';
-		if (isset($imdb['actors']) && $imdb['actors'] != '') {
-			$mov['actors'] = (is_array($imdb['actors'])) ? implode(', ', array_unique($imdb['actors'])) : $imdb['actors'];
-		}
-		$mov['actors'] = html_entity_decode($mov['actors'], ENT_QUOTES, 'UTF-8');
-
-		$mov['language'] = '';
-		if (isset($imdb['language']) && $imdb['language'] != '') {
-			$mov['language'] = (is_array($imdb['language'])) ? implode(', ', array_unique($imdb['language'])) : $imdb['language'];
-		}
-		$mov['language'] = html_entity_decode($mov['language'], ENT_QUOTES, 'UTF-8');
-
-		$query = sprintf("
-			INSERT INTO movieinfo
-				(imdbid, tmdbID, title, rating, tagline, trailer, plot, year, genre, director, actors, language, cover, backdrop, createddate, updateddate)
-			VALUES
-				(%d, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %d, %d, NOW(), NOW())
-			ON DUPLICATE KEY UPDATE
-				imdbid=%d, tmdbID=%s, title=%s, rating=%s, tagline=%s, trailer=%s, plot=%s, year=%s, genre=%s, director=%s, actors=%s, language=%s, cover=%d, backdrop=%d, updateddate=NOW()",
-		$mov['imdb_id'], $mov['tmdb_id'], $this->pdo->escapeString($mov['title']), $this->pdo->escapeString($mov['rating']), $this->pdo->escapeString($mov['tagline']), $this->pdo->escapeString($mov['trailer']), $this->pdo->escapeString($mov['plot']), $this->pdo->escapeString($mov['year']), $this->pdo->escapeString($mov['genre']), $this->pdo->escapeString($mov['director']), $this->pdo->escapeString($mov['actors']), $this->pdo->escapeString($mov['language']), $mov['cover'], $mov['backdrop'],
-		$mov['imdb_id'], $mov['tmdb_id'], $this->pdo->escapeString($mov['title']), $this->pdo->escapeString($mov['rating']), $this->pdo->escapeString($mov['tagline']), $this->pdo->escapeString($mov['trailer']), $this->pdo->escapeString($mov['plot']), $this->pdo->escapeString($mov['year']), $this->pdo->escapeString($mov['genre']), $this->pdo->escapeString($mov['director']), $this->pdo->escapeString($mov['actors']), $this->pdo->escapeString($mov['language']), $mov['cover'], $mov['backdrop']);
-
-		$movieId = $this->pdo->queryInsert($query);
-
-		return $movieId;
-	}
-
-	/**
-	 * Lookup a movie on tmdb by id
-	 */
-	public function fetchTmdbProperties($id, $isImdbId=true)
-	{
-		$tmdb = new TMDb($this->apikey, $this->lookuplanguage);
-		$lookupId = ($isImdbId) ? 'tt'.$id : $id;
-
-		try {
-			$movie = $tmdb->getMovie($lookupId);
-		} catch (Exception $e) {
-			return false;
-		}
-		if (!$movie || !is_array($movie)) { return false; }
-		if (isset($movie['status_code']) && $movie['status_code'] > 1) { return false; }
-
-		$ret = array();
-		$ret['title'] = $movie['title'];
-		$ret['tmdb_id'] = $movie['id'];
-		$ret['imdb_id'] = str_replace('tt', '', $movie['imdb_id']);
-		$ret['rating'] = ($movie['vote_average'] == 0) ? '' : $movie['vote_average'];
-		$ret['plot'] = $movie['overview'];
-		if (isset($movie['tagline']))
-			$ret['tagline'] = $movie['tagline'];
-		if (isset($movie['release_date']))
-			$ret['year'] = date("Y", strtotime($movie['release_date']));
-		if (isset($movie['genres']) && sizeof($movie['genres']) > 0)
-		{
-			$genres = array();
-			foreach($movie['genres'] as $genre)
-			{
-				$genres[] = $genre['name'];
-			}
-			$ret['genre'] = $genres;
-		}
-        if (isset($movie['trailers']) && isset($movie['trailers']['youtube']) && sizeof($movie['trailers']['youtube']) > 0)
-        {
-            foreach($movie['trailers']['youtube'] as $trailer)
-            {
-                $ret['trailer'] = $trailer['source'];
-                break;
-            }
-        }
-
-        if (isset($movie['poster_path']))
-            $ret['cover'] = $tmdb->getImageUrl($movie['poster_path'], TMDb::IMAGE_POSTER, "w185");
-
-        if (isset($movie['backdrop_path']))
-            $ret['backdrop'] = $tmdb->getImageUrl($movie['backdrop_path'], TMDb::IMAGE_BACKDROP, "w300");
-
-		return $ret;
-	}
-
-	/**
-	 * Search for a movie on tmdb by querystring.
-	 */
-	public function searchTmdb($search, $limit=10)
-	{
-		$tmdb = new TMDb($this->apikey, $this->lookuplanguage);
-		try {
-			$movies = $tmdb->searchMovie($search);
-		} catch (Exception $e) {
-			return false;
-		}
-		if (!$movies || !isset($movies['results'])) { return false; }
-
-		$ret = array();
-		$c=0;
-		foreach($movies['results'] as $movie)
-		{
-			$c++;
-			if ($c >= $limit)
-				continue;
-
-			$m = $this->fetchTmdbProperties($movie['id'], false);
-			if ($m !== false)
-				$ret[] = $m;
-		}
-		return $ret;
-	}
-
-	/**
-	 * Scrape a movie from imdb.
-	 */
-    public function fetchImdbProperties($imdbId)
-    {
-        $imdb_regex = array(
-            'title'    => '/<meta property=["\']og:title["\'] content="(.*?) \(/iS',
-			'tagline'  => '/taglines:<\/h4>\s([^<]+)/iS',
-            'plot'     => '/<meta name="description" content="(.*?)"/iS',
-			'rating'   => '/<span.*?ratingValue">([0-9]{1,2}[\.,][0-9]{1,2})<\/span>/iS',
-			'year'     => '/<title>.*?\(.*?(\d{4}).*?<\/title>/iS',
-			'cover'    => '/<a.*?href="\/media\/.*?>\s*<img[^>]*?src="(.*?)"/iS'
-        );
-
-        $imdb_regex_multi = array(
-        	'genre'    => '/<span.*?itemprop=\"genre\">(.*?)<\/span>/iS',
-			'language' => '/<a.*?href="\/language\/.* itemprop=["\']url["\'].*?>(.*?)<\/a>/iS'
-        );
-
-		$buffer = Utility::getUrl(['url' => 'http://www.imdb.com/title/tt$imdbId/', 'method'=>'get', 'language' => $this->lookuplanguage]);
-
-        // make sure we got some data
-        if ($buffer !== false && strlen($buffer))
-        {
-        	$ret = array();
-            foreach ($imdb_regex as $field => $regex)
-            {
-                if (preg_match($regex, $buffer, $matches))
-                {
-                    $match = $matches[1];
-                    $match = strip_tags(trim(rtrim($match)));
-                    $ret[$field] = $match;
-                    //echo 'Found '.$field.' : '.$ret[$field]."\n";
-
-                }
-            }
-
-            foreach ($imdb_regex_multi as $field => $regex)
-            {
-                if (preg_match_all($regex, $buffer, $matches))
-                {
-                    $match = $matches[1];
-                    $match = array_map("trim", $match);
-                    $ret[$field] = $match;
-                    //echo 'Found '.$field.' : '.implode(" | ", $ret[$field])."\n";
-                }
-            }
-
-
-	        //directors
-	        if (preg_match('/<div.*?itemprop="director".*?>(.*?)<\/div>/is', $buffer, $hit))
-			{
-				if (preg_match_all('/<span.*?itemprop="name".*?>(.*?)<\/span>/is', $hit[1], $results, PREG_PATTERN_ORDER))
-				{
-					$ret['director'] = $results[1];
-				}
-			}
-
-
-	        //actors
-	        if (preg_match('/<h4.*?Stars?:<\/h4>(.*?)<\/div>/is', $buffer, $hit))
-	        {
-				if (preg_match_all('/<span.*?itemprop=\"name\".*?>(.*?)<\/span>/is', $hit[1], $results, PREG_PATTERN_ORDER))
-				{
-					$ret['actors'] = $results[1];
-				}
-	        }
-
-	        return $ret;
-	    }
-
-	    return false;
-	}
-	/**
-	 * Process all untagged movies to link them to a movieinfo row.
-	 */
-    public function processMovieReleases()
-	{
-		$ret = 0;
-		$nfo = new Nfo();
-
-		$res = $this->pdo->queryDirect(sprintf("SELECT searchname, id from releases where imdbid IS NULL and categoryid in ( select id from category where parentid = %d ) ORDER BY postdate DESC LIMIT 100", Category::CAT_PARENT_MOVIE));
-		if ($this->pdo->getNumRows($res) > 0)
-		{
-			if ($this->echooutput)
-				echo "MovProc : Processing " . $this->pdo->getNumRows($res) . " movie releases\n";
-
-			while ($arr = $this->pdo->getAssocArray($res))
-			{
-				$imdbID = false;
-				/* Preliminary IMDB id Detection from NFO file */
-				$rawnfo = '';
-				if($nfo->getNfo($arr['id'], $rawnfo))
-					$imdbID = $this->parseImdbFromNfo($rawnfo);
-
-				if($imdbID !== false){
-					// Set IMDB (if found in nfo) and move along
-					$this->pdo->queryExec(sprintf("update releases set imdbid = %s where id = %d",  $this->pdo->escapeString($imdbID), $arr["id"]));
-					//check for existing movie entry
-					$movCheck = $this->getMovieInfo($imdbID);
-					if ($movCheck === false || (isset($movCheck['updateddate']) && (time() - strtotime($movCheck['updateddate'])) > 2592000))
-					{
-						$movieId = $this->updateMovieInfo($imdbID);
-					}
-					continue;
-				}
-
-				$moviename = $this->parseMovieName($arr['searchname']);
-				if ($moviename !== false)
-				{
-					if ($this->echooutput)
-						echo 'MovProc : '.$moviename.' ['.$arr['searchname'].']'."\n";
-
-					//$buffer = getUrl("https://www.google.com/search?source=ig&hl=en&rlz=&btnG=Google+Search&aq=f&oq=&q=".urlencode($moviename.' site:imdb.com'));
-                    $buffer = Utility::getUrl(['url' => 'http://www.bing.com/search?&q='.urlencode($moviename.' site:imdb.com')]);
-
-			        // make sure we got some data
-			        if ($buffer !== false && strlen($buffer))
-			        {
-						$imdbId = $this->parseImdbFromNfo($buffer);
-						if ($imdbId !== false)
-						{
-							//update release with imdb id
-							$this->pdo->queryExec(sprintf("update releases SET imdbid = %s WHERE id = %d", $this->pdo->escapeString($imdbId), $arr["id"]));
-
-							//check for existing movie entry
-							$movCheck = $this->getMovieInfo($imdbId);
-							if ($movCheck === false || (isset($movCheck['updateddate']) && (time() - strtotime($movCheck['updateddate'])) > 2592000))
-							{
-								$movieId = $this->updateMovieInfo($imdbId);
-							}
-
-						} else {
-							//no imdb id found, set to all zeros so we dont process again
-							$this->pdo->queryExec(sprintf("update releases SET imdbid = %d WHERE id = %d", 0, $arr["id"]));
-						}
-
-					} else {
-						//url fetch failed, will try next run
-					}
-
-
-				} else {
-					//no valid movie name found, set to all zeros so we dont process again
-					$this->pdo->queryExec(sprintf("update releases SET imdbid = %d WHERE id = %d", 0, $arr["id"]));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Strip a movie name from a release.
-	 */
-	public function parseMovieName($releasename)
-	{
-		$cat = new Category;
-		if (!$cat->isMovieForeign($releasename))
-		{
-			preg_match('/^(?P<name>.*)[\.\-_\( ](?P<year>19\d{2}|20\d{2})/i', $releasename, $matches);
-			if (!isset($matches['year']))
-				preg_match('/^(?P<name>.*)[\.\-_ ](?:dvdrip|bdrip|brrip|bluray|hdtv|divx|xvid|proper|repack|real\.proper|sub\.?fix|sub\.?pack|ac3d|unrated|1080i|1080p|720p|810p)/i', $releasename, $matches);
-
-			if (isset($matches['name']))
-			{
-				$name = preg_replace('/\(.*?\)|\.|_/i', ' ', $matches['name']);
-				$year = (isset($matches['year'])) ? ' ('.$matches['year'].')' : '';
-				return trim($name).$year;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get rows from upcoming table by type.
-	 */
-	public function getUpcoming($type, $source="rottentomato")
-	{
-		$sql = sprintf("select * from upcoming where source = %s and typeid = %d", $this->pdo->escapeString($source), $type);
-		return $this->pdo->queryOneRow($sql);
-	}
-
-	/**
-	 * Retrieve upcoming movie data from rottentomatoes API.
-	 */
-	public function updateUpcoming()
-	{
-		$s = new Sites();
-		$site = $s->get();
-		if (isset($site->rottentomatokey))
-		{
-			$rt = new RottenTomato($site->rottentomatokey);
-
-			$ret = $rt->getBoxOffice();
-			if ($ret != "")
-				$this->updateInsUpcoming('rottentomato', Movie::SRC_BOXOFFICE, $ret);
-
-			$ret = $rt->getInTheaters();
-			if ($ret != "")
-				$this->updateInsUpcoming('rottentomato', Movie::SRC_INTHEATRE, $ret);
-
-			$ret = $rt->getOpening();
-			if ($ret != "")
-				$this->updateInsUpcoming('rottentomato', Movie::SRC_OPENING, $ret);
-
-			$ret = $rt->getUpcoming();
-			if ($ret != "")
-				$this->updateInsUpcoming('rottentomato', Movie::SRC_UPCOMING, $ret);
-
-			$ret = $rt->getDVDReleases();
-			if ($ret != "")
-				$this->updateInsUpcoming('rottentomato', Movie::SRC_DVD, $ret);
-		}
-	}
-
-	/**
-	 * Add/Update upcoming row.
-	 */
-	public function updateInsUpcoming($source, $type, $info)
-	{
-
-		$sql = sprintf("INSERT into upcoming (source,typeID,info,updateddate) VALUES (%s, %d, %s, now()) ON DUPLICATE KEY UPDATE info = %s",
-						$this->pdo->escapeString($source), $type, $this->pdo->escapeString($info), $this->pdo->escapeString($info));
-		$this->pdo->queryInsert($sql);
-	}
-
-	/**
-	 * Get list of standard movie genres.
-	 */
-	public function getGenres()
-	{
-		return array(
-			'Action',
-			'Adventure',
-			'Animation',
-			'Biography',
-			'Comedy',
-			'Crime',
-			'Documentary',
-			'Drama',
-			'Family',
-			'Fantasy',
-			'Film-Noir',
-			'Game-Show',
-			'History',
-			'Horror',
-			'Music',
-			'Musical',
-			'Mystery',
-			'News',
-			'Reality-TV',
-			'Romance',
-			'Sci-Fi',
-			'Sport',
-			'Talk-Show',
-			'Thriller',
-			'War',
-			'Western'
-		);
-	}
-}
diff --git a/lib/copy_this/www/lib/music.php b/lib/copy_this/www/lib/music.php
deleted file mode 100644
index aa9ea5ff0..000000000
--- a/lib/copy_this/www/lib/music.php
+++ /dev/null
@@ -1,756 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/amazon.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/genres.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-
-/**
- * This class looks up music info from external sources and stores/retrieves musicinfo data.
- */
-class Music
-{
-	const NUMTOPROCESSPERTIME = 100;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $echooutput
-	 */
-	public function __construct($echooutput = false)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$s = new Sites();
-		$site = $s->get();
-		$this->pubkey = $site->amazonpubkey;
-		$this->privkey = $site->amazonprivkey;
-		$this->asstag = $site->amazonassociatetag;
-		$this->pdo = new DB();
-		$this->imgSavePath = WWW_DIR.'covers/music/';
-	}
-
-	/**
-	 * Get musicinfo row by id.
-	 */
-	public function getMusicInfo($id)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT musicinfo.*, genres.title as genres FROM musicinfo left outer join genres on genres.id = musicinfo.genreID where musicinfo.id = %d ", $id));
-	}
-
-	/**
-	 * Get musicinfo row by name.
-	 */
-	public function getMusicInfoByName($artist, $album)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM musicinfo where artist like %s and title like %s", $this->pdo->escapeString("%".$artist."%"),  $this->pdo->escapeString("%".$album."%")));
-	}
-
-	/**
-	 * Get musicinfo rows by limit.
-	 */
-	public function getRange($start, $num)
-	{
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		return $this->pdo->query(" SELECT * FROM musicinfo ORDER BY createddate DESC".$limit);
-	}
-
-	/**
-	 * Get count of all musicinfo rows.
-	 */
-	public function getCount()
-	{
-		$res = $this->pdo->queryOneRow("select count(id) as num from musicinfo");
-		return $res["num"];
-	}
-
-	/**
-	 * Get count of all musicinfo rows by filter.
-	 */
-	public function getMusicCount($cat, $maxage=-1, $excludedcats=array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1)
-		{
-			$catsrch = " (";
-			foreach ($cat as $category)
-			{
-				if ($category != -1)
-				{
-					$categ = new Category();
-					if ($categ->isParent($category))
-					{
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist.=", ".$child["id"];
-
-						if ($chlist != "-99")
-							$catsrch .= " r.categoryid in (".$chlist.") or ";
-					}
-					else
-					{
-						$catsrch .= sprintf(" r.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch.= "1=2 )";
-		}
-
-		if ($maxage > 0)
-			$maxage = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-		else
-			$maxage = "";
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and r.categoryid not in (".implode(",", $excludedcats).")";
-
-		$sql = sprintf("select count(r.id) as num from releases r inner join musicinfo m on m.id = r.musicinfoid and m.title != '' where r.passwordstatus <= (select value from site where setting='showpasswordedrelease') and %s %s %s %s", $browseby, $catsrch, $maxage, $exccatlist);
-		$res = $this->pdo->queryOneRow($sql, true);
-		return $res["num"];
-	}
-
-	/**
-	 * Get musicinfo rows for browse list by filters and limit.
-	 */
-	public function getMusicRange($cat, $start, $num, $orderby, $maxage=-1, $excludedcats=array())
-	{
-
-		$browseby = $this->getBrowseBy();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1)
-		{
-			$catsrch = " (";
-			foreach ($cat as $category)
-			{
-				if ($category != -1)
-				{
-					$categ = new Category();
-					if ($categ->isParent($category))
-					{
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist.=", ".$child["id"];
-
-						if ($chlist != "-99")
-							$catsrch .= " r.categoryid in (".$chlist.") or ";
-					}
-					else
-					{
-						$catsrch .= sprintf(" r.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch.= "1=2 )";
-		}
-
-		$maxagesql = "";
-		if ($maxage > 0)
-			$maxagesql = sprintf(" and r.postdate > now() - interval %d day ", $maxage);
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and r.categoryid not in (".implode(",", $excludedcats).")";
-
-		$order = $this->getMusicOrder($orderby);
-		// query modified to join to musicinfo after limiting releases as performance issue prevented sane sql.
-		$sql = sprintf(" SELECT r.*, r.id as releaseid, m.*, g.title as genre, groups.name as group_name, concat(cp.title, ' > ', c.title) as category_name, concat(cp.id, ',', c.id) as category_ids, rn.id as nfoid from releases r left outer join groups on groups.id = r.groupid inner join musicinfo m on m.id = r.musicinfoid and m.title != '' left outer join releasenfo rn on rn.releaseid = r.id and rn.nfo is not null left outer join category c on c.id = r.categoryid left outer join category cp on cp.id = c.parentid left outer join genres g on g.id = m.genreID inner join (select r.id from releases r inner join musicinfo m ON m.id = r.musicinfoid and m.title != '' where r.musicinfoid > 0 and r.passwordstatus <= (select value from site where setting='showpasswordedrelease') and %s %s %s %s order by %s %s %s) x on x.id = r.id order by %s %s", $browseby, $catsrch, $maxagesql, $exccatlist, $order[0], $order[1], $limit, $order[0], $order[1]);
-		return $this->pdo->query($sql, true);
-	}
-
-	/**
-	 * Get musicinfo orderby column sql.
-	 */
-	public function getMusicOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'r.postdate' : $orderby;
-		$orderArr = explode("_", $order);
-		switch($orderArr[0]) {
-			case 'artist':
-				$orderfield = 'm.artist';
-				break;
-			case 'size':
-				$orderfield = 'r.size';
-				break;
-			case 'files':
-				$orderfield = 'r.totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'r.grabs';
-				break;
-			case 'year':
-				$orderfield = 'm.year';
-				break;
-			case 'genre':
-				$orderfield = 'm.genreID';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'r.postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-		return array($orderfield, $ordersort);
-	}
-
-	/**
-	 * Get musicinfo orderby columns.
-	 */
-	public function getMusicOrdering()
-	{
-		return array('artist_asc', 'artist_desc', 'posted_asc', 'posted_desc', 'size_asc', 'size_desc', 'files_asc', 'files_desc', 'stats_asc', 'stats_desc', 'year_asc', 'year_desc', 'genre_asc', 'genre_desc');
-	}
-
-	/**
-	 * Get musicinfo filter columns.
-	 */
-	public function getBrowseByOptions()
-	{
-		return array('artist'=>'artist', 'title'=>'title', 'genre'=>'genreID', 'year'=>'year');
-	}
-
-	/**
-	 * Get musicinfo filter column sql for user selection.
-	 */
-	public function getBrowseBy()
-	{
-		$this->pdo = new Db;
-
-		$browseby = ' ';
-		$browsebyArr = $this->getBrowseByOptions();
-		foreach ($browsebyArr as $bbk=>$bbv)
-		{
-			if (isset($_REQUEST[$bbk]) && !empty($_REQUEST[$bbk]))
-			{
-				$bbs = stripslashes($_REQUEST[$bbk]);
-				if (preg_match('/id/i', $bbv))
-					$browseby .= "m.{$bbv} = $bbs AND ";
-				else
-					$browseby .= "m.$bbv LIKE(".$this->pdo->escapeString('%'.$bbs.'%').") AND ";
-			}
-		}
-		return $browseby;
-	}
-
-	/**
-	 * Update musicinfo row
-	 */
-	public function update($id, $title, $asin, $url, $salesrank, $artist, $publisher, $releasedate, $year, $tracks, $cover, $genreID)
-	{
-
-		$this->pdo->queryExec(sprintf("update musicinfo SET title=%s, asin=%s, url=%s, salesrank=%s, artist=%s, publisher=%s, releasedate='%s', year=%s, tracks=%s, cover=%d, genreID=%d, updateddate=NOW() WHERE id = %d",
-				$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url), $salesrank, $this->pdo->escapeString($artist), $this->pdo->escapeString($publisher), $releasedate, $this->pdo->escapeString($year), $this->pdo->escapeString($tracks), $cover, $genreID, $id));
-	}
-
-	/**
-	 * Update musicinfo from external source
-	 */
-	public function updateMusicInfo($artist, $album, $year)
-	{
-		$gen = new Genres();
-		$ri = new ReleaseImage();
-
-		$mus = array();
-		$amaz = $this->fetchAmazonProperties($artist." ".$album);
-		if (!$amaz)
-			return false;
-
-		sleep(1);
-
-		//load genres
-		$defaultGenres = $gen->getGenres(Genres::MUSIC_TYPE);
-		$genreassoc = array();
-		foreach($defaultGenres as $dg) {
-			$genreassoc[$dg['id']] = strtolower($dg['title']);
-		}
-
-		//
-		// get album properties
-		//
-		$mus['coverurl'] = (string) $amaz->Items->Item->LargeImage->URL;
-		if ($mus['coverurl'] != "")
-			$mus['cover'] = 1;
-		else
-			$mus['cover'] = 0;
-
-		$mus['title'] = (string) $amaz->Items->Item->ItemAttributes->Title;
-		if (empty($mus['title']))
-			$mus['title'] = $album;
-
-		$mus['asin'] = (string) $amaz->Items->Item->ASIN;
-
-		$mus['url'] = (string) $amaz->Items->Item->DetailPageURL;
-
-		$mus['salesrank'] = (string) $amaz->Items->Item->SalesRank;
-		if ($mus['salesrank'] == "")
-			$mus['salesrank'] = 'null';
-
-		$mus['artist'] = (string) $amaz->Items->Item->ItemAttributes->Artist;
-		if (empty($mus['artist']))
-			$mus['artist'] = $artist;
-
-		$mus['publisher'] = (string) $amaz->Items->Item->ItemAttributes->Publisher;
-
-		$mus['releasedate'] = $this->pdo->escapeString((string) $amaz->Items->Item->ItemAttributes->ReleaseDate);
-		if ($mus['releasedate'] == "''")
-			$mus['releasedate'] = 'null';
-
-		$mus['review'] = "";
-		if (isset($amaz->Items->Item->EditorialReviews))
-			$mus['review'] = trim(strip_tags((string) $amaz->Items->Item->EditorialReviews->EditorialReview->Content));
-
-		$mus['year'] = $year;
-		if ($mus['year'] == "")
-			$mus['year'] = ($mus['releasedate'] != 'null' ? substr($mus['releasedate'], 1, 4) : date("Y"));
-
-		$mus['tracks'] = "";
-		if (isset($amaz->Items->Item->Tracks))
-		{
-			$tmpTracks = (array) $amaz->Items->Item->Tracks->Disc;
-			$tracks = $tmpTracks['Track'];
-			$mus['tracks'] = (is_array($tracks) && !empty($tracks)) ? implode('|', $tracks) : '';
-		}
-
-		//This is to verify the result back from amazon was at least somewhat related to what was intended.
-		//If you are debugging releases comment out the following code to show all info
-
-		$match = similar_text($artist, $mus['artist'], $artistpercent);
-		//echo("Matched: Artist Percentage: $artistpercent%");
-		$match = similar_text($album, $mus['title'], $albumpercent);
-		//echo("Matched: Album Percentage: $albumpercent%");
-
-		//If the artist is Various Artists, assume artist is 100%
-		if (preg_match('/various/i', $artist))
-			$artistpercent = '100';
-
-		//If the Artist is less than 80% album must be 100%
-		if ($artistpercent < '80')
-		{
-			if ($albumpercent != '100')
-				return false;
-		}
-
-		//If the album is ever under 30%, it's probably not a match.
-		if ($albumpercent < '30')
-			return false;
-
-		//This is the end of the recheck code. Comment out to this point to show all info.
-
-		$genreKey = -1;
-		$genreName = '';
-		if (isset($amaz->Items->Item->BrowseNodes))
-		{
-			//had issues getting this out of the browsenodes obj
-			//workaround is to get the xml and load that into its own obj
-			$amazGenresXml = $amaz->Items->Item->BrowseNodes->asXml();
-			$amazGenresObj = simplexml_load_string($amazGenresXml);
-			$amazGenres = $amazGenresObj->xpath("//BrowseNodeId");
-
-			foreach($amazGenres as $amazGenre)
-			{
-				$currNode = trim($amazGenre[0]);
-				if (empty($genreName))
-				{
-					$genreMatch = $this->matchBrowseNode($currNode);
-					if ($genreMatch !== false)
-					{
-						$genreName = $genreMatch;
-						break;
-					}
-				}
-			}
-		}
-		$mus['musicgenreID'] = $genreKey;
-
-		$musicId = $this->addUpdateMusicInfo($mus['title'], $mus['asin'], $mus['url'],
-			$mus['salesrank'], $mus['artist'], $mus['publisher'], $mus['releasedate'], $mus['review'],
-			$mus['year'],$mus['musicgenreID'], $mus['tracks'], $mus['cover'] );
-
-		if ($musicId)
-		{
-			//if ($this->echooutput)
-			//	echo "added/updated album: ".$mus['title']." (".$mus['year'].")\n";
-
-			$mus['cover'] = $ri->saveImage($musicId, $mus['coverurl'], $this->imgSavePath, 250, 250);
-		}
-
-		return $musicId;
-	}
-
-	/**
-	 * Retrieve info from Amazon for a title.
-	 */
-	public function fetchAmazonProperties($title)
-	{
-		$obj = new AmazonProductAPI($this->pubkey, $this->privkey, $this->asstag);
-		try
-		{
-			$result = $obj->searchProducts($title, AmazonProductAPI::MP3, "TITLE");
-		}
-		catch(Exception $e)
-		{
-			//if first search failed try the mp3downloads section
-			try
-			{
-				// sleep for 1 second
-				sleep(1);
-				$result = $obj->searchProducts($title, AmazonProductAPI::MUSIC, "TITLE");
-
-			}
-			catch(Exception $e2)
-			{
-				$result = false;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Process all untagged releases to see if musicinfo exists for them.
-	 */
-	public function processMusicReleases()
-	{
-		$ret = 0;
-		$numlookedup = 0;
-
-		$res = $this->pdo->queryDirect(sprintf("SELECT searchname, id from releases where musicinfoid IS NULL and categoryid in ( select id from category where parentid = %d ) ORDER BY postdate DESC LIMIT 1000", Category::CAT_PARENT_MUSIC));
-		if ($this->pdo->getNumRows($res) > 0)
-		{
-			if ($this->echooutput)
-				echo "MusicPr : Processing ".$this->pdo->getNumRows($res)." audio releases\n";
-
-			while ($arr = $this->pdo->getAssocArray($res))
-			{
-				if ($numlookedup > Music::NUMTOPROCESSPERTIME)
-					return;
-
-				$albumId = -2;
-				$album = $this->parseArtist($arr['searchname']);
-				if ($album !== false)
-				{
-					if ($this->echooutput)
-						echo 'MusicPr : Looking up: '.$album["artist"].' - '.$album["album"]."\n";
-
-					//check for existing music entry
-					$albumCheck = $this->getMusicInfoByName($album["artist"], $album["album"]);
-
-					if ($albumCheck === false)
-					{
-						//
-						// get from amazon
-						//
-						$numlookedup++;
-						$ret = $this->updateMusicInfo($album["artist"], $album["album"], $album['year']);
-						if ($ret !== false)
-						{
-							$albumId = $ret;
-						}
-					}
-					else
-					{
-						$albumId = $albumCheck["id"];
-					}
-				}
-
-				$this->pdo->queryExec(sprintf("update releases SET musicinfoid = %d WHERE id = %d", $albumId, $arr["id"]));
-			}
-		}
-	}
-
-	/**
-	 * Strip out an artist name from a release.
-	 */
-	public function parseArtist($releasename)
-	{
-		$result = array();
-		/*TODO: FIX VA lookups
-		if (substr($releasename, 0, 3) == 'VA-') {
-				$releasename = trim(str_replace('VA-', '', $releasename));
-		} elseif (substr($name, 0, 3) == 'VA ') {
-				$releasename = trim(str_replace('VA ', '', $releasename));
-		}
-		*/
-		if (preg_match('/mdvdr/i', $releasename))
-			return false;
-
-		//Replace VA with Various Artists
-		$newName = preg_replace('/VA( |\-)/', 'Various Artists -', $releasename);
-
-		//remove years, vbr etc
-		$newName = preg_replace('/\(.*?\)/i', '', $newName);
-		//remove double dashes
-		$newName = str_replace('--', '-', $newName);
-		$newName = str_replace('FLAC', '', $newName);
-
-		$name = explode("-", $newName);
-		$name = array_map("trim", $name);
-
-		if (is_array($name) && sizeof($name) > 1)
-		{
-			$albumi = 1;
-			if ((strlen($name[0]) <= 2 || strlen($name[1]) <= 2) && !preg_match('/Various Artists/i', $name[0]))
-			{
-				$name[0] = $name[0].'-'.$name[1];
-				$albumi = 2;
-			}
-			elseif (strlen($name[1]) <= 2 && preg_match('/Various Artists/i', $name[0]) && sizeof($name) > 2)
-			{
-				$name[2] = $name[1].'-'.$name[2];
-				$albumi = 2;
-			}
-
-			if (!isset($name[$albumi]))
-				return false;
-
-			if (preg_match('/^the /i', $name[0])) {
-				$name[0] = preg_replace('/^the /i', '', $name[0]).', The';
-			}
-			if (preg_match('/deluxe edition|single|nmrVBR|READ NFO/i', $name[$albumi], $albumType)) {
-				$name[$albumi] = preg_replace('/'.$albumType[0].'/i', '', $name[$albumi]);
-			}
-			$result['artist'] = trim($name[0]);
-			$result['album'] = trim($name[$albumi]);
-		}
-
-		//make sure we've actually matched an album name
-		if (isset($result['album']))
-		{
-			if (preg_match('/^(nmrVBR|VBR|WEB|SAT|20\d{2}|19\d{2}|CDM|EP)$/i',$result['album']))
-			{
-				$result['album'] = '';
-			}
-		}
-
-		preg_match('/((?:19|20)\d{2})/i', $releasename, $year);
-		$result['year'] = (isset($year[1]) && !empty($year[1])) ? $year[1] : '';
-
-		$result['releasename'] = $releasename;
-
-		return (!empty($result['artist']) && !empty($result['album'])) ? $result : false;
-	}
-
-	/**
-	 * Process all releases tagged as musicinfoid -2 to attempt to retrieve properties from mediainfo xml.
-	 */
-	public function processMusicReleaseFromMediaInfo()
-	{
-		$res = $this->pdo->query("SELECT r.searchname, ref.releaseid, ref.mediainfo FROM releaseextrafull ref INNER JOIN releases r ON r.id = ref.releaseid WHERE r.musicinfoid = -2");
-
-		$rescount = sizeof($res);
-		if ($rescount > 0)
-		{
-			if ($this->echooutput)
-				echo "MusicPr : Processing ".$rescount." audio releases via mediainfo\n";
-
-			//load genres
-			$gen = new Genres();
-			$defaultGenres = $gen->getGenres(Genres::MUSIC_TYPE);
-			$genreassoc = array();
-			foreach($defaultGenres as $dg)
-				$genreassoc[$dg['id']] = strtolower($dg['title']);
-
-			foreach($res as $rel)
-			{
-				$albumId = -3;
-				$mi = null;
-				$mi = @simplexml_load_string($rel["mediainfo"]);
-				if ($mi != null)
-				{
-					$artist = (string) $mi->File->track[0]->Performer;
-					$album = (string) $mi->File->track[0]->Album;
-					$year = (string) $mi->File->track[0]->Recorded_date;
-					$genre = (string) $mi->File->track[0]->Genre;
-					$publisher = (string) $mi->File->track[0]->Publisher;
-
-					$albumCheck = $this->getMusicInfoByName($artist, $album);
-					if ($albumCheck === false)
-					{
-						//
-						// insert new musicinfo
-						//
-						$genreKey = -1;
-						if ($genre != "")
-							$albumId = $this->addUpdateMusicInfo($album, "", "",  "null", $artist,
-								$publisher, "null", "", $year, $genreKey, "", 0 );
-					}
-					else
-					{
-						$albumId = $albumCheck["id"];
-					}
-				}
-
-				$sql = sprintf("update releases set musicinfoid = %d where id = %d", $albumId, $rel["releaseid"]);
-
-				$this->pdo->queryExec($sql);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Insert or update a musicinfo row.
-	 */
-	public function addUpdateMusicInfo($title, $asin, $url, $salesrank, $artist, $publisher, $releasedate, $review, $year, $genreID, $tracks, $cover)
-	{
-
-		if (strlen($year) > 4)  {
-			if (preg_match("/\d{4}/", $year, $matches))
-				$year = $this->pdo->escapeString($matches[0]);
-			else
-				$year = "null";
-		}
-		else {
-			$year = $this->pdo->escapeString($year);
-		}
-
-		$sql = sprintf("
-		INSERT INTO musicinfo  (title, asin, url, salesrank,  artist, publisher, releasedate, review, year, genreID, tracks, cover, createddate, updateddate)
-		VALUES (%s, %s, %s,  %s,  %s, %s, %s, %s, %s,   %s, %s, %d, now(), now())
-			ON DUPLICATE KEY UPDATE  title = %s,  asin = %s,  url = %s,  salesrank = %s,  artist = %s,  publisher = %s,  releasedate = %s,  review = %s,  year = %s,  genreID = %s,  tracks = %s,  cover = %d,  createddate = now(),  updateddate = now()",
-			$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url),
-			$salesrank, $this->pdo->escapeString($artist), $this->pdo->escapeString($publisher),
-			$releasedate, $this->pdo->escapeString($review), $year,
-			($genreID==-1?"null":$genreID), $this->pdo->escapeString($tracks), $cover,
-			$this->pdo->escapeString($title), $this->pdo->escapeString($asin), $this->pdo->escapeString($url),
-			$salesrank, $this->pdo->escapeString($artist), $this->pdo->escapeString($publisher),
-			$releasedate, $this->pdo->escapeString($review), $this->pdo->escapeString($year),
-			($genreID==-1?"null":$genreID), $this->pdo->escapeString($tracks), $cover  );
-
-		$musicId = $this->pdo->queryInsert($sql);
-		return $musicId;
-	}
-
-	/**
-	 * Convert Amazon browsenodes to genres.
-	 */
-	public function matchBrowseNode($nodeId)
-	{
-		$str = '';
-
-		//music nodes above mp3 download nodes
-		switch($nodeId)
-		{
-			case '163420':
-				$str = 'Music Video & Concerts';
-				break;
-			case '30':
-			case '624869011':
-				$str = 'Alternative Rock';
-				break;
-			case '31':
-			case '624881011':
-				$str = 'Blues';
-				break;
-			case '265640':
-			case '624894011':
-				$str = 'Broadway & Vocalists';
-				break;
-			case '173425':
-			case '624899011':
-				$str = "Children's Music";
-				break;
-			case '173429': //christian
-			case '2231705011': //gospel
-			case '624905011': //christian & gospel
-				$str = 'Christian & Gospel';
-				break;
-			case '67204':
-			case '624916011':
-				$str = 'Classic Rock';
-				break;
-			case '85':
-			case '624926011':
-				$str = 'Classical';
-				break;
-			case '16':
-			case '624976011':
-				$str = 'Country';
-				break;
-			case '7': //dance & electronic
-			case '624988011': //dance & dj
-				$str = 'Dance & Electronic';
-				break;
-			case '32':
-			case '625003011':
-				$str = 'Folk';
-				break;
-			case '67207':
-			case '625011011':
-				$str = 'Hard Rock & Metal';
-				break;
-			case '33': //world music
-			case '625021011': //international
-				$str = 'World Music';
-				break;
-			case '34':
-			case '625036011':
-				$str = 'Jazz';
-				break;
-			case '289122':
-			case '625054011':
-				$str = 'Latin Music';
-				break;
-			case '36':
-			case '625070011':
-				$str = 'New Age';
-				break;
-			case '625075011':
-				$str = 'Opera & Vocal';
-				break;
-			case '37':
-			case '625092011':
-				$str = 'Pop';
-				break;
-			case '39':
-			case '625105011':
-				$str = 'R&B';
-				break;
-			case '38':
-			case '625117011':
-				$str = 'Rap & Hip-Hop';
-				break;
-			case '40':
-			case '625129011':
-				$str = 'Rock';
-				break;
-			case '42':
-			case '625144011':
-				$str = 'Soundtracks';
-				break;
-			case '35':
-			case '625061011':
-				$str = 'Miscellaneous';
-				break;
-		}
-		return ($str != '') ? $str : false;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/nfo.php b/lib/copy_this/www/lib/nfo.php
deleted file mode 100644
index 9aa0926a0..000000000
--- a/lib/copy_this/www/lib/nfo.php
+++ /dev/null
@@ -1,640 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/movie.php");
-require_once(WWW_DIR."/lib/tvrage.php");
-require_once(WWW_DIR."/lib/nntp.php");
-require_once(WWW_DIR."/lib/nzb.php");
-require_once(WWW_DIR."/lib/nzbinfo.php");
-
-// Silent Error Handler (used to shut up noisy XML exceptions)
-function nfoHandleError($errno, $errstr, $errfile, $errline, array $errcontext){
-	if (0 === error_reporting())
-		return false;
-	if(!defined('E_STRICT'))define('E_STRICT', 2048);
-	switch($errno){
-		case E_WARNING:
-		case E_NOTICE:
-		case E_STRICT:
-			return;
-		default:
-			break;
-	};
-	throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-}
-
-/**
- * This class looks up nfo files and handles storage/retrieval of them from the database.
- */
-class Nfo
-{
-	/**
-	 * @access public
-	 * @var how many releases to process at once (hence 1 release
-	 *      could have more then 10 possible nfo matches
-	 */
-	const NNTP_BATCH_COUNT = 10;
-
-	/**
-	 * @access public
-	 * @var Number of retries to usenet on a failed batch fetching before
-	 *      giving up a batch and moving on
-	 */
-	const USENET_RETRY_COUNT = 5;
-
-	/**
-	 * @access public
-	 * @var Defines the maximum size a single segment can be before we can rule
-	 *      after a binary has matched a releaseregex
-	 */
-	const NFO_MAX_FILESIZE = 50000;
-
-	/**
-	 * @access public
-	 * @var Database flag for no NFO found
-	 */
-	const FLAG_NFO_MISSING = -1;
-
-	/**
-	 * @access public
-	 * @var Database flag NFO pending scan
-	 */
-	const FLAG_NFO_PENDING = 0;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $verbose
-	 * @param bool $use_obfuscated
-	 * @param bool $use_fuzzy
-	 */
-	public function __construct($verbose=false, $use_obfuscated=true, $use_fuzzy=false)
-	{
-		$this->use_fuzzy=$use_fuzzy;
-		$this->use_obfuscated=$use_obfuscated;
-		$this->verbose=$verbose;
-	}
-
-	private function nfo_scan(&$nzbInfo){
-		//
-		// Phase 1, iterate over nzb file for a relative
-		//          match on a possible nfo file
-		//              - 1 segment
-		//              - within byte size
-		//
-
-		// Array of all possible matches to return
-		$nfo_idx = array();
-
-		// Search for all entries that have a single segment
-		if (empty($nzbInfo->segmentfiles))
-			// Nothing to Return
-			return array();
-
-		// Fetch Meta Information
-		if (isset($nzbInfo->metadata['name']))
-			$name = $nzbInfo->metadata['name'];
-		else
-			$name = "";
-
-		$unordered_list=array();
-		foreach($nzbInfo->segmentfiles as $segment){
-			if ($segment['filesize'] > Nfo::NFO_MAX_FILESIZE)
-				continue;
-
-			$unordered_list[] = array(
-				"name" => $name,
-				"subject" => $segment['subject'],
-				"bytes" => $segment['filesize'],
-				"segment" => $segment['segments'],
-				"groups" => $segment['groups']
-			);
-		}
-
-		//
-		// Filter built list above based on subject line info
-		// hence... eliminate par2, nzb ... etc files
-		//
-		// processing is done in 2 steps, the first step finds the
-		// most likely .nfo files, while the second keeps a backup
-		// of potential others in the unlikelyhood the content
-		// parsed here is bad
-		//
-		foreach($unordered_list as $idx => $n){
-			if (preg_match("/\.(nfo)([^a-z0-9]+|$)/i", $n["subject"])){
-				if($this->verbose) echo "[nfo] ";
-				$nfo_idx[]=$n;
-			}
-		}
-
-		// Handle Releases with Obfuscation
-		// Releases titled: f4ca0f95896da1d41254bf49791a86a2
-		if($this->use_obfuscated)
-			foreach($unordered_list as $idx => $n){
-				if (preg_match("/\.(sfv)([^a-z0-9]+|$)/i", $n["subject"]))
-					continue;
-				if (preg_match("/\.(nzb)([^a-z0-9]+|$)/i", $n["subject"]))
-					continue;
-
-				if (preg_match("/\.[0-9]+([^a-z0-9\.-]+|$)/i", $n["subject"])){
-					if($this->verbose) echo "[obfs] ";
-					$nfo_idx[]=$n;
-				}
-			}
-
-		// Fuzzy Parsing sees if it can identify other possible nfo's however
-		// they are appended to the end of the list obvious nfo's are always
-		// processed first
-		if($this->use_fuzzy)
-			foreach($unordered_list as $idx => $n){
-				if (preg_match("/\.(txt|diz)([^a-z0-9]+|$)/i", $n["subject"])){
-					if($this->verbose) echo "[fuzz] ";
-					$nfo_idx[]=$n;
-				}
-			}
-
-		// Return array of matched content in order (aprox)
-		// from very possible to... possible...
-		return $nfo_idx;
-	}
-
-	private function is_binary(&$raw){
-		// Returns true if data passed in is binary, otherwise
-		// returns false,
-		$has_binary = (
-			0 || substr_count($raw, "^\r\n")/512 > 0.3
-			|| substr_count($raw, "^ -~")/512 > 0.3
-			|| substr_count($raw, "\x00") > 0
-		);
-
-		if($has_binary)
-		{
-			// Before we rule it completely out, see if we can detect it
-			// as utf-16
-			$result = iconv($in_charset = 'UTF-16LE' , $out_charset = 'UTF-8', $raw);
-			if (false !== $result)
-			{
-				// not binary, we decoded it
-				// we're dealing with a utf-16 type file...
-				// store it as utf-8
-				$raw = $result;
-				return false;
-			}
-		}
-
-		// Return the binary flag
-		return ($has_binary)?true:false;
-	}
-
-	private function is_par2(&$raw){
-		// Returns true if data passed in is binary, otherwise
-		// returns false,
-		return (substr($raw, 4) == "PAR2");
-	}
-
-	private function is_sfv(&$raw){
-		// scan a content and return true if it is detected to be
-		// an sfv file, otherwise return false
-
-		// First we identify acceptable sfv lines, anything that
-		// does not match against the below causes this function to
-		// exit gracefully and report that were not dealing with
-		// an sfv file
-		$sfv_regex = array(
-			// the sfv information itself
-			'/^\s*([^; \t]+)\s+([^; \t]+)[ \t]*(;|$)/',
-			// sfv comments
-			'/^\s*;/',
-			// empty lines that contain nothing
-			'/^$/',
-		);
-		// itreate over each line of file, if all regex's match
-		// on every line then we are dealing with an sfv file
-		foreach(preg_split("/((\r?\n)|(\r\n?))/", $raw) as $line){
-			$matches=false;
-			foreach($sfv_regex as $regex)
-				if(preg_match($regex, $line)){
-					$matches=true;
-					break;
-				}
-			if(!$matches)
-				return false;
-		}
-		return true;
-	}
-
-	private function store_blob($nfometa, $blobhash, $removed){
-		// This takes a array of blobs with their index id being
-		// the release id;  In the event we fetch the data and deem
-		// it no good, we need to add it to the skipped array which
-		// must be passed into the function.
-
-		$db = new DB();
-		foreach($blobhash as $uid => $blob){
-			$query = sprintf(
-				"REPLACE INTO releasenfo (id, releaseid, binaryid, nfo) ".
-				"VALUES (NULL, %d, 0, compress(%s));",
-				$uid, $db->escapeString($blob));
-			$id = $db->queryInsert($query);
-			if(!$id){
-				if($this->verbose) echo "!";
-			}else{
-				$query = sprintf("UPDATE releases SET releasenfoid = %d WHERE id = %d LIMIT 1",
-								$id, $uid);
-				$res = $db->queryExec($query);
-				if($this->verbose) echo "s";
-			}
-		}
-
-		// Now we update the database with entries that have no nfo files
-		// associated with the release
-		foreach($removed as $uid){
-			$res = $this->setNfoMissing($uid);
-			if($res <= 0){
-				if($this->verbose) echo "!";
-			}else{
-				if($this->verbose) echo "s";
-			}
-		}
-	}
-
-	private function parse_blobs(&$nfometa, &$nfoblob){
-		// Parses an array of array of blobs and determines the most
-		// ideal nfo from them.
-		//
-		// $nfoblob is expected as follows
-		//
-		//	$nfoblob = array(
-		//       [<releaseid>] = array(
-		//           [0] = <potential nfo file>,
-		//           [1] = <potential nfo file>,
-		//           ...
-		//       ),
-		//       [<releaseid>] = array(
-		//           [0] = <potential nfo file>,
-		//       ),
-		//       ...
-		//  )
-		//
-		// Meanwhile, $nfometa is expected as follows:
-		//	$nfometa = array(
-		//       [<releaseid>] = array(
-		//           [groups] = array(
-		//                       "alt.binaries.mygroupa",
-		//                       "alt.binaries.mygroupb",
-		//                       "alt.binaries.mygroupc",
-		//                       ...
-		//                    )
-		//           [segment] = array(<segment id>),
-		//           [groups] = array(
-		//                       "alt.binaries.mygroupa",
-		//                       "alt.binaries.mygroupb",
-		//                       ...
-		//                    )
-		//       ),
-		//       [<releaseid>] = array(
-		//           [groups] = array(
-		//                       "alt.binaries.mygroupa",
-		//                       ...
-		//                    )
-		//           [segment] = array(<segment id>),
-		//       ),
-		//       ...
-		// The function strips indexes that appear invalid
-		// and stores the most ideal match per release
-
-		$parsed_blob = array();
-		$parsed_meta = array();
-
-		foreach($nfometa as $uid => $info){
-			$ideal = Null;
-			$tossed = 0;
-			$total = count($info);
-			foreach($info as $idx => $entry){
-				// Save first 'valid' entry
-
-				// Some simple checks right off the top... if there is
-				// no blob or the data failed to fetch, we can rule
-				// this entry out right away
-				if(!array_key_exists($uid, $nfoblob)){
-					if($this->verbose) echo '-';
-					continue;
-				}
-				if(!array_key_exists($idx, $nfoblob[$uid])){
-					if($this->verbose) echo '-';
-					continue;
-				}
-				if($nfoblob[(string)$uid][$idx] === Null){
-					if($this->verbose) echo '-';
-					continue;
-				}
-
-				// Eliminate detected xml (usually nzb) files
-				if(preg_match('/xmlns[^=]*="[^"]*"/i', $nfoblob[$uid][$idx]) ||
-					preg_match("/(\<\?xml[\d\D]*\?\>)/i", $nfoblob[$uid][$idx])){
-					if($this->verbose) echo '-';
-					continue;
-				}
-
-				// We do not want to pick up sfv files
-				if($this->is_sfv($nfoblob[$uid][$idx])){
-					if($this->verbose) echo '-';
-					continue;
-				}
-
-				// We do not want to pick up par2 files
-				if($this->is_par2($nfoblob[$uid][$idx])){
-					if($this->verbose) echo '-';
-					continue;
-				}
-				// Ideally if code reaches this far
-				// we can assume we've matched and we
-				// san skip further parsing
-				$ideal = $idx;
-				break;
-			}
-
-			if($ideal !== Null){
-				// An ideal match was found
-				$parsed_blob[(string)$uid] = $nfoblob[$uid][$ideal];
-				$parsed_meta[(string)$uid] = $nfometa[$uid][$ideal];
-				if($this->verbose) echo '+';
-			}else{
-				// No valid data
-				unset($parsed_blob[(string)$uid]);
-				unset($parsed_meta[(string)$uid]);
-			}
-		}
-
-		// perform swap with new parsed data by elminating the array containing
-		// the possible matches with the absolute match itself...
-		// no longer is anyone dealing with an array of array after calling
-		// this function
-		$nfoblob = $parsed_blob;
-		$nfometa = $parsed_meta;
-
-		return count($nfoblob);
-	}
-
-	private function _nfo_grab($nfometa, &$blobhash){
-		// nfometa should be an array() of segments from nzb file
-		// it will then populate the blobhash which uses the segments
-		// as hash entries for the blob data.
-		// nfometa is an array of arrays simiar to the following
-		// structure:
-		//
-		// The list is structured in such a way that the most ideal
-		// matches are at the front, while less likely ones at the
-		// back of the array
-		//
-		//	$nfometa = array(
-		//       [<releaseid>] = array(
-		//           [groups] = array(
-		//                       "alt.binaries.mygroupa",
-		//                       "alt.binaries.mygroupb",
-		//                       "alt.binaries.mygroupc",
-		//                       ...
-		//                    )
-		//           [segment] = array(<segment id>),
-		//           [groups] = array(
-		//                       "alt.binaries.mygroupa",
-		//                       "alt.binaries.mygroupb",
-		//                       ...
-		//                    )
-		//       ),
-		//       [<releaseid>] = array(
-		//           [groups] = array(
-		//                       "alt.binaries.mygroupa",
-		//                       ...
-		//                    )
-		//           [segment] = array(<segment id>),
-		//       ),
-		//       ...
-		//  )
-		$nntp = new Nntp();
-
-		// Connect to server (we throw an exception if we fail) which
-		// is caught upstairs with the nfo_grab() function
-		// no error handling is needed here
-		$nntp->doConnect(1, true);
-		foreach($nfometa as $uid => $matches){
-			$blobhash[$uid] = array();
-			foreach($matches as $idx => $match){
-				$fetched = false;
-				foreach($match["groups"] as $group){
-					// Don not try other groups if we already got it
-					if($fetched)break;
-
-					// Select the group and then attempt to fetch the article
-					$blob = $nntp->getMessages($group, $match["segment"], false);
-					if ($blob === false){
-						if($this->verbose) echo '*';
-						continue;
-					}
-					// Mark that we fetched it to prevent fetching more
-					// of the same thing
-					$fetched = true;
-					if($this->verbose) echo '.';
-
-					// Update blob with decrypted version and store
-					if ($this->is_binary($blob)){
-						// Binary data is not acceptable, we only
-						// work with text from here on out.
-						continue;
-					}
-					// Read-able ascii at this point... store it
-					$blobhash[$uid][$idx] = $blob;
-				}
-				if(!$fetched)
-					// handle empty/failed segments
-					$blobhash[$uid][$idx] = Null;
-			}
-		}
-		$nntp->doQuit();
-	}
-
-	private function nfo_grab($nfometa, &$blobhash){
-		// It is possible for connection to drop while attempting
-		// to fetch nfo content, to accomodate for the exceptions
-		// thrown during this time we wrap the real nfo_grab()
-		// in a try catch block with a silent exception catcher
-		$retries = nfo::USENET_RETRY_COUNT;
-		set_error_handler('nfoHandleError');
-		$_blobhash = array();
-		while($retries >0){
-			try{
-				$this->_nfo_grab($nfometa, $_blobhash);
-				break;
-			}catch (Exception $e){
-				// Connection lost
-				if($this->verbose) echo sprintf("\n%s Connection lost to usenet (%d retries left).\n",
-							'NfoProc', $retries);
-				// Decrement retry count
-				$retries--;
-				// Reset blobhash
-				$_blobhash = array();
-				continue;
-			}
-		}
-		// Restore handler as any future errors really are... code errors :)
-		restore_error_handler();
-
-		if($retries>0){
-			foreach ($_blobhash as $k => $v)
-				$blobhash[(string)$k]=$v;
-			return true;
-		}
-		return false;
-	}
-
-	private function scan_releases(&$processed, &$total, $limit=Null){
-		// Scan all nzb files whos releases match against data
-		// that has no nfo files associated with it.
-		//
-		// nzb files are further parsed for nfo segments that can
-		// be extracted and applied to the release
-		$nzb = new NZB();
-		$db = new DB();
-
-		// How many releases to handle at a time
-		$batch=Nfo::NNTP_BATCH_COUNT;
-
-		// Build NFO List
-		$nfometa = array();
-
-		// Missing NFO Query (oldest first so they don't expire on us)
-		$mnfo = "SELECT id,guid, name FROM releases r ".
-				"WHERE r.releasenfoid = ".Nfo::FLAG_NFO_PENDING.
-				" ORDER BY postdate DESC";
-
-		if ($limit !== Null && $limit > 0)
-			$mnfo .= " LIMIT $limit";
-
-		$res = $db->query($mnfo);
-		if($res){
-			foreach($res as $r){
-				$nzbfile = $nzb->getNZBPath($r["guid"]);
-				if(!is_file($nzbfile)){
-					if($this->verbose) echo sprintf("%s Missing NZB File: %d/%s ...\n",
-						'NfoProc', intval($r["id"]), $r["name"]);
-					$this->setNfoMissing($r["id"]);
-					continue;
-				}
-
-				$nzbInfo = new NzbInfo();
-				if (!$nzbInfo->loadFromFile($nzbfile))
-                {
-                   if($this->verbose) echo sprintf("%s Unable to parse NZB File: %d/%s ...\n",
-						'NfoProc', intval($r["id"]), $r["name"]);
-					$this->setNfoMissing($r["id"]);
-					continue;
-                }
-
-                $total+=1;
-
-				$filename = basename($nzbfile);
-				if($this->verbose) echo sprintf("NfoProc : Scanning %s - ", $r["name"]);
-
-				$matches = $this->nfo_scan($nzbInfo);
-				unset($nzbInfo);
-				if(is_array($matches)){
-					if(!count($matches)){
-						if($this->verbose) echo "nfo missing.\n";
-						$this->setNfoMissing($r["id"]);
-						continue;
-					}
-				}else{
-					if($this->verbose) echo "corrupt nzb.\n";
-					$this->setNfoMissing($r["id"]);
-					continue;
-				}
-				if($this->verbose) echo count($matches)." possible nfo(s).\n";
-				$processed++;
-
-				// Hash Matches by Release id
-				$nfometa[(string)$r["id"]] = $matches;
-
-				if(!($processed%$batch))
-				{
-					$nfoblob = array();
-					if($this->verbose) echo "NfoProc : Retrieval ...";
-					if($this->nfo_grab($nfometa, $nfoblob)){
-						$before = array_keys($nfoblob);
-						$this->parse_blobs($nfometa, $nfoblob);
-						$after = array_keys($nfoblob);
-						$removed = array_diff($before, $after);
-						$this->store_blob($nfometa, $nfoblob, $removed);
-					}
-					if($this->verbose) echo "\n";
-
-					// Reset nfo list array
-					$nfometa = array();
-				}
-			}
-			if(($processed%$batch)){
-				$nfoblob = array();
-				if($this->verbose) echo "NfoProc : Retrieval ...";
-				if($this->nfo_grab($nfometa, $nfoblob)){
-					$before = array_keys($nfoblob);
-					$this->parse_blobs($nfometa, $nfoblob);
-					$after = array_keys($nfoblob);
-					$removed = array_diff($before, $after);
-					$this->store_blob($nfometa, $nfoblob, $removed);
-				}
-				if($this->verbose) echo "\n";
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Delete a releasenfo row.
-	 */
-	public function deleteReleaseNfo($relid)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("DELETE from releasenfo where releaseid = %d", $relid));
-	}
-
-	/**
-	 * Mark a release as missing so it isn't ever parsed again
-	 */
-	private function setNfoMissing($relid)
-	{
-		$db = new DB();
-		$q = sprintf("UPDATE releases SET releasenfoid = %d ".
-					"WHERE id = %d", Nfo::FLAG_NFO_MISSING, $relid);
-		return $db->queryExec($q);
-	}
-
-	/**
-	 * Returns the nfo from the database (blob)
-	 */
-	public function getNfo($relid, &$nfoout)
-	{
-		$db = new DB();
-		// Has NFO Query
-		$mnfo = "SELECT uncompress(rn.nfo) as nfo FROM releases r ".
-			"INNER JOIN releasenfo rn ON rn.releaseid = r.id AND rn.id = r.releasenfoid ".
-			"WHERE rn.nfo IS NOT NULL AND r.id = %d LIMIT 1";
-		$res = $db->queryOneRow(sprintf($mnfo, $relid));
-		if($res && isset($res['nfo']))
-		{
-			$nfoout=$res['nfo'];
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Process Nfo's
-	 */
-	public function processNfoFiles($batch=50)
-	{
-		$processed = 0;
-		$total = 0;
-		$this->scan_releases($processed, $total, $batch);
-		if($this->verbose) echo sprintf("NfoProc : Complete %d NFOs detected from %d scanned NZB files.\n", $processed, $total);
-
-		return $total;
-	}
-}
diff --git a/lib/copy_this/www/lib/nntp.php b/lib/copy_this/www/lib/nntp.php
deleted file mode 100644
index 871c0017e..000000000
--- a/lib/copy_this/www/lib/nntp.php
+++ /dev/null
@@ -1,1618 +0,0 @@
-<?php
-/**
- * Attempt to include PEAR's nntp class if it has not already been included.
- */
-require_once(WWW_DIR . "/lib/Net_NNTP/NNTP/Client.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/Logger.php");
-
-/**
- * Class for connecting to the usenet, retrieving articles and article headers,
- * decoding yEnc articles, decompressing article headers.
- * Extends PEAR's Net_NNTP_Client class, overrides some functions.
- */
-class NNTP extends Net_NNTP_Client
-{
-	public $pdo;
-
-	/**
-	 * @var ColorCLI
-	 * @access protected
-	 */
-	protected $_colorCLI;
-
-	/**
-	 * @var Logger
-	 * @access protected
-	 */
-	protected $_debugging;
-
-	/**
-	 * Log/echo debug?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_debugBool;
-
-	/**
-	 * Echo to cli?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_echo;
-
-	/**
-	 * Does the server support XFeature GZip header compression?
-	 * @var boolean
-	 * @access protected
-	 */
-	protected $_compressionSupported = true;
-
-	/**
-	 * Is header compression enabled for the session?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_compressionEnabled = false;
-
-	/**
-	 * Currently selected group.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_currentGroup = '';
-
-	/**
-	 * Port of the current NNTP server.
-	 * @var int
-	 * @access protected
-	 */
-	protected $_currentPort = NNTP_PORT;
-
-	/**
-	 * Address of the current NNTP server.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_currentServer = NNTP_SERVER;
-
-	/**
-	 * Are we allowed to post to usenet?
-	 * @var bool
-	 * @access protected
-	 */
-	protected $_postingAllowed = false;
-
-	/**
-	 * How many times should we try to reconnect to the NNTP server?
-	 * @var int
-	 * @access protected
-	 */
-	protected $_nntpRetries;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param array $options Class instances and echo to CLI bool.
-	 *
-	 * @access public
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'      => true,
-			'Logger' => null,
-			'Settings'  => null,
-		];
-		$options += $defaults;
-
-		$this->_echo = ($options['Echo'] && NN_ECHOCLI);
-
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->_debugBool = (NN_LOGGING || NN_DEBUG);
-		if ($this->_debugBool) {
-			try {
-				$this->_debugging = ($options['Logger'] instanceof Logger ? $options['Logger'] : new Logger(['ColorCLI' => $this->pdo->log]));
-			} catch (LoggerException $error) {
-				$this->_debugBool = false;
-			}
-		}
-
-		$this->_nntpRetries = ($this->site->nntpretries != '') ? (int)$this->site->nntpretries : 0 + 1;
-
-		$this->_initiateYEncSettings();
-	}
-
-	/**
-	 * Destruct.
-	 * Close the NNTP connection if still connected.
-	 *
-	 * @access public
-	 */
-	public function __destruct()
-	{
-		$this->doQuit();
-	}
-
-	/**
-	 * Connect to a usenet server.
-	 *
-	 * @param boolean $compression Should we attempt to enable XFeature Gzip compression on this connection?
-	 * @param boolean $alternate   Use the alternate NNTP connection.
-	 *
-	 * @return mixed  On success = (bool)   Did we successfully connect to the usenet?
-	 *                On failure = (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function doConnect($compression = true, $alternate = false)
-	{
-		if (// Don't reconnect to usenet if:
-			// We are already connected to usenet. AND
-			parent::_isConnected() &&
-			// (Alternate is wanted, AND current server is alt,     OR    Alternate is not wanted AND current is main.)
-			(($alternate && $this->_currentServer === NNTP_SERVER_A) || (!$alternate && $this->_currentServer === NNTP_SERVER))
-		) {
-			return true;
-		} else {
-			$this->doQuit();
-		}
-
-		$ret = $connected = $cError = $aError = false;
-
-		// Set variables to connect based on if we are using the alternate provider or not.
-		if (!$alternate) {
-			$sslEnabled = (NNTP_SSLENABLED ? true : false);
-			$this->_currentServer = NNTP_SERVER;
-			$this->_currentPort = NNTP_PORT;
-			$userName = NNTP_USERNAME;
-			$password = NNTP_PASSWORD;
-			$socketTimeout = (defined('NNTP_SOCKET_TIMEOUT') ? NNTP_SOCKET_TIMEOUT : $this->_socketTimeout);
-		} else {
-			$sslEnabled = (NNTP_SSLENABLED_A ? true : false);
-			$this->_currentServer = NNTP_SERVER_A;
-			$this->_currentPort = NNTP_PORT_A;
-			$userName = NNTP_USERNAME_A;
-			$password = NNTP_PASSWORD_A;
-			$socketTimeout = (defined('NNTP_SOCKET_TIMEOUT_A') ? NNTP_SOCKET_TIMEOUT_A : $this->_socketTimeout);
-		}
-
-		$enc = ($sslEnabled ? ' (ssl)' : ' (non-ssl)');
-		$sslEnabled = ($sslEnabled ? 'tls' : false);
-
-		// Try to connect until we run of out tries.
-		$retries = $this->_nntpRetries;
-		while (true) {
-			$retries--;
-			$authenticated = false;
-
-			// If we are not connected, try to connect.
-			if (!$connected) {
-				$ret = $this->connect($this->_currentServer, $sslEnabled, $this->_currentPort, 5, $socketTimeout);
-			}
-
-			// Check if we got an error while connecting.
-			$cErr = $this->isError($ret);
-
-			// If no error, we are connected.
-			if (!$cErr) {
-				// Say that we are connected so we don't retry.
-				$connected = true;
-				// When there is no error it returns bool if we are allowed to post or not.
-				$this->_postingAllowed = $ret;
-			} else {
-				// Only fetch the message once.
-				if (!$cError) {
-					$cError = $ret->getMessage();
-				}
-			}
-
-			// If error, try to connect again.
-			if ($cErr && $retries > 0) {
-				continue;
-			}
-
-			// If we have no more retries and could not connect, return an error.
-			if ($retries === 0 && !$connected) {
-				$message =
-					"Cannot connect to server " .
-					$this->_currentServer .
-					$enc .
-					': ' .
-					$cError;
-				if ($this->_debugBool) {
-					$this->_debugging->log('NNTP', "doConnect", $message, Logger::LOG_ERROR);
-				}
-				return $this->throwError($this->pdo->log->error($message));
-			}
-
-			// If we are connected, try to authenticate.
-			if ($connected === true && $authenticated === false) {
-
-				// If the username is empty it probably means the server does not require a username.
-				if ($userName === '') {
-					$authenticated = true;
-
-					// Try to authenticate to usenet.
-				} else {
-					$ret2 = $this->authenticate($userName, $password);
-
-					// Check if there was an error authenticating.
-					$aErr = $this->isError($ret2);
-
-					// If there was no error, then we are authenticated.
-					if (!$aErr) {
-						$authenticated = true;
-					} elseif (!$aError) {
-						$aError = $ret2->getMessage();
-					}
-
-					// If error, try to authenticate again.
-					if ($aErr && $retries > 0) {
-						continue;
-					}
-
-					// If we ran out of retries, return an error.
-					if ($retries === 0 && $authenticated === false) {
-						$message =
-							"Cannot authenticate to server " .
-							$this->_currentServer .
-							$enc .
-							' - ' .
-							$userName .
-							' (' . $aError . ')';
-						if ($this->_debugBool) {
-							$this->_debugging->log('NNTP', "doConnect", $message, Logger::LOG_ERROR);
-						}
-						return $this->throwError($this->pdo->log->error($message));
-					}
-				}
-			}
-
-			// If we are connected and authenticated, try enabling compression if we have it enabled.
-			if ($connected === true && $authenticated === true) {
-				// Check if we should use compression on the connection.
-				if ($compression === false || $this->site->compressedheaders == 0) {
-					$this->_compressionSupported = false;
-				}
-				if ($this->_debugBool) {
-					$this->_debugging->log('NNTP', "doConnect", "Connected to " . $this->_currentServer . '.', Logger::LOG_INFO);
-				}
-				return true;
-			}
-			// If we reached this point and have not connected after all retries, break out of the loop.
-			if ($retries === 0) {
-				break;
-			}
-
-			// Sleep .4 seconds between retries.
-			usleep(400000);
-		}
-		// If we somehow got out of the loop, return an error.
-		$message = 'Unable to connect to ' . $this->_currentServer . $enc;
-		if ($this->_debugBool) {
-			$this->_debugging->log('NNTP', "doConnect", $message, Logger::LOG_ERROR);
-		}
-		return $this->throwError($this->pdo->log->error($message));
-	}
-
-	/**
-	 * Disconnect from the current NNTP server.
-	 *
-	 * @param  bool $force Force quit even if not connected?
-	 *
-	 * @return mixed On success : (bool)   Did we successfully disconnect from usenet?
-	 *               On Failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function doQuit($force = false)
-	{
-		$this->_resetProperties();
-
-		// Check if we are connected to usenet.
-		if ($force === true || parent::_isConnected(false)) {
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "doQuit", "Disconnecting from " . $this->_currentServer, Logger::LOG_INFO);
-			}
-			// Disconnect from usenet.
-			return parent::disconnect();
-		}
-		return true;
-	}
-
-	/**
-	 * Reset some properties when disconnecting from usenet.
-	 *
-	 * @void
-	 *
-	 * @access protected
-	 */
-	protected function _resetProperties()
-	{
-		$this->_compressionEnabled = false;
-		$this->_compressionSupported = true;
-		$this->_currentGroup = '';
-		$this->_postingAllowed = false;
-		parent::_resetProperties();
-	}
-
-	/**
-	 * Attempt to enable compression if the admin enabled the site setting.
-	 * @note This can be used to enable compression if the server was connected without compression.
-	 *
-	 * @access public
-	 */
-	public function enableCompression()
-	{
-		if (!$this->site->compressedheaders == 1) {
-			return;
-		}
-		$this->_enableCompression();
-	}
-
-	/**
-	 * @param string $group    Name of the group to select.
-	 * @param bool   $articles (optional) experimental! When true the article numbers is returned in 'articles'.
-	 * @param bool   $force    Force a refresh to get updated data from the usenet server.
-	 *
-	 * @return mixed On success : (array)  Group information.
-	 *               On failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function selectGroup($group, $articles = false, $force = false)
-	{
-		$connected = $this->_checkConnection(false);
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// Check if the current selected group is the same, or if we have not selected a group or if a fresh summary is wanted.
-		if ($force || $this->_currentGroup !== $group || is_null($this->_selectedGroupSummary)) {
-			$this->_currentGroup = $group;
-			return parent::selectGroup($group, $articles);
-		} else {
-			return $this->_selectedGroupSummary;
-		}
-	}
-
-	/**
-	 * Fetch an overview of article(s) in the currently selected group.
-	 *
-	 * @param null $range
-	 * @param bool $names
-	 * @param bool $forceNames
-	 *
-	 * @return mixed On success : (array)  Multidimensional array with article headers.
-	 *               On failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function getOverview($range = null, $names = true, $forceNames = true)
-	{
-		$connected = $this->_checkConnection();
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// Enabled header compression if not enabled.
-		$this->_enableCompression();
-		return parent::getOverview($range, $names, $forceNames);
-	}
-
-	/**
-	 * Pass a XOVER command to the NNTP provider, return array of articles using the overview format as array keys.
-	 *
-	 * @note This is a faster implementation of getOverview.
-	 *
-	 * Example successful return:
-	 *    array(9) {
-	 *        'Number'     => string(9)  "679871775"
-	 *        'Subject'    => string(18) "This is an example"
-	 *        'From'       => string(19) "Example@example.com"
-	 *        'Date'       => string(24) "26 Jun 2014 13:08:22 GMT"
-	 *        'Message-ID' => string(57) "<part1of1.uS*yYxQvtAYt$5t&wmE%UejhjkCKXBJ!@example.local>"
-	 *        'References' => string(0)  ""
-	 *        'Bytes'      => string(3)  "123"
-	 *        'Lines'      => string(1)  "9"
-	 *        'Xref'       => string(66) "e alt.test:679871775"
-	 *    }
-	 *
-	 * @param string $range Range of articles to get the overview for. Examples follow:
-	 *                      Single article number:         "679871775"
-	 *                      Range of article numbers:      "679871775-679999999"
-	 *                      All newer than article number: "679871775-"
-	 *                      All older than article number: "-679871775"
-	 *                      Message-ID:                    "<part1of1.uS*yYxQvtAYt$5t&wmE%UejhjkCKXBJ!@example.local>"
-	 *
-	 * @return array|object Multi-dimensional Array of headers on success, PEAR object on failure.
-	 */
-	public function getXOVER($range)
-	{
-		// Check if we are still connected.
-		$connected = $this->_checkConnection();
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// Enabled header compression if not enabled.
-		$this->_enableCompression();
-
-		// Send XOVER command to NNTP with wanted articles.
-		$response = $this->_sendCommand('XOVER ' . $range);
-		if ($this->isError($response)){
-			return $response;
-		}
-
-		// Verify the NNTP server got the right command, get the headers data.
-		switch ($response) {
-			// 224, RFC2980: 'Overview information follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_OVERVIEW_FOLLOWS:
-				$data = $this->_getTextResponse();
-				if ($this->isError($data)) {
-					return $data;
-				}
-				break;
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-
-		// Fetch the header overview format (for setting the array keys on the return array).
-		if (!is_null($this->_overviewFormatCache) && isset($this->_overviewFormatCache['Xref'])) {
-			$overview = $this->_overviewFormatCache;
-		} else {
-			$overview = $this->getOverviewFormat(false, true);
-			if ($this->isError($overview)) {
-				return $overview;
-			}
-			$this->_overviewFormatCache = $overview;
-		}
-		// Add the "Number" key.
-		$overview = array_merge(['Number' => false], $overview);
-
-		// Iterator used for selecting the header elements to insert into the overview format array.
-		$iterator = 0;
-
-		// Loop over strings of headers.
-		foreach ($data as $key => $header) {
-
-			// Split the individual headers by tab.
-			$header = explode("\t", $header);
-
-			// Make sure it's not empty.
-			if ($header === false) {
-				continue;
-			}
-
-			// Temp array to store the header.
-			$headerArray = $overview;
-
-			// Loop over the overview format and insert the individual header elements.
-			foreach ($overview as $name => $element) {
-				// Strip Xref:
-				if ($element === true) {
-					$header[$iterator] = substr($header[$iterator], 6);
-				}
-				$headerArray[$name] = $header[$iterator++];
-			}
-			// Add the individual header array back to the return array.
-			$data[$key] = $headerArray;
-			$iterator = 0;
-		}
-		// Return the array of headers.
-		return $data;
-	}
-
-	/**
-	 * Fetch valid groups.
-	 *
-	 * Returns a list of valid groups (that the client is permitted to select) and associated information.
-	 *
-	 * @param string $wildMat (optional) http://tools.ietf.org/html/rfc3977#section-4
-	 *
-	 * @return array|object Pear error on failure, array with groups on success.
-	 * @access public
-	 */
-	public function getGroups($wildMat = null)
-	{
-		// Enabled header compression if not enabled.
-		$this->_enableCompression();
-		return parent::getGroups($wildMat);
-	}
-
-	/**
-	 * Download multiple article bodies and string them together.
-	 *
-	 * @param string $groupName   The name of the group the articles are in.
-	 * @param mixed  $identifiers (string) Message-ID.
-	 *                            (int)    Article number.
-	 *                            (array)  Article numbers or Message-ID's (can contain both in the same array)
-	 * @param bool   $alternate   Use the alternate NNTP provider?
-	 *
-	 * @return mixed On success : (string) The article bodies.
-	 *               On failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function getMessages($groupName, $identifiers, $alternate = false)
-	{
-		$connected = $this->_checkConnection();
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// String to hold all the bodies.
-		$body = '';
-
-		$aConnected = false;
-		$nntp = ($alternate === true ? new NNTP(['Echo' => $this->_echo, 'Settings' => $this->pdo]) : null);
-
-		// Check if the msgIds are in an array.
-		if (is_array($identifiers)) {
-
-			$loops = $messageSize = 0;
-
-			// Loop over the message-id's or article numbers.
-			foreach ($identifiers as $wanted) {
-
-				/* This is to attempt to prevent string size overflow.
-				 * We get the size of 1 body in bytes, we increment the loop on every loop,
-				 * then we multiply the # of loops by the first size we got and check if it
-				 * exceeds 1.7 billion bytes (less than 2GB to give us headroom).
-				 * If we exceed, return the data.
-				 * If we don't do this, these errors are fatal.
-				 */
-				if ((++$loops * $messageSize) >= 1700000000) {
-					return $body;
-				}
-
-				// Download the body.
-				$message = $this->_getMessage($groupName, $wanted);
-
-				// Append the body to $body.
-				if (!$this->isError($message)) {
-					$body .= $message;
-
-					if ($messageSize === 0) {
-						$messageSize = strlen($message);
-					}
-
-					// If there is an error try the alternate provider or return the PEAR error.
-				} else {
-					// Check if admin has enabled alternate in site->edit.
-					if ($alternate === true) {
-						if ($aConnected === false) {
-							// Check if the current connected server is the alternate or not.
-							if ($this->_currentServer === NNTP_SERVER) {
-								// It's the main so connect to the alternate.
-								$aConnected = $nntp->doConnect(true, true);
-							} else {
-								// It's the alternate so connect to the main.
-								$aConnected = $nntp->doConnect();
-							}
-						}
-						// If we connected successfully to usenet try to download the article body.
-						if ($aConnected === true) {
-							$newBody = $nntp->_getMessage($groupName, $wanted);
-							// Check if we got an error.
-							if ($nntp->isError($newBody)) {
-								if ($aConnected) {
-									$nntp->doQuit();
-								}
-								// If we got some data, return it.
-								if ($body !== '') {
-									return $body;
-								}
-								if ($this->_debugBool) {
-									$this->_debugging->log('NNTP', "getMessages", $newBody->getMessage(), Logger::LOG_NOTICE);
-								}
-								// Return the error.
-								return $newBody;
-							}
-							// Append the alternate body to the main body.
-							$body .= $newBody;
-						}
-					} else {
-						// If we got some data, return it.
-						if ($body !== '') {
-							return $body;
-						}
-						return $message;
-					}
-				}
-			}
-
-			// If it's a string check if it's a valid message-id.
-		} else if (is_string($identifiers) || is_numeric($identifiers)) {
-			$body = $this->_getMessage($groupName, $identifiers);
-			if ($alternate === true && $this->isError($body)) {
-				$nntp->doConnect(true, true);
-				$body = $nntp->_getMessage($groupName, $identifiers);
-				$aConnected = true;
-			}
-
-			// Else return an error.
-		} else {
-			$message = 'Wrong Identifier type, array, int or string accepted. This type of var was passed: ' . gettype($identifiers);
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "getMessages", $message, Logger::LOG_WARNING);
-			}
-			return $this->throwError($this->pdo->log->error($message));
-		}
-
-		if ($aConnected === true) {
-			$nntp->doQuit();
-		}
-
-		return $body;
-	}
-
-	/**
-	 * Download a full article, the body and the header, return an array with named keys and their
-	 * associated values, optionally decode the body using yEnc.
-	 *
-	 * @param string $groupName  The name of the group the article is in.
-	 * @param mixed  $identifier (string)The message-id of the article to download.
-	 *                           (int) The article number.
-	 * @param bool   $yEnc       Attempt to yEnc decode the body.
-	 *
-	 * @return mixed  On success : (array)  The article.
-	 *                On failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function get_Article($groupName, $identifier, $yEnc = false)
-	{
-		$connected = $this->_checkConnection();
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// Make sure the requested group is already selected, if not select it.
-		if (parent::group() !== $groupName) {
-			// Select the group.
-			$summary = $this->selectGroup($groupName);
-			// If there was an error selecting the group, return PEAR error object.
-			if ($this->isError($summary)) {
-				if ($this->_debugBool) {
-					$this->_debugging->log('NNTP', "get_Article", $summary->getMessage(), Logger::LOG_NOTICE);
-				}
-				return $summary;
-			}
-		}
-
-		// Check if it's an article number or message-id.
-		if (!is_numeric($identifier)) {
-			// If it's a message-id, check if it has the required triangular brackets.
-			$identifier = $this->_formatMessageID($identifier);
-		}
-
-		// Download the article.
-		$article = parent::getArticle($identifier);
-		// If there was an error downloading the article, return a PEAR error object.
-		if ($this->isError($article)) {
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "get_Article", $article->getMessage(), Logger::LOG_NOTICE);
-			}
-			return $article;
-		}
-
-		$ret = $article;
-		// Make sure the article is an array and has more than 1 element.
-		if (count($article) > 0) {
-			$ret = [];
-			$body = '';
-			$emptyLine = false;
-			foreach ($article as $line) {
-				// If we found the empty line it means we are done reading the header and we will start reading the body.
-				if (!$emptyLine) {
-					if ($line === '') {
-						$emptyLine = True;
-						continue;
-					}
-
-					// Use the line type of the article as the array key (From, Subject, etc..).
-					if (preg_match('/([A-Z-]+?): (.*)/i', $line, $matches)) {
-						// If the line type takes more than 1 line, append the rest of the content to the same key.
-						if (array_key_exists($matches[1], $ret)) {
-							$ret[$matches[1]] .= $matches[2];
-						} else {
-							$ret[$matches[1]] = $matches[2];
-						}
-					}
-
-					// Now we have the header, so get the body from the rest of the lines.
-				} else {
-					$body .= $line;
-				}
-			}
-			// Finally we decode the message using yEnc.
-			$ret['Message'] = ($yEnc ? $this->_decodeIgnoreYEnc($body) : $body);
-		}
-		return $ret;
-	}
-
-	/**
-	 * Download a full article header.
-	 *
-	 * @param string $groupName  The name of the group the article is in.
-	 * @param mixed $identifier (string) The message-id of the article to download.
-	 *                          (int)    The article number.
-	 *
-	 * @return mixed On success : (array)  The header.
-	 *               On failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function get_Header($groupName, $identifier)
-	{
-		$connected = $this->_checkConnection();
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// Make sure the requested group is already selected, if not select it.
-		if (parent::group() !== $groupName) {
-			// Select the group.
-			$summary = $this->selectGroup($groupName);
-			// Return PEAR error object on failure.
-			if ($this->isError($summary)) {
-				if ($this->_debugBool) {
-					$this->_debugging->log('NNTP', "get_Header", $summary->getMessage(), Logger::LOG_NOTICE);
-				}
-				return $summary;
-			}
-		}
-
-		// Check if it's an article number or message-id.
-		if (!is_numeric($identifier)) {
-			// Verify we have the required triangular brackets if it is a message-id.
-			$identifier = $this->_formatMessageID($identifier);
-		}
-
-		// Download the header.
-		$header = parent::getHeader($identifier);
-		// If we failed, return PEAR error object.
-		if ($this->isError($header)) {
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "get_Header", $header->getMessage(), Logger::LOG_NOTICE);
-			}
-			return $header;
-		}
-
-		$ret = $header;
-		if (count($header) > 0) {
-			$ret = [];
-			// Use the line types of the header as array keys (From, Subject, etc).
-			foreach ($header as $line) {
-				if (preg_match('/([A-Z-]+?): (.*)/i', $line, $matches)) {
-					// If the line type takes more than 1 line, re-use the same array key.
-					if (array_key_exists($matches[1], $ret)) {
-						$ret[$matches[1]] .= $matches[2];
-					} else {
-						$ret[$matches[1]] = $matches[2];
-					}
-				}
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Post an article to usenet.
-	 *
-	 * @param $groups   mixed   (array)  Groups. ie.: $groups = array('alt.test', 'alt.testing', 'free.pt');
-	 *                          (string) Group.  ie.: $groups = 'alt.test';
-	 * @param $subject  string  The subject.     ie.: $subject = 'Test article';
-	 * @param $body     string  The message.     ie.: $message = 'This is only a test, please disregard.';
-	 * @param $from     string  The poster.      ie.: $from = '<anon@anon.com>';
-	 * @param $extra    string  Extra, separated by \r\n
-	 *                                           ie.: $extra  = 'Organization: <newznab>\r\nNNTP-Posting-Host: <127.0.0.1>';
-	 * @param $yEnc     bool    Encode the message with yEnc?
-	 * @param $compress bool    Compress the message with GZip?
-	 *
-	 * @return          mixed   On success : (bool)   True.
-	 *                          On failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function postArticle($groups, $subject, $body, $from, $yEnc = true, $compress = true, $extra = '')
-	{
-		if (!$this->_postingAllowed) {
-			$message = 'You do not have the right to post articles on server ' . $this->_currentServer;
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "postArticle", $message, Logger::LOG_NOTICE);
-			}
-			return $this->throwError($this->pdo->log->error($message));
-		}
-
-		$connected = $this->_checkConnection();
-		if ($connected !== true) {
-			return $connected;
-		}
-
-		// Throw errors if subject or from are more than 510 chars.
-		if (strlen($subject) > 510) {
-			$message = 'Max length of subject is 510 chars.';
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "postArticle", $message, Logger::LOG_WARNING);
-			}
-			return $this->throwError($this->pdo->log->error($message));
-		}
-
-		if (strlen($from) > 510) {
-			$message = 'Max length of from is 510 chars.';
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "postArticle", $message, Logger::LOG_WARNING);
-			}
-			return $this->throwError($this->pdo->log->error($message));
-		}
-
-		// Check if the group is string or array.
-		if (is_array(($groups))) {
-			$groups = implode(', ', $groups);
-		}
-
-		// Check if we should encode to yEnc.
-		if ($yEnc) {
-			$body = $this->encodeYEnc(($compress ? gzdeflate($body, 4) : $body), $subject);
-			// If not yEnc, then check if the body is 510+ chars, split it at 510 chars and separate with \r\n
-		} else {
-			$body = $this->_splitLines($body, $compress);
-		}
-
-		// From is required by NNTP servers, but parent function mail does not require it, so format it.
-		$from = 'From: ' . $from;
-		// If we had extra stuff to post, format it with from.
-		if ($extra != '') {
-			$from = $from . "\r\n" . $extra;
-		}
-
-		return parent::mail($groups, $subject, $body, $from);
-	}
-
-	/**
-	 * Restart the NNTP connection if an error occurs in the selectGroup
-	 * function, if it does not restart display the error.
-	 *
-	 * @param NNTP   $nntp  Instance of class NNTP.
-	 * @param string $group Name of the group.
-	 * @param bool   $comp Use compression or not?
-	 *
-	 * @return mixed On success : (array)  The group summary.
-	 *               On Failure : (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function dataError($nntp, $group, $comp = true)
-	{
-		// Disconnect.
-		$nntp->doQuit();
-		// Try reconnecting. This uses another round of max retries.
-		if ($nntp->doConnect($comp) !== true) {
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "dataError", 'Unable to reconnect to usenet!', Logger::LOG_NOTICE);
-			}
-			return $this->throwError('Unable to reconnect to usenet!');
-		}
-
-		// Try re-selecting the group.
-		$data = $nntp->selectGroup($group);
-		if ($this->isError($data)) {
-			$message = "Code {$data->code}: {$data->message}\nSkipping group: {$group}";
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "dataError", $message, Logger::LOG_NOTICE);
-			}
-
-			if ($this->_echo) {
-				$this->pdo->log->doEcho($this->pdo->log->error($message), true);
-			}
-			$nntp->doQuit();
-		}
-		return $data;
-	}
-
-	/**
-	 * yEncodes a string and returns it.
-	 *
-	 * @param string $string     String to encode.
-	 * @param string $filename   Name to use as the filename in the yEnc header (this does not have to be an actual file).
-	 * @param int    $lineLength Line length to use (can be up to 254 characters).
-	 * @param bool   $crc32      Pass True to include a CRC checksum in the trailer to allow decoders to verify data integrity.
-	 *
-	 * @return mixed On success: (string) yEnc encoded string.
-	 *               On failure: (bool)   False.
-	 *
-	 * @access public
-	 */
-	public function encodeYEnc($string, $filename, $lineLength = 128, $crc32 = true)
-	{
-		// yEnc 1.3 draft doesn't allow line lengths of more than 254 bytes.
-		if ($lineLength > 254) {
-			$lineLength = 254;
-		}
-
-		if ($lineLength < 1) {
-			$message = $lineLength . ' is not a valid line length.';
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', 'encodeYEnc', $message, Logger::LOG_NOTICE);
-			}
-			return $this->throwError($message);
-		}
-
-		$encoded = '';
-		$stringLength = strlen($string);
-		// Encode each character of the string one at a time.
-		for ($i = 0; $i < $stringLength; $i++) {
-			$value = ((ord($string{$i}) + 42) % 256);
-
-			// Escape NULL, TAB, LF, CR, space, . and = characters.
-			if ($value == 0 || $value == 9 || $value == 10 || $value == 13 || $value == 32 || $value == 46 || $value == 61) {
-				$encoded .= ('=' . chr(($value + 64) % 256));
-			} else {
-				$encoded .= chr($value);
-			}
-		}
-
-		$encoded =
-			'=ybegin line=' .
-			$lineLength .
-			' size=' .
-			$stringLength .
-			' name=' .
-			trim($filename) .
-			"\r\n" .
-			trim(chunk_split($encoded, $lineLength)) .
-			"\r\n=yend size=" .
-			$stringLength;
-
-		// Add a CRC32 checksum if desired.
-		if ($crc32 === true) {
-			$encoded .= ' crc32=' . strtolower(sprintf("%04X", crc32($string)));
-		}
-
-		return $encoded . "\r\n";
-	}
-
-	/**
-	 * yDecodes an encoded string and either writes the result to a file or returns it as a string.
-	 *
-	 * @param string $string yEncoded string to decode.
-	 *
-	 * @return mixed On success: (string) The decoded string.
-	 *               On failure: (object) PEAR_Error.
-	 *
-	 * @access public
-	 */
-	public function decodeYEnc($string)
-	{
-		$crc = '';
-		// Extract the yEnc string itself.
-		if (preg_match("/=ybegin.*size=([^ $]+).*\\r\\n(.*)\\r\\n=yend.*size=([^ $\\r\\n]+)(.*)/ims", $string, $encoded)) {
-			if (preg_match('/crc32=([^ $\\r\\n]+)/ims', $encoded[4], $trailer)) {
-				$crc = trim($trailer[1]);
-			}
-			$headerSize  = $encoded[1];
-			$trailerSize = $encoded[3];
-			$encoded     = $encoded[2];
-
-		} else {
-			return false;
-		}
-
-		// Remove line breaks from the string.
-		$encoded = trim(str_replace("\r\n", '', $encoded));
-
-		// Make sure the header and trailer file sizes match up.
-		if ($headerSize != $trailerSize) {
-			$message = 'Header and trailer file sizes do not match. This is a violation of the yEnc specification.';
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', 'decodeYEnc', $message, Logger::LOG_NOTICE);
-			}
-			return $this->throwError($message);
-		}
-
-		// Decode.
-		$decoded = '';
-		$encodedLength = strlen($encoded);
-		for ($chr = 0; $chr < $encodedLength; $chr++) {
-			$decoded .= ($encoded[$chr] !== '=' ? chr(ord($encoded[$chr]) - 42) : chr((ord($encoded[++$chr]) - 64) - 42));
-		}
-
-		// Make sure the decoded file size is the same as the size specified in the header.
-		if (strlen($decoded) != $headerSize) {
-			$message = 'Header file size and actual file size do not match. The file is probably corrupt.';
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', 'decodeYEnc', $message, Logger::LOG_NOTICE);
-			}
-			return $this->throwError($message);
-		}
-
-		// Check the CRC value
-		if ($crc !== '' && (strtolower($crc) !== strtolower(sprintf("%04X", crc32($decoded))))) {
-			$message = 'CRC32 checksums do not match. The file is probably corrupt.';
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', 'decodeYEnc', $message, Logger::LOG_NOTICE);
-			}
-			return $this->throwError($message);
-		}
-
-		return $decoded;
-	}
-
-	/**
-	 * Encode a yenc encoded string.
-	 */
-	function encodeYenc2($message, $filename, $linelen = 128, $crc32 = true)
-	{
-		/*
-		* This code was found http://everything2.com/title/yEnc+PHP+Class
-		*/
-
-		// yEnc 1.3 draft doesn't allow line lengths of more than 254 bytes.
-		if ($linelen > 254)
-			$linelen = 254;
-
-		if ($linelen < 1)
-			return false;
-
-		$encoded = "";
-
-		// Encode each character of the message one at a time.
-		for( $i = 0; $i < strlen($message); $i++)
-		{
-			$value = (ord($message{$i}) + 42) % 256;
-
-			// Escape NULL, TAB, LF, CR, space, . and = characters.
-			if ($value == 0 || $value == 9 || $value == 10 ||
-				$value == 13 || $value == 32 || $value == 46 ||
-				$value == 61)
-				$encoded .= "=".chr(($value + 64) % 256);
-			else
-				$encoded .= chr($value);
-		}
-
-		// Wrap the lines to $linelen characters
-		$encoded = trim(chunk_split($encoded, $linelen));
-
-		// Tack a yEnc header onto the encoded message.
-		$encoded = "=ybegin line=$linelen size=".strlen($message)
-			." name=".trim($filename)."\r\n".$encoded;
-		$encoded .= "\r\n=yend size=".strlen($message);
-
-		// Add a CRC32 checksum if desired.
-		if ($crc32 === true)
-			$encoded .= " crc32=".strtolower(sprintf("%04X", crc32($message)));
-
-		return $encoded."\r\n";
-	}
-
-	/**
-	 * Decode a yenc encoded string.
-	 */
-	function decodeYenc2($yencodedvar)
-	{
-		$input = array();
-		preg_match("/^(=ybegin.*=yend[^$]*)$/ims", $yencodedvar, $input);
-		if (isset($input[1])) {
-			$ret = "";
-			$input = trim(preg_replace("/\r\n/im", "", preg_replace("/(^=yend.*)/im", "", preg_replace("/(^=ypart.*\\r\\n)/im", "", preg_replace("/(^=ybegin.*\\r\\n)/im", "", $input[1], 1), 1), 1)));
-
-			for ($chr = 0; $chr < strlen($input); $chr++)
-				$ret .= ($input[$chr] != "=" ? chr(ord($input[$chr]) - 42) : chr((ord($input[++$chr]) - 64) - 42));
-
-			return $ret;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Decode a string of text encoded with yEnc. Ignores all errors.
-	 *
-	 * @param  string $data The encoded text to decode.
-	 *
-	 * @return string The decoded yEnc string, or the input string, if it's not yEnc.
-	 *
-	 * @access protected
-	 */
-	protected function _decodeIgnoreYEnc(&$data)
-	{
-		if (preg_match('/^(=yBegin.*=yEnd[^$]*)$/ims', $data, $input)) {
-			// If there user has no yyDecode path set, use PHP to decode yEnc.
-			if ($this->_yyDecoderPath === false) {
-				$data = '';
-				$input =
-					trim(
-						preg_replace(
-							'/\r\n/im', '',
-							preg_replace(
-								'/(^=yEnd.*)/im', '',
-								preg_replace(
-									'/(^=yPart.*\\r\\n)/im', '',
-									preg_replace(
-										'/(^=yBegin.*\\r\\n)/im', '',
-										$input[1],
-										1),
-									1),
-								1)
-						)
-					);
-
-				$length = strlen($input);
-				for ($chr = 0; $chr < $length; $chr++) {
-					$data .= ($input[$chr] !== '=' ? chr(ord($input[$chr]) - 42) : chr((ord($input[++$chr]) - 64) - 42));
-				}
-
-			} else if ($this->_yEncExtension) {
-				$data = simple_yenc_decode($input[1]);
-			} else {
-				$inFile = $this->_yEncTempInput . mt_rand(0, 999999);
-				$ouFile = $this->_yEncTempOutput . mt_rand(0, 999999);
-				file_put_contents($inFile, $input[1]);
-				file_put_contents($ouFile, '');
-				runCmd(
-					"'" .
-					$this->_yyDecoderPath .
-					"' '" .
-					$inFile .
-					"' -o '" .
-					$ouFile .
-					"' -f -b" .
-					$this->_yEncSilence
-				);
-				$data = file_get_contents($ouFile);
-				if ($data === false) {
-					$data = $this->throwError('Error getting data from yydecode.');
-				}
-				unlink($inFile);
-				unlink($ouFile);
-			}
-		}
-		return $data;
-	}
-
-	/**
-	 * Path to yyDecoder binary.
-	 * @var bool|string
-	 * @access protected
-	 */
-	protected $_yyDecoderPath;
-
-	/**
-	 * If on unix, hide yydecode CLI output.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_yEncSilence;
-
-	/**
-	 * Path to temp yEnc input storage file.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_yEncTempInput;
-
-	/**
-	 * Path to temp yEnc output storage file.
-	 * @var string
-	 * @access protected
-	 */
-	protected $_yEncTempOutput;
-
-	/**
-	 * Use the simple_php_yenc_decode extension for decoding yEnc articles?
-	 * @var bool
-	 */
-	protected $_yEncExtension = false;
-
-	/**
-	 * Check the Admin settings for yEnc and process them accordingly.
-	 *
-	 * @void
-	 *
-	 * @access protected
-	 */
-	protected function _initiateYEncSettings()
-	{
-		// Check if the user wants to use yyDecode or the simple_php_yenc_decode extension.
-		$this->_yyDecoderPath  = ($this->site->yydecoderpath != '') ? (string)$this->site->yydecoderpath : false;
-		if (strpos((string)$this->_yyDecoderPath, 'simple_php_yenc_decode') !== false) {
-			if (extension_loaded('simple_php_yenc_decode')) {
-				$this->_yEncExtension = true;
-			} else {
-				$this->_yyDecoderPath = false;
-			}
-		} else if ($this->_yyDecoderPath !== false) {
-
-			$this->_yEncSilence    = (isWindows() ? '' : ' > /dev/null 2>&1');
-			$this->_yEncTempInput  = NN_TMP . 'yEnc' . DS;
-			$this->_yEncTempOutput = $this->_yEncTempInput . 'output';
-			$this->_yEncTempInput .= 'input';
-
-			// Test if the user can read/write to the yEnc path.
-			if (!is_file($this->_yEncTempInput)) {
-				@file_put_contents($this->_yEncTempInput, 'x');
-			}
-			if (!is_file($this->_yEncTempInput) || !is_readable($this->_yEncTempInput) || !is_writable($this->_yEncTempInput)) {
-				$this->_yyDecoderPath = false;
-			}
-			if (is_file($this->_yEncTempInput)) {
-				@unlink($this->_yEncTempInput);
-			}
-		}
-	}
-
-	/**
-	 * Split a string into lines of 510 chars ending with \r\n.
-	 * Usenet limits lines to 512 chars, with \r\n that leaves us 510.
-	 *
-	 * @param string $string   The string to split.
-	 * @param bool   $compress Compress the string with gzip?
-	 *
-	 * @return string The split string.
-	 *
-	 * @access protected
-	 */
-	protected function _splitLines($string, $compress = false)
-	{
-		// Check if the length is longer than 510 chars.
-		if (strlen($string) > 510) {
-			// If it is, split it @ 510 and terminate with \r\n.
-			$string = chunk_split($string, 510, "\r\n");
-		}
-
-		// Compress the string if requested.
-		return ($compress ? gzdeflate($string, 4) : $string);
-	}
-
-	/**
-	 * Try to see if the NNTP server implements XFeature GZip Compression,
-	 * change the compression bool object if so.
-	 *
-	 * @return mixed On success : (bool)   True:  The server understood and compression is enabled.
-	 *                            (bool)   False: The server did not understand, compression is not enabled.
-	 *               On failure : (object) PEAR_Error.
-	 *
-	 * @access protected
-	 */
-	protected function _enableCompression()
-	{
-		if ($this->_compressionEnabled === true) {
-			return true;
-		} else if ($this->_compressionSupported === false) {
-			return false;
-		}
-
-
-		// Send this command to the usenet server.
-		$response = $this->_sendCommand('XFEATURE COMPRESS GZIP');
-
-		// Check if it's good.
-		if ($this->isError($response)) {
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "_enableCompression", $response->getMessage(), Logger::LOG_NOTICE);
-			}
-			$this->_compressionSupported = false;
-			return $response;
-		} else if ($response !== 290) {
-			$msg = "XFeature GZip Compression not supported. Consider disabling compression in site settings.";
-			if ($this->_debugBool) {
-				$this->_debugging->log('NNTP', "_enableCompression", $msg, Logger::LOG_NOTICE);
-			}
-
-			if ($this->_echo) {
-				$this->pdo->log->doEcho($this->pdo->log->error($msg), true);
-			}
-			$this->_compressionSupported = false;
-			return false;
-		}
-
-		$this->_compressionEnabled = true;
-		$this->_compressionSupported = true;
-		return true;
-	}
-
-	/**
-	 * Override PEAR NNTP's function to use our _getXFeatureTextResponse instead
-	 * of their _getTextResponse function since it is incompatible at decoding
-	 * headers when XFeature GZip compression is enabled server side.
-	 *
-	 * @return self    Our overridden function when compression is enabled.
-	 *         parent  Parent function when no compression.
-	 *
-	 * @access protected
-	 */
-	protected function _getTextResponse()
-	{
-		if ($this->_compressionEnabled === true &&
-			isset($this->_currentStatusResponse[1]) &&
-			stripos($this->_currentStatusResponse[1], 'COMPRESS=GZIP') !== false) {
-
-			return $this->_getXFeatureTextResponse();
-		} else {
-			return parent::_getTextResponse();
-		}
-	}
-
-	/**
-	 * Loop over the compressed data when XFeature GZip Compress is turned on,
-	 * string the data until we find a indicator
-	 * (period, carriage feed, line return ;; .\r\n), decompress the data,
-	 * split the data (bunch of headers in a string) into an array, finally
-	 * return the array.
-	 *
-	 * @return string/print Have we failed to decompress the data, was there a
-	 *                 problem downloading the data, etc..
-
-	 * @return mixed  On success : (array)  The headers.
-	 *                On failure : (object) PEAR_Error.
-	 *
-	 * @access protected
-	 */
-	protected function &_getXFeatureTextResponse()
-	{
-		$possibleTerm = false;
-		$data = null;
-
-		while (!feof($this->_socket)) {
-
-			// Did we find a possible ending ? (.\r\n)
-			if ($possibleTerm !== false) {
-
-				// Loop, sleeping shortly, to allow the server time to upload data, if it has any.
-				for ($i = 0; $i < 3; $i++) {
-					// If the socket is really empty, fGets will get stuck here, so set the socket to non blocking in case.
-					stream_set_blocking($this->_socket, 0);
-
-					// Now try to download from the socket.
-					$buffer = fgets($this->_socket);
-
-					// And set back the socket to blocking.
-					stream_set_blocking($this->_socket, 1);
-
-					// Don't sleep on last iteration.
-					if (!empty($buffer)) {
-						break;
-					} else if ($i < 2) {
-						usleep(10000);
-					}
-				}
-
-				// If the buffer was really empty, then we know $possibleTerm was the real ending.
-				if (empty($buffer)) {
-					// Remove .\r\n from end, decompress data.
-					$deComp = @gzuncompress(mb_substr($data, 0, -3, '8bit'));
-
-					if (!empty($deComp)) {
-
-						$bytesReceived = strlen($data);
-						if ($this->_echo && $bytesReceived > 10240) {
-							$this->pdo->log->doEcho(
-								$this->pdo->log->primaryOver(
-									'Received ' . round($bytesReceived / 1024) .
-									'KB from group (' . $this->group() . ').'
-								), true
-							);
-						}
-
-						// Split the string of headers into an array of individual headers, then return it.
-						$deComp = explode("\r\n", trim($deComp));
-						return $deComp;
-					} else {
-						$message = 'Decompression of OVER headers failed.';
-						if ($this->_debugBool) {
-							$this->_debugging->log('NNTP', "_getXFeatureTextResponse", $message, Logger::LOG_NOTICE);
-						}
-						$message = $this->throwError($this->pdo->log->error($message), 1000);
-						return $message;
-					}
-
-				} else {
-					// The buffer was not empty, so we know this was not the real ending, so reset $possibleTerm.
-					$possibleTerm = false;
-				}
-			} else {
-				// Get data from the stream.
-				$buffer = fgets($this->_socket);
-			}
-
-			// If we got no data at all try one more time to pull data.
-			if (empty($buffer)) {
-				usleep(10000);
-				$buffer = fgets($this->_socket);
-
-				// If wet got nothing again, return error.
-				if (empty($buffer)) {
-					$message = 'Error fetching data from usenet server while downloading OVER headers.';
-					if ($this->_debugBool) {
-						$this->_debugging->log('NNTP', "_getXFeatureTextResponse", $message, Logger::LOG_NOTICE);
-					}
-					$message = $this->throwError($this->pdo->log->error($message), 1000);
-					return $message;
-				}
-			}
-
-			// Append current buffer to rest of buffer.
-			$data .= $buffer;
-
-			// Check if we have the ending (.\r\n)
-			if (substr($buffer, -3) === ".\r\n") {
-				// We have a possible ending, next loop check if it is.
-				$possibleTerm = true;
-			}
-		}
-
-		$message = 'Unspecified error while downloading OVER headers.';
-		if ($this->_debugBool) {
-			$this->_debugging->log('NNTP', "_getXFeatureTextResponse", $message, Logger::LOG_NOTICE);
-		}
-		$message = $this->throwError($this->pdo->log->error($message), 1000);;
-		return $message;
-	}
-
-	/**
-	 * Check if the Message-ID has the required opening and closing brackets.
-	 *
-	 * @param  string $messageID The Message-ID with or without brackets.
-	 *
-	 * @return string            Message-ID with brackets.
-	 *
-	 * @access protected
-	 */
-	protected function _formatMessageID($messageID)
-	{
-		$messageID = (string)$messageID;
-		if (strlen($messageID) < 1) {
-			return false;
-		}
-
-		// Check if the first char is <, if not add it.
-		if ($messageID[0] !== '<') {
-			$messageID = ('<' . $messageID);
-		}
-
-		// Check if the last char is >, if not add it.
-		if (substr($messageID, -1) !== '>') {
-			$messageID .= '>';
-		}
-		return $messageID;
-	}
-
-	/**
-	 * Download an article body (an article without the header).
-	 *
-	 * @param string $groupName The name of the group the article is in.
-	 * @param mixed $identifier (string) The message-id of the article to download.
-	 *                          (int)    The article number.
-	 *
-	 * @return mixed On success : (string) The article's body.
-	 *               On failure : (object) PEAR_Error.
-	 *
-	 * @access protected
-	 */
-	protected function _getMessage($groupName, $identifier)
-	{
-		// Make sure the requested group is already selected, if not select it.
-		if (parent::group() !== $groupName) {
-			// Select the group.
-			$summary = $this->selectGroup($groupName);
-			// If there was an error selecting the group, return PEAR error object.
-			if ($this->isError($summary)) {
-				if ($this->_debugBool) {
-					$this->_debugging->log('NNTP', "getMessage", $summary->getMessage(), Logger::LOG_WARNING);
-				}
-				return $summary;
-			}
-		}
-
-		// Check if this is an article number or message-id.
-		if (!is_numeric($identifier)) {
-			// It's a message-id so check if it has the triangular brackets.
-			$identifier = $this->_formatMessageID($identifier);
-		}
-
-		// Tell the news server we want the body of an article.
-		$response = $this->_sendCommand('BODY ' . $identifier);
-		if ($this->isError($response)) {
-			return $response;
-		}
-
-		$body = '';
-		switch ($response) {
-			// 222, RFC977: 'n <a> article retrieved - body follows'
-			case NET_NNTP_PROTOCOL_RESPONSECODE_BODY_FOLLOWS:
-
-				// Continue until connection is lost
-				while (!feof($this->_socket)) {
-
-					// Retrieve and append up to 1024 characters from the server.
-					$line = fgets($this->_socket, 1024);
-
-					// If the socket is empty/ an error occurs, false is returned.
-					// Since the socket is blocking, the socket should not be empty, so it's definitely an error.
-					if ($line === false) {
-						return $this->throwError('Failed to read line from socket.', null);
-					}
-
-					// Check if the line terminates the text response.
-					if ($line === ".\r\n") {
-						if ($this->_debugBool) {
-							$this->_debugging->log('NNTP',
-								'getMessage', 'Fetched body for article ' . $identifier, Logger::LOG_INFO
-							);
-						}
-						// Attempt to yEnc decode and return the body.
-						return $this->_decodeIgnoreYEnc($body);
-					}
-
-					// Check for line that starts with double period, remove one.
-					if ($line[0] === '.' && $line[1] === '.') {
-						$line = substr($line, 1);
-					}
-
-					// Add the line to the rest of the lines.
-					$body .= $line;
-
-				}
-				return $this->throwError('End of stream! Connection lost?', null);
-
-			default:
-				return $this->_handleErrorResponse($response);
-		}
-	}
-
-	/**
-	 * Check if we are still connected. Reconnect if not.
-	 *
-	 * @param  bool $reSelectGroup Select back the group after connecting?
-	 *
-	 * @return mixed On success: (bool)   True;
-	 *               On failure: (object) PEAR_Error
-	 *
-	 * @access protected
-	 */
-	protected function _checkConnection($reSelectGroup = true)
-	{
-		$currentGroup = $this->_currentGroup;
-		// Check if we are connected.
-		if (parent::_isConnected()) {
-			$retVal = true;
-		} else {
-			switch($this->_currentServer) {
-				case NNTP_SERVER:
-					if (is_resource($this->_socket)) {
-						$this->doQuit(true);
-					}
-					$retVal = $this->doConnect();
-					break;
-				case NNTP_SERVER_A:
-					if (is_resource($this->_socket)) {
-						$this->doQuit(true);
-					}
-					$retVal = $this->doConnect(true, true);
-					break;
-				default:
-					$retVal = $this->throwError('Wrong server constant used in NNTP checkConnection()!');
-			}
-			if ($retVal === true && $reSelectGroup){
-				$group = $this->selectGroup($currentGroup);
-				if ($this->isError($group)) {
-					$retVal = $group;
-				}
-			}
-		}
-		return $retVal;
-	}
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/nzb.php b/lib/copy_this/www/lib/nzb.php
deleted file mode 100644
index 6621a8101..000000000
--- a/lib/copy_this/www/lib/nzb.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/Enzebe.php");
-
-/**
- * This class manages creation, storage and retrieval of NZB files.
- */
-class NZB
-{
-	/**
-	 * Default constructor.
-	 *
-	 * @param \DB $pdo
-	 *
-	 * @access public
-	 */
-	public function __construct(&$pdo = null)
-	{
-		$this->pdo = ($pdo instanceof \DB ? $pdo : new \DB());
-		$s = new Sites();
-		$this->site = $s->get();
-
-		$this->tablePerGroup = ($this->site->tablepergroup == 0 ? false : true);
-		$nzbSplitLevel = $this->site->nzbsplitlevel;
-		$this->nzbSplitLevel = (empty($nzbSplitLevel) ? 1 : $nzbSplitLevel);
-		$this->siteNzbPath = (string)$this->site->nzbpath;
-		if (substr($this->siteNzbPath, -1) !== DS) {
-			$this->siteNzbPath .= DS;
-		}
-	}
-
-	/**
-	 * Writes out the nzb when processing releases. Performed outside of smarty due to memory issues
-	 * of holding all parts in an array.
-	 */
-	function writeNZBforReleaseId($relid, $name, $catId, $path, $groupID)
-	{
-		$db = new DB();
-		$cat = new Category();
-		$this->groupID = $groupID;
-		// Set table names
-		if ($this->tablePerGroup === true) {
-			if ($this->groupID == '') {
-				exit("$this->groupID is missing\n");
-			}
-			$bName = 'binaries_' . $this->groupID;
-			$pName = 'parts_' . $this->groupID;
-		} else {
-			$bName = 'binaries';
-			$pName = 'parts';
-		}
-		$catrow = $cat->getById($catId);
-		$site = new Sites();
-
-		$fp = gzopen($path, "w");
-		if ($fp) {
-			gzwrite($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-			gzwrite($fp, "<!DOCTYPE nzb PUBLIC \"-//newzBin//DTD NZB 1.1//EN\" \"http://www.newzbin.com/DTD/nzb/nzb-1.1.dtd\">\n");
-			gzwrite($fp, "<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\n\n");
-			gzwrite($fp, "<head>\n");
-			if ($catrow)
-				gzwrite($fp, " <meta type=\"category\">" . htmlspecialchars($catrow["title"], ENT_QUOTES, 'utf-8') . "</meta>\n");
-			if ($name != "")
-				gzwrite($fp, " <meta type=\"name\">" . htmlspecialchars($name, ENT_QUOTES, 'utf-8') . "</meta>\n");
-			gzwrite($fp, "</head>\n\n");
-
-			$result = $db->queryDirect(sprintf("SELECT %s.*, UNIX_TIMESTAMP(date) AS unixdate, groups.name as groupname FROM %s inner join groups on %s.groupid = groups.id WHERE %s.releaseid = %d ORDER BY %s.name",
-					$bName,
-					$bName,
-					$bName,
-					$bName,
-					$relid,
-					$bName));
-			while ($binrow = $db->getAssocArray($result)) {
-				$groups = array();
-				$groupsRaw = explode(' ', $binrow['xref']);
-				foreach ($groupsRaw as $grp)
-					if (preg_match('/^([a-z0-9\.\-_]+):(\d+)?$/i', $grp, $match) && strtolower($grp) !== 'xref')
-						$groups[] = $match[1];
-
-				if (count($groups) == 0)
-					$groups[] = $binrow["groupname"];
-
-				gzwrite($fp, "<file poster=\"" . htmlspecialchars($binrow["fromname"], ENT_QUOTES, 'utf-8') . "\" date=\"" . $binrow["unixdate"] . "\" subject=\"" . htmlspecialchars($binrow["name"], ENT_QUOTES, 'utf-8') . " (1/" . $binrow["totalparts"] . ")\">\n");
-				gzwrite($fp, " <groups>\n");
-				foreach ($groups as $group)
-					gzwrite($fp, "  <group>" . $group . "</group>\n");
-				gzwrite($fp, " </groups>\n");
-				gzwrite($fp, " <segments>\n");
-
-				$resparts = $db->queryDirect(sprintf("SELECT DISTINCT(messageid), size, partnumber FROM %s WHERE binaryid = %d ORDER BY partnumber",
-						$pName,
-						$binrow["id"]));
-				while ($partsrow = $db->getAssocArray($resparts)) {
-					gzwrite($fp, "  <segment bytes=\"" . $partsrow["size"] . "\" number=\"" . $partsrow["partnumber"] . "\">" . htmlspecialchars($partsrow["messageid"], ENT_QUOTES, 'utf-8') . "</segment>\n");
-				}
-				gzwrite($fp, " </segments>\n</file>\n");
-			}
-			gzwrite($fp, "<!-- generated by newznab " . $site->version() . " -->\n</nzb>");
-			gzclose($fp);
-
-			if (is_file($path)) {
-				$db->queryExec(
-					sprintf('
-						UPDATE releases SET nzbstatus = %d WHERE id = %d',
-						Enzebe::NZB_ADDED,
-						$relid
-					)
-				);
-
-				// Chmod to fix issues some users have with file permissions.
-				chmod($path, 0777);
-
-				return true;
-			} else {
-				echo "ERROR: $path does not exist.\n";
-			}
-		}
-	}
-
-	/**
-	 * Builds a full path to the nzb file on disk. nzbs are stored in a subdir of their first char.
-	 *
-	 * @param        $releaseGuid
-	 * @param string $sitenzbpath
-	 * @param bool   $createIfDoesntExist
-	 *
-	 * @return string
-	 */
-	function getNZBPath($releaseGuid, $sitenzbpath = "", $createIfDoesntExist = false)
-	{
-		if ($sitenzbpath == "") {
-			$s = new Sites;
-			$site = $s->get();
-			$sitenzbpath = $site->nzbpath;
-		}
-
-		$nzbpath = $sitenzbpath . substr($releaseGuid, 0, 1) . "/";
-
-		if ($createIfDoesntExist && !file_exists($nzbpath))
-			mkdir($nzbpath);
-
-		return $nzbpath . $releaseGuid . ".nzb.gz";
-	}
-
-	/**
-	 * Returns a simple file listing from the parts inside the NZB.
-	 */
-	function nzbFileList($nzb)
-	{
-		$result = array();
-
-		$xml = @simplexml_load_string(str_replace("\x0F", '', $nzb));
-		$num_pars = 0;
-		if (!$xml || strtolower($xml->getName()) != 'nzb')
-			return false;
-
-		$i = 0;
-		foreach ($xml->file as $file) {
-			//subject
-			$title = $file->attributes()->subject;
-			if (preg_match('/\.par2/i', $title))
-				$num_pars++;
-
-			$result[$i]['title'] = "$title";
-
-			if (preg_match('/\.(7z|ai7|srr|srt|sub|aiff|asc|avi|audio|bin|bz2|c|cfc|cfm|chm|class|conf|cpp|cs|css|csv|deb|divx|doc|dot|eml|enc|file|gif|gz|hlp|htm|html|image|iso|jar|java|jpeg|jpg|js|lua|m|mm|mov|mp3|mpg|odc|odf|odg|odi|odp|ods|odt|ogg|pdf|pgp|php|pl|png|ppt|ps|py|ram|rar|rb|rm|rpm|rtf|sig|sql|swf|sxc|sxd|sxi|sxw|tar|tex|tgz|txt|vcf|video|vsd|wav|wma|wmv|xls|xml|xpi|xvid|zip7|rar|par2|mp3|exe|zip|ace|nzb|r\d{2,3}|jpg|txt|nfo|sfv|cue|m3u)[" ]/i', $file->attributes()->subject, $ext)) {
-				if (preg_match('/\.(r\d{2,3})/i', $ext[0], $extrar))
-					$ext[1] = "rar";
-
-				$result[$i]['ext'] = strtolower($ext[1]);
-			} else {
-				$result[$i]['ext'] = "";
-			}
-
-			//filesize
-			$filesize = $numsegs = 0;
-			foreach ($file->segments->segment as $segment) {
-				$filesize += $segment->attributes()->bytes;
-				$numsegs++;
-			}
-			$result[$i]['size'] = $filesize;
-
-			//file completion
-			preg_match('/\((\d+)\/(?P<total>\d+)\)$/', $title, $parts);
-			$result[$i]['partstotal'] = (isset($parts['total']) ? $parts['total'] : 0);
-			$result[$i]['partsactual'] = $numsegs;
-
-			$i++;
-		}
-
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/nzbget.php b/lib/copy_this/www/lib/nzbget.php
deleted file mode 100644
index 31f8adfed..000000000
--- a/lib/copy_this/www/lib/nzbget.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/sabnzbd.php");
-
-/**
- * Class NZBGet
- */
-class NZBGet
-{
-    public $username = '';
-    public $password = '';
-    public $url = '';
-    public $uid = 0;
-    public $rsstoken = '';
-    public $serverurl = '';
-
-	/**
-	 * @param $page
-	 */
-	public function __construct(&$page)
-    {
-        $this->serverurl = $page->serverurl;
-        $this->uid       = $page->userdata['id'];
-        $this->rsstoken  = $page->userdata['rsstoken'];
-
-        switch($page->site->sabintegrationtype)
-        {
-            case SABnzbd::INTEGRATION_TYPE_USER:
-                if (!empty($_COOKIE['nzbget_'.$this->uid.'__host']))
-                {
-                    $this->url = $_COOKIE['nzbget_'.$this->uid.'__host'];
-                    $this->username = $_COOKIE['nzbget_'.$this->uid.'__username'];
-                    $this->password = $_COOKIE['nzbget_'.$this->uid.'__password'];
-                }
-                elseif (!empty($page->userdata['nzbgeturl']))
-                {
-                    $this->url = $page->userdata['nzbgeturl'];
-                    $this->username = $page->userdata['nzbgetusername'];
-                    $this->password = $page->userdata['nzbgetpassword'];
-                }
-                $this->integrated = SABnzbd::INTEGRATION_TYPE_USER;
-                break;
-            case SABnzbd::INTEGRATION_TYPE_SITEWIDE:
-                if (!empty($page->site->nzbgeturl))
-                {
-                    $this->url = $page->site->nzbgeturl;
-                    $this->username = $page->site->nzbgetusername;
-                    $this->password = $page->site->nzbgetpassword;
-                }
-                $this->integrated = SABnzbd::INTEGRATION_TYPE_SITEWIDE;
-                break;
-        }
-    }
-
-    public function fullurl()
-    {
-        $url = $this->url;
-        if (preg_match('/(?P<protocol>https?):\/\/(?P<url>.+?)(:(?P<port>\d+\/)|\/)$/i',
-            $url,
-            $matches)) {
-            return
-                $matches['protocol'] .
-                '://' .
-                $this->username .
-                ':' .
-                $this->password .
-                '@' .
-                $matches['url'] .
-                (isset($matches['port']) ? ':' . $matches['port'] : (substr($matches['url'], -1) === '/' ? '' : '/')) .
-                'xmlrpc/';
-        } else {
-            return false;
-        }
-    }
-
-    public function sendToNZBGet($guid)
-    {
-        $releases = new Releases();
-        $reldata = $releases->getByGuid($guid);
-        $url     = "{$this->serverurl}getnzb/{$guid}&amp;i={$this->uid}&amp;r={$this->rsstoken}";
-        $header  = <<<NZBGet_URL
-<?xml version="1.0"?>
-<methodCall>
-	<methodName>appendurl</methodName>
-	<params>
-		<param>
-			<value><string>{$reldata['searchname']}.nzb</string></value>
-		</param>
-		<param>
-			<value><string>{$reldata['category_name']}</string></value>
-		</param>
-		<param>
-			<value><i4>0</i4></value>
-		</param>
-		<param>
-			<value><boolean>>False</boolean></value>
-		</param>
-		<param>
-			<value>
-				<string>$url</string>
-			</value>
-		</param>
-	</params>
-</methodCall>
-NZBGet_URL;
-
-        Utility::getUrl(['url' => $this->fullurl()."appendurl",'method' => "POST", 'postdata' => $header, 'verifycert' => false]);
-    }
-
-    public function pauseAll()
-    {
-        $header = <<<NZBGet_PAUSE_ALL
-<?xml version="1.0"?>
-<methodCall>
-	<methodName>pausedownload2</methodName>
-	<params>
-		<param>
-			<value><boolean>1</boolean></value>
-		</param>
-	</params>
-</methodCall>
-NZBGet_PAUSE_ALL;
-
-        Utility::getUrl(['url' => $this->fullurl().'pausedownload2', 'method' => "POST", 'postdata' =>$header, 'verifycert' => false]);
-    }
-
-    public function resumeAll()
-    {
-        $header = <<<NZBGet_RESUME_ALL
-<?xml version="1.0"?>
-<methodCall>
-	<methodName>resumedownload2</methodName>
-	<params>
-		<param>
-			<value><boolean>1</boolean></value>
-		</param>
-	</params>
-</methodCall>'
-NZBGet_RESUME_ALL;
-
-        Utility::getUrl(['url' => $this->fullurl().'resumedownload2', 'method' => "POST", 'postdata' => $header, 'verifycert' => false]);
-    }
-
-    public function delFromQueue($id)
-    {
-        $header = <<<NZBGet_DELETE_FROM_QUEUE
-<?xml version="1.0"?>
-<methodCall>
-	<methodName>editqueue</methodName>
-	<params>
-		<param>
-			<value><string>GroupDelete</string></value>
-		</param>
-		<param>
-			<value><i4>0</i4></value>
-		</param>
-		<param>
-			<value><string>""</string></value>
-		</param>
-		<param>
-			<value>
-				<array>
-					<value><i4>$id</i4></value>
-				</array>
-			</value>
-		</param>
-	</params>
-</methodCall>
-NZBGet_DELETE_FROM_QUEUE;
-
-        Utility::getUrl(['url' => $this->fullurl().'editqueue', 'method' => "POST", 'postdata' => $header, 'verifycert' => false]);
-    }
-
-    public function getQueue()
-    {
-        $data = Utility::getUrl(['url' => $this->fullurl().'listgroups', 'verifycert' => false]);
-        $retVal = false;
-        if ($data) {
-            $xml = simplexml_load_string($data);
-            if ($xml) {
-                $retVal = array();
-                $i = 0;
-                foreach ($xml->params->param->value->array->data->value as $value) {
-                    foreach ($value->struct->member as $member) {
-                        $value = (array)$member->value;
-                        $value = array_shift($value);
-                        if (!is_object($value)) {
-                            $retVal[$i][(string)$member->name] = $value;
-                        }
-                    }
-                    $i++;
-                }
-            }
-        }
-
-        return $retVal;
-    }
-
-    public function status()
-    {
-        $data = Utility::getUrl(['url' => $this->fullurl()."status", 'verifycert' => false]);
-        $retVal = false;
-        if ($data) {
-            $xml = simplexml_load_string($data);
-            if ($xml) {
-                foreach ($xml->params->param->value->struct->member as $member) {
-                    $value = (array)$member->value;
-                    $value = array_shift($value);
-                    if (!is_object($value)) {
-                        $retVal[(string)$member->name] = $value;
-                    }
-                }
-            }
-        }
-
-        return $retVal;
-    }
-
-    public function checkCookie()
-    {
-        $res = false;
-        if (isset($_COOKIE['nzbget_'.$this->uid.'__host']))
-            $res = true;
-        if (isset($_COOKIE['nzbget_'.$this->uid.'__username']))
-            $res = true;
-        if (isset($_COOKIE['nzbget_'.$this->uid.'__password']))
-            $res = true;
-
-        return $res;
-    }
-
-    public function setCookie($host, $username, $password)
-    {
-        setcookie('nzbget_'.$this->uid.'__host', $host, (time()+2592000));
-        setcookie('nzbget_'.$this->uid.'__username', $username, (time()+2592000));
-        setcookie('nzbget_'.$this->uid.'__password', $password, (time()+2592000));
-    }
-
-    public function unsetCookie()
-    {
-        setcookie('nzbget_'.$this->uid.'__host', '', (time()-2592000));
-        setcookie('nzbget_'.$this->uid.'__username', '', (time()-2592000));
-        setcookie('nzbget_'.$this->uid.'__password', '', (time()-2592000));
-    }
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/nzbinfo.php b/lib/copy_this/www/lib/nzbinfo.php
deleted file mode 100644
index 5a4a4100a..000000000
--- a/lib/copy_this/www/lib/nzbinfo.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-
-class nzbInfo
-{
-	public $source = '';
-	public $metadata = [];
-	public $groups = [];
-	public $filecount = 0;
-	public $parcount = 0;
-	public $rarcount = 0;
-	public $zipcount = 0;
-	public $videocount = 0;
-	public $audiocount = 0;
-    public $imgcount = 0;
-    public $srrcount = 0;
-    public $txtcount = 0;
-    public $sfvcount = 0;
-	public $filesize = 0;
-	public $poster	= '';
-	public $postedfirst = 0;
-	public $postedlast = 0;
-	public $completion = 0;
-	public $segmenttotal = 0;
-	public $segmentactual = 0;
-	public $gid = '';
-
-	public $nzb = [];
-	public $nfofiles = [];
-	public $samplefiles = [];
-	public $mediafiles = [];
-	public $audiofiles = [];
-	public $rarfiles = [];
-    public $imgfiles = [];
-    public $srrfiles = [];
-    public $txtfiles = [];
-    public $sfvfiles = [];
-	public $segmentfiles = [];
-    public $parfiles = [];
-
-    private $isLoaded = false;
-	private $loadAllVars = false;
-
-	public function __construct()
-	{
-        $this->nfofileregex = '/[ "\(\[].*?\.(nfo|ofn)[ "\)\]]/iS';
-        $this->mediafileregex = '/.*\.(AVI|VOB|MKV|MP4|TS|WMV|MOV|M4V|F4V|MPG|MPEG)(\.001)?[ "\)\]]/iS';
-        $this->audiofileregex = '/\.(MP3|FLAC|AAC|OGG|AIFF)[ "\)\]]/iS';
-        $this->rarfileregex = '/.*\W(?:part0*1|(?!part\d+)[^.]+)\.(rar|001)[ "\)\]]/iS';
-        $this->imgfileregex = '/\.(jpe?g|gif)[ "\)\]]/iS';
-        $this->srrfileregex = '/\.(srr)[ "\)\]]/iS';
-        $this->txtfileregex = '/\.(txt)[ "\)\]]/iS';
-        $this->sfvfileregex = '/\.(sfv)[ "\)\]]/iS';
-    }
-
-	public function loadFromString($str, $loadAllVars=false)
-	{
-		if (empty($this->source))
-			$this->source = 'string';
-		$this->loadAllVars = $loadAllVars;
-
-		$xmlObj = @simplexml_load_string($str);
-		if ($this->isValidNzb($xmlObj))
-			$this->parseNzb($xmlObj);
-
-		unset($xmlObj);
-
-		return $this->isLoaded;
-	}
-
-    public function loadFromFile($loc, $loadAllVars=false)
-    {
-        $this->source = $loc;
-        $this->loadAllVars = $loadAllVars;
-
-        if (file_exists($loc))
-        {
-            if (preg_match('/\.(gz|zip)$/i', $loc, $ext))
-            {
-                switch(strtolower($ext[1]))
-                {
-                    case 'gz':
-                        $loc = 'compress.zlib://'.$loc;
-                        break;
-                    case 'zip':
-                        $zip = new ZipArchive;
-                        if ($zip->open($loc) === true && $zip->numFiles == 1)
-                            return $this->loadFromString($zip->getFromIndex(0), $loadAllVars);
-                        else
-                            $loc = 'zip://'.$loc;
-                        break;
-                }
-            }
-
-            libxml_use_internal_errors(true);
-            $xmlObj = @simplexml_load_file($loc);
-            if ($this->isValidNzb($xmlObj))
-                $this->parseNzb($xmlObj);
-
-            unset($xmlObj);
-        }
-        return $this->isLoaded;
-    }
-
-	public function summarize()
-	{
-		$out = [];
-		$out[] = 'Reading from '.basename($this->source).'...';
-		if (!empty($this->nfofiles))
-			$out[] = ' -nfo detected';
-		if (!empty($this->samplefiles))
-			$out[] = ' -sample detected';
-		if (!empty($this->mediafiles))
-			$out[] = ' -media detected';
-		if (!empty($this->audio))
-			$out[] = ' -audio detected';
-
-		if (!empty($this->metadata))
-		{
-			$out[] = ' -metadata:';
-			foreach($this->metadata as $mk=>$mv)
-				$out[] = '       -'.$mk.': '.$mv;
-		}
-
-		$out[] = ' -sngl: '.sizeof($this->segmentfiles);
-
-		$out[] = ' -pstr: '.$this->poster;
-		$out[] = ' -grps: '.implode(', ', $this->groups);
-		$out[] = ' -size: '.round(($this->filesize / 1048576), 2).' MB in '.$this->filecount.' Files';
-		$out[] = '       -'.$this->rarcount.' rars';
-		$out[] = '       -'.$this->parcount.' pars';
-        $out[] = '       -'.$this->sfvcount.' sfvs';
-		$out[] = '       -'.$this->zipcount.' zips';
-		$out[] = '       -'.$this->videocount.' videos';
-		$out[] = '       -'.$this->audiocount.' audios';
-		$out[] = ' -cmpltn: '.$this->completion.'% ('.$this->segmentactual.'/'.$this->segmenttotal.')';
-		$out[] = ' -pstd: '.date("Y-m-d H:i:s", $this->postedlast);
-		$out[] = '';
-		$out[] = '';
-
-		return implode(PHP_EOL, $out);
-	}
-
-	private function isValidNzb($xmlObj)
-	{
-		if (!$xmlObj || strtolower($xmlObj->getName()) != 'nzb' || !isset($xmlObj->file))
-			return false;
-
-        return true;
-	}
-
-	private function parseNzb($xmlObj)
-	{
-		//Metadata
-		if (isset($xmlObj->head->meta))
-		{
-			foreach($xmlObj->head->meta as $meta)
-			{
-				if (isset($meta->attributes()->type))
-				{
-					$metaKey = (string) $meta->attributes()->type;
-					$this->metadata[$metaKey] = (string) $meta;
-				}
-			}
-		}
-
-		//NZB GID = first segment of first file
-		$gid = (string) $xmlObj->file->segments->segment;
-		if (!empty($gid))
-			$this->gid = md5($gid);
-
-		foreach($xmlObj->file as $file)
-		{
-			$fileArr = [];
-			$fileArr['subject'] = (string) $file->attributes()->subject;
-			$fileArr['poster'] = (string) $file->attributes()->poster;
-			$fileArr['posted'] = (int) $file->attributes()->date;
-			$fileArr['groups'] = [];
-			$fileArr['filesize'] = 0;
-			$fileArr['segmenttotal'] = 0;
-			$fileArr['segmentactual'] = 0;
-			$fileArr['completion'] = 0;
-			$fileArr['segments'] = [];
-
-			//subject
-			$subject = $fileArr['subject'];
-
-			//poster
-			$this->poster = $fileArr['poster'];
-
-			//dates
-			$date = $fileArr['posted'];
-			if ($date > $this->postedlast || $this->postedlast == 0)
-				$this->postedlast = $date;
-
-			if ($date < $this->postedfirst || $this->postedfirst == 0)
-				$this->postedfirst = $date;
-
-
-			//groups
-			foreach ($file->groups->group as $group)
-			{
-				$this->groups[] = (string) $group;
-				$fileArr['groups'][] = (string) $group;
-			}
-
-			//file segments
-			foreach($file->segments->segment as $segment)
-			{
-				$bytes = (int) $segment->attributes()->bytes;
-				$number = (int) $segment->attributes()->number;
-
-				$this->filesize += $bytes;
-				$this->segmentactual++;
-
-				$fileArr['filesize'] += $bytes;
-				$fileArr['segmentactual']++;
-				$fileArr['segments'][$number] = (string) $segment;
-                $fileArr['segmentbytes'][$number] = $bytes;
-			}
-
-            $pattern = '|\((\d+)[\/](\d+)\)|i';
-            preg_match_all($pattern, $subject, $matches, PREG_PATTERN_ORDER);
-            $matchcnt = sizeof($matches[0]);
-            $msgPart = $msgTotalParts = 0;
-            for ($i=0; $i<$matchcnt; $i++)
-            {
-                //not (int)'d here because of the preg_replace later on
-                $msgPart = $matches[1][$i];
-                $msgTotalParts = $matches[2][$i];
-            }
-            if((int)$msgPart > 0 && (int)$msgTotalParts > 0)
-            {
-                $this->segmenttotal += (int) $msgTotalParts;
-                $fileArr['segmenttotal'] = (int) $msgTotalParts;
-                $fileArr['completion'] = number_format(($fileArr['segmentactual']/$fileArr['segmenttotal'])*100, 0);
-
-                $fileArr['subject'] = utf8_encode(trim(preg_replace('|\('.$msgPart.'[\/]'.$msgTotalParts.'\)|i', '', $subject)));
-            }
-
-			//file counts
-			$this->filecount++;
-
-			if ($fileArr['segmenttotal'] == 1)
-				$this->segmentfiles[] = $fileArr;
-
-			if (preg_match($this->nfofileregex, $subject))
-				$this->nfofiles[] = $fileArr;
-
-			if (preg_match($this->mediafileregex, $subject) && preg_match('/sample[\.\-]/i', $subject) && !preg_match('/\.par2|\.srs/i', $subject))
-				$this->samplefiles[] = $fileArr;
-
-			if (preg_match($this->mediafileregex, $subject) && !preg_match('/sample[\.\-]/i', $subject) && !preg_match('/\.par2|\.srs/i', $subject))
-			{
-				$this->mediafiles[] = $fileArr;
-				$this->videocount++;
-			}
-
-			if (preg_match('/\.(rar|r\d{2,3})(?!\.)/i', $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/i', $subject))
-				$this->rarcount++;
-
-			if (preg_match($this->rarfileregex, $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/i', $subject))
-				$this->rarfiles[] = $fileArr;
-
-			if (preg_match($this->audiofileregex, $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/i', $subject))
-			{
-				$this->audiofiles[] = $fileArr;
-				$this->audiocount++;
-			}
-
-            if (preg_match($this->imgfileregex, $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/iS', $subject))
-            {
-                $this->imgfiles[] = $fileArr;
-                $this->imgcount++;
-            }
-
-            if (preg_match($this->srrfileregex, $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/iS', $subject))
-            {
-                $this->srrfiles[] = $fileArr;
-                $this->srrcount++;
-            }
-
-            if (preg_match($this->txtfileregex, $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/iS', $subject))
-            {
-                $this->txtfiles[] = $fileArr;
-                $this->txtcount++;
-            }
-
-            if (preg_match($this->sfvfileregex, $subject) && !preg_match('/\.(par2|vol\d+\+|nzb)/iS', $subject))
-            {
-                $this->sfvfiles[] = $fileArr;
-                $this->sfvcount++;
-            }
-
-            if (preg_match('/\.par2(?!\.)/iS', $subject))
-            {
-                $this->parcount++;
-                if (!preg_match('/(vol\d+\+|vol[_\.\s]\d)/iS', $subject) && $fileArr['segmenttotal'] < 3)
-                    $this->parfiles[] = $fileArr;
-            }
-
-			if (preg_match('/\.zip(?!\.)/i', $subject) && !preg_match('/\.(par2|vol\d+\+|sfv|nzb)/i', $subject))
-				$this->zipcount++;
-
-			if ($this->loadAllVars === true)
-				$this->nzb[] = $fileArr;
-			else
-				$this->nzb[]['subject'] = $fileArr['subject'];
-		}
-
-		$this->groups = array_unique($this->groups);
-
-		if ($this->segmenttotal > 0)
-			$this->completion = number_format(($this->segmentactual/$this->segmenttotal)*100, 0);
-
-		if (is_array($this->nzb) && !empty($this->nzb))
-			$this->isLoaded = true;
-
-		return $this->isLoaded;
-	}
-
-    public function toNzb()
-    {
-        if ($this->loadAllVars === false)
-            return false;
-
-        $nzb = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-        $nzb .= "<!DOCTYPE nzb PUBLIC \"-//newzBin//DTD NZB 1.1//EN\" \"http://www.newzbin.com/DTD/nzb/nzb-1.1.dtd\">\n";
-        $nzb .= "<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\n\n";
-        if (!empty($this->metadata))
-        {
-            $nzb .= "<head>\n";
-			$out = [];
-            foreach($this->metadata as $mk=>$mv)
-                $out[] = ' <meta type="'.$mk.'">'.$mv."</meta>\n";
-            $nzb .= "</head>\n";
-        }
-        foreach($this->nzb as $postFile)
-        {
-            $nzb .= "<file poster=\"".htmlspecialchars($postFile["poster"], ENT_QUOTES, 'utf-8')."\" date=\"".$postFile["posted"]."\" subject=\"".htmlspecialchars($postFile["subject"], ENT_QUOTES, 'utf-8')." (1/".$postFile["segmenttotal"].")\">\n";
-            $nzb .= " <groups>\n";
-            foreach($postFile['groups'] as $fileGroup)
-            {
-                $nzb .= "  <group>".$fileGroup."</group>\n";
-            }
-            $nzb .= " </groups>\n";
-            $nzb .= " <segments>\n";
-            foreach($postFile['segments'] as $fileSegmentNum=>$fileSegment)
-            {
-                $nzb .= "  <segment bytes=\"".$postFile['segmentbytes'][$fileSegmentNum]."\" number=\"".$fileSegmentNum."\">".htmlspecialchars($fileSegment, ENT_QUOTES, 'utf-8')."</segment>\n";
-            }
-            $nzb .= " </segments>\n</file>\n";
-        }
-        $nzb .= "<!-- newznab ".date("Y-m-d H:i:s")." -->\n</nzb>";
-
-        return $nzb;
-    }
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/nzbvortex.php b/lib/copy_this/www/lib/nzbvortex.php
deleted file mode 100644
index d1fcec437..000000000
--- a/lib/copy_this/www/lib/nzbvortex.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-require_once sprintf('%s/lib/users.php', WWW_DIR);
-require_once sprintf('%s/lib/util.php', WWW_DIR);
-require_once sprintf('%s/lib/page.php', WWW_DIR);
-
-final class NZBVortex
-{
-    protected $nonce   = null;
-    protected $session = null;
-
-    public function __construct()
-    {
-        if (is_null($this->session))
-        {
-            $this->getNonce();
-            $this->login();
-        }
-    }
-
-    /**
-     * get text for state
-     * @param int $code
-     * @return string
-     */
-    public function getState($code = 0)
-    {
-        $states = array
-        (
-            0  => 'Waiting',
-            1  => 'Downloading',
-            2  => 'Waiting for save',
-            3  => 'Saving',
-            4  => 'Saved',
-            5  => 'Password request',
-            6  => 'Queued for processing',
-            7  => 'User wait for processing',
-            8  => 'Checking',
-            9  => 'Repairing',
-            10 => 'Joining',
-            11 => 'Wait for further processing',
-            12 => 'Joining',
-            13 => 'Wait for uncompress',
-            14 => 'Uncompressing',
-            15 => 'Wait for cleanup',
-            16 => 'Cleaning up',
-            17 => 'Cleaned up',
-            18 => 'Moving to completed',
-            19 => 'Move completed',
-            20 => 'Done',
-            21 => 'Uncompress failed',
-            22 => 'Check failed, data corrupt',
-            23 => 'Move failed',
-            24 => 'Badly encoded download (uuencoded)'
-        );
-
-        return (isset($states[$code])) ?
-            $states[$code] : -1;
-    }
-
-    /**
-     * get overview of NZB's in queue
-     * @return array
-     */
-    public function getOverview()
-    {
-        $params   = array('sessionid' => $this->session);
-        $response = $this->sendRequest(sprintf('app/webUpdate'), $params);
-        foreach ($response['nzbs'] as &$nzb)
-        {
-            $nzb['original_state'] = $nzb['state'];
-            $nzb['state'] = (1 == $nzb['isPaused']) ? 'Paused' : $this->getState($nzb['state']);
-        }
-
-        return $response;
-    }
-
-
-    /**
-     * add NZB to queue
-     * @param string $nzb
-     * @return void
-     */
-    public function addQueue($nzb = '')
-    {
-        if (!empty($nzb))
-        {
-            $page = new Page;
-            $user = new Users;
-
-            $host     = $page->serverurl;
-            $data     = $user->getById($user->currentUserId());
-            $url      = sprintf("%sgetnzb/%s.nzb&i=%s&r=%s", $host, $nzb, $data['id'], $data['rsstoken']);
-
-            $params   = array
-            (
-                'sessionid' => $this->session,
-                'url'       => $url
-            );
-
-            $response = $this->sendRequest('nzb/add', $params);
-        }
-    }
-
-
-    /**
-     * resume NZB
-     * @param int $id
-     * @return void
-     */
-    public function resume($id = 0)
-    {
-        if ($id > 0)
-        {
-            # /nzb/(id)/resume
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/resume', $id), $params);
-        }
-    }
-
-
-    /**
-     * pause NZB
-     * @param int $id
-     * @return void
-     */
-    public function pause($id = 0)
-    {
-        if ($id > 0)
-        {
-            # /nzb/(id)/pause
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/pause', $id), $params);
-        }
-    }
-
-
-    /**
-     * move NZB up in queue
-     * @param int $id
-     * @return void
-     */
-    public function moveUp($id = 0)
-    {
-        if ($id > 0)
-        {
-            # nzb/(nzbid)/moveup
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/moveup', $id), $params);
-        }
-    }
-
-
-    /**
-     * move NZB down in queue
-     * @param int $id
-     * @return void
-     */
-    public function moveDown($id = 0)
-    {
-        if ($id > 0)
-        {
-            # nzb/(nzbid)/movedown
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/movedown', $id), $params);
-        }
-    }
-
-
-    /**
-     * move NZB to bottom of queue
-     * @param int $id
-     * @return void
-     */
-    public function moveBottom($id = 0)
-    {
-        if ($id > 0)
-        {
-            # nzb/(nzbid)/movebottom
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/movebottom', $id), $params);
-        }
-    }
-
-
-    /**
-     * Remove a (�nished/un�nished) NZB from queue and delete files
-     * @param int $id
-     * @return void
-     */
-    public function delete($id = 0)
-    {
-        if ($id > 0)
-        {
-            # nzb/(nzbid)/movebottom
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/cancelDelete', $id), $params);
-        }
-    }
-
-
-    /**
-     * move NZB to top of queue
-     * @param int $id
-     * @return void
-     */
-    public function moveTop($id = 0)
-    {
-        if ($id > 0)
-        {
-            # nzb/(nzbid)/movebottom
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('nzb/%s/movetop', $id), $params);
-        }
-    }
-
-
-    /**
-     * get filelist for nzb
-     * @param int $id
-     * @return array|bool
-     */
-    public function getFilelist($id = 0)
-    {
-        if ($id > 0)
-        {
-            # �le/(nzbid)
-            $params   = array('sessionid' => $this->session);
-            $response = $this->sendRequest(sprintf('file/%s', $id), $params);
-            return $response;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * get /auth/nonce
-     * @return void
-     */
-    protected function getNonce()
-    {
-        $response = $this->sendRequest('auth/nonce');
-        $this->nonce = $response['authNonce'];
-    }
-
-    /**
-     * @return void
-     */
-    protected function login()
-    {
-        $user     = new Users();
-        $data     = $user->getById($user->currentUserId());
-        $cnonce   = generateUuid();
-        $hash     = hash('sha256', sprintf("%s:%s:%s", $this->nonce, $cnonce, $data['nzbvortex_api_key']), true);
-        $hash     = base64_encode($hash);
-
-        $params   = array
-        (
-            'nonce'  => $this->nonce,
-            'cnonce' => $cnonce,
-            'hash'   => $hash
-        );
-
-        $response = $this->sendRequest('auth/login', $params);
-
-        if ('successful' == $response['loginResult'])
-            $this->session = $response['sessionID'];
-
-        if ('failed' == $response['loginResult']) { }
-    }
-
-    /**
-     * sendRequest()
-     * @return array
-     */
-    protected function sendRequest($path, $params = array())
-    {
-        $user = new Users;
-        $data = $user->getById($user->currentUserId());
-
-        $url    = sprintf('%s/api', $data['nzbvortex_server_url']);
-        $params = http_build_query($params);
-        $ch     = curl_init(sprintf("%s/%s?%s", $url, $path, $params));
-
-        curl_setopt($ch, CURLOPT_HEADER, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-
-        #curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
-        #curl_setopt($ch, CURLOPT_PROXY, 'localhost:8888');
-
-        $response = curl_exec($ch);
-        $response = json_decode($response, true);
-        $status   = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $error    = curl_error($ch);
-
-        curl_close($ch);
-
-        switch ($status)
-        {
-            case 0:
-                throw new Exception(sprintf('Unable to connect. Is NZBVortex running? Is your API key correct? Is something blocking ports? (Err: %s)', $error));
-                break;
-
-            case 200:
-                return $response;
-                break;
-
-            case 403:
-                throw new Exception('Unable to login. Is your API key correct?');
-                break;
-
-            default:
-                throw new Exception(sprintf("%s (%s): %s", $path, $status, $response['result']));
-                break;
-        }
-    }
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/page.php b/lib/copy_this/www/lib/page.php
deleted file mode 100644
index 68b06ea5e..000000000
--- a/lib/copy_this/www/lib/page.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/basepage.php");
-require_once(WWW_DIR."/lib/content.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/users.php");
-require_once(WWW_DIR."/lib/forum.php");
-require_once(WWW_DIR."/lib/menu.php");
-
-/**
- * This class represents every normal user page in the site.
- */
-class Page extends BasePage
-{
-	/**
-	 * Default constructor.
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		$role=Users::ROLE_GUEST;
-		if ($this->userdata != null)
-			$role = $this->userdata["role"];
-
-		$content = new Contents();
-		$f = new Forum();
-		$menu = new Menu();
-		$this->smarty->assign('menulist',$menu->get($role, $this->serverurl));
-		$this->smarty->assign('usefulcontentlist',$content->getForMenuByTypeAndRole(Contents::TYPEUSEFUL, $role));
-		$this->smarty->assign('articlecontentlist',$content->getForMenuByTypeAndRole(Contents::TYPEARTICLE, $role));
-		if ($this->userdata != null)
-			$this->smarty->assign('recentforumpostslist',$f->getRecentPosts($this->site->showrecentforumposts));
-
-		$this->smarty->assign('main_menu',$this->smarty->fetch('mainmenu.tpl'));
-		$this->smarty->assign('useful_menu',$this->smarty->fetch('usefullinksmenu.tpl'));
-		$this->smarty->assign('article_menu',$this->smarty->fetch('articlesmenu.tpl'));
-		$this->smarty->assign('recentposts_menu',$this->smarty->fetch('recentforumposts.tpl'));
-
-		$category = new Category();
-		if ($this->userdata != null)
-			$parentcatlist = $category->getForMenu($this->userdata["categoryexclusions"]);
-		else
-			$parentcatlist = $category->getForMenu();
-
-		$this->smarty->assign('parentcatlist',$parentcatlist);
-		$searchStr = '';
-		if ($this->page == 'search' && isset($_REQUEST["id"]))
-			$searchStr = (string) $_REQUEST["id"];
-		$this->smarty->assign('header_menu_search',$searchStr);
-
-		if (isset($_REQUEST["t"]))
-			$this->smarty->assign('header_menu_cat',$_REQUEST["t"]);
-		$header_menu = $this->smarty->fetch('headermenu.tpl');
-		$this->smarty->assign('header_menu',$header_menu);
-	}
-
-	/**
-	 * Output the page.
-	 */
-	public function render()
-	{
-		$this->smarty->assign('page',$this);
-		$this->page_template = "basepage.tpl";
-
-		parent::render();
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/parsing.php b/lib/copy_this/www/lib/parsing.php
deleted file mode 100644
index b7cc97ae5..000000000
--- a/lib/copy_this/www/lib/parsing.php
+++ /dev/null
@@ -1,1509 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/movie.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/nzbinfo.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/rarinfo/par2info.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-/**
- * This class handles parsing misc>other releases into real names.
- */
-class Parsing
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $echoonly
-	 * @param bool $limited
-	 * @param bool $verbose
-	 */
-	public function __construct($echoonly = false, $limited = true, $verbose = false)
-	{
-		$this->echoonly = $echoonly;
-		$this->limited = $limited;
-		$this->verbose = $verbose;
-		$this->releasestocheck = 0;
-		$this->numupdated = 0;
-		$this->numcleaned = 0;
-		$this->numnuked = 0;
-		$this->nummiscd = 0;
-		$this->nfosprocessed = 0;
-		$this->parsprocessed = 0;
-		$this->releasefilesprocessed = 0;
-		$this->cleanup = ['nuke' => [], 'misc' => []];
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->pdo = new DB();
-	}
-
-	/**
-	 * Performing parsing.
-	 */
-	public function process()
-	{
-
-		// Default query for both full db and last 4 hours.
-		$sql = "SELECT r.searchname, r.name, r.fromname, r.id as rid, r.categoryid, r.guid, r.postdate,
-			   rn.id as nfoid,
-			   g.name as groupname,
-			   GROUP_CONCAT(rf.name) as filenames
-		FROM releases r
-		LEFT JOIN releasenfo rn ON (rn.releaseid = r.id)
-		LEFT JOIN groups g ON (g.id = r.groupid)
-		LEFT JOIN releasefiles rf ON (rf.releaseid = r.id)
-		WHERE r.categoryid in (' . Category::CAT_TV_OTHER . ',' . Category::CAT_MOVIE_OTHER . ',' . Category::CAT_MISC_OTHER . ',' . Category::CAT_XXX_OTHER . ')
-		%s
-		GROUP BY r.id";
-
-		$res = $this->pdo->query(sprintf($sql, $this->limited ? "AND r.adddate BETWEEN NOW() - INTERVAL 4 HOUR AND NOW()" : ""));
-		$this->releasestocheck = sizeof($res);
-		if ($res) {
-			echo "PostPrc : Parsing last " . $this->releasestocheck . " releases in the Other-Misc categories\n";
-			foreach ($res as $rel) {
-				$tempname = $foundName = $methodused = '';
-
-				//Knoc.One
-				if (preg_match("/KNOC.ONE/i", $rel['name'])) {
-					$title = '';
-					$items = preg_split("/(\.| )/", $rel['name']);
-					foreach ($items as $value) {
-						if (preg_match("/^[a-z]+$/i", $value)) {
-							$len = strlen($value);
-							if ($len > 2) {
-								$title .= substr($value, -2) . substr($value, 0, -2) . " ";
-							} elseif ($len = 2) {
-								$title .= substr($value, -1) . substr($value, 0, -1) . " ";
-							} else {
-								$title .= $value . " ";
-							}
-						} else {
-							$title .= $value . " ";
-						}
-					}
-					$foundName = $title;
-					$methodused = "Knoc.One";
-					$this->determineCategory($rel, $foundName, $methodused);
-				}
-
-				///
-				///Use the Nfo to try to get the proper Releasename.
-				///
-				$nfo = $this->pdo->queryOneRow(sprintf("select uncompress(nfo) as nfo from releasenfo where releaseid = %d", $rel['rid']));
-				if ($nfo && $foundName == "") {
-					$this->nfosprocessed++;
-					$nfo = $nfo['nfo'];
-
-					//LOUNGE releases
-					if (preg_match('/([a-z0-9.]+\.MBLURAY)/i', $nfo, $matches)) {
-						$foundName = $matches[1];
-						$methodused = "LOUNGE";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//AsianDVDClub releases
-					if (preg_match('/adc-[a-z0-9]{1,10}/', $rel['name'])) {
-						if (preg_match('/.*\(\d{4}\).*/i', $nfo, $matches)) {
-							$foundName = $matches[0];
-							$methodused = "AsianDVDClub";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-					}
-
-					//ACOUSTiC  releases
-					if (preg_match('/ACOUSTiC presents \.\.\..*?([a-z0-9].*?\(.*?\))/is', $nfo, $matches)) {
-						$foundName = $matches[1] . ".MBLURAY";
-						$methodused = "ACOUSTiC ";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//Japhson  releases
-					if (preg_match('/Japhson/i', $nfo, $matches)) {
-						$movie = new Movie();
-						$imdbID = null;
-						if (preg_match('/tt(\d{7})/i', $nfo, $matches)) {
-							$imdbId = $matches[1];
-							$movCheck = $movie->fetchImdbProperties($imdbId);
-							$foundName = $movCheck['title'];
-							if (!preg_match('/(19|20)\d{2}/i', $foundName)) {
-								$foundName = $foundName . "." . $movCheck['year'];
-							}
-							if (preg_match('/language.*?\b([a-z0-9]+)\b/i', $nfo, $matches)) {
-								if (!preg_match('/English/i', $matches[1])) {
-									$foundName = $foundName . "." . $matches[1];
-								}
-							}
-							if (preg_match('/audio.*?\b(\w+)\b/i', $nfo, $matches)) {
-								if (preg_match('/(Chinese|German|Dutch|Spanish|Hebrew|Finnish|Norwegian)/i', $matches[1])) {
-									$foundName = $foundName . "." . $matches[1];
-								}
-							}
-							if (preg_match('/(video|resolution|video res).*?(1080|720|816|820|272|1280 @|528|1920)/i', $nfo, $matches)) {
-								if ($matches[2] == '1280 @') {
-									$matches[2] = '720';
-								}
-								if ($matches[2] == '1920') {
-									$matches[2] = '1080';
-								}
-								$foundName = $foundName . "." . $matches[2];
-							}
-							if (preg_match('/source.*?\b(DVD9|DVD5|BDRIP|DVD\-?RIP|BLURAY)\b/i', $nfo, $matches)) {
-								$foundName = $foundName . "." . $matches[1];
-							}
-							if (preg_match('/(video|resolution|video res).*?(XVID|X264|WMV)/i', $nfo, $matches)) {
-								$foundName = $foundName . "." . $matches[2];
-							}
-							if (preg_match('/audio.*?\b(DTS|AC3)\b/i', $nfo, $matches)) {
-								$foundName = $foundName . "." . $matches[1];
-							}
-							$foundName = $foundName . "-Japhson";
-							$methodused = "Japhson";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-					}
-
-					//AIHD  releases
-					if (preg_match('/ALWAYS iN HiGH/i', $nfo, $matches)) {
-						$movie = new Movie();
-						$imdbID = null;
-						if (preg_match('/tt(\d{7})/i', $nfo, $matches)) {
-							$imdbId = $matches[1];
-							$movCheck = $movie->fetchImdbProperties($imdbId);
-							$foundName = $movCheck['title'];
-							if (!preg_match('/(19|20)\d{2}/i', $foundName)) {
-								$foundName = $foundName . "." . $movCheck['year'];
-							}
-							if (preg_match('/L\.([a-z0-9]+)\b/i', $nfo, $matches)) {
-								if (!preg_match('/En/i', $matches[1])) {
-									$foundName = $foundName . "." . $matches[1];
-								}
-							}
-							if (preg_match('/(V).*?(1080|720|816|820|272|1280 @|528|1920)/i', $nfo, $matches)) {
-								if ($matches[2] == '1280 @') {
-									$matches[2] = '720';
-								}
-								if ($matches[2] == '1920') {
-									$matches[2] = '1080';
-								}
-								$foundName = $foundName . "." . $matches[2];
-							}
-							if (preg_match('/V.*?\b(DVD9|DVD5|BDRIP|DVD\-?RIP|BLURAY)\b/i', $nfo, $matches)) {
-								$foundName = $foundName . "." . $matches[1];
-							}
-							if (preg_match('/(V).*?(XVID|X264|WMV)/i', $nfo, $matches)) {
-								$foundName = $foundName . "." . $matches[2];
-							}
-							if (preg_match('/A.*?\b(DTS|AC3)\b/i', $nfo, $matches)) {
-								$foundName = $foundName . "." . $matches[1];
-							}
-							$foundName = $foundName . "-AIHD";
-							$methodused = "AIHD";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-					}
-
-					//IMAGiNE releases
-					if (preg_match('/\*\s+([a-z0-9]+(?:\.|_| )[a-z0-9\.\_\- ]+ \- imagine)\s+\*/i', $nfo, $matches)) {
-						$foundName = $matches[1];
-						$methodused = "imagine";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//LEGION releases
-					if (preg_match('/([a-z0-9 \.\-]+LEGi0N)/is', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "Legion";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//SWAGGER releases
-					if (preg_match('/(S  W  A  G  G  E  R|swg.*?nfo)/i', $nfo) && $foundName == "") {
-						if (preg_match('/presents.*?([a-z0-9].*?\((19|20)\d{2}\))/is', $nfo, $matches)) {
-							$foundName = $matches[1];
-						}
-						if (preg_match('/language.*?\b([a-z0-9]+)\b/i', $nfo, $matches)) {
-							if ($matches[1] != "english") {
-								$foundName = $foundName . "." . $matches[1];
-							}
-						}
-						if (preg_match('/resolution.*?(1080|720)/i', $nfo, $matches)) {
-							$foundName = $foundName . ".BluRay." . $matches[1];
-						}
-						if (preg_match('/video.*?\b([a-z0-9]+)\b/i', $nfo, $matches)) {
-							$foundName = $foundName . "." . $matches[1];
-						}
-						if (preg_match('/audio.*?\b([a-z0-9]+)\b/i', $nfo, $matches)) {
-							$foundName = $foundName . "." . $matches[1];
-						}
-						$foundName = $foundName . "-SWAGGER";
-						$methodused = "SWAGGER";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//cm8 releases
-					if (preg_match('/([a-z0-9]+(?:\.|_| )[a-z0-9\.\_\- \'\)\(]+\-(futv|crimson|qcf|runner|clue|ftp|episode|momentum|PFA|topaz|vision|tdp|haggis|nogrp|shirk|imagine|santi|sys|deimos|ltu|ficodvdr|cm8|dvdr|Nodlabs|aaf|sprinter|exvid|flawl3ss|rx|magicbox|done|unveil))\b/i', $nfo, $matches) && $foundName == "") {
-						//echo "this: ".$matches[1]."\n";
-						$foundName = $matches[1];
-						$methodused = "cm8";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//river
-					if (preg_match('/([a-z0-9\.\_\-]+\-(webios|river|w4f|sometv|ngchd|C4|gf|bov|26k|ftw))\b/i', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "river-1";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-					if (preg_match('/([a-z0-9]+(?:\.|_| )[a-z0-9\.\_\- \'\)\(]+\-(CiA|Anarchy|RemixHD|FTW|Revott|WAF|CtrlHD|Telly|Nif|Line|NPW|Rude|EbP|CRisC|SHK|AssAss1ns|Leverage|BBW|NPW))\b/i', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "river-2";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-					if (preg_match('/([a-z0-9]+(?:\.|_| )[a-z0-9\.\_\- \'\)\(]+\-(XPD|RHyTM))\b/i', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "river-3";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-					if (preg_match('/(-PROD$|-BOV$|-NMR$|$-HAGGiS|-JUST$|CRNTV$|-MCA$|int$|-DEiTY$|-VoMiT$|-iNCiTE$|-BRUTUS$|-DCN$|-saints$|-sfm$|-lol$|-fov$|-logies$|-c4tv$|-fqm$|-jetset$|-ils$|-miragetv$|-gfvid$|-btl$|-terra$)/i', $rel['searchname']) && $foundName == "") {
-						$foundName = $rel['searchname'];
-						$methodused = "river-4";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//SANTi releases
-					if (preg_match('/\b([a-z0-9]+(?:\.|_| )[a-z0-9\.\_\- \']+\-santi)\b/i', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "SANTi";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//INSPiRAL releases
-					if (preg_match('/^([a-z0-9]+(?:\.|_| )[a-z0-9\.\_\- ]+ \- INSPiRAL)\s+/im', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "INSPiRAL";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//CIA releases
-					if (preg_match('/Release NAME.*?\:.*?([a-z0-9][a-z0-9\.\ ]+)\b.*?([a-z0-9][a-z0-9\.\ ]+\-CIA)\b/is', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1] . $matches[2];
-						$methodused = "CIA";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//HDChina releases
-					if (preg_match('/HDChina/', $nfo) && $foundName == "") {
-						if (preg_match('/Disc Title\:.*?\b([a-z0-9\ \.\-\_()]+\-HDChina)/i', $nfo, $matches)) {
-							$foundName = $matches[1];
-							$methodused = "HDChina";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-					}
-
-					//Pringles
-					if (preg_match('/PRiNGLES/', $nfo) && $foundName == "") {
-						if (preg_match('/is giving you.*?\b([a-z0-9 ]+)\s/i', $nfo, $matches)) {
-							$foundName = $matches[1];
-							$foundName = rtrim($foundName);
-							$foundName = ltrim($foundName);
-						}
-						if (preg_match('/this release.*?((19|20)\d{2})/i', $nfo, $matches)) {
-							$foundName = $foundName . "." . $matches[1];
-							$foundName = rtrim($foundName);
-						}
-						if (preg_match('/\[x\] (Danish|Norwegian|Swedish|Finish|Other)/i', $nfo, $matches)) {
-							$foundName = $foundName . "." . $matches[1];
-						}
-						if (preg_match('/\[x\] (DVD9|DVD5)/i', $nfo, $matches)) {
-							$foundName = $foundName . "." . $matches[1];
-						}
-						$foundName = $foundName . "-PRiNGLES";
-						$methodused = "Pringles";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//Fairlight releases
-					if (preg_match('/\/Team FairLight/', $nfo) && $foundName == "") {
-						$title = null;
-						$os = null;
-						$method = null;
-						if (preg_match('/\b([a-z0-9\ \- \_()\.]+) \(c\)/i', $nfo, $matches)) {
-							$title = $matches['1'];
-							$foundName = $title;
-						}
-						$foundName = $foundName . "-FLT";
-						$methodused = "FairLight";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//CORE releases
-					if (preg_match('/Supplied.*?\:.*?(CORE)/', $nfo) || preg_match('/Packaged.*?\:.*?(CORE)/', $nfo) && $foundName == "") {
-						$title = null;
-						$os = null;
-						$method = null;
-						if (preg_match('/\b([a-z0-9\.\-\_\+\ ]+) \*[a-z0-9]+\*/i', $nfo, $matches)) {
-							$title = $matches['1'];
-							$foundName = $title;
-						}
-						if (preg_match('/Crack\/.*?\:.*?([a-z]+)/i', $nfo, $matches)) {
-							$method = $matches['1'];
-							$foundName = $foundName . " " . $method;
-						}
-						if (preg_match('/OS.*?\:.*?([a-z]+)/i', $nfo, $matches)) {
-							$os = $matches['1'];
-							$foundName = $foundName . " " . $os;
-						}
-						$foundName = $foundName . "-CORE";
-						$methodused = "CORE";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//CompleteRelease
-					if (preg_match('/Complete name.*?([a-z0-9].*?\-[a-z0-9]+)\b/i', $nfo, $matches) && $foundName == "") {
-						$foundName = $matches[1];
-						$methodused = "CompleteRelease";
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-
-					//Livesets
-					if (preg_match('/\nLivesets.*?\n.*?\n.*?\n.*?\n.*?\n(?P<name>\w.*?)\n(?P<album>\w.*?)\n/im', $nfo, $matches) && $foundName == "") {
-						$artist = $matches['name'];
-						$title = $matches['album'];
-						$source = null;
-						$year = null;
-						if (preg_match('/Year.*?\:{1,2} ?(?P<year>(19|20)\d{2})/i', $nfo, $matches)) {
-							$year = $matches[1];
-						} elseif (preg_match('/date.*?\:.*?(?P<year>(19|20)\d{2})/i', $nfo, $matches)) {
-							$year = $matches[1];
-						}
-						if (preg_match('/(web|cable|sat)/i', $title)) {
-							$source = "";
-						} elseif (preg_match('/Source.*?\:{1,2} ?(?P<source>.*?)(\s{2,}|\s{1,})/i', $nfo, $matches)) {
-							$source = $matches[1];
-							if ($source == "Satellite") {
-								$source = "Sat";
-							}
-						}
-						if ($artist) {
-							$tempname = $artist;
-							if ($title) {
-								$tempname = $tempname . "-" . $title;
-							}
-							if ($source) {
-								$tempname = $tempname . "-" . $source;
-							}
-							if ($year) {
-								$tempname = $tempname . "-" . $year;
-							}
-							$tempname = preg_replace("/[^a-zA-Z,0-9,\-,\s]/", "", $tempname);
-							$foundName = $tempname;
-							$methodused = "Live Sets";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-					}
-
-					//Typical scene regex
-					if (preg_match('/(?P<source>Source[\s\.]*?:|fix for nuke)?(?:\s|\]|\[)?(?P<name>[a-z0-9\'\-]+(?:\.|_)[a-z0-9\.\-_\'&]+\-[a-z0-9&]+)(?:\s|\[|\])/i', $nfo, $matches) && $foundName == "") {
-						if (empty($matches['source'])) {
-							if (!preg_match('/usenet\-space/i', $matches['name'])) {
-								$foundName = $matches['name'];
-								$methodused = "Scene";
-								$this->determineCategory($rel, $foundName, $methodused);
-							}
-						}
-					}
-				}
-
-				//The Big One
-				if (preg_match_all('/([a-z0-9\ ]+)\.{1,}(\:|\[)(?P<name>.*)(\s{2}|\s{1})/i', $nfo, $matches) && $foundName == "") {
-					$lut = array();
-					foreach ($matches[1] as $key => $k) {
-						$lut[str_replace(' ', '', strtolower(trim($k)))] = trim($matches[3][$key]);
-					}
-					$year = null;
-					$vidsource = null;
-					$series = null;
-					$season = null;
-					$episode = null;
-					$language = null;
-					$artist = null;
-					$source = null;
-
-					foreach ($lut as $k => $v) {
-						$v = rtrim($v);
-						if (!$year && preg_match('/((19|20)\d{2})/', $v, $matches)) {
-							$year = $matches[1];
-						}
-						if (!$vidsource && preg_match('/(xvid|x264|h264|wmv|divx)/i', $v, $matches)) {
-							$vidsource = $matches[1];
-						}
-
-						if (!$season && preg_match('/(season|seizon).*?(\d{1,3})/i', $v, $matches)) {
-							$season = $matches[2];
-						}
-						if (!$episode && preg_match('/(Episode|ep).*?(\d{1,3})/i', $v, $matches)) {
-							$episode = $matches[2];
-						}
-					}
-
-					if (isset ($lut['artist'])) {
-						$del = "-";
-						if (isset ($lut['artist'])) {
-							$lut['artist'] = trim($lut['artist'], " ");
-							$tempname = $lut['artist'];
-						}
-						if (isset ($lut['title'])) {
-							$tempname = $tempname . $del . $lut['title'];
-						}
-						if (isset ($lut['album']) && !isset ($lut['title'])) {
-							$tempname = $tempname . $del . $lut['album'];
-						}
-						if (isset ($lut['track']) && !isset ($lut['title']) && !isset ($lut['album'])) {
-							$tempname = $tempname . $del . $lut['track'];
-						}
-						if (!isset ($lut['source'])) {
-							$lut['source'] = 'WEB';
-						}
-						if (isset ($lut['source']) && !preg_match('/SAT/i', $tempname)) {
-							$tempname = $tempname . $del . $lut['source'];
-						}
-						if (!preg_match('/(19|20)\d{2}/', $tempname) && $year) {
-							$tempname = $tempname . $del . $year;
-						}
-						if (isset ($lut['ripper'])) {
-							$tempname = $tempname . $del . $lut['ripper'];
-						}
-						$tempname = preg_replace("/[^a-zA-Z,0-9,\-,\&,\s]/", "", $tempname);
-						$tempname = preg_replace("/[ ]{2,}/", "", $tempname);
-						$methodused = "The Big One Music";
-						$foundName = $tempname;
-						$this->determineCategory($rel, $foundName, $methodused);
-					} else if (isset ($lut['title'])) {
-						$del = " ";
-						if (isset ($lut['series'])) {
-							$tempname = $lut['series'];
-						}
-						$tempname = $tempname . $del . $lut['title'];
-						if ($season && $episode) {
-							$tempname = $tempname . $del . "S" . str_pad($season, 2, '0', STR_PAD_LEFT) . 'E' . str_pad($episode, 2, '0', STR_PAD_LEFT);
-						} else {
-							if ($season) {
-								$tempname = $tempname . $del . "S" . $season;
-							}
-							if ($episode) {
-								$tempname = $tempname . $del . "Ep" . $episode;
-							}
-						}
-						if (isset ($lut['source']) && !preg_match('/SAT/i', $lut['title'])) {
-							$tempname = $tempname . $del . $lut['source'];
-						}
-						if (!preg_match('/(19|20)\d{2}/', $tempname) && $year) {
-							$tempname = $tempname . $del . $year;
-						}
-						if (isset($lut['language'])) {
-							$tempname = $tempname . $del . $lut['language'];
-						}
-						if ($vidsource) {
-							$tempname = $tempname . $del . $vidsource;
-						}
-						$tempname = preg_replace("/ /", " ", $tempname);
-						$tempname = preg_replace("/[^a-zA-Z,0-9,\-,\&,\s]/", " ", $tempname);
-						$tempname = preg_replace("/[ ]+/", " ", $tempname);
-						$methodused = "The Big One Other";
-						$foundName = $tempname;
-						$this->determineCategory($rel, $foundName, $methodused);
-					}
-				}
-
-				///
-				///unable to extract releasename from nfo, try the rar file
-				///
-				if ($rel['filenames'] && $foundName == '') {
-					$this->releasefilesprocessed++;
-					$files = explode(',', $rel['filenames']);
-					if (![$files]) {
-						$files = [$files];
-					}
-
-					// Scene regex
-					$sceneRegex = '/([a-z0-9\'\-\.\_\(\)\+\ ]+\-[a-z0-9\'\-\.\_\(\)\ ]+)(.*?\\\\.*?|)\.(?:\w{3,4})$/i';
-
-					foreach ($files AS $file) {
-						// Petje Releases
-						if (preg_match('/Petje \<petje\@pietamientje\.com\>/', $rel['fromname'], $matches3) && $foundName == '') {
-							if (preg_match('/.*\.(mkv|avi|mp4|wmv|divx)/', $file, $matches4)) {
-								$array_new = explode('\\', $matches4[0]);
-								foreach ($array_new as $item) {
-									if (preg_match('/.*\((19|20\d{2})\)$/', $item, $matched)) {
-										//echo $matched[0].".720p.x264-Petje";
-										//print_r($matched);
-										$foundName = $matched[0] . ".720p.x264-Petje";
-										$methodused = "Petje";
-										$this->determineCategory($rel, $foundName, $methodused);
-										break 2;
-									}
-								}
-							}
-						}
-
-						//3D Remux
-						if (preg_match('/.*Remux\.mkv/', $file, $matches4)) {
-							$foundName = str_replace(".mkv", "", $matches4[0]);
-							$methodused = "3D Remux";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-						//QoQ Extended
-						if (preg_match('/Q\-sbuSLN.*/i', $file, $matches4)) {
-							$new1 = preg_match('/( )?(\.wmv|\.divx|\.avi|\.mkv)/i', $matches4[0], $matched);
-							$new2 = str_replace($matched[0], "", $matches4[0]);
-							$foundName = strrev($new2);
-							$methodused = "QoQ Extended";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-						// Directory\Title.Year.Format.Group.mkv
-						if (preg_match('/(?<=\\\).*?BLURAY.(1080|720)P.*?KNORLOADING(?=\.MKV)/i', $file, $matches3) && $foundName == '') {
-							$foundName = $matches3['0'];
-							$methodused = "a.b.hdtv.x264";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-						// ReleaseGroup.Title.Format.mkv
-						if (preg_match('/(?<=swg_|swghd\-|lost\-|veto\-|kaka\-|abd\-|airline\-|daa\-|data\-|japhson\-|ika\-|lng\-|nrdhd\-|saimorny\-|sparks\-|ulshd\-|nscrns\-|ifpd\-|invan\-|an0\-|besthd\-|muxhd\-|s7\-).*?((1080|720)|P)(?=\.MKV)/i', $file, $matches3) && $foundName == '') {
-							$foundName = str_replace("_", ".", $matches3['0']);
-							$methodused = "a.b.hdtv.x264";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-						// Title.Format.ReleaseGroup.mkv
-						if (preg_match('/.*?(1080|720)(|P).(SON)/i', $file, $matches3) && $foundName == '') {
-							$foundName = str_replace("_", ".", $matches3['0']);
-							$methodused = "a.b.hdtv.x264";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-
-						//epubmobi
-						if (preg_match('/.*\.(epub|mobi|azw3|pdf|prc|lit|rtf|azw|cbr|doc)/', $file, $matches4)) {
-							$foundName = str_replace(".doc", "", str_replace(".cbr", "", str_replace(".prc", "", str_replace(".pdf", "", str_replace(".azw3", "", str_replace(".mobi", "", str_replace(".epub", "", str_replace(".rtf", "", str_replace(".azw", "", str_replace(".lit", "", $matches4[0]))))))))));
-							$methodused = "EpubMobi";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-
-						//Reversed name
-						if (preg_match('/[a-z0-9\(\)\'\!\,\.\-\ \_]+(BEW|p027|p0801)[a-z0-9\(\)\,\'\!\ \-\.]+/i', $file, $matches4))
-						{
-							$new1 = preg_match('/( )?(\.m2ts|\.wmv|\.avi|.mp4|\.mkv)/i', $matches4[0], $matched);
-							$new2 = str_replace($matched[0], "", $matches4[0]);
-							$foundName = strrev($new2);
-							$methodused = "Reversed";
-							$this->determineCategory($rel, $foundName, $methodused);
-						}
-
-						//Check rarfile contents for a scene name
-						if (preg_match($sceneRegex, $file, $matches) && $foundName == '') {
-							//Simply Releases Toppers
-							if (preg_match('/(\\\\)(?P<name>.*?ReleaseS Toppers)/', $file, $matches1) && $foundName == '') {
-								$foundName = $matches1['name'];
-								$methodused = "Release Files-1";
-								$this->determineCategory($rel, $foundName, $methodused);
-
-							}
-							//Scene format no folder.
-							if (preg_match('/^([a-z0-9\.\_\- ]+\-[a-z0-9\_]+)(\\\\|)$/i', $matches[1]) && $foundName == '') {
-								if (strlen($matches['1']) >= 15) {
-									$foundName = $matches['1'];
-									$methodused = "Scene format no folder.";
-									$this->determineCategory($rel, $foundName, $methodused);
-								}
-							}
-
-							//Check to see if file is inside of a folder. Use folder name if it is
-							if (preg_match('/^(.*?\\\\)(.*?\\\\|)(.*?)$/i', $file, $matches1) && $foundName == '') {
-								If (preg_match('/^([a-z0-9\.\_\- ]+\-[a-z0-9\_]+)(\\\\|)$/i', $matches1['1'], $res)) {
-									$foundName = $res['1'];
-									$methodused = "Release Files-1";
-									$this->determineCategory($rel, $foundName, $methodused);
-								}
-								If (preg_match('/(?!UTC)([a-z0-9]+[a-z0-9\.\_\- \'\)\(]+(\d{4}|HDTV).*?\-[a-z0-9]+)/i', $matches1['1'], $res) && $foundName == '') {
-									$foundName = $res['1'];
-									$methodused = "Release Files-2";
-									$this->determineCategory($rel, $foundName, $methodused);
-								}
-								If (preg_match('/^([a-z0-9\.\_\- ]+\-[a-z0-9\_]+)(\\\\|)$/i', $matches1['2'], $res) && $foundName == '') {
-									$foundName = $res['1'];
-									$methodused = "Release Files-3";
-									$this->determineCategory($rel, $foundName, $methodused);
-								}
-								If (preg_match('/^([a-z0-9\.\_\- ]+\-(?:.+)\(html\))\\\\/i', $matches1['1'], $res) && $foundName == '') {
-									$foundName = $res['1'];
-									$methodused = "Release Files-4";
-									$this->determineCategory($rel, $foundName, $methodused);
-								}
-
-							}
-							If (preg_match('/(?!UTC)([a-z0-9]+[a-z0-9\.\_\- \'\)\(]+(\d{4}|HDTV).*?\-[a-z0-9]+)/i', $file, $matches2) && $foundName == '') {
-								$foundName = $matches2['1'];
-								$methodused = "Release Files-4";
-								$this->determineCategory($rel, $foundName, $methodused);
-							}
-						}
-					}
-
-					//RAR file contents release name matching
-
-					/*if (sizeof($files) > 0 && $foundName == '')
-					{
-						echo "RAR checking\n";
-						//Loop through releaseFiles to find a match
-						foreach($files as $rarFile)
-						{
-							//echo "-{$rarFile}\n";
-							if ($foundName == '')
-							{
-								//Lookup name via reqid (filename)
-								if (preg_match('/\.(avi|mkv|mp4|mov|wmv|iso|img|gcm|ps3|wad|ac3|nds|bin|cue|mdf)/i', $rarFile))
-								{
-									$this->site->reqidurl;
-									$lookupUrl = 'http://allfilled/query.php?t=alt.binaries.srrdb&reqid='.urlencode(basename($rarFile));
-									echo '-lookup: '.$lookupUrl."\n";
-									$xml = Utility::getUrl(['url' => $lookupUrl]);
-									//$xml = false;
-
-									if ($xml !== false)
-									{
-										$xmlObj = @simplexml_load_string($xml);
-										$arrXml = objectsIntoArray($xmlObj);
-
-										if (isset($arrXml["item"]) && is_array($arrXml["item"]) && isset($arrXml["item"]["@attributes"]) && is_array($arrXml["item"]["@attributes"]))
-										{
-											$foundName = $arrXml["item"]["@attributes"]["title"];
-										}
-									}
-								}
-							}
-						}
-					}*/
-
-				}
-
-				// do par check if user has elected for downloading extra stuff
-				if ($this->site->unrarpath != '' && $foundName == "") {
-					$nzb = new NZB();
-					$nzbfile = $nzb->NZBPath($rel['guid'], $this->site->nzbpath, true);
-					$nzbInfo = new nzbInfo;
-					$nzbInfo->loadFromFile($nzbfile);
-					if (!empty($nzbInfo->parfiles) && empty($nzbInfo->rarfiles) && empty($nzbInfo->audiofiles)) {
-						$nntp = new Nntp;
-						$nntp->doConnect();
-
-						if ($this->verbose) echo "Checking Par\n";
-						foreach ($nzbInfo->parfiles as $parfile) {
-							$this->parsprocessed++;
-							$parBinary = $nntp->getMessages($parfile['groups'][0], $parfile['segments'], $this->verbose);
-							if ($parBinary) {
-								$par2 = new Par2info();
-								$par2->setData($parBinary);
-								if (!$par2->error) {
-									$parFiles = $par2->getFileList();
-									foreach ($parFiles as $file) {
-										if (isset($file['name']) && (preg_match('/.*part0*1\.rar$/iS', $file['name'], $matches) || preg_match('/(?!part0*1)\.rar$/iS', $file['name'], $matches) || preg_match('/\.001$/iS', $file['name'], $matches))) {
-											$foundName = preg_replace('/^(.*)(\.part0*1\.rar|\.rar|\.001)$/i', '\1', $file['name']);
-											$methodused = "Par file";
-											$this->determineCategory($rel, $foundName, $methodused);
-											break;
-										}
-									}
-								}
-							}
-							unset($parBinary);
-
-							if ($foundName != "")
-								break;
-						}
-						$nntp->doQuit();
-					}
-				}
-
-				///
-				///	This is a last ditch effort, build a ReleaseName from the Nfo
-				///
-				if ($nfo && ($foundName == "" || $methodused == 'Scene format no folder.')) {
-					//LastNfoAttempt
-					if (preg_match('/tt(\d{7})/i', $nfo, $matches) && $foundName == "") {
-						$movie = new Movie();
-						$imdbId = $matches[1];
-						$movCheck = $movie->fetchImdbProperties($imdbId);
-						$buffer = Utility::getUrl(['url' => 'http://akas.imdb.com/title/tt' . $imdbId . '/']);
-						if (!preg_match('/content\=\"video\.tv\_show\"/i', $buffer)) {
-							if (isset($movCheck['title'])) {
-								$foundName = $movCheck['title'];
-								if (!preg_match('/(19|20)\d{2}/i', $foundName)) {
-									$foundName = $foundName . "." . (isset($movCheck['year']) ? $movCheck['year'] : "");
-								}
-								if (preg_match('/language.*?\b([a-z0-9]+)\b/i', $nfo, $matches)) {
-									if (!preg_match('/English/i', $matches[1])) {
-										$foundName = $foundName . "." . $matches[1];
-									}
-								}
-								if (preg_match('/audio.*?\b(\w+)\b/i', $nfo, $matches)) {
-									if (preg_match('/(Chinese|German|Dutch|Spanish|Hebrew|Finnish|Norwegian)/i', $matches[1])) {
-										$foundName = $foundName . "." . $matches[1];
-									}
-								}
-								if (preg_match('/(video|resolution|video res).*?(1080|720|816|820|272|1280 @|528|1920)/i', $nfo, $matches)) {
-									if ($matches[2] == '1280 @') {
-										$matches[2] = '720';
-									}
-									if ($matches[2] == '1920') {
-										$matches[2] = '1080';
-									}
-									$foundName = $foundName . "." . $matches[2];
-								}
-								if (preg_match('/source.*?\b(DVD9|DVD5|BDRIP|DVD\-?RIP|BLURAY|BD)\b/i', $nfo, $matches)) {
-									if ($matches[1] == 'BD') {
-										$matches[1] = 'Bluray.x264';
-									}
-									$foundName = $foundName . "." . $matches[1];
-								}
-								if (preg_match('/(video|resolution|video res).*?(XVID|X264|WMV)/i', $nfo, $matches)) {
-									$foundName = $foundName . "." . $matches[2];
-								}
-								if (preg_match('/audio.*?\b(DTS|AC3)\b/i', $nfo, $matches)) {
-									$foundName = $foundName . "." . $matches[1];
-								}
-
-								$foundName = $foundName . "-NoGroup";
-								$methodused = "LastNfoAttempt";
-								$this->determineCategory($rel, $foundName, $methodused);
-							}
-						}
-					}
-				}
-
-				if ($foundName == '' && $this->verbose) {
-					echo "ReleaseID: 		" . $rel["rid"] . "\n" .
-						" Group: 		" . $rel["groupname"] . "\n" .
-						" Old Name: 		" . $rel["name"] . "\n" .
-						" Old SearchName: 	" . $rel["searchname"] . "\n" .
-						" Status: 		No new name found.\n\n";
-				}
-			}
-		}
-
-		if ($this->verbose) {
-			echo $this->releasestocheck . " releases checked\n" .
-				$this->nfosprocessed . " of " . $this->releasestocheck . " releases had nfo's processed\n" .
-				$this->parsprocessed . " of " . $this->releasestocheck . " releases had par's processed\n" .
-				$this->releasefilesprocessed . " of " . $this->releasestocheck . " releases had releasefiles processed\n" .
-				$this->numupdated . " of " . $this->releasestocheck . " releases " . ($this->releasestocheck > 0 ? (floor($this->numupdated / $this->releasestocheck * 100)) . "%" : "") . " changed\n";
-		}
-	}
-
-	/**
-	 * Work out the category based on the name, resets to null if no category matched.
-	 */
-	private function determineCategory($rel, &$foundName, &$methodused)
-	{
-		$categoryID = null;
-		$category = new Categorize();
-		$categoryID = $category->determineCategory($rel['groupname'], $foundName);
-		if (($methodused == 'a.b.hdtv.x264') && ($rel['groupname'] == 'alt.binaries.hdtv.x264')) {
-			$categoryID = Category::CAT_MOVIE_HD;
-		}
-		if (($categoryID == $rel['categoryid'] || $categoryID == '7900') || ($foundName == $rel['name'] || $foundName == $rel['searchname'])) {
-			$foundName = null;
-			$methodused = null;
-		} else {
-			$foundName = str_replace('&#x27;', '', trim(html_entity_decode($foundName)));
-			$name = str_replace(' ', '_', $foundName);
-			$searchname = str_replace('_', ' ', $foundName);
-			echo
-				PHP_EOL .
-				ColorCLI::headerOver('ReleaseID: 		') . ColorCLI::primaryOver($rel['rid']) . PHP_EOL .
-				ColorCLI::headerOver(' Group: 		') . ColorCLI::primaryOver($rel['groupname']) . PHP_EOL .
-				ColorCLI::headerOver(' Old Name: 		') . ColorCLI::primaryOver($rel['name']) . PHP_EOL .
-				ColorCLI::headerOver(' Old SearchName: 	') . ColorCLI::primaryOver($rel['searchname']) . PHP_EOL .
-				ColorCLI::headerOver(' New Name: 		') . ColorCLI::primaryOver($name) . PHP_EOL .
-				ColorCLI::headerOver(' New SearchName: 	') . ColorCLI::primaryOver($searchname) . PHP_EOL .
-				ColorCLI::headerOver(' Old Cat: 		') . ColorCLI::primaryOver($rel['categoryid']) . PHP_EOL .
-				ColorCLI::headerOver(' New Cat: 		') . ColorCLI::primaryOver($categoryID) . PHP_EOL .
-				ColorCLI::headerOver(' Method: 		') . ColorCLI::primaryOver($methodused) . PHP_EOL ;
-			if (!$this->echoonly) {
-				$this->pdo->queryExec(sprintf("update releases SET name = %s, searchname = %s, categoryid = %d, imdbid = NULL, rageid = -1, bookinfoid = NULL, musicinfoid = NULL, consoleinfoid = NULL WHERE releases.id = %d", $this->pdo->escapeString($name), $this->pdo->escapeString($searchname), $categoryID, $rel['rid']));
-			}
-			$this->numupdated++;
-		}
-	}
-
-	/**
-	 * Perform cleanup of names and categories.
-	 */
-	public function cleanup()
-	{
-		echo "PostPrc : Performing cleanup \n";
-		$catsql = "select id from groups";
-		$res = $this->pdo->query($catsql);
-		foreach ($res as $r2) {
-			$sql = sprintf("select r.id, name, searchname, categoryid, size, totalpart, musicinfoid, preid, groupid, rn.id as nfoid from releases r left outer join releasenfo rn ON rn.releaseid = r.id where groupid = %d", $r2['id']) . " %s ";
-			$unbuf = $this->pdo->queryDirect(sprintf($sql, ($this->limited ? " and r.adddate BETWEEN NOW() - INTERVAL 1 DAY AND NOW() " : "")));
-
-			while ($r = $this->pdo->getAssocArray($unbuf)) {
-				///
-				///This Section will remove releases based on specific criteria
-				///
-
-				//Remove releases if they include Parts info in the release name, as they are not full releases.
-				if (preg_match('/(\[|\()\d{1,4}\/\d{1,4}(\]|\))/', $r['name'])) {
-					$this->handleClean($r, "Modifying Release due to Parts in Release Name: " . $r['name'] . " - ", true);
-					continue;
-				}
-
-				//Remove releases if they include file of in  the release name, as they are not full releases.
-				if (preg_match('/file \d+ of \d+/i', $r['name'])) {
-					$this->handleClean($r, "Modifying Release due to File of in Release Name: " . $r['name'] . " - ", true);
-					continue;
-				}
-
-				//Remove releases if they include file of in  the release name, as they are not full releases.
-				if (preg_match('/\[\d+ of \d+\]/i', $r['name'])) {
-					$this->handleClean($r, "Modifying Release due to 23 of 23 in Release Name: " . $r['name'] . " - ", true);
-					continue;
-				}
-
-				//Remove releases if the name is numbers only.
-				if (preg_match('/^[0-9\.\ \-\_\[\]\(\)\@\#]+$/', $r['name'])) {
-					$this->handleClean($r, "Modifying Release because it is Number Only in Release Name: " . $r['name'] . " - ");
-					continue;
-				}
-
-				//Remove releases if it starts with a IMDBID.
-				if (preg_match('/^tt\d{6}/i', $r['name'])) {
-					$this->handleClean($r, "Modifying Release because it starts with a IMDB id: " . $r['name'] . " - ");
-					continue;
-				}
-
-				//Remove releases if the name contains http(s): .
-				if (preg_match('/http(s|)\:/i', $r['name'])) {
-					$this->handleClean($r, "Modifying Release because it contains HTTP in the Release Name: " . $r['name'] . " - ", true);
-					continue;
-				}
-
-				//Remove releases if the name contains http(s): .
-				// try stripos, its faster than preg_match
-				if (preg_match('/sample/i', $r['name']) && $r['categoryid'] > 5000 && $r['categoryid'] < 5999) {
-					$this->handleClean($r, "Modifying Release because it contains Sample in the Release Name: " . $r['name'] . " - ", true);
-					continue;
-				}
-
-				///
-				///End of Remove by name section
-				///
-
-				///
-				///This section will cleanup releases based on the category and things such as release size and release name length
-				///
-
-				switch ($r['categoryid']) {
-					//CONSOLE
-					case Category::CAT_GAME_NDS: //NDS
-						if ($r['size'] < 2000000) {
-							$this->handleClean($r, "Modifying Release Due to NDS Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 11 && !preg_match('/\([a-z]{2,3}\)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Due to NDS Release Length: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_PSP: //PSP
-						if ($r['size'] < 100000 && $r['name'] != 'DLC') {
-							$this->handleClean($r, "Modifying Release Due to PSP Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 13 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release PSP Due to Release Length: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_WII: //Wii
-						if ($r['size'] < 9000000 && $r['totalpart'] < 10) {
-							$this->handleClean($r, "Modifying Release Wii Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 14 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Wii ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_XBOX: //Xbox
-						if ($r['size'] < 1500000) {
-							$this->handleClean($r, "Modifying Release Xbox Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 14 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Xbox ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_XBOX360: //Xbox 360
-						if ($r['size'] < 50000000) {
-							$this->handleClean($r, "Modifying Release Xbox360 Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 14 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Xbox360 ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_WIIWARE: //WiiWare + VC
-						if ($r['size'] < 1000000 && $r['totalpart'] <= 1) {
-							$this->handleClean($r, "Modifying Release Wiiware Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 14 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Wiiware ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_XBOX360DLC: //Xbox 360DLC
-						if ($r['size'] < 50000000) {
-							//I Haven't figured out what to do for this group yet...
-							//handleClean($r,true);
-							continue;
-						}
-						if (strlen($r['name']) < 16 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Xbox 360 DLC ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_GAME_PS3: //PS3
-						if ($r['size'] < 100000) {
-							$this->handleClean($r, "Modifying Release Due to PS3 Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 14 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release PS3 Due to Release Length: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					//MOVIES
-					case Category::CAT_MOVIE_FOREIGN: //Foreign Movies
-						if (($r['size'] < 10000000 || $r['totalpart'] <= 6) && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release Foreign Movie Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 16 && !preg_match('/(fix|pack|\b((19|20)\d{2})\b)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Foreign Movies ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MOVIE_OTHER: //Other Movies
-						if (($r['size'] < 10000000 || $r['totalpart'] <= 6) && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release Other Movies Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 24 && !preg_match('/(fix|pack|\b((19|20)\d{2})\b)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Other Movies ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MOVIE_SD: //SD Movies
-						if (($r['size'] < 10000000 || $r['totalpart'] <= 6) && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release SD Movie Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 21 && !preg_match('/(fix|pack|\b((19|20)\d{2})\b)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release SD Movies ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MOVIE_HD: //HD Movies
-						if (($r['size'] < 60000000 || $r['totalpart'] <= 6) && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release HD Movie Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 21 && !preg_match('/(fix|pack|\b((19|20)\d{2})\b)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release HD Movies ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MOVIE_BLURAY: //Bluray Movies
-						if (($r['size'] < 60000000 || $r['totalpart'] <= 6) && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release Bluray Movie Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 21 && !preg_match('/(fix|pack|\b((19|20)\d{2})\b)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Bluray Movies ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MOVIE_3D: //3D Movies
-						if (($r['size'] < 60000000 || $r['totalpart'] <= 6) && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !preg_match('/(fix|pack|\b((19|20)\d{2})\b)/i', $r['name']) && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release 3D Movies ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					//AUDIO
-					case Category::CAT_MUSIC_MP3: // MP3
-						if (preg_match('/m3u/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release Audio MP3 Due to M3U in the name: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if ($r['size'] < 5000000) {
-							$this->handleClean($r, "Modifying Release Audio MP3 Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 25 && !preg_match('/(discography|\b((19|20)\d{2})\b)/i', $r['name']) && $r['musicinfoid'] == '-2' && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Audio MP3 ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MUSIC_VIDEO: // Video
-						if ($r['size'] < 10000000) {
-							$this->handleClean($r, "Modifying Release Audio Video Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !preg_match('/(discography|\b((19|20)\d{2})\b)/i', $r['name']) && $r['musicinfoid'] == '-2' && !$r['preid']) {
-							//echo "Modifying Release Audio Video ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r); not sure what to
-							continue;
-						}
-						break;
-
-					case Category::CAT_MUSIC_AUDIOBOOK: // Audiobook
-						if ($r['size'] < 10000000) {
-							$this->handleClean($r, "Modifying Release Audiobook Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !preg_match('/(discography|\b((19|20)\d{2})\b)/i', $r['name']) && $r['musicinfoid'] == '-2' && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Audiobook ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_MUSIC_LOSSLESS: // Lossless
-						if ($r['size'] < 10000000) {
-							//echo "Modifying Release Audio Lossless Size: ".$r['name']." - ";
-							//handleClean($r,true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !preg_match('/(discography|\b((19|20)\d{2})\b)/i', $r['name']) && $r['musicinfoid'] == '-2' && !$r['preid']) {
-							//echo "Modifying Release Audio Lossless ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r);
-							continue;
-						}
-						break;
-
-					// PC
-					case Category::CAT_PC_0DAY: // 0Day
-						if ($r['size'] < 1500000) {
-							$this->handleClean($r, "Modifying Release PC 0Day Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && $r['nfoid'] == null && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release PC 0Day ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_PC_ISO: // ISO
-						if ($r['size'] < 1000000) {
-							$this->handleClean($r, "Modifying Release PC ISO Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release PC ISO ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_PC_MAC: // Mac
-						if ($r['size'] < 500000) {
-							$this->handleClean($r, "Modifying Release PC Mac Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							//echo "Modifying Release PC Mac ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r); Not sure about this yet
-							continue;
-						}
-						break;
-
-					case Category::CAT_PC_MOBILEOTHER: // Mobile Other
-						if ($r['size'] < 500000) {
-							$this->handleClean($r, "Modifying Release PC Mobile Other Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release PC Mobile Other ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_PC_GAMES: // Games
-						if ($r['size'] < 1000000) {
-							$this->handleClean($r, "Modifying Release PC Games Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							//echo "Modifying Release PC Games ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r); Not sure about this yet
-
-							continue;
-						}
-						break;
-
-					case Category::CAT_PC_MOBILEIOS: // Ios
-						if ($r['size'] < 600000) {
-							$this->handleClean($r, "Modifying Release PC Ios Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 21 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release PC Ios ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_PC_MOBILEANDROID: // Android
-						if ($r['size'] < 600000) {
-							$this->handleClean($r, "Modifying Release PC Android Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							//echo "Modifying Release PC Android ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r); Not sure about this yet
-							continue;
-						}
-						break;
-
-					// TV
-					case Category::CAT_TV_FOREIGN: // Foreign
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV Foreign Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 18 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV Foreign ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_TV_SD: // SD
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV SD Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV SD ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_TV_HD: // HD
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV HD Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV HD ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_TV_OTHER: // Other
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV Other Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV Other ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_TV_SPORT: // Sport
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV Sport Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 19 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV Sport ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_TV_ANIME: // Anime
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV Anime Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV Anime ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_TV_DOCU: // Docu
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release TV Docu Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release TV Docu ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					// XXX
-					case Category::CAT_XXX_DVD: // DVD
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release XXX DVD Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release XXX DVD ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_XXX_WMV: // WMV
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release XXX WMV Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 20 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release XXX WMV ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_XXX_XVID: // XVID
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release XXX XVID Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 14 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release XXX XVID ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_XXX_X264: // X264
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release XXX X264 Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release XXX X264 ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_XXX_PACK: // PACK
-						if ($r['size'] < 20000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release XXX PACK Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release XXX PACK ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_XXX_IMAGESET: // IMAGESET
-						if ($r['size'] < 3000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release XXX IMAGESET Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release XXX IMAGESET ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_BOOK_EBOOK: // Ebook
-						if ($r['size'] < 50000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release Misc Ebook Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 12 && !$r['preid']) {
-							$this->handleClean($r, "Modifying Release Misc Ebook ReleaseLEN: " . $r['name'] . " - ");
-							continue;
-						}
-						break;
-
-					case Category::CAT_BOOK_COMICS: // Comic
-						if ($r['size'] < 50000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							//echo "Modifying Release MISC Comic Size: ".$r['name']." - ";
-							//handleClean($r,true);
-							continue;
-						}
-						if (strlen($r['name']) < 7 && !$r['preid']) {
-							//echo "Modifying Release MISC Comic ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r);
-							continue;
-						}
-						break;
-
-					//OTHER
-					case Category::CAT_MISC_OTHER:
-						if ($r['size'] < 1000000 && !preg_match('/(fix|pack)/i', $r['name'])) {
-							$this->handleClean($r, "Modifying Release Misc Other Size: " . $r['name'] . " - ", true);
-							continue;
-						}
-						if (strlen($r['name']) < 15 && !$r['preid']) {
-							//echo "Modifying Release MISC Other ReleaseLEN: ".$r['name']." - ";
-							//handleClean($r); Not sure what to do with this
-							continue;
-						}
-						break;
-				}
-				///
-				///End of Remove by name section
-				///
-
-			}
-
-			$this->doClean();
-			gc_collect_cycles();
-		}
-	}
-
-	/**
-	 * Stores reason code and id of item to be cleaned.
-	 */
-	private function handleClean($row, $reason = "", $forceNuke = false)
-	{
-		if (!$forceNuke) {
-			$this->cleanup['misc'][$row['id']] = true;
-			if ($this->verbose) echo $reason . "Moving to Misc Other\n";
-		} else {
-			$this->cleanup['nuke'][$row['id']] = true;
-			if ($this->verbose) echo $reason . "Removing Release\n";
-		}
-	}
-
-	/**
-	 * Perform cleanup of all items in arrays.
-	 */
-	private function doClean()
-	{
-
-		$this->numnuked += count($this->cleanup['nuke']);
-		$this->nummiscd += count($this->cleanup['misc']);
-
-		if (!$this->echoonly) {
-			$releases = new \Releases(['Settings' => $this->pdo]);
-			foreach (array_keys($this->cleanup['nuke']) as $id) {
-				$releases->delete($id);
-			}
-
-			if (count($this->cleanup['misc'])) {
-				$sql = 'update releases set categoryid = ' . Category::CAT_MISC_OTHER . ' where categoryid != ' . Category::CAT_MISC_OTHER . ' and id in (' . implode(array_keys($this->cleanup['misc']), ',') . ')';
-				$this->pdo->queryExec($sql);
-			}
-		}
-
-		$this->cleanup = array('nuke' => array(), 'misc' => array());
-	}
-
-	/**
-	 * Removes funky chars from beginning and end of string
-	 */
-	public function removeSpecial()
-	{
-		$sql = "select id, searchname from releases where 1 = 1 ";
-		$sql .= ($this->limited ? "AND adddate BETWEEN NOW() - INTERVAL 1 DAY AND NOW()" : "");
-		$sql .= " order by postdate desc";
-
-		$res = $this->pdo->queryDirect($sql);
-		while ($r = $this->pdo->getAssocArray($res)) {
-			$oldname = $r['searchname'];
-
-			if (preg_match('/^(\:|\"|\-| )+/', $r['searchname'])) {
-				while (preg_match('/^(\:|\"|\-| |\_)+/', $r['searchname'])) {
-					$r['searchname'] = substr($r['searchname'], 1);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-			if (preg_match('/^000\-/', $r['searchname'])) {
-				while (preg_match('/^000\-/', $r['searchname'])) {
-					$r['searchname'] = substr($r['searchname'], 4);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-			if (preg_match('/(\:|\"|\-| |\/)$/', $r['searchname'])) {
-				while (preg_match('/(\:|\"|\-| |\/)$/', $r['searchname'])) {
-					$r['searchname'] = substr($r['searchname'], 0, -1);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-			if (preg_match('/\"/', $r['searchname'])) {
-				while (preg_match('/\"/', $r['searchname'])) {
-					$r['searchname'] = str_replace('"', '', $r['searchname']);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-			if (preg_match('/\-\d{1}$/', $r['searchname'])) {
-				while (preg_match('/\-\d{1}$/', $r['searchname'])) {
-					$r['searchname'] = preg_replace('/\-\d{1}$/', '', $r['searchname']);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-			if (preg_match('/\!+.*?mom.*?\!+/i', $r['searchname'])) {
-				while (preg_match('/\!+.*?mom.*?\!+/i', $r['searchname'])) {
-					$r['searchname'] = preg_replace('/\!+.*?mom.*?\!+/i', '', $r['searchname']);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-			if (preg_match('/(\\/)/i', $r['searchname'])) {
-				while (preg_match('/(\\/)/i', $r['searchname'])) {
-					$r['searchname'] = preg_replace('/(\\/)/i', '', $r['searchname']);
-				}
-				$this->updateName($this->pdo, $r['id'], $oldname, $r['searchname']);
-			}
-		}
-	}
-
-	/**
-	 * update a release name
-	 *
-	 * @param DB $pdo
-	 * @param    $id
-	 * @param    $oldname
-	 * @param    $newname
-	 */
-	private function updateName(DB $pdo, $id, $oldname, $newname)
-	{
-		if ($this->verbose)
-			echo sprintf("OLD : %s\nNEW : %s\n\n", $oldname, $newname);
-
-		if (!$this->echoonly)
-			$this->pdo->queryExec(sprintf("update releases set name=%s, searchname = %s WHERE id = %d", $this->pdo->escapeString($newname), $this->pdo->escapeString($newname), $id));
-	}
-}
diff --git a/lib/copy_this/www/lib/postprocess.php b/lib/copy_this/www/lib/postprocess.php
deleted file mode 100644
index 502c58a42..000000000
--- a/lib/copy_this/www/lib/postprocess.php
+++ /dev/null
@@ -1,1020 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/rarinfo/archiveinfo.php");
-require_once(WWW_DIR."/lib/releasefiles.php");
-require_once(WWW_DIR."/lib/releaseextra.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-require_once(WWW_DIR."/lib/tvrage.php");
-require_once(WWW_DIR."/lib/thetvdb.php");
-require_once(WWW_DIR."/lib/anidb.php");
-require_once(WWW_DIR."/lib/movie.php");
-require_once(WWW_DIR."/lib/music.php");
-require_once(WWW_DIR."/lib/console.php");
-require_once(WWW_DIR."/lib/nfo.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/book.php");
-require_once(WWW_DIR."/lib/Books.php");
-require_once(WWW_DIR."/lib/nzbinfo.php");
-require_once(WWW_DIR."/lib/spotnab.php");
-require_once(WWW_DIR."/lib/parsing.php");
-
-/**
- * This class handles all post processing performed during update_releases process.
- */
-class PostProcess
-{
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $echooutput
-	 */
-	public function __construct($echooutput = false)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);;
-		$s = new \Sites();
-		$this->site = $s->get();
-		$this->pdo = new \DB();
-		$this->mediafileregex = 'AVI|VOB|MKV|MP4|TS|WMV|MOV|M4V|F4V|MPG|MPEG|M2TS';
-		$this->audiofileregex = 'MP3|AAC|OGG';
-		$this->mp3SavePath = WWW_DIR.'covers/audio/';
-	}
-
-	/**
-	 * Perform all post processing.
-	 */
-	public function processAll()
-	{
-		$this->processAdditional();
-		$this->processNfos();
-		$this->processSpotNab();
-		$this->processUnwanted();
-		$this->processMovies();
-		$this->processMusic();
-		$this->processBooks();
-		$this->processGames();
-		$this->processTv();
-		$this->processMusicFromMediaInfo();
-		$this->processOtherMiscCategory();
-		$this->processUnknownCategory();
-	}
-
-	public function processUnwanted()
-	{
-		$r = new Releases;
-		$currTime_ori = $this->pdo->queryOneRow("SELECT NOW() as now");
-
-		//
-		// Delete any passworded releases
-		//
-		if($this->site->deletepasswordedrelease == 1)
-		{
-			echo "PostPrc : Removing unwanted releases\n";
-			$result = $this->pdo->query("select id from releases where passwordstatus > 0");
-			foreach ($result as $row)
-				$r->delete($row["id"]);
-		}
-
-		//
-		// Delete any releases which are older than site's release retention days
-		//
-		if($this->site->releaseretentiondays != 0)
-		{
-			echo "PostPrc : Deleting releases older than ".$this->site->releaseretentiondays." days\n";
-
-			$result = $this->pdo->query(sprintf("select id from releases where postdate < %s - interval %d day", $this->pdo->escapeString($currTime_ori["now"]), $this->site->releaseretentiondays));
-			foreach ($result as $row)
-				$r->delete($row["id"]);
-		}
-
-		//
-		// Delete any audiopreviews older than site->audiopreviewprune days
-		//
-		if($this->site->audiopreviewprune > 0)
-		{
-			$result = $this->pdo->query(sprintf("select guid from releases where categoryid in (select id from category where parentid = ".Category::CAT_PARENT_MUSIC.") and haspreview = 2 and adddate < %s - interval %d day", $this->pdo->escapeString($currTime_ori["now"]), $this->site->audiopreviewprune));
-
-            if (sizeof($result) > 0)
-            {
-                echo "PostPrc : Deleting ".count($result)." audio previews older than ".$this->site->audiopreviewprune." days\n";
-                foreach ($result as $row)
-                {
-                    $r->updateHasPreview($row["guid"], 0);
-                    $this->deleteAudioSample($row["guid"]);
-                }
-            }
-		}
-
-		//
-		// Delete any releases suspected of being spam/virus
-		//
-		if($this->site->removespam != 0)
-		{
-			$spamIDs = array();
-
-			//
-			// all releases where the only file inside the rars is *.exe and they are not in the PC category
-			//
-			$sql = "select releasefiles.releaseid as id from releasefiles inner join  ( select releaseid, count(*) as totnum from  releasefiles group by releaseid ) x on x.releaseid = releasefiles.releaseid and x.totnum = 1 inner join releases on releases.id = releasefiles.releaseid left join releasenfo on releasenfo.releaseid = releases.id where (releasefiles.name like '%.exe' or releasefiles.name like '%.scr') and (releases.categoryid not in (select id from category where parentid = ".Category::CAT_PARENT_PC.") or (releases.categoryid in (select id from category where parentid = ".Category::CAT_PARENT_PC.") and releasenfo.id is null)) group by releasefiles.releaseid";
-			$result = $this->pdo->query($sql);
-			$spamIDs = array_merge($result, $spamIDs);
-
-			//
-			// all releases containing exe not in permitted categories
-			//
-			if ($this->site->exepermittedcategories != '')
-			{
-				$sql = sprintf("select releasefiles.releaseid as id from releasefiles  inner join releases on releases.id = releasefiles.releaseid  left join releasenfo on releasenfo.releaseid = releases.id  where releasefiles.name like '%%.exe'  and releases.categoryid not in (%s)  group by releasefiles.releaseid", $this->site->exepermittedcategories);
-				$result = $this->pdo->query($sql);
-				$spamIDs = array_merge($result, $spamIDs);
-			}
-
-			//
-			// delete all releases which contain a file with password.url in it
-			//
-			$sql = "select distinct releasefiles.releaseid as id from releasefiles where name = 'password.url'";
-			$result = $this->pdo->query($sql);
-			$spamIDs = array_merge($result, $spamIDs);
-
-			//
-			// all releases where the only file inside the rars is *.rar
-			//
-			$sql = "select releasefiles.releaseid as id from releasefiles  inner join  ( select releaseid, count(*) as totnum from releasefiles group by releaseid ) x on x.releaseid = releasefiles.releaseid and x.totnum = 1 inner join releases on releases.id = releasefiles.releaseid where releasefiles.name like '%.rar' group by releasefiles.releaseid";
-			$result = $this->pdo->query($sql);
-			$spamIDs = array_merge($result, $spamIDs);
-
-			//
-			// all audio which contains a file with .exe in
-			//
-			$sql = "select distinct r.id from releasefiles rf inner join releases r on r.id = rf.releaseid and r.categoryid in (select id from category where parentid = ".Category::CAT_PARENT_MUSIC.") where (rf.name like '%.exe' or rf.name like '%.bin')";
-			$result = $this->pdo->query($sql);
-			$spamIDs = array_merge($result, $spamIDs);
-
-			if (count($spamIDs) > 0)
-			{
-				echo "PostPrc : Deleting ".count($spamIDs)." spam releases\n" ;
-				foreach ($spamIDs as $row)
-					$r->delete($row["id"]);
-			}
-		}
-	}
-
-	/**
-	 * Process nfo files
-	 */
-	public function processNfos()
-	{
-		if ($this->site->lookupnfo == 1)
-		{
-			$nfo = new Nfo($this->echooutput);
-			$nfo->processNfoFiles(500);
-		}
-	}
-
-	/**
-	 * Process Global IDs
-	 */
-	public function processSpotNab()
-	{
-		$spotnab = new SpotNab();
-		$processed = $spotnab->processGID(500);
-        if ($processed > 0)
-		    printf("PostPrc : Updating GID in releases table %d release(s) updated\n", $processed);
-		$spotnab->auto_post_discovery();
-		$spotnab->fetch_discovery();
-		$spotnab->fetch();
-		$spotnab->post();
-		$spotnab->auto_clean();
-	}
-
-	/**
-	 * Lookup imdb if enabled
-	 */
-	public function processMovies()
-	{
-		if ($this->site->lookupimdb == 1)
-		{
-			$movie = new Movie($this->echooutput);
-			$movie->processMovieReleases();
-		}
-	}
-
-	/**
-	 * Lookup music if enabled
-	 */
-	public function processMusic()
-	{
-		if ($this->site->lookupmusic == 1)
-		{
-			$music = new Music($this->echooutput);
-			$music->processMusicReleases();
-		}
-	}
-
-	/**
-	 * Lookup book if enabled
-	 */
-	public function processBooks()
-	{
-		if ($this->site->lookupbooks == 1)
-		{
-			$book = new Book($this->echooutput);
-			$book->processBookReleases();
-		}
-	}
-
-	/**
-	 * Lookup games if enabled
-	 */
-	public function processGames()
-	{
-		if ($this->site->lookupgames == 1)
-		{
-			$console = new Console($this->echooutput);
-			$console->processConsoleReleases();
-		}
-	}
-
-	/**
-	 * Work out any categories which were not assigned by regex or determinecategory
-	 * Done in post process as releasevideo/audio will have been performed by now.
-	 */
-	public function processUnknownCategory()
-	{
-		$sql = sprintf("select id from releases where categoryid = %d", Category::CAT_NOT_DETERMINED);
-		$result = $this->pdo->query($sql);
-		$rescount = sizeof($result);
-		if ($rescount > 0)
-		{
-			echo "PostPrc : Attempting to fix ".$rescount." uncategorised release(s)\n";
-
-			$sql = sprintf("update releases inner join releasevideo rv on rv.releaseid = releases.id set releases.categoryid = %d where imdbid is not null and categoryid = %d and videocodec = 'XVID'", Category::CAT_MOVIE_SD, Category::CAT_NOT_DETERMINED);
-			$this->pdo->queryExec($sql);
-
-			$sql = sprintf("update releases inner join releasevideo rv on rv.releaseid = releases.id set releases.categoryid = %d where imdbid is not null and categoryid = %d and videocodec = 'V_MPEG4/ISO/AVC'", Category::CAT_MOVIE_HD, Category::CAT_NOT_DETERMINED);
-			$this->pdo->queryExec($sql);
-
-			$sql = sprintf("update releases set categoryid = %d where categoryid = %d", Category::CAT_MISC_OTHER, Category::CAT_NOT_DETERMINED);
-			$this->pdo->queryExec($sql);
-		}
-	}
-
-	/**
-	 * Process all TV related releases which will assign their series/episode/rage data
-	 */
-	public function processTv()
-	{
-		if ($this->site->lookupanidb == 1)
-		{
-			$anidb = new AniDB($this->echooutput);
-			$anidb->animetitlesUpdate();
-			$anidb->processAnimeReleases();
-		}
-
-		if ($this->site->lookuptvrage == 1)
-		{
-			$tvrage = new TVRage($this->echooutput);
-			$tvrage->processTvReleases(($this->site->lookuptvrage==1));
-		}
-
-		if ($this->site->lookupthetvdb == 1)
-		{
-			$thetvdb = new TheTVDB($this->echooutput);
-			$thetvdb->processReleases();
-		}
-	}
-
-	/**
-	 * Process releases without a proper name
-	 */
-	public function processOtherMiscCategory()
-	{
-        $p = null;
-        if($this->site->updatecleanup == 1)
-        {
-            $p = new Parsing(false, true, false);
-            $p->cleanup();
-        }
-
-        if($this->site->updateparsing == 1)
-        {
-            if ($p == null)
-                $p = new Parsing(false, true, false);
-            $p->process();
-        }
-
-        if($this->site->removespecial == 1)
-        {
-            if ($p == null)
-                $p = new Parsing(false, true, false);
-            $p->removeSpecial();
-        }
- 	}
-
-	/**
-	 * Check for passworded releases, RAR contents and Sample/Media info
-	 */
-	public function processAdditional($numtoProcess = 100)
-	{
-		require_once(WWW_DIR."/lib/nntp.php");
-
-		$maxattemptstocheckpassworded = 5;
-		$processVideoSample = ($this->site->ffmpegpath != '') ? true : false;
-		$processMediainfo = ($this->site->mediainfopath != '') ? true : false;
-		$processPasswords = ($this->site->unrarpath != '') ? true : false;
-		$processAudioSample = ($this->site->saveaudiopreview == 1) ? true : false;
-
-		$tmpPath = $this->site->tmpunrarpath;
-		if (substr($tmpPath, -strlen( '/' ) ) != '/')
-		{
-			$tmpPath = $tmpPath.'/';
-		}
-
-		if (!file_exists($tmpPath))
-			mkdir($tmpPath, 0766, true);
-
-		$nntp = new Nntp;
-		$nzb = new Nzb;
-
-		//
-		// Get out all releases which have not been checked more than max attempts for password.
-		//
-        $sql = sprintf("select r.id, r.guid, r.name, c.disablepreview from releases r
-			left join category c on c.id = r.categoryid
-			where (r.passwordstatus between %d and -1)
-			or (r.haspreview = -1 and c.disablepreview = 0) order by r.postdate desc limit %d ", ($maxattemptstocheckpassworded + 1) * -1, $numtoProcess);
-		$result = $this->pdo->query($sql);
-
-		$iteration = $rescount = sizeof($result);
-		if ($rescount > 0)
-		{
-			echo "PostPrc : Performing additional post processing on last ".$rescount." releases ...";
-			$nntpconnected = false;
-
-			foreach ($result as $rel)
-			{
-				echo $iteration--.".";
-
-				// Per release defaults
-                $passStatus = array(Releases::PASSWD_NONE);
-                $blnTookMediainfo = false;
-                $blnTookSample = ($rel['disablepreview'] == 1) ? true : false; //only attempt sample if not disabled
-
-                if ($blnTookSample)
-                    $this->pdo->queryExec(sprintf("update releases set haspreview = 0 where id = %d", $rel['id']));
-
-                //
-                // Go through the binaries for this release looking for a rar, a sample, and a mediafile
-                //
-                $nzbInfo = new nzbInfo;
-                $norar = 0;
-
-                // only load nzbs and check for rar files if we are doing something with them.
-                if ($processVideoSample || $processMediainfo || $processPasswords || $processAudioSample)
-                {
-                    $nzbfile = $nzb->getNZBPath($rel['guid'], $this->site->nzbpath);
-                    if (!$nzbInfo->loadFromFile($nzbfile))
-                    {
-                        continue;
-                    }
-
-                    foreach($nzbInfo->nzb as $nzbsubject)
-                    {
-                        if (preg_match("/\w\.r00/i", $nzbsubject['subject']))
-                            $norar= 1;
-                    }
-                }
-
-				// attempt to process video sample file
-				if(!empty($nzbInfo->samplefiles) && $processVideoSample && $blnTookSample === false)
-				{
-					$sampleFile = $nzbInfo->samplefiles[0]; //first detected sample
-					$sampleMsgids = array_slice($sampleFile['segments'], 0, 1); //get first segment, increase to get more of the sample
-					$sampleGroup = $sampleFile['groups'][0];
-
-					//echo "PostPrc : Fetching ".implode($sampleMsgids, ', ')." from {$sampleGroup}\n";
-					if (!$nntpconnected)
-						$nntpconnected = $nntp->doConnect();
-
-					$sampleBinary = $nntp->getMessages($sampleGroup, $sampleMsgids);
-					if ($sampleBinary === false)
-						echo "\nPostPrc : Couldnt fetch sample\n";
-					else
-					{
-						$samplefile = $tmpPath.'sample.avi';
-
-						file_put_contents($samplefile, $sampleBinary);
-
-						$blnTookSample = $this->getSample($tmpPath, $this->site->ffmpegpath, $rel['guid']);
-						if ($blnTookSample)
-							$this->updateReleaseHasPreview($rel['guid']);
-
-						unlink($samplefile);
-					}
-					unset($sampleBinary);
-				}
-
-				// attempt to process loose media file
-				if(!empty($nzbInfo->mediafiles) && (($processVideoSample && $blnTookSample === false) || $processMediainfo))
-				{
-					$mediaFile = $nzbInfo->mediafiles[0]; //first detected media file
-					$mediaMsgids = array_slice($mediaFile['segments'], 0, 2); //get first two segments
-					$mediaGroup = $mediaFile['groups'][0];
-
-					//echo "PostPrc : Fetching ".implode($mediaMsgids, ', ')." from {$mediaGroup}\n";
-					if (!$nntpconnected)
-						$nntpconnected = $nntp->doConnect();
-
-					$mediaBinary = $nntp->getMessages($mediaGroup, $mediaMsgids);
-					if ($mediaBinary === false)
-						echo "\nPostPrc : Couldnt fetch media file\n";
-					else
-					{
-						$mediafile = $tmpPath.'sample.avi';
-
-						file_put_contents($mediafile, $mediaBinary);
-
-						if ($processVideoSample && $blnTookSample === false)
-						{
-							$blnTookSample = $this->getSample($tmpPath, $this->site->ffmpegpath, $rel['guid']);
-							if ($blnTookSample)
-								$this->updateReleaseHasPreview($rel['guid']);
-						}
-
-						if ($processMediainfo)
-							$blnTookMediainfo = $this->getMediainfo($tmpPath, $this->site->mediainfopath, $rel['id']);
-
-						unlink($mediafile);
-					}
-					unset($mediaBinary);
-				}
-
-				// attempt to process audio sample file
-				if(!empty($nzbInfo->audiofiles) && $processAudioSample && $blnTookSample === false)
-				{
-					$audioFile = $nzbInfo->audiofiles[0]; //first detected audio file
-					$audioMsgids = array_slice($audioFile['segments'], 0, 1); //get first segment
-					$audioGroup = $audioFile['groups'][0];
-
-					//echo "PostPrc : Fetching ".implode($audioMsgids, ', ')." from {$audioGroup}\n";
-					if (!$nntpconnected)
-						$nntpconnected = $nntp->doConnect();
-
-					$audioBinary = $nntp->getMessages($audioGroup, $audioMsgids);
-					if ($audioBinary === false)
-						echo "\nPostPrc : Couldnt fetch audio sample\n";
-					else
-					{
-						$audiofile = $tmpPath.'sample.mp3';
-
-						file_put_contents($audiofile, $audioBinary);
-
-						$blnTookSample = $this->getAudioSample($tmpPath, $rel['guid']);
-						if ($blnTookSample !== false)
-							$this->updateReleaseHasPreview($rel['guid'], 2);
-
-						if ($processMediainfo)
-							$blnTookMediainfo = $this->getMediainfo($tmpPath, $this->site->mediainfopath, $rel['id']);
-
-						if ($this->site->lamepath != "")
-							$this->lameAudioSample($this->site->lamepath, $rel['guid']);
-
-						unlink($audiofile);
-					}
-					unset($audioBinary);
-				}
-
-				if (!empty($nzbInfo->rarfiles) && ($this->site->checkpasswordedrar > 0 || (($processVideoSample || $processAudioSample) && $blnTookSample === false) || $processMediainfo))
-				{
-					$mysqlkeepalive = 0;
-					foreach($nzbInfo->rarfiles as $rarFile)
-					{
-						//dont process any more rars if a passworded rar has been detected and the site is set to automatically delete them
-						if ($this->site->deletepasswordedrelease == 1 && max($passStatus) == Releases::PASSWD_RAR)
-						{
-							echo "-Skipping processing of rar {$rarFile['subject']} as this release has already been marked as passworded.\n";
-							continue;
-						}
-
-						$rarMsgids = array_slice($rarFile['segments'], 0, 1); //get first segment
-						$rarGroup = $rarFile['groups'][0];
-
-						//echo "PostPrc : Fetching ".implode($rarMsgids, ', ')." from {$rarGroup} (".++$mysqlkeepalive.")\n";
-						if (!$nntpconnected)
-							$nntpconnected = $nntp->doConnect();
-
-						$fetchedBinary = $nntp->getMessages($rarGroup, $rarMsgids);
-						if ($fetchedBinary === false)
-						{
-							//echo "\nPostPrc : Failed fetching rar file\n";
-							$this->pdo->queryExec(sprintf("update releases set passwordstatus = passwordstatus - 1 where id = %d", $rel['id']));
-							continue;
-						}
-						else
-						{
-							$relFiles = $this->processReleaseFiles($fetchedBinary, $rel['id']);
-
-							if ($this->site->checkpasswordedrar > 0 && $processPasswords)
-							{
-								$passStatus[] = $this->processReleasePasswords($fetchedBinary, $tmpPath, $this->site->unrarpath, $this->site->checkpasswordedrar);
-							}
-
-							// we need to unrar the fetched binary if checkpasswordedrar wasnt 2
-							if ($this->site->checkpasswordedrar < 2 && $processPasswords)
-							{
-								$rarfile = $tmpPath.'rarfile.rar';
-								file_put_contents($rarfile, $fetchedBinary);
-								$execstring = '"'.$this->site->unrarpath.'" e -ai -ep -c- -id -r -kb -p- -y -inul "'.$rarfile.'" "'.$tmpPath.'"';
-								$output = runCmd($execstring, false, true);
-								unlink($rarfile);
-							}
-
-							if ($processVideoSample && $blnTookSample === false)
-							{
-								$blnTookSample = $this->getSample($tmpPath, $this->site->ffmpegpath, $rel['guid']);
-								if ($blnTookSample)
-									$this->updateReleaseHasPreview($rel['guid']);
-							}
-
-							$blnTookAudioSample = false;
-							if ($processAudioSample && $blnTookSample === false)
-							{
-								$blnTookSample = $this->getAudioSample($tmpPath, $rel['guid']);
-								if ($blnTookSample)
-								{
-									$blnTookAudioSample = true;
-									$this->updateReleaseHasPreview($rel['guid'], 2);
-								}
-							}
-
-							if ($processMediainfo && $blnTookMediainfo === false)
-							{
-								$blnTookMediainfo = $this->getMediainfo($tmpPath, $this->site->mediainfopath, $rel['id']);
-							}
-
-							//
-							// Has to be done after mediainfo
-							//
-							if ($blnTookAudioSample && $this->site->lamepath != "")
-								$this->lameAudioSample($this->site->lamepath, $rel['guid']);
-
-							if ($mysqlkeepalive % 25 == 0)
-								$this->pdo->query("select 1");
-						}
-
-						//clean up all files
-						foreach(glob($tmpPath.'*') as $v)
-						{
-							unlink($v);
-						}
-
-					} //end foreach msgid
-				}
-				elseif(empty($nzbInfo->rarfiles) && $norar == 1)
-				{
-					$passStatus[] = Releases::PASSWD_POTENTIAL;
-				}
-
-				$hpsql = '';
-				if (!$blnTookSample)
-					$hpsql = ', haspreview = 0';
-
-				$sql = sprintf("update releases set passwordstatus = %d %s where id = %d", max($passStatus), $hpsql, $rel["id"]);
-				$this->pdo->queryExec($sql);
-
-			} //end foreach result
-
-			if ($nntpconnected)
-			{
-				$nntp->doQuit();
-			}
-
-			echo "\n";
-		}
-	}
-
-	/**
-	 * Work out all files contained inside a rar
-	 */
-	public function processReleaseFiles($fetchedBinary, $relid)
-	{
-		$retval = array();
-        $rar = new ArchiveInfo();
-		$rf = new ReleaseFiles;
-
-        $rar->setData($fetchedBinary, true);
-        if ($rar->error)
-        {
-            return false;
-        }
-
-        $files = $rar->getArchiveFileList();
-        if ($files !== false)
-        {
-            foreach ($files as $file)
-            {
-                if (isset($file['name']))
-                {
-                    $rf->add($relid, utf8_encode($file['name']), (isset($file['size']) ? $file['size'] : ""), (isset($file['date']) ? $file['date'] : ""), (isset($file['pass']) ? $file['pass'] : "") );
-                    $retval[] = $file['name'];
-                }
-            }
-        }
-
-		unset($fetchedBinary);
-		return $retval;
-	}
-
-
-	/**
-	 * Work out if a release is passworded
-	 */
-	public function processReleasePasswords($fetchedBinary, $tmpPath, $unrarPath, $checkpasswordedrar)
-	{
-		$passStatus = Releases::PASSWD_NONE;
-        $potentiallypasswordedfileregex = "/\.(ace|cab|tar|gz|url)$/i";
-        $definetlypasswordedfileregex = "/password\.url/i";
-        $rar = new ArchiveInfo();
-		$filecount = 0;
-
-		$rarfile = $tmpPath.'rarfile.rar';
-		file_put_contents($rarfile, $fetchedBinary);
-
-		if ($rar->open($rarfile))
-		{
-            $rarsummary = $rar->getSummary(true, false);
-            if ((isset($rarsummary["is_encrypted"]) && $rarsummary["is_encrypted"] != 0) || !empty($rar->isEncrypted))
-            {
-                $passStatus = Releases::PASSWD_RAR;
-            }
-			else
-			{
-				$files = $rar->getArchiveFileList();
-
-				if ($files !== false)
-				{
-					foreach ($files as $file)
-					{
-						if (isset($file['pass']) && isset($file["name"]))
-						{
-							$filecount++;
-							//
-							// individual file rar passworded
-							//
-							if ($file['pass'] == true || preg_match($definetlypasswordedfileregex, $file["name"]))
-							{
-								$passStatus = Releases::PASSWD_RAR;
-							}
-
-							//
-							// individual file looks suspect
-							//
-							elseif (preg_match($potentiallypasswordedfileregex, $file["name"]) && $passStatus != Releases::PASSWD_RAR)
-							{
-								$passStatus = Releases::PASSWD_POTENTIAL;
-							}
-						}
-					}
-				}
-
-
-				//
-				// Deep Checking
-				//
-				if ($checkpasswordedrar == 2)
-				{
-
-					$israr = $this->isRar($rarfile);
-					for ($i=0;$i<sizeof($israr);$i++)
-					{
-						if (preg_match('/\\\\/',$israr[$i]))
-						{
-							$israr[$i] = ltrim((strrchr($israr[$i],"\\")),"\\");
-						}
-					}
-
-					$execstring = '"'.$unrarPath.'" e -ai -ep -c- -id -r -kb -p- -y -inul "'.$rarfile.'" "'.$tmpPath.'"';
-					$output = runCmd($execstring, false, true);
-
-					// delete the rar
-					@unlink($rarfile);
-
-					// ok, now we have all the files extracted from the rar into the tempdir and
-					// the rar file deleted, now to loop through the files and recursively unrar
-					// if any of those are rars, we don't trust their names and we test every file
-					// for the rar header
-					for ($i=0;$i<sizeof($israr);$i++)
-					{
-						// even though its in the rar filelist there may not have been enough data
-						// to extract this file so dont attempt to read the file if it doesnt exist
-						if (!file_exists($tmpPath.$israr[$i]))
-							continue;
-
-						$tmp = $this->isRar($tmpPath.$israr[$i]);
-
-						if (is_array($tmp))
-						// it's a rar
-						{
-							for ($x=0;$x<sizeof($tmp);$x++)
-							{
-								if (preg_match('/\\\\/',$tmp[$x]))
-								{
-									$tmp[$x] = ltrim((strrchr($tmp[$x],"\\")),"\\");
-								}
-								$israr[] = $tmp[$x];
-							}
-
-							$execstring = '"'.$unrarPath.'" e -ai -ep -c- -id -r -kb -p- -y -inul "'.$tmpPath.$israr[$i].'" "'.$tmpPath.'"';
-							$output2 = runCmd($execstring, false, true);
-							@unlink($tmpPath.$israr[$i]);
-						}
-						else
-						{
-							if ($tmp == 1 || $tmp == 2)
-							{
-								$passStatus = Releases::PASSWD_RAR;
-								@unlink($tmpPath.$israr[$i]);
-							}
-						}
-						unset($tmp);
-					}
-				}
-			}
-		}
-		@unlink($rarfile);
-		unset($fetchedBinary);
-		return $passStatus;
-	}
-
-	/**
-	 * Work out if a rar is passworded
-	 */
-	public function isRar($rarfile)
-	{
-		// returns 0 if not rar
-		// returns 1 if encrypted rar
-		// returns 2 if passworded rar
-		// returns array of files in the rar if normal rar
-        $filelist = array();
-		$rar = new ArchiveInfo;
-		if ($rar->open($rarfile))
-		{
-            if (!empty($rar->isEncrypted))
-			{
-				return 1;
-			}
-			else
-			{
-				$files = $rar->getArchiveFileList();
-				foreach ($files as $file)
-				{
-					if (isset($file['pass']) && isset($file["name"]))
-					{
-						$filelist[] = $file['name'];
-						if ($file['pass'] == true)
-						//
-						// individual file rar passworded
-						//
-						{
-							return 2;
-							// passworded
-						}
-					}
-				}
-				return ($filelist);
-				// normal rar
-			}
-		}
-		else
-		{
-			return 0;
-			// not a rar
-		}
-	}
-
-	/**
-	 * Work out all files contained inside a rar
-	 */
-	public function getMediainfo($ramdrive,$mediainfo,$releaseID)
-	{
-		$retval = false;
-		$mediafiles = glob($ramdrive.'*.*');
-		if (is_array($mediafiles))
-		{
-			foreach($mediafiles as $mediafile)
-			{
-				if (preg_match("/\.(".$this->mediafileregex.'|'.$this->audiofileregex.")$/i",$mediafile))
-				{
-					$execstring = '"'.$mediainfo.'" --Output=XML "'.$mediafile.'"';
-					$xmlarray = runCmd($execstring);
-
-					if (is_array($xmlarray))
-					{
-						$xmlarray = implode("\n",$xmlarray);
-						$re = new ReleaseExtra();
-						$re->addFull($releaseID,$xmlarray);
-						$re->addFromXml($releaseID,$xmlarray);
-						$retval = true;
-					}
-					else
-					{
-						echo "PostPrc : Failed to process mediainfo for ".$mediafile." release (".$releaseID.")\n";
-					}
-				}
-			}
-		}
-		else
-		{
-			echo "PostPrc: Couldn't open temp drive ".$ramdrive."\n";
-		}
-		return $retval;
-	}
-
-	/**
-	 * Get a sample from a release using ffmpeg
-	 */
-	public function getSample($ramdrive, $ffmpeginfo, $releaseguid)
-	{
-		$ri = new ReleaseImage();
-		$retval = false;
-
-		$samplefiles = glob($ramdrive.'*.*');
-		if (is_array($samplefiles))
-		{
-			foreach($samplefiles as $samplefile)
-			{
-				if (preg_match("/\.(".$this->mediafileregex.")$/i",$samplefile))
-				{
-                    //1.0
-                    //$execstring = '"'.$ffmpeginfo.'" -sameq -i "'.$samplefile.'" -vframes 300 "'.$ramdrive.'zzzz%03d.jpg"';
-
-                    //1.1
-                    //$execstring = '"'.$ffmpeginfo.'" -i "'.$samplefile.'" -qscale:v 1 -vframes 300 "'.$ramdrive.'zzzz%03d.jpg"';
-
-                    //2.0
-                    $execstring = '"'.$ffmpeginfo.'" -i "'.$samplefile.'"  -vframes 300 "'.$ramdrive.'zzzz%03d.jpg"';
-
-                    //1.x
-                    //$execstring = '"'.$ffmpeginfo.'" -q:v 0 -i "'.$samplefile.'" -vframes 300 "'.$ramdrive.'zzzz%03d.jpg"';
-
-                    runCmd($execstring, false, true);
-					$all_files = scandir($ramdrive,1);
-					if(preg_match("/zzzz\d{3}\.jpg/",$all_files[1]))
-					{
-						$ri->saveImage($releaseguid.'_thumb', $ramdrive.$all_files[1], $ri->imgSavePath, 800, 600);
-						$retval = true;
-					}
-
-					//clean up all files
-					foreach(glob($ramdrive.'*.jpg') as $v)
-					{
-						unlink($v);
-					}
-				}
-			}
-		}
-		else
-		{
-			echo "PostPrc: Couldn't open temp drive ".$ramdrive."\n";
-		}
-		return $retval;
-	}
-
-	/**
-	 * Has to be performed after mediainfo, as lame strips id3 tags.
-	 */
-    public function lameAudioSample($lameinfo, $releaseguid)
-    {
-        $returnval = false;
-
-        $minacceptableencodefilesize = 10000;
-        $samplefile = $this->mp3SavePath.$releaseguid.'.mp3';
-        $samplefileogg = $this->mp3SavePath.$releaseguid.'.ogg';
-        $ffmpeginfo = $this->site->ffmpegpath;
-
-        if (file_exists($samplefile))
-        {
-            $outfile = $this->mp3SavePath.$releaseguid.'_l.mp3';
-            $outfileogg = $this->mp3SavePath.$releaseguid.'_l.ogg';
-
-            //
-            // lame the sample down to 96kb and replace it. alternatives could be
-            // V8 for low quality variable.
-            //
-
-            $execstring = '"'.$lameinfo.'" -b 96 "'.$samplefile.'" "'.$outfile.'"';
-            $execstringogg = '"'.$ffmpeginfo.'" -i "'.$samplefile.'" -acodec libvorbis "'.$outfileogg.'"';
-            $output = runCmd($execstring, false, true);
-            $output = runCmd($execstringogg, false, true);
-
-            //
-            // lame can create bad/small files if the source was corrupt
-            // if it creates a file thats surprisingly small, then ignore it and retain
-            // original
-            //
-            if (file_exists($outfile))
-            {
-                if (filesize($outfile) < $minacceptableencodefilesize)
-                    unlink($outfile);
-                else
-                {
-                    unlink($samplefile);
-                    rename($outfile, $samplefile);
-
-                    $returnval = true;
-                }
-            }
-            if (file_exists($outfileogg))
-            {
-                if (filesize($outfileogg) < $minacceptableencodefilesize)
-                    unlink($outfileogg);
-                else
-                {
-                    rename($outfileogg, $samplefileogg);
-                    $returnval = true;
-                }
-            }
-        }
-
-        return $returnval;
-    }
-
-	/**
-	 * Get an audio sample from a release.
-	 */
-	public function getAudioSample($ramdrive, $releaseguid)
-	{
-		$retval = false;
-
-		$audiofiles = glob($ramdrive.'*.*');
-		if (is_array($audiofiles))
-		{
-			foreach($audiofiles as $audiofile)
-			{
-				if (preg_match("/\.(".$this->audiofileregex.")$/i",$audiofile))
-				{
-					if (copy($audiofile, $this->mp3SavePath.$releaseguid.'.mp3') !== false)
-						$retval = true;
-					else
-						echo "PostPrc : Failed to get audio sample from ".$audiofile."\n";
-				}
-			}
-		}
-		else
-		{
-			echo "PostPrc: Couldn't open temp drive ".$ramdrive."\n";
-		}
-		return $retval;
-	}
-
-	/**
-	 * Delete an audio sample from a release.
-	 */
-	public function deleteAudioSample($releaseguid)
-	{
-		$preview = $this->mp3SavePath.$releaseguid.'.mp3';
-		if (file_exists($preview))
-			unlink($preview);
-	}
-
-	/**
-	 * Update release to indicate a preview has been obtained.
-	 */
-	public function updateReleaseHasPreview($guid, $prevtype=1)
-	{
-		$rel = new Releases;
-		$rel->updateHasPreview($guid, $prevtype);
-	}
-
-	/**
-	 * Process untagged music releases using information from mediainfo if config permits.
-	 */
-	public function processMusicFromMediaInfo()
-	{
-		$processMediainfo = ($this->site->mediainfopath != '') ? true : false;
-		$processAudioSample = ($this->site->saveaudiopreview == 1) ? true : false;
-		$processMusic = ($this->site->lookupmusic == 1) ? true : false;
-
-		if ($processMusic && $processMediainfo && $processAudioSample)
-		{
-			$music = new Music($this->echooutput);
-			$ret = $music->processMusicReleaseFromMediaInfo();
-			return $ret;
-		}
-
-		return false;
-	}
-}
diff --git a/lib/copy_this/www/lib/powerprocess.php b/lib/copy_this/www/lib/powerprocess.php
deleted file mode 100644
index 880d4862f..000000000
--- a/lib/copy_this/www/lib/powerprocess.php
+++ /dev/null
@@ -1,808 +0,0 @@
-<?php
-
-declare(ticks = 1);
-
-/**
- * PowerProcess is an abstraction class for PHP's posix and pcntl extensions.
- *
- * It enables easy process forking or threading to allow use of parallel
- * processes for completing complicated tasks that would otherwise be
- * inefficient for normal serial and procedural processing
- *
- * If you like PowerProcess, please consider donating
- *  - BTC: 1K2tvdYzdDDd8w6vNHQgvbNQnhcHqLEadx
- *  - LTC: LfceD3QH2n1FqH8inqHdKxjBFV55QvuESv
- *
- * @package PowerProcess
- *
- * @author Don Bauer <lordgnu@me.com>
- * @link https://github.com/lordgnu/PowerProcess
- * @license MIT License
- * @version 2.0
- *
- * @copyright
- * Copyright (c) 2011 Don Bauer <lordgnu@me.com>
- * 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.
- */
-class PowerProcess {
-	const CALLBACK_STOP_PROPOGATION	=	-1;
-	const CALLBACK_IGNORE			=	0;
-	const CALLBACK_CONTINUE 		=	1;
-	const CALLBACK_SHUTDOWN 		=	2;
-	const CALLBACK_RESTART			=	3;
-
-	/**
-	 * Current PowerProcess version
-	 *
-	 * @var string
-	 */
-	public static $version = '2.1';
-
-	/**
-	 * Data store for data that is to be passed to the child process which is to be spawned
-	 *
-	 * @var mixed
-	 */
-	public $threadData;
-
-	/**
-	 * Boolean variable which determines whether or not to shutdown the control process (parent)
-	 *
-	 * @var boolean
-	 */
-	public $complete;
-
-	/**
-	 * Callback array for setting callback functions based on signals that can be sent to the parent process
-	 *
-	 * @var array
-	 */
-	public $callbacks;
-
-	/**
-	 * The name of the current thread.  Used by WhoAmI()
-	 *
-	 * @var string
-	 */
-	public $currentThread;
-
-	/**
-	 * Whether to log internal debug message
-	 *
-	 * @var boolean
-	 */
-	public $debugLogging;
-
-	/**
-	 * The maximum number of concurrent threads that can be running at any given time.
-	 *
-	 * This setting has an impact on performance for PowerProcess so play
-	 * with it on the system you are on to determine a good value.
-	 * 10 is a good place to start
-	 *
-	 * @var integer
-	 */
-	public $maxThreads;
-
-	/**
-	 * Array which stores the thread data for the control process (parent) to manage running child threads
-	 *
-	 * @var array
-	 */
-	public $myThreads;
-
-	/**
-	 * Session id of parent session when process is daemonized
-	 *
-	 * @var integer
-	 */
-	public $parentSID;
-
-	/**
-	 * The pid of the parent process
-	 *
-	 * Used after a process is forked to
-	 * determine whether the new thread is to run the thread code
-	 *
-	 * @var integer
-	 */
-	public $parentPID;
-
-	/**
-	 * Sleep timer in micro seconds for the parent process to sleep between status checks using Tick()
-	 *
-	 * @var integer
-	 */
-	public $tickCount = 100;
-
-	/**
-	 * Whether to add a timestamp to log output
-	 *
-	 * @var boolean
-	 */
-	public $timeStampLogs = true;
-
-	/**
-	 * The maximum number of seconds a thread will be allowed to run.
-	 *
-	 * Set to 0 to disable a time limit (use with caution)
-	 *
-	 * @var integer
-	 */
-	public $threadTimeLimit;
-
-	/**
-	 * Location to log information messages to.
-	 *
-	 * Can be a file or php://stdout, php://stderr.
-	 * Set to false to disable
-	 *
-	 * @var mixed
-	 */
-	public $logTo;
-
-	/**
-	 * When logging is enabled, this points to the socket in which to write log messages.
-	 *
-	 * @var resource
-	 */
-	public $logSocket;
-
-	/**
-	 * Signals to install for SignalDispatcher.
-	 *
-	 * You can use any signal constant PNCTL supports
-	 * @link http://us3.php.net/manual/en/pcntl.constants.php
-	 *
-	 * @var array
-	 */
-	public $signalArray = array(
-		SIGUSR1,	// User-Defined 1
-		SIGUSR2		// User-Defined 2
-	);
-
-	static public function SignalName($signal) {
-		switch ($signal) {
-			case SIGHUP:
-				return 'SIGHUP';
-			case SIGINT:
-				return 'SIGINT';
-			case SIGQUIT:
-				return 'SIGQUIT';
-			case SIGILL:
-				return 'SIGILL';
-			case SIGTRAP:
-				return 'SIGTRAP';
-			case SIGABRT:
-				return 'SIGABRT';
-			case SIGIOT:
-				return 'SIGIOT';
-			case SIGBUS:
-				return 'SIGBUS';
-			case SIGFPE:
-				return 'SIGFPE';
-			case SIGUSR1:
-				return 'SIGUSR1';
-			case SIGSEGV:
-				return 'SIGSEGV';
-			case SIGUSR2:
-				return 'SIGUSR2';
-			case SIGPIPE:
-				return 'SIGPIPE';
-			case SIGALRM:
-				return 'SIGALRM';
-			case SIGTERM:
-				return 'SIGTERM';
-			case SIGSTKFLT:
-				return 'SIGSTKFLT';
-			case SIGCLD:
-				return 'SIGCLD';
-			case SIGCHLD:
-				return 'SIGCHLD';
-			case SIGCONT:
-				return 'SIGCONT';
-			case SIGTSTP:
-				return 'SIGTSTP';
-			case SIGTTIN:
-				return 'SIGTTIN';
-			case SIGTTOU:
-				return 'SIGTTOU';
-			case SIGURG:
-				return 'SIGURG';
-			case SIGXCPU:
-				return 'SIGXCPU';
-			case SIGXFSZ:
-				return 'SIGXFSZ';
-			case SIGVTALRM:
-				return 'SIGVTALRM';
-			case SIGPROF:
-				return 'SIGPROF';
-			case SIGWINCH:
-				return 'SIGWINCH';
-			case SIGPOLL:
-				return 'SIGPOLL';
-			case SIGIO:
-				return 'SIGIO';
-			case SIGPWR:
-				return 'SIGPWR';
-			case SIGSYS:
-				return 'SIGSYS';
-			case SIGBABY:
-				return 'SIGBABY';
-			case SIG_BLOCK:
-				return 'SIG_BLOCK';
-			case SIG_UNBLOCK:
-				return 'SIG_UNBLOCK';
-			case SIG_SETMASK:
-				return 'SIG_SETMASK';
-			default:
-				return "Signal # {$signal}";
-		}
-	}
-
-	/**
-	 * PowerProcess constructor.
-	 *
-	 * Returns an instanced PowerProcess object or dies on failure
-	 *
-	 * @param integer	$maxThreads			Max number of concurrent threads to allow at any given time
-	 * @param integer	$threadTimeLimit	Maximum number of seconds a thread is allowed to live
-	 * @param boolean	$daemon 			Whether to start as a deamon or just a normal script
-	 * @param string	$logTo 				What stream to log output to
-	 * @param boolean	$debugLogging		Whether to enable debug logging
-	 *
-	 * @return object	Instanced PowerProcess object
-	 */
-	public function __construct($maxThreads = 10, $threadTimeLimit = 300, $daemon = false, $logTo = false, $debugLogging = false) {
-		if (function_exists('pcntl_fork') && function_exists('posix_getpid')) {
-			// Set the current thread name
-			$this->currentThread = 'CONTROL';
-
-			// Set the max threads setting
-			$this->SetMaxThreads($maxThreads);
-
-			// Set the thread time limit setting
-			$this->SetThreadTimeLimit($threadTimeLimit);
-
-			// Init the logger
-			$this->InitializeLogger($logTo, $debugLogging);
-
-			if ($daemon) {
-				// Attempt to daemonize
-				if (!$this->Daemonize()) {
-					die("Could not daemonize");
-				} else {
-					$this->Log("Daemonized successfully",true);
-				}
-			} else {
-				// Register control process PID
-				$this->parentPID = $this->GetPID();
-				$this->parentSID = false;
-				$this->Log("Parent PID detected as {$this->parentPID}",true);
-			}
-
-			// The the complete flag to false
-			$this->complete = false;
-
-			// Install the signal handler
-			$this->InstallSignalHandler();
-
-			// Init the Thread Queue
-			$this->myThreads = array();
-
-			// Log completion of startup
-			$this->Log("Startup process complete",true);
-		} else {
-			die("PowerProcess requires both the POSIX and PCNTL extensions to operate.\n");
-		}
-	}
-
-	/**
-	 * Frees up memory
-	 */
-	public function __destruct() {
-		unset($this->callbacks);
-		unset($this->myThreads);
-
-		// Handle any remaining signals
-		pcntl_signal_dispatch();
-
-		$this->RemoveLogger();
-	}
-
-	/**
-	 * Executes specified program in the current process space
-	 *
-	 * @param string $process	Path to the binary process to execute
-	 * @param array $args		Array of argument strings to pass to the program
-	 */
-	public function Exec($process, $args = null) {
-		if ($args == null) {
-			pcntl_exec($process);
-		} else {
-			pcntl_exec($process, $args);
-		}
-	}
-
-	/**
-	 * Returns the PID of the current process
-	 *
-	 * @return integer
-	 */
-	public function GetPID() {
-		return posix_getpid();
-	}
-
-	/**
-	 * Returns the PID of the process that spawned this one
-	 *
-	 * @return integer
-	 */
-	public function GetControlPID() {
-		return posix_getppid();
-	}
-
-	/**
-	 * Get the status of a running thread by name or PID
-	 *
-	 * @param string|integer $name The name or PID of the process for which you want status information
-	 * @return array|boolean
-	 */
-	public function GetThreadStatus($name = false) {
-		if ($name === false) return false;
-		if (isset($this->myThreads[$name])) {
-			return $this->myThreads[$name];
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Determine whether the control process is daemonized
-	 *
-	 * @return boolean
-	 */
-	public function IsDaemon() {
-		return $this->parentSID !== false;
-	}
-
-	/**
-	 * Log a message
-	 *
-	 * @param string $msg The message to log
-	 * @param boolean $internal Whether this is an internal debug logging message
-	 */
-	public function Log($msg, $internal = false) {
-		if ($this->logSocket !== false) {
-			if (!$internal || $this->debugLogging) {
-				if ($this->timeStampLogs) {
-					fwrite($this->logSocket, sprintf("[%s][%-22s] %s\n", date("Y-m-d H:i:s"), $this->WhoAmI(), $msg));
-				} else {
-					fwrite($this->logSocket, sprintf("[%-22s] %s\n", $this->WhoAmI(), $msg));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restarts the control process
-	 */
-	public function Restart() {
-		// Build Path of Script
-		if (isset($_SERVER['_'])) {
-			$cmd = $_SERVER['_'];
-			$this->Log("Attempting to restart using {$cmd}",true);
-		} else {
-			$this->Log("Can not restart - Shutting down", true);
-			return $this->Shutdown();
-		}
-
-		// Wait for threads to complete
-		while ($this->ThreadCount()) {
-			$this->CheckThreads();
-			$this->Tick();
-		}
-
-		// Remove the first arg if this is a stand-alone
-		if ($cmd == $_SERVER['argv'][0]) unset($_SERVER['argv'][0]);
-
-		// Execute Restart
-		$this->Exec($cmd, $_SERVER['argv']);
-		$this->Shutdown(true);
-		return self::CALLBACK_IGNORE;
-	}
-
-	/**
-	 * Registers a callback function for the signal dispatcher or for special signals used by PowerProcess
-	 *
-	 * Special signals are:
-	 *   - 'shutdown' : Triggered on completion of the Shutdown() method
-	 *   - 'threadotl' : Triggered on killing a thread due to exceeding time limit
-	 *
-	 * @param int|string $signal The signal to register a callback for
-	 * @param callback $callback The callback function
-	 */
-	public function RegisterCallback($signal, $callback = false) {
-		if ($callback !== false) $this->callbacks[$signal][] = $callback;
-
-		// Register with PCNTL
-		if (is_int($signal)) {
-			$this->Log("Registering signal {$signal} with dispatcher",true);
-			pcntl_signal($signal, array(&$this, 'SignalDispatch'));
-
-			// Unblock the Signal
-			pcntl_sigprocmask(SIG_UNBLOCK,array($signal));
-		}
-	}
-
-	/**
-	 * Determines whether we should be running the control code or the thread code
-	 *
-	 * @return boolean
-	 */
-	public function RunControlCode() {
-		$this->Tick();
-		if (!$this->complete) {
-			return $this->ControlCheck();
-		} else {
-			$this->SignalDispatch('shutdown');
-			return false;
-		}
-	}
-
-	/**
-	 * Determines whether we should be running the child code
-	 *
-	 * @return boolean
-	 */
-	public function RunThreadCode() {
-		return !$this->ControlCheck();
-	}
-
-	/**
-	 * Send a signal to a process
-	 *
-	 * @param integer $pid
-	 * @param integer $signal
-	 */
-	public function SendSignal($pid = 0, $signal = 0) {
-		if ($signal > 0 && $pid > 0) {
-			return posix_kill($pid, $signal) && pcntl_signal_dispatch();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Set the max number of threads that can be running concurrently
-	 *
-	 * @param integer $maxThreads The max number of threads to run concurrently
-	 */
-	public function SetMaxThreads($maxThreads = 10) {
-		$this->maxThreads = $maxThreads;
-	}
-
-	/**
-	 * Set the max number of seconds a thread can run before being terminated
-	 *
-	 * @param integer $threadTimeLimit The max number of seconds a thread can run
-	 */
-	public function SetThreadTimeLimit($threadTimeLimit = 300) {
-		$this->threadTimeLimit = $threadTimeLimit;
-	}
-
-	/**
-	 * Initiates the shutdown procedure for PowerProcess
-	 *
-	 * @param boolean $exit When set to true, Shutdown causes the script to exit
-	 */
-	public function Shutdown($exit = false) {
-		$this->Log("Initiating shutdown",true);
-
-		while ($this->ThreadCount()) {
-			$this->CheckThreads();
-			$this->Tick();
-		}
-
-		$this->complete = true;
-
-		// Send custom shutdown signal
-		$this->SignalDispatch('shutdown');
-
-		$this->Log("Shutdown Complete");
-		if ($exit) exit;
-
-		return self::CALLBACK_IGNORE;
-	}
-
-	/**
-	 * Determines if a new process can be spawned
-	 *
-	 * @return boolean
-	 */
-	public function SpawnReady() {
-		$this->Tick();
-		return ($this->ThreadCount() < $this->maxThreads);
-	}
-
-	/**
-	 * Spawn a new thread
-	 *
-	 * @param string $name The name of the thread to be spawned
-	 * @param boolean $returnPid Whether to return the pid instead of boolean
-	 *
-	 * @return boolean|integer
-	 */
-	public function SpawnThread($name = false, $returnPid = false) {
-		// Check to make sure we can spawn another thread
-		if (!$this->SpawnReady()) {
-			$this->Log("The maximum number of threads are already running",true);
-			$this->Tick();
-			return false;
-		}
-
-		if ($name !== false) {
-			// Check to make sure there is not already a named thread with this name
-			if ($this->GetThreadStatus($name) !== false) {
-				$this->Log("There is already a thread named '{$name}' running",true);
-				$this->Tick();
-				return false;
-			}
-		}
-
-		$pid = pcntl_fork();
-
-		if ($pid) {
-			// We are the control thread so log the child in a queue
-			$index = ($name === false) ? $pid : $name;
-			$name = ($name === false) ? "THREAD:{$pid}" : $name;
-			$this->myThreads[$index] = array(
-				'pid'	=>	$pid,
-				'time'	=>	time(),
-				'name'	=>	$name
-			);
-			$this->Log("Spawned thread: {$name}",true);
-			$this->Tick();
-			return ($returnPid) ? $pid : true;
-		} else {
-			// We are the child thread so change the current thread var
-			$this->currentThread = ($name === false) ? "THREAD:".$this->GetPID() : $name;
-			return ($returnPid) ? $pid : true;
-		}
-	}
-
-	/**
-	 * Get the count of running threads
-	 *
-	 * @return integer
-	 */
-	public function ThreadCount() {
-		return count($this->myThreads);
-	}
-
-	/**
-	 * Process signals to be dispatched and sleep for a number of microseconds
-	 */
-	public function Tick() {
-		// Dispatch Pending Signals
-		pcntl_signal_dispatch();
-
-		// Check Running Threads
-		if ($this->parentPID == $this->GetPID()) $this->CheckThreads();
-
-		// Tick
-		usleep($this->tickCount);
-	}
-
-	/**
-	 * Get the name of the current thread
-	 *
-	 * @return string The name of the current thread
-	 */
-	public function WhoAmI() {
-		return $this->currentThread;
-	}
-
-	// All Private Functions Below Here
-	/**
-	 * Checks all running threads to make sure they are still running and their time limit  has not been exceeded
-	 *
-	 * If a thread has exceeded it's time limit, this method will kill that process
-	 * and dispatch the special signal 'threadotl'
-	 */
-	private function CheckThreads() {
-		foreach ($this->myThreads as $i => $thread) {
-			// Check to make sure the process is still running
-			if ($this->PIDDead($thread['pid']) != 0) {
-				// Thread is Dead
-				unset($this->myThreads[$i]);
-			} elseif ($this->threadTimeLimit > 0) {
-				if (time() - $thread['time'] > $this->threadTimeLimit) {
-					$this->KillThread($thread['pid']);
-					$this->Log("Thread {$thread['name']} has exceeded the thread time limit",true);
-					$this->SignalDispatch('threadotl');
-					unset($this->myThreads[$i]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check if the current process is the control process
-	 *
-	 * @return boolean
-	 */
-	private function ControlCheck() {
-		return $this->parentPID == $this->GetPID();
-	}
-
-	/**
-	 * Attempts to daemonize the current process
-	 *
-	 * @return integer
-	 */
-	private function Daemonize() {
-		$this->Log("Attempting to Daemonize",true);
-
-		// First need to fork
-		$pid = pcntl_fork();
-
-		// Tick to catch signals
-		$this->Tick();
-
-		if ($pid < 0) exit; // Error
-		if ($pid) exit;		// Parent
-
-		$this->parentSID = posix_setsid();
-
-		// Need to reset the parent PID
-		$this->parentPID = $this->GetPID();
-		$this->Log("Parent PID {$this->parentPID}",true);
-		$this->Log("Parent SID {$this->parentSID}",true);
-
-		return ($this->parentSID > 0);
-	}
-
-	/**
-	 * Initialize the logging stream if enabled
-	 *
-	 * @param string|boolean $logTo The path or stream to log to or false to disable
-	 */
-	private function InitializeLogger($logTo, $debugLogging) {
-		if ($logTo !== false) {
-			$this->logSocket = @fopen($logTo, 'w');
-			$this->debugLogging = $debugLogging;
-		} else {
-			$this->logSocket = false;
-			$this->debugLogging = false;
-		}
-	}
-
-	/**
-	 * Installs the default signal handlers
-	 */
-	private function InstallSignalHandler() {
-		// Register the callback for thread completion
-		$this->RegisterCallback(SIGCHLD, array($this,'CheckThreads'));
-		$this->Log("SIGCHLD callback registered",true);
-
-		// Register the callback for restart requests
-		$this->RegisterCallback(SIGHUP, array($this, 'Restart'));
-		$this->Log("SIGHUP callback registered",true);
-
-		// Register the callback for shutdown requests
-		$this->RegisterCallback(SIGTERM, array($this, 'Shutdown'));
-		$this->Log("SIGTERM callback registered",true);
-
-		// Install the signal handler
-		foreach ($this->signalArray as $signal) $this->RegisterCallback($signal);
-		$this->Log("Signal Dispatcher installed",true);
-	}
-
-	/**
-	 * Kill a thread by PID
-	 *
-	 * @param integer $pid The PID of the thread to kill
-	 */
-	private function KillThread($pid = 0) {
-		$this->SendSignal($pid, SIGTERM);
-	}
-
-	/**
-	 * Determine whether a child pid has exited
-	 *
-	 * Returns the PID of child which exited or 0
-	 *
-	 * @param integer $pid The PID to check
-	 * @return integer
-	 */
-	private function PIDDead($pid = 0) {
-		if ($pid > 0) {
-			return pcntl_waitpid($pid, $status, WUNTRACED OR WNOHANG);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Closes the logging stream
-	 */
-	private function RemoveLogger() {
-		if ($this->logSocket) {
-			@fclose($this->logSocket);
-		}
-	}
-
-	/**
-	 * Handles dispatching of signals to user-defined callbacks
-	 *
-	 * @param integer|string $signal
-	 */
-	public function SignalDispatch($signal) {
-		// Log Dispatch
-		$signalName = self::SignalName($signal);
-		$this->Log("Received signal: {$signalName}",true);
-
-		// Check the callback array for this signal number
-		if (isset($this->callbacks[$signal])) {
-			// Execute the callback
-			$callStack = $this->callbacks[$signal];
-
-			// Run last added callbacks first (FILO)
-			$i = count($callStack);
-			while ($callback = array_pop($callStack)) {
-				$this->Log("Running Callback[{$i}] for signal: {$signalName}", true);
-				--$i;
-				$status = call_user_func($callback);
-
-				// Check if we should continue
-				if ($status == self::CALLBACK_STOP_PROPOGATION) {
-					// Break out of loop
-					$this->Log("Callback[{$i}] for signal '{$signalName}' has stopped propogation of further callbacks", true);
-					break;
-				}
-
-				// OK, now switch on the status
-				switch ($status) {
-					case self::CALLBACK_RESTART:
-						$this->Restart();
-						break;
-					case self::CALLBACK_SHUTDOWN:
-						$this->Shutdown();
-						break;
-					case self::CALLBACK_IGNORE:
-					case self::CALLBACK_CONTINUE:
-						// Do nothing :: Continue propogation
-						break;
-					default:
-						$this->Log("Callback[{$i}] for signal '{$signalName}' did not return a valid status");
-				}
-
-				// Continue the loop
-			}
-		} else {
-			// No callback registered
-			$this->Log("There is no callback registered for signal {$signalName}",true);
-		}
-
-		// Handle SIGTERM for threads
-		if ($signal == 15) exit(0);
-	}
-
-}
diff --git a/lib/copy_this/www/lib/predb.php b/lib/copy_this/www/lib/predb.php
deleted file mode 100644
index a434395ce..000000000
--- a/lib/copy_this/www/lib/predb.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/sphinx.php");
-
-/**
- * This class handles lookup of nzpre lookups and storage/retrieval of pre data.
- */
-class PreDB
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Default constructor.
-	 *
-	 * @param bool $echooutput
-	 */
-	public function __construct($echooutput = true)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$this->pdo = new \DB();
-	}
-
-	/**
-	 * Get a predb row by id.
-	 */
-	public function getByID($preID)
-	{
-		$predbQuery = $this->pdo->query(sprintf("SELECT * FROM predb WHERE id = %s LIMIT %d", $preID, 1));
-
-		return isset($predbQuery[0]) ? $predbQuery[0] : false;
-	}
-
-	/**
-	 * Get a predb row by name.
-	 */
-	public function getByDirname($dirname)
-	{
-		$dirname = str_replace(' ', '_', $dirname);
-		$predbQuery = $this->pdo->query(sprintf("SELECT * FROM predb WHERE dirname = %s LIMIT %d", $this->pdo->escapeString($dirname), 1));
-
-		return isset($predbQuery[0]) ? $predbQuery[0] : false;
-	}
-
-	/**
-	 * Get count of all predb rows.
-	 */
-	public function getPreCount($dirname='', $category='')
-	{
-	    // Only use Sphinx if this is a search request
-	    if ($dirname) {
-	        $s = new Sites();
-    		$site = $s->get();
-    		if ($site->sphinxenabled && $site->sphinxindexpredb) {
-    		    // Search using Sphinx
-    		    $sphinx = new Sphinx();
-    		    $count = $sphinx->getPreCount($dirname, $category);
-    		    if ($count > -1) {
-    		        return $count;
-    		    }
-    		}
-	    }
-
-		$dirname = empty($dirname) ? '' : sprintf("WHERE dirname LIKE %s", $this->pdo->escapeString('%'.$dirname.'%'));
-		$category = empty($category) ? '' : sprintf((empty($dirname) ? 'WHERE' : ' AND')." category = %s", $this->pdo->escapeString($category));
-
-		$predbQuery = $this->pdo->queryOneRow(sprintf('SELECT COUNT(id) AS num FROM predb %s %s', $dirname, $category), true);
-
-		return $predbQuery['num'];
-	}
-
-	/**
-	 * Get predb rows by limit and filter.
-	 */
-	public function getPreRange($start=0, $num, $dirname='', $category='')
-	{
-	    // Only use Sphinx if this is a search request
-	    if ($dirname) {
-	        $s = new Sites();
-    		$site = $s->get();
-			if ($site->sphinxenabled && $site->sphinxindexpredb) {
-    		    // Search using Sphinx
-    		    $sphinx = new Sphinx();
-    		    $results = $sphinx->getPreRange($start, $num, $dirname, $category);
-           		if (is_array($results)) {
-           		    return $results;
-           		}
-    		}
-		}
-
-		$dirname = str_replace(' ', '%', $dirname);
-		$dirname = empty($dirname) ? '' : sprintf('WHERE dirname LIKE %s', $this->pdo->escapeString('%'.$dirname.'%'));
-		$category = empty($category) ? '' : sprintf((empty($dirname) ? 'WHERE' : ' AND')." category = %s", $this->pdo->escapeString($category));
-
-		$sql = sprintf('SELECT p.*, r.guid FROM predb p left outer join releases r on p.id = r.preid %s %s ORDER BY ctime DESC LIMIT %d,%d', $dirname, $category, $start, $num);
-
-		return $this->pdo->query($sql, true);
-	}
-
-	/**
-	 * Process all untagged releases to see if they are found in predb.
-	 */
-	public function processReleases($daysback = 3)
-	{
-
-		if ($this->echooutput)
-			echo "Predb   : Updating releases with pre data\n";
-
-		$matched = 0;
-		$releasesQuery = $this->pdo->queryDirect(sprintf('SELECT id, searchname FROM releases WHERE preid IS NULL AND adddate > DATE_SUB(NOW(), INTERVAL %d DAY)', $daysback));
-		while($arr = $this->pdo->getAssocArray($releasesQuery))
-		{
-			$arr['searchname'] = str_replace(' ', '_', $arr['searchname']);
-			$sql = sprintf("SELECT id FROM predb WHERE dirname = %s LIMIT 1", $this->pdo->escapeString($arr['searchname']));
-			$predbQuery = $this->pdo->queryOneRow($sql);
-
-			if($predbQuery)
-			{
-				$this->pdo->queryExec(sprintf('UPDATE releases SET preid = %d WHERE id = %d', $predbQuery['id'], $arr['id']));
-
-				$matched++;
-			}
-		}
-
-		if($this->echooutput)
-			echo "Predb   : Matched pre data to ".$matched." releases\n";
-
-	}
-
-	/**
-	 * Add/Update predb row.
-	 *
-	 * @param DB $pdo
-	 * @param    $preArray
-	 * @return bool
-	 */
-	public function updatePreDB(DB $pdo, $preArray)
-	{
-		if(!preg_match('/^(UN)?((MOD)?NUKED?|DELPRE)$/', $preArray['category']))
-		{
-			$this->pdo->queryExec(sprintf('INSERT INTO predb
-				(ctime, dirname, category, filesize, filecount, filename)
-				VALUES (%d, %s, %s, %F, %d, %s)
-				ON DUPLICATE KEY UPDATE
-				category=%3$s, filesize=%4$F, filecount=%5$d, filename=%6$s',
-				$preArray['ctime'],
-				$this->pdo->escapeString($preArray['dirname']),
-				$this->pdo->escapeString($preArray['category']),
-				(!empty($preArray['filesize']) ? (float) $preArray['filesize'] : 0),
-				(!empty($preArray['filecount']) ? (int) $preArray['filecount'] : 0),
-				(!empty($preArray['nuke_filename']) ? $this->pdo->escapeString($preArray['nuke_filename']) : '""')
-			));
-
-			//$newCheck = mysql_affected_rows();
-			//if($this->echooutput && $newCheck > 0)
-			//	echo "!PRE: [".date('Y-m-d H:i:s', $preArray['ctime']).'] - [ '.$preArray['dirname'].' ] - ['.$preArray['category']."]\n";
-
-			return true;
-		}
-		else
-		{
-			$this->pdo->queryExec(sprintf("update predb
-				SET nuketype=%s, nukereason=%s, nuketime=%d
-				WHERE dirname = %s",
-				$this->pdo->escapeString($preArray['category']),
-				(!empty($preArray['nuke_filename']) ? $this->pdo->escapeString($preArray['nuke_filename']) : '""'),
-				$preArray['ctime'],
-				$this->pdo->escapeString($preArray['dirname'])
-			));
-
-			//$newCheck = mysql_affected_rows();
-			//if($this->echooutput && $newCheck > 0)
-			//	echo $preArray['category'].': ['.date('Y-m-d H:i:s', $preArray['ctime']).'] - [ '.$preArray['dirname'].' ] - ['.$preArray['nuke_filename']."]\n";
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * XOR decode a string with a key.
-	 */
-	function xorDecode($subject, $nzprekey)
-	{
-		return ($nzprekey ^ base64_decode($subject));
-	}
-
-	/**
-	 * Parse the nzpre details from the string.
-	 */
-	private function nzpreParse($msgHeader, $nzprekey)
-	{
-		preg_match('/^\[(?P<ctime>\d+)\]-\[(?P<category>[^\]]+)\]-\[ (?P<dirname>[^\ ]+) \](?:-\[(?:(?:(?P<filesize>\d+(\.\d+)?)MB)?\/?(?:(?P<filecount>\d+)F)?\/?(?:(?P<nuke_filename>[^\]]+))?\]))?$/', $this->xorDecode($msgHeader, $nzprekey), $fieldArray);
-
-		return empty($fieldArray) ? false : $fieldArray;
-	}
-
-	/**
-	 * Get nzpre data from usenet and parse.
-	 */
-	public function nzpreUpdate()
-	{
-		require_once(WWW_DIR."/lib/nntp.php");
-
-		$s = new Sites();
-		$site = $s->get();
-
-		if(empty($site->nzpregroup) || empty($site->nzpresubject) || empty($site->nzpreposter) || empty($site->nzprefield) || empty($site->nzprekey))
-			return false;
-
-		if($this->echooutput)
-			echo "Predb   : Checking for new pre data ";
-
-		$nntp = new Nntp();
-
-		if(!$nntp->doConnect()) {
-            echo "Failed to get NNTP connection\n";
-			return false;
-		}
-
-		$ret = $groupData = $nntp->selectGroup($site->nzpregroup);
-		if($nntp->isError($ret)) {
-			echo "Predb   : Error ".$ret->getMessage()."\n";
-			return false;
-		}
-
-		$ret = $groupMsgs = $nntp->getOverview(($groupData['last']-(!empty($site->nzprearticles) ? $site->nzprearticles : 500)).'-'.$groupData['last']);
-		if($nntp->isError($ret)) {
-			echo "Predb   : Error ".$ret->getMessage()."\n";
-			return false;
-		}
-
-		$added_updated = 0;
-		$nzprekey = $site->nzprekey;
-		while(strlen($nzprekey) < 1024)
-			$nzprekey = $nzprekey.$nzprekey;
-
-		$cnt = !empty($site->nzprearticles) ? $site->nzprearticles : 500;
-		foreach($groupMsgs as $groupMsg) {
-			if ($cnt%50==0 && $cnt != 0 && $this->echooutput)
-				echo $cnt."..";
-			$cnt--;
-
-			if(preg_match('/^'.$site->nzpresubject.'$/', $groupMsg['Subject']) && preg_match('/^'.$site->nzpreposter.'$/', $groupMsg['From'])) {
-				$ret = $msgHeader = $nntp->getHeader($groupMsg['Message-ID']);
-				if($nntp->isError($ret))
-					continue;
-
-				for($i=0; $i < count($msgHeader); $i++) {
-					if(preg_match('/^'.$site->nzprefield.': /', $msgHeader[$i])) {
-						if($nzpreParse = $this->nzpreParse(str_replace($site->nzprefield.': ', '', $msgHeader[$i]), $nzprekey))
-						{
-							if ($this->updatePreDB($this->pdo, $nzpreParse))
-							{
-								$added_updated++;
-							}
-						}
-
-						break;
-					}
-				}
-			}
-		}
-
-		$nntp->disconnect();
-
-		if($this->echooutput)
-			echo "\nPredb   : Added/Updated ".$added_updated." records\n";
-	}
-}
diff --git a/lib/copy_this/www/lib/rarinfo/archivereader.php b/lib/copy_this/www/lib/rarinfo/archivereader.php
deleted file mode 100644
index 7532a8f4a..000000000
--- a/lib/copy_this/www/lib/rarinfo/archivereader.php
+++ /dev/null
@@ -1,835 +0,0 @@
-<?php
-
-/**
- * Abstract base class for all archive file inspectors.
- *
- * @author         Hecks
- * @copyright  (c) 2010-2013 Hecks
- * @license        Modified BSD
- * @version        3.1
- */
-abstract class ArchiveReader
-{
-	// ------ Class variables and methods -----------------------------------------
-
-	/**
-	 * Unpacks data from a binary string.
-	 *
-	 * This method helps in particular to fix unpacking of unsigned longs on 32-bit
-	 * systems due to PHP internal quirks.
-	 *
-	 * @param   string  $format   format codes for unpacking
-	 * @param   string  $data     the packed string
-	 * @param   boolean $fixLongs should unsigned longs be fixed?
-	 *
-	 * @return  array    the unpacked data
-	 */
-	public static function unpack($format, $data, $fixLongs = true)
-	{
-		$unpacked = unpack($format, $data);
-		$longs = 'VNL';
-
-		// Fix conversion of unsigned longs on 32-bit systems
-		if ($fixLongs && PHP_INT_SIZE <= 4 && preg_match("/[{$longs}]++/", $format)) {
-			$codes = explode('/', $format);
-			foreach ($unpacked as $key => $value) {
-				$code = array_shift($codes);
-				if (strpos($longs, $code[0]) !== false && $value < 0) {
-					$unpacked[$key] = $value + 0x100000000; // converts to float
-				}
-			}
-		}
-
-		return $unpacked;
-	}
-
-	/**
-	 * Converts two longs to a float to represent a 64-bit integer on 32-bit
-	 * systems, otherwise returns the integer.
-	 *
-	 * If more precision is needed, the bcmath functions should be used.
-	 *
-	 * @param   integer $low  the low 32 bits
-	 * @param   integer $high the high 32 bits
-	 *
-	 * @return  float|integer
-	 */
-	public static function int64($low, $high)
-	{
-		return ($low + ($high * 0x100000000));
-	}
-
-	/**
-	 * Converts DOS standard timestamps to UNIX timestamps.
-	 *
-	 * @param   integer $dostime DOS timestamp
-	 *
-	 * @return  integer  UNIX timestamp
-	 */
-	public static function dos2unixtime($dostime)
-	{
-		$sec = 2 * ($dostime & 0x1f);
-		$min = ($dostime >> 5) & 0x3f;
-		$hrs = ($dostime >> 11) & 0x1f;
-		$day = ($dostime >> 16) & 0x1f;
-		$mon = ($dostime >> 21) & 0x0f;
-		$year = (($dostime >> 25) & 0x7f) + 1980;
-
-		return mktime($hrs, $min, $sec, $mon, $day, $year);
-	}
-
-	/**
-	 * Converts Windows FILETIME format timestamps to UNIX timestamps.
-	 *
-	 * @param   integer $low  the low 32 bits
-	 * @param   integer $high the high 32 bits
-	 *
-	 * @return  integer  UNIX timestamp
-	 */
-	public static function win2unixtime($low, $high)
-	{
-		$ushift = 116444736000000000;
-		$ftime = self::int64($low, $high);
-
-		return (int)floor(($ftime - $ushift) / 10000000);
-	}
-
-	/**
-	 * Converts a numeric value passed by reference to a hexadecimal string.
-	 *
-	 * @param   mixed $value the numeric value to convert
-	 *
-	 * @return  void
-	 */
-	public static function convert2hex(&$value)
-	{
-		if (is_numeric($value)) {
-			$value = base_convert($value, 10, 16);
-		}
-	}
-
-	/**
-	 * Calculates the size of the given file.
-	 *
-	 * This is fiddly on 32-bit systems for sizes larger than 2GB due to internal
-	 * limitations - filesize() returns a signed long - and so needs hackery.
-	 *
-	 * @param   string $file full path to the file
-	 *
-	 * @return  integer|float   the file size in bytes
-	 */
-	public static function getFileSize($file)
-	{
-		// 64-bit systems should be OK
-		if (PHP_INT_SIZE > 4)
-			return filesize($file);
-
-		// Hack for Windows
-		if (DIRECTORY_SEPARATOR === '\\') {
-			if (!extension_loaded('com_dotnet')) {
-				return trim(shell_exec('for %f in (' . escapeshellarg($file) . ') do @echo %~zf')) + 0;
-			}
-			$com = new COM('Scripting.FileSystemObject');
-			$f = $com->GetFile($file);
-
-			return $f->Size + 0;
-		}
-
-		// Hack for *nix
-		$os = php_uname();
-		if (stripos($os, 'Darwin') !== false) {
-			$command = 'stat -f %z ' . escapeshellarg($file);
-		} elseif (stripos($os, 'DiskStation') !== false) {
-			$command = 'ls -l ' . escapeshellarg($file) . ' | awk \'{print $5}\'';
-		} else {
-			$command = 'stat -c %s ' . escapeshellarg($file);
-		}
-
-		return trim(shell_exec($command)) + 0;
-	}
-
-	/**
-	 * Returns human-readable byte sizes as formatted strings.
-	 *
-	 * @param   integer $bytes the size to format
-	 * @param   integer $round decimal places limit
-	 *
-	 * @return  string   human-readable size
-	 */
-	public static function formatSize($bytes, $round = 1)
-	{
-		$suffix = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-		for ($i = 0; $bytes > 1024 && isset($suffix[$i + 1]); $i++) {
-			$bytes /= 1024;
-		}
-
-		return round($bytes, $round) . ' ' . $suffix[$i];
-	}
-
-	/**
-	 * Creates a directory if it doesn't already exist.
-	 *
-	 * @param   string $dir the directory path
-	 *
-	 * @return  boolean  false if the directory already exists
-	 */
-	public static function makeDirectory($dir)
-	{
-		if (file_exists($dir))
-			return false;
-
-		mkdir($dir, 0777, true);
-		chmod($dir, 0777);
-
-		return true;
-	}
-
-	/**
-	 * Returns all the positions of a case-sensitive needle in a haystack string.
-	 * With an array of needles, the result will be a sorted list with the positions
-	 * as keys and a list of all matching needle keys as the values.
-	 *
-	 * @param   string       $haystack the string to search
-	 * @param   string|array $needle   the string or list of strings to find
-	 *
-	 * @return  array|boolean  the needle positions, or false if none found
-	 */
-	public static function strposall($haystack, $needle, $offset = 0)
-	{
-		$start = $offset;
-		$hlen = strlen($haystack);
-		$isArray = is_array($needle);
-		$results = array();
-
-		foreach ((array)$needle as $key => $value) {
-			if (($vlen = strlen($value)) == 0)
-				continue;
-			while ($offset < $hlen && ($pos = strpos($haystack, $value, $offset)) !== false) {
-				$offset = $pos + $vlen;
-				if ($isArray) {
-					$results[$pos][] = $key;
-				} else {
-					$results[$pos] = $pos;
-				}
-			}
-			$offset = $start;
-		}
-		if (!empty($results)) {
-			ksort($results);
-
-			return $isArray ? $results : array_values($results);
-		}
-
-		return false;
-	}
-
-	// ------ Instance variables and methods ---------------------------------------
-
-	/**
-	 * The last error message.
-	 *
-	 * @var string
-	 */
-	public $error = '';
-
-	/**
-	 * The number of files in the archive file/data.
-	 *
-	 * @var integer
-	 */
-	public $fileCount = 0;
-
-	/**
-	 * Default constructor for loading and analyzing archive files.
-	 *
-	 * @param   string  $file       path to the archive file
-	 * @param   boolean $isFragment true if file is an archive fragment
-	 * @param   array   $range      the start and end byte positions
-	 *
-	 * @return  void
-	 */
-	public function __construct($file = null, $isFragment = false, array $range = null)
-	{
-		if ($file) $this->open($file, $isFragment, $range);
-	}
-
-	/**
-	 * Opens a handle to the archive file and analyzes the archive contents,
-	 * optionally within a defined byte range only.
-	 *
-	 * @param   string  $file       path to the file
-	 * @param   boolean $isFragment true if file is an archive fragment
-	 * @param   array   $range      the start and end byte positions
-	 *
-	 * @return  boolean  false if archive analysis fails
-	 */
-	public function open($file, $isFragment = false, array $range = null)
-	{
-		$this->reset();
-		$this->isFragment = $isFragment;
-		if (!$this->setRange($range)) {
-			return false;
-		}
-
-		if (!$file || !($archive = realpath($file)) || !is_file($archive)) {
-			$this->error = "File does not exist ($file)";
-
-			return false;
-		}
-
-		$this->file = $archive;
-		$this->fileSize = self::getFileSize($archive);
-		if (!$this->end) {
-			$this->end = $this->fileSize - 1;
-		}
-		if (!$this->checkRange()) {
-			return false;
-		}
-
-		// Open the file handle
-		$this->handle = fopen($archive, 'rb');
-		$this->rewind();
-
-		return $this->analyze();
-	}
-
-	/**
-	 * Loads data up to maxReadBytes and analyzes the archive contents, optionally
-	 * within a defined byte range only.
-	 *
-	 * This method is recommended when dealing with file fragments.
-	 *
-	 * @param   string  $data       archive data to be analyzed
-	 * @param   boolean $isFragment true if data is an archive fragment
-	 * @param   array   $range      the start and end byte positions
-	 *
-	 * @return  boolean  false if archive analysis fails
-	 */
-	public function setData($data, $isFragment = false, array $range = null)
-	{
-		$this->reset();
-		$this->isFragment = $isFragment;
-		if (!$this->setRange($range)) {
-			return false;
-		}
-
-		if (($dsize = strlen($data)) == 0) {
-			$this->error = 'No data was passed, nothing to analyze';
-
-			return false;
-		}
-
-		// Store the data locally up to max bytes
-		$data = ($dsize > $this->maxReadBytes) ? substr($data, 0, $this->maxReadBytes) : $data;
-		$this->dataSize = strlen($data);
-		if (!$this->end) {
-			$this->end = $this->dataSize - 1;
-		}
-		if (!$this->checkRange()) {
-			return false;
-		}
-		$this->data = $data;
-
-		$this->rewind();
-
-		return $this->analyze();
-	}
-
-	/**
-	 * Closes any open file handle and unsets any stored data.
-	 *
-	 * @return  void
-	 */
-	public function close()
-	{
-		if (is_resource($this->handle)) {
-			fclose($this->handle);
-			$this->handle = null;
-		}
-		$this->data = '';
-	}
-
-	/**
-	 * Sets the maximum number of stored data bytes to analyze.
-	 *
-	 * @param   integer $bytes the max bytes to read
-	 *
-	 * @return  void
-	 */
-	public function setMaxReadBytes($bytes)
-	{
-		if (is_int($bytes) && $bytes > 0) {
-			$this->maxReadBytes = $bytes;
-		}
-	}
-
-	/**
-	 * A full summary will be returned by default when converting the archive
-	 * object to a string, such as when echoing it.
-	 *
-	 * @return  string  archive summary
-	 */
-	public function __toString()
-	{
-		return print_r($this->getSummary(true), true);
-	}
-
-	/**
-	 * Magic method for accessing protected properties.
-	 *
-	 * @param   string $name the property name
-	 *
-	 * @return  mixed   the property value
-	 * @throws  RuntimeException
-	 * @throws  LogicException
-	 */
-	public function __get($name)
-	{
-		// For backwards compatibility
-		if ($name == 'file') {
-			return $this->file;
-		}
-
-		if (!isset($this->$name))
-			throw new RuntimeException('Undefined property: ' . get_class($this) . '::$' . $name);
-
-		throw new LogicException('Cannot access protected property ' . get_class($this) . '::$' . $name);
-	}
-
-	/**
-	 * Class destructor.
-	 *
-	 * @return  void
-	 */
-	public function __destruct()
-	{
-		$this->deleteTempFiles();
-	}
-
-	/**
-	 * Convenience method that outputs a summary list of the archive information,
-	 * useful for pretty-printing.
-	 *
-	 * @param   boolean $full return a full summary?
-	 *
-	 * @return  array    archive summary
-	 */
-	abstract public function getSummary($full = false);
-
-	/**
-	 * Parses the stored archive info and returns a list of records for each of the
-	 * files in the archive.
-	 *
-	 * @return  array  list of file records, empty if none are available
-	 */
-	abstract public function getFileList();
-
-	/**
-	 * Returns the position of the archive marker/signature.
-	 *
-	 * @return  mixed  Marker position, or false if none found
-	 */
-	abstract public function findMarker();
-
-	/**
-	 * Parses the archive data and stores the results locally.
-	 *
-	 * @return  boolean  false if parsing fails
-	 */
-	abstract protected function analyze();
-
-	/**
-	 * Path to the archive file (if any).
-	 *
-	 * @var string
-	 */
-	protected $file = '';
-
-	/**
-	 * File handle for the current archive.
-	 *
-	 * @var resource
-	 */
-	protected $handle;
-
-	/**
-	 * The maximum number of stored data bytes to analyze.
-	 *
-	 * @var integer
-	 */
-	protected $maxReadBytes = 1048576;
-
-	/**
-	 * The maximum length of filenames (for sanity checking).
-	 *
-	 * @var integer
-	 */
-	protected $maxFilenameLength = 256;
-
-	/**
-	 * Is this a file/data fragment?
-	 *
-	 * @var boolean
-	 */
-	protected $isFragment = false;
-
-	/**
-	 * The stored archive file data.
-	 *
-	 * @var string
-	 */
-	protected $data = '';
-
-	/**
-	 * The size in bytes of the currently stored data.
-	 *
-	 * @var integer
-	 */
-	protected $dataSize = 0;
-
-	/**
-	 * The size in bytes of the archive file.
-	 *
-	 * @var integer
-	 */
-	protected $fileSize = 0;
-
-	/**
-	 * The starting position for the analysis.
-	 *
-	 * @var integer
-	 */
-	protected $start = 0;
-
-	/**
-	 * The ending position for the analysis.
-	 *
-	 * @var integer
-	 */
-	protected $end = 0;
-
-	/**
-	 * The number of bytes to analyze from the $start position.
-	 *
-	 * @var integer
-	 */
-	protected $length = 0;
-
-	/**
-	 * The current position relative to the $start position.
-	 *
-	 * @var integer
-	 */
-	protected $offset = 0;
-
-	/**
-	 * The position of the marker/signature relative to the $start position.
-	 *
-	 * @var integer
-	 */
-	protected $markerPosition;
-
-	/**
-	 * The list of any temporary files created by the reader.
-	 *
-	 * @var array
-	 */
-	protected $tempFiles = array();
-
-	/**
-	 * Sets the absolute start and end positions in the file/data to be analyzed
-	 * (zero-indexed and inclusive of the end byte).
-	 *
-	 * @param   array $range the start and end byte positions
-	 *
-	 * @return  boolean  false if ranges are invalid
-	 */
-	protected function setRange(array $range = null)
-	{
-		$start = isset($range[0]) ? (int)$range[0] : 0;
-		$end = isset($range[1]) ? (int)$range[1] : 0;
-
-		if ($start != $range[0] || $end != $range[1] || $start < 0 || $end < 0) {
-			$this->error = "Start ($start) and end ($end) points must be positive integers";
-
-			return false;
-		}
-		if ($end < $start) {
-			$this->error = "End point ($end) must be higher than start point ($start)";
-
-			return false;
-		}
-		$this->start = $start;
-		$this->end = $end;
-
-		return $this->checkRange();
-	}
-
-	/**
-	 * Determines whether the currently set start and end ranges are within the
-	 * bounds of the available data, and if not sets an error message.
-	 *
-	 * @return  boolean
-	 */
-	protected function checkRange()
-	{
-		$this->length = $this->end - $this->start + 1;
-		$mlen = $this->file ? $this->fileSize : $this->dataSize;
-		if ($mlen && ($this->end >= $mlen || $this->start >= $mlen || $this->length < 1)) {
-			$this->error = "Byte range ({$this->start}-{$this->end}) is invalid";
-
-			return false;
-		}
-		$this->error = '';
-
-		return true;
-	}
-
-	/**
-	 * Returns data within the given absolute byte range of the current file/data.
-	 *
-	 * @param   array $range the absolute start and end positions
-	 *
-	 * @return  string|boolean  the requested data or false on error
-	 */
-	protected function getRange(array $range)
-	{
-		// Check that the requested range is valid
-		$original = array($this->start, $this->end, $this->length);
-		if (!$this->setRange($range)) {
-			list($this->start, $this->end, $this->length) = $original;
-
-			return false;
-		}
-
-		// Get the data
-		$this->seek(0);
-		$data = $this->read($this->length);
-
-		// Restore the original range
-		list($this->start, $this->end, $this->length) = $original;
-
-		return $data;
-	}
-
-	/**
-	 * Saves data within the given absolute byte range of the current file/data to
-	 * the destination file.
-	 *
-	 * @param   array  $range       the absolute start and end positions
-	 * @param   string $destination full path of the file to create
-	 *
-	 * @return  integer|boolean  number of bytes written or false on error
-	 */
-	protected function saveRange(array $range, $destination)
-	{
-		// Check that the requested range is valid
-		$original = array($this->start, $this->end, $this->length);
-		if (!$this->setRange($range)) {
-			list($this->start, $this->end, $this->length) = $original;
-
-			return false;
-		}
-
-		// Write the buffered data to disk
-		$this->seek(0);
-		$fh = fopen($destination, 'wb');
-		$rlen = $this->length;
-		$written = 0;
-		while ($this->offset < $this->length) {
-			$data = $this->read(min(1024, $rlen));
-			$rlen -= strlen($data);
-			$written += fwrite($fh, $data);
-		}
-		fclose($fh);
-
-		// Restore the original range
-		list($this->start, $this->end, $this->length) = $original;
-
-		return $written;
-	}
-
-	/**
-	 * Reads the given number of bytes from the archive file/data and moves the
-	 * offset pointer forward.
-	 *
-	 * @param   integer $num number of bytes to read
-	 *
-	 * @return  string   the byte string
-	 * @throws  InvalidArgumentException
-	 * @throws  RangeException
-	 */
-	protected function read($num)
-	{
-		if ($num == 0) return '';
-
-		// Check that enough data is available
-		$newPos = $this->offset + $num;
-		if ($num < 1 || $newPos > $this->length)
-			throw new InvalidArgumentException("Could not read {$num} bytes from offset {$this->offset}");
-
-		// Read the requested bytes
-		if ($this->file && is_resource($this->handle)) {
-			$read = fread($this->handle, $num);
-		} elseif ($this->data) {
-			$read = substr($this->data, $this->tell(), $num);
-		}
-
-		// Confirm the read length
-		if (!isset($read) || (($rlen = strlen($read)) < $num)) {
-			$rlen = isset($rlen) ? $rlen : 'none';
-			$this->error = "Not enough data to read ({$num} bytes requested, {$rlen} available)";
-			throw new RangeException($this->error);
-		}
-
-		// Move the data pointer
-		$this->offset = $newPos;
-
-		return $read;
-	}
-
-	/**
-	 * Moves the current offset pointer to a position in the stored data or file
-	 * relative to the start position.
-	 *
-	 * Note that seeking in files past the 2GB limit on 32-bit systems is either
-	 * impossible or needs an incredibly slow hack due to the fseek() pointer not
-	 * behaving after 2GB. The only real solution here is to use a 64-bit system.
-	 *
-	 * @param   integer $pos new pointer position
-	 *
-	 * @return  void
-	 * @throws  RuntimeException
-	 * @throws  InvalidArgumentException
-	 */
-	protected function seek($pos)
-	{
-		if ($pos > $this->length || $pos < 0)
-			throw new InvalidArgumentException("Could not seek to {$pos} (max: {$this->length})");
-
-		if ($this->file && is_resource($this->handle)) {
-			$max = PHP_INT_MAX;
-			$file_pos = $this->start + $pos;
-			if ($file_pos >= $max) {
-				$this->error = 'The file is too large for this PHP version (> ' . self::formatSize($max) . ')';
-				throw new RuntimeException($this->error);
-			}
-			fseek($this->handle, $file_pos, SEEK_SET);
-		}
-
-		$this->offset = $pos;
-	}
-
-	/**
-	 * Provides the absolute position within the current file/data rather than
-	 * the offset relative to the defined start position.
-	 *
-	 * @return  integer  the absolute file/data position
-	 */
-	protected function tell()
-	{
-		if ($this->file && is_resource($this->handle))
-			return ftell($this->handle);
-
-		return $this->start + $this->offset;
-	}
-
-	/**
-	 * Sets the file/data offset pointer to the starting position.
-	 *
-	 * @return  void
-	 */
-	protected function rewind()
-	{
-		if ($this->file && is_resource($this->handle)) {
-			rewind($this->handle);
-		}
-		$this->seek(0);
-	}
-
-	/**
-	 * Saves the current stored data to a temporary file and returns its name.
-	 *
-	 * @return  string  path to the temporary file
-	 */
-	protected function createTempDataFile()
-	{
-		list($hash, $dest) = $this->getTempFileName();
-
-		if (file_exists($dest))
-			return $this->tempFiles[$hash] = $dest;
-
-		file_put_contents($dest, $this->data);
-		chmod($dest, 0777);
-
-		return $this->tempFiles[$hash] = $dest;
-	}
-
-	/**
-	 * Calculates a temporary file name based on hashes of the given data string
-	 * or the stored data.
-	 *
-	 * @param   string $data the source data to be hashed
-	 *
-	 * @return  array   the hash and temporary file path values
-	 */
-	protected function getTempFileName($data = null)
-	{
-		$hash = $data ? md5($data) : md5(substr($this->data, 0, 16 * 1024));
-		$path = $this->getTempDirectory() . DIRECTORY_SEPARATOR . $hash . '.tmp';
-
-		return array($hash, $path);
-	}
-
-	/**
-	 * Returns the absolute path to the directory for storing temporary files,
-	 * and creates any parent directories if they don't already exist.
-	 *
-	 * @return  string  the temporary directory path
-	 */
-	protected function getTempDirectory()
-	{
-		$dir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'archivereader';
-		self::makeDirectory($dir);
-
-		return $dir;
-	}
-
-	/**
-	 * Deletes any temporary files created by the reader.
-	 *
-	 * @return  void
-	 */
-	protected function deleteTempFiles()
-	{
-		foreach ($this->tempFiles as $temp) {
-			@unlink($temp);
-		}
-		$this->tempFiles = array();
-	}
-
-	/**
-	 * Resets the instance variables before parsing new data.
-	 *
-	 * @return  void
-	 */
-	protected function reset()
-	{
-		$this->close();
-		$this->file = '';
-		$this->data = '';
-		$this->fileSize = 0;
-		$this->dataSize = 0;
-		$this->start = 0;
-		$this->end = 0;
-		$this->length = 0;
-		$this->offset = 0;
-		$this->error = '';
-		$this->isFragment = false;
-		$this->fileCount = 0;
-		$this->markerPosition = null;
-		$this->deleteTempFiles();
-		clearstatcache();
-	}
-
-} // End ArchiveReader class
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/rarinfo/rarinfo.php b/lib/copy_this/www/lib/rarinfo/rarinfo.php
deleted file mode 100644
index e66a75613..000000000
--- a/lib/copy_this/www/lib/rarinfo/rarinfo.php
+++ /dev/null
@@ -1,1647 +0,0 @@
-<?php
-
-require_once dirname(__FILE__) . '/archivereader.php';
-require_once dirname(__FILE__) . '/pipereader.php';
-
-/**
- * RarInfo class.
- *
- * A simple class for inspecting RAR file data and listing information about
- * the archive contents in pure PHP (no external dependencies). Data can be
- * streamed from a file or loaded directly from memory.
- *
- * Example usage:
- *
- * <code>
- *
- *   // Load the RAR file or data
- *   $rar = new RarInfo;
- *   $rar->open('./foo.rar'); // or $rar->setData($data);
- *   if ($rar->error) {
- *     echo "Error: {$rar->error}\n";
- *     exit;
- *   }
- *
- *   // Check encryption
- *   if ($rar->isEncrypted) {
- *     echo "Archive is password encrypted\n";
- *     exit;
- *   }
- *
- *   // Process the file list
- *   $files = $rar->getFileList();
- *   foreach ($files as $file) {
- *     if ($file['pass'] == true) {
- *       echo "File is passworded: {$file['name']}\n";
- *     }
- *     if ($file['compressed'] == false) {
- *       echo "Extracting uncompressed file: {$file['name']}\n";
- *       $rar->saveFileData($file['name'], "./destination/{$file['name']}");
- *       // or $data = $rar->getFileData($file['name']);
- *     }
- *   }
- *
- * </code>
- *
- * For RAR file fragments - i.e. that may not contain a valid Marker Block - add
- * TRUE as the second parameter for the open() or setData() methods to skip the
- * error messages and allow a forced search for valid File Header blocks.
- *
- * @author         Hecks
- * @copyright  (c) 2010-2014 Hecks
- * @license        Modified BSD
- * @version        5.6
- */
-class RarInfo extends ArchiveReader
-{
-	// ------ Class constants -----------------------------------------------------
-
-	/**#@+
-	 * RAR 1.5 - 4.x archive format values (thanks to Marko Kreen)
-	 */
-
-	// Block types
-	const BLOCK_MARK = 0x72;
-	const BLOCK_MAIN = 0x73;
-	const BLOCK_FILE = 0x74;
-	const BLOCK_OLD_COMMENT = 0x75;
-	const BLOCK_OLD_EXTRA = 0x76;
-	const BLOCK_OLD_SUB = 0x77;
-	const BLOCK_OLD_RECOVERY = 0x78;
-	const BLOCK_OLD_AUTH = 0x79;
-	const BLOCK_SUB = 0x7a;
-	const BLOCK_ENDARC = 0x7b;
-	const BLOCK_NULL = 0x00;
-
-	// Flags for BLOCK_MAIN
-	const MAIN_VOLUME = 0x0001;
-	const MAIN_COMMENT = 0x0002;
-	const MAIN_LOCK = 0x0004;
-	const MAIN_SOLID = 0x0008;
-	const MAIN_NEWNUMBERING = 0x0010;
-	const MAIN_AUTH = 0x0020;
-	const MAIN_RECOVERY = 0x0040;
-	const MAIN_PASSWORD = 0x0080;
-	const MAIN_FIRSTVOLUME = 0x0100;
-	const MAIN_ENCRYPTVER = 0x0200;
-
-	// Flags for BLOCK_FILE
-	const FILE_SPLIT_BEFORE = 0x0001;
-	const FILE_SPLIT_AFTER = 0x0002;
-	const FILE_PASSWORD = 0x0004;
-	const FILE_COMMENT = 0x0008;
-	const FILE_SOLID = 0x0010;
-	const FILE_DICTMASK = 0x00e0;
-	const FILE_DICT64 = 0x0000;
-	const FILE_DICT128 = 0x0020;
-	const FILE_DICT256 = 0x0040;
-	const FILE_DICT512 = 0x0060;
-	const FILE_DICT1024 = 0x0080;
-	const FILE_DICT2048 = 0x00a0;
-	const FILE_DICT4096 = 0x00c0;
-	const FILE_DIRECTORY = 0x00e0;
-	const FILE_LARGE = 0x0100;
-	const FILE_UNICODE = 0x0200;
-	const FILE_SALT = 0x0400;
-	const FILE_VERSION = 0x0800;
-	const FILE_EXTTIME = 0x1000;
-	const FILE_EXTFLAGS = 0x2000;
-
-	// Flags for BLOCK_ENDARC
-	const ENDARC_NEXT_VOLUME = 0x0001;
-	const ENDARC_DATACRC = 0x0002;
-	const ENDARC_REVSPACE = 0x0004;
-	const ENDARC_VOLNR = 0x0008;
-
-	// Flags for all blocks
-	const SKIP_IF_UNKNOWN = 0x4000;
-	const LONG_BLOCK = 0x8000;
-
-	// Subtypes for BLOCK_SUB
-	const SUBTYPE_COMMENT = 'CMT';
-	const SUBTYPE_ACL = 'ACL';
-	const SUBTYPE_STREAM = 'STM';
-	const SUBTYPE_UOWNER = 'UOW';
-	const SUBTYPE_AUTHVER = 'AV';
-	const SUBTYPE_RECOVERY = 'RR';
-	const SUBTYPE_OS2EA = 'EA2';
-	const SUBTYPE_BEOSEA = 'EABE';
-
-	// Compression methods
-	const METHOD_STORE = 0x30;
-	const METHOD_FASTEST = 0x31;
-	const METHOD_FAST = 0x32;
-	const METHOD_NORMAL = 0x33;
-	const METHOD_GOOD = 0x34;
-	const METHOD_BEST = 0x35;
-
-	// OS types
-	const OS_MSDOS = 0;
-	const OS_OS2 = 1;
-	const OS_WIN32 = 2;
-	const OS_UNIX = 3;
-	const OS_MACOS = 4;
-	const OS_BEOS = 5;
-
-	/**#@-*/
-
-	/**
-	 * Size in bytes of the main part of each block header.
-	 */
-	const HEADER_SIZE = 7;
-
-	/**
-	 * Format for unpacking the main part of each block header.
-	 */
-	const FORMAT_BLOCK_HEADER = 'vhead_crc/Chead_type/vhead_flags/vhead_size';
-
-	/**
-	 * Format for unpacking the remainder of a File block header.
-	 */
-	const FORMAT_FILE_HEADER = 'Vpack_size/Vunp_size/Chost_os/Vfile_crc/Vftime/Cunp_ver/Cmethod/vname_size/Vattr';
-
-	/**
-	 * RAR archive format version.
-	 */
-	const FMT_RAR14 = '1.4';
-	const FMT_RAR15 = '1.5';
-	const FMT_RAR50 = '5.0';
-
-	/**#@+
-	 * RAR 5.0 archive format values
-	 */
-
-	// Block types
-	const R50_BLOCK_MAIN = 0x01;
-	const R50_BLOCK_FILE = 0x02;
-	const R50_BLOCK_SERVICE = 0x03;
-	const R50_BLOCK_CRYPT = 0x04;
-	const R50_BLOCK_ENDARC = 0x05;
-
-	// Flags for all block types
-	const R50_HAS_EXTRA = 0x0001;
-	const R50_HAS_DATA = 0x0002;
-	const R50_SKIP_IF_UNKNOWN = 0x0004;
-	const R50_SPLIT_BEFORE = 0x0008;
-	const R50_SPLIT_AFTER = 0x0010;
-	const R50_IS_CHILD = 0x0020;
-	const R50_INHERITED = 0x0040;
-
-	// Service block types
-	const R50_SERVICE_COMMENT = 'CMT';
-	const R50_SERVICE_QUICKOPEN = 'QO';
-	const R50_SERVICE_ACL = 'ACL';
-	const R50_SERVICE_STREAM = 'STM';
-	const R50_SERVICE_RECOVERY = 'RR';
-
-	// Flags for R50_BLOCK_MAIN
-	const R50_MAIN_VOLUME = 0x0001;
-	const R50_MAIN_VOLNUMBER = 0x0002;
-	const R50_MAIN_SOLID = 0x0004;
-	const R50_MAIN_RECOVERY = 0x0008;
-	const R50_MAIN_LOCK = 0x0010;
-
-	// Flags for R50_BLOCK_FILE
-	const R50_FILE_DIRECTORY = 0x0001;
-	const R50_FILE_UTIME = 0x0002;
-	const R50_FILE_CRC32 = 0x0004;
-	const R50_FILE_UNPUNKNOWN = 0x0008;
-
-	// Flags for R50_BLOCK_ENDARC
-	const R50_ENDARC_NEXT_VOLUME = 0x0001;
-
-	// Extra record types for R50_BLOCK_MAIN
-	const R50_MEXTRA_LOCATOR = 0x01;
-
-	// Flags for R50_MEXTRA_LOCATOR
-	const R50_MEXTRA_LOC_QLIST = 0x0001;
-	const R50_MEXTRA_LOC_RR = 0x0002;
-
-	// Extra record types for R50_BLOCK_FILE
-	const R50_FEXTRA_CRYPT = 0x01;
-	const R50_FEXTRA_HASH = 0x02;
-	const R50_FEXTRA_HTIME = 0x03;
-	const R50_FEXTRA_VERSION = 0x04;
-	const R50_FEXTRA_REDIR = 0x05;
-	const R50_FEXTRA_UOWNER = 0x06;
-	const R50_FEXTRA_SUBDATA = 0x07;
-
-	// Flags for R50_FEXTRA_HTIME
-	const R50_FEXTRA_HT_UNIX = 0x0001;
-	const R50_FEXTRA_HT_MTIME = 0x0002;
-	const R50_FEXTRA_HT_CTIME = 0x0004;
-	const R50_FEXTRA_HT_ATIME = 0x0008;
-
-	// Compression methods
-	const R50_METHOD_STORE = 0;
-	const R50_METHOD_FASTEST = 1;
-	const R50_METHOD_FAST = 2;
-	const R50_METHOD_NORMAL = 3;
-	const R50_METHOD_GOOD = 4;
-	const R50_METHOD_BEST = 5;
-
-	// OS types
-	const R50_OS_WIN32 = 0;
-	const R50_OS_UNIX = 1;
-
-	/**#@-*/
-
-	// ------ Instance variables and methods ---------------------------------------
-
-	/**
-	 * Signature for the RAR Marker block.
-	 *
-	 * @var string
-	 */
-	protected $markerBlock = "\x52\x61\x72\x21\x1a\x07\x00";
-
-	/**
-	 * Signature for RAR 5.0 format archives.
-	 *
-	 * @var string
-	 */
-	protected $markerRar50 = "\x52\x61\x72\x21\x1a\x07\x01\x00";
-
-	/**
-	 * List of block names corresponding to block types.
-	 *
-	 * @var array
-	 */
-	protected $blockNames = array(
-		// RAR 1.5 - 4.x
-		self::BLOCK_MARK         => 'Marker',
-		self::BLOCK_MAIN         => 'Archive',
-		self::BLOCK_FILE         => 'File',
-		self::BLOCK_OLD_COMMENT  => 'Old Style Comment',
-		self::BLOCK_OLD_EXTRA    => 'Old Style Extra Info',
-		self::BLOCK_OLD_SUB      => 'Old Style Subblock',
-		self::BLOCK_OLD_RECOVERY => 'Old Style Recovery Record',
-		self::BLOCK_OLD_AUTH     => 'Old Style Archive Authenticity',
-		self::BLOCK_SUB          => 'Subblock',
-		self::BLOCK_ENDARC       => 'Archive End',
-		self::BLOCK_NULL         => 'Null Block',
-		// RAR 5.0
-		self::R50_BLOCK_MAIN     => 'Archive',
-		self::R50_BLOCK_FILE     => 'File',
-		self::R50_BLOCK_SERVICE  => 'Service',
-		self::R50_BLOCK_CRYPT    => 'Archive Encryption',
-		self::R50_BLOCK_ENDARC   => 'Archive End',
-	);
-
-	/**
-	 * List of the names corresponding to Subblock types (0x7a).
-	 *
-	 * @var array
-	 */
-	protected $subblockNames = array(
-		self::SUBTYPE_COMMENT  => 'Comment',
-		self::SUBTYPE_ACL      => 'Access Control List',
-		self::SUBTYPE_STREAM   => 'Stream',
-		self::SUBTYPE_UOWNER   => 'Owner/Group Information',
-		self::SUBTYPE_AUTHVER  => 'Authenticity Verification',
-		self::SUBTYPE_RECOVERY => 'Recovery Record',
-		self::SUBTYPE_OS2EA    => 'OS2EA',
-		self::SUBTYPE_BEOSEA   => 'BEOSEA',
-	);
-
-	/**
-	 * List of the names corresponding to RAR 5.0 Service types.
-	 *
-	 * @var array
-	 */
-	protected $serviceNames = array(
-		self::R50_SERVICE_COMMENT   => 'Archive Comment',
-		self::R50_SERVICE_QUICKOPEN => 'Archive Quick Open',
-		self::R50_SERVICE_ACL       => 'Access Control List',
-		self::R50_SERVICE_STREAM    => 'NTFS Stream',
-		self::R50_SERVICE_RECOVERY  => 'Recovery Record',
-	);
-
-	/**
-	 * Is the volume attribute set for the archive?
-	 *
-	 * @var boolean
-	 */
-	public $isVolume = false;
-
-	/**
-	 * Is authenticity information present?
-	 *
-	 * @var boolean
-	 */
-	public $hasAuth = false;
-
-	/**
-	 * Is a recovery record present?
-	 *
-	 * @var boolean
-	 */
-	public $hasRecovery = false;
-
-	/**
-	 * Is the archive encrypted with a password?
-	 *
-	 * @var boolean
-	 */
-	public $isEncrypted = false;
-
-	/**
-	 * The RAR format version for the current archive.
-	 *
-	 * @var string
-	 */
-	public $format = '';
-
-	/**
-	 * Any RAR 5.0 archive comments.
-	 *
-	 * @var string
-	 */
-	public $comments = '';
-
-	/**
-	 * Convenience method that outputs a summary list of the archive information,
-	 * useful for pretty-printing.
-	 *
-	 * @param   boolean $full     add file list to output?
-	 * @param   boolean $skipDirs should directory entries be skipped?
-	 *
-	 * @return  array     archive summary
-	 */
-	public function getSummary($full = false, $skipDirs = false)
-	{
-		$summary = array(
-			'file_name'    => $this->file,
-			'file_size'    => $this->fileSize,
-			'data_size'    => $this->dataSize,
-			'use_range'    => "{$this->start}-{$this->end}",
-			'is_volume'    => (int)$this->isVolume,
-			'has_auth'     => (int)$this->hasAuth,
-			'has_recovery' => (int)$this->hasRecovery,
-			'is_encrypted' => (int)$this->isEncrypted,
-			'rar_format'   => $this->format,
-		);
-		if ($this->comments) {
-			$summary['comments'] = $this->comments;
-		}
-		$fileList = $this->getFileList($skipDirs);
-		$summary['file_count'] = count($fileList);
-		if ($full) {
-			$summary['file_list'] = $fileList;
-		}
-		if ($this->error) {
-			$summary['error'] = $this->error;
-		}
-
-		return $summary;
-	}
-
-	/**
-	 * Returns a list of the blocks found in the archive, optionally in human-readable
-	 * format (for debugging purposes only).
-	 *
-	 * @param   boolean $format should the block data be formatted?
-	 * @param   boolean $asHex  should numeric values be displayed as hexadecimal?
-	 *
-	 * @return  array|boolean  list of blocks, or false if none available
-	 */
-	public function getBlocks($format = true, $asHex = false)
-	{
-		// Check that blocks are stored
-		if (empty($this->blocks)) {
-			return false;
-		}
-		if (!$format) {
-			return $this->blocks;
-		}
-
-		// Build a formatted block list
-		$ret = array();
-		foreach ($this->blocks as $block) {
-			$b = $this->formatBlock($block, $asHex);
-			if ($b['head_type'] == self::R50_BLOCK_SERVICE && !empty($block['file_name'])
-				&& $b['file_name'] == self::R50_SERVICE_QUICKOPEN
-			) {
-				// Format any cached blocks
-				foreach ($b['cache_data'] as &$cache) {
-					$cache['data'] = $this->formatBlock($cache['data'], $asHex);
-				}
-			}
-			$ret[] = $b;
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Parses the stored blocks and returns a list of records for each of the
-	 * files in the archive.
-	 *
-	 * @param   boolean $skipDirs should directory entries be skipped?
-	 *
-	 * @return  array  list of file records, empty if none are available
-	 */
-	public function getFileList($skipDirs = false)
-	{
-		$ret = array();
-		foreach ($this->blocks as $block) {
-			if (($block['head_type'] == self::BLOCK_FILE || $block['head_type'] == self::R50_BLOCK_FILE)
-				&& !empty($block['file_name'])
-			) {
-				if ($skipDirs && !empty($block['is_dir'])) {
-					continue;
-				}
-				$ret[] = $this->getFileBlockSummary($block);
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Returns a summary list of any RAR 5.0 Quick Open cached file headers.
-	 *
-	 * @param   boolean $skipDirs should directory entries be skipped?
-	 *
-	 * @return  array|boolean  list of file record, or false if none available
-	 */
-	public function getQuickOpenFileList($skipDirs = false)
-	{
-		// Check that blocks are stored
-		if (empty($this->blocks)) {
-			return false;
-		}
-
-		$ret = array();
-		foreach ($this->blocks as $block) {
-			if ($block['head_type'] == self::R50_BLOCK_SERVICE && !empty($block['file_name'])
-				&& $block['file_name'] == self::R50_SERVICE_QUICKOPEN
-			) {
-				// Build the cached file header list
-				foreach ($block['cache_data'] as $cache) {
-					if ($cache['data']['head_type'] == self::R50_BLOCK_FILE) {
-						if ($skipDirs && !empty($cache['data']['is_dir'])) {
-							continue;
-						}
-						$ret[] = $this->getFileBlockSummary($cache['data'], true);
-					}
-				}
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Retrieves the raw data for the given filename. Note that this is only useful
-	 * if the file isn't compressed.
-	 *
-	 * @param   string $filename name of the file to extract
-	 *
-	 * @return  string|boolean  file data, or false on error
-	 */
-	public function getFileData($filename)
-	{
-		// Check that blocks are stored and data source is available
-		if (empty($this->blocks) || ($this->data == '' && $this->handle == null))
-			return false;
-
-		// Get the absolute start/end positions
-		if (!($info = $this->getFileInfo($filename)) || empty($info['range'])) {
-			$this->error = "Could not find file info for: ({$filename})";
-
-			return false;
-		}
-		$this->error = '';
-
-		return $this->getRange(explode('-', $info['range']));
-	}
-
-	/**
-	 * Saves the raw data for the given filename to the given destination. This
-	 * is only useful if the file isn't compressed.
-	 *
-	 * @param   string $filename    name of the file to extract
-	 * @param   string $destination full path of the file to create
-	 *
-	 * @return  integer|boolean  number of bytes saved or false on error
-	 */
-	public function saveFileData($filename, $destination)
-	{
-		// Check that blocks are stored and data source is available
-		if (empty($this->blocks) || ($this->data == '' && $this->handle == null))
-			return false;
-
-		// Get the absolute start/end positions
-		if (!($info = $this->getFileInfo($filename)) || empty($info['range'])) {
-			$this->error = "Could not find file info for: ({$filename})";
-
-			return false;
-		}
-		$this->error = '';
-
-		return $this->saveRange(explode('-', $info['range']), $destination);
-	}
-
-	/**
-	 * Sets the absolute path to the external Unrar client.
-	 *
-	 * @param   string $client path to the client
-	 *
-	 * @return  void
-	 * @throws  InvalidArgumentException
-	 */
-	public function setExternalClient($client)
-	{
-		if ($client && (!is_file($client) || !is_executable($client)))
-			throw new InvalidArgumentException("Not a valid client: {$client}");
-
-		$this->externalClient = $client;
-	}
-
-	/**
-	 * Extracts a compressed or encrypted file using the configured external Unrar
-	 * client, optionally returning the data or saving it to file.
-	 *
-	 * @param   string $filename    name of the file to extract
-	 * @param   string $destination full path of the file to create
-	 * @param   string $password    password to use for decryption
-	 *
-	 * @return  mixed   extracted data, number of bytes saved or false on error
-	 */
-	public function extractFile($filename, $destination = null, $password = null)
-	{
-		if (!$this->externalClient || (!$this->file && !$this->data)) {
-			$this->error = 'An external client and valid data source are needed';
-
-			return false;
-		}
-
-		// Check that the file is extractable
-		if (!($info = $this->getFileInfo($filename))) {
-			$this->error = "Could not find file info for: ({$filename})";
-
-			return false;
-		}
-		if (!empty($info['pass']) && $password == null) {
-			$this->error = "The file is passworded: ({$filename})";
-
-			return false;
-		}
-
-		// Set the data file source
-		$source = $this->file ? $this->file : $this->createTempDataFile();
-
-		// Ensure that internal file paths are valid for Mac/*nix
-		if (DIRECTORY_SEPARATOR !== '\\') {
-			$filename = str_replace('\\', '/', $filename);
-		}
-
-		// Set the external command
-		$pass = $password ? '-p' . escapeshellarg($password) : '-p-';
-		$command = '"' . $this->externalClient . '"'
-			. " p -kb -y -c- -ierr -ip {$pass} -- "
-			. escapeshellarg($source) . ' ' . escapeshellarg($filename);
-
-		// Set STDERR to write to a temporary file
-		list($hash, $errorFile) = $this->getTempFileName($source . 'errors');
-		$this->tempFiles[$hash] = $errorFile;
-		$command .= ' 2> ' . escapeshellarg($errorFile);
-
-		// Start the new pipe reader
-		$pipe = new PipeReader;
-		if (!$pipe->open($command)) {
-			$this->error = $pipe->error;
-
-			return false;
-		}
-		$this->error = '';
-
-		// Open destination file or start buffer
-		if ($destination) {
-			$handle = fopen($destination, 'wb');
-			$written = 0;
-		} else {
-			$data = '';
-		}
-
-		// Buffer the piped data or save it to file
-		while ($read = $pipe->read(1024, false)) {
-			if ($destination) {
-				$written += fwrite($handle, $read);
-			} else {
-				$data .= $read;
-			}
-		}
-		if ($destination) {
-			fclose($handle);
-		}
-		$pipe->close();
-
-		// Check for errors (only after the pipe is closed)
-		if (($error = @file_get_contents($errorFile)) && strpos($error, 'All OK') === false) {
-			if ($destination) {
-				@unlink($destination);
-			}
-			$this->error = $error;
-
-			return false;
-		}
-
-		return $destination ? $written : $data;
-	}
-
-	/**
-	 * List of block types and Subblock subtypes without bodies.
-	 *
-	 * @var array
-	 */
-	protected $headersOnly = array(
-		'type'    => array(),
-		'subtype' => array()
-	);
-
-	/**
-	 * List of blocks found in the archive.
-	 *
-	 * @var array
-	 */
-	protected $blocks = array();
-
-	/**
-	 * Full path to the external Unrar client.
-	 *
-	 * @var string
-	 */
-	protected $externalClient = '';
-
-	/**
-	 * Returns block data in human-readable format (for debugging purposes only).
-	 *
-	 * @param   array   $block the block to format
-	 * @param   boolean $asHex should numeric values be displayed as hexadecimal?
-	 *
-	 * @return  array    the formatted block
-	 */
-	protected function formatBlock($block, $asHex = false)
-	{
-		$b = array();
-
-		// Add block descriptors
-		$b['type'] = isset($this->blockNames[$block['head_type']]) ? $this->blockNames[$block['head_type']] : 'Unknown';
-		if ($block['head_type'] == self::BLOCK_SUB && !empty($block['file_name'])
-			&& isset($this->subblockNames[$block['file_name']])
-		) {
-			$b['sub_type'] = $this->subblockNames[$block['file_name']];
-		}
-		if ($block['head_type'] == self::R50_BLOCK_SERVICE && !empty($block['file_name'])
-			&& isset($this->serviceNames[$block['file_name']])
-		) {
-			$b['name'] = $this->serviceNames[$block['file_name']];
-		}
-		$b += $block;
-
-		// Use hexadecimal values?
-		if ($asHex) {
-			array_walk_recursive($b, array('self', 'convert2hex'));
-		}
-
-		// Sanity check filename length
-		if (isset($b['file_name'])) {
-			$b['file_name'] = substr($b['file_name'], 0, $this->maxFilenameLength);
-		}
-
-		return $b;
-	}
-
-	/**
-	 * Returns a processed summary of a RAR File block.
-	 *
-	 * @param   array $block     a valid File block
-	 * @param   array $quickOpen is this a Quick Open cached block?
-	 *
-	 * @return  array  summary information
-	 */
-	protected function getFileBlockSummary($block, $quickOpen = false)
-	{
-		$ret = array(
-			'name'        => !empty($block['file_name']) ? substr($block['file_name'], 0, $this->maxFilenameLength) : 'Unknown',
-			'size'        => isset($block['unp_size']) ? $block['unp_size'] : 0,
-			'date'        => !empty($block['utime']) ? $block['utime'] : (!empty($block['ftime']) ? self::dos2unixtime($block['ftime']) : 0),
-			'pass'        => isset($block['has_password']) ? ((int)$block['has_password']) : 0,
-			'compressed'  => (int)($block['method'] != self::METHOD_STORE && $block['method'] != self::R50_METHOD_STORE),
-			'next_offset' => $block['next_offset'],
-		);
-		if (!empty($block['is_dir'])) {
-			$ret['is_dir'] = 1;
-		} elseif (!$quickOpen && !in_array(self::BLOCK_FILE, $this->headersOnly['type'])) {
-			$start = $this->start + $block['offset'] + $block['head_size'];
-			$end = min($this->end, $start + $block['pack_size'] - 1);
-			$ret['range'] = "{$start}-{$end}";
-		}
-		if (!empty($block['file_crc'])) {
-			$ret['crc32'] = dechex($block['file_crc']);
-		}
-		if (!empty($block['split_after']) || !empty($block['split_before'])) {
-			$ret['split'] = 1;
-		}
-		if (!empty($block['split_after'])) {
-			$ret['split_after'] = 1;
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Returns information for the given filename in the current file/data.
-	 *
-	 * @param   string $filename the filename to search
-	 *
-	 * @return  array|boolean  the file info or false on error
-	 */
-	protected function getFileInfo($filename)
-	{
-		foreach ($this->getFileList(true) as $file) {
-			if (isset($file['name']) && $file['name'] == $filename) {
-				return $file;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Searches for the position of a valid File header in the file/data up to
-	 * maxReadBytes, and sets it as the start of the data to analyze.
-	 *
-	 * This quite slow hack is only useful when handling RAR file fragments, and
-	 * only with RAR format 1.5 - 4.x.
-	 *
-	 * @return  integer|boolean  the header offset, or false if none is found
-	 */
-	protected function findFileHeader()
-	{
-		// Buffer the data to search
-		$start = $this->offset;
-		try {
-			$buffer = $this->read(min($this->length, $this->maxReadBytes));
-			$this->rewind();
-		} catch (Exception $e) {
-			return false;
-		}
-
-		// Get all the offsets to test
-		if (!($positions = self::strposall($buffer, pack('C', self::BLOCK_FILE))))
-			return false;
-
-		foreach ($positions as $offset) try {
-			$offset += $start;
-			$this->seek($offset - 2);
-
-			// Run a File header CRC & sanity check
-			$block = $this->getNextBlock();
-			if ($this->checkFileHeaderCRC($block)) {
-				$this->seek($block['offset'] + self::HEADER_SIZE);
-				$this->processBlock($block);
-				if ($this->sanityCheckFileHeader($block)) {
-
-					// A valid File header was found
-					$this->format = self::FMT_RAR15;
-
-					return $this->markerPosition = $block['offset'];
-				}
-			}
-
-			// No more readable data, or read error
-		} catch (Exception $e) {
-			continue;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Runs a File Header CRC check on a valid File block.
-	 *
-	 * @param   array $block a valid File block
-	 *
-	 * @return  boolean  false if CRC check fails
-	 */
-	protected function checkFileHeaderCRC($block)
-	{
-		// Not supported for RAR 5.0
-		if ($this->format == self::FMT_RAR50) {
-			return false;
-		}
-
-		try {
-			$this->seek($block['offset'] + 2);
-			$data = $this->read($block['head_size'] - 2);
-			$crc = crc32($data) & 0xffff;
-
-			return ($crc === $block['head_crc']);
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * File header CRC checks can produce false positives, so this is a
-	 * last-ditch attempt to verify that this is actually a valid header.
-	 *
-	 * @param   array   $block the block to sanity check
-	 * @param   integer $limit the minimum failure threshold
-	 *
-	 * @return  boolean  false if the sanity check fails
-	 */
-	protected function sanityCheckFileHeader($block, $limit = 3)
-	{
-		// Not supported for RAR 5.0
-		if ($this->format == self::FMT_RAR50) {
-			return false;
-		}
-
-		$fail = ($block['host_os'] > 5)
-			+ ($block['method'] > 0x35)
-			+ ($block['unp_ver'] > 50)
-			+ ($block['name_size'] > $this->maxFilenameLength)
-			+ ($block['pack_size'] > PHP_INT_MAX)
-			+ (isset($block['salt']) && !isset($block['has_password']));
-
-		return $fail < $limit;
-	}
-
-	/**
-	 * Returns the position of the archive marker/signature in the stored data or file.
-	 *
-	 * @return  mixed  Marker position, or false if marker is missing
-	 */
-	public function findMarker()
-	{
-		if ($this->markerPosition !== null)
-			return $this->markerPosition;
-
-		try {
-			$buff = $this->read(min($this->length, $this->maxReadBytes));
-			$this->rewind();
-			if (($pos = strpos($buff, $this->markerBlock)) !== false) {
-				$this->format = self::FMT_RAR15;
-			} elseif (($pos = strpos($buff, $this->markerRar50)) !== false) {
-				$this->format = self::FMT_RAR50;
-			}
-
-			return $this->markerPosition = $pos;
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Parses the RAR data and stores a list of valid blocks locally.
-	 *
-	 * @return  boolean  false if parsing fails
-	 */
-	protected function analyze()
-	{
-		// Find the RAR marker, if there is one
-		$startPos = $this->findMarker();
-		if ($this->format == self::FMT_RAR50) {
-			// Start after the RAR 5.0 marker signature
-			$this->seek($startPos + strlen($this->markerRar50));
-
-		} elseif ($startPos === false && !$this->isFragment) {
-
-			// Not a RAR fragment or valid file, so abort here
-			$this->error = 'Could not find Marker block, not a valid RAR file';
-
-			return false;
-
-		} elseif ($startPos !== false) {
-
-			// Start at the MARKER block
-			$this->seek($startPos);
-
-		} elseif ($this->isFragment) {
-
-			// Search for a valid file header and continue unpacking from there
-			if (($startPos = $this->findFileHeader()) === false) {
-				$this->error = 'Could not find a valid File header';
-
-				return false;
-			}
-			$this->seek($startPos);
-		}
-
-		// Analyze all valid blocks
-		while ($this->offset < $this->length) try {
-
-			// Get the next block header
-			$block = $this->getNextBlock();
-
-			// Process the current block by type
-			$this->processBlock($block);
-
-			// Add the current block to the list
-			$this->blocks[] = $block;
-
-			// Bail if this is an encrypted archive
-			if ($this->isEncrypted)
-				break;
-
-			// Skip to the next block, if any
-			if ($this->offset != $block['next_offset']) {
-				$this->seek($block['next_offset']);
-			}
-
-			// Sanity check
-			if ($block['offset'] == $this->offset) {
-				$this->error = 'Parsing seems to be stuck';
-				$this->close();
-
-				return false;
-			}
-
-			// No more readable data, or read error
-		} catch (Exception $e) {
-			if ($this->error) {
-				$this->close();
-
-				return false;
-			}
-			break;
-		}
-
-		// Check for valid blocks
-		if (empty($this->blocks)) {
-			$this->error = 'No valid RAR blocks were found';
-
-			return false;
-		}
-
-		// Analysis was successful
-		return true;
-	}
-
-	/**
-	 * Reads the start of the next block header and returns the common block
-	 * info before further processing by block type.
-	 *
-	 * @return  array  the next block header info
-	 */
-	protected function getNextBlock()
-	{
-		if ($this->format == self::FMT_RAR50)
-			return $this->getNextBlockR50();
-
-		// Start the block info
-		$block = array('offset' => $this->offset);
-
-		// Unpack the block header
-		$block += self::unpack(self::FORMAT_BLOCK_HEADER, $this->read(self::HEADER_SIZE), false);
-
-		// Check for add_size field
-		if (($block['head_flags'] & self::LONG_BLOCK)
-			&& ($block['head_type'] != self::BLOCK_FILE)
-			&& ($block['head_type'] != self::BLOCK_SUB)
-		) {
-			$block += self::unpack('Vadd_size', $this->read(4));
-		} else {
-			$block['add_size'] = 0;
-		}
-
-		// Sanity check header size
-		$block['head_size'] = max(self::HEADER_SIZE, $block['head_size']);
-
-		// Add offset info for next block (if any)
-		$block['next_offset'] = $block['offset'] + $block['head_size'] + $block['add_size'];
-
-		// Return the block info
-		return $block;
-	}
-
-	/**
-	 * Processes a block passed by reference based on its type.
-	 *
-	 * @param   array $block the block to process
-	 *
-	 * @return  void
-	 */
-	protected function processBlock(&$block)
-	{
-		if ($this->format == self::FMT_RAR50)
-			return $this->processBlockR50($block);
-
-		// Block type: ARCHIVE
-		if ($block['head_type'] == self::BLOCK_MAIN) {
-
-			// Unpack the remainder of the Archive block header
-			$block += self::unpack('vreserved1/Vreserved2', $this->read(6));
-
-			// Parse Archive flags
-			if ($block['head_flags'] & self::MAIN_VOLUME) {
-				$block['is_volume'] = true;
-				$this->isVolume = true;
-			}
-			if ($block['head_flags'] & self::MAIN_AUTH) {
-				$block['has_auth'] = true;
-				$this->hasAuth = true;
-			}
-			if ($block['head_flags'] & self::MAIN_RECOVERY) {
-				$block['has_recovery'] = true;
-				$this->hasRecovery = true;
-			}
-			if ($block['head_flags'] & self::MAIN_PASSWORD) {
-				$block['is_encrypted'] = 1;
-				$this->isEncrypted = true;
-			}
-		} // Block type: ARCHIVE END
-		elseif ($block['head_type'] == self::BLOCK_ENDARC) {
-			$block['more_volumes'] = (bool)($block['head_flags'] & self::ENDARC_NEXT_VOLUME);
-		} // Block type: NULL BLOCK (zero-padded)
-		elseif ($block['head_type'] == self::BLOCK_NULL) {
-			$remainder = $this->length - $block['offset'] - $block['head_size'];
-			if ($remainder < self::HEADER_SIZE) {
-				$block['next_offset'] = $this->length;
-				$block['add_size'] = $remainder;
-			}
-		} // Block type: FILE or SUBBLOCK (new style)
-		elseif ($block['head_type'] == self::BLOCK_FILE || $block['head_type'] == self::BLOCK_SUB) {
-
-			// Unpack the remainder of the block header
-			$block += self::unpack(self::FORMAT_FILE_HEADER, $this->read(25));
-
-			// Large file sizes
-			if ($block['head_flags'] & self::FILE_LARGE) {
-				$block += self::unpack('Vhigh_pack_size/Vhigh_unp_size', $this->read(8));
-				$block['pack_size'] = self::int64($block['pack_size'], $block['high_pack_size']);
-				$block['unp_size'] = self::int64($block['unp_size'], $block['high_unp_size']);
-			}
-
-			// Is this a directory entry?
-			if (($block['head_flags'] & self::FILE_DICTMASK) == self::FILE_DIRECTORY) {
-				$block['is_dir'] = true;
-			}
-
-			// Filename: unicode
-			if ($block['head_flags'] & self::FILE_UNICODE) {
-
-				// Split the standard filename and unicode data from the file_name field
-				$fn = explode("\x00", $this->read($block['name_size']));
-
-				// Decompress the unicode filename, encode the result as UTF-8
-				$uc = new RarUnicodeFilename($fn[0], $fn[1]);
-				if ($ucname = $uc->decode()) {
-					$block['file_name'] = @iconv('UTF-16LE', 'UTF-8//IGNORE//TRANSLIT', $ucname);
-
-					// Fallback to the standard filename
-				} else {
-					$block['file_name'] = $fn[0];
-				}
-
-				// Filename: non-unicode
-			} else {
-				$block['file_name'] = $this->read($block['name_size']);
-			}
-
-			// Salt (optional)
-			if ($block['head_flags'] & self::FILE_SALT) {
-				$block['salt'] = $this->read(8);
-			}
-
-			// Extended time fields (optional)
-			if ($block['head_flags'] & self::FILE_EXTTIME) {
-				$block['ext_time'] = true;
-			}
-
-			// Encrypted with password?
-			if ($block['head_flags'] & self::FILE_PASSWORD) {
-				$block['has_password'] = true;
-			}
-
-			// Continued from previous volume?
-			if ($block['head_flags'] & self::FILE_SPLIT_BEFORE) {
-				$block['split_before'] = true;
-			}
-
-			// Continued in next volume?
-			if ($block['head_flags'] & self::FILE_SPLIT_AFTER) {
-				$block['split_after'] = true;
-			}
-
-			// Increment the file count
-			if ($block['head_type'] == self::BLOCK_FILE) {
-				$this->fileCount++;
-			}
-
-			// Update next header block offset
-			if (($block['head_type'] == self::BLOCK_FILE && !in_array(self::BLOCK_FILE, $this->headersOnly['type']))
-				|| ($block['head_type'] == self::BLOCK_SUB && !in_array($block['file_name'], $this->headersOnly['subtype']))
-			) {
-				$block['next_offset'] += $block['pack_size'];
-			}
-		}
-
-		// Parse any useful Subblock info
-		if ($block['head_type'] == self::BLOCK_SUB) {
-
-			// Authenticity verification
-			if ($block['file_name'] == self::SUBTYPE_AUTHVER) {
-				$block += self::unpack('vav_name_size', $this->read(2));
-				$block['av_file_name'] = $this->read($block['av_name_size']);
-				$block += self::unpack('vav_unknown/vav_cname_size', $this->read(4)); // guesswork
-				$block['av_created_by'] = $this->read($block['av_cname_size']);
-			}
-		}
-	}
-
-	/**
-	 * Reads the start of the next Rar 5.0 block header and returns the common
-	 * block info before further processing by block type.
-	 *
-	 * @return  array  the next block header info
-	 */
-	protected function getNextBlockR50()
-	{
-		// Start the block info
-		$block = array('offset' => $this->offset);
-
-		// Unpack the main part of the header
-		$block += self::unpack('Vhead_crc', $this->read(4));
-		$block['head_size_r'] = $this->getVarInt();
-		$block['head_size'] = $this->offset - $block['offset'] + $block['head_size_r'];
-		$block['head_type'] = $this->getVarInt();
-		$block['head_flags'] = $this->getVarInt();
-
-		// Optional extra area and data area sizes
-		if ($block['head_flags'] & self::R50_HAS_EXTRA) {
-			$block['extra_size'] = $this->getVarInt();
-		}
-		if ($block['head_flags'] & self::R50_HAS_DATA) {
-			$block['data_size'] = $this->getVarInt();
-		}
-
-		// Sanity check header size
-		$block['head_size'] = max(self::HEADER_SIZE, $block['head_size']);
-
-		// Add offset info for next block (if any)
-		$block['next_offset'] = $block['offset'] + $block['head_size'];
-		if (isset($block['data_size'])) {
-			$block['next_offset'] += $block['data_size'];
-		}
-
-		// Return the block info
-		return $block;
-	}
-
-	/**
-	 * Processes a RAR 5.0 block passed by reference based on its type.
-	 *
-	 * @param   array $block     the block to process
-	 * @param   array $quickOpen is this a Quick Open cached block?
-	 *
-	 * @return  void
-	 * @throws  RuntimeException
-	 */
-	protected function processBlockR50(&$block, $quickOpen = false)
-	{
-		// Block type: ARCHIVE
-		if ($block['head_type'] == self::R50_BLOCK_MAIN) {
-			$block['flags'] = $this->getVarInt();
-
-			if ($block['flags'] & self::R50_MAIN_VOLUME) {
-				$block['is_volume'] = true;
-				$this->isVolume = true;
-			}
-			if ($block['flags'] & self::R50_MAIN_VOLNUMBER) {
-				$block['vol_number'] = $this->getVarInt();
-			}
-			if ($block['flags'] & self::R50_MAIN_RECOVERY) {
-				$block['has_recovery'] = true;
-				$this->hasRecovery = true;
-			}
-		} // Block type: ARCHIVE END
-		elseif ($block['head_type'] == self::R50_BLOCK_ENDARC) {
-			$block['flags'] = $this->getVarInt();
-			$block['more_volumes'] = (bool)($block['flags'] & self::R50_ENDARC_NEXT_VOLUME);
-		} // Block type: ARCHIVE ENCRYPTION
-		elseif ($block['head_type'] == self::R50_BLOCK_CRYPT) {
-			$this->isEncrypted = true;
-		} // Block type: FILE or SERVICE
-		elseif ($block['head_type'] == self::R50_BLOCK_FILE
-			|| $block['head_type'] == self::R50_BLOCK_SERVICE
-		) {
-			if (!isset($block['data_size']))
-				throw new RuntimeException('Required block data size is missing');
-
-			$block['flags'] = $this->getVarInt();
-			$block['pack_size'] = $block['data_size'];
-			$block['unp_size'] = $this->getVarInt();
-			$block['attr'] = $this->getVarInt();
-			$block['utime'] = 0;
-
-			if ($block['flags'] & self::R50_FILE_UTIME) {
-				$block += self::unpack('Vutime', $this->read(4));
-			}
-			if ($block['flags'] & self::R50_FILE_CRC32) {
-				$block += self::unpack('Vfile_crc', $this->read(4));
-			}
-			if ($block['flags'] & self::R50_FILE_DIRECTORY) {
-				$block['is_dir'] = true;
-			}
-
-			$block['comp_info'] = $this->getVarInt();
-			$block['unp_ver'] = $block['comp_info'] & 0x3f;
-			$block['method'] = ($block['comp_info'] >> 7) & 7;
-			$block['host_os'] = $this->getVarInt();
-			$block['name_size'] = $this->getVarInt();
-			$block['file_name'] = $this->read($block['name_size']);
-
-			// Increment the file count
-			if ($block['head_type'] == self::R50_BLOCK_FILE && !$quickOpen) {
-				$this->fileCount++;
-			}
-
-			if ($block['head_type'] == self::R50_BLOCK_SERVICE && !$quickOpen) {
-
-				// Add any archive comments
-				if ($block['file_name'] == self::R50_SERVICE_COMMENT) {
-					$this->comments = $this->read($block['pack_size']);
-
-					// Add the quick open data
-				} elseif ($block['file_name'] == self::R50_SERVICE_QUICKOPEN) {
-					$this->processQuickOpenRecords($block);
-				}
-			}
-		}
-
-		// Continued from previous volume?
-		if ($block['head_flags'] & self::R50_SPLIT_BEFORE) {
-			$block['split_before'] = true;
-		}
-
-		// Continued in next volume?
-		if ($block['head_flags'] & self::R50_SPLIT_AFTER) {
-			$block['split_after'] = true;
-		}
-
-		// Process any extra records
-		if ($block['head_flags'] & self::R50_HAS_EXTRA) {
-			$this->processExtraRecords($block);
-		}
-	}
-
-	/**
-	 * Processes the RAR 5.0 Quick Open block data and stores any cached headers.
-	 *
-	 * @param   array $block the block to process
-	 *
-	 * @return  void
-	 */
-	protected function processQuickOpenRecords(&$block)
-	{
-		$end = $this->offset + $block['data_size'];
-		while ($this->offset < $end) {
-
-			// Start the cache record
-			$cache = array('offset' => $this->offset);
-			$cache += self::unpack('Vcrc32', $this->read(4));
-			$cache['size'] = $this->getVarInt();
-			$cache['flags'] = $this->getVarInt();
-			$cache['quick_offset'] = $this->getVarInt();
-			$cache['data_size'] = $this->getVarInt();
-			$cache['next'] = $this->offset + $cache['data_size'];
-
-			// Process the cached header data
-			$data = $this->getNextBlockR50();
-			$this->processBlockR50($data, true);
-			$cache['data'] = $data;
-
-			// Store the cached data
-			$block['cache_data'][] = $cache;
-			if ($this->offset != $cache['next']) {
-				$this->seek($cache['next']);
-			}
-		}
-	}
-
-	/**
-	 * Processes the extra records of a RAR 5.0 block passed by reference.
-	 *
-	 * @param   array $block the block to process
-	 *
-	 * @return  void
-	 */
-	protected function processExtraRecords(&$block)
-	{
-		$end = $this->offset + $block['extra_size'];
-		while ($this->offset < $end) {
-
-			// Start with the record size and type
-			$rec = array(
-				'name'   => 'Unknown',
-				'offset' => $this->offset,
-				'size'   => $size = $this->getVarInt(),
-				'next'   => $this->offset + $size,
-				'type'   => $this->getVarInt(),
-			);
-
-			// Block type: ARCHIVE
-			if ($block['head_type'] == self::R50_BLOCK_MAIN) {
-				if ($rec['type'] == self::R50_MEXTRA_LOCATOR) {
-					$rec['name'] = 'Locator';
-					$rec['flags'] = $this->getVarInt();
-
-					if ($rec['flags'] & self::R50_MEXTRA_LOC_QLIST) {
-						$rec['quick'] = $this->getVarInt();
-					}
-					if ($rec['flags'] & self::R50_MEXTRA_LOC_RR) {
-						$rec['rr'] = $this->getVarInt();
-					}
-				}
-			} // Block type: FILE
-			elseif ($block['head_type'] == self::R50_BLOCK_FILE) {
-				if ($rec['type'] == self::R50_FEXTRA_CRYPT) {
-					$rec['name'] = 'File encryption';
-					$block['has_password'] = true;
-				} elseif ($rec['type'] == self::R50_FEXTRA_HASH) {
-					$rec['name'] = 'File hash';
-				} elseif ($rec['type'] == self::R50_FEXTRA_HTIME) {
-					$rec['name'] = 'File time';
-					$rec['flags'] = $this->getVarInt();
-					$rec['unix'] = (bool)($rec['flags'] & self::R50_FEXTRA_HT_UNIX);
-
-					if ($rec['flags'] & self::R50_FEXTRA_HT_MTIME) {
-						if ($rec['unix']) {
-							$rec += self::unpack('Vmtime', $this->read(4));
-							$block['utime'] = $rec['mtime'];
-						} else {
-							$rec += self::unpack('Vmtime/Vmtime_high', $this->read(8));
-							$block['utime'] = self::win2unixtime($rec['mtime'], $rec['mtime_high']);
-						}
-					}
-					if ($rec['flags'] & self::R50_FEXTRA_HT_CTIME) {
-						if ($rec['unix']) {
-							$rec += self::unpack('Vctime', $this->read(4));
-						} else {
-							$rec += self::unpack('Vctime/Vctime_high', $this->read(8));
-						}
-					}
-					if ($rec['flags'] & self::R50_FEXTRA_HT_ATIME) {
-						if ($rec['unix']) {
-							$rec += self::unpack('Vatime', $this->read(4));
-						} else {
-							$rec += self::unpack('Vatime/Vatime_high', $this->read(8));
-						}
-					}
-				} elseif ($rec['type'] == self::R50_FEXTRA_VERSION) {
-					$rec['name'] = 'File version';
-				} elseif ($rec['type'] == self::R50_FEXTRA_REDIR) {
-					$rec['name'] = 'Redirection';
-				} elseif ($rec['type'] == self::R50_FEXTRA_UOWNER) {
-					$rec['name'] = 'Unix owner';
-				} elseif ($rec['type'] == self::R50_FEXTRA_SUBDATA) {
-					$rec['name'] = 'Service data';
-				}
-			}
-
-			// Add the extra record
-			$block['extra'][] = $rec;
-			if ($this->offset != $rec['next']) {
-				$this->seek($rec['next']);
-			}
-		}
-	}
-
-	/**
-	 * Reads a RAR 5.0 variable length integer value from the current offset,
-	 * which may be an unsigned integer or float depending on the size and system.
-	 *
-	 * The high bit of each byte in the little-endian sequence is a continuation
-	 * flag (where 0 = end of the sequence), the remaining 7 bits are the value.
-	 * The maximum value is an unsigned 64-bit integer in a 10-byte sequence.
-	 *
-	 * @return  integer|float  the variable length value, or zero on under/overflow
-	 */
-	protected function getVarInt()
-	{
-		$shift = $low = $high = 0;
-		$count = 1;
-
-		while ($this->offset < $this->length && $count <= 10) {
-			$byte = ord($this->read(1));
-			if ($count < 5) {
-				$low += ($byte & 0x7f) << $shift;
-			} elseif ($count == 5) {
-				$low += ($byte & 0x0f) << $shift; // 4 bits
-				$high += ($byte >> 4) & 0x07; // 3 bits
-				$shift = -4;
-			} elseif ($count > 5) {
-				$high += ($byte & 0x7f) << $shift;
-			}
-			if (($byte & 0x80) === 0) {
-				if ($low < 0) {
-					$low += 0x100000000;
-				}
-				if ($high < 0) {
-					$high += 0x100000000;
-				}
-
-				return ($high ? self::int64($low, $high) : $low);
-			}
-			$shift += 7;
-			$count += 1;
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Resets the instance variables before parsing new data.
-	 *
-	 * @return  void
-	 */
-	protected function reset()
-	{
-		parent::reset();
-		$this->isVolume = false;
-		$this->hasAuth = false;
-		$this->hasRecovery = false;
-		$this->isEncrypted = false;
-		$this->blocks = array();
-		$this->format = '';
-		$this->comments = '';
-	}
-
-} // End RarInfo class
-
-/**
- * RarUnicodeFilename class.
- *
- * This utility class handles the unicode filename decompression for RAR files. It is
- * adapted directly from Marko Kreen's python script rarfile.py.
- *
- * @link    https://github.com/markokr/rarfile
- *
- * @version 1.2
- */
-class RarUnicodeFilename
-{
-	/**
-	 * Initializes the class instance.
-	 *
-	 * @param   string $stdName the standard filename
-	 * @param   string $encData the unicode data
-	 *
-	 * @return  void
-	 */
-	public function __construct($stdName, $encData)
-	{
-		$this->stdName = $stdName;
-		$this->encData = $encData;
-	}
-
-	/**
-	 * Decompresses the unicode filename by combining the standard filename with
-	 * the additional unicode data, return value is encoded as UTF-16LE.
-	 *
-	 * @return  mixed  the unicode filename, or false on failure
-	 */
-	public function decode()
-	{
-		$highByte = $this->encByte();
-		$encDataLen = strlen($this->encData);
-		$flagBits = 0;
-
-		while ($this->encPos < $encDataLen) {
-			if ($flagBits == 0) {
-				$flags = $this->encByte();
-				$flagBits = 8;
-			}
-			$flagBits -= 2;
-
-			switch (($flags >> $flagBits) & 3) {
-				case 0:
-					$this->put($this->encByte(), 0);
-					break;
-				case 1:
-					$this->put($this->encByte(), $highByte);
-					break;
-				case 2:
-					$this->put($this->encByte(), $this->encByte());
-					break;
-				default:
-					$n = $this->encByte();
-					if ($n & 0x80) {
-						$c = $this->encByte();
-						for ($i = 0; $i < (($n & 0x7f) + 2); $i++) {
-							$lowByte = ($this->stdByte() + $c) & 0xFF;
-							$this->put($lowByte, $highByte);
-						}
-					} else {
-						for ($i = 0; $i < ($n + 2); $i++) {
-							$this->put($this->stdByte(), 0);
-						}
-					}
-			}
-		}
-
-		// Return the unicode string
-		if ($this->failed) {
-			return false;
-		}
-
-		return $this->output;
-	}
-
-	/**
-	 * The standard filename data.
-	 *
-	 * @var string
-	 */
-	protected $stdName;
-
-	/**
-	 * The unicode data used for processing.
-	 *
-	 * @var string
-	 */
-	protected $encData;
-
-	/**
-	 * Pointer for the standard filename data.
-	 *
-	 * @var integer
-	 */
-	protected $pos = 0;
-
-	/**
-	 * Pointer for the unicode data.
-	 *
-	 * @var integer
-	 */
-	protected $encPos = 0;
-
-	/**
-	 * Did the decompression fail?
-	 *
-	 * @var boolean
-	 */
-	protected $failed = false;
-
-	/**
-	 * Decompressed unicode filename string.
-	 *
-	 * @var string
-	 */
-	protected $output;
-
-	/**
-	 * Gets the current byte value from the unicode data and increments the
-	 * pointer if successful.
-	 *
-	 * @return  integer  encoded byte value, or 0 on fail
-	 */
-	protected function encByte()
-	{
-		if (isset($this->encData[$this->encPos])) {
-			$ret = ord($this->encData[$this->encPos]);
-		} else {
-			$this->failed = true;
-			$ret = 0;
-		}
-		$this->encPos++;
-
-		return $ret;
-	}
-
-	/**
-	 * Gets the current byte value from the standard filename data.
-	 *
-	 * @return  integer  standard byte value, or placeholder on fail
-	 */
-	protected function stdByte()
-	{
-		if (isset($this->stdName[$this->pos])) {
-			return ord($this->stdName[$this->pos]);
-		}
-		$this->failed = true;
-
-		return ord('?');
-	}
-
-	/**
-	 * Builds the output for the unicode filename string in 16-bit blocks (UTF-16LE).
-	 *
-	 * @param   integer $low  low byte value
-	 * @param   integer $high high byte value
-	 *
-	 * @return  void
-	 */
-	protected function put($low, $high)
-	{
-		$this->output .= chr($low);
-		$this->output .= chr($high);
-		$this->pos++;
-	}
-
-} // End RarUnicodeFilename class
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/recaptchalib.php b/lib/copy_this/www/lib/recaptchalib.php
deleted file mode 100644
index f285e3200..000000000
--- a/lib/copy_this/www/lib/recaptchalib.php
+++ /dev/null
@@ -1,274 +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]);
-
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/releasecomments.php b/lib/copy_this/www/lib/releasecomments.php
deleted file mode 100644
index 7c6a150d3..000000000
--- a/lib/copy_this/www/lib/releasecomments.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/site.php");
-
-/**
- * This class handles storage and retrieval of release comments.
- */
-class ReleaseComments
-{
-	/**
-	 * Get a comment by id.
-	 */
-	public function getCommentById($id)
-	{
-		$db = new DB();
-		return $db->queryOneRow(sprintf("SELECT * FROM releasecomment WHERE id = %d", $id));
-	}
-
-	/**
-	 * Get all comments for a GID.
-	 */
-	public function getCommentsByGid($gid)
-	{
-		$db = new DB();
-		return $db->query(sprintf("SELECT rc.id, text, createddate, sourceid, CASE WHEN sourceid = 0 THEN (SELECT username FROM users WHERE id = userid) ELSE username END AS username, CASE WHEN sourceid = 0 THEN (SELECT role FROM users WHERE id = userid) ELSE '-1' END AS role, CASE WHEN sourceid =0 THEN (SELECT r.name AS rolename FROM users AS u LEFT JOIN userroles AS r ON r.id = u.role WHERE u.id = userid) ELSE (SELECT description AS rolename FROM spotnabsources WHERE id = sourceid) END AS rolename FROM releasecomment rc WHERE isvisible = 1  AND gid = %s AND (userid IN (SELECT id FROM users) OR rc.username IS NOT NULL) ORDER BY createddate DESC LIMIT 100", $db->escapeString($gid)));
-	}
-
-	/**
-	 * Get all comments for a release.GUID.
-	 */
-	public function getCommentsByGuid($guid)
-	{
-		$db = new DB();
-		return $db->query(sprintf("SELECT rc.id, text, createddate, sourceid, CASE WHEN sourceid = 0 THEN (SELECT username FROM users WHERE id = userid) ELSE username END AS username FROM releasecomment rc LEFT JOIN releases r ON r.gid = rc.gid WHERE isvisible = 1 AND guid = %s AND (userid IN (SELECT id FROM users) OR rc.username IS NOT NULL) ORDER BY createddate DESC LIMIT 100", $db->escapeString($guid)));
-	}
-
-	/**
-	 * Get all count of all comments.
-	 */
-	public function getCommentCount($refdate=Null, $localOnly=Null)
-	{
-		$db = new DB();
-		if($refdate !== Null){
-			if(is_string($refdate)){
-			    // ensure we're in the right format
-				$refdate=date("Y-m-d H:i:s", strtotime($refdate));
-			}else if(is_int($refdate)){
-			    // ensure we're in the right format
-				$refdate=date("Y-m-d H:i:s", $refdate);
-			}else{
-				// leave it as null (bad content anyhow)
-				$refdate = Null;
-			}
-		}
-
-		$q = "SELECT count(id) AS num FROM releasecomment";
-		$clause = array();
-		if($refdate !== Null)
-			$clause[] = "createddate >= '$refdate'";
-
-        // set localOnly to Null to include both local and remote
-        // set localOnly to true to only receive local comment count
-        // set localOnly to false to only receive remote comment count
-		if($localOnly === true){
-			$clause[] = "sourceid = 0";
-		}else if($localOnly === false){
-			$clause[] = "sourceid != 0";
-		}
-
-		if(count($clause))
-			$q .= " WHERE ".implode(" AND ", $clause);
-
-		$res = $db->queryOneRow($q);
-		return $res["num"];
-	}
-
-	/**
-	 * Delete a comment.
-	 */
-	public function deleteComment($id)
-	{
-		$db = new DB();
-		$res = $this->getCommentById($id);
-		if ($res)
-		{
-			$db->queryExec(sprintf("update releasecomment SET isvisible = 0 WHERE id = %d", $id));
-			$this->updateReleaseCommentCount($res["gid"]);
-		}
-	}
-
-	/**
-	 * Delete all comments for a release.id.
-	 */
-	public function deleteCommentsForRelease($id)
-	{
-		$db = new DB();
-		$res = $this->getCommentById($id);
-		if ($res)
-		{
-			$db->queryExec(sprintf("DELETE rc.* FROM releasecomment rc JOIN releases r ON r.gid = rc.gid WHERE r.id = %d", $id));
-			$this->updateReleaseCommentCount($res["gid"]);
-		}
-	}
-
-	/**
-	 * Delete all comments for a users.id.
-	 */
-	public function deleteCommentsForUser($id)
-	{
-		$db = new DB();
-
-		$numcomments = $this->getCommentCountForUser($id);
-		if ($numcomments > 0)
-		{
-			$comments = $this->getCommentsForUserRange($id, 0, $numcomments);
-			foreach ($comments as $comment)
-			{
-				$this->deleteComment($comment["id"]);
-				$this->updateReleaseCommentCount($comment["gid"]);
-			}
-		}
-	}
-
-	/**
-	 * Add a releasecomment row.
-	 */
-	public function addComment($id, $gid, $text, $userid, $host)
-	{
-		if(strlen(trim($text)) == 0)
-			return false;
-
-		$db = new DB();
-
-		$site = new Sites();
-		$s = $site->get();
-		if ($s->storeuserips != "1")
-			$host = "";
-
-		$comid = $db->queryInsert(sprintf("INSERT INTO releasecomment (releaseid, gid, text, userid, createddate, host) VALUES (%d, %s, %s, %d, now(), %s)", $id, $db->escapeString($gid), $db->escapeString($text), $userid, $db->escapeString($host)));
-		$this->updateReleaseCommentCount($gid);
-		return $comid;
-	}
-
-	/**
-	 * Get releasecomment rows by limit.
-	 */
-	public function getCommentsRange($start, $num)
-	{
-		$db = new DB();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$sql = "SELECT rc.id, userid, guid, text, createddate, sourceid, CASE WHEN sourceid = 0 THEN (SELECT username FROM users WHERE id = userid) ELSE username END AS username, CASE WHEN sourceid = 0 THEN (SELECT role FROM users WHERE id = userid) ELSE '-1' END AS role, CASE WHEN sourceid =0 THEN (SELECT r.name AS rolename FROM users AS u LEFT JOIN userroles AS r ON r.id = u.role WHERE u.id = userid) ELSE (SELECT description AS rolename FROM spotnabsources WHERE id = sourceid) END AS rolename FROM releasecomment rc LEFT JOIN releases r ON r.gid = rc.gid WHERE isvisible = 1 AND (userid IN (SELECT id FROM users) OR rc.username IS NOT NULL) ORDER BY createddate DESC ".$limit;
-		return $db->query($sql);
-	}
-
-	/**
-	 * Update the denormalised count of comments for a release.
-	 */
-	public function updateReleaseCommentCount($gid)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("update releases
-				SET comments = (SELECT count(id) FROM releasecomment WHERE releasecomment.gid = releases.gid AND isvisible = 1)
-				WHERE releases.gid = %s", $db->escapeString($gid) ));
-	}
-
-	/**
-	 * Get a count of all comments for a user.
-	 */
-	public function getCommentCountForUser($uid)
-	{
-		$db = new DB();
-		$res = $db->queryOneRow(sprintf("SELECT count(id) AS num FROM releasecomment WHERE userid = %d AND isvisible = 1", $uid));
-		return $res["num"];
-	}
-
-	/**
-	 * Get comments for a user by limit.
-	 */
-	public function getCommentsForUserRange($uid, $start, $num)
-	{
-		$db = new DB();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		return $db->query(sprintf("SELECT releasecomment.*, r.guid, r.searchname, users.username FROM releasecomment INNER JOIN releases r ON r.id = releasecomment.releaseid LEFT OUTER JOIN users ON users.id = releasecomment.userid WHERE userid = %d ORDER BY releasecomment.createddate DESC ".$limit, $uid));
-	}
-}
diff --git a/lib/copy_this/www/lib/releaseextra.php b/lib/copy_this/www/lib/releaseextra.php
deleted file mode 100644
index e3f489950..000000000
--- a/lib/copy_this/www/lib/releaseextra.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/util.php");
-
-/**
- * This class handles storage and retrieval of releaseextrafull/releasevideo/audio/subs data.
- */
-class ReleaseExtra
-{
-
-	const VIDEO_RESOLUTION_NA = 0;
-	const VIDEO_RESOLUTION_SD = 1;
-	const VIDEO_RESOLUTION_720 = 2;
-	const VIDEO_RESOLUTION_1080 = 3;
-
-	/**
-	 * Convert a codec string to a user friendly format.
-	 */
-	public function makeCodecPretty($codec)
-	{
-		if (preg_match("/DX50|DIVX|DIV3/i", $codec))
-			return "DivX";
-		if (preg_match("/XVID/i", $codec))
-			return "XviD";
-		if (preg_match("/^27$/i", $codec))
-			return "Blu-Ray";
-		if (preg_match("/V_MPEG4\/ISO\/AVC/i", $codec))
-			return "x264";
-		if (preg_match("/wmv|WVC1/i", $codec))
-			return "wmv";
-		if (preg_match("/^2$/i", $codec))
-			return "HD.ts";
-		if (preg_match("/avc1/i", $codec))
-			return "h.264";
-		if (preg_match("/DX50|DIVX|DIV3/i", $codec))
-			return "DivX";
-
-		return $codec;
-	}
-
-	public function getAudio($id)
-	{
-		$db = new DB();
-
-		return $db->query(sprintf("select * from releaseaudio where releaseid = %d order by audioid ASC", $id));
-	}
-
-	public function getBriefByGuid($guid)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select containerformat,videocodec,videoduration,videoaspect, concat(releasevideo.videowidth,'x',releasevideo.videoheight,' @',format(videoframerate,0),'fps') as size, group_concat(distinct releaseaudio.audiolanguage SEPARATOR ', ') as audio, group_concat(distinct releaseaudio.audiobitrate SEPARATOR ', ') as audiobitrate, group_concat(distinct releaseaudio.audioformat SEPARATOR ', ') as audioformat, group_concat(distinct releaseaudio.audiomode SEPARATOR ', ') as audiomode,  group_concat(distinct releaseaudio.audiobitratemode SEPARATOR ', ') as audiobitratemode, group_concat(distinct releasesubs.subslanguage SEPARATOR ', ') as subs from releaseaudio left outer join releasesubs on releaseaudio.releaseid = releasesubs.releaseid left outer join releasevideo on releasevideo.releaseid = releaseaudio.releaseid inner join releases r on r.id = releaseaudio.releaseid where r.guid = %s group by r.id", $db->escapeString($guid)));
-	}
-
-	public function delete($id)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from releaseaudio where releaseid = %d", $id));
-		$db->queryExec(sprintf("DELETE from releasesubs where releaseid = %d", $id));
-		$db->queryExec(sprintf("DELETE from releaseextrafull where releaseid = %d", $id));
-		$db->queryExec(sprintf("DELETE from releasevideo where releaseid = %d", $id));
-	}
-
-	/**
-	 * Add releasevideo/audio/subs for a release based on the mediainfo xml.
-	 */
-	public function addFromXml($releaseID, $xml)
-	{
-		$xmlObj = @simplexml_load_string($xml);
-		$arrXml = objectsIntoArray($xmlObj);
-		$containerformat = "";
-		$overallbitrate = "";
-
-		if (isset($arrXml["File"]) && isset($arrXml["File"]["track"])) {
-			foreach ($arrXml["File"]["track"] as $track) {
-				if (isset($track["@attributes"]) && isset($track["@attributes"]["type"])) {
-					if ($track["@attributes"]["type"] == "General") {
-						if (isset($track["Format"]))
-							$containerformat = $track["Format"];
-						if (isset($track["Overall_bit_rate"]))
-							$overallbitrate = $track["Overall_bit_rate"];
-						$gendata = $track;
-					} elseif ($track["@attributes"]["type"] == "Video") {
-						$videoduration = "";
-						$videoformat = "";
-						$videocodec = "";
-						$videowidth = "";
-						$videoheight = "";
-						$videoaspect = "";
-						$videoframerate = "";
-						$videolibrary = "";
-						$gendata = "";
-						$viddata = "";
-						$audiodata = "";
-						if (isset($track["Duration"]))
-							$videoduration = $track["Duration"];
-						if (isset($track["Format"]))
-							$videoformat = $track["Format"];
-						if (isset($track["Codec_ID"]))
-							$videocodec = $track["Codec_ID"];
-						if (isset($track["Width"]))
-							$videowidth = preg_replace("/[^0-9]/", '', $track["Width"]);
-						if (isset($track["Height"]))
-							$videoheight = preg_replace("/[^0-9]/", '', $track["Height"]);
-						if (isset($track["Display_aspect_ratio"]))
-							$videoaspect = $track["Display_aspect_ratio"];
-						if (isset($track["Frame_rate"]))
-							$videoframerate = str_replace(" fps", "", $track["Frame_rate"]);
-						if (isset($track["Writing_library"]))
-							$videolibrary = $track["Writing_library"];
-						$viddata = $track;
-						$this->addVideo($releaseID, $containerformat, $overallbitrate, $videoduration,
-							$videoformat, $videocodec, $videowidth, $videoheight,
-							$videoaspect, $videoframerate, $videolibrary
-						);
-					} elseif ($track["@attributes"]["type"] == "Audio") {
-						$audioID = 1;
-						$audioformat = "";
-						$audiomode = "";
-						$audiobitratemode = "";
-						$audiobitrate = "";
-						$audiochannels = "";
-						$audiosamplerate = "";
-						$audiolibrary = "";
-						$audiolanguage = "";
-						$audiotitle = "";
-						if (isset($track["@attributes"]["streamid"]))
-							$audioID = $track["@attributes"]["streamid"];
-						if (isset($track["Format"]))
-							$audioformat = $track["Format"];
-						if (isset($track["Mode"]))
-							$audiomode = $track["Mode"];
-						if (isset($track["Bit_rate_mode"]))
-							$audiobitratemode = $track["Bit_rate_mode"];
-						if (isset($track["Bit_rate"]))
-							$audiobitrate = $track["Bit_rate"];
-						if (isset($track["Channel_s_"]))
-							$audiochannels = $track["Channel_s_"];
-						if (isset($track["Sampling_rate"]))
-							$audiosamplerate = $track["Sampling_rate"];
-						if (isset($track["Writing_library"]))
-							$audiolibrary = $track["Writing_library"];
-						if (isset($track["Language"]))
-							$audiolanguage = $track["Language"];
-						if (isset($track["Title"]))
-							$audiotitle = $track["Title"];
-						$audiodata = $track;
-						$this->addAudio($releaseID, $audioID, $audioformat, $audiomode, $audiobitratemode, $audiobitrate, $audiochannels, $audiosamplerate, $audiolibrary, $audiolanguage, $audiotitle);
-					} elseif ($track["@attributes"]["type"] == "Text") {
-						$subsID = 1;
-						$subslanguage = "Unknown";
-						if (isset($track["@attributes"]["streamid"]))
-							$subsID = $track["@attributes"]["streamid"];
-						if (isset($track["Language"]))
-							$subslanguage = $track["Language"];
-						$this->addSubs($releaseID, $subsID, $subslanguage);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add a releasevideo row.
-	 */
-	public function addVideo($releaseID, $containerformat, $overallbitrate, $videoduration, $videoformat, $videocodec, $videowidth, $videoheight, $videoaspect, $videoframerate, $videolibrary)
-	{
-		$db = new DB();
-
-		$row = $this->getVideo($releaseID);
-		if ($row)
-			return -1;
-
-		if (is_numeric($videoframerate))
-			$videoframerate = number_format($videoframerate, 3, '.', '');
-		else
-			$videoframerate = 0.0;
-
-		$sql = sprintf("insert into releasevideo
-						(releaseid, containerformat, overallbitrate, videoduration,
-						videoformat, videocodec, videowidth, videoheight,
-						videoaspect, videoframerate, 	videolibrary, definition)
-						values ( %d, %s, %s, %s, %s, %s, %d, %d, %s, %s, %s, %d )",
-			$releaseID, $db->escapeString($containerformat), $db->escapeString($overallbitrate), $db->escapeString($videoduration),
-			$db->escapeString($videoformat), $db->escapeString($videocodec), $videowidth, $videoheight,
-			$db->escapeString($videoaspect), $db->escapeString($videoframerate), $db->escapeString($videolibrary), self::determineVideoResolution($videowidth, $videoheight)
-		);
-
-		return $db->queryInsert($sql);
-	}
-
-	public function getVideo($id)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select * from releasevideo where releaseid = %d", $id));
-	}
-
-	/**
-	 * Work out the res based on height and width
-	 */
-	public function determineVideoResolution($width, $height)
-	{
-		if ($width == 0 || $height == 0)
-		{
-			return self::VIDEO_RESOLUTION_NA;
-		}
-		elseif ($width <= 720 && $height <= 480)
-		{
-			return self::VIDEO_RESOLUTION_SD; //SD 480
-		}
-		elseif ($width <= 768 && $height <= 576) // 720x576 (PAL) (768 when rescaled for square pixels)
-		{
-			return self::VIDEO_RESOLUTION_SD; //SD 576
-		}
-		elseif ($width <= 1048 && $height <= 576) // 1024x576 (PAL) (1048 when rescaled for square pixels) (16x9)
-		{
-			return self::VIDEO_RESOLUTION_SD; //SD 576 16x9
-		}
-		elseif ($width <= 960 && $height <= 544) // 960x540 (sometimes 544 which is multiple of 16)
-		{
-			return self::VIDEO_RESOLUTION_SD; //SD 540
-		}
-		elseif ($width <= 1280 && $height <= 720) // 1280x720
-		{
-			return self::VIDEO_RESOLUTION_720; //HD 720
-		}
-		else // 1920x1080
-		{
-			return self::VIDEO_RESOLUTION_1080; //HD 1080
-		}
-
-		return self::VIDEO_RESOLUTION_NA; //catch all
-
-	}
-
-	/**
-	 * Add a releaseaudio row.
-	 */
-	public function addAudio($releaseID, $audioID, $audioformat, $audiomode, $audiobitratemode, $audiobitrate, $audiochannels, $audiosamplerate, $audiolibrary, $audiolanguage, $audiotitle)
-	{
-		$db = new DB();
-
-		$row = $this->getAudioAndChannel($releaseID, $audioID);
-		if ($row)
-			return -1;
-
-		$sql = sprintf("insert into releaseaudio
-						(releaseid,	audioid,audioformat,audiomode, audiobitratemode, audiobitrate,
-						audiochannels,audiosamplerate,audiolibrary,audiolanguage,audiotitle)
-						values ( %d, %d, %s, %s, %s, %s, %s, %s, %s, %s, %s )",
-			$releaseID, $audioID, $db->escapeString($audioformat), $db->escapeString($audiomode), $db->escapeString($audiobitratemode),
-			$db->escapeString($audiobitrate), $db->escapeString($audiochannels), $db->escapeString($audiosamplerate), $db->escapeString(substr($audiolibrary, 0, 255)),
-			$db->escapeString(substr($audiolanguage, 0, 255)), $db->escapeString(substr($audiotitle, 0, 255))
-		);
-
-		return $db->queryInsert($sql);
-	}
-
-	public function getAudioAndChannel($rid, $aid)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select * from releaseaudio where releaseid = %d and audioid = %d", $rid, $aid));
-	}
-
-	public function addSubs($releaseID, $subsID, $subslanguage)
-	{
-		$db = new DB();
-		$row = $this->getSubs($releaseID);
-		if ($row)
-			return -1;
-
-		$sql = sprintf("insert into releasesubs (releaseid,	subsID, subslanguage) values ( %d, %d, %s)", $releaseID, $subsID, $db->escapeString($subslanguage));
-
-		return $db->queryInsert($sql);
-	}
-
-	public function getSubs($id)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("SELECT group_concat(subslanguage SEPARATOR ', ') as subs FROM `releasesubs` WHERE `releaseid` = %d ORDER BY `subsID` ASC", $id));
-	}
-
-	public function deleteFull($id)
-	{
-		$db = new DB();
-
-		return $db->queryExec(sprintf("DELETE from releaseextrafull where releaseid = %d", $id));
-	}
-
-	public function addFull($id, $xml)
-	{
-		$db = new DB();
-		$row = $this->getFull($id);
-		if ($row)
-			return -1;
-
-		return $db->queryInsert(sprintf("insert into releaseextrafull (releaseid, mediainfo) values (%d, %s)", $id, $db->escapeString($xml)));
-	}
-
-	public function getFull($id)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select * from releaseextrafull where releaseid = %d", $id));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/releasefiles.php b/lib/copy_this/www/lib/releasefiles.php
deleted file mode 100644
index df5f23049..000000000
--- a/lib/copy_this/www/lib/releasefiles.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-
-/**
- * This class handles storage and retrieval of releasefiles.
- */
-class ReleaseFiles
-{
-	/**
-	 * Get releasefiles row by id.
-	 */
-	public function get($id)
-	{
-		$db = new DB();
-		return $db->query(sprintf("select * from releasefiles where releaseid = %d  order by releasefiles.name ", $id));
-	}
-
-	/**
-	 * Get releasefiles row by release.GUID.
-	 */
-	public function getByGuid($guid)
-	{
-		$db = new DB();
-		return $db->query(sprintf("select releasefiles.* from releasefiles inner join releases r on r.id = releasefiles.releaseid where r.guid = %s order by releasefiles.name ", $db->escapeString($guid)));
-	}
-
-	/**
-	 * Delete a releasefiles row.
-	 */
-	public function delete($id)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("DELETE from releasefiles where releaseid = %d", $id));
-	}
-
-	/**
-	 * Add a releasefiles row.
-	 */
-	public function add($id, $name, $size, $createddate, $passworded)
-	{
-		$db = new DB();
-		$sql = sprintf("INSERT INTO releasefiles  (releaseid,   name,   size,   createddate,   passworded) VALUES (%d, %s, %s, from_unixtime(%d), %d)", $id, $db->escapeString($name), $db->escapeString($size), $createddate, $passworded );
-		return $db->queryInsert($sql);
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/releaseimage.php b/lib/copy_this/www/lib/releaseimage.php
deleted file mode 100644
index ce53c852a..000000000
--- a/lib/copy_this/www/lib/releaseimage.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/util.php");
-
-/**
- * Resize/save/delete images to disk.
- *
- * Class ReleaseImage
- */
-class ReleaseImage
-{
-	/**
-	 * Path to save ogg audio samples.
-	 *
-	 * @var string
-	 */
-	public $audSavePath;
-
-	/**
-	 * Path to save video preview jpg pictures.
-	 *
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * Path to save large jpg pictures(xxx).
-	 *
-	 * @var string
-	 */
-	public $jpgSavePath;
-
-	/**
-	 * Path to save movie jpg covers.
-	 *
-	 * @var string
-	 */
-	public $movieImgSavePath;
-
-	/**
-	 * Path to save video ogv files.
-	 *
-	 * @var string
-	 */
-	public $vidSavePath;
-
-	/**
-	 * Construct.
-	 * @param \DB()
-	 */
-	public function __construct(&$pdo = null)
-	{
-		// Creates the NN_COVERS constant
-		if ($pdo === null) {
-			$pdo = new \DB();
-		}
-		//                                                            Table    |  Column
-		$this->audSavePath    = NN_COVERS . 'audiosample' . DS; // releases    guid
-		$this->imgSavePath    = NN_COVERS . 'preview'     . DS; // releases    guid
-		$this->jpgSavePath    = NN_COVERS . 'sample'      . DS; // releases    guid
-		$this->movieImgSavePath = NN_COVERS . 'movies'      . DS; // releases    imdbid
-		$this->vidSavePath    = NN_COVERS . 'video'       . DS; // releases    guid
-
-		/* For reference. *
-		$this->anidbImgPath   = NN_COVERS . 'anime'       . DS; // anidb       anidbid | used in populate_anidb.php, not anidb.php
-		$this->bookImgPath    = NN_COVERS . 'book'        . DS; // bookinfo    id
-		$this->consoleImgPath = NN_COVERS . 'console'     . DS; // consoleinfo id
-		$this->musicImgPath   = NN_COVERS . 'music'       . DS; // musicinfo   id
-		$this->tvRageImgPath  = NN_COVERS . 'tvrage'      . DS; // tvrage      id (not rageid)
-
-		$this->audioImgPath   = NN_COVERS . 'audio'       . DS; // unused folder, music folder already exists.
-		**/
-	}
-
-	/**
-	 * Get a URL or file image and convert it to string.
-	 *
-	 * @param string $imgLoc URL or file location.
-	 *
-	 * @return bool|mixed|string
-	 */
-	protected function fetchImage($imgLoc)
-	{
-		$img = false;
-
-		if (strpos(strtolower($imgLoc), 'http:') === 0) {
-			$img = Utility::getUrl(['url' => $imgLoc]);
-		} else if (is_file($imgLoc)) {
-			$img = @file_get_contents($imgLoc);
-		}
-
-		if ($img !== false) {
-			$im = @imagecreatefromstring($img);
-			if ($im !== false) {
-				imagedestroy($im);
-				return $img;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Save an image to disk, optionally resizing it.
-	 * @param string $imgName      What to name the new image.
-	 * @param string $imgLoc       URL or location on the disk the original image is in.
-	 * @param string $imgSavePath  Folder to save the new image in.
-	 * @param string $imgMaxWidth  Max width to resize image to.   (OPTIONAL)
-	 * @param string $imgMaxHeight Max height to resize image to.  (OPTIONAL)
-	 * @param bool   $saveThumb    Save a thumbnail of this image? (OPTIONAL)
-	 *
-	 * @return int 1 on success, 0 on failure Used on site to check if there is an image.
-	 */
-	public function saveImage($imgName, $imgLoc, $imgSavePath, $imgMaxWidth='', $imgMaxHeight='', $saveThumb=false)
-	{
-		// Try to get the image as a string.
-		$cover = $this->fetchImage($imgLoc);
-		if ($cover === false) {
-			return 0;
-		}
-
-		// Check if we need to resize it.
-		if ($imgMaxWidth != '' && $imgMaxHeight != '') {
-			$im = @imagecreatefromstring($cover);
-			$width = @imagesx($im);
-			$height = @imagesy($im);
-			$ratio = min($imgMaxHeight/$height, $imgMaxWidth/$width);
-			// New dimensions
-			$new_width = intval($ratio*$width);
-			$new_height = intval($ratio*$height);
-			if ($new_width < $width && $new_width > 10 && $new_height > 10) {
-				$new_image = @imagecreatetruecolor($new_width, $new_height);
-				@imagecopyresampled($new_image, $im, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
-				ob_start();
-				@imagejpeg($new_image, null, 85);
-				$thumb = ob_get_clean();
-				@imagedestroy($new_image);
-
-				if ($saveThumb) {
-					@file_put_contents($imgSavePath.$imgName.'_thumb.jpg', $thumb);
-				} else {
-					$cover = $thumb;
-				}
-
-				unset($thumb);
-			}
-			@imagedestroy($im);
-		}
-		// Store it on the hard drive.
-		$coverPath = $imgSavePath.$imgName.'.jpg';
-		$coverSave = @file_put_contents($coverPath, $cover);
-
-		// Check if it's on the drive.
-		if ($coverSave === false || !is_file($coverPath)) {
-			return 0;
-		}
-		return 1;
-	}
-
-	/**
-	 * Delete images for the release.
-	 *
-	 * @param string      $guid   The GUID of the release.
-	 *
-	 * @return void
-	 */
-	public function delete($guid)
-	{
-		$thumb = $guid . '_thumb.jpg';
-
-		// Audiosample folder.
-		@unlink($this->audSavePath . $guid . '.ogg');
-
-		// Preview folder.
-		@unlink($this->imgSavePath . $thumb);
-
-		// Sample folder.
-		@unlink($this->jpgSavePath . $thumb);
-
-		// Video folder.
-		@unlink($this->vidSavePath . $guid . '.ogg');
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/releaseregex.php b/lib/copy_this/www/lib/releaseregex.php
deleted file mode 100644
index 38800e369..000000000
--- a/lib/copy_this/www/lib/releaseregex.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/site.php");
-
-
-/**
- * This class handles storage and retrieval of releaseregex rows.
- */
-class ReleaseRegex
-{
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $tablePerGroup;
-
-	public function __construct()
-	{
-		$this->regexes = [];
-		$this->pdo = new DB();
-	}
-
-	/**
-	 * Get all releaseregex rows matching filters.
-	 *
-	 * @param bool   $activeonly
-	 * @param string $groupname
-	 * @param bool   $blnIncludeReleaseCount
-	 * @param null   $userReleaseRegex
-	 *
-	 * @return array
-	 */
-	public function get($activeonly = true, $groupname = "-1", $blnIncludeReleaseCount = false, $userReleaseRegex = null)
-	{
-		if (!empty($this->regexes))
-			return $this->regexes;
-
-		$where = "";
-		if ($activeonly)
-			$where .= " and releaseregex.status = 1";
-
-		if ($groupname == "all")
-			$where .= " and releaseregex.groupname is null";
-		elseif ($groupname != "-1")
-			$where .= sprintf(" and releaseregex.groupname = %s", $this->pdo->escapeString($groupname));
-
-		if ($userReleaseRegex === true) {
-			$where .= ' AND releaseregex.id >= 100000';
-		} else if ($userReleaseRegex === false) {
-			$where .= ' AND releaseregex.id < 100000';
-		}
-
-		$relcountjoin = "";
-		$relcountcol = "";
-		if ($blnIncludeReleaseCount) {
-			$relcountcol = " , coalesce(x.count, 0) as num_releases, coalesce(x.adddate, 'n/a') as max_releasedate ";
-			$relcountjoin = " left outer join (  select regexid, max(adddate) adddate, count(id) as count from releases group by regexid) x on x.regexid = releaseregex.id ";
-		}
-
-		$this->regexes = $this->pdo->query("SELECT releaseregex.id, releaseregex.categoryid, category.title as categoryTitle, releaseregex.status, releaseregex.description, releaseregex.groupname AS groupname, releaseregex.regex,
-												groups.id AS groupid, releaseregex.ordinal " . $relcountcol . "
-												FROM releaseregex
-												left outer JOIN groups ON groups.name = releaseregex.groupname
-												left outer join category on category.id = releaseregex.categoryid
-												" . $relcountjoin . "
-												where 1=1 " . $where . "
-												ORDER BY groupname LIKE '%*' ASC, coalesce(groupname,'zzz') DESC, ordinal ASC"
-		);
-
-		return $this->regexes;
-	}
-
-	/**
-	 * Get all groups used by releaseregexes for use in dropdownlist.
-	 */
-	public function getGroupsForSelect()
-	{
-
-		$categories = $this->pdo->query("SELECT distinct coalesce(groupname,'all') as groupname from releaseregex order by groupname ");
-		$temp_array = array();
-
-		$temp_array[-1] = "--Please Select--";
-
-		foreach ($categories as $category)
-			$temp_array[$category["groupname"]] = $category["groupname"];
-
-		return $temp_array;
-	}
-
-	/**
-	 * Get a releaseregex row by id.
-	 */
-	public function getByID($id)
-	{
-
-		return $this->pdo->queryOneRow(sprintf("select * from releaseregex where id = %d ", $id));
-	}
-
-	/**
-	 * Get a releaseregex row by id.
-	 */
-	public function getForGroup($groupname)
-	{
-		$ret = array();
-		$groupRegexes = $this->get(true);
-		if ($groupRegexes) {
-			foreach ($groupRegexes as $groupRegex) {
-				$outcome = @preg_match("/^" . $groupRegex["groupname"] . "$/i", $groupname);
-				if ($outcome)
-					$ret[] = $groupRegex;
-				elseif ($outcome === false)
-					echo "ERROR: " . ($groupRegex["id"] < 10000 ? "System" : "Custom") . " release regex '" . $groupRegex["id"] . "'. Group name '" . $groupRegex["groupname"] . "' should be a valid regex.\n";
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Delete a releaseregex row.
-	 *
-	 * @param $id
-	 *
-	 * @return bool|PDOStatement
-	 */
-	public function delete($id)
-	{
-
-		return $this->pdo->queryExec(sprintf("DELETE from releaseregex where id = %d", $id));
-	}
-
-	/**
-	 * Update a releaseregex row.
-	 */
-	public function update($regex)
-	{
-
-		$groupname = $regex["groupname"];
-		if ($groupname == "")
-			$groupname = "null";
-		else
-			$groupname = sprintf("%s", $this->pdo->escapeString($regex["groupname"]));
-
-		$catid = $regex["category"];
-		if ($catid == "-1")
-			$catid = "null";
-		else
-			$catid = sprintf("%d", $regex["category"]);
-
-		$this->pdo->queryExec(sprintf("update releaseregex set groupname=%s, regex=%s, ordinal=%d, status=%d, description=%s, categoryid=%s where id = %d ",
-				$groupname, $this->pdo->escapeString($regex["regex"]), $regex["ordinal"], $regex["status"], $this->pdo->escapeString($regex["description"]), $catid, $regex["id"]
-			)
-		);
-	}
-
-	/**
-	 * Add a releaseregex row.
-	 *
-	 * @param $regex
-	 *
-	 * @return bool|int
-	 */
-	public function add($regex)
-	{
-
-		$groupname = $regex["groupname"];
-		if ($groupname == "")
-			$groupname = "null";
-		else
-			$groupname = sprintf("%s", $this->pdo->escapeString($regex["groupname"]));
-
-		$catid = $regex["category"];
-		if ($catid == "-1")
-			$catid = "null";
-		else
-			$catid = sprintf("%d", $regex["category"]);
-
-		return $this->pdo->queryInsert(sprintf("insert into releaseregex (groupname, regex, ordinal, status, description, categoryid) values (%s, %s, %d, %d, %s, %s) ",
-				$groupname, $this->pdo->escapeString($regex["regex"]), $regex["ordinal"], $regex["status"], $this->pdo->escapeString($regex["description"]), $catid
-			)
-		);
-
-	}
-
-	public function performMatch(&$regexArr, $binarySubject)
-	{
-		$ret = false;
-
-		$outcome = @preg_match($regexArr["regex"], $binarySubject, $matches);
-		if ($outcome === false) {
-			echo "ERROR: " . ($regexArr["id"] < 10000 ? "System" : "Custom") . " release regex '" . $regexArr["id"] . "' is not a valid regex.\n";
-			$this->pdo->queryExec(sprintf("update releaseregex set status=0 where id = %d and status=1", $regexArr["id"]));
-
-			return $ret;
-		}
-
-		if ($outcome) {
-			$cat = new Categorize();
-			$matches = array_map("trim", $matches);
-
-			if (isset($matches['reqid']) && (!isset($matches['name']) || empty($matches['name']))) {
-				$matches['name'] = $matches['reqid'];
-			}
-
-			// Check that the regex provided the correct parameters
-			if (!isset($matches['name']) || empty($matches['name'])) {
-				//echo "ERROR: Regex applied which didnt return right number of capture groups - '".$regexArr["id"]."'\n";
-				return $ret;
-			}
-
-			if (!isset($matches['parts']) || empty($matches['parts'])) {
-				$matches['parts'] = "00/00";
-			}
-
-			if (isset($matches['name']) && isset($matches['parts'])) {
-				if (strpos($matches['parts'], '/') === false) {
-					$matches['parts'] = str_replace(array('-', '~', ' of '), '/', $matches['parts']);
-				}
-
-				$regcatid = "null ";
-				if ($regexArr["categoryid"] != "")
-					$regcatid = $regexArr["categoryid"];
-				//override
-				if ($regcatid == Category::CAT_PC_0DAY) {
-					if ($cat->isPhone($matches['name']))
-						$regcatid = Category::CAT_PC_MOBILEANDROID;
-					if ($cat->isPhone($matches['name']))
-						$regcatid = Category::CAT_PC_MOBILEIOS;
-					if ($cat->isPhone($matches['name']))
-						$regcatid = Category::CAT_PC_MOBILEOTHER;
-					if ($cat->isIso($matches['name']))
-						$regcatid = Category::CAT_PC_ISO;
-					if ($cat->isMac($matches['name']))
-						$regcatid = Category::CAT_PC_MAC;
-					if ($cat->isPcGame($matches['name']))
-						$regcatid = Category::CAT_PC_GAMES;
-					if ($cat->isEBook($matches['name']))
-						$regcatid = Category::CAT_BOOK_EBOOK;
-				}
-
-				$reqID = "";
-				if (isset($matches['reqid']))
-					$reqID = $matches['reqid'];
-
-				//check if post is repost
-				if (preg_match('/(repost\d?|re\-?up)/i', $binarySubject, $repost) && !preg_match('/repost|re\-?up/i', $matches['name'])) {
-					$matches['name'] .= ' ' . $repost[1];
-				}
-
-				$matches['regcatid'] = $regcatid;
-				$matches['regexid'] = $regexArr['id'];
-				$matches['reqid'] = $reqID;
-
-				$ret = $matches;
-			}
-		}
-
-		return $ret;
-	}
-
-	public function testRegex($regex, $groupname, $poster, $ignorematched, $matchagainstbins)
-	{
-		$cat = new Categorize();
-		$s = new Sites();
-		$site = $s->get();
-		$groups = new Groups();
-		$groupID = $groups->getByNameByID($groupname);
-		$group = $groups->getCBPTableNames($site->tablepergroup, $groupID);
-
-		$catList = $cat->getForSelect();
-		$matches = array();
-
-		if ($groupname === 0)
-			$groupname = '.*';
-
-		if ($matchagainstbins !== '')
-			$sql = sprintf("select b.*, '0' as size, '0' as blacklistid, g.name as groupname from %s b left join groups g on g.id = b.groupid where b.groupid IN (select g.id from groups g where g.name REGEXP %s) order by b.date desc", $group['bname'], $this->pdo->escapeString('^' . $groupname . '$'));
-		else
-			$sql = sprintf("select rrt.* from releaseregextesting rrt where rrt.groupname REGEXP %s order by rrt.date desc", $this->pdo->escapeString('^' . $groupname . '$'));
-
-		$resbin = $this->pdo->queryDirect($sql);
-
-		while ($rowbin = $this->pdo->getAssocArray($resbin)) {
-			if ($ignorematched !== '' && ($rowbin['regexid'] != '' || $rowbin['blacklistid'] == 1))
-				continue;
-
-			$regexarr = array("id" => "", 'regex' => $regex, 'poster' => $poster, "categoryid" => "");
-			$regexCheck = $this->performMatch($regexarr, $rowbin['name'], $rowbin['fromname']);
-
-			if ($regexCheck !== false) {
-				$relname = $regexCheck['name'];
-				$relparts = explode("/", $regexCheck['parts']);
-
-				$matches[$relname]['name'] = $relname;
-				$matches[$relname]['parts'] = $regexCheck['parts'];
-
-				$matches[$relname]['bincount'] = (isset($matches[$relname]['bincount'])) ? $matches[$relname]['bincount'] + 1 : 1;
-				$matches[$relname]['bininfo'][] = $rowbin;
-
-				$matches[$relname]['binsize'][] = $rowbin['size'];
-				$matches[$relname]['totalsize'] = array_sum($matches[$relname]['binsize']);
-
-				$matches[$relname]['relparts'][$relparts[1]] = $relparts[1];
-				$matches[$relname]['reltotalparts'] = array_sum($matches[$relname]['relparts']);
-
-				$matches[$relname]['regexid'] = $regexCheck['regexid'];
-
-				if (ctype_digit($regexCheck['regcatid']))
-					$matches[$relname]['catname'] = $catList[$regexCheck['regcatid']];
-				else
-					$matches[$relname]['catname'] = $catList[$cat->determineCategory($groupname, $relname)];
-
-			}
-
-		}
-
-		//echo '<pre>';
-		//print_r(array_pop($matches));
-		//echo '</pre>';
-		return $matches;
-	}
-
-
-	public function fetchTestBinaries($groupname, $numarticles, $clearexistingbins)
-	{
-		$nntp = new Nntp();
-		$binaries = new Binaries();
-		$groups = new Groups();
-
-		$ret = array();
-		if ($clearexistingbins == true)
-			$this->pdo->queryExec('truncate releaseregextesting');
-
-		$nntp->doConnect();
-
-		$groupsToFetch = array();
-		if (preg_match('/^[a-z]{2,3}(\.[a-z0-9\-]+)+$/', $groupname))
-			$groupsToFetch[] = array('name' => $groupname);
-		elseif ($groupname === 0)
-			$groupsToFetch = $groups->getAll();
-		else {
-			$newsgroups = $nntp->getGroups();
-			foreach ($newsgroups as $ngroup) {
-				if (preg_match('/' . $groupname . '/', $ngroup['group']))
-					$groupsToFetch[] = array('name' => $ngroup['group']);
-			}
-		}
-
-		foreach ($groupsToFetch as $groupArr) {
-
-			$group = $groupArr['name'];
-			$data = $nntp->selectGroup($group);
-			if (NNTP::isError($data)) {
-				$ret[] = "Could not select group (doesnt exist on USP): {$group}";
-				continue;
-			} else {
-				$rangeStart = $data['last'] - $numarticles;
-				$rangeEnd = $groupEnd = $data['last'];
-				$rangeTotal = $rangeEnd - $rangeStart;
-
-				$done = false;
-
-				while ($done === false) {
-					if ($rangeTotal > $binaries->messageBuffer) {
-						if ($rangeStart + $binaries->messageBuffer > $groupEnd)
-							$rangeEnd = $groupEnd;
-						else
-							$rangeEnd = $rangeStart + $binaries->messageBuffer;
-					}
-
-
-						$msgs = $nntp->getXOver($rangeStart . "-" . $rangeEnd, true, false);
-
-					if (NNTP::isError($msgs)) {
-						$ret[] = "Error {$msgs->code}: {$msgs->message} on " . $group;
-						continue 2;
-					}
-
-					$headers = array();
-					if (is_array($msgs)) {
-						//loop headers, figure out parts
-						foreach ($msgs AS $msg) {
-							if (!isset($msg['Number']))
-								continue;
-
-							$msgPart = $msgTotalParts = 0;
-
-							$pattern = '|\((\d+)[\/](\d+)\)|i';
-							preg_match_all($pattern, $msg['Subject'], $matches, PREG_PATTERN_ORDER);
-							$matchcnt = sizeof($matches[0]);
-							for ($i = 0; $i < $matchcnt; $i++) {
-								//not (int)'d here because of the preg_replace later on
-								$msgPart = $matches[1][$i];
-								$msgTotalParts = $matches[2][$i];
-							}
-
-							if (!isset($msg['Subject']) || $matchcnt == 0) // not a binary post most likely.. continue
-								continue;
-
-							if ((int)$msgPart > 0 && (int)$msgTotalParts > 0) {
-								$subject = utf8_encode(trim(preg_replace('|\(' . $msgPart . '[\/]' . $msgTotalParts . '\)|i', '', $msg['Subject'])));
-
-								if (!isset($headers[$subject])) {
-									$headers[$subject]['Subject'] = $subject;
-									$headers[$subject]['From'] = $msg['From'];
-									$headers[$subject]['Date'] = strtotime($msg['Date']);
-									$headers[$subject]['Message-ID'] = $msg['Message-ID'];
-									$headers[$subject]['Size'] = $msg['Bytes'];
-								} else
-									$headers[$subject]['Size'] += $msg['Bytes'];
-							}
-						}
-						unset($msgs);
-
-						if (isset($headers) && count($headers)) {
-							$groupRegexes = $this->getForGroup($group);
-
-							$binSetData = array();
-
-							foreach ($headers as $subject => $data) {
-								$binData = array(
-									'name'         => $subject,
-									'fromname'     => $data['From'],
-									'date'         => $data['Date'],
-									'binaryhash'   => md5($subject . $data['From'] . $group),
-									'groupname'    => $group,
-									'regexid'      => "null",
-									'categoryid'   => "null",
-									'reqid'        => "null",
-									'blacklistid'  => 0,
-									'size'         => $data['Size'],
-									'relname'      => "null",
-									'relpart'      => "null",
-									'reltotalpart' => "null"
-								);
-
-								//Filter binaries based on black/white list
-								if ($binaries->isBlackListed($data, $group)) {
-									//binary is blacklisted
-									$binData['blacklistid'] = 1;
-								}
-
-								//Apply Regexes
-								$regexMatches = array();
-								foreach ($groupRegexes as $groupRegex) {
-									$regexCheck = $this->performMatch($groupRegex, $subject, $data['From']);
-									if ($regexCheck !== false) {
-										$regexMatches = $regexCheck;
-
-										$binData['regexid'] = $regexCheck['regexid'];
-										$binData['categoryid'] = $regexCheck['regcatid'];
-										$binData['reqid'] = empty($regexCheck['reqid']) ? "null" : $regexCheck['reqid'];
-										$binData['relname'] = $regexCheck['name'];
-										break;
-									}
-								}
-
-								$binSetData[] = $binData;
-							}
-
-							//insert 500 bins at a time
-							$binChunks = array_chunk($binSetData, 500);
-
-							foreach ($binChunks as $binChunk) {
-								foreach ($binChunk as $chunk) {
-									$binParams[] = sprintf("(%s, %s, FROM_UNIXTIME(%s), %s, %s, %s, %s, %s, %d, %d, now())", $this->pdo->escapeString($chunk['name']), $this->pdo->escapeString($chunk['fromname']), $this->pdo->escapeString($chunk['date']), $this->pdo->escapeString($chunk['binaryhash']), $this->pdo->escapeString($chunk['groupname']), $chunk['regexid'], $chunk['categoryid'], $chunk['reqid'], $chunk['blacklistid'], $chunk['size']);
-								}
-								$binSql = "INSERT IGNORE INTO releaseregextesting (name, fromname, date, binaryhash, groupname, regexid, categoryid, reqid, blacklistid, size, dateadded) VALUES " . implode(', ', $binParams);
-								//echo $binSql;
-								$this->pdo->queryExec($binSql);
-							}
-
-							$ret[] = "Fetched " . number_format($numarticles) . " articles from " . $group;
-						} else {
-							$ret[] = "No headers found on " . $group;
-							continue;
-						}
-					} else {
-						$ret[] = "Can't get parts from server (msgs not array) on " . $group;
-						continue;
-					}
-
-					if ($rangeEnd == $groupEnd) {
-						$done = true;
-					}
-
-					$rangeStart = $rangeEnd + 1;
-
-				}
-			}
-		}
-		$nntp->doQuit();
-
-		return $ret;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/releases.php b/lib/copy_this/www/lib/releases.php
deleted file mode 100644
index 9beafde1b..000000000
--- a/lib/copy_this/www/lib/releases.php
+++ /dev/null
@@ -1,3011 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-require_once(WWW_DIR . "/lib/page.php");
-require_once(WWW_DIR . "/lib/users.php");
-require_once(WWW_DIR . "/lib/releaseregex.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/nzbinfo.php");
-require_once(WWW_DIR . "/lib/nfo.php");
-require_once(WWW_DIR . "/lib/zipfile.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/releasefiles.php");
-require_once(WWW_DIR . "/lib/releaseextra.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/releasecomments.php");
-require_once(WWW_DIR . "/lib/postprocess.php");
-require_once(WWW_DIR . "/lib/sphinx.php");
-require_once(WWW_DIR . "lib/Categorize.php");
-require_once(NN_TMUX . 'lib' . DS . 'ReleaseCleaner.php');
-require_once(NN_TMUX . 'lib' . DS . 'Pprocess.php');
-require_once(NN_TMUX . 'lib' . DS . 'Enzebe.php');
-require_once(NN_LIB . 'SphinxSearch.php');
-require_once(NN_LIB . 'ReleaseSearch.php');
-require_once(NN_LIB . 'ConsoleTools.php');
-require_once(NN_LIB . 'RequestIDLocal.php');
-require_once(NN_LIB . 'RequestIDWeb.php');
-
-/**
- * This class handles storage and retrieval of releases rows and the main processing functions
- * for turning binaries into releases.
- */
-class Releases
-{
-	// RAR/ZIP Passworded indicator.
-	const PASSWD_NONE      =  0; // No password.
-	const PASSWD_POTENTIAL =  1; // Might have a password.
-	const BAD_FILE         =  2; // Possibly broken RAR/ZIP.
-	const PASSWD_RAR       = 10; // Definitely passworded.
-
-	/**
-	 * @access public
-	 * @var initial binary state after being added from usenet
-	 */
-	const PROCSTAT_NEW = 0;
-
-	/**
-	 * @access public
-	 * @var after a binary has matched a releaseregex
-	 */
-	const PROCSTAT_TITLEMATCHED = 5;
-
-	/**
-	 * @access public
-	 * @var after a binary has been confirmed as having the right number of parts
-	 */
-	const PROCSTAT_READYTORELEASE = 1;
-
-	/**
-	 * @access public
-	 * @var binary has not matched a releaseregex
-	 */
-	const PROCSTAT_TITLENOTMATCHED = 3;
-
-	/**
-	 * @access public
-	 * @var binary that has finished and successfully made it into a release
-	 */
-	const PROCSTAT_RELEASED = 4;
-
-	/**
-	 * @access public
-	 * @var after a series of attempts to lookup the allfilled style reqid to get a name, its given up
-	 */
-	const PROCSTAT_NOREQIDNAMELOOKUPFOUND = 7;
-
-	/**
-	 * @var SphinxSearch
-	 */
-	public $sphinxSearch;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var Groups
-	 */
-	public $groups;
-
-	/**
-	 * @var bool
-	 */
-	public $updategrabs;
-
-	/**
-	 * @var ReleaseSearch
-	 */
-	public $releaseSearch;
-
-	/**
-	 * @var bool
-	 */
-	public $tablePerGroup;
-
-	/**
-	 * @var int
-	 */
-	public $crossPostTime;
-
-	/**
-	 * @var int
-	 */
-	public $releaseCreationLimit;
-
-	/**
-	 * @var int
-	 */
-	public $completion;
-
-	/**
-	 * @var int
-	 */
-	public $processRequestIDs;
-
-	/**
-	 * @var bool
-	 */
-	public $echoCLI;
-
-	/**
-	 * @var \ConsoleTools
-	 */
-	public $consoleTools;
-
-	/**
-	 * @var \NZB
-	 */
-	public $nzb;
-
-	/**
-	 * @var \ReleaseCleaning
-	 */
-	public $releaseCleaning;
-
-	/**
-	 * @var \ReleaseImage
-	 */
-	public $releaseImage;
-
-	/**
-	 * @param array $options Class instances / Echo to cli ?
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'            => true,
-			'ConsoleTools'    => null,
-			'Groups'          => null,
-			'NZB'             => null,
-			'ReleaseCleaning' => null,
-			'ReleaseImage'    => null,
-			'Releases'        => null,
-			'Settings'        => null,
-		];
-		$options += $defaults;
-
-		$this->echoCLI = ($options['Echo'] && NN_ECHOCLI);
-
-		$this->pdo = ($options['Settings'] instanceof \DB ? $options['Settings'] : new \DB());
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->consoleTools = ($options['ConsoleTools'] instanceof \ConsoleTools ? $options['ConsoleTools'] : new \ConsoleTools(['ColorCLI' => $this->pdo->log]));
-		$this->groups = ($options['Groups'] instanceof \Groups ? $options['Groups'] : new \Groups(['Settings' => $this->pdo]));
-		$this->nzb = ($options['NZB'] instanceof \NZB ? $options['NZB'] : new \NZB());
-		$this->releaseCleaning = ($options['ReleaseCleaning'] instanceof \ReleaseCleaning ? $options['ReleaseCleaning'] : new \ReleaseCleaning($this->pdo));
-		$this->releaseImage = ($options['ReleaseImage'] instanceof \ReleaseImage ? $options['ReleaseImage'] : new \ReleaseImage($this->pdo));
-		$this->updategrabs = ($this->site->grabstatus == '0' ? false : true);
-		$this->passwordStatus = ($this->site->checkpasswordedrar == 1 ? -1 : 0);
-		$this->sphinxSearch = new \SphinxSearch();
-		$this->releaseSearch = new \ReleaseSearch($this->pdo, $this->sphinxSearch);
-		$this->releaseRegex = new \ReleaseRegex();
-
-		$this->tablePerGroup = ($this->site->tablepergroup == 0 ? false : true);
-		$this->crossPostTime = ($this->site->crossposttime != '' ? (int)$this->site->crossposttime : 2);
-		$this->releaseCreationLimit = ($this->site->maxnzbsprocessed != '' ? (int)$this->site->maxnzbsprocessed : 1000);
-		$this->completion = ($this->site->completionpercent != '' ? (int)$this->site->completionpercent : 0);
-		$this->processRequestIDs = (int)$this->site->lookup_reqids;
-		if ($this->completion > 100) {
-			$this->completion = 100;
-			echo $this->pdo->log->error(PHP_EOL . 'You have an invalid setting for completion. It must be lower than 100.');
-		}
-	}
-
-
-	/**
-	 * Get a list of releases by an array of names
-	 */
-	public function getByNames($names)
-	{
-
-		$nsql = "1=2";
-		if (count($names) > 0) {
-			$n = array();
-			foreach ($names as $nm)
-				$n[] = " searchname = " . $this->pdo->escapeString($nm);
-
-			$nsql = "( " . implode(' or ', $n) . " )";
-		}
-
-		$sql = sprintf(" SELECT releases.*, CONCAT(cp.title, ' > ', c.title) AS category_name,
-							m.id AS movie_id, m.title, m.rating, m.cover, m.plot, m.year, m.genre, m.director, m.actors, m.tagline,
-							mu.id AS music_id, mu.title AS mu_title, mu.cover AS mu_cover, mu.year AS mu_year, mu.artist AS mu_artist, mu.tracks AS mu_tracks, mu.review AS mu_review,
-							ep.id AS ep_id, ep.showtitle AS ep_showtitle, ep.airdate AS ep_airdate, ep.fullep AS ep_fullep, ep.overview AS ep_overview,
-							tvrage.imgdata AS rage_imgdata, tvrage.id AS rg_ID
-							FROM releases
-							LEFT OUTER JOIN category c ON c.id = releases.categoryid
-							LEFT OUTER JOIN category cp ON cp.id = c.parentid
-							LEFT OUTER JOIN movieinfo m ON m.imdbid = releases.imdbid
-							LEFT OUTER JOIN musicinfo mu ON mu.id = releases.musicinfoid
-							LEFT OUTER JOIN episodeinfo ep ON ep.id = releases.episodeinfoid
-							LEFT OUTER JOIN tvrage ON tvrage.rageid = releases.rageid
-						WHERE %s", $nsql
-		);
-
-		return $this->pdo->queryDirect($sql);
-	}
-
-	/**
-	 * Get a count of releases for pager. used in admin manage list
-	 */
-	public function getCount()
-	{
-
-		$res = $this->pdo->queryOneRow("SELECT count(id) AS num FROM releases");
-
-		return $res["num"];
-	}
-
-	/**
-	 * Get a range of releases. used in admin manage list
-	 */
-	public function getRange($start, $num)
-	{
-
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT " . $start . "," . $num;
-
-		return $this->pdo->query(" SELECT releases.*, concat(cp.title, ' > ', c.title) AS category_name FROM releases LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN category cp ON cp.id = c.parentid ORDER BY postdate DESC" . $limit);
-	}
-
-	/**
-	 * Get a count of previews for pager. used in admin manage list
-	 */
-	public function getPreviewCount($previewtype, $cat)
-	{
-
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = " and (";
-			foreach ($cat as $category) {
-				if ($category != -1) {
-					$categ = new Categorize();
-					if ($categ->isParent($category)) {
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist .= ", " . $child["id"];
-
-						if ($chlist != "-99")
-							$catsrch .= " releases.categoryid in (" . $chlist . ") or ";
-					} else {
-						$catsrch .= sprintf(" releases.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch .= "1=2 )";
-		}
-
-		$sql = sprintf("SELECT count(id) AS num FROM releases WHERE haspreview = %d %s ", $previewtype, $catsrch);
-		$res = $this->pdo->queryOneRow($sql);
-
-		return $res["num"];
-	}
-
-	/**
-	 * Get a range of releases. used in admin manage list
-	 */
-	public function getPreviewRange($previewtype, $cat, $start, $num)
-	{
-
-
-		$catsrch = "";
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = " and (";
-			foreach ($cat as $category) {
-				if ($category != -1) {
-					$categ = new Categorize();
-					if ($categ->isParent($category)) {
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist .= ", " . $child["id"];
-
-						if ($chlist != "-99")
-							$catsrch .= " releases.categoryid in (" . $chlist . ") or ";
-					} else {
-						$catsrch .= sprintf(" releases.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch .= "1=2 )";
-		}
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT " . $start . "," . $num;
-
-		$sql = sprintf(" SELECT releases.*, concat(cp.title, ' > ', c.title) AS category_name FROM releases LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN category cp ON cp.id = c.parentid WHERE haspreview = %d %s ORDER BY postdate DESC %s", $previewtype, $catsrch, $limit);
-
-		return $this->pdo->query($sql);
-	}
-
-
-	/**
-	 * Used for pager on browse page.
-	 *
-	 * @param array  $cat
-	 * @param int    $maxAge
-	 * @param array  $excludedCats
-	 * @param string $groupName
-	 *
-	 * @return int
-	 */
-	public function getBrowseCount($cat, $maxAge = -1, $excludedCats = [], $groupName = '')
-	{
-		return $this->getPagerCount(
-			sprintf(
-				'SELECT r.id
-				FROM releases r
-				%s
-				WHERE r.nzbstatus = %d
-				AND r.passwordstatus %s
-				%s %s %s %s',
-				($groupName != '' ? 'INNER JOIN groups g ON g.id = r.groupid' : ''),
-				Enzebe::NZB_ADDED,
-				$this->showPasswords(),
-				($groupName != '' ? sprintf(' AND g.name = %s', $this->pdo->escapeString($groupName)) : ''),
-				$this->categorySQL($cat),
-				($maxAge > 0 ? (' AND r.postdate > NOW() - INTERVAL ' . $maxAge . ' DAY ') : ''),
-				(count($excludedCats) ? (' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')') : '')
-			)
-		);
-	}
-
-	/**
-	 * Used for browse results.
-	 *
-	 * @param array  $cat
-	 * @param        $start
-	 * @param        $num
-	 * @param string $orderBy
-	 * @param int    $maxAge
-	 * @param array  $excludedCats
-	 * @param string $groupName
-	 *
-	 * @return array
-	 */
-	public function getBrowseRange($cat, $start, $num, $orderBy, $maxAge = -1, $excludedCats = [], $groupName = '')
-	{
-		$orderBy = $this->getBrowseOrder($orderBy);
-		return $this->pdo->query(
-			sprintf(
-				"SELECT r.*,
-					CONCAT(cp.title, ' > ', c.title) AS category_name,
-					CONCAT(cp.id, ',', c.id) AS category_ids,
-					g.name AS group_name,
-					rn.id AS nfoid,
-					re.releaseid AS reid
-				FROM releases r
-				STRAIGHT_JOIN groups g ON g.id = r.groupid
-				STRAIGHT_JOIN category c ON c.id = r.categoryid
-				INNER JOIN category cp ON cp.id = c.parentid
-				LEFT OUTER JOIN releasevideo re ON re.releaseid = r.id
-				LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id
-				AND rn.nfo IS NOT NULL
-				WHERE r.nzbstatus = %d
-				AND r.passwordstatus %s
-				%s %s %s %s
-				ORDER BY %s %s %s",
-				Enzebe::NZB_ADDED,
-				$this->showPasswords(),
-				$this->categorySQL($cat),
-				($maxAge > 0 ? (" AND postdate > NOW() - INTERVAL " . $maxAge . ' DAY ') : ''),
-				(count($excludedCats) ? (' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')') : ''),
-				($groupName != '' ? sprintf(' AND g.name = %s ', $this->pdo->escapeString($groupName)) : ''),
-				$orderBy[0],
-				$orderBy[1],
-				($start === false ? '' : ' LIMIT ' . $num . ' OFFSET ' . $start)
-			),
-			true, NN_CACHE_EXPIRY_MEDIUM
-		);
-	}
-
-	/**
-	 * Get a column names browse list to be ordered by
-	 */
-	public function getBrowseOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'posted_desc' : $orderby;
-		$orderArr = explode("_", $order);
-		switch ($orderArr[0]) {
-			case 'cat':
-				$orderfield = 'categoryid';
-				break;
-			case 'name':
-				$orderfield = 'searchname';
-				break;
-			case 'size':
-				$orderfield = 'size';
-				break;
-			case 'files':
-				$orderfield = 'totalpart';
-				break;
-			case 'stats':
-				$orderfield = 'grabs';
-				break;
-			case 'posted':
-			default:
-				$orderfield = 'postdate';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-
-		return array($orderfield, $ordersort);
-	}
-
-	/**
-	 * Return ordering types usable on site.
-	 *
-	 * @return array
-	 */
-	public function getBrowseOrdering()
-	{
-		return [
-			'name_asc',
-			'name_desc',
-			'cat_asc',
-			'cat_desc',
-			'posted_asc',
-			'posted_desc',
-			'size_asc',
-			'size_desc',
-			'files_asc',
-			'files_desc',
-			'stats_asc',
-			'stats_desc'
-		];
-	}
-
-	/**
-	 * Get a range of releases. Used in nzb export
-	 */
-	public function getForExport($postfrom, $postto, $group, $cat)
-	{
-
-		if ($postfrom != "") {
-			$dateparts = explode("/", $postfrom);
-			if (count($dateparts) == 3)
-				$postfrom = sprintf(" and postdate > %s ", $this->pdo->escapeString($dateparts[2] . "-" . $dateparts[1] . "-" . $dateparts[0] . " 00:00:00"));
-			else
-				$postfrom = "";
-		}
-
-		if ($postto != "") {
-			$dateparts = explode("/", $postto);
-			if (count($dateparts) == 3)
-				$postto = sprintf(" and postdate < %s ", $this->pdo->escapeString($dateparts[2] . "-" . $dateparts[1] . "-" . $dateparts[0] . " 23:59:59"));
-			else
-				$postto = "";
-		}
-
-		if ($group != "" && $group != "-1")
-			$group = sprintf(" and groupid = %d ", $group);
-		else
-			$group = "";
-
-		if ($cat != "" && $cat != "-1")
-			$cat = sprintf(" and categoryid = %d ", $cat);
-		else
-			$cat = "";
-
-		return $this->pdo->queryDirect(sprintf("SELECT searchname, guid, CONCAT(cp.title,'_',category.title) AS catName FROM releases INNER JOIN category ON releases.categoryid = category.id LEFT OUTER JOIN category cp ON cp.id = category.parentid WHERE 1 = 1 %s %s %s %s", $postfrom, $postto, $group, $cat));
-	}
-
-	/**
-	 * Get the earliest release
-	 */
-	public function getEarliestUsenetPostDate()
-	{
-
-		$row = $this->pdo->queryOneRow("SELECT DATE_FORMAT(min(postdate), '%d/%m/%Y') AS postdate FROM releases");
-
-		return $row["postdate"];
-	}
-
-	/**
-	 * Get the most recent release
-	 */
-	public function getLatestUsenetPostDate()
-	{
-
-		$row = $this->pdo->queryOneRow("SELECT DATE_FORMAT(max(postdate), '%d/%m/%Y') AS postdate FROM releases");
-
-		return $row["postdate"];
-	}
-
-	/**
-	 * Get all groups for which there is a release for a html select
-	 */
-	public function getReleasedGroupsForSelect($blnIncludeAll = true)
-	{
-
-		$groups = $this->pdo->query("SELECT DISTINCT groups.id, groups.name FROM releases INNER JOIN groups ON groups.id = releases.groupid");
-		$temp_array = array();
-
-		if ($blnIncludeAll)
-			$temp_array[-1] = "--All Groups--";
-
-		foreach ($groups as $group)
-			$temp_array[$group["id"]] = $group["name"];
-
-		return $temp_array;
-	}
-
-	/**
-	 * Get releases for all types of rss feeds
-	 */
-	public function getRss($cat, $num, $uid = 0, $rageid, $anidbid, $airdate = -1)
-	{
-
-
-		$limit = " LIMIT 0," . ($num > 100 ? 100 : $num);
-
-		$cartsrch = "";
-		$catsrch = "";
-
-		if (count($cat) > 0) {
-			if ($cat[0] == -2) {
-				$cartsrch = sprintf(" inner join usercart on usercart.userid = %d and usercart.releaseid = releases.id ", $uid);
-			} elseif ($cat[0] == -1) {
-			} else {
-				$catsrch = " and (";
-				foreach ($cat as $category) {
-					if ($category != -1) {
-						$categ = new Categorize();
-						if ($categ->isParent($category)) {
-							$children = $categ->getChildren($category);
-							$chlist = "-99";
-							foreach ($children as $child)
-								$chlist .= ", " . $child["id"];
-
-							if ($chlist != "-99")
-								$catsrch .= " releases.categoryid in (" . $chlist . ") or ";
-						} else {
-							$catsrch .= sprintf(" releases.categoryid = %d or ", $category);
-						}
-					}
-				}
-				$catsrch .= "1=2 )";
-			}
-		}
-
-		$rage = ($rageid > -1) ? sprintf(" and releases.rageid = %d ", $rageid) : '';
-		$anidb = ($anidbid > -1) ? sprintf(" and releases.anidbid = %d ", $anidbid) : '';
-		$airdate = ($airdate > -1) ? sprintf(" and releases.tvairdate >= DATE_SUB(CURDATE(), INTERVAL %d DAY) ", $airdate) : '';
-
-		$sql = sprintf(" SELECT releases.*, rn.id AS nfoid, m.title AS imdbtitle, m.cover, m.imdbid, m.rating, m.plot, m.year, m.genre, m.director, m.actors, g.name AS group_name, concat(cp.title, ' > ', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, coalesce(cp.id,0) AS parentCategoryID, mu.title AS mu_title, mu.url AS mu_url, mu.artist AS mu_artist, mu.publisher AS mu_publisher, mu.releasedate AS mu_releasedate, mu.review AS mu_review, mu.tracks AS mu_tracks, mu.cover AS mu_cover, mug.title AS mu_genre, co.title AS co_title, co.url AS co_url, co.publisher AS co_publisher, co.releasedate AS co_releasedate, co.review AS co_review, co.cover AS co_cover, cog.title AS co_genre,   bo.title AS bo_title, bo.url AS bo_url, bo.publisher AS bo_publisher, bo.author AS bo_author, bo.publishdate AS bo_publishdate, bo.review AS bo_review, bo.cover AS bo_cover  FROM releases LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN category cp ON cp.id = c.parentid LEFT OUTER JOIN groups g ON g.id = releases.groupid LEFT OUTER JOIN releasenfo rn ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL LEFT OUTER JOIN movieinfo m ON m.imdbid = releases.imdbid AND m.title != '' LEFT OUTER JOIN musicinfo mu ON mu.id = releases.musicinfoid LEFT OUTER JOIN genres mug ON mug.id = mu.genreID LEFT OUTER JOIN bookinfo bo ON bo.id = releases.bookinfoid LEFT OUTER JOIN consoleinfo co ON co.id = releases.consoleinfoid LEFT OUTER JOIN genres cog ON cog.id = co.genreID %s WHERE releases.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') %s %s %s %s ORDER BY postdate DESC %s", $cartsrch, $catsrch, $rage, $anidb, $airdate, $limit);
-
-		return $this->pdo->query($sql, true);
-	}
-
-	/**
-	 * Get releases in users 'my tv show' rss feed
-	 */
-	public function getShowsRss($num, $uid = 0, $excludedcats = array(), $airdate = -1)
-	{
-
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and releases.categoryid not in (" . implode(",", $excludedcats) . ")";
-
-		$usershows = $this->pdo->query(sprintf("SELECT rageid, categoryid FROM userseries WHERE userid = %d", $uid), true);
-		$usql = '(1=2 ';
-		foreach ($usershows as $ushow) {
-			$usql .= sprintf('or (releases.rageid = %d', $ushow['rageid']);
-			if ($ushow['categoryid'] != '') {
-				$catsArr = explode('|', $ushow['categoryid']);
-				if (count($catsArr) > 1)
-					$usql .= sprintf(' and releases.categoryid in (%s)', implode(',', $catsArr));
-				else
-					$usql .= sprintf(' and releases.categoryid = %d', $catsArr[0]);
-			}
-			$usql .= ') ';
-		}
-		$usql .= ') ';
-
-		$airdate = ($airdate > -1) ? sprintf(" and releases.tvairdate >= DATE_SUB(CURDATE(), INTERVAL %d DAY) ", $airdate) : '';
-
-		$limit = " LIMIT 0," . ($num > 100 ? 100 : $num);
-
-		$sql = sprintf(" SELECT releases.*, tvr.rageid, tvr.releasetitle, epinfo.overview, epinfo.director, epinfo.gueststars, epinfo.writer, epinfo.rating, epinfo.fullep, epinfo.showtitle, epinfo.tvdbid AS ep_tvdbID, g.name AS group_name, concat(cp.title, '-', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, coalesce(cp.id,0) AS parentCategoryID
-						FROM releases FORCE INDEX (ix_releases_rageID)
-						LEFT OUTER JOIN category c ON c.id = releases.categoryid
-						LEFT OUTER JOIN category cp ON cp.id = c.parentid
-						LEFT OUTER JOIN groups g ON g.id = releases.groupid
-						LEFT OUTER JOIN (SELECT id, releasetitle, rageid FROM tvrage GROUP BY rageid) tvr ON tvr.rageid = releases.rageid
-						LEFT OUTER JOIN episodeinfo epinfo ON epinfo.id = releases.episodeinfoid
-						INNER JOIN
-						(   SELECT id FROM
-								( SELECT id, rageid, categoryid, season, episode FROM releases WHERE %s ORDER BY season DESC, episode DESC, postdate ASC ) releases
-							GROUP BY rageid, season, episode, categoryid
-						) z ON z.id = releases.id
-						WHERE %s %s %s
-						AND releases.passwordstatus <= (SELECT VALUE FROM site WHERE setting='showpasswordedrelease')
-						ORDER BY postdate DESC %s", $usql, $usql, $exccatlist, $airdate, $limit
-		);
-
-		return $this->pdo->query($sql);
-	}
-
-	/**
-	 * Get releases in users 'my movies' rss feed
-	 */
-	public function getMyMoviesRss($num, $uid = 0, $excludedcats = array())
-	{
-
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and releases.categoryid not in (" . implode(",", $excludedcats) . ")";
-
-		$usermovies = $this->pdo->query(sprintf("SELECT imdbid, categoryid FROM usermovies WHERE userid = %d", $uid), true);
-		$usql = '(1=2 ';
-		foreach ($usermovies as $umov) {
-			$usql .= sprintf('or (releases.imdbid = %d', $umov['imdbid']);
-			if ($umov['categoryid'] != '') {
-				$catsArr = explode('|', $umov['categoryid']);
-				if (count($catsArr) > 1)
-					$usql .= sprintf(' and releases.categoryid in (%s)', implode(',', $catsArr));
-				else
-					$usql .= sprintf(' and releases.categoryid = %d', $catsArr[0]);
-			}
-			$usql .= ') ';
-		}
-		$usql .= ') ';
-
-		$limit = " LIMIT 0," . ($num > 100 ? 100 : $num);
-
-		$sql = sprintf(" SELECT releases.*, mi.title AS releasetitle, g.name AS group_name, concat(cp.title, '-', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, coalesce(cp.id,0) AS parentCategoryID
-						FROM releases
-						LEFT OUTER JOIN category c ON c.id = releases.categoryid
-						LEFT OUTER JOIN category cp ON cp.id = c.parentid
-						LEFT OUTER JOIN groups g ON g.id = releases.groupid
-						LEFT OUTER JOIN movieinfo mi ON mi.imdbid = releases.imdbid
-						WHERE %s %s
-						AND releases.passwordstatus <= (SELECT VALUE FROM site WHERE setting='showpasswordedrelease')
-						ORDER BY postdate DESC %s", $usql, $exccatlist, $limit
-		);
-
-		return $this->pdo->query($sql);
-	}
-
-	/**
-	 * Get range of releases in users 'my tvshows'
-	 */
-	public function getShowsRange($usershows, $start, $num, $orderby, $maxage = -1, $excludedcats = array())
-	{
-
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT " . $start . "," . $num;
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and releases.categoryid not in (" . implode(",", $excludedcats) . ")";
-
-		$usql = '(1=2 ';
-		foreach ($usershows as $ushow) {
-			$usql .= sprintf('or (releases.rageid = %d', $ushow['rageid']);
-			if ($ushow['categoryid'] != '') {
-				$catsArr = explode('|', $ushow['categoryid']);
-				if (count($catsArr) > 1)
-					$usql .= sprintf(' and releases.categoryid in (%s)', implode(',', $catsArr));
-				else
-					$usql .= sprintf(' and releases.categoryid = %d', $catsArr[0]);
-			}
-			$usql .= ') ';
-		}
-		$usql .= ') ';
-
-		$maxagesql = "";
-		if ($maxage > 0)
-			$maxagesql = sprintf(" and releases.postdate > now() - interval %d day ", $maxage);
-
-		$order = $this->getBrowseOrder($orderby);
-		$sql = sprintf(" SELECT releases.*, concat(cp.title, '-', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, groups.name AS group_name, pre.ctime, pre.nuketype, rn.id AS nfoid, re.releaseid AS reID FROM releases LEFT OUTER JOIN releasevideo re ON re.releaseid = releases.id LEFT OUTER JOIN groups ON groups.id = releases.groupid LEFT OUTER JOIN releasenfo rn ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN predb pre ON pre.id = releases.preid LEFT OUTER JOIN category cp ON cp.id = c.parentid WHERE %s %s AND releases.passwordstatus <= (SELECT VALUE FROM site WHERE setting='showpasswordedrelease') %s ORDER BY %s %s" . $limit, $usql, $exccatlist, $maxagesql, $order[0], $order[1]);
-
-		return $this->pdo->query($sql, true);
-	}
-
-	/**
-	 * Get count of releases in users 'my tvshows' for pager
-	 *
-	 * @param       $usershows
-	 * @param int   $maxage
-	 * @param array $excludedcats
-	 *
-	 * @return
-	 */
-	public function getShowsCount($usershows, $maxage = -1, $excludedcats = array())
-	{
-
-
-		$exccatlist = "";
-		if (count($excludedcats) > 0)
-			$exccatlist = " and releases.categoryid not in (" . implode(",", $excludedcats) . ")";
-
-		$usql = '(1=2 ';
-		foreach ($usershows as $ushow) {
-			$usql .= sprintf('or (releases.rageid = %d', $ushow['rageid']);
-			if ($ushow['categoryid'] != '') {
-				$catsArr = explode('|', $ushow['categoryid']);
-				if (count($catsArr) > 1)
-					$usql .= sprintf(' and releases.categoryid in (%s)', implode(',', $catsArr));
-				else
-					$usql .= sprintf(' and releases.categoryid = %d', $catsArr[0]);
-			}
-			$usql .= ') ';
-		}
-		$usql .= ') ';
-
-		$maxagesql = "";
-		if ($maxage > 0)
-			$maxagesql = sprintf(" and releases.postdate > now() - interval %d day ", $maxage);
-
-		$res = $this->pdo->queryOneRow(sprintf(" SELECT count(releases.id) AS num FROM releases WHERE %s %s AND releases.passwordstatus <= (SELECT VALUE FROM site WHERE setting='showpasswordedrelease') %s", $usql, $exccatlist, $maxagesql), true);
-
-		return $res["num"];
-	}
-
-	/**
-	 * Delete a preview associated with a release and update the release to indicate it doesnt have one.
-	 */
-	public function deletePreview($guid)
-	{
-		$this->updateHasPreview($guid, 0);
-		$ri = new ReleaseImage();
-		$ri->delete($guid);
-	}
-
-	/**
-	 * Update whether a release has a preview.
-	 */
-	public function updateHasPreview($guid, $haspreview)
-	{
-
-		$this->pdo->queryExec(sprintf("UPDATE releases SET haspreview = %d WHERE guid = %s", $haspreview, $this->pdo->escapeString($guid)));
-	}
-
-	/**
-	 * Update a release.
-	 */
-	public function update($id, $name, $searchname, $fromname, $category, $parts, $grabs, $size, $posteddate, $addeddate, $rageid, $seriesfull, $season, $episode, $imdbid, $anidbid, $tvdbid, $consoleinfoid)
-	{
-
-
-		$this->pdo->queryExec(sprintf("UPDATE releases SET name=%s, searchname=%s, fromname=%s, categoryid=%d, totalpart=%d, grabs=%d, size=%s, postdate=%s, adddate=%s, rageid=%d, seriesfull=%s, season=%s, episode=%s, imdbid=%d, anidbid=%d, tvdbid=%d,consoleinfoid=%d WHERE id = %d",
-				$this->pdo->escapeString($name), $this->pdo->escapeString($searchname), $this->pdo->escapeString($fromname), $category, $parts, $grabs, $this->pdo->escapeString($size), $this->pdo->escapeString($posteddate), $this->pdo->escapeString($addeddate), $rageid, $this->pdo->escapeString($seriesfull), $this->pdo->escapeString($season), $this->pdo->escapeString($episode), $imdbid, $anidbid, $tvdbid, $consoleinfoid, $id
-			)
-		);
-		$this->sphinxSearch->updateReleaseSearchName($id, $searchname);
-	}
-
-	/**
-	 * Update multiple releases.
-	 */
-	public function updatemulti($guids, $category, $grabs, $rageid, $season, $imdbid)
-	{
-		if (!is_array($guids) || sizeof($guids) < 1)
-			return false;
-
-		$update = array(
-			'categoryid' => (($category == '-1') ? '' : $category),
-			'grabs'      => $grabs,
-			'rageid'     => $rageid,
-			'season'     => $season,
-			'imdbid'     => $imdbid
-		);
-
-
-		$updateSql = array();
-		foreach ($update as $updk => $updv) {
-			if ($updv != '')
-				$updateSql[] = sprintf($updk . '=%s', $this->pdo->escapeString($updv));
-		}
-
-		if (sizeof($updateSql) < 1) {
-			//echo 'no field set to be changed';
-			return -1;
-		}
-
-		$updateGuids = array();
-		foreach ($guids as $guid) {
-			$updateGuids[] = $this->pdo->escapeString($guid);
-		}
-
-		$sql = sprintf('UPDATE releases SET ' . implode(', ', $updateSql) . ' WHERE guid IN (%s)', implode(', ', $updateGuids));
-
-		return $this->pdo->queryExec($sql);
-	}
-
-
-	/**
-	 * @param        $rageId
-	 * @param string $series
-	 * @param string $episode
-	 * @param int    $offset
-	 * @param int    $limit
-	 * @param string $name
-	 * @param array  $cat
-	 * @param int    $maxAge
-	 *
-	 * @return array
-	 */
-	public function searchbyRageId($rageId, $series = '', $episode = '', $offset = 0, $limit = 100, $name = '', $cat = [-1], $maxAge = -1)
-	{
-		$whereSql = sprintf(
-			"%s
-			WHERE r.categoryid BETWEEN 5000 AND 5999
-			AND r.nzbstatus = %d
-			AND r.passwordstatus %s %s %s %s %s %s %s",
-			($name !== '' ? $this->releaseSearch->getFullTextJoinString() : ''),
-			Enzebe::NZB_ADDED,
-			$this->showPasswords(),
-			($rageId != -1 ? sprintf(' AND rageid = %d ', $rageId) : ''),
-			($series != '' ? sprintf(' AND UPPER(r.season) = UPPER(%s)', $this->pdo->escapeString(((is_numeric($series) && strlen($series) != 4) ? sprintf('S%02d', $series) : $series))) : ''),
-			($episode != '' ? sprintf(' AND r.episode %s', $this->pdo->likeString((is_numeric($episode) ? sprintf('E%02d', $episode) : $episode))) : ''),
-			($name !== '' ? $this->releaseSearch->getSearchSQL(['searchname' => $name]) : ''),
-			$this->categorySQL($cat),
-			($maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '')
-		);
-
-		$baseSql = sprintf(
-			"SELECT r.*,
-				concat(cp.title, ' > ', c.title) AS category_name,
-				CONCAT(cp.id, ',', c.id) AS category_ids,
-				groups.name AS group_name,
-				rn.id AS nfoid,
-				re.releaseid AS reid
-			FROM releases r
-			INNER JOIN category c ON c.id = r.categoryid
-			INNER JOIN groups ON groups.id = r.groupid
-			LEFT OUTER JOIN releasevideo re ON re.releaseid = r.id
-			LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id AND rn.nfo IS NOT NULL
-			INNER JOIN category cp ON cp.id = c.parentid
-			%s",
-			$whereSql
-		);
-
-		$sql = sprintf(
-			"%s
-			ORDER BY postdate DESC
-			LIMIT %d OFFSET %d",
-			$baseSql,
-			$limit,
-			$offset
-		);
-		$releases = $this->pdo->query($sql);
-		if ($releases && count($releases)) {
-			$releases[0]['_totalrows'] = $this->getPagerCount($baseSql);
-		}
-		return $releases;
-	}
-
-	/**
-	 * @param int    $aniDbID
-	 * @param string $episodeNumber
-	 * @param int    $offset
-	 * @param int    $limit
-	 * @param string $name
-	 * @param array  $cat
-	 * @param int    $maxAge
-	 *
-	 * @return array
-	 */
-	public function searchbyAnidbId($aniDbID, $episodeNumber = '', $offset = 0, $limit = 100, $name = '', $cat = [-1], $maxAge = -1)
-	{
-		$whereSql = sprintf(
-			"%s
-			WHERE r.passwordstatus %s AND r.nzbstatus = %d %s %s %s %s %s",
-			($name !== '' ? $this->releaseSearch->getFullTextJoinString() : ''),
-			$this->showPasswords(),
-			Enzebe::NZB_ADDED,
-			($aniDbID > -1 ? sprintf(' AND anidbid = %d ', $aniDbID) : ''),
-			(is_numeric($episodeNumber) ? sprintf(" AND r.episode '%s' ", $this->pdo->likeString($episodeNumber)) : ''),
-			($name !== '' ? $this->releaseSearch->getSearchSQL(['searchname' => $name]) : ''),
-			$this->categorySQL($cat),
-			($maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '')
-		);
-
-		$baseSql = sprintf(
-			"SELECT r.*,
-				CONCAT(cp.title, ' > ', c.title) AS category_name,
-				CONCAT(cp.id, ',', c.id) AS category_ids,
-				groups.name AS group_name,
-				rn.id AS nfoid
-			FROM releases r
-			INNER JOIN category c ON c.id = r.categoryid
-			INNER JOIN groups ON groups.id = r.groupid
-			LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id AND rn.nfo IS NOT NULL
-			INNER JOIN category cp ON cp.id = c.parentid
-			%s",
-			$whereSql
-		);
-
-		$sql = sprintf(
-			"%s
-			ORDER BY postdate DESC
-			LIMIT %d OFFSET %d",
-			$baseSql,
-			$limit,
-			$offset
-		);
-		$releases = $this->pdo->query($sql);
-		if ($releases && count($releases)) {
-			$releases[0]['_totalrows'] = $this->getPagerCount($baseSql);
-		}
-		return $releases;
-	}
-
-	/**
-	 * @param int    $imDbId
-	 * @param int    $offset
-	 * @param int    $limit
-	 * @param string $name
-	 * @param array  $cat
-	 * @param int    $maxAge
-	 *
-	 * @return array
-	 */
-	public function searchbyImdbId($imDbId, $offset = 0, $limit = 100, $name = '', $cat = [-1], $maxAge = -1)
-	{
-		$whereSql = sprintf(
-			"%s
-			WHERE r.categoryid BETWEEN 2000 AND 2999
-			AND r.nzbstatus = %d
-			AND r.passwordstatus %s
-			%s %s %s %s",
-			($name !== '' ? $this->releaseSearch->getFullTextJoinString() : ''),
-			Enzebe::NZB_ADDED,
-			$this->showPasswords(),
-			($name !== '' ? $this->releaseSearch->getSearchSQL(['searchname' => $name]) : ''),
-			(($imDbId != '-1' && is_numeric($imDbId)) ? sprintf(' AND imdbid = %d ', str_pad($imDbId, 7, '0', STR_PAD_LEFT)) : ''),
-			$this->categorySQL($cat),
-			($maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '')
-		);
-
-		$baseSql = sprintf(
-			"SELECT r.*,
-				concat(cp.title, ' > ', c.title) AS category_name,
-				CONCAT(cp.id, ',', c.id) AS category_ids,
-				g.name AS group_name,
-				rn.id AS nfoid
-			FROM releases r
-			INNER JOIN groups g ON g.id = r.groupid
-			INNER JOIN category c ON c.id = r.categoryid
-			LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id AND rn.nfo IS NOT NULL
-			INNER JOIN category cp ON cp.id = c.parentid
-			%s",
-			$whereSql
-		);
-
-		$sql = sprintf(
-			"%s
-			ORDER BY postdate DESC
-			LIMIT %d OFFSET %d",
-			$baseSql,
-			$limit,
-			$offset
-		);
-		$releases = $this->pdo->query($sql);
-		if ($releases && count($releases)) {
-			$releases[0]['_totalrows'] = $this->getPagerCount($baseSql);
-		}
-		return $releases;
-	}
-
-	/**
-	 * Search for releases by album/artist/musicinfo. Used by API.
-	 */
-	public function searchAudio($artist, $album, $label, $track, $year, $genre = array(-1), $offset = 0, $limit = 100, $cat = array(-1), $maxage = -1)
-	{
-		$s = new Sites();
-		$site = $s->get();
-		if ($site->sphinxenabled) {
-			$sphinx = new Sphinx();
-			$results = $sphinx->searchAudio($artist, $album, $label, $track, $year, $genre, $offset, $limit, $cat, $maxage, array(), true);
-			if (is_array($results))
-				return $results;
-		}
-
-
-		$searchsql = "";
-
-		if ($artist != "")
-			$searchsql .= sprintf(" and musicinfo.artist like %s ", $this->pdo->escapeString("%" . $artist . "%"));
-		if ($album != "")
-			$searchsql .= sprintf(" and musicinfo.title like %s ", $this->pdo->escapeString("%" . $album . "%"));
-		if ($label != "")
-			$searchsql .= sprintf(" and musicinfo.publisher like %s ", $this->pdo->escapeString("%" . $label . "%"));
-		if ($track != "")
-			$searchsql .= sprintf(" and musicinfo.tracks like %s ", $this->pdo->escapeString("%" . $track . "%"));
-		if ($year != "")
-			$searchsql .= sprintf(" and musicinfo.year = %d ", $year);
-
-
-		$catsrch = "";
-		$usecatindex = "";
-		if (count($cat) > 0 && $cat[0] != -1) {
-			$catsrch = " and (";
-			foreach ($cat as $category) {
-				if ($category != -1) {
-					$categ = new Categorize();
-					if ($categ->isParent($category)) {
-						$children = $categ->getChildren($category);
-						$chlist = "-99";
-						foreach ($children as $child)
-							$chlist .= ", " . $child["id"];
-
-						if ($chlist != "-99")
-							$catsrch .= " releases.categoryid in (" . $chlist . ") or ";
-					} else {
-						$catsrch .= sprintf(" releases.categoryid = %d or ", $category);
-					}
-				}
-			}
-			$catsrch .= "1=2 )";
-			$usecatindex = " use index (ix_releases_categoryID) ";
-		}
-
-		if ($maxage > 0)
-			$maxage = sprintf(" and postdate > now() - interval %d day ", $maxage);
-		else
-			$maxage = "";
-
-		$genresql = "";
-		if (count($genre) > 0 && $genre[0] != -1) {
-			$genresql = " and (";
-			foreach ($genre as $g) {
-				$genresql .= sprintf(" musicinfo.genreID = %d or ", $g);
-			}
-			$genresql .= "1=2 )";
-		}
-
-		$sql = sprintf("SELECT releases.*, musicinfo.cover AS mi_cover, musicinfo.review AS mi_review, musicinfo.tracks AS mi_tracks, musicinfo.publisher AS mi_publisher, musicinfo.title AS mi_title, musicinfo.artist AS mi_artist, genres.title AS music_genrename, concat(cp.title, ' > ', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, groups.name AS group_name, rn.id AS nfoid FROM releases %s LEFT OUTER JOIN musicinfo ON musicinfo.id = releases.musicinfoid LEFT JOIN genres ON genres.id = musicinfo.genreID LEFT OUTER JOIN groups ON groups.id = releases.groupid LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN releasenfo rn ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL LEFT OUTER JOIN category cp ON cp.id = c.parentid WHERE releases.passwordstatus <= (SELECT VALUE FROM site WHERE setting='showpasswordedrelease') %s %s %s %s ORDER BY postdate DESC LIMIT %d, %d ", $usecatindex, $searchsql, $catsrch, $maxage, $genresql, $offset, $limit);
-		$orderpos = strpos($sql, "order by");
-		$wherepos = strpos($sql, "where");
-		$sqlcount = "SELECT count(releases.id) AS num FROM releases INNER JOIN musicinfo ON musicinfo.id = releases.musicinfoid " . substr($sql, $wherepos, $orderpos - $wherepos);
-
-		$countres = $this->pdo->queryOneRow($sqlcount, true);
-		$res = $this->pdo->query($sql, true);
-		if (count($res) > 0)
-			$res[0]["_totalrows"] = $countres["num"];
-
-		return $res;
-	}
-
-	/**
-	 * Search for releases by author/bookinfo. Used by API.
-	 */
-	public function searchBook($author, $title, $offset = 0, $limit = 100, $maxage = -1)
-	{
-		$s = new Sites();
-		$site = $s->get();
-		if ($site->sphinxenabled) {
-			$sphinx = new Sphinx();
-			$results = $sphinx->searchBook($author, $title, $offset, $limit, $maxage, array(), true);
-			if (is_array($results))
-				return $results;
-		}
-
-
-		$searchsql = "";
-
-		if ($author != "")
-			$searchsql .= sprintf(" and bookinfo.author like %s ", $this->pdo->escapeString("%" . $author . "%"));
-		if ($title != "")
-			$searchsql .= sprintf(" and bookinfo.title like %s ", $this->pdo->escapeString("%" . $title . "%"));
-
-		if ($maxage > 0)
-			$maxage = sprintf(" and postdate > now() - interval %d day ", $maxage);
-		else
-			$maxage = "";
-
-		$sql = sprintf("SELECT releases.*, bookinfo.cover AS bi_cover, bookinfo.review AS bi_review, bookinfo.publisher AS bi_publisher, bookinfo.pages AS bi_pages, bookinfo.publishdate AS bi_publishdate, bookinfo.title AS bi_title, bookinfo.author AS bi_author, genres.title AS book_genrename, concat(cp.title, ' > ', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, groups.name AS group_name, rn.id AS nfoid FROM releases LEFT OUTER JOIN bookinfo ON bookinfo.id = releases.bookinfoid LEFT JOIN genres ON genres.id = bookinfo.genreID LEFT OUTER JOIN groups ON groups.id = releases.groupid LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN releasenfo rn ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL LEFT OUTER JOIN category cp ON cp.id = c.parentid WHERE releases.passwordstatus <= (SELECT value FROM site WHERE setting='showpasswordedrelease') %s %s ORDER BY postdate DESC LIMIT %d, %d ", $searchsql, $maxage, $offset, $limit);
-		$orderpos = strpos($sql, "order by");
-		$wherepos = strpos($sql, "where");
-		$sqlcount = "SELECT count(releases.id) AS num FROM releases INNER JOIN bookinfo ON bookinfo.id = releases.bookinfoid " . substr($sql, $wherepos, $orderpos - $wherepos);
-
-		$countres = $this->pdo->queryOneRow($sqlcount, true);
-		$res = $this->pdo->query($sql, true);
-		if (count($res) > 0)
-			$res[0]["_totalrows"] = $countres["num"];
-
-		return $res;
-	}
-
-	/**
-	 * @param       $currentID
-	 * @param       $name
-	 * @param int   $limit
-	 * @param array $excludedCats
-	 *
-	 * @return array
-	 */
-	public function searchSimilar($currentID, $name, $limit = 6, $excludedCats = [])
-	{
-		// Get the category for the parent of this release.
-		$currRow = $this->getById($currentID);
-		$catRow = (new \Category(['Settings' => $this->pdo]))->getById($currRow['categoryid']);
-		$parentCat = $catRow['parentid'];
-
-		$results = $this->search(
-			$this->getSimilarName($name), -1, -1, -1, [$parentCat], -1, -1, 0, 0, -1, -1, 0, $limit, '', -1, $excludedCats
-		);
-		if (!$results) {
-			return $results;
-		}
-
-		$ret = [];
-		foreach ($results as $res) {
-			if ($res['id'] != $currentID && $res['categoryParentID'] == $parentCat) {
-				$ret[] = $res;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	public function getSimilarName($name)
-	{
-		return implode(' ', array_slice(str_word_count(str_replace(['.', '_'], ' ', $name), 2), 0, 2));
-	}
-
-	/**
-	 * Function for searching on the site (by subject, searchname or advanced).
-	 *
-	 * @param string $searchName
-	 * @param string $usenetName
-	 * @param string $posterName
-	 * @param string $groupName
-	 * @param array  $cat
-	 * @param int    $sizeFrom
-	 * @param int    $sizeTo
-	 * @param int    $hasNfo
-	 * @param int    $hasComments
-	 * @param int    $daysNew
-	 * @param int    $daysOld
-	 * @param int    $offset
-	 * @param int    $limit
-	 * @param string $orderBy
-	 * @param int    $maxAge
-	 * @param array  $excludedCats
-	 * @param string $type
-	 *
-	 * @return array
-	 */
-	public function search(
-		$searchName, $usenetName, $posterName, $groupName, $cat = [-1], $sizeFrom,
-		$sizeTo, $hasNfo, $hasComments, $daysNew, $daysOld, $offset = 0, $limit = 1000,
-		$orderBy = '', $maxAge = -1, $excludedCats = [], $type = 'basic'
-	)
-	{
-
-		$sphinxSearch = new SphinxSearch();
-		$releaseSearch = new ReleaseSearch($this->pdo, $sphinxSearch);
-		$sizeRange = range(1, 11);
-		$groups = new Groups();
-
-		if ($orderBy == '') {
-			$orderBy = [];
-			$orderBy[0] = 'postdate ';
-			$orderBy[1] = 'desc ';
-		} else {
-			$orderBy = $this->getBrowseOrder($orderBy);
-		}
-
-		$searchOptions = [];
-		if ($searchName != -1) {
-			$searchOptions['searchname'] = $searchName;
-		}
-		if ($usenetName != -1) {
-			$searchOptions['name'] = $usenetName;
-		}
-		if ($posterName != -1) {
-			$searchOptions['fromname'] = $posterName;
-		}
-
-		$whereSql = sprintf(
-			"%s
-			WHERE r.passwordstatus <= (select value from site where setting='showpasswordedrelease') AND r.nzbstatus = %d %s %s %s %s %s %s %s %s %s %s %s",
-			$releaseSearch->getFullTextJoinString(),
-			Enzebe::NZB_ADDED,
-			($maxAge > 0 ? sprintf(' AND r.postdate > (NOW() - INTERVAL %d DAY) ', $maxAge) : ''),
-			($groupName != -1 ? sprintf(' AND r.groupid = %d ', $groups->getIDByName($groupName)) : ''),
-			(in_array($sizeFrom, $sizeRange) ? ' AND r.size > ' . (string)(104857600 * (int)$sizeFrom) . ' ' : ''),
-			(in_array($sizeTo, $sizeRange) ? ' AND r.size < ' . (string)(104857600 * (int)$sizeTo) . ' ' : ''),
-			($hasNfo != 0 ? ' AND r.nfostatus = 1 ' : ''),
-			($hasComments != 0 ? ' AND r.comments > 0 ' : ''),
-			($type !== 'advanced' ? $this->categorySQL($cat) : ($cat[0] != '-1' ? sprintf(' AND (r.categoryid = %d) ', $cat[0]) : '')),
-			($daysNew != -1 ? sprintf(' AND r.postdate < (NOW() - INTERVAL %d DAY) ', $daysNew) : ''),
-			($daysOld != -1 ? sprintf(' AND r.postdate > (NOW() - INTERVAL %d DAY) ', $daysOld) : ''),
-			(count($excludedCats) > 0 ? ' AND r.categoryid NOT IN (' . implode(',', $excludedCats) . ')' : ''),
-			(count($searchOptions) > 0 ? $releaseSearch->getSearchSQL($searchOptions) : '')
-		);
-
-		$baseSql = sprintf(
-			"SELECT r.*,
-				CONCAT(cp.title, ' > ', c.title) AS category_name,
-				CONCAT(cp.id, ',', c.id) AS category_ids,
-				groups.name AS group_name,
-				rn.id AS nfoid,
-				re.releaseid AS reid,
-				cp.id AS categoryParentID
-			FROM releases r
-			LEFT OUTER JOIN releasevideo re ON re.releaseid = r.id
-			LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id
-			INNER JOIN groups ON groups.id = r.groupid
-			INNER JOIN category c ON c.id = r.categoryid
-			INNER JOIN category cp ON cp.id = c.parentid
-			%s",
-			$whereSql
-		);
-
-		$sql = sprintf(
-			"SELECT * FROM (
-				%s
-			) r
-			ORDER BY r.%s %s
-			LIMIT %d OFFSET %d",
-			$baseSql,
-			$orderBy[0],
-			$orderBy[1],
-			$limit,
-			$offset
-		);
-		$releases = $this->pdo->query($sql);
-		if ($releases && count($releases)) {
-			$releases[0]['_totalrows'] = $this->getPagerCount($baseSql);
-		}
-
-		return $releases;
-	}
-
-	/**
-	 * Get count of releases for pager.
-	 *
-	 * @param string $query The query to get the count from.
-	 *
-	 * @return int
-	 */
-	private function getPagerCount($query)
-	{
-
-		$count = $this->pdo->queryOneRow(
-			sprintf(
-				'SELECT COUNT(*) AS count FROM (%s LIMIT %s) z',
-				preg_replace('/SELECT.+?FROM\s+releases/is', 'SELECT r.id FROM releases', $query),
-				NN_MAX_PAGER_RESULTS
-			)
-		);
-		if (isset($count['count']) && is_numeric($count['count'])) {
-			return $count['count'];
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Creates part of a query for searches requiring the categoryid's.
-	 *
-	 * @param array $categories
-	 *
-	 * @return string
-	 */
-	public function categorySQL($categories)
-	{
-		$sql = '';
-		if (count($categories) > 0 && $categories[0] != -1) {
-			$Category = new \Category(['Settings' => $this->pdo]);
-			$sql = ' AND (';
-			foreach ($categories as $category) {
-				if ($category != -1) {
-					if ($Category->isParent($category)) {
-						$children = $Category->getChildren($category);
-						$childList = '-99';
-						foreach ($children as $child) {
-							$childList .= ', ' . $child['id'];
-						}
-
-						if ($childList != '-99') {
-							$sql .= ' r.categoryid IN (' . $childList . ') OR ';
-						}
-					} else {
-						$sql .= sprintf(' r.categoryid = %d OR ', $category);
-					}
-				}
-			}
-			$sql .= '1=2 )';
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * @param int $id
-	 *
-	 * @return array|bool
-	 */
-	public function getById($id)
-	{
-		return $this->pdo->queryOneRow(
-			sprintf(
-				'SELECT r.*, g.name AS group_name
-				FROM releases r
-				INNER JOIN groups g ON g.id = r.groupid
-				WHERE r.id = %d',
-				$id
-			)
-		);
-	}
-
-	/**
-	 * Writes a zip file of an array of release guids directly to the stream
-	 */
-	public function getZipped($guids)
-	{
-		$s = new Sites();
-		$this->nzb = new NZB;
-		$site = $s->get();
-		$zipfile = new zipfile();
-
-		foreach ($guids as $guid) {
-			$nzbpath = $this->nzb->getNZBPath($guid, $site->nzbpath);
-
-			if (file_exists($nzbpath)) {
-				ob_start();
-				@readgzfile($nzbpath);
-				$nzbfile = ob_get_contents();
-				ob_end_clean();
-
-				$filename = $guid;
-				$r = $this->getByGuid($guid);
-				if ($r)
-					$filename = $r["searchname"];
-
-				$zipfile->addFile($nzbfile, $filename . ".nzb");
-			}
-		}
-
-		return $zipfile->file();
-	}
-
-	/**
-	 * Retrieve one or more releases by guid.
-	 */
-	public function getByGuid($guid)
-	{
-
-		if (is_array($guid)) {
-			$tmpguids = array();
-			foreach ($guid as $g)
-				$tmpguids[] = $this->pdo->escapeString($g);
-			$gsql = sprintf('guid in (%s)', implode(',', $tmpguids));
-		} else {
-			$gsql = sprintf('guid = %s', $this->pdo->escapeString($guid));
-		}
-		$sql = sprintf("SELECT releases.*, musicinfo.cover AS mi_cover, musicinfo.review AS mi_review, musicinfo.tracks AS mi_tracks, musicinfo.publisher AS mi_publisher, musicinfo.title AS mi_title, musicinfo.artist AS mi_artist, music_genre.title AS music_genrename,    bookinfo.cover AS bi_cover, bookinfo.review AS bi_review, bookinfo.publisher AS bi_publisher, bookinfo.publishdate AS bi_publishdate, bookinfo.title AS bi_title, bookinfo.author AS bi_author, bookinfo.pages AS bi_pages,  bookinfo.isbn AS bi_isbn, concat(cp.title, ' > ', c.title) AS category_name, concat(cp.id, ',', c.id) AS category_ids, groups.name AS group_name, movieinfo.title AS movietitle, movieinfo.year AS movieyear, (SELECT releasetitle FROM tvrage WHERE rageid = releases.rageid AND rageid > 0 LIMIT 1) AS tvreleasetitle FROM releases LEFT OUTER JOIN groups ON groups.id = releases.groupid LEFT OUTER JOIN category c ON c.id = releases.categoryid LEFT OUTER JOIN category cp ON cp.id = c.parentid LEFT OUTER JOIN musicinfo ON musicinfo.id = releases.musicinfoid LEFT OUTER JOIN bookinfo ON bookinfo.id = releases.bookinfoid LEFT OUTER JOIN movieinfo ON movieinfo.imdbid = releases.imdbid LEFT JOIN genres music_genre ON music_genre.id = musicinfo.genreID WHERE %s", $gsql);
-
-		return (is_array($guid)) ? $this->pdo->query($sql) : $this->pdo->queryOneRow($sql);
-	}
-
-	/**
-	 * Removes an associated tvrage id from all releases using it.
-	 */
-	public function removeRageIdFromReleases($rageid)
-	{
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT count(id) AS num FROM releases WHERE rageid = %d", $rageid));
-		$ret = $res["num"];
-		$this->pdo->queryExec(sprintf("UPDATE releases SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL WHERE rageid = %d", $rageid));
-
-		return $ret;
-	}
-
-	/**
-	 * Removes an associated tvdb id from all releases using it.
-	 */
-	public function removeThetvdbIdFromReleases($tvdbID)
-	{
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT count(id) AS num FROM releases WHERE tvdbid = %d", $tvdbID));
-		$ret = $res["num"];
-		$res = $this->pdo->queryExec(sprintf("UPDATE releases SET tvdbid = -1 WHERE tvdbid = %d", $tvdbID));
-
-		return $ret;
-	}
-
-	public function removeAnidbIdFromReleases($anidbID)
-	{
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT count(id) AS num FROM releases WHERE anidbid = %d", $anidbID));
-		$ret = $res["num"];
-		$this->pdo->queryExec(sprintf("UPDATE releases SET anidbid = -1, episode = NULL, tvtitle = NULL, tvairdate = NULL WHERE anidbid = %d", $anidbID));
-
-		return $ret;
-	}
-
-	public function getReleaseNfo($id, $incnfo = true)
-	{
-
-		$selnfo = ($incnfo) ? ', uncompress(nfo) as nfo' : '';
-
-		return $this->pdo->queryOneRow(sprintf("SELECT id, releaseid" . $selnfo . " FROM releasenfo where releaseid = %d AND nfo IS NOT NULL", $id));
-	}
-
-	public function updateGrab($guid)
-	{
-
-		$this->pdo->queryExec(sprintf("UPDATE releases SET grabs = grabs + 1 WHERE guid = %s", $this->pdo->escapeString($guid)));
-	}
-
-
-	/**
-	 * @param int    $categorize
-	 * @param int    $postProcess
-	 * @param string $groupName (optional)
-	 * @param \NNTP   $nntp
-	 * @param bool   $echooutput
-	 *
-	 * @return int
-	 */
-	public function processReleases($categorize, $postProcess, $groupName, &$nntp, $echooutput)
-	{
-		$this->echoCLI = ($echooutput && NN_ECHOCLI);
-		$page = new Page();
-		$groupID = '';
-		$s = new Sites();
-		echo $s->getLicense();
-
-		if (!empty($groupName)) {
-			$groupInfo = $this->groups->getByName($groupName);
-			$groupID = $groupInfo['id'];
-		}
-
-		$processReleases = microtime(true);
-		if ($this->echoCLI) {
-			$this->pdo->log->doEcho($this->pdo->log->header("Starting release update process (" . date('Y-m-d H:i:s') . ")"), true);
-		}
-
-		if (!file_exists($page->site->nzbpath)) {
-			$this->pdo->log->doEcho($this->pdo->log->primary('Bad or missing nzb directory - ' . $page->site->nzbpath), true);
-
-			return -1;
-		}
-
-		$this->checkRegexesUptoDate($page->site->latestregexurl, $page->site->latestregexrevision, $page->site->newznabID);
-
-		$this->applyRegex($groupID);
-		$this->processIncompleteBinaries($groupID);
-
-		$DIR = NN_MISC;
-		$PYTHON = shell_exec('which python3 2>/dev/null');
-		$PYTHON = (empty($PYTHON) ? 'python -OOu' : 'python3 -OOu');
-		$processRequestIDs = (int)$page->site->lookup_reqids;
-		$consoleTools = new ConsoleTools(['ColorCLI' => $this->pdo->log]);
-		$totalReleasesAdded = $loops = 0;
-		do {
-			$releasesAdded = $this->createReleases($groupID);
-			$totalReleasesAdded += $releasesAdded;
-
-			if ($processRequestIDs === 0) {
-				$this->processRequestIDs($groupID, 5000, true);
-			} else if ($processRequestIDs === 1) {
-				$this->processRequestIDs($groupID, 5000, true);
-				$this->processRequestIDs($groupID, 1000, false);
-			} else if ($processRequestIDs === 2) {
-				$requestIDTime = time();
-				if ($this->echoCLI) {
-					$this->pdo->log->doEcho($this->pdo->log->header("Process Releases -> Request id Threaded lookup."));
-					}
-				passthru("$PYTHON ${DIR}update_scripts/nix_scripts/tmux/python/requestid_threaded.py");
-				if ($this->echoCLI) {
-					$this->pdo->log->doEcho(
-						$this->pdo->log->primary(
-							"\nReleases updated in " .
-							$consoleTools->convertTime(time() - $requestIDTime)
-						)
-					);
-				}
-			}
-			$this->categorizeReleases($categorize, $groupID);
-			$this->postProcessReleases($postProcess, $nntp);
-			$this->deleteBinaries($groupID);
-			// This loops as long as there were releases created or 3 loops, otherwise, you could loop indefinately
-		} while ($releasesAdded > 0 && $loops++ < 3);
-
-		$this->deletedReleasesByGroup($groupID);
-		$this->deleteReleases();
-
-		//
-		// User/Request housekeeping, should ideally move this to its own section, but it needs to be done automatically.
-		//
-		$users = new Users;
-		$users->pruneRequestHistory($page->site->userdownloadpurgedays);
-
-		//Print amount of added releases and time it took.
-		if ($this->echoCLI && $this->tablePerGroup === false) {
-			$countID = $this->pdo->queryOneRow('SELECT COUNT(id) AS count FROM binaries ' . (!empty($groupID) ? ' WHERE groupid = ' . $groupID : ''));
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					'Completed adding ' .
-					number_format($totalReleasesAdded) .
-					' releases in ' .
-					$this->consoleTools->convertTime(number_format(microtime(true) - $processReleases, 2)) .
-					'. ' .
-					number_format(($countID === false ? 0 : $countID['count'])) .
-					' binaries waiting to be converted (still incomplete or in queue for creation)'
-				), true
-			);
-		}
-
-		return $totalReleasesAdded;
-
-	}
-	/**
-	 * Delete unwanted binaries based on size/file count using admin settings.
-	 *
-	 * @param int|string $groupID (optional)
-	 *
-	 * @void
-	 * @access public
-	 */
-	public function deleteBinaries($groupID)
-	{
-		$group = $this->groups->getCBPTableNames($this->tablePerGroup, $groupID);
-		$page = new Page();
-		$currTime_ori = $this->pdo->queryOneRow("SELECT NOW() as now");
-		//
-		// aggregate the releasefiles upto the releases.
-		//
-		$this->pdo->log->doEcho($this->pdo->log->primary('Aggregating Files'));
-		$this->pdo->queryExec("UPDATE releases INNER JOIN (SELECT releaseid, COUNT(id) AS num FROM releasefiles GROUP BY releaseid) b ON b.releaseid = releases.id AND releases.rarinnerfilecount = 0 SET rarinnerfilecount = b.num");
-
-		// Remove the binaries and parts used to form releases, or that are duplicates.
-		//
-		if ($page->site->partsdeletechunks > 0) {
-			$this->pdo->log->doEcho($this->pdo->log->primary('Chunk deleting unused binaries and parts'));
-			$query = sprintf("SELECT p.id AS partsID,b.id AS binariesID FROM %s p
-						LEFT JOIN %s b ON b.id = p.binaryid
-						WHERE b.dateadded < %s - INTERVAL %d HOUR LIMIT 0,%d",
-				$group['pname'],
-				$group['bname'],
-				$this->pdo->escapeString($currTime_ori["now"]),
-				ceil($page->site->rawretentiondays * 24),
-				$page->site->partsdeletechunks
-			);
-
-			$cc = 0;
-			$done = false;
-			while (!$done) {
-				$dd = $cc;
-				$result = $this->pdo->query($query);
-				if (count($result) > 0) {
-					$pID = array();
-					$bID = array();
-					foreach ($result as $row) {
-						$pID[] = $row['partsID'];
-						$bID[] = $row['binariesID'];
-					}
-					$pID = '(' . implode(',', $pID) . ')';
-					$bID = '(' . implode(',', $bID) . ')';
-					$fr = $this->pdo->queryExec("DELETE FROM %s WHERE id IN {$pID}", $group['pname']);
-					if ($fr > 0) {
-						$cc += $fr;
-						$cc += $this->pdo->queryExec("DELETE FROM %s WHERE id IN {$bID}", $group['bname']);
-					}
-					unset($pID);
-					unset($bID);
-					if ($cc == $dd) {
-						$done = true;
-					}
-					echo($cc % 10000 ? '.' : '');
-				} else {
-					$done = true;
-				}
-			}
-			$this->pdo->log->doEcho($this->pdo->log->primary('Complete - ' . $cc . ' rows affected'));
-		} else {
-			$this->pdo->log->doEcho($this->pdo->log->primary('Deleting unused binaries and parts'));
-			$this->pdo->queryExec(sprintf("DELETE %s, %s FROM %s JOIN %s  ON %s.id = %s.binaryid
-			WHERE %s.dateadded < %s - INTERVAL %d HOUR",
-					$group['pname'],
-					$group['bname'],
-					$group['pname'],
-					$group['bname'],
-					$group['bname'],
-					$group['pname'],
-					$group['bname'],
-					$this->pdo->escapeString($currTime_ori["now"]),
-					ceil($page->site->rawretentiondays * 24)
-				)
-			);
-		}
-	}
-
-	/**
-	 * @param int $groupID
-	 * @void
-	 * @access public
-	 */
-	public function processIncompleteBinaries($groupID)
-	{
-		//
-		// Move all binaries from releases which have the correct number of files on to the next stage.
-		//
-		$retcount = 0;
-		$currTime_ori = $this->pdo->queryOneRow("SELECT NOW() as now");
-		$page = new Page();
-		$group = $this->groups->getCBPTableNames($this->tablePerGroup, $groupID);
-		$this->pdo->log->doEcho($this->pdo->log->primary('Marking binaries where all parts are available'));
-		$result = $this->pdo->queryDirect(sprintf("SELECT relname, date, SUM(reltotalpart) AS reltotalpart, groupid, reqid, fromname, SUM(num) AS num, coalesce(g.minfilestoformrelease, s.minfilestoformrelease) AS minfilestoformrelease FROM ( SELECT relname, reltotalpart, groupid, reqid, fromname, max(date) AS date, COUNT(id) AS num FROM %s WHERE procstat = %s GROUP BY relname, reltotalpart, groupid, reqid, fromname ORDER BY NULL ) x LEFT OUTER JOIN groups g ON g.id = x.groupid INNER JOIN ( SELECT value AS minfilestoformrelease FROM site WHERE setting = 'minfilestoformrelease' ) s GROUP BY relname, groupid, reqid, fromname, minfilestoformrelease ORDER BY NULL", $group['bname'], Releases::PROCSTAT_TITLEMATCHED));
-
-		while ($row = $this->pdo->getAssocArray($result)) {
-			$retcount++;
-
-			//
-			// Less than the site permitted number of files in a release. Dont discard it, as it may
-			// be part of a set being uploaded.
-			//
-			if ($row["num"] < $row["minfilestoformrelease"]) {
-				//echo "Number of files in release ".$row["relname"]." less than site/group setting (".$row['num']."/".$row["minfilestoformrelease"].")\n";
-			}
-
-			//
-			// There are the same or more files in our release than the number of files specified
-			// in the message subject so go ahead and make a release
-			//
-			elseif ($row["num"] >= $row["reltotalpart"]) {
-				$incomplete = false;
-
-				if ($row['reltotalpart'] == 0 && strtotime($currTime_ori['now']) - strtotime($row['date']) < 14400) {
-					$incomplete = true;
-				} else {
-					// Check that the binary is complete
-					$binlist = $this->pdo->query(sprintf('SELECT %s.id, totalparts, date, COUNT(DISTINCT %s.messageid) AS num FROM %s,
-					%s WHERE %s.id=%s.binaryid AND %s.relname = %s
-					AND %s.procstat = %d AND %s.groupid = %d AND %s.fromname = %s
-					GROUP BY %s.id ORDER BY NULL',
-					$group['bname'],
-					$group['pname'],
-					$group['bname'],
-					$group['pname'],
-					$group['bname'],
-					$group['pname'],
-					$group['bname'],
-					$this->pdo->escapeString($row["relname"]),
-					$group['bname'],
-					Releases::PROCSTAT_TITLEMATCHED,
-					$group['bname'],
-					$row['groupid'],
-					$group['bname'],
-					$this->pdo->escapeString($row["fromname"]),
-					$group['bname']
-						)
-					);
-
-					foreach ($binlist as $rowbin) {
-						if ($rowbin['num'] < $rowbin['totalparts']) {
-							// Allow to binary to release if posted to usenet longer than four hours ago and we still don't have all the parts
-							if (!(strtotime($currTime_ori['now']) - strtotime($rowbin['date']) > 14400)) {
-								$incomplete = true;
-								break;
-							}
-						}
-					}
-				}
-
-				if (!$incomplete) {
-					//
-					// Right number of files, but see if the binary is a allfilled/reqid post, in which case it needs its name looked up
-					//
-					if ($row['reqid'] != '' && $page->site->reqidurl != "") {
-						//
-						// Try and get the name using the group
-						//
-						$binGroup = $this->groups->getByNameById($groupID);
-						$newtitle = $this->getReleaseNameForReqId($page->site->reqidurl, $page->site->newznabID, $binGroup, $row["reqid"]);
-
-						//
-						// if the feed/group wasnt supported by the scraper, then just use the release name as the title.
-						//
-						if ($newtitle == "no feed") {
-							$newtitle = $row["relname"];
-						}
-
-						//
-						// Valid release with right number of files and title now, so move it on
-						//
-						if ($newtitle != "") {
-							$this->pdo->queryExec(sprintf("UPDATE %s SET relname = %s, procstat = %d WHERE %s relname = %s AND procstat = %d AND fromname = %s",
-									$group['bname'], $this->pdo->escapeString($newtitle), Releases::PROCSTAT_READYTORELEASE, (!empty($groupID) ? ' groupid = ' . $groupID . ' AND ' : ' '), $this->pdo->escapeString($row["relname"]), Releases::PROCSTAT_TITLEMATCHED, $this->pdo->escapeString($row["fromname"])
-								)
-							);
-						} else {
-							//
-							// Item not found, if the binary was added to the index yages ago, then give up.
-							//
-							$maxaddeddate = $this->pdo->queryOneRow(sprintf("SELECT NOW() AS now, MAX(dateadded) AS dateadded FROM %s WHERE relname = %s AND procstat = %d AND groupid = %d AND fromname=%s",
-									$group['bname'], $this->pdo->escapeString($row["relname"]), Releases::PROCSTAT_TITLEMATCHED, $groupID, $this->pdo->escapeString($row["fromname"])
-								)
-							);
-
-							//
-							// If added to the index over 48 hours ago, give up trying to determine the title
-							//
-							if (strtotime($maxaddeddate['now']) - strtotime($maxaddeddate['dateadded']) > (60 * 60 * 48)) {
-								$this->pdo->queryExec(sprintf("UPDATE %s SET procstat=%d WHERE relname = %s AND procstat = %d AND groupid = %d AND fromname=%s",
-										$group['bname'], Releases::PROCSTAT_NOREQIDNAMELOOKUPFOUND, $this->pdo->escapeString($row["relname"]), Releases::PROCSTAT_TITLEMATCHED, $groupID, $this->pdo->escapeString($row["fromname"])
-									)
-								);
-							}
-						}
-					} else {
-						$this->pdo->queryExec(sprintf("UPDATE %s SET procstat = %d WHERE relname = %s AND procstat = %d AND %s fromname=%s",
-								$group['bname'], Releases::PROCSTAT_READYTORELEASE, $this->pdo->escapeString($row["relname"]), Releases::PROCSTAT_TITLEMATCHED,(!empty($groupID) ? ' groupid = ' . $groupID . ' AND ' : ' '), $this->pdo->escapeString($row["fromname"])
-							)
-						);
-					}
-				}
-			}
-			if ($retcount % 100 == 0)
-				echo ".";
-		}
-	}
-
-	/**
-	 * Create releases from complete binaries.
-	 *
-	 * @param int|string $groupID (optional)
-	 *
-	 * @return int
-	 * @access public
-	 */
-	public function createReleases($groupID)
-	{
-		$startTime = time();
-		$group = $this->groups->getCBPTableNames($this->tablePerGroup, $groupID);
-		$page = new Page();
-		$this->pdo->log->doEcho($this->pdo->log->primary('Creating releases from complete binaries'));
-
-		$this->pdo->ping(true);
-		//
-		// Get out all distinct relname, group from binaries
-		//
-		$categorize = new \Categorize(['Settings' => $this->pdo]);
-		$returnCount = $duplicate = 0;
-		$result = $this->pdo->queryDirect(sprintf("SELECT %s.*, g.name AS group_name, count(%s.id) AS parts FROM %s INNER JOIN groups g ON g.id = %s.groupid WHERE %s procstat = %d AND relname IS NOT NULL GROUP BY relname, g.name, groupid, fromname ORDER BY COUNT(%s.id) DESC LIMIT %d", $group['bname'], $group['bname'], $group['bname'], $group['bname'], (!empty($groupID) ? ' groupid = ' . $groupID . ' AND ' : ' '), Releases::PROCSTAT_READYTORELEASE, $group['bname'], $this->releaseCreationLimit));
-		while ($row = $this->pdo->getAssocArray($result)) {
-			$relguid = $this->createGUID();
-			// Clean release name
-			$releaseCleaning = new ReleaseCleaning();
-			$cleanRelName = $this->cleanReleaseName($row['relname']);
-			$cleanedName = $releaseCleaning->releaseCleaner(
-				$row['relname'], $row['fromname'], $row['group_name']
-			);
-
-			if (is_array($cleanedName)) {
-				$properName = $cleanedName['properlynamed'];
-				$prehashID = (isset($cleanerName['predb']) ? $cleanerName['predb'] : false);
-				$isReqID = (isset($cleanerName['requestid']) ? $cleanerName['requestid'] : false);
-				$cleanedName = $cleanedName['cleansubject'];
-			} else {
-				$properName = true;
-				$isReqID = $prehashID = false;
-			}
-
-			if ($prehashID === false && $cleanedName !== '') {
-				// try to match the cleaned searchname to predb title or filename here
-				$preHash = new PreHash();
-				$preMatch = $preHash->matchPre($cleanedName);
-				if ($preMatch !== false) {
-					$cleanedName = $preMatch['title'];
-					$prehashID = $preMatch['prehashid'];
-					$properName = true;
-				}
-			}
-			$relid = $this->insertRelease(
-				[
-					'name'           => $this->pdo->escapeString($cleanRelName),
-					'searchname'     => $this->pdo->escapeString(utf8_encode($cleanedName)),
-					'totalpart'      => $row["parts"],
-					'groupid'        => $row["groupid"],
-					'guid'           => $this->pdo->escapeString($relguid),
-					'categoryid'     => $categorize->determineCategory($groupID, $cleanedName),
-					'regexid'        => $row["regexid"],
-					'postdate'       => $this->pdo->escapeString($row['date']),
-					'fromname'       => $this->pdo->escapeString($row['fromname']),
-					'reqid'          => $row["reqid"],
-					'passwordstatus' => ($page->site->checkpasswordedrar > 0 ? -1 : 0),
-					'nzbstatus'      => \Enzebe::NZB_NONE,
-					'isrenamed'      => ($properName === true ? 1 : 0),
-					'reqidstatus'    => ($isReqID === true ? 1 : 0),
-					'prehashid'      => ($prehashID === false ? 0 : $prehashID)
-				]
-			);
-			//
-			// Tag every binary for this release with its parent release id
-			//
-			$this->pdo->queryExec(sprintf("UPDATE %s SET procstat = %d, releaseid = %d WHERE relname = %s AND procstat = %d AND %s fromname=%s",
-					$group['bname'], Releases::PROCSTAT_RELEASED, $relid, $this->pdo->escapeString($row["relname"]), Releases::PROCSTAT_READYTORELEASE, (!empty($groupID) ? ' groupid = ' . $groupID . ' AND ' : ' '), $this->pdo->escapeString($row["fromname"])
-				)
-			);
-		$cat = new \Categorize(['Settings' => $this->pdo]);
-
-			//
-			// Write the nzb to disk
-			//
-			$catId = $cat->determineCategory($groupID, $cleanRelName);
-			$nzbfile = $this->nzb->getNZBPath($relguid, $page->site->nzbpath, true);
-			$this->nzb->writeNZBforreleaseID($relid, $cleanRelName, $catId, $nzbfile, $groupID);
-
-			//
-			// Remove used binaries
-			//
-			$this->pdo->queryExec(sprintf("DELETE %s, %s FROM %s JOIN %s ON %s.id = %s.binaryid WHERE releaseid = %d ",
-					$group['pname'],
-					$group['bname'],
-					$group['pname'],
-					$group['bname'],
-					$group['bname'],
-					$group['pname'],
-					$relid
-				)
-			);
-
-			//
-			// If nzb successfully written, then load it and get size completion from it
-			//
-			$nzbInfo = new nzbInfo;
-			if (!$nzbInfo->loadFromFile($nzbfile)) {
-				$this->pdo->log->doEcho($this->pdo->log->primary('Failed to write nzb file (bad perms?) ' . $nzbfile . ''));
-				$this->delete($relid);
-			} else {
-				// Check if gid already exists
-				$dupes = $this->pdo->queryOneRow(sprintf("SELECT EXISTS(SELECT 1 FROM releases WHERE gid = %s) AS total", $this->pdo->escapeString($nzbInfo->gid)));
-				if ($dupes['total'] > 0) {
-					$this->pdo->log->doEcho($this->pdo->log->primary('Duplicate - ' . $cleanRelName . ''));
-					$this->delete($relid);
-					$duplicate++;
-				} else {
-					$this->pdo->queryExec(sprintf("UPDATE releases SET totalpart = %d, size = %s, COMPLETION = %d, GID=%s , nzb_guid = %s WHERE id = %d",
-							$nzbInfo->filecount,
-							$nzbInfo->filesize,
-							$nzbInfo->completion,
-							$this->pdo->escapeString($nzbInfo->gid),
-							$this->pdo->escapeString($nzbInfo->gid),
-							$relid
-						)
-					);
-					$this->pdo->log->doEcho($this->pdo->log->primary('Added release ' . $cleanRelName . ''));
-					$returnCount++;
-
-					/*if ($this->echoCLI) {
-						$this->pdo->log->doEcho($this->pdo->log->primary('Added ' . $returnCount . 'releases.'));
-					}*/
-
-				}
-             }
-		}
-		if ($this->echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					PHP_EOL .
-					number_format($returnCount) .
-					' Releases added and ' .
-					number_format($duplicate) .
-					' duplicate releases deleted in ' .
-					$this->consoleTools->convertTime(time() - $startTime)
-				), true
-			);
-		}
-
-		return $returnCount;
-	}
-	/**
-	 * @param $url
-	 * @param $rev
-	 * @param $nnid
-	 */
-	public function checkRegexesUptoDate($url, $rev, $nnid)
-	{
-		if ($url != "") {
-			if ($nnid != "")
-				$nnid = "?newznabID=" . $nnid . "&rev=" . $rev;
-			$regfile = Utility::getUrl(['url' => $url . $nnid, 'method' => 'get', 'enctype' => 'gzip']);
-			if ($regfile !== false && $regfile != "") {
-				/*$Rev: 728 $*/
-				if (preg_match('/\/\*\$Rev: (\d{3,4})/i', $regfile, $matches)) {
-					$serverrev = intval($matches[1]);
-					if ($serverrev > $rev) {
-
-						$site = new Sites;
-
-						$queries = explode(";", $regfile);
-						$queries = array_map("trim", $queries);
-						foreach ($queries as $q) {
-							if ($q) {
-								$this->pdo->queryExec($q);
-							}
-						}
-
-						$site->updateLatestRegexRevision($serverrev);
-						echo "Updated regexes to revision " . $serverrev . "\n";
-					} else {
-						echo "Using latest regex revision " . $rev . "\n";
-					}
-				} else {
-					echo "Error Processing Regex File\n";
-				}
-			} else {
-				echo "Error Regex File Does Not Exist or Unable to Connect\n";
-			}
-		}
-	}
-
-	/**
-	 * Post-process releases.
-	 *
-	 * @param int        $postProcess
-	 * @param NNTP       $nntp
-	 *
-	 * @void
-	 * @access public
-	 */
-	public function postProcessReleases($postProcess, &$nntp)
-	{
-		if ($postProcess == 1) {
-			(new PProcess(['Echo' => $this->echoCLI, 'Settings' => $this->pdo, 'Groups' => $this->groups]))->processAll($nntp);
-		} else {
-			if ($this->echoCLI) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->info(
-						"\nPost-processing is not running inside the Releases class.\n" .
-						"If you are using tmux or screen they might have their own scripts running Post-processing."
-					)
-				);
-			}
-		}
-	}
-
-
-	/**
-	 * @param int|string $groupID (optional)
-	 */
-	public function applyRegex($groupID)
-	{
-		//
-		// Get all regexes for all groups which are to be applied to new binaries
-		// in order of how they should be applied
-		//
-		$group = $this->groups->getCBPTableNames($this->tablePerGroup, $groupID);
-		$groups = $this->groups->getByID($groupID);
-		$activeGroups = $this->groups->getActive();
-		$this->releaseRegex->get();
-		$this->pdo->log->doEcho($this->pdo->log->primary('Applying regex to binaries'), true);
-	   foreach($activeGroups as $groupArr) {
-			//check if regexes have already been applied during update binaries
-			if ($groupArr['regexmatchonly'] == 1)
-				continue;
-
-			$groupRegexes = $this->releaseRegex->getForGroup($groupArr['name']);
-
-			$this->pdo->log->doEcho($this->pdo->log->primary('Applying ' . sizeof($groupRegexes) . ' regexes to group ' . $groupArr['name']), true);
-
-			// Get out all binaries of STAGE0 for current group
-			$newUnmatchedBinaries = array();
-			$ressql = sprintf('SELECT id, name, date, totalparts, procstat, fromname FROM %s b
- 								WHERE groupid = %d AND procstat IN (%d, %d) AND regexid IS NULL ORDER BY b.date ASC',
-								$group['bname'],
-								$groupArr['id'],
-								Releases::PROCSTAT_NEW,
-								Releases::PROCSTAT_TITLENOTMATCHED
-								);
-			$resbin = $this->pdo->queryDirect($ressql);
-
-			$matchedbins = 0;
-			while ($rowbin = $this->pdo->getAssocArray($resbin)) {
-				$regexMatches = array();
-				foreach ($groupRegexes as $groupRegex) {
-					$regexCheck = $this->releaseRegex->performMatch($groupRegex, $rowbin['name']);
-					if ($regexCheck !== false) {
-						$regexMatches = $regexCheck;
-						break;
-					}
-				}
-
-				if (!empty($regexMatches)) {
-					$matchedbins++;
-					$relparts = explode("/", $regexMatches['parts']);
-					$this->pdo->queryExec(sprintf("UPDATE %s SET relname = replace(%s, '_', ' '), relpart = %d, reltotalpart = %d, procstat=%d, categoryid=%s, regexid=%d, reqid=%s WHERE id = %d",
-							$group['bname'], $this->pdo->escapeString($regexMatches['name']), $relparts[0], $relparts[1], Releases::PROCSTAT_TITLEMATCHED, $regexMatches['regcatid'], $regexMatches['regexid'], $this->pdo->escapeString($regexMatches['reqid']), $rowbin["id"]
-						)
-					);
-				} else {
-					if ($rowbin['procstat'] == Releases::PROCSTAT_NEW)
-						$newUnmatchedBinaries[] = $rowbin['id'];
-				}
-
-			}
-
-			//mark as not matched
-			if (!empty($newUnmatchedBinaries))
-				$this->pdo->queryExec(sprintf("UPDATE %s SET procstat=%d WHERE id IN (%s)", $group['bname'], Releases::PROCSTAT_TITLENOTMATCHED, implode(',', $newUnmatchedBinaries)));
-
-		}
-	}
-
-	/**
-	 * @param $url
-	 * @param $nnid
-	 * @param $groupname
-	 * @param $reqid
-	 *
-	 * @return string
-	 */
-	public function getReleaseNameForReqId($url, $nnid, $groupname, $reqid)
-	{
-		if ($reqid == " null " || $reqid == "0" || $reqid == "")
-			return "";
-
-		$url = str_ireplace("[GROUP]", urlencode($groupname), $url);
-		$url = str_ireplace("[REQID]", urlencode($reqid), $url);
-
-		if ($nnid != "") {
-			$url = $url . "&newznabID=" . $nnid;
-		}
-
-
-		$xml = Utility::getUrl([$url]);
-
-		if ($xml === false || preg_match('/no feed/i', $xml))
-			return "no feed";
-		else {
-			if ($xml != "") {
-				$xmlObj = @simplexml_load_string($xml);
-				$arrXml = objectsIntoArray($xmlObj);
-
-				if (isset($arrXml["item"]) && is_array($arrXml["item"])) {
-					foreach ($arrXml["item"] as $item) {
-						$title = (array_key_exists("@attributes", $item) ? $item["@attributes"]["title"] : $item["title"]);
-
-						return $title;
-					}
-				}
-			}
-		}
-
-		return "";
-	}
-
-	public function cleanReleaseName($relname)
-	{
-		$cleanArr = array('#', '@', '$', '%', '^', '§', '¨', '©', 'Ö');
-
-		$relname = str_replace($cleanArr, '', $relname);
-		$relname = str_replace('_', ' ', $relname);
-
-		return $relname;
-	}
-
-	public function insertRelease(array $parameters = [])
-	{
-
-		if ($parameters['regexid'] == "")
-			$parameters['regexid'] = " null ";
-
-		if ($parameters['reqid'] != "")
-			$parameters['reqid'] = $this->pdo->escapeString($parameters['reqid']);
-		else
-			$parameters['reqid'] = " null ";
-
-		$parameters['id'] = $this->pdo->queryInsert(sprintf("INSERT INTO releases (name, searchname, totalpart, groupid, adddate, guid, categoryid, regexid, rageid, postdate, fromname, size, reqid, passwordstatus, completion, haspreview, nfostatus, nzbstatus,
-					isrenamed, iscategorized, reqidstatus, prehashid)
-                    VALUES (%s, %s, %d, %d, now(), %s, %d, %s, -1, %s, %s, 0, %s, %d, 100,-1, -1, %d, %d, 1, %d, %d)",
-				$parameters['name'],
-				$parameters['searchname'],
-				$parameters['totalpart'],
-				$parameters['groupid'],
-				$parameters['guid'],
-				$parameters['categoryid'],
-				$parameters['regexid'],
-				$parameters['postdate'],
-				$parameters['fromname'],
-				$parameters['reqid'],
-				$parameters['passwordstatus'],
-				$parameters['nzbstatus'],
-				$parameters['isrenamed'],
-				$parameters['reqidstatus'],
-				$parameters['prehashid']
-			)
-		);
-
-		$this->sphinxSearch->insertRelease($parameters);
-
-		return $parameters['id'];
-	}
-
-
-	/**
-	 * @param      $id
-	 * @param bool $isGuid
-	 */
-	public function delete($id, $isGuid = false)
-	{
-
-		$users = new Users();
-		$s = new Sites();
-		$nfo = new Nfo();
-		$site = $s->get();
-		$rf = new ReleaseFiles();
-		$re = new ReleaseExtra();
-		$rc = new ReleaseComments();
-		$ri = new ReleaseImage();
-
-		if (!is_array($id))
-			$id = array($id);
-
-		foreach ($id as $identifier) {
-			//
-			// delete from disk.
-			//
-			$rel = ($isGuid) ? $this->getByGuid($identifier) : $this->getById($identifier);
-
-			$nzbpath = "";
-			if ($isGuid)
-				$nzbpath = $site->nzbpath . substr($identifier, 0, 1) . "/" . $identifier . ".nzb.gz";
-			elseif ($rel)
-				$nzbpath = $site->nzbpath . substr($rel["guid"], 0, 1) . "/" . $rel["guid"] . ".nzb.gz";
-
-			if ($nzbpath != "" && file_exists($nzbpath))
-				unlink($nzbpath);
-
-			$audiopreviewpath = "";
-			if ($isGuid)
-				$audiopreviewpath = WWW_DIR . 'covers/audio/' . $identifier . ".mp3";
-			elseif ($rel)
-				$audiopreviewpath = WWW_DIR . 'covers/audio/' . $rel["guid"] . ".mp3";
-
-			if ($audiopreviewpath && file_exists($audiopreviewpath))
-				unlink($audiopreviewpath);
-
-			if ($rel) {
-				$nfo->deleteReleaseNfo($rel['id']);
-				$rc->deleteCommentsForRelease($rel['id']);
-				$users->delCartForRelease($rel['id']);
-				$users->delDownloadRequestsForRelease($rel['id']);
-				$rf->delete($rel['id']);
-				$re->delete($rel['id']);
-				$re->deleteFull($rel['id']);
-				$ri->delete($rel['guid']);
-				$this->pdo->queryExec(sprintf("DELETE FROM releases WHERE id = %d", $rel['id']));
-			}
-		}
-	}
-
-	/**
-	 * Deletes a single release by GUID, and all the corresponding files.
-	 *
-	 * @param array        $identifiers ['g' => Release GUID(mandatory), 'id => ReleaseID(optional, pass false)]
-	 * @param NZB          $nzb
-	 * @param ReleaseImage $releaseImage
-	 */
-	public function deleteSingle($identifiers, $nzb, $releaseImage)
-	{
-		// Delete NZB from disk.
-		$nzbPath = $nzb->getNZBPath($identifiers['g']);
-		if ($nzbPath) {
-			@unlink($nzbPath);
-		}
-
-
-		// Delete images.
-		$releaseImage->delete($identifiers['g']);
-
-		//Delete from sphinx.
-		$this->sphinxSearch->deleteRelease($identifiers, $this->pdo);
-
-		// Delete from DB.
-		$this->pdo->queryExec(
-			sprintf('
-				DELETE r, rn, rc, uc, rf, ra, rs, rv, re
-				FROM releases r
-				LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id
-				LEFT OUTER JOIN releasecomment rc ON rc.releaseid = r.id
-				LEFT OUTER JOIN usercart uc ON uc.releaseid = r.id
-				LEFT OUTER JOIN releasefiles rf ON rf.releaseid = r.id
-				LEFT OUTER JOIN releaseaudio ra ON ra.releaseid = r.id
-				LEFT OUTER JOIN releasesubs rs ON rs.releaseid = r.id
-				LEFT OUTER JOIN releasevideo rv ON rv.releaseid = r.id
-				LEFT OUTER JOIN releaseextrafull re ON re.releaseid = r.id
-				WHERE r.guid = %s',
-				$this->pdo->escapeString($identifiers['g'])
-			)
-		);
-	}
-
-	public function getTopDownloads()
-	{
-
-
-		return $this->pdo->query("SELECT id, searchname, guid, adddate, grabs FROM releases
-							WHERE grabs > 0
-							ORDER BY grabs DESC
-							LIMIT 10"
-		);
-	}
-
-	public function getTopComments()
-	{
-
-
-		return $this->pdo->query("SELECT id, guid, searchname, adddate, comments FROM releases
-							WHERE comments > 0
-							ORDER BY comments DESC
-							LIMIT 10"
-		);
-	}
-
-	public function getRecentlyAdded()
-	{
-
-
-		return $this->pdo->query("SELECT concat(cp.title, ' > ', category.title) AS title, COUNT(*) AS count
-                            FROM category
-                            LEFT OUTER JOIN category cp ON cp.id = category.parentid
-                            INNER JOIN releases ON releases.categoryid = category.id
-                            WHERE releases.adddate > NOW() - INTERVAL 1 WEEK
-                            GROUP BY concat(cp.title, ' > ', category.title)
-                            ORDER BY COUNT(*) DESC"
-		);
-	}
-
-	/**
-	 * Get all newest movies with coves for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestMovies()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.imdbid, r.guid, r.name, r.searchname, r.size, r.completion,
-				postdate, categoryid, comments, grabs,
-				m.cover
-			FROM releases r
-			INNER JOIN movieinfo m USING (imdbid)
-			WHERE r.categoryid BETWEEN 2000 AND 2999
-			AND m.imdbid > 0
-			AND m.cover = 1
-			AND r.id in (select max(id) from releases where imdbid > 0 group by imdbid)
-			ORDER BY r.postdate DESC
-			LIMIT 24"
-		);
-	}
-
-	/**
-	 * Get all newest console games with covers for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestConsole()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.consoleinfoid, r.guid, r.name, r.searchname, r.size, r.completion,
-				r.postdate, r.categoryid, r.comments, r.grabs,
-				con.cover
-			FROM releases r
-			INNER JOIN consoleinfo con ON r.consoleinfoid = con.id
-			WHERE r.categoryid BETWEEN 1000 AND 1999
-			AND con.id > 0
-			AND con.cover > 0
-			AND r.id in (select max(id) from releases where consoleinfoid > 0 group by consoleinfoid)
-			ORDER BY r.postdate DESC
-			LIMIT 35"
-		);
-	}
-
-	/**
-	 * Get all newest PC games with covers for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestGames()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.gamesinfo_id, r.guid, r.name, r.searchname, r.size, r.completion,
-				r.postdate, r.categoryid, r.comments, r.grabs,
-				gi.cover
-			FROM releases r
-			INNER JOIN gamesinfo gi ON r.gamesinfo_id = gi.id
-			WHERE r.categoryid = 4050
-			AND gi.id > 0
-			AND gi.cover > 0
-			AND r.id in (select max(id) from releases where gamesinfo_id > 0 group by gamesinfo_id)
-			ORDER BY r.postdate DESC
-			LIMIT 35"
-		);
-	}
-
-	/**
-	 * Get all newest music with covers for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestMP3s()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.musicinfoid, r.guid, r.name, r.searchname, r.size, r.completion,
-				r.postdate, r.categoryid, r.comments, r.grabs,
-				m.cover
-			FROM releases r
-			INNER JOIN musicinfo m ON r.musicinfoid = m.id
-			WHERE r.categoryid BETWEEN 3000 AND 3999
-			AND r.categoryid != 3030
-			AND m.id > 0
-			AND m.cover > 0
-			AND r.id in (select max(id) from releases where musicinfoid > 0 group by musicinfoid)
-			ORDER BY r.postdate DESC
-			LIMIT 24"
-		);
-	}
-
-	/**
-	 * Get all newest books with covers for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestBooks()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.bookinfoid, r.guid, r.name, r.searchname, r.size, r.completion,
-				r.postdate, r.categoryid, r.comments, r.grabs,
-				b.url,	b.cover, b.title as booktitle, b.author
-			FROM releases r
-			INNER JOIN bookinfo b ON r.bookinfoid = b.id
-			WHERE r.categoryid BETWEEN 7000 AND 7999
-			OR r.categoryid = 3030
-			AND b.id > 0
-			AND b.cover > 0
-			AND r.id in (select max(id) from releases where bookinfoid > 0 group by bookinfoid)
-			ORDER BY r.postdate DESC
-			LIMIT 24"
-		);
-	}
-
-	/**
-	 * Get all newest xxx with covers for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestXXX()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.xxxinfo_id, r.guid, r.name, r.searchname, r.size, r.completion,
-				r.postdate, r.categoryid, r.comments, r.grabs,
-				xxx.cover, xxx.title
-			FROM releases r
-			INNER JOIN xxxinfo xxx ON r.xxxinfo_id = xxx.id
-			WHERE r.categoryid BETWEEN 6000 AND 6999
-			AND xxx.id > 0
-			AND xxx.cover = 1
-			AND r.id in (select max(id) from releases where xxxinfo_id > 0 group by xxxinfo_id)
-			ORDER BY r.postdate DESC
-			LIMIT 24"
-		);
-	}
-
-	/**
-	 * Get all newest TV with covers for poster wall.
-	 *
-	 * @return array
-	 */
-	public function getNewestTV()
-	{
-		return $this->pdo->queryDirect(
-			"SELECT r.rageid, r.guid, r.name, r.searchname, r.size, r.completion,
-				r.postdate, r.categoryid, r.comments, r.grabs,
-				tv.id as tvid, tv.imgdata, tv.releasetitle as tvtitle
-			FROM releases r
-			INNER JOIN tvrage tv USING (rageid)
-			WHERE r.categoryid BETWEEN 5000 AND 5999
-			AND tv.rageid > 0
-			AND length(tv.imgdata) > 0
-			GROUP BY tv.rageid
-			ORDER BY r.postdate DESC
-			LIMIT 24"
-		);
-	}
-
-	/**
-	 * Process RequestID's.
-	 *
-	 * @param int|string $groupID
-	 * @param int        $limit
-	 * @param bool       $local
-	 *
-	 * @access public
-	 * @void
-	 */
-	public function processRequestIDs($groupID = '', $limit = 5000, $local = true)
-	{
-
-		$echoCLI = NN_ECHOCLI;
-		$groups = new Groups();
-		$s = new Sites();
-		$site = $s->get();
-		$consoleTools = new ConsoleTools(['ColorCLI' => $this->pdo->log]);
-		if ($local === false && $site->lookup_reqids == 0) {
-			return;
-		}
-
-		$startTime = time();
-		if ($echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->header(
-					sprintf(
-						"Process Releases -> Request id %s lookup -- limit %s",
-						($local === true ? 'local' : 'web'),
-						$limit
-					)
-				)
-			);
-		}
-
-		if ($local === true) {
-			$foundRequestIDs = (
-			new \RequestIDLocal(
-				['Echo'   => $echoCLI, 'ConsoleTools' => $consoleTools,
-				 'Groups' => $groups, 'Settings' => $this->pdo
-				]
-			)
-			)->lookupRequestIDs(['GroupID' => $groupID, 'limit' => $limit, 'time' => 168]);
-		} else {
-			$foundRequestIDs = (
-			new \RequestIDWeb(
-				['Echo'   => $echoCLI, 'ConsoleTools' => $consoleTools,
-				 'Groups' => $groups, 'Settings' => $this->pdo
-				]
-			)
-			)->lookupRequestIDs(['GroupID' => $groupID, 'limit' => $limit, 'time' => 168]);
-		}
-		if ($echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					number_format($foundRequestIDs) .
-					' releases updated in ' .
-					$consoleTools->convertTime(time() - $startTime)
-				), true
-			);
-		}
-	}
-
-	/**
-	 * Delete unwanted releases based on admin settings.
-	 * This deletes releases based on group.
-	 *
-	 * @param int|string $groupID (optional)
-	 *
-	 * @void
-	 * @access public
-	 */
-	public function deletedReleasesByGroup($groupID = '')
-	{
-		$startTime = time();
-		$minSizeDeleted = $maxSizeDeleted = $minFilesDeleted = 0;
-
-		if ($this->echoCLI) {
-			echo $this->pdo->log->header("Process Releases -> Delete releases smaller/larger than minimum size/file count from group/site setting.");
-		}
-
-		if ($groupID == '') {
-			$groupIDs = $this->groups->getActiveIDs();
-		} else {
-			$groupIDs = [['id' => $groupID]];
-		}
-
-		$maxSizeSetting = $this->site->maxsizetoformrelease;
-		$minSizeSetting = $this->site->minsizetoformrelease;
-		$minFilesSetting = $this->site->minfilestoformrelease;
-
-		foreach ($groupIDs as $groupID) {
-			$releases = $this->pdo->queryDirect(
-				sprintf("
-					SELECT r.guid, r.id
-					FROM releases r
-					INNER JOIN groups g ON g.id = r.groupid
-					WHERE r.groupid = %d
-					AND greatest(IFNULL(g.minsizetoformrelease, 0), %d) > 0
-					AND r.size < greatest(IFNULL(g.minsizetoformrelease, 0), %d)",
-					$groupID['id'],
-					$minSizeSetting,
-					$minSizeSetting
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$minSizeDeleted++;
-				}
-			}
-
-			if ($maxSizeSetting > 0) {
-				$releases = $this->pdo->queryDirect(
-					sprintf('
-						SELECT id, guid
-						FROM releases
-						WHERE groupid = %d
-						AND size > %d',
-						$groupID['id'],
-						$maxSizeSetting
-					)
-				);
-				if ($releases instanceof \Traversable) {
-					foreach ($releases as $release) {
-						$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-						$maxSizeDeleted++;
-					}
-				}
-			}
-
-			$releases = $this->pdo->queryDirect(
-				sprintf("
-					SELECT r.id, r.guid
-					FROM releases r
-					INNER JOIN groups g ON g.id = r.groupid
-					WHERE r.groupid = %d
-					AND greatest(IFNULL(g.minfilestoformrelease, 0), %d) > 0
-					AND r.totalpart < greatest(IFNULL(g.minfilestoformrelease, 0), %d)",
-					$groupID['id'],
-					$minFilesSetting,
-					$minFilesSetting
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$minFilesDeleted++;
-				}
-			}
-		}
-
-		if ($this->echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					'Deleted ' . ($minSizeDeleted + $maxSizeDeleted + $minFilesDeleted) . ' releases: ' . PHP_EOL .
-					$minSizeDeleted . ' smaller than, ' .
-					$maxSizeDeleted . ' bigger than, ' .
-					$minFilesDeleted . ' with less files than site/group settings in: ' .
-					$this->consoleTools->convertTime(time() - $startTime)
-				), true
-			);
-		}
-	}
-
-	/**
-	 * Delete releases using admin settings.
-	 * This deletes releases, regardless of group.
-	 *
-	 * @void
-	 * @access public
-	 */
-	public function deleteReleases()
-	{
-		$startTime = time();
-		$category = new \Category(['Settings' => $this->pdo]);
-		$genres = new \Genres(['Settings' => $this->pdo]);
-		$passwordDeleted = $duplicateDeleted = $retentionDeleted = $completionDeleted = $disabledCategoryDeleted = 0;
-		$disabledGenreDeleted = $miscRetentionDeleted = $miscHashedDeleted = $categoryMinSizeDeleted = 0;
-
-		// Delete old releases and finished collections.
-		if ($this->echoCLI) {
-			$this->pdo->log->doEcho($this->pdo->log->header("Process Releases -> Delete old releases and passworded releases."));
-		}
-
-		// Releases past retention.
-		if ($this->site->releaseretentiondays != 0) {
-			$releases = $this->pdo->queryDirect(
-				sprintf(
-					'SELECT id, guid FROM releases WHERE postdate < (NOW() - INTERVAL %d DAY)',
-					$this->site->releaseretentiondays
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$retentionDeleted++;
-				}
-			}
-		}
-
-		// Passworded releases.
-		if ($this->site->deletepasswordedrelease == 1) {
-			$releases = $this->pdo->queryDirect(
-				sprintf(
-					'SELECT id, guid FROM releases WHERE passwordstatus = %d',
-					\Releases::PASSWD_RAR
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$passwordDeleted++;
-				}
-			}
-		}
-
-		// Possibly passworded releases.
-		if ($this->site->deletepossiblerelease == 1) {
-			$releases = $this->pdo->queryDirect(
-				sprintf(
-					'SELECT id, guid FROM releases WHERE passwordstatus = %d',
-					\Releases::PASSWD_POTENTIAL
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$passwordDeleted++;
-				}
-			}
-		}
-
-		if ($this->crossPostTime != 0) {
-			// Crossposted releases.
-			do {
-				$releases = $this->pdo->queryDirect(
-					sprintf(
-						'SELECT id, guid FROM releases WHERE adddate > (NOW() - INTERVAL %d HOUR) GROUP BY name HAVING COUNT(name) > 1',
-						$this->crossPostTime
-					)
-				);
-				$total = 0;
-				if ($releases && $releases->rowCount()) {
-					$total = $releases->rowCount();
-					foreach ($releases as $release) {
-						$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-						$duplicateDeleted++;
-					}
-				}
-			} while ($total > 0);
-		}
-
-		if ($this->completion > 0) {
-			$releases = $this->pdo->queryDirect(
-				sprintf('SELECT id, guid FROM releases WHERE completion < %d AND completion > 0', $this->completion)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$completionDeleted++;
-				}
-			}
-		}
-
-		// Disabled categories.
-		$disabledCategories = $category->getDisabledIDs();
-		if (count($disabledCategories) > 0) {
-			foreach ($disabledCategories as $disabledCategory) {
-				$releases = $this->pdo->queryDirect(
-					sprintf('SELECT id, guid FROM releases WHERE categoryid = %d', $disabledCategory['id'])
-				);
-				if ($releases instanceof \Traversable) {
-					foreach ($releases as $release) {
-						$disabledCategoryDeleted++;
-						$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					}
-				}
-			}
-		}
-
-		// Delete smaller than category minimum sizes.
-		$categories = $this->pdo->queryDirect('
-			SELECT c.id AS id,
-			CASE WHEN c.minsizetoformrelease = 0 THEN cp.minsizetoformrelease ELSE c.minsizetoformrelease END AS minsize
-			FROM category c
-			INNER JOIN category cp ON cp.id = c.parentid
-			WHERE c.parentid IS NOT NULL'
-		);
-
-		if ($categories instanceof \Traversable) {
-			foreach ($categories as $category) {
-				if ($category['minsize'] > 0) {
-					$releases = $this->pdo->queryDirect(
-						sprintf('
-							SELECT r.id, r.guid
-							FROM releases r
-							WHERE r.categoryid = %d
-							AND r.size < %d',
-							$category['id'],
-							$category['minsize']
-						)
-					);
-					if ($releases instanceof \Traversable) {
-						foreach ($releases as $release) {
-							$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-							$categoryMinSizeDeleted++;
-						}
-					}
-				}
-			}
-		}
-
-		// Disabled music genres.
-		$genrelist = $genres->getDisabledIDs();
-		if (count($genrelist) > 0) {
-			foreach ($genrelist as $genre) {
-				$releases = $this->pdo->queryDirect(
-					sprintf('
-						SELECT id, guid
-						FROM releases
-						INNER JOIN (SELECT id AS mid FROM musicinfo WHERE musicinfo.genreID = %d) mi
-						ON musicinfoid = mid',
-						$genre['id']
-					)
-				);
-				if ($releases instanceof \Traversable) {
-					foreach ($releases as $release) {
-						$disabledGenreDeleted++;
-						$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					}
-				}
-			}
-		}
-
-		// Misc other.
-		if ($this->site->miscotherretentionhours > 0) {
-			$releases = $this->pdo->queryDirect(
-				sprintf('
-					SELECT id, guid
-					FROM releases
-					WHERE categoryid = %d
-					AND adddate <= NOW() - INTERVAL %d HOUR',
-					\Category::CAT_MISC_OTHER,
-					$this->site->miscotherretentionhours
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$miscRetentionDeleted++;
-				}
-			}
-		}
-
-		// Misc hashed.
-		if ($this->site->mischashedretentionhours > 0) {
-			$releases = $this->pdo->queryDirect(
-				sprintf('
-					SELECT id, guid
-					FROM releases
-					WHERE categoryid = %d
-					AND adddate <= NOW() - INTERVAL %d HOUR',
-					\Category::CAT_MISC_HASHED,
-					$this->site->mischashedretentionhours
-				)
-			);
-			if ($releases instanceof \Traversable) {
-				foreach ($releases as $release) {
-					$this->deleteSingle(['g' => $release['guid'], 'i' => $release['id']], $this->nzb, $this->releaseImage);
-					$miscHashedDeleted++;
-				}
-			}
-		}
-
-		if ($this->echoCLI) {
-			$this->pdo->log->doEcho(
-				$this->pdo->log->primary(
-					'Removed releases: ' .
-					number_format($retentionDeleted) .
-					' past retention, ' .
-					number_format($passwordDeleted) .
-					' passworded, ' .
-					number_format($duplicateDeleted) .
-					' crossposted, ' .
-					number_format($disabledCategoryDeleted) .
-					' from disabled categories, ' .
-					number_format($categoryMinSizeDeleted) .
-					' smaller than category settings, ' .
-					number_format($disabledGenreDeleted) .
-					' from disabled music genres, ' .
-					number_format($miscRetentionDeleted) .
-					' from misc->other' .
-					number_format($miscHashedDeleted) .
-					' from misc->hashed' .
-					($this->completion > 0
-						? ', ' . number_format($completionDeleted) . ' under ' . $this->completion . '% completion.'
-						: '.'
-					)
-				)
-			);
-
-			$totalDeleted = (
-				$retentionDeleted + $passwordDeleted + $duplicateDeleted + $disabledCategoryDeleted +
-				$disabledGenreDeleted + $miscRetentionDeleted + $miscHashedDeleted + $completionDeleted +
-				$categoryMinSizeDeleted
-			);
-			if ($totalDeleted > 0) {
-				$this->pdo->log->doEcho(
-					$this->pdo->log->primary(
-						"Removed " . number_format($totalDeleted) . ' releases in ' .
-						$this->consoleTools->convertTime(time() - $startTime)
-					)
-				);
-			}
-		}
-	}
-
-	/**
-	 * Categorizes releases.
-	 *
-	 * @param string $type  name or searchname | Categorize using the search name or subject.
-	 * @param string $where Optional "where" query parameter.
-	 *
-	 * @return int Quantity of categorized releases.
-	 * @access public
-	 */
-	public function categorizeRelease($type, $where = '')
-	{
-		$cat = new \Categorize(['Settings' => $this->pdo]);
-		$categorized = $total = 0;
-		$releases = $this->pdo->queryDirect(sprintf('SELECT id, %s, groupid FROM releases %s', $type, $where));
-		if ($releases && $releases->rowCount()) {
-			$total = $releases->rowCount();
-			foreach ($releases as $release) {
-				$catId = $cat->determineCategory($release['groupid'], $release[$type]);
-				$this->pdo->queryExec(
-					sprintf('UPDATE releases SET categoryid = %d, iscategorized = 1 WHERE id = %d', $catId, $release['id'])
-				);
-				$categorized++;
-				if ($this->echoCLI) {
-					$this->consoleTools->overWritePrimary(
-						'Categorizing: ' . $this->consoleTools->percentString($categorized, $total)
-					);
-				}
-			}
-		}
-		if ($this->echoCLI !== false && $categorized > 0) {
-			echo PHP_EOL;
-		}
-
-		return $categorized;
-	}
-
-	/**
-	 * Categorize releases.
-	 *
-	 * @param int        $categorize
-	 * @param int|string $groupID (optional)
-	 *
-	 * @void
-	 * @access public
-	 */
-	public function categorizeReleases($categorize, $groupID = '')
-	{
-		$startTime = time();
-		if ($this->echoCLI) {
-			echo $this->pdo->log->header("Process Releases -> Categorize releases.");
-		}
-		switch ((int)$categorize) {
-			case 2:
-				$type = 'searchname';
-				break;
-			case 1:
-			default:
-
-				$type = 'name';
-				break;
-		}
-		$this->categorizeRelease(
-			$type,
-			(!empty($groupID) ? 'WHERE iscategorized = 0 AND groupid = ' . $groupID : 'WHERE iscategorized = 0')
-		);
-
-		if ($this->echoCLI) {
-			$this->pdo->log->doEcho($this->pdo->log->primary($this->consoleTools->convertTime(time() - $startTime)), true);
-		}
-	}
-
-	/**
-	 * Return all releases to other->misc category.
-	 *
-	 * @param string $where Optional "where" query parameter.
-	 *
-	 * @void
-	 * @access public
-	 */
-	public function resetCategorize($where = '')
-	{
-		$this->pdo->queryExec(
-			sprintf('UPDATE releases SET categoryid = %d, iscategorized = 0 %s', \Category::CAT_MISC_OTHER, $where)
-		);
-	}
-
-	/**
-	 * Create a GUID for a release.
-	 * @return string
-	 */
-	public function createGUID()
-	{
-		return bin2hex(openssl_random_pseudo_bytes(20));
-	}
-
-	/**
-	 * Buffer of the password status string to form part of the query.
-	 * @var null|string
-	 */
-	private $passwordSettingBuffer = null;
-
-	/**
-	 * Return site setting for hiding/showing passworded releases.
-	 *
-	 * @return int
-	 */
-	public function showPasswords()
-	{
-		if (!is_null($this->passwordSettingBuffer)) {
-			return $this->passwordSettingBuffer;
-		}
-		$setting = $this->pdo->queryOneRow(
-			"SELECT value
-			FROM site
-			WHERE setting = 'showpasswordedrelease'"
-		);
-		$passwordStatus = ('= ' . \Releases::PASSWD_NONE);
-		if ($setting !== false) {
-			switch ($setting['value']) {
-				case 1:
-					$passwordStatus = ('<= ' . \Releases::PASSWD_POTENTIAL);
-					break;
-				case 10:
-					$passwordStatus = ('<= ' . \Releases::PASSWD_RAR);
-					break;
-			}
-		}
-		$this->passwordSettingBuffer = $passwordStatus;
-		return $passwordStatus;
-	}
-	/**
-	 * Retrieve alternate release with same or similar searchname
-	 *
-	 * @param string $guid
-	 * @param string $searchname
-	 * @param string $userid
-	 * @return string
-	 */
-	public function getAlternate($guid, $searchname, $userid)
-	{
-		//status values
-		// 0/false 	= successfully downloaded
-		// 1/true 	= failed download
-		$this->pdo->queryInsert(sprintf("INSERT IGNORE INTO dnzb_failures (userid, guid) VALUES (%d, %s)",
-				$userid,
-				$this->pdo->escapeString($guid)
-				)
-		);
-
-		$alternate = $this->pdo->queryOneRow(sprintf('SELECT * FROM releases r
-			WHERE r.searchname %s
-			AND r.guid NOT IN (SELECT guid FROM failed_downloads WHERE userid = %d)',
-			$this->pdo->likeString($searchname),
-			$userid
-			)
-		);
-		return $alternate;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/rottentomato.php b/lib/copy_this/www/lib/rottentomato.php
deleted file mode 100644
index 159f8a2e4..000000000
--- a/lib/copy_this/www/lib/rottentomato.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/util.php");
-
-/**
- * Fetches and returns JSON documents from the Rotten Tomato API using a supplied API key.
- *
- * Class RottenTomato
- */
-class RottenTomato
-{
-	/**
-	 * Main link for all the methods.
-	 */
-	const API_URL = 'http://api.rottentomatoes.com/api/public/v1.0/';
-
-	/**
-	 * RT Api key.
-	 * @var string
-	 */
-	private $_apikey;
-
-	/**
-	 * @param string $apiKey RT Api Key.
-	 */
-	public function __construct($apiKey)
-	{
-		$this->_apikey = $apiKey;
-	}
-
-	/**
-	 * Displays Top Box Office Earning Movies, Sorted by Most Recent Weekend Gross Ticket Sales.
-	 *
-	 * @param int    $limit   Limits the number of box office movies returned.
-	 * @param string $country Provides localized data for the selected country (ISO 3166-1 alpha-2) if available.
-	 *                        Otherwise, returns US data.
-	 *
-	 * @return string
-	 */
-	public function getBoxOffice($limit = 10, $country = 'us')
-	{
-		return $this->_makeCall(
-			'lists/movies/box_office.json',
-			array(
-				'limit'   => $limit,
-				'country' => $country
-			)
-		);
-	}
-
-	/**
-	 * Retrieves movies currently in theaters.
-	 *
-	 * @param int    $limit   The amount of movies in theaters to show per page.
-	 * @param int    $page    The selected page of in theaters movies.
-	 * @param string $country Provides localized data for the selected country (ISO 3166-1 alpha-2) if available.
-	 *                        Otherwise, returns US data.
-	 *
-	 * @return string
-	 */
-	public function getInTheaters($limit = 16, $page = 1, $country = 'us')
-	{
-		return $this->_makeCall(
-			'lists/movies/in_theaters.json',
-			array(
-				'page_limit' => $limit,
-				'page'       => $page,
-				'country'    => $country
-			)
-		);
-	}
-
-	/**
-	 * Retrieves current opening movies.
-	 *
-	 * @param int    $limit   Limits the number of opening movies returned.
-	 * @param string $country Provides localized data for the selected country (ISO 3166-1 alpha-2) if available.
-	 *                        Otherwise, returns US data.
-	 *
-	 * @return string
-	 */
-	public function getOpening($limit = 16, $country = 'us')
-	{
-		return $this->_makeCall(
-			'lists/movies/opening.json',
-			array(
-				'limit'   => $limit,
-				'country' => $country
-			)
-		);
-	}
-
-	/**
-	 * Retrieves upcoming movies. Results are paginated if they go past the specified page limit.
-	 *
-	 * @param int    $limit   The amount of upcoming movies to show per page.
-	 * @param int    $page    The selected page of upcoming movies.
-	 * @param string $country Provides localized data for the selected country (ISO 3166-1 alpha-2) if available.
-	 *                        Otherwise, returns US data.
-	 *
-	 * @return string
-	 */
-	public function getUpcoming($limit = 16, $page = 1, $country = 'us')
-	{
-		return $this->_makeCall(
-			'lists/movies/upcoming.json',
-			array(
-				'page_limit' => $limit,
-				'page'       => $page,
-				'country'    => $country
-			)
-		);
-	}
-
-	/**
-	 * Shows the DVD lists RT has available.
-	 *
-	 * @return string
-	 */
-	public function getDVDReleases()
-	{
-		return $this->_makeCall('lists/dvds/new_releases.json');
-	}
-
-	/**
-	 * The movies search endpoint for plain text queries. Allows you to search for movies!
-	 *
-	 * @param string $title The plain text search query to search for a movie. Remember to URI encode this!
-	 * @param int    $limit The amount of movie search results to show per page.
-	 * @param int    $page  The selected page of movie search results.
-	 *
-	 * @return string
-	 */
-	public function searchMovie($title, $limit = 50, $page = 1)
-	{
-		return $this->_makeCall(
-			'movies.json',
-			array(
-				'q'          => $title,
-				'page_limit' => $limit,
-				'page'       => $page
-			)
-		);
-	}
-
-	/**
-	 * Detailed information on a specific movie specified by Id.
-	 * You can use the movies search endpoint or peruse the lists of movies/dvds to get the urls to movies.
-	 *
-	 * @param int $ID The RT id.
-	 *
-	 * @return string
-	 */
-	public function getMovie($ID)
-	{
-		return $this->_makeCall('movies/' . $ID . '.json');
-	}
-
-	/**
-	 * Retrieves the reviews for a movie.
-	 * Results are paginated if they go past the specified page limit.
-	 *
-	 * @param int    $ID      The RT id.
-	 * @param string $type    Three different review types are possible:
-	 *                        "all", "top_critic" and "dvd".
-	 *                        "top_critic" shows all the Rotten Tomatoes designated top critics.
-	 *                        "dvd" pulls the reviews given on the DVD of the movie.
-	 *                        "all" as the name implies retrieves all reviews.
-	 * @param int $limit      The number of reviews to show per page.
-	 * @param int $page       The selected page of reviews.
-	 * @param string $country Provides localized data for the selected country (ISO 3166-1 alpha-2) if available.
-	 *                        Otherwise, returns US data.
-	 *
-	 * @return string
-	 */
-	public function getReviews($ID, $type = 'top_critic', $limit = 20, $page = 1, $country = 'us')
-	{
-		return $this->_makeCall(
-			'movies/' . $ID . '/reviews.json',
-			array(
-				'review_type' => $type,
-				'page_limit'  => $limit,
-				'page'        => $page,
-				'country'     => $country
-			)
-		);
-	}
-
-	/**
-	 * Pulls the complete movie cast for a movie.
-	 *
-	 * @param int $ID The RT id.
-	 *
-	 * @return string
-	 */
-	public function getCast($ID)
-	{
-		return $this->_makeCall('movies/' . $ID . '/cast.json');
-	}
-
-	/**
-	 * Make a request to RT.
-	 *
-	 * @param string  $function The type of request.
-	 * @param array   $params   Extra HTTP parameters.
-	 *
-	 * @return string JSON data from RT.
-	 */
-	private function _makeCall($function, $params = [])
-	{
-		return trim(
-			Utility::getUrl([
-					'url' => \RottenTomato::API_URL .
-						$function .
-						'?limit=' .
-						mt_rand(15, 20) .
-						'&apikey=' .
-						$this->_apikey .
-						(!empty($params) ? ('&' . http_build_query($params)) : '')
-				]
-			)
-		);
-	}
-
-	/**
-	 * Get the RT api key.
-	 *
-	 * @return string
-	 */
-	public function getApiKey()
-	{
-		return $this->_apikey;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/sabnzbd.php b/lib/copy_this/www/lib/sabnzbd.php
deleted file mode 100644
index 3dcaafe90..000000000
--- a/lib/copy_this/www/lib/sabnzbd.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/util.php");
-
-/**
- * Class SABnzbd
- */
-class SABnzbd
-{
-	/**
-	 * Type of site integration.
-	 */
-	const INTEGRATION_TYPE_NONE = 0;
-	const INTEGRATION_TYPE_SITEWIDE = 1;
-	const INTEGRATION_TYPE_USER = 2;
-	/**
-	 * Type of SAB API key.
-	 */
-	const API_TYPE_NZB = 1;
-	const API_TYPE_FULL = 2;
-	/**
-	 * Priority to send the NZB to SAB.
-	 */
-	const PRIORITY_PAUSED = -2;
-	const PRIORITY_LOW = -1;
-	const PRIORITY_NORMAL = 0;
-	const PRIORITY_HIGH = 1; // Sab is completely disabled - no user can use it.
-	const PRIORITY_FORCE = 2; // Sab is enabled, 1 remote SAB server for the whole site.
-	/**
-	 * URL to the SAB server.
-	 *
-	 * @var string
-	 */
-	public $url = ''; // Sab is enabled, every user can use their own SAB server.
-	/**
-	 * The SAB API key.
-	 *
-	 * @var string
-	 */
-	public $apikey = '';
-	/**
-	 * Download priority of the sent NZB file.
-	 *
-	 * @var string
-	 */
-	public $priority = '';
-	/**
-	 * Type of SAB API key (full/nzb).
-	 *
-	 * @var string
-	 */
-	public $apikeytype = '';
-	/**
-	 * @var int
-	 */
-	public $integrated = self::INTEGRATION_TYPE_NONE;
-	/**
-	 * Is sab integrated into the site or not.
-	 * @var bool
-	 */
-	public $integratedBool = false;
-
-	/**
-	 * id of the current user, to send to SAB when downloading a NZB.
-	 *
-	 * @var string
-	 */
-	protected $uid = '';
-	/**
-	 * User's newznab API key to send to SAB when downloading a NZB.
-	 *
-	 * @var string
-	 */
-	protected $rsstoken = '';
-	/**
-	 * newznab Site URL to send to SAB to download the NZB.
-	 *
-	 * @var string
-	 */
-	protected $serverurl = '';
-
-	/**
-	 * Construct.
-	 *
-	 * @param BasePage $page
-	 */
-	public function __construct(&$page)
-	{
-		$this->uid = $page->userdata['id'];
-		$this->rsstoken = $page->userdata['rsstoken'];
-		$this->serverurl = $page->serverurl;
-
-		// Set up properties.
-		switch ($page->site->sabintegrationtype) {
-			case self::INTEGRATION_TYPE_USER:
-				if (!empty($_COOKIE['sabnzbd_' . $this->uid . '__apikey']) && !empty($_COOKIE['sabnzbd_' . $this->uid . '__host'])) {
-					$this->url = $_COOKIE['sabnzbd_' . $this->uid . '__host'];
-					$this->apikey = $_COOKIE['sabnzbd_' . $this->uid . '__apikey'];
-					$this->priority = (isset($_COOKIE['sabnzbd_' . $this->uid . '__priority'])) ? $_COOKIE['sabnzbd_' . $this->uid . '__priority'] : 0;
-					$this->apikeytype = (isset($_COOKIE['sabnzbd_' . $this->uid . '__apitype'])) ? $_COOKIE['sabnzbd_' . $this->uid . '__apitype'] : 1;
-				} else if (!empty($page->userdata['sabapikey']) && !empty($page->userdata['saburl'])) {
-					$this->url = $page->userdata['saburl'];
-					$this->apikey = $page->userdata['sabapikey'];
-					$this->priority = $page->userdata['sabpriority'];
-					$this->apikeytype = $page->userdata['sabapikeytype'];
-				}
-				$this->integrated = self::INTEGRATION_TYPE_USER;
-				switch ((int)$page->userdata['queuetype']) {
-					case 1:
-					case 2:
-						$this->integratedBool = true;
-						break;
-					default:
-						$this->integratedBool = false;
-						break;
-				}
-				break;
-
-			case self::INTEGRATION_TYPE_SITEWIDE:
-				if (!empty($page->site->sabapikey) && !empty($page->site->saburl)) {
-					$this->url = $page->site->saburl;
-					$this->apikey = $page->site->sabapikey;
-					$this->priority = $page->site->sabpriority;
-					$this->apikeytype = $page->site->sabapikeytype;
-				}
-				$this->integrated = self::INTEGRATION_TYPE_SITEWIDE;
-				$this->integratedBool = true;
-				break;
-
-			case self::INTEGRATION_TYPE_NONE:
-				$this->integrated = self::INTEGRATION_TYPE_NONE;
-				// This is for nzbget.
-				if ($page->userdata['queuetype'] == 2) {
-					$this->integratedBool = true;
-				}
-				break;
-		}
-		// Verify the URL is good, fix it if not.
-		if ($this->url !== '' && preg_match('/(?P<first>\/)?(?P<sab>[a-z]+)?(?P<last>\/)?$/i', $this->url, $matches)) {
-			if (!isset($matches['first'])) {
-				$this->url .= '/';
-			}
-			if (!isset($matches['sab'])) {
-				$this->url .= 'sabnzbd';
-			} elseif ($matches['sab'] !== 'sabnzbd') {
-				$this->url .= 'sabnzbd';
-			}
-			if (!isset($matches['last'])) {
-				$this->url .= '/';
-			}
-		}
-	}
-
-	/**
-	 * Send a release to SAB.
-	 *
-	 * @param string $guid Release identifier.
-	 *
-	 * @return bool|mixed
-	 */
-	public function sendToSab($guid)
-	{
-		return Utility::getUrl([
-				'url' => $this->url .
-					'api?mode=addurl&priority=' .
-					$this->priority .
-					'&apikey=' .
-					$this->apikey .
-					'&name=' .
-					urlencode(
-						$this->serverurl .
-						'getnzb/' .
-						$guid .
-						'&i=' .
-						$this->uid .
-						'&r=' .
-						$this->rsstoken
-					),
-				'verifypeer' => false,
-			]
-		);
-	}
-
-	/**
-	 * Get JSON representation of the SAB queue.
-	 *
-	 * @return bool|mixed
-	 */
-	public function getQueue()
-	{
-		return Utility::getUrl([
-				'url' =>
-					$this->url .
-					"api?mode=qstatus&output=json&apikey=" .
-					$this->apikey,
-				'verifypeer' => false,
-			]
-		);
-	}
-
-	/**
-	 * Get JSON representation of the full SAB queue.
-	 *
-	 * @return bool|mixed
-	 */
-	public function getAdvQueue()
-	{
-		return Utility::getUrl([
-				'url' =>
-					$this->url .
-					"api?mode=queue&start=START&limit=LIMIT&output=json&apikey=" .
-					$this->apikey,
-				'verifypeer' => false,
-			]
-		);
-	}
-
-	/**
-	 * Delete a single NZB from the SAB queue.
-	 *
-	 * @param int $id
-	 *
-	 * @return bool|mixed
-	 */
-	public function delFromQueue($id)
-	{
-		return Utility::getUrl([
-		$this->url .
-			"api?mode=queue&name=delete&value=" .
-			$id .
-			"&apikey=" .
-			$this->apikey,
-			'verifypeer' => false,
-		]);
-	}
-
-	/**
-	 * Pause a single NZB in the SAB queue.
-	 *
-	 * @param int $id
-	 *
-	 * @return bool|mixed
-	 */
-	public function pauseFromQueue($id)
-	{
-		return Utility::getUrl([
-		$this->url .
-			"api?mode=queue&name=pause&value=" .
-			$id .
-			"&apikey=" .
-			$this->apikey,
-			'verifypeer' => false,
-		]);
-	}
-
-	/**
-	 * Resume a single NZB in the SAB queue.
-	 *
-	 * @param int $id
-	 *
-	 * @return bool|mixed
-	 */
-	public function resumeFromQueue($id)
-	{
-		return Utility::getUrl([
-		$this->url .
-			"api?mode=queue&name=resume&value=" .
-			$id .
-			"&apikey=" .
-			$this->apikey,
-			'verifypeer' => false,
-		]);
-	}
-
-	/**
-	 * Pause all NZB's in the SAB queue.
-	 *
-	 * @return bool|mixed
-	 */
-	public function pauseAll()
-	{
-		return Utility::getUrl([
-		$this->url .
-			"api?mode=pause" .
-			"&apikey=" .
-			$this->apikey,
-			'verifypeer' => false,
-		]);
-	}
-
-	/**
-	 * Resume all NZB's in the SAB queue.
-	 *
-	 * @return bool|mixed
-	 */
-	public function resumeAll()
-	{
-		return Utility::getUrl([
-		$this->url .
-			"api?mode=resume" .
-			"&apikey=" .
-			$this->apikey,
-			'verifypeer' => false,
-		]);
-	}
-
-	/**
-	 * Check if the SAB cookies are in the User's browser.
-	 *
-	 * @return bool
-	 */
-	public function checkCookie()
-	{
-		$res = false;
-		if (isset($_COOKIE['sabnzbd_' . $this->uid . '__apikey'])) {
-			$res = true;
-		}
-		if (isset($_COOKIE['sabnzbd_' . $this->uid . '__host'])) {
-			$res = true;
-		}
-		if (isset($_COOKIE['sabnzbd_' . $this->uid . '__priority'])) {
-			$res = true;
-		}
-		if (isset($_COOKIE['sabnzbd_' . $this->uid . '__apitype'])) {
-			$res = true;
-		}
-
-		return $res;
-	}
-
-	/**
-	 * Creates the SAB cookies for the user's browser.
-	 *
-	 * @param $host
-	 * @param $apikey
-	 * @param $priority
-	 * @param $apitype
-	 */
-	public function setCookie($host, $apikey, $priority, $apitype)
-	{
-		setcookie('sabnzbd_' . $this->uid . '__host', $host, (time() + 2592000));
-		setcookie('sabnzbd_' . $this->uid . '__apikey', $apikey, (time() + 2592000));
-		setcookie('sabnzbd_' . $this->uid . '__priority', $priority, (time() + 2592000));
-		setcookie('sabnzbd_' . $this->uid . '__apitype', $apitype, (time() + 2592000));
-	}
-
-	/**
-	 * Deletes the SAB cookies from the user's browser.
-	 */
-	public function unsetCookie()
-	{
-		setcookie('sabnzbd_' . $this->uid . '__host', '', (time() - 2592000));
-		setcookie('sabnzbd_' . $this->uid . '__apikey', '', (time() - 2592000));
-		setcookie('sabnzbd_' . $this->uid . '__priority', '', (time() - 2592000));
-		setcookie('sabnzbd_' . $this->uid . '__apitype', '', (time() - 2592000));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/showsleep.php b/lib/copy_this/www/lib/showsleep.php
deleted file mode 100644
index 091fb3100..000000000
--- a/lib/copy_this/www/lib/showsleep.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-//This script is ported from nZEDb and adapted for newznab
-require_once("ConsoleTools.php");
-
-// This script is simply so I can show sleep progress in bash script
-$consoletools = new ConsoleTools();
-if (isset($argv[1]) && is_numeric($argv[1]))
-{
-	$consoletools->showsleep($argv[1]);
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/site.php b/lib/copy_this/www/lib/site.php
deleted file mode 100644
index a289fda6e..000000000
--- a/lib/copy_this/www/lib/site.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/framework/cache.php");
-
-class Sites
-{
-	const REGISTER_STATUS_OPEN = 0;
-	const REGISTER_STATUS_INVITE = 1;
-	const REGISTER_STATUS_CLOSED = 2;
-	const REGISTER_STATUS_API_ONLY = 3;
-
-	const ERR_BADUNRARPATH = -1;
-	const ERR_BADFFMPEGPATH = -2;
-	const ERR_BADMEDIAINFOPATH = -3;
-	const ERR_BADNZBPATH = -4;
-	const ERR_DEEPNOUNRAR = -5;
-	const ERR_BADTMPUNRARPATH = -6;
-	const ERR_BADLAMEPATH = -7;
-	const ERR_SABCOMPLETEPATH = -8;
-
-	public function version()
-	{
-		return "0.3.6 nn-tmux";
-	}
-
-	public function update($form)
-	{
-		$db = new DB();
-		$site = $this->row2Object($form);
-
-		if (substr($site->nzbpath, strlen($site->nzbpath) - 1) != '/')
-			$site->nzbpath = $site->nzbpath . "/";
-
-		//
-		// Validate site settings
-		//
-		if ($site->mediainfopath != "" && !is_file($site->mediainfopath))
-			return Sites::ERR_BADMEDIAINFOPATH;
-
-		if ($site->ffmpegpath != "" && !is_file($site->ffmpegpath))
-			return Sites::ERR_BADFFMPEGPATH;
-
-		if ($site->unrarpath != "" && !is_file($site->unrarpath))
-			return Sites::ERR_BADUNRARPATH;
-
-		if ($site->nzbpath != "" && !file_exists($site->nzbpath))
-			return Sites::ERR_BADNZBPATH;
-
-		if ($site->checkpasswordedrar == 2 && !is_file($site->unrarpath))
-			return Sites::ERR_DEEPNOUNRAR;
-
-		if ($site->tmpunrarpath != "" && !file_exists($site->tmpunrarpath))
-			return Sites::ERR_BADTMPUNRARPATH;
-
-		if ($site->lamepath != "" && !file_exists($site->lamepath))
-			return Sites::ERR_BADLAMEPATH;
-
-		if ($site->sabcompletedir != "" && !file_exists($site->sabcompletedir))
-			return Sites::ERR_SABCOMPLETEPATH;
-
-		$sql = $sqlKeys = array();
-		foreach ($form as $settingK => $settingV) {
-			$sql[] = sprintf("WHEN %s THEN %s", $db->escapeString($settingK), $db->escapeString(trim($settingV)));
-			$sqlKeys[] = $db->escapeString($settingK);
-		}
-
-		$db->exec(sprintf("update site SET value = CASE setting %s END WHERE setting IN (%s)", implode(' ', $sql), implode(', ', $sqlKeys)));
-
-		return $this->get(true);
-	}
-
-	public function get($refresh = false)
-	{
-		$sql = "select * from site";
-
-		if ($refresh) {
-			$cache = new Cache();
-			$cache->delete($sql);
-		}
-
-		$db = new DB();
-		$rows = $db->query($sql, true, NN_CACHE_EXPIRY_MEDIUM);
-
-		if ($rows === false)
-			return false;
-
-		return $this->rows2Object($rows);
-	}
-
-	public function rows2Object($rows)
-	{
-		$obj = new stdClass;
-		foreach ($rows as $row)
-			$obj->{$row['setting']} = $row['value'];
-
-		$obj->{'version'} = $this->version();
-
-		return $obj;
-	}
-
-	public function row2Object($row)
-	{
-		$obj = new stdClass;
-		$rowKeys = array_keys($row);
-		foreach ($rowKeys as $key)
-			$obj->{$key} = $row[$key];
-
-		return $obj;
-	}
-
-	public function getUnappliedPatches($site)
-	{
-		preg_match("/\d+/", $site->dbversion, $matches);
-		$currentrev = $matches[0];
-
-		$patchpath = WWW_DIR . "../db/patch/0.2.3/";
-		$patchfiles = glob($patchpath . "*.sql");
-		$missingpatch = array();
-		foreach ($patchfiles as $file) {
-			$filecontents = file_get_contents($file);
-			if (preg_match("/Rev\: (\d+)/", $filecontents, $matches)) {
-				$patchrev = $matches[1];
-				if ($patchrev > $currentrev)
-					$missingpatch[] = $file;
-			}
-		}
-
-		return $missingpatch;
-	}
-
-	public function updateItem($setting, $value)
-	{
-		$db = new DB();
-		$sql = sprintf("update site set value = %s where setting = %s", $db->escapeString($value), $db->escapeString($setting));
-
-		return $db->exec($sql);
-	}
-
-	public function updateLatestRegexRevision($rev)
-	{
-		return $this->updateItem("latestregexrevision", $rev);
-	}
-
-	public function getLicense($html = false)
-	{
-		$n = "\r\n";
-		if ($html)
-			$n = "<br/>";
-
-		return $n . "newznab " . $this->version() . " Copyright (C) " . date("Y") . " newznab.com" . $n . "
-
-This program is distributed with a commercial licence. See LICENCE.txt for
-further details." . $n;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/sitemaps.php b/lib/copy_this/www/lib/sitemaps.php
deleted file mode 100644
index a8902a257..000000000
--- a/lib/copy_this/www/lib/sitemaps.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-class Sitemap
-{
-	public $type = '';
-	public $name = '';
-	public $loc = '';
-	public $priority = '';
-	public $changefreq = '';
-	
-	function Sitemap($t, $n, $l, $p, $c)
-	{
-		$this->type = $t;
-		$this->name = $n;
-		$this->loc = $l;
-		$this->priority = $p;
-		$this->changefreq = $c;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/smarty/Smarty.class.php b/lib/copy_this/www/lib/smarty/Smarty.class.php
deleted file mode 100644
index 6291e4cd5..000000000
--- a/lib/copy_this/www/lib/smarty/Smarty.class.php
+++ /dev/null
@@ -1,1674 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4848 2014-06-08 18:12:09Z Uwe.Tews@googlemail.com $
- * 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 (at your option) any later version.
- * 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.
- * 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
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- * @version   3.1.19
- */
-
-/**
- * define shorthand directory separator constant
- */
-if (!defined('DS')) {
-    define('DS', DIRECTORY_SEPARATOR);
-}
-
-/**
- * set SMARTY_DIR to absolute path to Smarty library files.
- * Sets SMARTY_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DS);
-}
-
-/**
- * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
- * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_SYSPLUGINS_DIR')) {
-    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
-}
-if (!defined('SMARTY_PLUGINS_DIR')) {
-    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
-}
-if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_split'));
-}
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
-}
-if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    /**
-     * @deprecated in favor of Smarty::$_DATE_FORMAT
-     */
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-}
-
-/**
- * register the class autoloader
- */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-}
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
-    }
-} else {
-    spl_autoload_register('smartyAutoload');
-}
-
-/**
- * Load always needed external class files
- */
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-include_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_cacheresource_file.php';
-
-/**
- * This is the main Smarty class
- *
- * @package Smarty
- */
-class Smarty extends Smarty_Internal_TemplateBase
-{
-    /**#@+
-     * constant definitions
-     */
-
-    /**
-     * smarty version
-     */
-    const SMARTY_VERSION = 'Smarty-3.1.19';
-
-    /**
-     * define variable scopes
-     */
-    const SCOPE_LOCAL = 0;
-    const SCOPE_PARENT = 1;
-    const SCOPE_ROOT = 2;
-    const SCOPE_GLOBAL = 3;
-    /**
-     * define caching modes
-     */
-    const CACHING_OFF = 0;
-    const CACHING_LIFETIME_CURRENT = 1;
-    const CACHING_LIFETIME_SAVED = 2;
-    /**
-     * define constant for clearing cache files be saved expiration datees
-     */
-    const CLEAR_EXPIRED = - 1;
-
-    /**
-     * define compile check modes
-     */
-    const COMPILECHECK_OFF = 0;
-    const COMPILECHECK_ON = 1;
-    const COMPILECHECK_CACHEMISS = 2;
-    /**
-     * modes for handling of "<?php ... ?>" tags in templates.
-     */
-    const PHP_PASSTHRU = 0; //-> print tags as plain text
-    const PHP_QUOTE = 1; //-> escape tags as entities
-    const PHP_REMOVE = 2; //-> escape tags as entities
-    const PHP_ALLOW = 3; //-> escape tags as entities
-    /**
-     * filter types
-     */
-    const FILTER_POST = 'post';
-    const FILTER_PRE = 'pre';
-    const FILTER_OUTPUT = 'output';
-    const FILTER_VARIABLE = 'variable';
-    /**
-     * plugin types
-     */
-    const PLUGIN_FUNCTION = 'function';
-    const PLUGIN_BLOCK = 'block';
-    const PLUGIN_COMPILER = 'compiler';
-    const PLUGIN_MODIFIER = 'modifier';
-    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
-
-    /**#@-*/
-
-    /**
-     * assigned global tpl vars
-     */
-    public static $global_tpl_vars = array();
-
-    /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
-     */
-    public static $_previous_error_handler = null;
-    /**
-     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
-     */
-    public static $_muted_directories = array();
-    /**
-     * Flag denoting if Multibyte String functions are available
-     */
-    public static $_MBSTRING = SMARTY_MBSTRING;
-    /**
-     * The character set to adhere to (e.g. "UTF-8")
-     */
-    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
-    /**
-     * The date format to be used internally
-     * (accepts date() and strftime())
-     */
-    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
-    /**
-     * Flag denoting if PCRE should run in UTF-8 mode
-     */
-    public static $_UTF8_MODIFIER = 'u';
-
-    /**
-     * Flag denoting if operating system is windows
-     */
-    public static $_IS_WINDOWS = false;
-
-    /**#@+
-     * variables
-     */
-
-    /**
-     * auto literal on delimiters with whitspace
-     *
-     * @var boolean
-     */
-    public $auto_literal = true;
-    /**
-     * display error on not assigned variables
-     *
-     * @var boolean
-     */
-    public $error_unassigned = false;
-    /**
-     * look up relative filepaths in include_path
-     *
-     * @var boolean
-     */
-    public $use_include_path = false;
-    /**
-     * template directory
-     *
-     * @var array
-     */
-    private $template_dir = array();
-    /**
-     * joined template directory string used in cache keys
-     *
-     * @var string
-     */
-    public $joined_template_dir = null;
-    /**
-     * joined config directory string used in cache keys
-     *
-     * @var string
-     */
-    public $joined_config_dir = null;
-    /**
-     * default template handler
-     *
-     * @var callable
-     */
-    public $default_template_handler_func = null;
-    /**
-     * default config handler
-     *
-     * @var callable
-     */
-    public $default_config_handler_func = null;
-    /**
-     * default plugin handler
-     *
-     * @var callable
-     */
-    public $default_plugin_handler_func = null;
-    /**
-     * compile directory
-     *
-     * @var string
-     */
-    private $compile_dir = null;
-    /**
-     * plugins directory
-     *
-     * @var array
-     */
-    private $plugins_dir = array();
-    /**
-     * cache directory
-     *
-     * @var string
-     */
-    private $cache_dir = null;
-    /**
-     * config directory
-     *
-     * @var array
-     */
-    private $config_dir = array();
-    /**
-     * force template compiling?
-     *
-     * @var boolean
-     */
-    public $force_compile = false;
-    /**
-     * check template for modifications?
-     *
-     * @var boolean
-     */
-    public $compile_check = true;
-    /**
-     * use sub dirs for compiled/cached files?
-     *
-     * @var boolean
-     */
-    public $use_sub_dirs = false;
-    /**
-     * allow ambiguous resources (that are made unique by the resource handler)
-     *
-     * @var boolean
-     */
-    public $allow_ambiguous_resources = false;
-    /**
-     * caching enabled
-     *
-     * @var boolean
-     */
-    public $caching = false;
-    /**
-     * merge compiled includes
-     *
-     * @var boolean
-     */
-    public $merge_compiled_includes = false;
-    /**
-     * template inheritance merge compiled includes
-     *
-     * @var boolean
-     */
-    public $inheritance_merge_compiled_includes = true;
-    /**
-     * cache lifetime in seconds
-     *
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
-    /**
-     * force cache file creation
-     *
-     * @var boolean
-     */
-    public $force_cache = false;
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
-    /**
-     * template left-delimiter
-     *
-     * @var string
-     */
-    public $left_delimiter = "{";
-    /**
-     * template right-delimiter
-     *
-     * @var string
-     */
-    public $right_delimiter = "}";
-    /**#@+
-     * security
-     */
-    /**
-     * class name
-     * This should be instance of Smarty_Security.
-     *
-     * @var string
-     * @see Smarty_Security
-     */
-    public $security_class = 'Smarty_Security';
-    /**
-     * implementation of security class
-     *
-     * @var Smarty_Security
-     */
-    public $security_policy = null;
-    /**
-     * controls handling of PHP-blocks
-     *
-     * @var integer
-     */
-    public $php_handling = self::PHP_PASSTHRU;
-    /**
-     * controls if the php template file resource is allowed
-     *
-     * @var bool
-     */
-    public $allow_php_templates = false;
-    /**
-     * Should compiled-templates be prevented from being called directly?
-     * {@internal
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
-    /**#@-*/
-    /**
-     * debug mode
-     * Setting this to true enables the debug-console.
-     *
-     * @var boolean
-     */
-    public $debugging = false;
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * <ul>
-     *  <li>NONE => no debugging control allowed</li>
-     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
-     * </ul>
-     *
-     * @var string
-     */
-    public $debugging_ctrl = 'NONE';
-    /**
-     * Name of debugging URL-param.
-     * Only used when $debugging_ctrl is set to 'URL'.
-     * The name of the URL-parameter that activates debugging.
-     *
-     * @var type
-     */
-    public $smarty_debug_id = 'SMARTY_DEBUG';
-    /**
-     * Path of debug template.
-     *
-     * @var string
-     */
-    public $debug_tpl = null;
-    /**
-     * When set, smarty uses this value as error_reporting-level.
-     *
-     * @var int
-     */
-    public $error_reporting = null;
-    /**
-     * Internal flag for getTags()
-     *
-     * @var boolean
-     */
-    public $get_used_tags = false;
-
-    /**#@+
-     * config var settings
-     */
-
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     *
-     * @var boolean
-     */
-    public $config_overwrite = true;
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
-     *
-     * @var boolean
-     */
-    public $config_booleanize = true;
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     *
-     * @var boolean
-     */
-    public $config_read_hidden = false;
-
-    /**#@-*/
-
-    /**#@+
-     * resource locking
-     */
-
-    /**
-     * locking concurrent compiles
-     *
-     * @var boolean
-     */
-    public $compile_locking = true;
-    /**
-     * Controls whether cache resources should emply locking mechanism
-     *
-     * @var boolean
-     */
-    public $cache_locking = false;
-    /**
-     * seconds to wait for acquiring a lock before ignoring the write lock
-     *
-     * @var float
-     */
-    public $locking_timeout = 10;
-
-    /**#@-*/
-
-    /**
-     * global template functions
-     *
-     * @var array
-     */
-    public $template_functions = array();
-    /**
-     * resource type used if none given
-     * Must be an valid key of $registered_resources.
-     *
-     * @var string
-     */
-    public $default_resource_type = 'file';
-    /**
-     * caching type
-     * Must be an element of $cache_resource_types.
-     *
-     * @var string
-     */
-    public $caching_type = 'file';
-    /**
-     * internal config properties
-     *
-     * @var array
-     */
-    public $properties = array();
-    /**
-     * config type
-     *
-     * @var string
-     */
-    public $default_config_type = 'file';
-    /**
-     * cached template objects
-     *
-     * @var array
-     */
-    public $template_objects = array();
-    /**
-     * check If-Modified-Since headers
-     *
-     * @var boolean
-     */
-    public $cache_modified_check = false;
-    /**
-     * registered plugins
-     *
-     * @var array
-     */
-    public $registered_plugins = array();
-    /**
-     * plugin search order
-     *
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
-    /**
-     * registered objects
-     *
-     * @var array
-     */
-    public $registered_objects = array();
-    /**
-     * registered classes
-     *
-     * @var array
-     */
-    public $registered_classes = array();
-    /**
-     * registered filters
-     *
-     * @var array
-     */
-    public $registered_filters = array();
-    /**
-     * registered resources
-     *
-     * @var array
-     */
-    public $registered_resources = array();
-    /**
-     * resource handler cache
-     *
-     * @var array
-     */
-    public $_resource_handlers = array();
-    /**
-     * registered cache resources
-     *
-     * @var array
-     */
-    public $registered_cache_resources = array();
-    /**
-     * cache resource handler cache
-     *
-     * @var array
-     */
-    public $_cacheresource_handlers = array();
-    /**
-     * autoload filter
-     *
-     * @var array
-     */
-    public $autoload_filters = array();
-    /**
-     * default modifier
-     *
-     * @var array
-     */
-    public $default_modifiers = array();
-    /**
-     * autoescape variable output
-     *
-     * @var boolean
-     */
-    public $escape_html = false;
-    /**
-     * global internal smarty vars
-     *
-     * @var array
-     */
-    public static $_smarty_vars = array();
-    /**
-     * start time for execution time calculation
-     *
-     * @var int
-     */
-    public $start_time = 0;
-    /**
-     * default file permissions
-     *
-     * @var int
-     */
-    public $_file_perms = 0644;
-    /**
-     * default dir permissions
-     *
-     * @var int
-     */
-    public $_dir_perms = 0771;
-    /**
-     * block tag hierarchy
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-    /**
-     * self pointer to Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty;
-    /**
-     * required by the compiler for BC
-     *
-     * @var string
-     */
-    public $_current_file = null;
-    /**
-     * internal flag to enable parser debugging
-     *
-     * @var bool
-     */
-    public $_parserdebug = false;
-    /**
-     * Saved parameter of merged templates during compilation
-     *
-     * @var array
-     */
-    public $merged_templates_func = array();
-    /**#@-*/
-
-    /**
-     * Initialize new Smarty object
-
-     */
-    public function __construct()
-    {
-        // selfpointer needed by some other class methods
-        $this->smarty = $this;
-        if (is_callable('mb_internal_encoding')) {
-            mb_internal_encoding(Smarty::$_CHARSET);
-        }
-        $this->start_time = microtime(true);
-        // set default dirs
-        $this->setTemplateDir('.' . DS . 'templates' . DS)
-            ->setCompileDir('.' . DS . 'templates_c' . DS)
-            ->setPluginsDir(SMARTY_PLUGINS_DIR)
-            ->setCacheDir('.' . DS . 'cache' . DS)
-            ->setConfigDir('.' . DS . 'configs' . DS);
-
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
-        if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
-        }
-    }
-
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * <<magic>> set selfpointer on cloned object
-     */
-    public function __clone()
-    {
-        $this->smarty = $this;
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param  string $name property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $allowed = array(
-            'template_dir' => 'getTemplateDir',
-            'config_dir'   => 'getConfigDir',
-            'plugins_dir'  => 'getPluginsDir',
-            'compile_dir'  => 'getCompileDir',
-            'cache_dir'    => 'getCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        $allowed = array(
-            'template_dir' => 'setTemplateDir',
-            'config_dir'   => 'setConfigDir',
-            'plugins_dir'  => 'setPluginsDir',
-            'compile_dir'  => 'setCompileDir',
-            'cache_dir'    => 'setCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * Check if a template resource exists
-     *
-     * @param  string $resource_name template name
-     *
-     * @return boolean status
-     */
-    public function templateExists($resource_name)
-    {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-
-        return $result;
-    }
-
-    /**
-     * Returns a single or all global  variables
-     *
-     * @param  string $varname variable name or null
-     *
-     * @return string variable value or or array of variables
-     */
-    public function getGlobal($varname = null)
-    {
-        if (isset($varname)) {
-            if (isset(self::$global_tpl_vars[$varname])) {
-                return self::$global_tpl_vars[$varname]->value;
-            } else {
-                return '';
-            }
-        } else {
-            $_result = array();
-            foreach (self::$global_tpl_vars AS $key => $var) {
-                $_result[$key] = $var->value;
-            }
-
-            return $_result;
-        }
-    }
-
-    /**
-     * Empty cache folder
-     *
-     * @param  integer $exp_time expiration time
-     * @param  string  $type     resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param  string  $template_name template name
-     * @param  string  $cache_id      cache id
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     * @param  string  $type          resource type
-     *
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param  string|Smarty_Security $security_class if a string is used, it must be class-name
-     *
-     * @return Smarty                 current Smarty instance for chaining
-     * @throws SmartyException        when an invalid class name is provided
-     */
-    public function enableSecurity($security_class = null)
-    {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Disable security
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function disableSecurity()
-    {
-        $this->security_policy = null;
-
-        return $this;
-    }
-
-    /**
-     * Set template directory
-     *
-     * @param  string|array $template_dir directory(s) of template sources
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setTemplateDir($template_dir)
-    {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-        }
-
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-
-        return $this;
-    }
-
-    /**
-     * Add template directory(s)
-     *
-     * @param  string|array $template_dir directory(s) of template sources
-     * @param  string       $key          of the array element to assign the template dir to
-     *
-     * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
-     */
-    public function addTemplateDir($template_dir, $key = null)
-    {
-        // make sure we're dealing with an array
-        $this->template_dir = (array) $this->template_dir;
-
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->template_dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $this->template_dir[$k] = $v;
-                }
-            }
-        } else {
-            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($template_dir, '/\\')) . DS;
-            if ($key !== null) {
-                // override directory at specified index
-                $this->template_dir[$key] = $v;
-            } else {
-                // append new directory
-                $this->template_dir[] = $v;
-            }
-        }
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-
-        return $this;
-    }
-
-    /**
-     * Get template directories
-     *
-     * @param mixed $index index of directory to get, null to get all
-     *
-     * @return array|string list of template directories, or directory of $index
-     */
-    public function getTemplateDir($index = null)
-    {
-        if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
-        }
-
-        return (array) $this->template_dir;
-    }
-
-    /**
-     * Set config directory
-     *
-     * @param $config_dir
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setConfigDir($config_dir)
-    {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-
-        return $this;
-    }
-
-    /**
-     * Add config directory(s)
-     *
-     * @param string|array        $config_dir directory(s) of config sources
-     * @param mixed $key        key of the array element to assign the config dir to
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addConfigDir($config_dir, $key = null)
-    {
-        // make sure we're dealing with an array
-        $this->config_dir = (array) $this->config_dir;
-
-        if (is_array($config_dir)) {
-            foreach ($config_dir as $k => $v) {
-                $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($v, '/\\')) . DS;
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->config_dir[] = $v;
-                } else {
-                    // string indexes are overridden
-                    $this->config_dir[$k] = $v;
-                }
-            }
-        } else {
-            $v = preg_replace('#(\w+)(/|\\\\){1,}#', '$1$2', rtrim($config_dir, '/\\')) . DS;
-            if ($key !== null) {
-                // override directory at specified index
-                $this->config_dir[$key] = rtrim($v, '/\\') . DS;
-            } else {
-                // append new directory
-                $this->config_dir[] = rtrim($v, '/\\') . DS;
-            }
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-
-        return $this;
-    }
-
-    /**
-     * Get config directory
-     *
-     * @param mixed $index index of directory to get, null to get all
-     *
-     * @return array|string configuration directory
-     */
-    public function getConfigDir($index = null)
-    {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-
-        return (array) $this->config_dir;
-    }
-
-    /**
-     * Set plugins directory
-     *
-     * @param  string|array $plugins_dir directory(s) of plugins
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setPluginsDir($plugins_dir)
-    {
-        $this->plugins_dir = array();
-        foreach ((array) $plugins_dir as $k => $v) {
-            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds directory of plugin files
-     *
-     * @param $plugins_dir
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addPluginsDir($plugins_dir)
-    {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-
-        if (is_array($plugins_dir)) {
-            foreach ($plugins_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            // append new directory
-            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
-        }
-
-        $this->plugins_dir = array_unique($this->plugins_dir);
-
-        return $this;
-    }
-
-    /**
-     * Get plugin directories
-     *
-     * @return array list of plugin directories
-     */
-    public function getPluginsDir()
-    {
-        return (array) $this->plugins_dir;
-    }
-
-    /**
-     * Set compile directory
-     *
-     * @param  string $compile_dir directory to store compiled templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCompileDir($compile_dir)
-    {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
-        if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
-            Smarty::$_muted_directories[$this->compile_dir] = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get compiled directory
-     *
-     * @return string path to compiled templates
-     */
-    public function getCompileDir()
-    {
-        return $this->compile_dir;
-    }
-
-    /**
-     * Set cache directory
-     *
-     * @param  string $cache_dir directory to store cached templates in
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCacheDir($cache_dir)
-    {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
-        if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
-            Smarty::$_muted_directories[$this->cache_dir] = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get cache directory
-     *
-     * @return string path of cache directory
-     */
-    public function getCacheDir()
-    {
-        return $this->cache_dir;
-    }
-
-    /**
-     * Set default modifiers
-     *
-     * @param  array|string $modifiers modifier or list of modifiers to set
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function setDefaultModifiers($modifiers)
-    {
-        $this->default_modifiers = (array) $modifiers;
-
-        return $this;
-    }
-
-    /**
-     * Add default modifiers
-     *
-     * @param  array|string $modifiers modifier or list of modifiers to add
-     *
-     * @return Smarty       current Smarty instance for chaining
-     */
-    public function addDefaultModifiers($modifiers)
-    {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
-        } else {
-            $this->default_modifiers[] = $modifiers;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get default modifiers
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers()
-    {
-        return $this->default_modifiers;
-    }
-
-    /**
-     * Set autoload filters
-     *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setAutoloadFilters($filters, $type = null)
-    {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
-        } else {
-            $this->autoload_filters = (array) $filters;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add autoload filters
-     *
-     * @param  array  $filters filters to load automatically
-     * @param  string $type    "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     *
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addAutoloadFilters($filters, $type = null)
-    {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
-                } else {
-                    $this->autoload_filters[$key] = (array) $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get autoload filters
-     *
-     * @param  string $type type of filter to get autoloads for. Defaults to all autoload filters
-     *
-     * @return array  array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
-     */
-    public function getAutoloadFilters($type = null)
-    {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
-
-        return $this->autoload_filters;
-    }
-
-    /**
-     * return name of debugging template
-     *
-     * @return string
-     */
-    public function getDebugTemplate()
-    {
-        return $this->debug_tpl;
-    }
-
-    /**
-     * set the debug template
-     *
-     * @param  string $tpl_name
-     *
-     * @return Smarty          current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate($tpl_name)
-    {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
-
-        return $this;
-    }
-
-    /**
-     * creates a template object
-     *
-     * @param  string  $template   the resource handle of the template file
-     * @param  mixed   $cache_id   cache id to be used with this template
-     * @param  mixed   $compile_id compile id to be used with this template
-     * @param  object  $parent     next higher level of Smarty variables
-     * @param  boolean $do_clone   flag is Smarty object shall be cloned
-     *
-     * @return object  template object
-     */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
-    {
-        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent !== null && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        // default to cache_id and compile_id of Smarty object
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        // already in template cache?
-        if ($this->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if ($do_clone) {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
-            }
-        } else {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            }
-        }
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-
-        return $tpl;
-    }
-
-    /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param  string $plugin_name class plugin name to load
-     * @param  bool   $check       check if already loaded
-     *
-     * @throws SmartyException
-     * @return string |boolean filepath of loaded file or false
-     */
-    public function loadPlugin($plugin_name, $check = true)
-    {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-        }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (file_exists($file)) {
-                require_once($file);
-
-                return $file;
-            } else {
-                return false;
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // loop through plugin dirs and find the plugin
-        foreach ($this->getPluginsDir() as $_plugin_dir) {
-            $names = array(
-                $_plugin_dir . $_plugin_filename,
-                $_plugin_dir . strtolower($_plugin_filename),
-            );
-            foreach ($names as $file) {
-                if (file_exists($file)) {
-                    require_once($file);
-
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-
-                    if ($file !== false) {
-                        require_once($file);
-
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates($extension = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param  string $extension     file extension
-     * @param  bool   $force_compile force all to recompile
-     * @param  int    $time_limit
-     * @param  int    $max_errors
-     *
-     * @return integer number of template files recompiled
-     */
-    public function compileAllConfig($extension = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllConfig($extension, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param  string  $resource_name template name
-     * @param  string  $compile_id    compile id
-     * @param  integer $exp_time      expiration time
-     *
-     * @return integer number of template files deleted
-     */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $template
-     *
-     * @return array  of tag/attributes
-     */
-    public function getTags(Smarty_Internal_Template $template)
-    {
-        return Smarty_Internal_Utility::getTags($template);
-    }
-
-    /**
-     * Run installation test
-     *
-     * @param  array $errors Array to write errors into, rather than outputting them
-     *
-     * @return boolean true if setup is fine, false if something is wrong
-     */
-    public function testInstall(&$errors = null)
-    {
-        return Smarty_Internal_Utility::testInstall($this, $errors);
-    }
-
-    /**
-     * Error Handler to mute expected messages
-     *
-     * @link http://php.net/set_error_handler
-     *
-     * @param  integer $errno Error level
-     * @param          $errstr
-     * @param          $errfile
-     * @param          $errline
-     * @param          $errcontext
-     *
-     * @return boolean
-     */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-        $_is_muted_directory = false;
-
-        // add the SMARTY_DIR to the list of muted directories
-        if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
-            $smarty_dir = realpath(SMARTY_DIR);
-            if ($smarty_dir !== false) {
-                Smarty::$_muted_directories[SMARTY_DIR] = array(
-                    'file'   => $smarty_dir,
-                    'length' => strlen($smarty_dir),
-                );
-            }
-        }
-
-        // walk the muted directories and test against $errfile
-        foreach (Smarty::$_muted_directories as $key => &$dir) {
-            if (!$dir) {
-                // resolve directory and length for speedy comparisons
-                $file = realpath($key);
-                if ($file === false) {
-                    // this directory does not exist, remove and skip it
-                    unset(Smarty::$_muted_directories[$key]);
-                    continue;
-                }
-                $dir = array(
-                    'file'   => $file,
-                    'length' => strlen($file),
-                );
-            }
-            if (!strncmp($errfile, $dir['file'], $dir['length'])) {
-                $_is_muted_directory = true;
-                break;
-            }
-        }
-
-        // pass to next error handler if this error did not occur inside SMARTY_DIR
-        // or the error was within smarty but masked to be ignored
-        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
-            if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Enable error handler to mute expected messages
-     *
-     * @return void
-     */
-    public static function muteExpectedErrors()
-    {
-        /*
-            error muting is done because some people implemented custom error_handlers using
-            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
-
-                It is important to remember that the standard PHP error handler is completely bypassed for the
-                error types specified by error_types unless the callback function returns FALSE.
-                error_reporting() settings will have no effect and your error handler will be called regardless -
-                however you are still able to read the current value of error_reporting and act appropriately.
-                Of particular note is that this value will be 0 if the statement that caused the error was
-                prepended by the @ error-control operator.
-
-            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
-                - @filemtime() is almost twice as fast as using an additional file_exists()
-                - between file_exists() and filemtime() a possible race condition is opened,
-                  which does not exist using the simple @filemtime() approach.
-        */
-        $error_handler = array('Smarty', 'mutingErrorHandler');
-        $previous = set_error_handler($error_handler);
-
-        // avoid dead loops
-        if ($previous !== $error_handler) {
-            Smarty::$_previous_error_handler = $previous;
-        }
-    }
-
-    /**
-     * Disable error handler muting expected messages
-     *
-     * @return void
-     */
-    public static function unmuteExpectedErrors()
-    {
-        restore_error_handler();
-    }
-}
-
-// Check if we're running on windows
-Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-
-// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-if (Smarty::$_CHARSET !== 'UTF-8') {
-    Smarty::$_UTF8_MODIFIER = '';
-}
-
-/**
- * Smarty exception class
- *
- * @package Smarty
- */
-class SmartyException extends Exception
-{
-    public static $escape = false;
-
-    public function __toString()
-    {
-        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
-    }
-}
-
-/**
- * Smarty compiler exception class
- *
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException
-{
-    public function __toString()
-    {
-        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
-    }
-
-    /**
-     * The line number of the template error
-     *
-     * @type int|null
-     */
-    public $line = null;
-    /**
-     * The template source snippet relating to the error
-     *
-     * @type string|null
-     */
-    public $source = null;
-    /**
-     * The raw text of the error message
-     *
-     * @type string|null
-     */
-    public $desc = null;
-    /**
-     * The resource identifier or template name
-     *
-     * @type string|null
-     */
-    public $template = null;
-}
-
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    static $_classes = array(
-        'smarty_config_source'               => true,
-        'smarty_config_compiled'             => true,
-        'smarty_security'                    => true,
-        'smarty_cacheresource'               => true,
-        'smarty_cacheresource_custom'        => true,
-        'smarty_cacheresource_keyvaluestore' => true,
-        'smarty_resource'                    => true,
-        'smarty_resource_custom'             => true,
-        'smarty_resource_uncompiled'         => true,
-        'smarty_resource_recompiled'         => true,
-    );
-
-    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/SmartyBC.class.php b/lib/copy_this/www/lib/smarty/SmartyBC.class.php
deleted file mode 100644
index cec946746..000000000
--- a/lib/copy_this/www/lib/smarty/SmartyBC.class.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        SmartyBC.class.php
- * SVN:         $Id: $
- * 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 (at your option) any later version.
- * 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.
- * 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
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link      http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author    Monte Ohrt <monte at ohrt dot com>
- * @author    Uwe Tews
- * @author    Rodney Rehm
- * @package   Smarty
- */
-/**
- * @ignore
- */
-require_once(dirname(__FILE__) . '/Smarty.class.php');
-
-/**
- * Smarty Backward Compatability Wrapper Class
- *
- * @package Smarty
- */
-class SmartyBC extends Smarty
-{
-    /**
-     * Smarty 2 BC
-     *
-     * @var string
-     */
-    public $_version = self::SMARTY_VERSION;
-
-    /**
-     * Initialize new SmartyBC object
-     *
-     * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
-    }
-
-    /**
-     * wrapper for assign_by_ref
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to assign
-     */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-        $this->assignByRef($tpl_var, $value);
-    }
-
-    /**
-     * wrapper for append_by_ref
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
-    {
-        $this->appendByRef($tpl_var, $value, $merge);
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    public function clear_assign($tpl_var)
-    {
-        $this->clearAssign($tpl_var);
-    }
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function      the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     */
-    public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters custom function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_function($function)
-    {
-        $this->unregisterPlugin('function', $function);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object      name of template object
-     * @param object  $object_impl the referenced PHP object to register
-     * @param array   $allowed     list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
-     * @param array   $block_methods list of methods that are block format
-     *
-     * @throws SmartyException
-     * @internal param array $block_functs list of methods that are block format
-     */
-    public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregisters object
-     *
-     * @param string $object name of template object
-     */
-    public function unregister_object($object)
-    {
-        $this->unregisterObject($object);
-    }
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block      name of template block
-     * @param string $block_impl PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     */
-    public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
-    {
-        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters block function
-     *
-     * @param string $block name of template function
-     */
-    public function unregister_block($block)
-    {
-        $this->unregisterPlugin('block', $block);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function      name of template function
-     * @param string $function_impl name of PHP function to register
-     * @param bool   $cacheable
-     */
-    public function register_compiler_function($function, $function_impl, $cacheable = true)
-    {
-        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
-    }
-
-    /**
-     * Unregisters compiler function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_compiler_function($function)
-    {
-        $this->unregisterPlugin('compiler', $function);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier      name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     */
-    public function register_modifier($modifier, $modifier_impl)
-    {
-        $this->registerPlugin('modifier', $modifier, $modifier_impl);
-    }
-
-    /**
-     * Unregisters modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    public function unregister_modifier($modifier)
-    {
-        $this->unregisterPlugin('modifier', $modifier);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type      name of resource
-     * @param array  $functions array of functions to handle resource
-     */
-    public function register_resource($type, $functions)
-    {
-        $this->registerResource($type, $functions);
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource
-     */
-    public function unregister_resource($type)
-    {
-        $this->unregisterResource($type);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callable $function
-     */
-    public function register_prefilter($function)
-    {
-        $this->registerFilter('pre', $function);
-    }
-
-    /**
-     * Unregisters a prefilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_prefilter($function)
-    {
-        $this->unregisterFilter('pre', $function);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callable $function
-     */
-    public function register_postfilter($function)
-    {
-        $this->registerFilter('post', $function);
-    }
-
-    /**
-     * Unregisters a postfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_postfilter($function)
-    {
-        $this->unregisterFilter('post', $function);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callable $function
-     */
-    public function register_outputfilter($function)
-    {
-        $this->registerFilter('output', $function);
-    }
-
-    /**
-     * Unregisters an outputfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_outputfilter($function)
-    {
-        $this->unregisterFilter('output', $function);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     */
-    public function load_filter($type, $name)
-    {
-        $this->loadFilter($type, $name);
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param  string $tpl_file   name of template file
-     * @param  string $cache_id   name of cache_id
-     * @param  string $compile_id name of compile_id
-     * @param  string $exp_time   expiration time
-     *
-     * @return boolean
-     */
-    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param  string $exp_time expire time
-     *
-     * @return boolean
-     */
-    public function clear_all_cache($exp_time = null)
-    {
-        return $this->clearCache(null, null, null, $exp_time);
-    }
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param  string $tpl_file name of template file
-     * @param  string $cache_id
-     * @param  string $compile_id
-     *
-     * @return boolean
-     */
-    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        return $this->isCached($tpl_file, $cache_id, $compile_id);
-    }
-
-    /**
-     * clear all the assigned template variables.
-     */
-    public function clear_all_assign()
-    {
-        $this->clearAllAssign();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param  string $tpl_file
-     * @param  string $compile_id
-     * @param  string $exp_time
-     *
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param  string $tpl_file
-     *
-     * @return boolean
-     */
-    public function template_exists($tpl_file)
-    {
-        return $this->templateExists($tpl_file);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param  string $name
-     *
-     * @return array
-     */
-    public function get_template_vars($name = null)
-    {
-        return $this->getTemplateVars($name);
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param  string $name
-     *
-     * @return array
-     */
-    public function get_config_vars($name = null)
-    {
-        return $this->getConfigVars($name);
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    public function config_load($file, $section = null, $scope = 'global')
-    {
-        $this->ConfigLoad($file, $section, $scope);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param  string $name
-     *
-     * @return object
-     */
-    public function get_registered_object($name)
-    {
-        return $this->getRegisteredObject($name);
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    public function clear_config($var = null)
-    {
-        $this->clearConfig($var);
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string  $error_msg
-     * @param integer $error_type
-     */
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-}
-
-/**
- * Smarty {php}{/php} block function
- *
- * @param array   $params   parameter list
- * @param string  $content  contents of the block
- * @param object  $template template object
- * @param boolean &$repeat  repeat flag
- *
- * @return string content re-formatted
- */
-function smarty_php_tag($params, $content, $template, &$repeat)
-{
-    eval($content);
-
-    return '';
-}
diff --git a/lib/copy_this/www/lib/smarty/debug.tpl b/lib/copy_this/www/lib/smarty/debug.tpl
deleted file mode 100644
index 16f1cf4ae..000000000
--- a/lib/copy_this/www/lib/smarty/debug.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-{capture name='_smarty_debug' assign=debug_output}
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-	<head>
-		<title>Smarty Debug Console</title>
-		<style type="text/css">
-			{literal}
-			body, h1, h2, td, th, p {
-				font-family: sans-serif;
-				font-weight: normal;
-				font-size: 0.9em;
-				margin: 1px;
-				padding: 0;
-			}
-
-			h1 {
-				margin: 0;
-				text-align: left;
-				padding: 2px;
-				background-color: #f0c040;
-				color: black;
-				font-weight: bold;
-				font-size: 1.2em;
-			}
-
-			h2 {
-				background-color: #9B410E;
-				color: white;
-				text-align: left;
-				font-weight: bold;
-				padding: 2px;
-				border-top: 1px solid black;
-			}
-
-			body {
-				background: black;
-			}
-
-			p, table, div {
-				background: #f0ead8;
-			}
-
-			p {
-				margin: 0;
-				font-style: italic;
-				text-align: center;
-			}
-
-			table {
-				width: 100%;
-			}
-
-			th, td {
-				font-family: monospace;
-				vertical-align: top;
-				text-align: left;
-				width: 50%;
-			}
-
-			td {
-				color: green;
-			}
-
-			.odd {
-				background-color: #eeeeee;
-			}
-
-			.even {
-				background-color: #fafafa;
-			}
-
-			.exectime {
-				font-size: 0.8em;
-				font-style: italic;
-			}
-
-			#table_assigned_vars th {
-				color: blue;
-			}
-
-			#table_config_vars th {
-				color: maroon;
-			}
-
-			{/literal}
-		</style>
-	</head>
-	<body>
-
-	<h1>Smarty Debug Console
-		-  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
-
-	{if !empty($template_data)}
-		<h2>included templates &amp; config files (load time in seconds)</h2>
-		<div>
-			{foreach $template_data as $template}
-				<font color=brown>{$template.name}</font>
-				<span class="exectime">
-   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"}
-					)
-  </span>
-				<br>
-			{/foreach}
-		</div>
-	{/if}
-
-	<h2>assigned template variables</h2>
-
-	<table id="table_assigned_vars">
-		{foreach $assigned_vars as $vars}
-			<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-				<th>${$vars@key|escape:'html'}</th>
-				<td>{$vars|debug_print_var nofilter}</td>
-			</tr>
-		{/foreach}
-	</table>
-
-	<h2>assigned config file variables (outer template scope)</h2>
-
-	<table id="table_config_vars">
-		{foreach $config_vars as $vars}
-			<tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
-				<th>{$vars@key|escape:'html'}</th>
-				<td>{$vars|debug_print_var nofilter}</td>
-			</tr>
-		{/foreach}
-
-	</table>
-	</body>
-	</html>
-{/capture}
-<script type="text/javascript">
-	{$id = $template_name|default:''|md5}
-	_smarty_console = window.open("", "console{$id}", "width=680,height=600,resizable,scrollbars=yes");
-	_smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
-	_smarty_console.document.close();
-</script>
diff --git a/lib/copy_this/www/lib/smarty/plugins/block.textformat.php b/lib/copy_this/www/lib/smarty/plugins/block.textformat.php
deleted file mode 100644
index abf544939..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/block.textformat.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Smarty plugin to format text blocks
- *
- * @package    Smarty
- * @subpackage PluginsBlock
- */
-
-/**
- * Smarty {textformat}{/textformat} block plugin
- * Type:     block function<br>
- * Name:     textformat<br>
- * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings<br>
- * Params:
- * <pre>
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- * </pre>
- *
- * @link   http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *         (Smarty online manual)
- *
- * @param array                    $params   parameters
- * @param string                   $content  contents of the block
- * @param Smarty_Internal_Template $template template object
- * @param boolean                  &$repeat  repeat flag
- *
- * @return string content re-formatted
- * @author Monte Ohrt <monte at ohrt dot com>
- */
-function smarty_block_textformat($params, $content, $template, &$repeat)
-{
-    if (is_null($content)) {
-        return;
-    }
-
-    $style = null;
-    $indent = 0;
-    $indent_first = 0;
-    $indent_char = ' ';
-    $wrap = 80;
-    $wrap_char = "\n";
-    $wrap_cut = false;
-    $assign = null;
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'style':
-            case 'indent_char':
-            case 'wrap_char':
-            case 'assign':
-                $$_key = (string) $_val;
-                break;
-
-            case 'indent':
-            case 'indent_first':
-            case 'wrap':
-                $$_key = (int) $_val;
-                break;
-
-            case 'wrap_cut':
-                $$_key = (bool) $_val;
-                break;
-
-            default:
-                trigger_error("textformat: unknown attribute '$_key'");
-        }
-    }
-
-    if ($style == 'email') {
-        $wrap = 72;
-    }
-    // split into paragraphs
-    $_paragraphs = preg_split('![\r\n]{2}!', $content);
-
-    foreach ($_paragraphs as &$_paragraph) {
-        if (!$_paragraph) {
-            continue;
-        }
-        // convert mult. spaces & special chars to single space
-        $_paragraph = preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER), array(' ', ''), $_paragraph);
-        // indent first line
-        if ($indent_first > 0) {
-            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
-        }
-        // wordwrap sentences
-        if (Smarty::$_MBSTRING) {
-            require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
-            $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        } else {
-            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        }
-        // indent lines
-        if ($indent > 0) {
-            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
-        }
-    }
-    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-
-    if ($assign) {
-        $template->assign($assign, $_output);
-    } else {
-        return $_output;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.counter.php b/lib/copy_this/www/lib/smarty/plugins/function.counter.php
deleted file mode 100644
index cba658b95..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.counter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {counter} function plugin
- * Type:     function<br>
- * Name:     counter<br>
- * Purpose:  print out a counter value
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- * @link   http://www.smarty.net/manual/en/language.function.counter.php {counter}
- *         (Smarty online manual)
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-function smarty_function_counter($params, $template)
-{
-	static $counters = array();
-
-	$name = (isset($params['name'])) ? $params['name'] : 'default';
-	if (!isset($counters[$name])) {
-		$counters[$name] = array(
-			'start'     => 1,
-			'skip'      => 1,
-			'direction' => 'up',
-			'count'     => 1
-		);
-	}
-	$counter =& $counters[$name];
-
-	if (isset($params['start'])) {
-		$counter['start'] = $counter['count'] = (int)$params['start'];
-	}
-
-	if (!empty($params['assign'])) {
-		$counter['assign'] = $params['assign'];
-	}
-
-	if (isset($counter['assign'])) {
-		$template->assign($counter['assign'], $counter['count']);
-	}
-
-	if (isset($params['print'])) {
-		$print = (bool)$params['print'];
-	} else {
-		$print = empty($counter['assign']);
-	}
-
-	if ($print) {
-		$retval = $counter['count'];
-	} else {
-		$retval = null;
-	}
-
-	if (isset($params['skip'])) {
-		$counter['skip'] = $params['skip'];
-	}
-
-	if (isset($params['direction'])) {
-		$counter['direction'] = $params['direction'];
-	}
-
-	if ($counter['direction'] == "down") {
-		$counter['count'] -= $counter['skip'];
-	} else {
-		$counter['count'] += $counter['skip'];
-	}
-
-	return $retval;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.cycle.php b/lib/copy_this/www/lib/smarty/plugins/function.cycle.php
deleted file mode 100644
index d95e98430..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.cycle.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {cycle} function plugin
- * Type:     function<br>
- * Name:     cycle<br>
- * Date:     May 3, 2002<br>
- * Purpose:  cycle through given values<br>
- * Params:
- * <pre>
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- * </pre>
- * Examples:<br>
- * <pre>
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *           (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credit to Mark Priatel <mpriatel@rogers.com>
- * @author   credit to Gerard <gerard@interfold.com>
- * @author   credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version  1.3
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-
-function smarty_function_cycle($params, $template)
-{
-	static $cycle_vars;
-
-	$name = (empty($params['name'])) ? 'default' : $params['name'];
-	$print = (isset($params['print'])) ? (bool)$params['print'] : true;
-	$advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-	$reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
-
-	if (!isset($params['values'])) {
-		if (!isset($cycle_vars[$name]['values'])) {
-			trigger_error("cycle: missing 'values' parameter");
-
-			return;
-		}
-	} else {
-		if (isset($cycle_vars[$name]['values'])
-			&& $cycle_vars[$name]['values'] != $params['values']
-		) {
-			$cycle_vars[$name]['index'] = 0;
-		}
-		$cycle_vars[$name]['values'] = $params['values'];
-	}
-
-	if (isset($params['delimiter'])) {
-		$cycle_vars[$name]['delimiter'] = $params['delimiter'];
-	} elseif (!isset($cycle_vars[$name]['delimiter'])) {
-		$cycle_vars[$name]['delimiter'] = ',';
-	}
-
-	if (is_array($cycle_vars[$name]['values'])) {
-		$cycle_array = $cycle_vars[$name]['values'];
-	} else {
-		$cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']);
-	}
-
-	if (!isset($cycle_vars[$name]['index']) || $reset) {
-		$cycle_vars[$name]['index'] = 0;
-	}
-
-	if (isset($params['assign'])) {
-		$print = false;
-		$template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
-	}
-
-	if ($print) {
-		$retval = $cycle_array[$cycle_vars[$name]['index']];
-	} else {
-		$retval = null;
-	}
-
-	if ($advance) {
-		if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) {
-			$cycle_vars[$name]['index'] = 0;
-		} else {
-			$cycle_vars[$name]['index']++;
-		}
-	}
-
-	return $retval;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.fetch.php b/lib/copy_this/www/lib/smarty/plugins/function.fetch.php
deleted file mode 100644
index b1c7bdbf4..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.fetch.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {fetch} plugin
- * Type:     function<br>
- * Name:     fetch<br>
- * Purpose:  fetch file, web or ftp data and display results
- *
- * @link   http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
- *         (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
- * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
- */
-function smarty_function_fetch($params, $template)
-{
-	if (empty($params['file'])) {
-		trigger_error("[plugin] fetch parameter 'file' cannot be empty", E_USER_NOTICE);
-
-		return;
-	}
-
-	// strip file protocol
-	if (stripos($params['file'], 'file://') === 0) {
-		$params['file'] = substr($params['file'], 7);
-	}
-
-	$protocol = strpos($params['file'], '://');
-	if ($protocol !== false) {
-		$protocol = strtolower(substr($params['file'], 0, $protocol));
-	}
-
-	if (isset($template->smarty->security_policy)) {
-		if ($protocol) {
-			// remote resource (or php stream, …)
-			if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
-				return;
-			}
-		} else {
-			// local file
-			if (!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
-				return;
-			}
-		}
-	}
-
-	$content = '';
-	if ($protocol == 'http') {
-		// http fetch
-		if ($uri_parts = parse_url($params['file'])) {
-			// set defaults
-			$host = $server_name = $uri_parts['host'];
-			$timeout = 30;
-			$accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-			$agent = "Smarty Template Engine " . Smarty::SMARTY_VERSION;
-			$referer = "";
-			$uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
-			$uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
-			$_is_proxy = false;
-			if (empty($uri_parts['port'])) {
-				$port = 80;
-			} else {
-				$port = $uri_parts['port'];
-			}
-			if (!empty($uri_parts['user'])) {
-				$user = $uri_parts['user'];
-			}
-			if (!empty($uri_parts['pass'])) {
-				$pass = $uri_parts['pass'];
-			}
-			// loop through parameters, setup headers
-			foreach ($params as $param_key => $param_value) {
-				switch ($param_key) {
-					case "file":
-					case "assign":
-					case "assign_headers":
-						break;
-					case "user":
-						if (!empty($param_value)) {
-							$user = $param_value;
-						}
-						break;
-					case "pass":
-						if (!empty($param_value)) {
-							$pass = $param_value;
-						}
-						break;
-					case "accept":
-						if (!empty($param_value)) {
-							$accept = $param_value;
-						}
-						break;
-					case "header":
-						if (!empty($param_value)) {
-							if (!preg_match('![\w\d-]+: .+!', $param_value)) {
-								trigger_error("[plugin] invalid header format '" . $param_value . "'", E_USER_NOTICE);
-
-								return;
-							} else {
-								$extra_headers[] = $param_value;
-							}
-						}
-						break;
-					case "proxy_host":
-						if (!empty($param_value)) {
-							$proxy_host = $param_value;
-						}
-						break;
-					case "proxy_port":
-						if (!preg_match('!\D!', $param_value)) {
-							$proxy_port = (int)$param_value;
-						} else {
-							trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
-
-							return;
-						}
-						break;
-					case "agent":
-						if (!empty($param_value)) {
-							$agent = $param_value;
-						}
-						break;
-					case "referer":
-						if (!empty($param_value)) {
-							$referer = $param_value;
-						}
-						break;
-					case "timeout":
-						if (!preg_match('!\D!', $param_value)) {
-							$timeout = (int)$param_value;
-						} else {
-							trigger_error("[plugin] invalid value for attribute '" . $param_key . "'", E_USER_NOTICE);
-
-							return;
-						}
-						break;
-					default:
-						trigger_error("[plugin] unrecognized attribute '" . $param_key . "'", E_USER_NOTICE);
-
-						return;
-				}
-			}
-			if (!empty($proxy_host) && !empty($proxy_port)) {
-				$_is_proxy = true;
-				$fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
-			} else {
-				$fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
-			}
-
-			if (!$fp) {
-				trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
-
-				return;
-			} else {
-				if ($_is_proxy) {
-					fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
-				} else {
-					fputs($fp, "GET $uri HTTP/1.0\r\n");
-				}
-				if (!empty($host)) {
-					fputs($fp, "Host: $host\r\n");
-				}
-				if (!empty($accept)) {
-					fputs($fp, "Accept: $accept\r\n");
-				}
-				if (!empty($agent)) {
-					fputs($fp, "User-Agent: $agent\r\n");
-				}
-				if (!empty($referer)) {
-					fputs($fp, "Referer: $referer\r\n");
-				}
-				if (isset($extra_headers) && is_array($extra_headers)) {
-					foreach ($extra_headers as $curr_header) {
-						fputs($fp, $curr_header . "\r\n");
-					}
-				}
-				if (!empty($user) && !empty($pass)) {
-					fputs($fp, "Authorization: BASIC " . base64_encode("$user:$pass") . "\r\n");
-				}
-
-				fputs($fp, "\r\n");
-				while (!feof($fp)) {
-					$content .= fgets($fp, 4096);
-				}
-				fclose($fp);
-				$csplit = preg_split("!\r\n\r\n!", $content, 2);
-
-				$content = $csplit[1];
-
-				if (!empty($params['assign_headers'])) {
-					$template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0]));
-				}
-			}
-		} else {
-			trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
-
-			return;
-		}
-	} else {
-		$content = @file_get_contents($params['file']);
-		if ($content === false) {
-			throw new SmartyException("{fetch} cannot read resource '" . $params['file'] . "'");
-		}
-	}
-
-	if (!empty($params['assign'])) {
-		$template->assign($params['assign'], $content);
-	} else {
-		return $content;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_checkboxes.php b/lib/copy_this/www/lib/smarty/plugins/function.html_checkboxes.php
deleted file mode 100644
index 91ed7ee43..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_checkboxes.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_checkboxes} function plugin
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
- * Examples:
- * <pre>
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * Params:
- * <pre>
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
- *
- * @link       http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *             (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author     credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- *
- * @param array  $params   parameters
- * @param object $template template object
- *
- * @return string
- * @uses       smarty_function_escape_special_chars()
- */
-function smarty_function_html_checkboxes($params, $template)
-{
-	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-	$name = 'checkbox';
-	$values = null;
-	$options = null;
-	$selected = array();
-	$separator = '';
-	$escape = true;
-	$labels = true;
-	$label_ids = false;
-	$output = null;
-
-	$extra = '';
-
-	foreach ($params as $_key => $_val) {
-		switch ($_key) {
-			case 'name':
-			case 'separator':
-				$$_key = (string)$_val;
-				break;
-
-			case 'escape':
-			case 'labels':
-			case 'label_ids':
-				$$_key = (bool)$_val;
-				break;
-
-			case 'options':
-				$$_key = (array)$_val;
-				break;
-
-			case 'values':
-			case 'output':
-				$$_key = array_values((array)$_val);
-				break;
-
-			case 'checked':
-			case 'selected':
-				if (is_array($_val)) {
-					$selected = array();
-					foreach ($_val as $_sel) {
-						if (is_object($_sel)) {
-							if (method_exists($_sel, "__toString")) {
-								$_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
-							} else {
-								trigger_error("html_checkboxes: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
-								continue;
-							}
-						} else {
-							$_sel = smarty_function_escape_special_chars((string)$_sel);
-						}
-						$selected[$_sel] = true;
-					}
-				} elseif (is_object($_val)) {
-					if (method_exists($_val, "__toString")) {
-						$selected = smarty_function_escape_special_chars((string)$_val->__toString());
-					} else {
-						trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
-					}
-				} else {
-					$selected = smarty_function_escape_special_chars((string)$_val);
-				}
-				break;
-
-			case 'checkboxes':
-				trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
-				$options = (array)$_val;
-				break;
-
-			case 'assign':
-				break;
-
-			case 'strict':
-				break;
-
-			case 'disabled':
-			case 'readonly':
-				if (!empty($params['strict'])) {
-					if (!is_scalar($_val)) {
-						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
-					}
-
-					if ($_val === true || $_val === $_key) {
-						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-					}
-
-					break;
-				}
-			// omit break; to fall through!
-
-			default:
-				if (!is_array($_val)) {
-					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-				} else {
-					trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-				}
-				break;
-		}
-	}
-
-	if (!isset($options) && !isset($values)) {
-		return '';
-	} /* raise error here? */
-
-	$_html_result = array();
-
-	if (isset($options)) {
-		foreach ($options as $_key => $_val) {
-			$_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-		}
-	} else {
-		foreach ($values as $_i => $_key) {
-			$_val = isset($output[$_i]) ? $output[$_i] : '';
-			$_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-		}
-	}
-
-	if (!empty($params['assign'])) {
-		$template->assign($params['assign'], $_html_result);
-	} else {
-		return implode("\n", $_html_result);
-	}
-}
-
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape = true)
-{
-	$_output = '';
-
-	if (is_object($value)) {
-		if (method_exists($value, "__toString")) {
-			$value = (string)$value->__toString();
-		} else {
-			trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
-
-			return '';
-		}
-	} else {
-		$value = (string)$value;
-	}
-
-	if (is_object($output)) {
-		if (method_exists($output, "__toString")) {
-			$output = (string)$output->__toString();
-		} else {
-			trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE);
-
-			return '';
-		}
-	} else {
-		$output = (string)$output;
-	}
-
-	if ($labels) {
-		if ($label_ids) {
-			$_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
-			$_output .= '<label for="' . $_id . '">';
-		} else {
-			$_output .= '<label>';
-		}
-	}
-
-	$name = smarty_function_escape_special_chars($name);
-	$value = smarty_function_escape_special_chars($value);
-	if ($escape) {
-		$output = smarty_function_escape_special_chars($output);
-	}
-
-	$_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-
-	if ($labels && $label_ids) {
-		$_output .= ' id="' . $_id . '"';
-	}
-
-	if (is_array($selected)) {
-		if (isset($selected[$value])) {
-			$_output .= ' checked="checked"';
-		}
-	} elseif ($value === $selected) {
-		$_output .= ' checked="checked"';
-	}
-
-	$_output .= $extra . ' />' . $output;
-	if ($labels) {
-		$_output .= '</label>';
-	}
-
-	$_output .= $separator;
-
-	return $_output;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_image.php b/lib/copy_this/www/lib/smarty/plugins/function.html_image.php
deleted file mode 100644
index 0b9e03515..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_image.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_image} function plugin
- * Type:     function<br>
- * Name:     html_image<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  format HTML tags for the image<br>
- * Examples: {html_image file="/images/masthead.gif"}<br>
- * Output:   <img src="/images/masthead.gif" width=400 height=23><br>
- * Params:
- * <pre>
- * - file        - (required) - file (and path) of image
- * - height      - (optional) - image height (default actual height)
- * - width       - (optional) - image width (default actual width)
- * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
- * - path_prefix - prefix for path output (optional, default empty)
- * </pre>
- *
- * @link    http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *          (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- * @author  credits to Duda <duda@big.hu>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @throws SmartyException
- * @return string
- * @uses    smarty_function_escape_special_chars()
- */
-function smarty_function_html_image($params, $template)
-{
-	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-	$alt = '';
-	$file = '';
-	$height = '';
-	$width = '';
-	$extra = '';
-	$prefix = '';
-	$suffix = '';
-	$path_prefix = '';
-	$basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
-	foreach ($params as $_key => $_val) {
-		switch ($_key) {
-			case 'file':
-			case 'height':
-			case 'width':
-			case 'dpi':
-			case 'path_prefix':
-			case 'basedir':
-				$$_key = $_val;
-				break;
-
-			case 'alt':
-				if (!is_array($_val)) {
-					$$_key = smarty_function_escape_special_chars($_val);
-				} else {
-					throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-				}
-				break;
-
-			case 'link':
-			case 'href':
-				$prefix = '<a href="' . $_val . '">';
-				$suffix = '</a>';
-				break;
-
-			default:
-				if (!is_array($_val)) {
-					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-				} else {
-					throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-				}
-				break;
-		}
-	}
-
-	if (empty($file)) {
-		trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-
-		return;
-	}
-
-	if ($file[0] == '/') {
-		$_image_path = $basedir . $file;
-	} else {
-		$_image_path = $file;
-	}
-
-	// strip file protocol
-	if (stripos($params['file'], 'file://') === 0) {
-		$params['file'] = substr($params['file'], 7);
-	}
-
-	$protocol = strpos($params['file'], '://');
-	if ($protocol !== false) {
-		$protocol = strtolower(substr($params['file'], 0, $protocol));
-	}
-
-	if (isset($template->smarty->security_policy)) {
-		if ($protocol) {
-			// remote resource (or php stream, …)
-			if (!$template->smarty->security_policy->isTrustedUri($params['file'])) {
-				return;
-			}
-		} else {
-			// local file
-			if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
-				return;
-			}
-		}
-	}
-
-	if (!isset($params['width']) || !isset($params['height'])) {
-		// FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
-		if (!$_image_data = @getimagesize($_image_path)) {
-			if (!file_exists($_image_path)) {
-				trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-
-				return;
-			} elseif (!is_readable($_image_path)) {
-				trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-
-				return;
-			} else {
-				trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-
-				return;
-			}
-		}
-
-		if (!isset($params['width'])) {
-			$width = $_image_data[0];
-		}
-		if (!isset($params['height'])) {
-			$height = $_image_data[1];
-		}
-	}
-
-	if (isset($params['dpi'])) {
-		if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
-			// FIXME: (rodneyrehm) wrong dpi assumption
-			// don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
-			$dpi_default = 72;
-		} else {
-			$dpi_default = 96;
-		}
-		$_resize = $dpi_default / $params['dpi'];
-		$width = round($width * $_resize);
-		$height = round($height * $_resize);
-	}
-
-	return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_options.php b/lib/copy_this/www/lib/smarty/plugins/function.html_options.php
deleted file mode 100644
index 7ec3e065c..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_options.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_options} function plugin
- * Type:     function<br>
- * Name:     html_options<br>
- * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "select"
- * - values     (required) - if no options supplied) - array
- * - options    (required) - if no values supplied) - associative array
- * - selected   (optional) - string default not set
- * - output     (required) - if not options supplied) - array
- * - id         (optional) - string default not set
- * - class      (optional) - string default not set
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *           (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- *
- * @param array $params parameters
- *
- * @return string
- * @uses     smarty_function_escape_special_chars()
- */
-function smarty_function_html_options($params)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = null;
-    $output = null;
-    $id = null;
-    $class = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'class':
-            case 'id':
-                $$_key = (string) $_val;
-                break;
-
-            case 'options':
-                $options = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_options: selected attribute contains an object of class '" . get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[$_sel] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params['strict'])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = '';
-    $_idx = 0;
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    }
-
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
-        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-    }
-
-    return $_html_result;
-}
-
-function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
-{
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[$_key])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
-            $_html_result .= ' selected="selected"';
-        }
-        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, "__toString")) {
-                $value = smarty_function_escape_special_chars((string) $value->__toString());
-            } else {
-                trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
-
-                return '';
-            }
-        } else {
-            $value = smarty_function_escape_special_chars((string) $value);
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx ++;
-    } else {
-        $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null, $class, $_idx);
-        $idx ++;
-    }
-
-    return $_html_result;
-}
-
-function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
-{
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    }
-    $optgroup_html .= "</optgroup>\n";
-
-    return $optgroup_html;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_options_multiple.php b/lib/copy_this/www/lib/smarty/plugins/function.html_options_multiple.php
deleted file mode 100644
index 3446dd9a3..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_options_multiple.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-/**
- * Smarty {html_options_multiple} function plugin
- *
- * Type:     function<br>
- * Name:     html_options_multiple<br>
- * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "select"
- * - values     (required) - if no options supplied) - array
- * - options    (required) - if no values supplied) - associative array
- * - selected   (optional) - string default not set
- * - output     (required) - if not options supplied) - array
- * - id         (optional) - string default not set
- * - class      (optional) - string default not set
- * </pre>
- *
- * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_options_multiple($params, $template)
-{
-	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-	$name = null;
-	$values = null;
-	$options = null;
-	$selected = null;
-	$output = null;
-	$id = null;
-	$class = null;
-	$extra = '';
-	foreach ($params as $_key => $_val) {
-		switch ($_key) {
-			case 'name':
-			case 'class':
-			case 'id':
-				$$_key = (string) $_val;
-				break;
-			case 'options':
-				$options = (array) $_val;
-				break;
-			case 'values':
-			case 'output':
-				$$_key = array_values((array) $_val);
-				break;
-			case 'selected':
-				if (is_array($_val)) {
-					$selected = array();
-					foreach ($_val as $_sel) {
-						if (is_object($_sel)) {
-							if (method_exists($_sel, "__toString")) {
-								$_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-							} else {
-								trigger_error("html_options_multiple: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
-								continue;
-							}
-						} else {
-							$_sel = smarty_function_escape_special_chars((string) $_sel);
-						}
-						$selected[$_sel] = true;
-					}
-				} elseif (is_object($_val)) {
-					if (method_exists($_val, "__toString")) {
-						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
-					} else {
-						trigger_error("html_options_multiple: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
-					}
-				} else {
-					$selected = smarty_function_escape_special_chars((string) $_val);
-				}
-				break;
-			case 'strict': break;
-			case 'disabled':
-			case 'readonly':
-				if (!empty($params['strict'])) {
-					if (!is_scalar($_val)) {
-						trigger_error("html_options_multiple: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
-					}
-					if ($_val === true || $_val === $_key) {
-						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-					}
-					break;
-				}
-				// omit break; to fall through!
-			default:
-				if (!is_array($_val)) {
-					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-				} else {
-					trigger_error("html_options_multiple: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-				}
-				break;
-		}
-	}
-	if (!isset($options) && !isset($values)) {
-		/* raise error here? */
-		return '';
-	}
-	$_html_result = '';
-	$_idx = 0;
-	if (isset($options)) {
-		foreach ($options as $_key => $_val) {
-			$_html_result .= smarty_function_html_options_multiple_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-		}
-	} else {
-		foreach ($values as $_i => $_key) {
-			$_val = isset($output[$_i]) ? $output[$_i] : '';
-			$_html_result .= smarty_function_html_options_multiple_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-		}
-	}
-	if (!empty($name)) {
-		$_html_class = !empty($class) ? ' class="'.$class.'"' : '';
-		$_html_id = !empty($id) ? ' id="'.$id.'"' : '';
-		// the name needs to have [] added (this is html text [] not PHP, so that the return for the multiselect is an array
-		$_html_result = '<select multiple="multiple" name="' . $name . '[]"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-	}
-	return $_html_result;
-}
-function smarty_function_html_options_multiple_optoutput($key, $value, $selected, $id, $class, &$idx)
-{
-	if (!is_array($value)) {
-		$_key = smarty_function_escape_special_chars($key);
-		$_html_result = '<option value="' . $_key . '"';
-		if (is_array($selected)) {
-			if (isset($selected[$_key])) {
-				$_html_result .= ' selected="selected"';
-			}
-		} elseif ($_key === $selected) {
-			$_html_result .= ' selected="selected"';
-		}
-		$_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
-		$_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
-		if (is_object($value)) {
-			if (method_exists($value, "__toString")) {
-				$value = smarty_function_escape_special_chars((string) $value->__toString());
-			} else {
-				trigger_error("html_options_multiple: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
-				return '';
-			}
-		} else {
-			$value = smarty_function_escape_special_chars((string) $value);
-		}
-		$_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-		$idx++;
-	} else {
-		$_idx = 0;
-		$_html_result = smarty_function_html_options_multiple_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
-		$idx++;
-	}
-	return $_html_result;
-}
-function smarty_function_html_options_multiple_optgroup($key, $values, $selected, $id, $class, &$idx)
-{
-	$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-	foreach ($values as $key => $value) {
-		$optgroup_html .= smarty_function_html_options_multiple_optoutput($key, $value, $selected, $id, $class, $idx);
-	}
-	$optgroup_html .= "</optgroup>\n";
-	return $optgroup_html;
-}
-?>
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_radios.php b/lib/copy_this/www/lib/smarty/plugins/function.html_radios.php
deleted file mode 100644
index f121d5eae..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_radios.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_radios} function plugin
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
- * Examples:
- * <pre>
- * {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- *
- * @link    http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *          (Smarty online manual)
- * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author  credits to Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string
- * @uses    smarty_function_escape_special_chars()
- */
-function smarty_function_html_radios($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) . "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = (string) $_val;
-                }
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'radios':
-                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params['strict'])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute", E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        }
-    }
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
-}
-
-function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape)
-{
-    $_output = '';
-
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) . "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) . "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_select_date.php b/lib/copy_this/www/lib/smarty/plugins/function.html_select_date.php
deleted file mode 100644
index 693c3feee..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_select_date.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
-/**
- * Smarty {html_select_date} plugin
- * Type:     function<br>
- * Name:     html_select_date<br>
- * Purpose:  Prints the dropdowns for date selection.
- * ChangeLog:
- * <pre>
- *            - 1.0 initial release
- *            - 1.1 added support for +/- N syntax for begin
- *              and end year values. (Monte)
- *            - 1.2 added support for yyyy-mm-dd syntax for
- *              time value. (Jan Rosier)
- *            - 1.3 added support for choosing format for
- *              month values (Gary Loescher)
- *            - 1.3.1 added support for choosing format for
- *              day values (Marcus Bointon)
- *            - 1.3.2 support negative timestamps, force year
- *              dropdown to include given date unless explicitly set (Monte)
- *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
- *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,
- *              added attributes month_names, *_id
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
- *           (Smarty online manual)
- * @version  2.0
- * @author   Andrei Zmievski
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_html_select_date($params)
-{
-	// generate timestamps used for month names only
-	static $_month_timestamps = null;
-	static $_current_year = null;
-	if ($_month_timestamps === null) {
-		$_current_year = date('Y');
-		$_month_timestamps = array();
-		for ($i = 1; $i <= 12; $i++) {
-			$_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
-		}
-	}
-
-	/* Default values. */
-	$prefix = "Date_";
-	$start_year = null;
-	$end_year = null;
-	$display_days = true;
-	$display_months = true;
-	$display_years = true;
-	$month_format = "%B";
-	/* Write months as numbers by default  GL */
-	$month_value_format = "%m";
-	$day_format = "%02d";
-	/* Write day values using this format MB */
-	$day_value_format = "%d";
-	$year_as_text = false;
-	/* Display years in reverse order? Ie. 2000,1999,.... */
-	$reverse_years = false;
-	/* Should the select boxes be part of an array when returned from PHP?
-	   e.g. setting it to "birthday", would create "birthday[Day]",
-	   "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
-	$field_array = null;
-	/* <select size>'s of the different <select> tags.
-	   If not set, uses default dropdown. */
-	$day_size = null;
-	$month_size = null;
-	$year_size = null;
-	/* Unparsed attributes common to *ALL* the <select>/<input> tags.
-	   An example might be in the template: all_extra ='class ="foo"'. */
-	$all_extra = null;
-	/* Separate attributes for the tags. */
-	$day_extra = null;
-	$month_extra = null;
-	$year_extra = null;
-	/* Order in which to display the fields.
-	   "D" -> day, "M" -> month, "Y" -> year. */
-	$field_order = 'MDY';
-	/* String printed between the different fields. */
-	$field_separator = "\n";
-	$option_separator = "\n";
-	$time = null;
-	// $all_empty = null;
-	// $day_empty = null;
-	// $month_empty = null;
-	// $year_empty = null;
-	$extra_attrs = '';
-	$all_id = null;
-	$day_id = null;
-	$month_id = null;
-	$year_id = null;
-
-	foreach ($params as $_key => $_value) {
-		switch ($_key) {
-			case 'time':
-				if (!is_array($_value) && $_value !== null) {
-					$time = smarty_make_timestamp($_value);
-				}
-				break;
-
-			case 'month_names':
-				if (is_array($_value) && count($_value) == 12) {
-					$$_key = $_value;
-				} else {
-					trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
-				}
-				break;
-
-			case 'prefix':
-			case 'field_array':
-			case 'start_year':
-			case 'end_year':
-			case 'day_format':
-			case 'day_value_format':
-			case 'month_format':
-			case 'month_value_format':
-			case 'day_size':
-			case 'month_size':
-			case 'year_size':
-			case 'all_extra':
-			case 'day_extra':
-			case 'month_extra':
-			case 'year_extra':
-			case 'field_order':
-			case 'field_separator':
-			case 'option_separator':
-			case 'all_empty':
-			case 'month_empty':
-			case 'day_empty':
-			case 'year_empty':
-			case 'all_id':
-			case 'month_id':
-			case 'day_id':
-			case 'year_id':
-				$$_key = (string)$_value;
-				break;
-
-			case 'display_days':
-			case 'display_months':
-			case 'display_years':
-			case 'year_as_text':
-			case 'reverse_years':
-				$$_key = (bool)$_value;
-				break;
-
-			default:
-				if (!is_array($_value)) {
-					$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-				} else {
-					trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-				}
-				break;
-		}
-	}
-
-	// Note: date() is faster than strftime()
-	// Note: explode(date()) is faster than date() date() date()
-	if (isset($params['time']) && is_array($params['time'])) {
-		if (isset($params['time'][$prefix . 'Year'])) {
-			// $_REQUEST[$field_array] given
-			foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-				$_variableName = '_' . strtolower($_elementName);
-				$$_variableName = isset($params['time'][$prefix . $_elementName])
-					? $params['time'][$prefix . $_elementName]
-					: date($_elementKey);
-			}
-		} elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
-			// $_REQUEST given
-			foreach (array('Y' => 'Year', 'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-				$_variableName = '_' . strtolower($_elementName);
-				$$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-					? $params['time'][$field_array][$prefix . $_elementName]
-					: date($_elementKey);
-			}
-		} else {
-			// no date found, use NOW
-			list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-		}
-	} elseif ($time === null) {
-		if (array_key_exists('time', $params)) {
-			$_year = $_month = $_day = $time = null;
-		} else {
-			list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-		}
-	} else {
-		list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
-	}
-
-	// make syntax "+N" or "-N" work with $start_year and $end_year
-	// Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-	foreach (array('start', 'end') as $key) {
-		$key .= '_year';
-		$t = $$key;
-		if ($t === null) {
-			$$key = (int)$_current_year;
-		} elseif ($t[0] == '+') {
-			$$key = (int)($_current_year + (int)trim(substr($t, 1)));
-		} elseif ($t[0] == '-') {
-			$$key = (int)($_current_year - (int)trim(substr($t, 1)));
-		} else {
-			$$key = (int)$$key;
-		}
-	}
-
-	// flip for ascending or descending
-	if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-		$t = $end_year;
-		$end_year = $start_year;
-		$start_year = $t;
-	}
-
-	// generate year <select> or <input>
-	if ($display_years) {
-		$_extra = '';
-		$_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-		if ($all_extra) {
-			$_extra .= ' ' . $all_extra;
-		}
-		if ($year_extra) {
-			$_extra .= ' ' . $year_extra;
-		}
-
-		if ($year_as_text) {
-			$_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
-		} else {
-			$_html_years = '<select name="' . $_name . '"';
-			if ($year_id !== null || $all_id !== null) {
-				$_html_years .= ' id="' . smarty_function_escape_special_chars(
-						$year_id !== null ? ($year_id ? $year_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-					) . '"';
-			}
-			if ($year_size) {
-				$_html_years .= ' size="' . $year_size . '"';
-			}
-			$_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-
-			if (isset($year_empty) || isset($all_empty)) {
-				$_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' . $option_separator;
-			}
-
-			$op = $start_year > $end_year ? -1 : 1;
-			for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-				$_html_years .= '<option value="' . $i . '"'
-					. ($_year == $i ? ' selected="selected"' : '')
-					. '>' . $i . '</option>' . $option_separator;
-			}
-
-			$_html_years .= '</select>';
-		}
-	}
-
-	// generate month <select> or <input>
-	if ($display_months) {
-		$_extra = '';
-		$_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-		if ($all_extra) {
-			$_extra .= ' ' . $all_extra;
-		}
-		if ($month_extra) {
-			$_extra .= ' ' . $month_extra;
-		}
-
-		$_html_months = '<select name="' . $_name . '"';
-		if ($month_id !== null || $all_id !== null) {
-			$_html_months .= ' id="' . smarty_function_escape_special_chars(
-					$month_id !== null ? ($month_id ? $month_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-				) . '"';
-		}
-		if ($month_size) {
-			$_html_months .= ' size="' . $month_size . '"';
-		}
-		$_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-
-		if (isset($month_empty) || isset($all_empty)) {
-			$_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' . $option_separator;
-		}
-
-		for ($i = 1; $i <= 12; $i++) {
-			$_val = sprintf('%02d', $i);
-			$_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
-			$_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
-			$_html_months .= '<option value="' . $_value . '"'
-				. ($_val == $_month ? ' selected="selected"' : '')
-				. '>' . $_text . '</option>' . $option_separator;
-		}
-
-		$_html_months .= '</select>';
-	}
-
-	// generate day <select> or <input>
-	if ($display_days) {
-		$_extra = '';
-		$_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-		if ($all_extra) {
-			$_extra .= ' ' . $all_extra;
-		}
-		if ($day_extra) {
-			$_extra .= ' ' . $day_extra;
-		}
-
-		$_html_days = '<select name="' . $_name . '"';
-		if ($day_id !== null || $all_id !== null) {
-			$_html_days .= ' id="' . smarty_function_escape_special_chars(
-					$day_id !== null ? ($day_id ? $day_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-				) . '"';
-		}
-		if ($day_size) {
-			$_html_days .= ' size="' . $day_size . '"';
-		}
-		$_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-
-		if (isset($day_empty) || isset($all_empty)) {
-			$_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' . $option_separator;
-		}
-
-		for ($i = 1; $i <= 31; $i++) {
-			$_val = sprintf('%02d', $i);
-			$_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-			$_value = $day_value_format == '%02d' ? $_val : sprintf($day_value_format, $i);
-			$_html_days .= '<option value="' . $_value . '"'
-				. ($_val == $_day ? ' selected="selected"' : '')
-				. '>' . $_text . '</option>' . $option_separator;
-		}
-
-		$_html_days .= '</select>';
-	}
-
-	// order the fields for output
-	$_html = '';
-	for ($i = 0; $i <= 2; $i++) {
-		switch ($field_order[$i]) {
-			case 'Y':
-			case 'y':
-				if (isset($_html_years)) {
-					if ($_html) {
-						$_html .= $field_separator;
-					}
-					$_html .= $_html_years;
-				}
-				break;
-
-			case 'm':
-			case 'M':
-				if (isset($_html_months)) {
-					if ($_html) {
-						$_html .= $field_separator;
-					}
-					$_html .= $_html_months;
-				}
-				break;
-
-			case 'd':
-			case 'D':
-				if (isset($_html_days)) {
-					if ($_html) {
-						$_html .= $field_separator;
-					}
-					$_html .= $_html_days;
-				}
-				break;
-		}
-	}
-
-	return $_html;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_select_time.php b/lib/copy_this/www/lib/smarty/plugins/function.html_select_time.php
deleted file mode 100644
index 9af6aad5b..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_select_time.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
-/**
- * Smarty {html_select_time} function plugin
- * Type:     function<br>
- * Name:     html_select_time<br>
- * Purpose:  Prints the dropdowns for time selection
- *
- * @link     http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
- *           (Smarty online manual)
- * @author   Roberto Berto <roberto@berto.net>
- * @author   Monte Ohrt <monte AT ohrt DOT com>
- *
- * @param array $params parameters
- *
- * @return string
- * @uses     smarty_make_timestamp()
- */
-function smarty_function_html_select_time($params)
-{
-    $prefix = "Time_";
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-
-    $display_hours = true;
-    $display_minutes = true;
-    $display_seconds = true;
-    $display_meridian = true;
-
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-
-    $use_24_hours = true;
-    $minute_interval = 1;
-    $second_interval = 1;
-
-    $extra_attrs = '';
-    $all_extra = null;
-    $hour_extra = null;
-    $minute_extra = null;
-    $second_extra = null;
-    $meridian_extra = null;
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-
-            case 'prefix':
-            case 'field_array':
-
-            case 'field_separator':
-            case 'option_separator':
-
-            case 'all_extra':
-            case 'hour_extra':
-            case 'minute_extra':
-            case 'second_extra':
-            case 'meridian_extra':
-
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
-                $$_key = (string) $_value;
-                break;
-
-            case 'display_hours':
-            case 'display_minutes':
-            case 'display_seconds':
-            case 'display_meridian':
-            case 'use_24_hours':
-                $$_key = (bool) $_value;
-                break;
-
-            case 'minute_interval':
-            case 'second_interval':
-
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
-                $$_key = (int) $_value;
-                break;
-
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Hour'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
-            // $_REQUEST given
-            foreach (array('H' => 'Hour', 'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_hour = $_minute = $_second = $time = null;
-        } else {
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-        }
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-
-    // generate hour <select>
-    if ($display_hours) {
-        $_html_hours = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($hour_extra) {
-            $_extra .= ' ' . $hour_extra;
-        }
-
-        $_html_hours = '<select name="' . $_name . '"';
-        if ($hour_id !== null || $all_id !== null) {
-            $_html_hours .= ' id="' . smarty_function_escape_special_chars(
-                    $hour_id !== null ? ($hour_id ? $hour_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($hour_size) {
-            $_html_hours .= ' size="' . $hour_size . '"';
-        }
-        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i = $start; $i <= $end; $i ++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
-
-            if (!$use_24_hours) {
-                $_hour12 = $_hour == 0
-                    ? 12
-                    : ($_hour <= 12 ? $_hour : $_hour - 12);
-            }
-
-            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
-            $_html_hours .= '<option value="' . $_value . '"'
-                . ($selected ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_hours .= '</select>';
-    }
-
-    // generate minute <select>
-    if ($display_minutes) {
-        $_html_minutes = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($minute_extra) {
-            $_extra .= ' ' . $minute_extra;
-        }
-
-        $_html_minutes = '<select name="' . $_name . '"';
-        if ($minute_id !== null || $all_id !== null) {
-            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                    $minute_id !== null ? ($minute_id ? $minute_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($minute_size) {
-            $_html_minutes .= ' size="' . $minute_size . '"';
-        }
-        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i = 0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_minutes .= '</select>';
-    }
-
-    // generate second <select>
-    if ($display_seconds) {
-        $_html_seconds = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($second_extra) {
-            $_extra .= ' ' . $second_extra;
-        }
-
-        $_html_seconds = '<select name="' . $_name . '"';
-        if ($second_id !== null || $all_id !== null) {
-            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                    $second_id !== null ? ($second_id ? $second_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($second_size) {
-            $_html_seconds .= ' size="' . $second_size . '"';
-        }
-        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i = 0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_seconds .= '</select>';
-    }
-
-    // generate meridian <select>
-    if ($display_meridian && !$use_24_hours) {
-        $_html_meridian = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($meridian_extra) {
-            $_extra .= ' ' . $meridian_extra;
-        }
-
-        $_html_meridian = '<select name="' . $_name . '"';
-        if ($meridian_id !== null || $all_id !== null) {
-            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                    $meridian_id !== null ? ($meridian_id ? $meridian_id : $_name) : ($all_id ? ($all_id . $_name) : $_name)
-                ) . '"';
-        }
-        if ($meridian_size) {
-            $_html_meridian .= ' size="' . $meridian_size . '"';
-        }
-        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) . '</option>' . $option_separator;
-        }
-
-        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') . '>AM</option>' . $option_separator
-            . '<option value="pm"' . ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator
-            . '</select>';
-    }
-
-    $_html = '';
-    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-
-    return $_html;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.html_table.php b/lib/copy_this/www/lib/smarty/plugins/function.html_table.php
deleted file mode 100644
index 1870b5d0e..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.html_table.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_table} function plugin
- * Type:     function<br>
- * Name:     html_table<br>
- * Date:     Feb 17, 2003<br>
- * Purpose:  make an html table from an array of data<br>
- * Params:
- * <pre>
- * - loop       - array to loop through
- * - cols       - number of columns, comma separated list of column names
- *                or array of column names
- * - rows       - number of rows
- * - table_attr - table attributes
- * - th_attr    - table heading attributes (arrays are cycled)
- * - tr_attr    - table row attributes (arrays are cycled)
- * - td_attr    - table cell attributes (arrays are cycled)
- * - trailpad   - value to pad trailing cells with
- * - caption    - text for caption element
- * - vdir       - vertical direction (default: "down", means top-to-bottom)
- * - hdir       - horizontal direction (default: "right", means left-to-right)
- * - inner      - inner loop (default "cols": print $loop line by line,
- *                $loop will be printed column by column otherwise)
- * </pre>
- * Examples:
- * <pre>
- * {table loop=$data}
- * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
- * {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
- *
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author   credit to boots <boots dot smarty at yahoo dot com>
- * @version  1.1
- * @link     http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *           (Smarty online manual)
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_html_table($params)
-{
-	$table_attr = 'border="1"';
-	$tr_attr = '';
-	$th_attr = '';
-	$td_attr = '';
-	$cols = $cols_count = 3;
-	$rows = 3;
-	$trailpad = '&nbsp;';
-	$vdir = 'down';
-	$hdir = 'right';
-	$inner = 'cols';
-	$caption = '';
-	$loop = null;
-
-	if (!isset($params['loop'])) {
-		trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
-
-		return;
-	}
-
-	foreach ($params as $_key => $_value) {
-		switch ($_key) {
-			case 'loop':
-				$$_key = (array)$_value;
-				break;
-
-			case 'cols':
-				if (is_array($_value) && !empty($_value)) {
-					$cols = $_value;
-					$cols_count = count($_value);
-				} elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-					$cols = explode(',', $_value);
-					$cols_count = count($cols);
-				} elseif (!empty($_value)) {
-					$cols_count = (int)$_value;
-				} else {
-					$cols_count = $cols;
-				}
-				break;
-
-			case 'rows':
-				$$_key = (int)$_value;
-				break;
-
-			case 'table_attr':
-			case 'trailpad':
-			case 'hdir':
-			case 'vdir':
-			case 'inner':
-			case 'caption':
-				$$_key = (string)$_value;
-				break;
-
-			case 'tr_attr':
-			case 'td_attr':
-			case 'th_attr':
-				$$_key = $_value;
-				break;
-		}
-	}
-
-	$loop_count = count($loop);
-	if (empty($params['rows'])) {
-		/* no rows specified */
-		$rows = ceil($loop_count / $cols_count);
-	} elseif (empty($params['cols'])) {
-		if (!empty($params['rows'])) {
-			/* no cols specified, but rows */
-			$cols_count = ceil($loop_count / $rows);
-		}
-	}
-
-	$output = "<table $table_attr>\n";
-
-	if (!empty($caption)) {
-		$output .= '<caption>' . $caption . "</caption>\n";
-	}
-
-	if (is_array($cols)) {
-		$cols = ($hdir == 'right') ? $cols : array_reverse($cols);
-		$output .= "<thead><tr>\n";
-
-		for ($r = 0; $r < $cols_count; $r++) {
-			$output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-			$output .= $cols[$r];
-			$output .= "</th>\n";
-		}
-		$output .= "</tr></thead>\n";
-	}
-
-	$output .= "<tbody>\n";
-	for ($r = 0; $r < $rows; $r++) {
-		$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-		$rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-
-		for ($c = 0; $c < $cols_count; $c++) {
-			$x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-			if ($inner != 'cols') {
-				/* shuffle x to loop over rows*/
-				$x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-			}
-
-			if ($x < $loop_count) {
-				$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
-			} else {
-				$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-			}
-		}
-		$output .= "</tr>\n";
-	}
-	$output .= "</tbody>\n";
-	$output .= "</table>\n";
-
-	return $output;
-}
-
-function smarty_function_html_table_cycle($name, $var, $no)
-{
-	if (!is_array($var)) {
-		$ret = $var;
-	} else {
-		$ret = $var[$no % count($var)];
-	}
-
-	return ($ret) ? ' ' . $ret : '';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.mailto.php b/lib/copy_this/www/lib/smarty/plugins/function.mailto.php
deleted file mode 100644
index 02bca7bb2..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.mailto.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {mailto} function plugin
- * Type:     function<br>
- * Name:     mailto<br>
- * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.<br>
- * Params:
- * <pre>
- * - address    - (required) - e-mail address
- * - text       - (optional) - text to display, default is address
- * - encode     - (optional) - can be one of:
- *                             * none : no encoding (default)
- *                             * javascript : encode with javascript
- *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexidecimal (no javascript)
- * - cc         - (optional) - address(es) to carbon copy
- * - bcc        - (optional) - address(es) to blind carbon copy
- * - subject    - (optional) - e-mail subject
- * - newsgroups - (optional) - newsgroup(s) to post to
- * - followupto - (optional) - address(es) to follow up to
- * - extra      - (optional) - extra tags for the href link
- * </pre>
- * Examples:
- * <pre>
- * {mailto address="me@domain.com"}
- * {mailto address="me@domain.com" encode="javascript"}
- * {mailto address="me@domain.com" encode="hex"}
- * {mailto address="me@domain.com" subject="Hello to you!"}
- * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
- * {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
- *
- * @link     http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *           (Smarty online manual)
- * @version  1.2
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
- *
- * @param array $params parameters
- *
- * @return string
- */
-function smarty_function_mailto($params)
-{
-	static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
-	$extra = '';
-
-	if (empty($params['address'])) {
-		trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
-
-		return;
-	} else {
-		$address = $params['address'];
-	}
-
-	$text = $address;
-	// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
-	// so, don't encode it.
-	$search = array('%40', '%2C');
-	$replace = array('@', ',');
-	$mail_parms = array();
-	foreach ($params as $var => $value) {
-		switch ($var) {
-			case 'cc':
-			case 'bcc':
-			case 'followupto':
-				if (!empty($value)) {
-					$mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
-				}
-				break;
-
-			case 'subject':
-			case 'newsgroups':
-				$mail_parms[] = $var . '=' . rawurlencode($value);
-				break;
-
-			case 'extra':
-			case 'text':
-				$$var = $value;
-
-			default:
-		}
-	}
-
-	if ($mail_parms) {
-		$address .= '?' . join('&', $mail_parms);
-	}
-
-	$encode = (empty($params['encode'])) ? 'none' : $params['encode'];
-	if (!isset($_allowed_encoding[$encode])) {
-		trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
-
-		return;
-	}
-	// FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
-	if ($encode == 'javascript') {
-		$string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-
-		$js_encode = '';
-		for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
-			$js_encode .= '%' . bin2hex($string[$x]);
-		}
-
-		return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-	} elseif ($encode == 'javascript_charcode') {
-		$string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-		for ($x = 0, $y = strlen($string); $x < $y; $x++) {
-			$ord[] = ord($string[$x]);
-		}
-
-		$_ret = "<script type=\"text/javascript\" language=\"javascript\">\n"
-			. "{document.write(String.fromCharCode("
-			. implode(',', $ord)
-			. "))"
-			. "}\n"
-			. "</script>\n";
-
-		return $_ret;
-	} elseif ($encode == 'hex') {
-		preg_match('!^(.*)(\?.*)$!', $address, $match);
-		if (!empty($match[2])) {
-			trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
-
-			return;
-		}
-		$address_encode = '';
-		for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
-			if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
-				$address_encode .= '%' . bin2hex($address[$x]);
-			} else {
-				$address_encode .= $address[$x];
-			}
-		}
-		$text_encode = '';
-		for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
-			$text_encode .= '&#x' . bin2hex($text[$x]) . ';';
-		}
-
-		$mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-
-		return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
-	} else {
-		// no encoding
-		return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/function.math.php b/lib/copy_this/www/lib/smarty/plugins/function.math.php
deleted file mode 100644
index eca94c18d..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/function.math.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * This plugin is only for Smarty2 BC
- *
- * @package    Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {math} function plugin
- * Type:     function<br>
- * Name:     math<br>
- * Purpose:  handle math computations in template
- *
- * @link     http://www.smarty.net/manual/en/language.function.math.php {math}
- *           (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- *
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- *
- * @return string|null
- */
-function smarty_function_math($params, $template)
-{
-	static $_allowed_funcs = array(
-		'int'  => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
-		'log'  => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
-		'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true, 'tan' => true
-	);
-	// be sure equation parameter is present
-	if (empty($params['equation'])) {
-		trigger_error("math: missing equation parameter", E_USER_WARNING);
-
-		return;
-	}
-
-	$equation = $params['equation'];
-
-	// make sure parenthesis are balanced
-	if (substr_count($equation, "(") != substr_count($equation, ")")) {
-		trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
-
-		return;
-	}
-
-	// match all vars in equation, make sure all are passed
-	preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!", $equation, $match);
-
-	foreach ($match[1] as $curr_var) {
-		if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
-			trigger_error("math: function call $curr_var not allowed", E_USER_WARNING);
-
-			return;
-		}
-	}
-
-	foreach ($params as $key => $val) {
-		if ($key != "equation" && $key != "format" && $key != "assign") {
-			// make sure value is not empty
-			if (strlen($val) == 0) {
-				trigger_error("math: parameter $key is empty", E_USER_WARNING);
-
-				return;
-			}
-			if (!is_numeric($val)) {
-				trigger_error("math: parameter $key: is not numeric", E_USER_WARNING);
-
-				return;
-			}
-			$equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
-		}
-	}
-	$smarty_math_result = null;
-	eval("\$smarty_math_result = " . $equation . ";");
-
-	if (empty($params['format'])) {
-		if (empty($params['assign'])) {
-			return $smarty_math_result;
-		} else {
-			$template->assign($params['assign'], $smarty_math_result);
-		}
-	} else {
-		if (empty($params['assign'])) {
-			printf($params['format'], $smarty_math_result);
-		} else {
-			$template->assign($params['assign'], sprintf($params['format'], $smarty_math_result));
-		}
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.capitalize.php b/lib/copy_this/www/lib/smarty/plugins/modifier.capitalize.php
deleted file mode 100644
index 728766e11..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.capitalize.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty capitalize modifier plugin
- * Type:     modifier<br>
- * Name:     capitalize<br>
- * Purpose:  capitalize words in the string
- * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
- *
- * @param string  $string    string to capitalize
- * @param boolean $uc_digits also capitalize "x123" to "X123"
- * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
- *
- * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Rodney Rehm
- */
-function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
-{
-	if (Smarty::$_MBSTRING) {
-		if ($lc_rest) {
-			// uppercase (including hyphenated words)
-			$upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
-		} else {
-			// uppercase word breaks
-			$upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert_cb', $string);
-		}
-		// check uc_digits case
-		if (!$uc_digits) {
-			if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-				foreach ($matches[1] as $match) {
-					$upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
-				}
-			}
-		}
-		$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_mbconvert2_cb', $upper_string);
-
-		return $upper_string;
-	}
-
-	// lowercase first
-	if ($lc_rest) {
-		$string = strtolower($string);
-	}
-	// uppercase (including hyphenated words)
-	$upper_string = preg_replace_callback("!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst_cb', $string);
-	// check uc_digits case
-	if (!$uc_digits) {
-		if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-			foreach ($matches[1] as $match) {
-				$upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
-			}
-		}
-	}
-	$upper_string = preg_replace_callback("!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER, 'smarty_mod_cap_ucfirst2_cb', $upper_string);
-
-	return $upper_string;
-}
-
-/*
- *
- * Bug: create_function() use exhausts memory when used in long loops
- * Fix: use declared functions for callbacks instead of using create_function()
- * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
- *
- * @author Kyle Renfrow
- */
-function smarty_mod_cap_mbconvert_cb($matches)
-{
-	return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-function smarty_mod_cap_mbconvert2_cb($matches)
-{
-	return stripslashes($matches[1]) . mb_convert_case(stripslashes($matches[3]), MB_CASE_UPPER, Smarty::$_CHARSET);
-}
-
-function smarty_mod_cap_ucfirst_cb($matches)
-{
-	return stripslashes($matches[1]) . ucfirst(stripslashes($matches[2]));
-}
-
-function smarty_mod_cap_ucfirst2_cb($matches)
-{
-	return stripslashes($matches[1]) . ucfirst(stripslashes($matches[3]));
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.date_format.php b/lib/copy_this/www/lib/smarty/plugins/modifier.date_format.php
deleted file mode 100644
index c5fcf5ae4..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.date_format.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty date_format modifier plugin
- * Type:     modifier<br>
- * Name:     date_format<br>
- * Purpose:  format datestamps via strftime<br>
- * Input:<br>
- *          - string: input date string
- *          - format: strftime format for output
- *          - default_date: default date if $string is empty
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input date string
- * @param string $format       strftime format for output
- * @param string $default_date default date if $string is empty
- * @param string $formatter    either 'strftime' or 'auto'
- *
- * @return string |void
- * @uses   smarty_make_timestamp()
- */
-function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
-{
-	if ($format === null) {
-		$format = Smarty::$_DATE_FORMAT;
-	}
-	/**
-	 * Include the {@link shared.make_timestamp.php} plugin
-	 */
-	require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-	if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
-		$timestamp = smarty_make_timestamp($string);
-	} elseif ($default_date != '') {
-		$timestamp = smarty_make_timestamp($default_date);
-	} else {
-		return;
-	}
-	if ($formatter == 'strftime' || ($formatter == 'auto' && strpos($format, '%') !== false)) {
-		if (DS == '\\') {
-			$_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
-			$_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
-			if (strpos($format, '%e') !== false) {
-				$_win_from[] = '%e';
-				$_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-			}
-			if (strpos($format, '%l') !== false) {
-				$_win_from[] = '%l';
-				$_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-			}
-			$format = str_replace($_win_from, $_win_to, $format);
-		}
-
-		return strftime($format, $timestamp);
-	} else {
-		return date($format, $timestamp);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.debug_print_var.php b/lib/copy_this/www/lib/smarty/plugins/modifier.debug_print_var.php
deleted file mode 100644
index b8f3742b8..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.debug_print_var.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Debug
- */
-
-/**
- * Smarty debug_print_var modifier plugin
- * Type:     modifier<br>
- * Name:     debug_print_var<br>
- * Purpose:  formats variable contents for display in the console
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param array|object $var    variable to be formatted
- * @param integer      $depth  maximum recursion depth if $var is an array
- * @param integer      $length maximum string length if $var is a string
- *
- * @return string
- */
-function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
-{
-	$_replace = array("\n" => '<i>\n</i>',
-					  "\r" => '<i>\r</i>',
-					  "\t" => '<i>\t</i>'
-	);
-
-	switch (gettype($var)) {
-		case 'array' :
-			$results = '<b>Array (' . count($var) . ')</b>';
-			foreach ($var as $curr_key => $curr_val) {
-				$results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-					. '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-					. smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-				$depth--;
-			}
-			break;
-
-		case 'object' :
-			$object_vars = get_object_vars($var);
-			$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-			foreach ($object_vars as $curr_key => $curr_val) {
-				$results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-					. '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-					. smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-				$depth--;
-			}
-			break;
-
-		case 'boolean' :
-		case 'NULL' :
-		case 'resource' :
-			if (true === $var) {
-				$results = 'true';
-			} elseif (false === $var) {
-				$results = 'false';
-			} elseif (null === $var) {
-				$results = 'null';
-			} else {
-				$results = htmlspecialchars((string)$var);
-			}
-			$results = '<i>' . $results . '</i>';
-			break;
-
-		case 'integer' :
-		case 'float' :
-			$results = htmlspecialchars((string)$var);
-			break;
-
-		case 'string' :
-			$results = strtr($var, $_replace);
-			if (Smarty::$_MBSTRING) {
-				if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
-					$results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
-				}
-			} else {
-				if (isset($var[$length])) {
-					$results = substr($var, 0, $length - 3) . '...';
-				}
-			}
-
-			$results = htmlspecialchars('"' . $results . '"');
-			break;
-
-		case 'unknown type' :
-		default :
-			$results = strtr((string)$var, $_replace);
-			if (Smarty::$_MBSTRING) {
-				if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
-					$results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
-				}
-			} else {
-				if (strlen($results) > $length) {
-					$results = substr($results, 0, $length - 3) . '...';
-				}
-			}
-
-			$results = htmlspecialchars($results);
-	}
-
-	return $results;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.escape.php b/lib/copy_this/www/lib/smarty/plugins/modifier.escape.php
deleted file mode 100644
index 315ce20f7..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.escape.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty escape modifier plugin
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  escape string for output
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string        input string
- * @param string  $esc_type      escape type
- * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
- * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
- *
- * @return string escaped input string
- */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
-{
-	static $_double_encode = null;
-	if ($_double_encode === null) {
-		$_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-	}
-
-	if (!$char_set) {
-		$char_set = Smarty::$_CHARSET;
-	}
-
-	switch ($esc_type) {
-		case 'html':
-			if ($_double_encode) {
-				// php >=5.3.2 - go native
-				return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-			} else {
-				if ($double_encode) {
-					// php <5.2.3 - only handle double encoding
-					return htmlspecialchars($string, ENT_QUOTES, $char_set);
-				} else {
-					// php <5.2.3 - prevent double encoding
-					$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-					$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-					$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
-					return $string;
-				}
-			}
-
-		case 'htmlall':
-			if (Smarty::$_MBSTRING) {
-				// mb_convert_encoding ignores htmlspecialchars()
-				if ($_double_encode) {
-					// php >=5.3.2 - go native
-					$string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-				} else {
-					if ($double_encode) {
-						// php <5.2.3 - only handle double encoding
-						$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-					} else {
-						// php <5.2.3 - prevent double encoding
-						$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-						$string = htmlspecialchars($string, ENT_QUOTES, $char_set);
-						$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
-						return $string;
-					}
-				}
-
-				// htmlentities() won't convert everything, so use mb_convert_encoding
-				return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
-			}
-
-			// no MBString fallback
-			if ($_double_encode) {
-				return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-			} else {
-				if ($double_encode) {
-					return htmlentities($string, ENT_QUOTES, $char_set);
-				} else {
-					$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-					$string = htmlentities($string, ENT_QUOTES, $char_set);
-					$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-
-					return $string;
-				}
-			}
-
-		case 'url':
-			return rawurlencode($string);
-
-		case 'urlpathinfo':
-			return str_replace('%2F', '/', rawurlencode($string));
-
-		case 'quotes':
-			// escape unescaped single quotes
-			return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-
-		case 'hex':
-			// escape every byte into hex
-			// Note that the UTF-8 encoded character ä will be represented as %c3%a4
-			$return = '';
-			$_length = strlen($string);
-			for ($x = 0; $x < $_length; $x++) {
-				$return .= '%' . bin2hex($string[$x]);
-			}
-
-			return $return;
-
-		case 'hexentity':
-			$return = '';
-			if (Smarty::$_MBSTRING) {
-				require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-				$return = '';
-				foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-					$return .= '&#x' . strtoupper(dechex($unicode)) . ';';
-				}
-
-				return $return;
-			}
-			// no MBString fallback
-			$_length = strlen($string);
-			for ($x = 0; $x < $_length; $x++) {
-				$return .= '&#x' . bin2hex($string[$x]) . ';';
-			}
-
-			return $return;
-
-		case 'decentity':
-			$return = '';
-			if (Smarty::$_MBSTRING) {
-				require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-				$return = '';
-				foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-					$return .= '&#' . $unicode . ';';
-				}
-
-				return $return;
-			}
-			// no MBString fallback
-			$_length = strlen($string);
-			for ($x = 0; $x < $_length; $x++) {
-				$return .= '&#' . ord($string[$x]) . ';';
-			}
-
-			return $return;
-
-		case 'javascript':
-			// escape quotes and backslashes, newlines, etc.
-			return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/'));
-
-		case 'mail':
-			if (Smarty::$_MBSTRING) {
-				require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
-				return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-			}
-
-			// no MBString fallback
-			return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-
-		case 'nonstd':
-			// escape non-standard chars, such as ms document quotes
-			$return = '';
-			if (Smarty::$_MBSTRING) {
-				require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-				foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-					if ($unicode >= 126) {
-						$return .= '&#' . $unicode . ';';
-					} else {
-						$return .= chr($unicode);
-					}
-				}
-
-				return $return;
-			}
-
-			$_length = strlen($string);
-			for ($_i = 0; $_i < $_length; $_i++) {
-				$_ord = ord(substr($string, $_i, 1));
-				// non-standard char, escape it
-				if ($_ord >= 126) {
-					$return .= '&#' . $_ord . ';';
-				} else {
-					$return .= substr($string, $_i, 1);
-				}
-			}
-
-			return $return;
-
-		default:
-			return $string;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.regex_replace.php b/lib/copy_this/www/lib/smarty/plugins/modifier.regex_replace.php
deleted file mode 100644
index 6150718e8..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.regex_replace.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty regex_replace modifier plugin
- * Type:     modifier<br>
- * Name:     regex_replace<br>
- * Purpose:  regular expression search/replace
- *
- * @link    http://smarty.php.net/manual/en/language.modifier.regex.replace.php
- *          regex_replace (Smarty online manual)
- * @author  Monte Ohrt <monte at ohrt dot com>
- *
- * @param string       $string  input string
- * @param string|array $search  regular expression(s) to search for
- * @param string|array $replace string(s) that should be replaced
- *
- * @return string
- */
-function smarty_modifier_regex_replace($string, $search, $replace)
-{
-	if (is_array($search)) {
-		foreach ($search as $idx => $s) {
-			$search[$idx] = _smarty_regex_replace_check($s);
-		}
-	} else {
-		$search = _smarty_regex_replace_check($search);
-	}
-
-	return preg_replace($search, $replace, $string);
-}
-
-/**
- * @param  string $search string(s) that should be replaced
- *
- * @return string
- * @ignore
- */
-function _smarty_regex_replace_check($search)
-{
-	// null-byte injection detection
-	// anything behind the first null-byte is ignored
-	if (($pos = strpos($search, "\0")) !== false) {
-		$search = substr($search, 0, $pos);
-	}
-	// remove eval-modifier from $search
-	if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-		$search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
-	}
-
-	return $search;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.replace.php b/lib/copy_this/www/lib/smarty/plugins/modifier.replace.php
deleted file mode 100644
index da11a19e7..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.replace.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty replace modifier plugin
- * Type:     modifier<br>
- * Name:     replace<br>
- * Purpose:  simple search/replace
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param string $string  input string
- * @param string $search  text to search for
- * @param string $replace replacement text
- *
- * @return string
- */
-function smarty_modifier_replace($string, $search, $replace)
-{
-	if (Smarty::$_MBSTRING) {
-		require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-
-		return smarty_mb_str_replace($search, $replace, $string);
-	}
-
-	return str_replace($search, $replace, $string);
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.spacify.php b/lib/copy_this/www/lib/smarty/plugins/modifier.spacify.php
deleted file mode 100644
index e5c41ad8b..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.spacify.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty spacify modifier plugin
- * Type:     modifier<br>
- * Name:     spacify<br>
- * Purpose:  add spaces between characters in a string
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string $string       input string
- * @param string $spacify_char string to insert between characters.
- *
- * @return string
- */
-function smarty_modifier_spacify($string, $spacify_char = ' ')
-{
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, - 1, PREG_SPLIT_NO_EMPTY));
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifier.truncate.php b/lib/copy_this/www/lib/smarty/plugins/modifier.truncate.php
deleted file mode 100644
index ca83129f2..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifier.truncate.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty truncate modifier plugin
- * Type:     modifier<br>
- * Name:     truncate<br>
- * Purpose:  Truncate a string to a certain length if necessary,
- *               optionally splitting in the middle of a word, and
- *               appending the $etc string or inserting $etc into the middle.
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- *
- * @param string  $string      input string
- * @param integer $length      length of truncated text
- * @param string  $etc         end string
- * @param boolean $break_words truncate at word boundary
- * @param boolean $middle      truncate in the middle of text
- *
- * @return string truncated string
- */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
-{
-	if ($length == 0) {
-		return '';
-	}
-
-	if (Smarty::$_MBSTRING) {
-		if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
-			$length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
-			if (!$break_words && !$middle) {
-				$string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
-			}
-			if (!$middle) {
-				return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
-			}
-
-			return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
-		}
-
-		return $string;
-	}
-
-	// no MBString fallback
-	if (isset($string[$length])) {
-		$length -= min($length, strlen($etc));
-		if (!$break_words && !$middle) {
-			$string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-		}
-		if (!$middle) {
-			return substr($string, 0, $length) . $etc;
-		}
-
-		return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
-	}
-
-	return $string;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.cat.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.cat.php
deleted file mode 100644
index 6ddb7f0f6..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.cat.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty cat modifier plugin
- * Type:     modifier<br>
- * Name:     cat<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  catenate a value to a variable<br>
- * Input:    string to catenate<br>
- * Example:  {$var|cat:"foo"}
- *
- * @link     http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *           (Smarty online manual)
- * @author   Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_cat($params)
-{
-	return '(' . implode(').(', $params) . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_characters.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_characters.php
deleted file mode 100644
index 58f4e2c79..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_characters.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_characters modifier plugin
- * Type:     modifier<br>
- * Name:     count_characteres<br>
- * Purpose:  count the number of characters in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_characters($params)
-{
-	if (!isset($params[1]) || $params[1] != 'true') {
-		return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
-	}
-	if (Smarty::$_MBSTRING) {
-		return 'mb_strlen(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-	}
-
-	// no MBString fallback
-	return 'strlen(' . $params[0] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_paragraphs.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
deleted file mode 100644
index 34f0bbb8a..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_paragraphs.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_paragraphs modifier plugin
- * Type:     modifier<br>
- * Name:     count_paragraphs<br>
- * Purpose:  count the number of paragraphs in a text
- *
- * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author  Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_paragraphs($params)
-{
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_sentences.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_sentences.php
deleted file mode 100644
index 70a5ef132..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_sentences.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_sentences modifier plugin
- * Type:     modifier<br>
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- *
- * @link    http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author  Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_sentences($params)
-{
-	// find periods, question marks, exclamation marks with a word before but not after.
-	return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_words.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_words.php
deleted file mode 100644
index 640d09abb..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.count_words.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_words modifier plugin
- * Type:     modifier<br>
- * Name:     count_words<br>
- * Purpose:  count the number of words in a text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_words($params)
-{
-	if (Smarty::$_MBSTRING) {
-		// return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-		// expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-		return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-	}
-
-	// no MBString fallback
-	return 'str_word_count(' . $params[0] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.default.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.default.php
deleted file mode 100644
index 816a831af..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.default.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty default modifier plugin
- * Type:     modifier<br>
- * Name:     default<br>
- * Purpose:  designate default value for empty variables
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_default($params)
-{
-	$output = $params[0];
-	if (!isset($params[1])) {
-		$params[1] = "''";
-	}
-
-	array_shift($params);
-	foreach ($params as $param) {
-		$output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
-	}
-
-	return $output;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.escape.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.escape.php
deleted file mode 100644
index 3fdcda808..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.escape.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php');
-
-/**
- * Smarty escape modifier plugin
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  escape string for output
- *
- * @link   http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
- * @author Rodney Rehm
- *
- * @param array $params parameters
- * @param       $compiler
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_escape($params, $compiler)
-{
-	static $_double_encode = null;
-	if ($_double_encode === null) {
-		$_double_encode = version_compare(PHP_VERSION, '5.2.3', '>=');
-	}
-
-	try {
-		$esc_type = smarty_literal_compiler_param($params, 1, 'html');
-		$char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
-		$double_encode = smarty_literal_compiler_param($params, 3, true);
-
-		if (!$char_set) {
-			$char_set = Smarty::$_CHARSET;
-		}
-
-		switch ($esc_type) {
-			case 'html':
-				if ($_double_encode) {
-					return 'htmlspecialchars('
-					. $params[0] . ', ENT_QUOTES, '
-					. var_export($char_set, true) . ', '
-					. var_export($double_encode, true) . ')';
-				} elseif ($double_encode) {
-					return 'htmlspecialchars('
-					. $params[0] . ', ENT_QUOTES, '
-					. var_export($char_set, true) . ')';
-				} else {
-					// fall back to modifier.escape.php
-				}
-
-			case 'htmlall':
-				if (Smarty::$_MBSTRING) {
-					if ($_double_encode) {
-						// php >=5.2.3 - go native
-						return 'mb_convert_encoding(htmlspecialchars('
-						. $params[0] . ', ENT_QUOTES, '
-						. var_export($char_set, true) . ', '
-						. var_export($double_encode, true)
-						. '), "HTML-ENTITIES", '
-						. var_export($char_set, true) . ')';
-					} elseif ($double_encode) {
-						// php <5.2.3 - only handle double encoding
-						return 'mb_convert_encoding(htmlspecialchars('
-						. $params[0] . ', ENT_QUOTES, '
-						. var_export($char_set, true)
-						. '), "HTML-ENTITIES", '
-						. var_export($char_set, true) . ')';
-					} else {
-						// fall back to modifier.escape.php
-					}
-				}
-
-				// no MBString fallback
-				if ($_double_encode) {
-					// php >=5.2.3 - go native
-					return 'htmlentities('
-					. $params[0] . ', ENT_QUOTES, '
-					. var_export($char_set, true) . ', '
-					. var_export($double_encode, true) . ')';
-				} elseif ($double_encode) {
-					// php <5.2.3 - only handle double encoding
-					return 'htmlentities('
-					. $params[0] . ', ENT_QUOTES, '
-					. var_export($char_set, true) . ')';
-				} else {
-					// fall back to modifier.escape.php
-				}
-
-			case 'url':
-				return 'rawurlencode(' . $params[0] . ')';
-
-			case 'urlpathinfo':
-				return 'str_replace("%2F", "/", rawurlencode(' . $params[0] . '))';
-
-			case 'quotes':
-				// escape unescaped single quotes
-				return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[0] . ')';
-
-			case 'javascript':
-				// escape quotes and backslashes, newlines, etc.
-				return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-		}
-	} catch (SmartyException $e) {
-		// pass through to regular plugin fallback
-	}
-
-	// could not optimize |escape call, so fallback to regular plugin
-	if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-		$compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-		$compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
-	} else {
-		$compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'modifier.escape.php';
-		$compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
-	}
-
-	return 'smarty_modifier_escape(' . join(', ', $params) . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.from_charset.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.from_charset.php
deleted file mode 100644
index dab43e9c3..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.from_charset.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty from_charset modifier plugin
- * Type:     modifier<br>
- * Name:     from_charset<br>
- * Purpose:  convert character encoding from $charset to internal encoding
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_from_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
-    }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
-    }
-
-    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.indent.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.indent.php
deleted file mode 100644
index e3ca20821..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.indent.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty indent modifier plugin
- * Type:     modifier<br>
- * Name:     indent<br>
- * Purpose:  indent lines of text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_indent($params)
-{
-    if (!isset($params[1])) {
-        $params[1] = 4;
-    }
-    if (!isset($params[2])) {
-        $params[2] = "' '";
-    }
-
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.lower.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.lower.php
deleted file mode 100644
index 1d255f371..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.lower.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty lower modifier plugin
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to lowercase
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_lower($params)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strtolower(' . $params[0] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.noprint.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.noprint.php
deleted file mode 100644
index edcb106de..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.noprint.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty noprint modifier plugin
- * Type:     modifier<br>
- * Name:     noprint<br>
- * Purpose:  return an empty string
- *
- * @author   Uwe Tews
- * @return string with compiled code
- */
-function smarty_modifiercompiler_noprint()
-{
-	return "''";
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.string_format.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.string_format.php
deleted file mode 100644
index 8196dbc19..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.string_format.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty string_format modifier plugin
- * Type:     modifier<br>
- * Name:     string_format<br>
- * Purpose:  format strings via sprintf
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_string_format($params)
-{
-	return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.strip.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.strip.php
deleted file mode 100644
index fcd6cbaea..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.strip.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty strip modifier plugin
- * Type:     modifier<br>
- * Name:     strip<br>
- * Purpose:  Replace all repeated spaces, newlines, tabs
- *              with a single space or supplied replacement string.<br>
- * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
- * Date:     September 25th, 2002
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_strip($params)
-{
-    if (!isset($params[1])) {
-        $params[1] = "' '";
-    }
-
-    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.strip_tags.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.strip_tags.php
deleted file mode 100644
index 69e2bbd7f..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.strip_tags.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty strip_tags modifier plugin
- * Type:     modifier<br>
- * Name:     strip_tags<br>
- * Purpose:  strip html tags from text
- *
- * @link   http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strip_tags($params)
-{
-	if (!isset($params[1]) || $params[1] === true || trim($params[1], '"') == 'true') {
-		return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
-	} else {
-		return 'strip_tags(' . $params[0] . ')';
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.to_charset.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.to_charset.php
deleted file mode 100644
index 9122d8bbb..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.to_charset.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty to_charset modifier plugin
- * Type:     modifier<br>
- * Name:     to_charset<br>
- * Purpose:  convert character encoding from internal encoding to $charset
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_to_charset($params)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
-    }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
-    }
-
-    return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.unescape.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.unescape.php
deleted file mode 100644
index 3b17ea2e1..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.unescape.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty unescape modifier plugin
- * Type:     modifier<br>
- * Name:     unescape<br>
- * Purpose:  unescape html entities
- *
- * @author Rodney Rehm
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_unescape($params)
-{
-    if (!isset($params[1])) {
-        $params[1] = 'html';
-    }
-    if (!isset($params[2])) {
-        $params[2] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[2] = "'" . $params[2] . "'";
-    }
-
-    switch (trim($params[1], '"\'')) {
-        case 'entity':
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
-            }
-
-            return 'html_entity_decode(' . $params[0] . ', ENT_NOQUOTES, ' . $params[2] . ')';
-
-        case 'html':
-            return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)';
-
-        case 'url':
-            return 'rawurldecode(' . $params[0] . ')';
-
-        default:
-            return $params[0];
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.upper.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.upper.php
deleted file mode 100644
index 1250658ae..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.upper.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty upper modifier plugin
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to uppercase
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_upper($params)
-{
-	if (Smarty::$_MBSTRING) {
-		return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-	}
-
-	// no MBString fallback
-	return 'strtoupper(' . $params[0] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.wordwrap.php b/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.wordwrap.php
deleted file mode 100644
index d83516080..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/modifiercompiler.wordwrap.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty wordwrap modifier plugin
- * Type:     modifier<br>
- * Name:     wordwrap<br>
- * Purpose:  wrap a string of text at a given length
- *
- * @link   http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews
- *
- * @param array $params parameters
- * @param       $compiler
- *
- * @return string with compiled code
- */
-function smarty_modifiercompiler_wordwrap($params, $compiler)
-{
-	if (!isset($params[1])) {
-		$params[1] = 80;
-	}
-	if (!isset($params[2])) {
-		$params[2] = '"\n"';
-	}
-	if (!isset($params[3])) {
-		$params[3] = 'false';
-	}
-	$function = 'wordwrap';
-	if (Smarty::$_MBSTRING) {
-		if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
-			$compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-			$compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-		} else {
-			$compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php';
-			$compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-		}
-		$function = 'smarty_mb_wordwrap';
-	}
-
-	return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/outputfilter.trimwhitespace.php b/lib/copy_this/www/lib/smarty/plugins/outputfilter.trimwhitespace.php
deleted file mode 100644
index 62ab4e776..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/outputfilter.trimwhitespace.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFilter
- */
-
-/**
- * Smarty trimwhitespace outputfilter plugin
- * Trim unnecessary whitespace from HTML markup.
- *
- * @author   Rodney Rehm
- *
- * @param string $source input string
- *
- * @return string filtered output
- * @todo     substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
- */
-function smarty_outputfilter_trimwhitespace($source)
-{
-    $store = array();
-    $_store = 0;
-    $_offset = 0;
-
-    // Unify Line-Breaks to \n
-    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
-
-    // capture Internet Explorer Conditional Comments
-    if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store ++;
-        }
-    }
-
-    // Strip all HTML-Comments
-    // yes, even the ones in <script> - see http://stackoverflow.com/a/808850/515124
-    $source = preg_replace('#<!--.*?-->#ms', '', $source);
-
-    // capture html elements not to be messed with
-    $_offset = 0;
-    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store ++;
-        }
-    }
-
-    $expressions = array(
-        // replace multiple spaces between tags by a single space
-        // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
-        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
-        // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
-        // note: for some very weird reason trim() seems to remove spaces inside attributes.
-        // maybe a \0 byte or something is interfering?
-        '#^\s+<#Ss'                                                       => '<',
-        '#>\s+$#Ss'                                                       => '>',
-    );
-
-    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
-    // note: for some very weird reason trim() seems to remove spaces inside attributes.
-    // maybe a \0 byte or something is interfering?
-    // $source = trim( $source );
-
-    $_offset = 0;
-    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $_length = strlen($match[0][0]);
-            $replace = $store[$match[1][0]];
-            $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
-
-            $_offset += strlen($replace) - $_length;
-            $_store ++;
-        }
-    }
-
-    return $source;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/shared.escape_special_chars.php b/lib/copy_this/www/lib/smarty/plugins/shared.escape_special_chars.php
deleted file mode 100644
index 78d38477e..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/shared.escape_special_chars.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-	/**
-	 * escape_special_chars common function
-	 * Function: smarty_function_escape_special_chars<br>
-	 * Purpose:  used by other smarty functions to escape
-	 *           special chars except for already escaped ones
-	 *
-	 * @author   Monte Ohrt <monte at ohrt dot com>
-	 *
-	 * @param  string $string text that should by escaped
-	 *
-	 * @return string
-	 */
-	function smarty_function_escape_special_chars($string)
-	{
-		if (!is_array($string)) {
-			$string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-		}
-
-		return $string;
-	}
-} else {
-	/**
-	 * escape_special_chars common function
-	 * Function: smarty_function_escape_special_chars<br>
-	 * Purpose:  used by other smarty functions to escape
-	 *           special chars except for already escaped ones
-	 *
-	 * @author   Monte Ohrt <monte at ohrt dot com>
-	 *
-	 * @param  string $string text that should by escaped
-	 *
-	 * @return string
-	 */
-	function smarty_function_escape_special_chars($string)
-	{
-		if (!is_array($string)) {
-			$string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-			$string = htmlspecialchars($string);
-			$string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string);
-		}
-
-		return $string;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/shared.literal_compiler_param.php b/lib/copy_this/www/lib/smarty/plugins/shared.literal_compiler_param.php
deleted file mode 100644
index 6205a6da6..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/shared.literal_compiler_param.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * evaluate compiler parameter
- *
- * @param array   $params  parameter array as given to the compiler function
- * @param integer $index   array index of the parameter to convert
- * @param mixed   $default value to be returned if the parameter is not present
- *
- * @return mixed evaluated value of parameter or $default
- * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
- * @author Rodney Rehm
- */
-function smarty_literal_compiler_param($params, $index, $default = null)
-{
-	// not set, go default
-	if (!isset($params[$index])) {
-		return $default;
-	}
-	// test if param is a literal
-	if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[$index])) {
-		throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
-	}
-
-	$t = null;
-	eval("\$t = " . $params[$index] . ";");
-
-	return $t;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/shared.make_timestamp.php b/lib/copy_this/www/lib/smarty/plugins/shared.make_timestamp.php
deleted file mode 100644
index 7c94e5f59..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/shared.make_timestamp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * Function: smarty_make_timestamp<br>
- * Purpose:  used by other smarty functions to make a timestamp from a string.
- *
- * @author   Monte Ohrt <monte at ohrt dot com>
- *
- * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
- *
- * @return int
- */
-function smarty_make_timestamp($string)
-{
-    if (empty($string)) {
-        // use "now":
-        return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
-    } elseif (strlen($string) == 14 && ctype_digit($string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2),
-                      substr($string, 4, 2), substr($string, 6, 2), substr($string, 0, 4));
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        return (int) $string;
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time == - 1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            return time();
-        }
-
-        return $time;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/shared.mb_str_replace.php b/lib/copy_this/www/lib/smarty/plugins/shared.mb_str_replace.php
deleted file mode 100644
index a5682ed30..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/shared.mb_str_replace.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-if (!function_exists('smarty_mb_str_replace')) {
-
-    /**
-     * Multibyte string replace
-     *
-     * @param  string $search  the string to be searched
-     * @param  string $replace the replacement string
-     * @param  string $subject the source string
-     * @param  int    &$count  number of matches found
-     *
-     * @return string replaced string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
-    {
-        if (!is_array($search) && is_array($replace)) {
-            return false;
-        }
-        if (is_array($subject)) {
-            // call mb_replace for each single string in $subject
-            foreach ($subject as &$string) {
-                $string = & smarty_mb_str_replace($search, $replace, $string, $c);
-                $count += $c;
-            }
-        } elseif (is_array($search)) {
-            if (!is_array($replace)) {
-                foreach ($search as &$string) {
-                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
-                    $count += $c;
-                }
-            } else {
-                $n = max(count($search), count($replace));
-                while ($n --) {
-                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
-                    $count += $c;
-                    next($search);
-                    next($replace);
-                }
-            }
-        } else {
-            $parts = mb_split(preg_quote($search), $subject);
-            $count = count($parts) - 1;
-            $subject = implode($replace, $parts);
-        }
-
-        return $subject;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/shared.mb_unicode.php b/lib/copy_this/www/lib/smarty/plugins/shared.mb_unicode.php
deleted file mode 100644
index 020ce760d..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/shared.mb_unicode.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * convert characters to their decimal unicode equivalents
- *
- * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- *
- * @param string $string   characters to calculate unicode of
- * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
- *
- * @return array sequence of unicodes
- * @author Rodney Rehm
- */
-function smarty_mb_to_unicode($string, $encoding = null)
-{
-	if ($encoding) {
-		$expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
-	} else {
-		$expanded = mb_convert_encoding($string, "UTF-32BE");
-	}
-
-	return unpack("N*", $expanded);
-}
-
-/**
- * convert unicodes to the character of given encoding
- *
- * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- *
- * @param integer|array $unicode  single unicode or list of unicodes to convert
- * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
- *
- * @return string unicode as character sequence in given $encoding
- * @author Rodney Rehm
- */
-function smarty_mb_from_unicode($unicode, $encoding = null)
-{
-	$t = '';
-	if (!$encoding) {
-		$encoding = mb_internal_encoding();
-	}
-	foreach ((array)$unicode as $utf32be) {
-		$character = pack("N*", $utf32be);
-		$t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
-	}
-
-	return $t;
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/shared.mb_wordwrap.php b/lib/copy_this/www/lib/smarty/plugins/shared.mb_wordwrap.php
deleted file mode 100644
index e760a9ad5..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/shared.mb_wordwrap.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package    Smarty
- * @subpackage PluginsShared
- */
-
-if (!function_exists('smarty_mb_wordwrap')) {
-
-	/**
-	 * Wrap a string to a given number of characters
-	 *
-	 * @link   http://php.net/manual/en/function.wordwrap.php for similarity
-	 *
-	 * @param  string  $str   the string to wrap
-	 * @param  int     $width the width of the output
-	 * @param  string  $break the character used to break the line
-	 * @param  boolean $cut   ignored parameter, just for the sake of
-	 *
-	 * @return string  wrapped string
-	 * @author Rodney Rehm
-	 */
-	function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
-	{
-		// break words into tokens using white space as a delimiter
-		$tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-		$length = 0;
-		$t = '';
-		$_previous = false;
-
-		foreach ($tokens as $_token) {
-			$token_length = mb_strlen($_token, Smarty::$_CHARSET);
-			$_tokens = array($_token);
-			if ($token_length > $width) {
-				// remove last space
-				$t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-				$_previous = false;
-				$length = 0;
-
-				if ($cut) {
-					$_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-					// broken words go on a new line
-					$t .= $break;
-				}
-			}
-
-			foreach ($_tokens as $token) {
-				$_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
-				$token_length = mb_strlen($token, Smarty::$_CHARSET);
-				$length += $token_length;
-
-				if ($length > $width) {
-					// remove space before inserted break
-					if ($_previous && $token_length < $width) {
-						$t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-					}
-
-					// add the break before the token
-					$t .= $break;
-					$length = $token_length;
-
-					// skip space after inserting a break
-					if ($_space) {
-						$length = 0;
-						continue;
-					}
-				} elseif ($token == "\n") {
-					// hard break must reset counters
-					$_previous = 0;
-					$length = 0;
-				} else {
-					// remember if we had a space or not
-					$_previous = $_space;
-				}
-				// add the token
-				$t .= $token;
-			}
-		}
-
-		return $t;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/plugins/variablefilter.htmlspecialchars.php b/lib/copy_this/www/lib/smarty/plugins/variablefilter.htmlspecialchars.php
deleted file mode 100644
index 176d1c697..000000000
--- a/lib/copy_this/www/lib/smarty/plugins/variablefilter.htmlspecialchars.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsFilter
- */
-
-/**
- * Smarty htmlspecialchars variablefilter plugin
- *
- * @param string $source input string
- *
- * @return string filtered output
- */
-function smarty_variablefilter_htmlspecialchars($source)
-{
-	return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource.php
deleted file mode 100644
index d5050723b..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Cache Handler API
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource
-{
-	/**
-	 * cache for Smarty_CacheResource instances
-	 *
-	 * @var array
-	 */
-	public static $resources = array();
-
-	/**
-	 * resource types provided by the core
-	 *
-	 * @var array
-	 */
-	protected static $sysplugins = array(
-		'file' => true,
-	);
-
-	/**
-	 * populate Cached Object with meta data from Resource
-	 *
-	 * @param Smarty_Template_Cached   $cached    cached object
-	 * @param Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	abstract public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
-
-	/**
-	 * populate Cached Object with timestamp and exists from Resource
-	 *
-	 * @param Smarty_Template_Cached $cached
-	 *
-	 * @return void
-	 */
-	abstract public function populateTimestamp(Smarty_Template_Cached $cached);
-
-	/**
-	 * Read the cached template and process header
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 * @param Smarty_Template_Cached   $cached    cached object
-	 *
-	 * @return boolean true or false if the cached content does not exist
-	 */
-	abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null);
-
-	/**
-	 * Write the rendered template output to cache
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 * @param string                   $content   content to cache
-	 *
-	 * @return boolean success
-	 */
-	abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
-
-	/**
-	 * Return cached content
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 *
-	 * @return null|string
-	 */
-	public function getCachedContent(Smarty_Internal_Template $_template)
-	{
-		if ($_template->cached->handler->process($_template)) {
-			ob_start();
-			$_template->properties['unifunc']($_template);
-
-			return ob_get_clean();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Empty cache
-	 *
-	 * @param Smarty  $smarty   Smarty object
-	 * @param integer $exp_time expiration time (number of seconds, not timestamp)
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	abstract public function clearAll(Smarty $smarty, $exp_time = null);
-
-	/**
-	 * Empty cache for a specific template
-	 *
-	 * @param Smarty  $smarty        Smarty object
-	 * @param string  $resource_name template name
-	 * @param string  $cache_id      cache id
-	 * @param string  $compile_id    compile id
-	 * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-
-	/**
-	 * @param Smarty                 $smarty
-	 * @param Smarty_Template_Cached $cached
-	 *
-	 * @return bool|null
-	 */
-	public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		// theoretically locking_timeout should be checked against time_limit (max_execution_time)
-		$start = microtime(true);
-		$hadLock = null;
-		while ($this->hasLock($smarty, $cached)) {
-			$hadLock = true;
-			if (microtime(true) - $start > $smarty->locking_timeout) {
-				// abort waiting for lock release
-				return false;
-			}
-			sleep(1);
-		}
-
-		return $hadLock;
-	}
-
-	/**
-	 * Check is cache is locked for this template
-	 *
-	 * @param Smarty                 $smarty
-	 * @param Smarty_Template_Cached $cached
-	 *
-	 * @return bool
-	 */
-	public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		// check if lock exists
-		return false;
-	}
-
-	/**
-	 * Lock cache for this template
-	 *
-	 * @param Smarty                 $smarty
-	 * @param Smarty_Template_Cached $cached
-	 *
-	 * @return bool
-	 */
-	public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		// create lock
-		return true;
-	}
-
-	/**
-	 * Unlock cache for this template
-	 *
-	 * @param Smarty                 $smarty
-	 * @param Smarty_Template_Cached $cached
-	 *
-	 * @return bool
-	 */
-	public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		// release lock
-		return true;
-	}
-
-	/**
-	 * Load Cache Resource Handler
-	 *
-	 * @param Smarty $smarty Smarty object
-	 * @param string $type   name of the cache resource
-	 *
-	 * @throws SmartyException
-	 * @return Smarty_CacheResource Cache Resource Handler
-	 */
-	public static function load(Smarty $smarty, $type = null)
-	{
-		if (!isset($type)) {
-			$type = $smarty->caching_type;
-		}
-
-		// try smarty's cache
-		if (isset($smarty->_cacheresource_handlers[$type])) {
-			return $smarty->_cacheresource_handlers[$type];
-		}
-
-		// try registered resource
-		if (isset($smarty->registered_cache_resources[$type])) {
-			// do not cache these instances as they may vary from instance to instance
-			return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
-		}
-		// try sysplugins dir
-		if (isset(self::$sysplugins[$type])) {
-			if (!isset(self::$resources[$type])) {
-				$cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-				self::$resources[$type] = new $cache_resource_class();
-			}
-
-			return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
-		}
-		// try plugins dir
-		$cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
-		if ($smarty->loadPlugin($cache_resource_class)) {
-			if (!isset(self::$resources[$type])) {
-				self::$resources[$type] = new $cache_resource_class();
-			}
-
-			return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
-		}
-		// give up
-		throw new SmartyException("Unable to load cache resource '{$type}'");
-	}
-
-	/**
-	 * Invalid Loaded Cache Files
-	 *
-	 * @param Smarty $smarty Smarty object
-	 */
-	public static function invalidLoadedCache(Smarty $smarty)
-	{
-		foreach ($smarty->template_objects as $tpl) {
-			if (isset($tpl->cached)) {
-				$tpl->cached->valid = false;
-				$tpl->cached->processed = false;
-			}
-		}
-	}
-}
-
-/**
- * Smarty Resource Data Object
- * Cache Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-class Smarty_Template_Cached
-{
-	/**
-	 * Source Filepath
-	 *
-	 * @var string
-	 */
-	public $filepath = false;
-
-	/**
-	 * Source Content
-	 *
-	 * @var string
-	 */
-	public $content = null;
-
-	/**
-	 * Source Timestamp
-	 *
-	 * @var integer
-	 */
-	public $timestamp = false;
-
-	/**
-	 * Source Existence
-	 *
-	 * @var boolean
-	 */
-	public $exists = false;
-
-	/**
-	 * Cache Is Valid
-	 *
-	 * @var boolean
-	 */
-	public $valid = false;
-
-	/**
-	 * Cache was processed
-	 *
-	 * @var boolean
-	 */
-	public $processed = false;
-
-	/**
-	 * CacheResource Handler
-	 *
-	 * @var Smarty_CacheResource
-	 */
-	public $handler = null;
-
-	/**
-	 * Template Compile Id (Smarty_Internal_Template::$compile_id)
-	 *
-	 * @var string
-	 */
-	public $compile_id = null;
-
-	/**
-	 * Template Cache Id (Smarty_Internal_Template::$cache_id)
-	 *
-	 * @var string
-	 */
-	public $cache_id = null;
-
-	/**
-	 * Id for cache locking
-	 *
-	 * @var string
-	 */
-	public $lock_id = null;
-
-	/**
-	 * flag that cache is locked by this instance
-	 *
-	 * @var bool
-	 */
-	public $is_locked = false;
-
-	/**
-	 * Source Object
-	 *
-	 * @var Smarty_Template_Source
-	 */
-	public $source = null;
-
-	/**
-	 * create Cached Object container
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 */
-	public function __construct(Smarty_Internal_Template $_template)
-	{
-		$this->compile_id = $_template->compile_id;
-		$this->cache_id = $_template->cache_id;
-		$this->source = $_template->source;
-		$_template->cached = $this;
-		$smarty = $_template->smarty;
-
-		//
-		// load resource handler
-		//
-		$this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
-
-		//
-		//    check if cache is valid
-		//
-		if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-			$handler->populate($this, $_template);
-
-			return;
-		}
-		while (true) {
-			while (true) {
-				$handler->populate($this, $_template);
-				if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
-					$this->valid = false;
-				} else {
-					$this->valid = true;
-				}
-				if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
-					// lifetime expired
-					$this->valid = false;
-				}
-				if ($this->valid || !$_template->smarty->cache_locking) {
-					break;
-				}
-				if (!$this->handler->locked($_template->smarty, $this)) {
-					$this->handler->acquireLock($_template->smarty, $this);
-					break 2;
-				}
-			}
-			if ($this->valid) {
-				if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-					// load cache file for the following checks
-					if ($smarty->debugging) {
-						Smarty_Internal_Debug::start_cache($_template);
-					}
-					if ($handler->process($_template, $this) === false) {
-						$this->valid = false;
-					} else {
-						$this->processed = true;
-					}
-					if ($smarty->debugging) {
-						Smarty_Internal_Debug::end_cache($_template);
-					}
-				} else {
-					continue;
-				}
-			} else {
-				return;
-			}
-			if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-				$this->valid = false;
-			}
-			if (!$this->valid && $_template->smarty->cache_locking) {
-				$this->handler->acquireLock($_template->smarty, $this);
-
-				return;
-			} else {
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Write this cache object to handler
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 * @param string                   $content   content to cache
-	 *
-	 * @return boolean success
-	 */
-	public function write(Smarty_Internal_Template $_template, $content)
-	{
-		if (!$_template->source->recompiled) {
-			if ($this->handler->writeCachedContent($_template, $content)) {
-				$this->content = null;
-				$this->timestamp = time();
-				$this->exists = true;
-				$this->valid = true;
-				if ($_template->smarty->cache_locking) {
-					$this->handler->releaseLock($_template->smarty, $this);
-				}
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource_custom.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource_custom.php
deleted file mode 100644
index 1ae116e4d..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource_custom.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Cache Handler API
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
-{
-	/**
-	 * fetch cached content and its modification time from data source
-	 *
-	 * @param  string  $id         unique cache content identifier
-	 * @param  string  $name       template name
-	 * @param  string  $cache_id   cache id
-	 * @param  string  $compile_id compile id
-	 * @param  string  $content    cached content
-	 * @param  integer $mtime      cache modification timestamp (epoch)
-	 *
-	 * @return void
-	 */
-	abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
-
-	/**
-	 * Fetch cached content's modification timestamp from data source
-	 * {@internal implementing this method is optional.
-	 *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
-	 *
-	 * @param  string $id         unique cache content identifier
-	 * @param  string $name       template name
-	 * @param  string $cache_id   cache id
-	 * @param  string $compile_id compile id
-	 *
-	 * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-	 */
-	protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-	{
-		return null;
-	}
-
-	/**
-	 * Save content to cache
-	 *
-	 * @param  string       $id         unique cache content identifier
-	 * @param  string       $name       template name
-	 * @param  string       $cache_id   cache id
-	 * @param  string       $compile_id compile id
-	 * @param  integer|null $exp_time   seconds till expiration or null
-	 * @param  string       $content    content to cache
-	 *
-	 * @return boolean      success
-	 */
-	abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
-
-	/**
-	 * Delete content from cache
-	 *
-	 * @param  string       $name       template name
-	 * @param  string       $cache_id   cache id
-	 * @param  string       $compile_id compile id
-	 * @param  integer|null $exp_time   seconds till expiration time in seconds or null
-	 *
-	 * @return integer      number of deleted caches
-	 */
-	abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
-
-	/**
-	 * populate Cached Object with meta data from Resource
-	 *
-	 * @param  Smarty_Template_Cached   $cached    cached object
-	 * @param  Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-	{
-		$_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
-		$_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-
-		$cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
-		$this->populateTimestamp($cached);
-	}
-
-	/**
-	 * populate Cached Object with timestamp and exists from Resource
-	 *
-	 * @param Smarty_Template_Cached $cached
-	 *
-	 * @return void
-	 */
-	public function populateTimestamp(Smarty_Template_Cached $cached)
-	{
-		$mtime = $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
-		if ($mtime !== null) {
-			$cached->timestamp = $mtime;
-			$cached->exists = !!$cached->timestamp;
-
-			return;
-		}
-		$timestamp = null;
-		$this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $cached->content, $timestamp);
-		$cached->timestamp = isset($timestamp) ? $timestamp : false;
-		$cached->exists = !!$cached->timestamp;
-	}
-
-	/**
-	 * Read the cached template and process the header
-	 *
-	 * @param  Smarty_Internal_Template $_template template object
-	 * @param  Smarty_Template_Cached   $cached    cached object
-	 *
-	 * @return boolean                 true or false if the cached content does not exist
-	 */
-	public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
-	{
-		if (!$cached) {
-			$cached = $_template->cached;
-		}
-		$content = $cached->content ? $cached->content : null;
-		$timestamp = $cached->timestamp ? $cached->timestamp : null;
-		if ($content === null || !$timestamp) {
-			$this->fetch(
-				$_template->cached->filepath,
-				$_template->source->name,
-				$_template->cache_id,
-				$_template->compile_id,
-				$content,
-				$timestamp
-			);
-		}
-		if (isset($content)) {
-			/** @var Smarty_Internal_Template $_smarty_tpl
-			 * used in evaluated code
-			 */
-			$_smarty_tpl = $_template;
-			eval("?>" . $content);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Write the rendered template output to cache
-	 *
-	 * @param  Smarty_Internal_Template $_template template object
-	 * @param  string                   $content   content to cache
-	 *
-	 * @return boolean                  success
-	 */
-	public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-	{
-		return $this->save(
-			$_template->cached->filepath,
-			$_template->source->name,
-			$_template->cache_id,
-			$_template->compile_id,
-			$_template->properties['cache_lifetime'],
-			$content
-		);
-	}
-
-	/**
-	 * Empty cache
-	 *
-	 * @param  Smarty  $smarty   Smarty object
-	 * @param  integer $exp_time expiration time (number of seconds, not timestamp)
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	public function clearAll(Smarty $smarty, $exp_time = null)
-	{
-		$this->cache = array();
-
-		return $this->delete(null, null, null, $exp_time);
-	}
-
-	/**
-	 * Empty cache for a specific template
-	 *
-	 * @param  Smarty  $smarty        Smarty object
-	 * @param  string  $resource_name template name
-	 * @param  string  $cache_id      cache id
-	 * @param  string  $compile_id    compile id
-	 * @param  integer $exp_time      expiration time (number of seconds, not timestamp)
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-	{
-		$this->cache = array();
-		$cache_name = null;
-
-		if (isset($resource_name)) {
-			$_save_stat = $smarty->caching;
-			$smarty->caching = true;
-			$tpl = new $smarty->template_class($resource_name, $smarty);
-			$smarty->caching = $_save_stat;
-
-			if ($tpl->source->exists) {
-				$cache_name = $tpl->source->name;
-			} else {
-				return 0;
-			}
-			// remove from template cache
-			if ($smarty->allow_ambiguous_resources) {
-				$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-			} else {
-				$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-			}
-			if (isset($_templateId[150])) {
-				$_templateId = sha1($_templateId);
-			}
-			unset($smarty->template_objects[$_templateId]);
-			// template object no longer needed
-			unset($tpl);
-		}
-
-		return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
-	}
-
-	/**
-	 * Check is cache is locked for this template
-	 *
-	 * @param  Smarty                 $smarty Smarty object
-	 * @param  Smarty_Template_Cached $cached cached object
-	 *
-	 * @return boolean               true or false if cache is locked
-	 */
-	public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$id = $cached->filepath;
-		$name = $cached->source->name . '.lock';
-
-		$mtime = $this->fetchTimestamp($id, $name, null, null);
-		if ($mtime === null) {
-			$this->fetch($id, $name, null, null, $content, $mtime);
-		}
-
-		return $mtime && time() - $mtime < $smarty->locking_timeout;
-	}
-
-	/**
-	 * Lock cache for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return bool|void
-	 */
-	public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$cached->is_locked = true;
-
-		$id = $cached->filepath;
-		$name = $cached->source->name . '.lock';
-		$this->save($id, $name, null, null, $smarty->locking_timeout, '');
-	}
-
-	/**
-	 * Unlock cache for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return bool|void
-	 */
-	public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$cached->is_locked = false;
-
-		$name = $cached->source->name . '.lock';
-		$this->delete($name, null, null, null);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
deleted file mode 100644
index b0906c1ce..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ /dev/null
@@ -1,493 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-
-/**
- * Smarty Cache Handler Base for Key/Value Storage Implementations
- * This class implements the functionality required to use simple key/value stores
- * for hierarchical cache groups. key/value stores like memcache or APC do not support
- * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
- * is no problem to filesystem and RDBMS implementations.
- * This implementation is based on the concept of invalidation. While one specific cache
- * can be identified and cleared, any range of caches cannot be identified. For this reason
- * each level of the cache group hierarchy can have its own value in the store. These values
- * are nothing but microtimes, telling us when a particular cache group was cleared for the
- * last time. These keys are evaluated for every cache read to determine if the cache has
- * been invalidated since it was created and should hence be treated as inexistent.
- * Although deep hierarchies are possible, they are not recommended. Try to keep your
- * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
- * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
- * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
- * consider using »a|b|c|$page-$items-$whatever« instead.
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Rodney Rehm
- */
-abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
-{
-	/**
-	 * cache for contents
-	 *
-	 * @var array
-	 */
-	protected $contents = array();
-	/**
-	 * cache for timestamps
-	 *
-	 * @var array
-	 */
-	protected $timestamps = array();
-
-	/**
-	 * populate Cached Object with meta data from Resource
-	 *
-	 * @param  Smarty_Template_Cached   $cached    cached object
-	 * @param  Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-	{
-		$cached->filepath = $_template->source->uid
-			. '#' . $this->sanitize($cached->source->resource)
-			. '#' . $this->sanitize($cached->cache_id)
-			. '#' . $this->sanitize($cached->compile_id);
-
-		$this->populateTimestamp($cached);
-	}
-
-	/**
-	 * populate Cached Object with timestamp and exists from Resource
-	 *
-	 * @param  Smarty_Template_Cached $cached cached object
-	 *
-	 * @return void
-	 */
-	public function populateTimestamp(Smarty_Template_Cached $cached)
-	{
-		if (!$this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $content, $timestamp, $cached->source->uid)) {
-			return;
-		}
-		$cached->content = $content;
-		$cached->timestamp = (int)$timestamp;
-		$cached->exists = $cached->timestamp;
-	}
-
-	/**
-	 * Read the cached template and process the header
-	 *
-	 * @param  Smarty_Internal_Template $_template template object
-	 * @param  Smarty_Template_Cached   $cached    cached object
-	 *
-	 * @return boolean                 true or false if the cached content does not exist
-	 */
-	public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
-	{
-		if (!$cached) {
-			$cached = $_template->cached;
-		}
-		$content = $cached->content ? $cached->content : null;
-		$timestamp = $cached->timestamp ? $cached->timestamp : null;
-		if ($content === null || !$timestamp) {
-			if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
-				return false;
-			}
-		}
-		if (isset($content)) {
-			/** @var Smarty_Internal_Template $_smarty_tpl
-			 * used in evaluated code
-			 */
-			$_smarty_tpl = $_template;
-			eval("?>" . $content);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Write the rendered template output to cache
-	 *
-	 * @param  Smarty_Internal_Template $_template template object
-	 * @param  string                   $content   content to cache
-	 *
-	 * @return boolean                  success
-	 */
-	public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-	{
-		$this->addMetaTimestamp($content);
-
-		return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
-	}
-
-	/**
-	 * Empty cache
-	 * {@internal the $exp_time argument is ignored altogether }}
-	 *
-	 * @param  Smarty  $smarty   Smarty object
-	 * @param  integer $exp_time expiration time [being ignored]
-	 *
-	 * @return integer number of cache files deleted [always -1]
-	 * @uses purge() to clear the whole store
-	 * @uses invalidate() to mark everything outdated if purge() is inapplicable
-	 */
-	public function clearAll(Smarty $smarty, $exp_time = null)
-	{
-		if (!$this->purge()) {
-			$this->invalidate(null);
-		}
-
-		return -1;
-	}
-
-	/**
-	 * Empty cache for a specific template
-	 * {@internal the $exp_time argument is ignored altogether}}
-	 *
-	 * @param  Smarty  $smarty        Smarty object
-	 * @param  string  $resource_name template name
-	 * @param  string  $cache_id      cache id
-	 * @param  string  $compile_id    compile id
-	 * @param  integer $exp_time      expiration time [being ignored]
-	 *
-	 * @return integer number of cache files deleted [always -1]
-	 * @uses buildCachedFilepath() to generate the CacheID
-	 * @uses invalidate() to mark CacheIDs parent chain as outdated
-	 * @uses delete() to remove CacheID from cache
-	 */
-	public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-	{
-		$uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-		$cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
-		$this->delete(array($cid));
-		$this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-
-		return -1;
-	}
-
-	/**
-	 * Get template's unique id
-	 *
-	 * @param  Smarty $smarty        Smarty object
-	 * @param  string $resource_name template name
-	 * @param  string $cache_id      cache id
-	 * @param  string $compile_id    compile id
-	 *
-	 * @return string filepath of cache file
-	 */
-	protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
-	{
-		$uid = '';
-		if (isset($resource_name)) {
-			$tpl = new $smarty->template_class($resource_name, $smarty);
-			if ($tpl->source->exists) {
-				$uid = $tpl->source->uid;
-			}
-
-			// remove from template cache
-			if ($smarty->allow_ambiguous_resources) {
-				$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-			} else {
-				$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-			}
-			if (isset($_templateId[150])) {
-				$_templateId = sha1($_templateId);
-			}
-			unset($smarty->template_objects[$_templateId]);
-		}
-
-		return $uid;
-	}
-
-	/**
-	 * Sanitize CacheID components
-	 *
-	 * @param  string $string CacheID component to sanitize
-	 *
-	 * @return string sanitized CacheID component
-	 */
-	protected function sanitize($string)
-	{
-		// some poeple smoke bad weed
-		$string = trim($string, '|');
-		if (!$string) {
-			return null;
-		}
-
-		return preg_replace('#[^\w\|]+#S', '_', $string);
-	}
-
-	/**
-	 * Fetch and prepare a cache object.
-	 *
-	 * @param  string  $cid           CacheID to fetch
-	 * @param  string  $resource_name template name
-	 * @param  string  $cache_id      cache id
-	 * @param  string  $compile_id    compile id
-	 * @param  string  $content       cached content
-	 * @param  integer &$timestamp    cached timestamp (epoch)
-	 * @param  string  $resource_uid  resource's uid
-	 *
-	 * @return boolean success
-	 */
-	protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
-	{
-		$t = $this->read(array($cid));
-		$content = !empty($t[$cid]) ? $t[$cid] : null;
-		$timestamp = null;
-
-		if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
-			$invalidated = $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
-			if ($invalidated > $timestamp) {
-				$timestamp = null;
-				$content = null;
-			}
-		}
-
-		return !!$content;
-	}
-
-	/**
-	 * Add current microtime to the beginning of $cache_content
-	 * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
-	 *
-	 * @param string &$content the content to be cached
-	 */
-	protected function addMetaTimestamp(&$content)
-	{
-		$mt = explode(" ", microtime());
-		$ts = pack("NN", $mt[1], (int)($mt[0] * 100000000));
-		$content = $ts . $content;
-	}
-
-	/**
-	 * Extract the timestamp the $content was cached
-	 *
-	 * @param  string &$content the cached content
-	 *
-	 * @return float  the microtime the content was cached
-	 */
-	protected function getMetaTimestamp(&$content)
-	{
-		$s = unpack("N", substr($content, 0, 4));
-		$m = unpack("N", substr($content, 4, 4));
-		$content = substr($content, 8);
-
-		return $s[1] + ($m[1] / 100000000);
-	}
-
-	/**
-	 * Invalidate CacheID
-	 *
-	 * @param  string $cid           CacheID
-	 * @param  string $resource_name template name
-	 * @param  string $cache_id      cache id
-	 * @param  string $compile_id    compile id
-	 * @param  string $resource_uid  source's uid
-	 *
-	 * @return void
-	 */
-	protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-	{
-		$now = microtime(true);
-		$key = null;
-		// invalidate everything
-		if (!$resource_name && !$cache_id && !$compile_id) {
-			$key = 'IVK#ALL';
-		} // invalidate all caches by template
-		else {
-			if ($resource_name && !$cache_id && !$compile_id) {
-				$key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
-			} // invalidate all caches by cache group
-			else {
-				if (!$resource_name && $cache_id && !$compile_id) {
-					$key = 'IVK#CACHE#' . $this->sanitize($cache_id);
-				} // invalidate all caches by compile id
-				else {
-					if (!$resource_name && !$cache_id && $compile_id) {
-						$key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
-					} // invalidate by combination
-					else {
-						$key = 'IVK#CID#' . $cid;
-					}
-				}
-			}
-		}
-		$this->write(array($key => $now));
-	}
-
-	/**
-	 * Determine the latest timestamp known to the invalidation chain
-	 *
-	 * @param  string $cid           CacheID to determine latest invalidation timestamp of
-	 * @param  string $resource_name template name
-	 * @param  string $cache_id      cache id
-	 * @param  string $compile_id    compile id
-	 * @param  string $resource_uid  source's filepath
-	 *
-	 * @return float  the microtime the CacheID was invalidated
-	 */
-	protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-	{
-		// abort if there is no CacheID
-		if (false && !$cid) {
-			return 0;
-		}
-		// abort if there are no InvalidationKeys to check
-		if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
-			return 0;
-		}
-
-		// there are no InValidationKeys
-		if (!($values = $this->read($_cid))) {
-			return 0;
-		}
-		// make sure we're dealing with floats
-		$values = array_map('floatval', $values);
-
-		return max($values);
-	}
-
-	/**
-	 * Translate a CacheID into the list of applicable InvalidationKeys.
-	 * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
-	 *
-	 * @param  string $cid           CacheID to translate
-	 * @param  string $resource_name template name
-	 * @param  string $cache_id      cache id
-	 * @param  string $compile_id    compile id
-	 * @param  string $resource_uid  source's filepath
-	 *
-	 * @return array  list of InvalidationKeys
-	 * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
-	 */
-	protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-	{
-		$t = array('IVK#ALL');
-		$_name = $_compile = '#';
-		if ($resource_name) {
-			$_name .= $resource_uid . '#' . $this->sanitize($resource_name);
-			$t[] = 'IVK#TEMPLATE' . $_name;
-		}
-		if ($compile_id) {
-			$_compile .= $this->sanitize($compile_id);
-			$t[] = 'IVK#COMPILE' . $_compile;
-		}
-		$_name .= '#';
-		// some poeple smoke bad weed
-		$cid = trim($cache_id, '|');
-		if (!$cid) {
-			return $t;
-		}
-		$i = 0;
-		while (true) {
-			// determine next delimiter position
-			$i = strpos($cid, '|', $i);
-			// add complete CacheID if there are no more delimiters
-			if ($i === false) {
-				$t[] = 'IVK#CACHE#' . $cid;
-				$t[] = 'IVK#CID' . $_name . $cid . $_compile;
-				$t[] = 'IVK#CID' . $_name . $_compile;
-				break;
-			}
-			$part = substr($cid, 0, $i);
-			// add slice to list
-			$t[] = 'IVK#CACHE#' . $part;
-			$t[] = 'IVK#CID' . $_name . $part . $_compile;
-			// skip past delimiter position
-			$i++;
-		}
-
-		return $t;
-	}
-
-	/**
-	 * Check is cache is locked for this template
-	 *
-	 * @param  Smarty                 $smarty Smarty object
-	 * @param  Smarty_Template_Cached $cached cached object
-	 *
-	 * @return boolean               true or false if cache is locked
-	 */
-	public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$key = 'LOCK#' . $cached->filepath;
-		$data = $this->read(array($key));
-
-		return $data && time() - $data[$key] < $smarty->locking_timeout;
-	}
-
-	/**
-	 * Lock cache for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return bool|void
-	 */
-	public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$cached->is_locked = true;
-		$key = 'LOCK#' . $cached->filepath;
-		$this->write(array($key => time()), $smarty->locking_timeout);
-	}
-
-	/**
-	 * Unlock cache for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return bool|void
-	 */
-	public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$cached->is_locked = false;
-		$key = 'LOCK#' . $cached->filepath;
-		$this->delete(array($key));
-	}
-
-	/**
-	 * Read values for a set of keys from cache
-	 *
-	 * @param  array $keys list of keys to fetch
-	 *
-	 * @return array list of values with the given keys used as indexes
-	 */
-	abstract protected function read(array $keys);
-
-	/**
-	 * Save values for a set of keys to cache
-	 *
-	 * @param  array $keys   list of values to save
-	 * @param  int   $expire expiration time
-	 *
-	 * @return boolean true on success, false on failure
-	 */
-	abstract protected function write(array $keys, $expire = null);
-
-	/**
-	 * Remove values from cache
-	 *
-	 * @param  array $keys list of keys to delete
-	 *
-	 * @return boolean true on success, false on failure
-	 */
-	abstract protected function delete(array $keys);
-
-	/**
-	 * Remove *all* values from cache
-	 *
-	 * @return boolean true on success, false on failure
-	 */
-	protected function purge()
-	{
-		return false;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_config_source.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_config_source.php
deleted file mode 100644
index fd37e61f7..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_config_source.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Config Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property string $content
- * @property int    $timestamp
- * @property bool   $exists
- */
-class Smarty_Config_Source extends Smarty_Template_Source
-{
-    /**
-     * create Config Object container
-     *
-     * @param Smarty_Resource $handler         Resource Handler this source object communicates with
-     * @param Smarty          $smarty          Smarty instance this source object belongs to
-     * @param string          $resource        full config_resource
-     * @param string          $type            type of resource
-     * @param string          $name            resource name
-     * @param string          $unique_resource unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        // Note: these may be ->config_compiler_class etc in the future
-        //$this->config_compiler_class = $handler->config_compiler_class;
-        //$this->config_lexer_class = $handler->config_lexer_class;
-        //$this->config_parser_class = $handler->config_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * @param  string $property_name valid: content, timestamp, exists
-     * @param  mixed  $value         newly assigned value (not check for correct type)
-     *
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'content':
-            case 'timestamp':
-            case 'exists':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid config property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param  string $property_name valid: content, timestamp, exists
-     *
-     * @return mixed|void
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("config property '$property_name' does not exist.");
-        }
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
deleted file mode 100644
index 5c362eda7..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CacheResource File
- *
- * @package    Smarty
- * @subpackage Cacher
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * This class does contain all necessary methods for the HTML cache on file system
- * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
- *
- * @package    Smarty
- * @subpackage Cacher
- */
-class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
-{
-	/**
-	 * populate Cached Object with meta data from Resource
-	 *
-	 * @param Smarty_Template_Cached   $cached    cached object
-	 * @param Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-	{
-		$_source_file_path = str_replace(':', '.', $_template->source->filepath);
-		$_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-		$_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-		$_filepath = $_template->source->uid;
-		// if use_sub_dirs, break file into directories
-		if ($_template->smarty->use_sub_dirs) {
-			$_filepath = substr($_filepath, 0, 2) . DS
-				. substr($_filepath, 2, 2) . DS
-				. substr($_filepath, 4, 2) . DS
-				. $_filepath;
-		}
-		$_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-		if (isset($_cache_id)) {
-			$_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
-		} else {
-			$_cache_id = '';
-		}
-		if (isset($_compile_id)) {
-			$_compile_id = $_compile_id . $_compile_dir_sep;
-		} else {
-			$_compile_id = '';
-		}
-		$_cache_dir = $_template->smarty->getCacheDir();
-		if ($_template->smarty->cache_locking) {
-			// create locking file name
-			// relative file name?
-			if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_cache_dir)) {
-				$_lock_dir = rtrim(getcwd(), '/\\') . DS . $_cache_dir;
-			} else {
-				$_lock_dir = $_cache_dir;
-			}
-			$cached->lock_id = $_lock_dir . sha1($_cache_id . $_compile_id . $_template->source->uid) . '.lock';
-		}
-		$cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-		$cached->timestamp = @filemtime($cached->filepath);
-		$cached->exists = !!$cached->timestamp;
-	}
-
-	/**
-	 * populate Cached Object with timestamp and exists from Resource
-	 *
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return void
-	 */
-	public function populateTimestamp(Smarty_Template_Cached $cached)
-	{
-		$cached->timestamp = @filemtime($cached->filepath);
-		$cached->exists = !!$cached->timestamp;
-	}
-
-	/**
-	 * Read the cached template and process its header
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 * @param Smarty_Template_Cached   $cached    cached object
-	 *
-	 * @return booleantrue or false if the cached content does not exist
-	 */
-	public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
-	{
-		/** @var Smarty_Internal_Template $_smarty_tpl
-		 * used in included file
-		 */
-		$_smarty_tpl = $_template;
-
-		return @include $_template->cached->filepath;
-	}
-
-	/**
-	 * Write the rendered template output to cache
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 * @param string                   $content   content to cache
-	 *
-	 * @return boolean success
-	 */
-	public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-	{
-		if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-			$_template->cached->timestamp = @filemtime($_template->cached->filepath);
-			$_template->cached->exists = !!$_template->cached->timestamp;
-			if ($_template->cached->exists) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Empty cache
-	 *
-	 * @param Smarty  $smarty
-	 * @param integer $exp_time expiration time (number of seconds, not timestamp)
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	public function clearAll(Smarty $smarty, $exp_time = null)
-	{
-		return $this->clear($smarty, null, null, null, $exp_time);
-	}
-
-	/**
-	 * Empty cache for a specific template
-	 *
-	 * @param Smarty  $smarty
-	 * @param string  $resource_name template name
-	 * @param string  $cache_id      cache id
-	 * @param string  $compile_id    compile id
-	 * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-	{
-		$_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-		$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-		$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-		$_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-		$_dir = realpath($smarty->getCacheDir()) . '/';
-		$_dir_length = strlen($_dir);
-		if (isset($_cache_id)) {
-			$_cache_id_parts = explode('|', $_cache_id);
-			$_cache_id_parts_count = count($_cache_id_parts);
-			if ($smarty->use_sub_dirs) {
-				foreach ($_cache_id_parts as $id_part) {
-					$_dir .= $id_part . DS;
-				}
-			}
-		}
-		if (isset($resource_name)) {
-			$_save_stat = $smarty->caching;
-			$smarty->caching = true;
-			$tpl = new $smarty->template_class($resource_name, $smarty);
-			$smarty->caching = $_save_stat;
-
-			// remove from template cache
-			$tpl->source; // have the template registered before unset()
-			if ($smarty->allow_ambiguous_resources) {
-				$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-			} else {
-				$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-			}
-			if (isset($_templateId[150])) {
-				$_templateId = sha1($_templateId);
-			}
-			unset($smarty->template_objects[$_templateId]);
-
-			if ($tpl->source->exists) {
-				$_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-			} else {
-				return 0;
-			}
-		}
-		$_count = 0;
-		$_time = time();
-		if (file_exists($_dir)) {
-			$_cacheDirs = new RecursiveDirectoryIterator($_dir);
-			$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-			foreach ($_cache as $_file) {
-				if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-					continue;
-				}
-				// directory ?
-				if ($_file->isDir()) {
-					if (!$_cache->isDot()) {
-						// delete folder if empty
-						@rmdir($_file->getPathname());
-					}
-				} else {
-					$_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
-					$_parts_count = count($_parts);
-					// check name
-					if (isset($resource_name)) {
-						if ($_parts[$_parts_count - 1] != $_resourcename_parts) {
-							continue;
-						}
-					}
-					// check compile id
-					if (isset($_compile_id) && (!isset($_parts[$_parts_count - 2 - $_compile_id_offset]) || $_parts[$_parts_count - 2 - $_compile_id_offset] != $_compile_id)) {
-						continue;
-					}
-					// check cache id
-					if (isset($_cache_id)) {
-						// count of cache id parts
-						$_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-						if ($_parts_count < $_cache_id_parts_count) {
-							continue;
-						}
-						for ($i = 0; $i < $_cache_id_parts_count; $i++) {
-							if ($_parts[$i] != $_cache_id_parts[$i]) {
-								continue 2;
-							}
-						}
-					}
-					// expired ?
-					if (isset($exp_time)) {
-						if ($exp_time < 0) {
-							preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_file), $match);
-							if ($_time < (@filemtime($_file) + $match[1])) {
-								continue;
-							}
-						} else {
-							if ($_time - @filemtime($_file) < $exp_time) {
-								continue;
-							}
-						}
-					}
-					$_count += @unlink((string)$_file) ? 1 : 0;
-				}
-			}
-		}
-
-		return $_count;
-	}
-
-	/**
-	 * Check is cache is locked for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return boolean true or false if cache is locked
-	 */
-	public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-			clearstatcache(true, $cached->lock_id);
-		} else {
-			clearstatcache();
-		}
-		$t = @filemtime($cached->lock_id);
-
-		return $t && (time() - $t < $smarty->locking_timeout);
-	}
-
-	/**
-	 * Lock cache for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return bool|void
-	 */
-	public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$cached->is_locked = true;
-		touch($cached->lock_id);
-	}
-
-	/**
-	 * Unlock cache for this template
-	 *
-	 * @param Smarty                 $smarty Smarty object
-	 * @param Smarty_Template_Cached $cached cached object
-	 *
-	 * @return bool|void
-	 */
-	public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-	{
-		$cached->is_locked = false;
-		@unlink($cached->lock_id);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_append.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_append.php
deleted file mode 100644
index 716f1de72..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_append.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Append
- * Compiles the {append} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Append Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
-{
-	/**
-	 * Compiles code for the {append} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// the following must be assigned at runtime because it will be overwritten in parent class
-		$this->required_attributes = array('var', 'value');
-		$this->shorttag_order = array('var', 'value');
-		$this->optional_attributes = array('scope', 'index');
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		// map to compile assign attributes
-		if (isset($_attr['index'])) {
-			$_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
-			unset($_attr['index']);
-		} else {
-			$_params['smarty_internal_index'] = '[]';
-		}
-		$_new_attr = array();
-		foreach ($_attr as $key => $value) {
-			$_new_attr[] = array($key => $value);
-		}
-
-		// call compile assign
-		return parent::compile($_new_attr, $compiler, $_params);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_assign.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_assign.php
deleted file mode 100644
index d76dbd0b8..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_assign.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Assign
- * Compiles the {assign} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Assign Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {assign} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
-		$this->required_attributes = array('var', 'value');
-		$this->shorttag_order = array('var', 'value');
-		$this->optional_attributes = array('scope');
-		$_nocache = 'null';
-		$_scope = Smarty::SCOPE_LOCAL;
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		// nocache ?
-		if ($compiler->tag_nocache || $compiler->nocache) {
-			$_nocache = 'true';
-			// create nocache var to make it know for further compiling
-			if (isset($compiler->template->tpl_vars[trim($_attr['var'], "'")])) {
-				$compiler->template->tpl_vars[trim($_attr['var'], "'")]->nocache = true;
-			} else {
-				$compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
-			}
-		}
-		// scope setup
-		if (isset($_attr['scope'])) {
-			$_attr['scope'] = trim($_attr['scope'], "'\"");
-			if ($_attr['scope'] == 'parent') {
-				$_scope = Smarty::SCOPE_PARENT;
-			} elseif ($_attr['scope'] == 'root') {
-				$_scope = Smarty::SCOPE_ROOT;
-			} elseif ($_attr['scope'] == 'global') {
-				$_scope = Smarty::SCOPE_GLOBAL;
-			} else {
-				$compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-			}
-		}
-		// compiled output
-		if (isset($parameter['smarty_internal_index'])) {
-			$output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
-		} else {
-			// implement Smarty2's behaviour of variables assigned by reference
-			if ($compiler->template->smarty instanceof SmartyBC) {
-				$output = "<?php if (isset(\$_smarty_tpl->tpl_vars[$_attr[var]])) {\$_smarty_tpl->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-				$output .= "\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value = $_attr[value]; \$_smarty_tpl->tpl_vars[$_attr[var]]->nocache = $_nocache; \$_smarty_tpl->tpl_vars[$_attr[var]]->scope = $_scope;";
-				$output .= "\n} else \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
-			} else {
-				$output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
-			}
-		}
-		if ($_scope == Smarty::SCOPE_PARENT) {
-			$output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-		} elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-			$output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
-		}
-		if ($_scope == Smarty::SCOPE_GLOBAL) {
-			$output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-		}
-		$output .= '?>';
-
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_block.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_block.php
deleted file mode 100644
index 921d807ee..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_block.php
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Block
- * Compiles the {block}{/block} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase
-{
-
-    const parent = '____SMARTY_BLOCK_PARENT____';
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $option_flags = array('hide', 'append', 'prepend', 'nocache');
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('internal_file', 'internal_uid', 'internal_line');
-    /**
-     * nested child block names
-     *
-     * @var array
-     */
-    public static $nested_block_names = array();
-
-    /**
-     * child block source buffer
-     *
-     * @var array
-     */
-    public static $block_data = array();
-
-    /**
-     * Compiles code for the {block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $_name = trim($_attr['name'], "\"'");
-
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            array_unshift(self::$nested_block_names, $_name);
-            // build {block} for child block
-            self::$block_data[$_name]['source'] =
-                "{$compiler->smarty->left_delimiter}private_child_block name={$_attr['name']} file='{$compiler->template->source->filepath}' type='{$compiler->template->source->type}' resource='{$compiler->template->template_resource}'" .
-                " uid='{$compiler->template->source->uid}' line={$compiler->lex->line}";
-            if ($_attr['nocache']) {
-                self::$block_data[$_name]['source'] .= ' nocache';
-            }
-            self::$block_data[$_name]['source'] .= $compiler->smarty->right_delimiter;
-
-            $save = array($_attr, $compiler->inheritance);
-            $this->openTag($compiler, 'block', $save);
-            // set flag for {block} tag
-            $compiler->inheritance = true;
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
-        }
-        $save = array($_attr, $compiler->inheritance, $compiler->parser->current_buffer, $compiler->nocache);
-        $this->openTag($compiler, 'block', $save);
-        $compiler->inheritance = true;
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-
-        return true;
-    }
-
-    /**
-     * Compile saved child block source
-     *
-     * @param object $compiler compiler object
-     * @param string $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileChildBlock($compiler, $_name = null)
-    {
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            if (isset($compiler->template->block_data[$name1])) {
-                //  replace inner block name with generic
-                Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= $compiler->template->block_data[$name1]['source'];
-                Smarty_Internal_Compile_Block::$block_data[$name1]['child'] = true;
-            }
-            $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            $compiler->has_code = false;
-            return;
-        }
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.child} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            $compiler->popTrace();
-            return '';
-        }
-        // flag that child is already compile by {$smarty.block.child} inclusion
-        $compiler->template->block_data[$_name]['compiled'] = true;
-        $_tpl = new Smarty_Internal_template('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-                                             $compiler->template->compile_id, $compiler->template->caching, $compiler->template->cache_lifetime);
-        if ($compiler->smarty->debugging) {
-            Smarty_Internal_Debug::ignore($_tpl);
-        }
-        $_tpl->tpl_vars = $compiler->template->tpl_vars;
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->allow_relative_path = true;
-        $_tpl->compiler->inheritance = true;
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressFilter = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $_tpl->compiler->suppressMergedTemplates = true;
-        $nocache = $compiler->nocache || $compiler->tag_nocache;
-        if (strpos($compiler->template->block_data[$_name]['source'], self::parent) !== false) {
-            $_output = str_replace(self::parent, $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl, $nocache));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl, $nocache);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl, $nocache);
-        }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
-        }
-        foreach ($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache && $compiler->template->caching) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach ($tmp1 as $name => $tmp) {
-                foreach ($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
-        $compiler->has_code = true;
-        return $_output;
-    }
-
-    /**
-     * Compile $smarty.block.parent
-     *
-     * @param object $compiler compiler object
-     * @param string $_name    optional name of child block
-     *
-     * @return string   compiled code of child block
-     */
-    static function compileParentBlock($compiler, $_name = null)
-    {
-        // if called by {$smarty.block.parent} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'], "\"'");
-                    break;
-                }
-            }
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error(' tag {$smarty.block.parent} used outside {block} tags ', $compiler->lex->taglineno);
-        }
-        if (empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-            $compiler->trigger_template_error(' illegal {$smarty.block.parent} in parent template ', $compiler->lex->taglineno);
-        }
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= Smarty_Internal_Compile_Block::parent;
-        $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-        $compiler->has_code = false;
-        return;
-    }
-
-    /**
-     * Process block source
-     *
-     * @param        $compiler
-     * @param string $source source text
-     *
-     */
-    static function blockSource($compiler, $source)
-    {
-        Smarty_Internal_Compile_Block::$block_data[Smarty_Internal_Compile_Block::$nested_block_names[0]]['source'] .= $source;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile BlockClose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        // reset flag for {block} tag
-        $compiler->inheritance = $saved_data[1];
-        // check if we process an inheritance child template
-        if ($compiler->inheritance_child) {
-            $name1 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-            Smarty_Internal_Compile_Block::$block_data[$name1]['source'] .= "{$compiler->smarty->left_delimiter}/private_child_block{$compiler->smarty->right_delimiter}";
-            array_shift(Smarty_Internal_Compile_Block::$nested_block_names);
-            if (!empty(Smarty_Internal_Compile_Block::$nested_block_names)) {
-                $name2 = Smarty_Internal_Compile_Block::$nested_block_names[0];
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child']) || !isset($compiler->template->block_data[$name1])) {
-                        Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    } else {
-                        if ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'] . Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } else {
-                            Smarty_Internal_Compile_Block::$block_data[$name2]['source'] .= $compiler->template->block_data[$name1]['source'];
-                        }
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBLOCK);
-            } else {
-                if (isset($compiler->template->block_data[$name1]) || !$saved_data[0]['hide']) {
-                    if (isset($compiler->template->block_data[$name1]) && !isset(Smarty_Internal_Compile_Block::$block_data[$name1]['child'])) {
-                        if (strpos($compiler->template->block_data[$name1]['source'], Smarty_Internal_Compile_Block::parent) !== false) {
-                            $compiler->template->block_data[$name1]['source'] =
-                                str_replace(Smarty_Internal_Compile_Block::parent, Smarty_Internal_Compile_Block::$block_data[$name1]['source'], $compiler->template->block_data[$name1]['source']);
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'prepend') {
-                            $compiler->template->block_data[$name1]['source'] .= Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                        } elseif ($compiler->template->block_data[$name1]['mode'] == 'append') {
-                            $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'] . $compiler->template->block_data[$name1]['source'];
-                        }
-                    } else {
-                        $compiler->template->block_data[$name1]['source'] = Smarty_Internal_Compile_Block::$block_data[$name1]['source'];
-                    }
-                    $compiler->template->block_data[$name1]['mode'] = 'replace';
-                    if ($saved_data[0]['append']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'append';
-                    }
-                    if ($saved_data[0]['prepend']) {
-                        $compiler->template->block_data[$name1]['mode'] = 'prepend';
-                    }
-                }
-                unset(Smarty_Internal_Compile_Block::$block_data[$name1]);
-                $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
-            }
-            $compiler->has_code = false;
-            return;
-        }
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            if ($saved_data[0]['hide'] && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
-            }
-        }
-        unset($compiler->template->block_data[$_name]['compiled']);
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[2];
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $compiler->nocache = $saved_data[3];
-        // $_output content has already nocache code processed
-        $compiler->suppressNocacheProcessing = true;
-
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'file', 'uid', 'line', 'type', 'resource');
-
-    /**
-     * Compiles code for the {private_child_block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // update template with original template resource of {block}
-        if (trim($_attr['type'], "'") == 'file') {
-            $compiler->template->template_resource = realpath(trim($_attr['file'], "'"));
-        } else {
-            $compiler->template->template_resource = trim($_attr['resource'], "'");
-        }
-        // source object
-        unset ($compiler->template->source);
-        $exists = $compiler->template->source->exists;
-
-        // must merge includes
-        if ($_attr['nocache'] == true) {
-            $compiler->tag_nocache = true;
-        }
-        $save = array($_attr, $compiler->nocache);
-
-        // set trace back to child block
-        $compiler->pushTrace(trim($_attr['file'], "\"'"), trim($_attr['uid'], "\"'"), $_attr['line'] - $compiler->lex->line);
-
-        $this->openTag($compiler, 'private_child_block', $save);
-
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Child Block Close Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Child_Blockclose extends Smarty_Internal_CompileBase
-{
-
-    /**
-     * Compiles code for the {/private_child_block} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     *
-     * @return boolean true
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $saved_data = $this->closeTag($compiler, array('private_child_block'));
-
-        // end of child block
-        $compiler->popTrace();
-
-        $compiler->nocache = $saved_data[1];
-        $compiler->has_code = false;
-
-        return true;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_break.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_break.php
deleted file mode 100644
index 69c8c4e4a..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_break.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Break
- * Compiles the {break} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Break Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('levels');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('levels');
-
-	/**
-	 * Compiles code for the {break} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-
-		if (isset($_attr['levels'])) {
-			if (!is_numeric($_attr['levels'])) {
-				$compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
-			}
-			$_levels = $_attr['levels'];
-		} else {
-			$_levels = 1;
-		}
-		$level_count = $_levels;
-		$stack_count = count($compiler->_tag_stack) - 1;
-		while ($level_count > 0 && $stack_count >= 0) {
-			if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-				$level_count--;
-			}
-			$stack_count--;
-		}
-		if ($level_count != 0) {
-			$compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
-		}
-
-		return "<?php break {$_levels}?>";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_call.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_call.php
deleted file mode 100644
index bfbd1f547..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_call.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function_Call
- * Compiles the calls of user defined tags defined by {function}
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function_Call Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles the calls of user defined tags defined by {function}
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save possible attributes
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-        $_name = $_attr['name'];
-        if ($compiler->compiles_template_function) {
-            $compiler->called_functions[] = trim($_name, "'\"");
-        }
-        unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
-        // set flag (compiled code of {function} must be included in cache file
-        if ($compiler->nocache || $compiler->tag_nocache) {
-            $_nocache = 'true';
-        } else {
-            $_nocache = 'false';
-        }
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
-            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        }
-        //variable name?
-        if (!(strpos($_name, '$') === false)) {
-            $call_cache = $_name;
-            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
-        } else {
-            $_name = trim($_name, "'\"");
-            $call_cache = "'{$_name}'";
-            $call_function = 'smarty_template_function_' . $_name;
-        }
-
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
-        // was there an assign attribute
-        if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            }
-        } else {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            }
-        }
-
-        return $_output;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_capture.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_capture.php
deleted file mode 100644
index 34728e47a..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_capture.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Capture
- * Compiles the {capture} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Capture Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'assign', 'append');
-
-    /**
-     * Compiles code for the {capture} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
-        $assign = isset($_attr['assign']) ? $_attr['assign'] : 'null';
-        $append = isset($_attr['append']) ? $_attr['append'] : 'null';
-
-        $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
-
-        return $_output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Captureclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/capture} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
-
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
-        $_output .= "if (!empty(\$_capture_buffer)) {\n";
-        $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
-        $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
-        $_output .= "} else \$_smarty_tpl->capture_error();?>";
-
-        return $_output;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_config_load.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
deleted file mode 100644
index a1aa81f1b..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_config_load.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Config Load
- * Compiles the {config load} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Config Load Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('file');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('file', 'section');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('section', 'scope');
-
-	/**
-	 * Compiles code for the {config_load} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		static $_is_legal_scope = array('local' => true, 'parent' => true, 'root' => true, 'global' => true);
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-
-		// save possible attributes
-		$conf_file = $_attr['file'];
-		if (isset($_attr['section'])) {
-			$section = $_attr['section'];
-		} else {
-			$section = 'null';
-		}
-		$scope = 'local';
-		// scope setup
-		if (isset($_attr['scope'])) {
-			$_attr['scope'] = trim($_attr['scope'], "'\"");
-			if (isset($_is_legal_scope[$_attr['scope']])) {
-				$scope = $_attr['scope'];
-			} else {
-				$compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-			}
-		}
-		// create config object
-		$_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-		$_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
-
-		return $_output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_continue.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_continue.php
deleted file mode 100644
index 0774910e5..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_continue.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Continue
- * Compiles the {continue} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Continue Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('levels');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('levels');
-
-	/**
-	 * Compiles code for the {continue} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-
-		if (isset($_attr['levels'])) {
-			if (!is_numeric($_attr['levels'])) {
-				$compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
-			}
-			$_levels = $_attr['levels'];
-		} else {
-			$_levels = 1;
-		}
-		$level_count = $_levels;
-		$stack_count = count($compiler->_tag_stack) - 1;
-		while ($level_count > 0 && $stack_count >= 0) {
-			if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-				$level_count--;
-			}
-			$stack_count--;
-		}
-		if ($level_count != 0) {
-			$compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
-		}
-
-		return "<?php continue {$_levels}?>";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_debug.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_debug.php
deleted file mode 100644
index 0a2a0c999..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_debug.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Debug
- * Compiles the {debug} tag.
- * It opens a window the the Smarty Debugging Console.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Debug Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {debug} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		// compile always as nocache
-		$compiler->tag_nocache = true;
-
-		// display debug template
-		$_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
-
-		return $_output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_eval.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_eval.php
deleted file mode 100644
index c66dab32d..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_eval.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Eval
- * Compiles the {eval} tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Eval Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('var');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('assign');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('var', 'assign');
-
-	/**
-	 * Compiles code for the {eval} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		$this->required_attributes = array('var');
-		$this->optional_attributes = array('assign');
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		if (isset($_attr['assign'])) {
-			// output will be stored in a smarty variable instead of being displayed
-			$_assign = $_attr['assign'];
-		}
-
-		// create template object
-		$_output = "\$_template = new {$compiler->smarty->template_class}('eval:'." . $_attr['var'] . ", \$_smarty_tpl->smarty, \$_smarty_tpl);";
-		//was there an assign attribute?
-		if (isset($_assign)) {
-			$_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
-		} else {
-			$_output .= "echo \$_template->fetch();";
-		}
-
-		return "<?php $_output ?>";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_extends.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_extends.php
deleted file mode 100644
index 5f36ac5ec..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_extends.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile extend
- * Compiles the {extends} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile extend Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('file');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('file');
-
-	/**
-	 * Compiles code for the {extends} tag
-	 *
-	 * @param array  $args     array with attributes from parser
-	 * @param object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-		if (strpos($_attr['file'], '$_tmp') !== false) {
-			$compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
-		}
-
-		$name = $_attr['file'];
-		/** @var Smarty_Internal_Template $_smarty_tpl
-		 * used in evaluated code
-		 */
-		$_smarty_tpl = $compiler->template;
-		eval("\$tpl_name = $name;");
-		// create template object
-		$_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template);
-		// check for recursion
-		$uid = $_template->source->uid;
-		if (isset($compiler->extends_uid[$uid])) {
-			$compiler->trigger_template_error("illegal recursive call of \"$include_file\"", $compiler->lex->line - 1);
-		}
-		$compiler->extends_uid[$uid] = true;
-		if (empty($_template->source->components)) {
-			array_unshift($compiler->sources, $_template->source);
-		} else {
-			foreach ($_template->source->components as $source) {
-				array_unshift($compiler->sources, $source);
-				$uid = $source->uid;
-				if (isset($compiler->extends_uid[$uid])) {
-					$compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line - 1);
-				}
-				$compiler->extends_uid[$uid] = true;
-			}
-		}
-		unset ($_template);
-		$compiler->inheritance_child = true;
-		$compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
-
-		return '';
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_for.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_for.php
deleted file mode 100644
index a624b922c..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_for.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile For
- * Compiles the {for} {forelse} {/for} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile For Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {for} tag
-     * Smarty 3 does implement two different syntax's:
-     * - {for $var in $array}
-     * For looping over arrays or iterators
-     * - {for $x=0; $x<$y; $x++}
-     * For general loops
-     * The parser is generating different sets of attribute by which this compiler can
-     * determine which syntax is used.
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        if ($parameter == 0) {
-            $this->required_attributes = array('start', 'to');
-            $this->optional_attributes = array('max', 'step');
-        } else {
-            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
-            $this->optional_attributes = array();
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $output = "<?php ";
-        if ($parameter == 1) {
-            foreach ($_attr['start'] as $_statement) {
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
-            }
-            $output .= "  if ($_attr[ifexp]) { for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]) {\n";
-        } else {
-            $_statement = $_attr['start'];
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-            if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
-            }
-            if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
-            }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0) {\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++) {\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
-        }
-        $output .= "?>";
-
-        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // return compiled code
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Forelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {forelse} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
-        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
-
-        return "<?php }} else { ?>";
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Forclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the {/for} tag
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
-
-        if ($openTag == 'forelse') {
-            return "<?php }  ?>";
-        } else {
-            return "<?php }} ?>";
-        }
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_foreach.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
deleted file mode 100644
index 280391394..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_foreach.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Foreach
- * Compiles the {foreach} {foreachelse} {/foreach} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Foreach Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('from', 'item');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('name', 'key');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('from', 'item', 'key', 'name');
-
-	/**
-	 * Compiles code for the {foreach} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		$from = $_attr['from'];
-		$item = $_attr['item'];
-		if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
-			$compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
-		}
-
-		if (isset($_attr['key'])) {
-			$key = $_attr['key'];
-		} else {
-			$key = null;
-		}
-
-		$this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key));
-		// maybe nocache because of nocache variables
-		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-		if (isset($_attr['name'])) {
-			$name = $_attr['name'];
-			$has_name = true;
-			$SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
-		} else {
-			$name = null;
-			$has_name = false;
-		}
-		$ItemVarName = '$' . trim($item, '\'"') . '@';
-		// evaluates which Smarty variables and properties have to be computed
-		if ($has_name) {
-			$usesSmartyFirst = strpos($compiler->lex->data, $SmartyVarName . 'first') !== false;
-			$usesSmartyLast = strpos($compiler->lex->data, $SmartyVarName . 'last') !== false;
-			$usesSmartyIndex = strpos($compiler->lex->data, $SmartyVarName . 'index') !== false;
-			$usesSmartyIteration = strpos($compiler->lex->data, $SmartyVarName . 'iteration') !== false;
-			$usesSmartyShow = strpos($compiler->lex->data, $SmartyVarName . 'show') !== false;
-			$usesSmartyTotal = strpos($compiler->lex->data, $SmartyVarName . 'total') !== false;
-		} else {
-			$usesSmartyFirst = false;
-			$usesSmartyLast = false;
-			$usesSmartyTotal = false;
-			$usesSmartyShow = false;
-		}
-
-		$usesPropFirst = $usesSmartyFirst || strpos($compiler->lex->data, $ItemVarName . 'first') !== false;
-		$usesPropLast = $usesSmartyLast || strpos($compiler->lex->data, $ItemVarName . 'last') !== false;
-		$usesPropIndex = $usesPropFirst || strpos($compiler->lex->data, $ItemVarName . 'index') !== false;
-		$usesPropIteration = $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'iteration') !== false;
-		$usesPropShow = strpos($compiler->lex->data, $ItemVarName . 'show') !== false;
-		$usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($compiler->lex->data, $ItemVarName . 'total') !== false;
-		// generate output code
-		$output = "<?php ";
-		$output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
-		if ($key != null) {
-			$output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
-		}
-		$output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
-		if ($usesPropTotal) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
-		}
-		if ($usesPropIteration) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
-		}
-		if ($usesPropIndex) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
-		}
-		if ($usesPropShow) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-		}
-		if ($has_name) {
-			if ($usesSmartyTotal) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
-			}
-			if ($usesSmartyIteration) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
-			}
-			if ($usesSmartyIndex) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
-			}
-			if ($usesSmartyShow) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-			}
-		}
-		$output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value) {\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
-		if ($key != null) {
-			$output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
-		}
-		if ($usesPropIteration) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
-		}
-		if ($usesPropIndex) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
-		}
-		if ($usesPropFirst) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
-		}
-		if ($usesPropLast) {
-			$output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
-		}
-		if ($has_name) {
-			if ($usesSmartyFirst) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
-			}
-			if ($usesSmartyIteration) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
-			}
-			if ($usesSmartyIndex) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
-			}
-			if ($usesSmartyLast) {
-				$output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
-			}
-		}
-		$output .= "?>";
-
-		return $output;
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {foreachelse} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach'));
-		$this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key));
-
-		return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/foreach} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		// must endblock be nocache?
-		if ($compiler->nocache) {
-			$compiler->tag_nocache = true;
-		}
-
-		list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
-
-		return "<?php } ?>";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_function.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_function.php
deleted file mode 100644
index 1572185da..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_function.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function
- * Compiles the {function} {/function} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('name');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('name');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the {function} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return boolean true
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-		unset($_attr['nocache']);
-		$save = array($_attr, $compiler->parser->current_buffer,
-					  $compiler->template->has_nocache_code, $compiler->template->required_plugins
-		);
-		$this->openTag($compiler, 'function', $save);
-		$_name = trim($_attr['name'], "'\"");
-		unset($_attr['name']);
-		// set flag that we are compiling a template function
-		$compiler->compiles_template_function = true;
-		$compiler->template->properties['function'][$_name]['parameter'] = array();
-		/** @var Smarty_Internal_Template $_smarty_tpl
-		 * used in evaluated code
-		 */
-		$_smarty_tpl = $compiler->template;
-		foreach ($_attr as $_key => $_data) {
-			eval ('$tmp=' . $_data . ';');
-			$compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
-		}
-		$compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
-		if ($compiler->template->caching) {
-			$output = '';
-		} else {
-			$output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
-    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-		}
-		// Init temporary context
-		$compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-		$compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-		$compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
-		$compiler->template->has_nocache_code = false;
-		$compiler->has_code = false;
-		$compiler->template->properties['function'][$_name]['compiled'] = '';
-
-		return true;
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Functionclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/function} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return boolean true
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		$_attr = $this->getAttributes($compiler, $args);
-		$saved_data = $this->closeTag($compiler, array('function'));
-		$_name = trim($saved_data[0]['name'], "'\"");
-		// build plugin include code
-		$plugins_string = '';
-		if (!empty($compiler->template->required_plugins['compiled'])) {
-			$plugins_string = '<?php ';
-			foreach ($compiler->template->required_plugins['compiled'] as $tmp) {
-				foreach ($tmp as $data) {
-					$plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-				}
-			}
-			$plugins_string .= '?>';
-		}
-		if (!empty($compiler->template->required_plugins['nocache'])) {
-			$plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-			foreach ($compiler->template->required_plugins['nocache'] as $tmp) {
-				foreach ($tmp as $data) {
-					$plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
-				}
-			}
-			$plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
-		}
-		// remove last line break from function definition
-		$last = count($compiler->parser->current_buffer->subtrees) - 1;
-		if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
-			unset($compiler->parser->current_buffer->subtrees[$last]);
-		}
-		// if caching save template function for possible nocache call
-		if ($compiler->template->caching) {
-			$compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
-				. $compiler->parser->current_buffer->to_smarty_php();
-			$compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-			$compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
-			$compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions;
-			$compiler->called_functions = array();
-			$compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
-			$compiler->has_code = false;
-			$output = true;
-		} else {
-			$output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;
-foreach (Smarty::\$global_tpl_vars as \$key => \$value) if(!isset(\$_smarty_tpl->tpl_vars[\$key])) \$_smarty_tpl->tpl_vars[\$key] = \$value;}}?>\n";
-		}
-		// reset flag that we are compiling a template function
-		$compiler->compiles_template_function = false;
-		// restore old compiler status
-		$compiler->parser->current_buffer = $saved_data[1];
-		$compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
-		$compiler->template->required_plugins = $saved_data[3];
-
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_if.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_if.php
deleted file mode 100644
index c7094ff03..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_if.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile If
- * Compiles the {if} {else} {elseif} {/if} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile If Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {if} tag
-	 *
-	 * @param array  $args      array with attributes from parser
-	 * @param object $compiler  compiler object
-	 * @param array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		$this->openTag($compiler, 'if', array(1, $compiler->nocache));
-		// must whole block be nocache ?
-		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-		if (!array_key_exists("if condition", $parameter)) {
-			$compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
-		}
-
-		if (is_array($parameter['if condition'])) {
-			if ($compiler->nocache) {
-				$_nocache = ',true';
-				// create nocache var to make it know for further compiling
-				if (is_array($parameter['if condition']['var'])) {
-					$compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-				} else {
-					$compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-				}
-			} else {
-				$_nocache = '';
-			}
-			if (is_array($parameter['if condition']['var'])) {
-				$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-				$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-			} else {
-				$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-				$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-			}
-
-			return $_output;
-		} else {
-			return "<?php if ({$parameter['if condition']}) {?>";
-		}
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Else Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {else} tag
-	 *
-	 * @param array  $args      array with attributes from parser
-	 * @param object $compiler  compiler object
-	 * @param array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-		$this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
-
-		return "<?php } else { ?>";
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile ElseIf Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {elseif} tag
-	 *
-	 * @param array  $args      array with attributes from parser
-	 * @param object $compiler  compiler object
-	 * @param array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-
-		if (!array_key_exists("if condition", $parameter)) {
-			$compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
-		}
-
-		if (is_array($parameter['if condition'])) {
-			$condition_by_assign = true;
-			if ($compiler->nocache) {
-				$_nocache = ',true';
-				// create nocache var to make it know for further compiling
-				if (is_array($parameter['if condition']['var'])) {
-					$compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-				} else {
-					$compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-				}
-			} else {
-				$_nocache = '';
-			}
-		} else {
-			$condition_by_assign = false;
-		}
-
-		if (empty($compiler->prefix_code)) {
-			if ($condition_by_assign) {
-				$this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-				if (is_array($parameter['if condition']['var'])) {
-					$_output = "<?php } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-					$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-				} else {
-					$_output = "<?php  } else { if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-					$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-				}
-
-				return $_output;
-			} else {
-				$this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
-
-				return "<?php } elseif ({$parameter['if condition']}) {?>";
-			}
-		} else {
-			$tmp = '';
-			foreach ($compiler->prefix_code as $code) {
-				$tmp .= $code;
-			}
-			$compiler->prefix_code = array();
-			$this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-			if ($condition_by_assign) {
-				if (is_array($parameter['if condition']['var'])) {
-					$_output = "<?php } else {?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-					$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-				} else {
-					$_output = "<?php } else {?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-					$_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-				}
-
-				return $_output;
-			} else {
-				return "<?php } else {?>{$tmp}<?php if ({$parameter['if condition']}) {?>";
-			}
-		}
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Ifclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/if} tag
-	 *
-	 * @param array  $args      array with attributes from parser
-	 * @param object $compiler  compiler object
-	 * @param array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// must endblock be nocache?
-		if ($compiler->nocache) {
-			$compiler->tag_nocache = true;
-		}
-		list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
-		$tmp = '';
-		for ($i = 0; $i < $nesting; $i++) {
-			$tmp .= '}';
-		}
-
-		return "<?php {$tmp}?>";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_include.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_include.php
deleted file mode 100644
index 14c368cfc..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_include.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include
- * Compiles the {include} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Include Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
-{
-	/**
-	 * caching mode to create nocache code but no cache file
-	 */
-	const CACHING_NOCACHE_CODE = 9999;
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('file');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('file');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $option_flags = array('nocache', 'inline', 'caching');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the {include} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		// save possible attributes
-		$include_file = $_attr['file'];
-
-		if (isset($_attr['assign'])) {
-			// output will be stored in a smarty variable instead of being displayed
-			$_assign = $_attr['assign'];
-		}
-
-		$_parent_scope = Smarty::SCOPE_LOCAL;
-		if (isset($_attr['scope'])) {
-			$_attr['scope'] = trim($_attr['scope'], "'\"");
-			if ($_attr['scope'] == 'parent') {
-				$_parent_scope = Smarty::SCOPE_PARENT;
-			} elseif ($_attr['scope'] == 'root') {
-				$_parent_scope = Smarty::SCOPE_ROOT;
-			} elseif ($_attr['scope'] == 'global') {
-				$_parent_scope = Smarty::SCOPE_GLOBAL;
-			}
-		}
-
-		$_caching = Smarty::CACHING_OFF;
-
-		// flag if included template code should be merged into caller
-		$merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) || $_attr['inline'] === true) && !$compiler->template->source->recompiled;
-
-		// set default when in nocache mode
-		//       if ($compiler->template->caching && ($compiler->nocache || $compiler->tag_nocache || $compiler->forceNocache == 2)) {
-		if ($compiler->template->caching && ((!$compiler->inheritance && !$compiler->nocache && !$compiler->tag_nocache) || ($compiler->inheritance && ($compiler->nocache || $compiler->tag_nocache)))) {
-			$_caching = self::CACHING_NOCACHE_CODE;
-		}
-		/*
-		* if the {include} tag provides individual parameter for caching
-		* it will not be included into the common cache file and treated like
-		* a nocache section
-		*/
-		if (isset($_attr['cache_lifetime'])) {
-			$_cache_lifetime = $_attr['cache_lifetime'];
-			$compiler->tag_nocache = true;
-			$_caching = Smarty::CACHING_LIFETIME_CURRENT;
-		} else {
-			$_cache_lifetime = 'null';
-		}
-		if (isset($_attr['cache_id'])) {
-			$_cache_id = $_attr['cache_id'];
-			$compiler->tag_nocache = true;
-			$_caching = Smarty::CACHING_LIFETIME_CURRENT;
-		} else {
-			$_cache_id = '$_smarty_tpl->cache_id';
-		}
-		if (isset($_attr['compile_id'])) {
-			$_compile_id = $_attr['compile_id'];
-		} else {
-			$_compile_id = '$_smarty_tpl->compile_id';
-		}
-		if ($_attr['caching'] === true) {
-			$_caching = Smarty::CACHING_LIFETIME_CURRENT;
-		}
-		if ($_attr['nocache'] === true) {
-			$compiler->tag_nocache = true;
-			if ($merge_compiled_includes) {
-				$_caching = self::CACHING_NOCACHE_CODE;
-			} else {
-				$_caching = Smarty::CACHING_OFF;
-			}
-		}
-
-		$has_compiled_template = false;
-		if ($merge_compiled_includes && $_attr['inline'] !== true) {
-			// variable template name ?
-			if ($compiler->has_variable_string || !((substr_count($include_file, '"') == 2 || substr_count($include_file, "'") == 2))
-				|| substr_count($include_file, '(') != 0 || substr_count($include_file, '$_smarty_tpl->') != 0
-			) {
-				$merge_compiled_includes = false;
-				if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-					$compiler->trigger_template_error(' variable template file names not allow within {block} tags');
-				}
-			}
-			// variable compile_id?
-			if (isset($_attr['compile_id'])) {
-				if (!((substr_count($_attr['compile_id'], '"') == 2 || substr_count($_attr['compile_id'], "'") == 2))
-					|| substr_count($_attr['compile_id'], '(') != 0 || substr_count($_attr['compile_id'], '$_smarty_tpl->') != 0
-				) {
-					$merge_compiled_includes = false;
-					if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-						$compiler->trigger_template_error(' variable compile_id not allow within {block} tags');
-					}
-				}
-			}
-		}
-		if ($merge_compiled_includes) {
-			if ($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache) && $_caching != self::CACHING_NOCACHE_CODE) {
-				$merge_compiled_includes = false;
-				if ($compiler->inheritance && $compiler->smarty->inheritance_merge_compiled_includes) {
-					$compiler->trigger_template_error(' invalid caching mode of subtemplate within {block} tags');
-				}
-			}
-		}
-		if ($merge_compiled_includes) {
-			// we must observe different compile_id
-			$uid = sha1($_compile_id);
-			$tpl_name = null;
-			$nocache = false;
-			/** @var Smarty_Internal_Template $_smarty_tpl
-			 * used in evaluated code
-			 */
-			$_smarty_tpl = $compiler->template;
-			eval("\$tpl_name = $include_file;");
-			if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid])) {
-				$tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
-				// save unique function name
-				$compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-				// use current nocache hash for inlined code
-				$compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-				if ($compiler->template->caching && $_caching == self::CACHING_NOCACHE_CODE) {
-					// all code must be nocache
-					$nocache = true;
-				}
-				if ($compiler->inheritance) {
-					$tpl->compiler->inheritance = true;
-				}
-				// make sure whole chain gets compiled
-				$tpl->mustCompile = true;
-				if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-
-					// get compiled code
-					$compiled_code = $tpl->compiler->compileTemplate($tpl, $nocache);
-					// release compiler object to free memory
-					unset($tpl->compiler);
-					// merge compiled code for {function} tags
-					$compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
-					// merge filedependency
-					$tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp, $tpl->source->type);
-					$compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
-					// remove header code
-					$compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-					if ($tpl->has_nocache_code) {
-						// replace nocache_hash
-						$compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-						$compiler->template->has_nocache_code = true;
-					}
-					$compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
-					$has_compiled_template = true;
-					unset ($tpl);
-				}
-			} else {
-				$has_compiled_template = true;
-			}
-		}
-		// delete {include} standard attributes
-		unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
-		// remaining attributes must be assigned as smarty variable
-		if (!empty($_attr)) {
-			if ($_parent_scope == Smarty::SCOPE_LOCAL) {
-				// create variables
-				$nccode = '';
-				foreach ($_attr as $key => $value) {
-					$_pairs[] = "'$key'=>$value";
-					$nccode .= "\$_smarty_tpl->tpl_vars['$key'] =  new Smarty_variable($value);\n";
-				}
-				$_vars = 'array(' . join(',', $_pairs) . ')';
-			} else {
-				$compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
-			}
-		} else {
-			$_vars = 'array()';
-		}
-		if ($has_compiled_template) {
-			// never call inline templates in nocache mode
-			$compiler->suppressNocacheProcessing = true;
-			$_hash = $compiler->smarty->merged_templates_func[$tpl_name][$uid]['nocache_hash'];
-			$_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
-			$_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
-			if (!empty($nccode) && $_caching == 9999 && $_smarty_tpl->caching) {
-				$compiler->suppressNocacheProcessing = false;
-				$_output .= substr($compiler->processNocacheCode('<?php ' . $nccode . "?>\n", true), 6, -3);
-				$compiler->suppressNocacheProcessing = true;
-			}
-			$_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
-			if (isset($_assign)) {
-				$_output .= 'ob_start(); ';
-			}
-			$_output .= $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] . "(\$_smarty_tpl);\n";
-			$_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
-			if (isset($_assign)) {
-				$_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
-			}
-			$_output .= "\n/*  End of included template \"" . $tpl_name . "\" */?>";
-
-			return $_output;
-		}
-
-		// was there an assign attribute
-		if (isset($_assign)) {
-			$_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
-		} else {
-			$_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
-		}
-
-		return $_output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_include_php.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
deleted file mode 100644
index 76f506c52..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_include_php.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include PHP
- * Compiles the {include_php} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('once', 'assign');
-
-    /**
-     * Compiles code for the {include_php} tag
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     *
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        if (!($compiler->smarty instanceof SmartyBC)) {
-            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        /** @var Smarty_Internal_Template $_smarty_tpl
-         * used in evaluated code
-         */
-        $_smarty_tpl = $compiler->template;
-        $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';');
-        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $_file;
-        } else {
-            if (isset($compiler->smarty->security_policy)) {
-                $_dir = $compiler->smarty->security_policy->trusted_dir;
-            } else {
-                $_dir = $compiler->smarty->trusted_dir;
-            }
-            if (!empty($_dir)) {
-                foreach ((array) $_dir as $_script_dir) {
-                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir . $_file;
-                        break;
-                    }
-                }
-            }
-        }
-        if ($_filepath == false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
-        }
-
-        if (isset($compiler->smarty->security_policy)) {
-            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
-        }
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-        $_once = '_once';
-        if (isset($_attr['once'])) {
-            if ($_attr['once'] == 'false') {
-                $_once = '';
-            }
-        }
-
-        if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
-        } else {
-            return "<?php include{$_once} ('{$_filepath}');?>\n";
-        }
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_insert.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_insert.php
deleted file mode 100644
index 4a3dcaae7..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_insert.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Insert
- * Compiles the {insert} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('name');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('name');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the {insert} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		// never compile as nocache code
-		$compiler->suppressNocacheProcessing = true;
-		$compiler->tag_nocache = true;
-		$_smarty_tpl = $compiler->template;
-		$_name = null;
-		$_script = null;
-
-		$_output = '<?php ';
-		// save possible attributes
-		eval('$_name = ' . $_attr['name'] . ';');
-		if (isset($_attr['assign'])) {
-			// output will be stored in a smarty variable instead of being displayed
-			$_assign = $_attr['assign'];
-			// create variable to make sure that the compiler knows about its nocache status
-			$compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
-		}
-		if (isset($_attr['script'])) {
-			// script which must be included
-			$_function = "smarty_insert_{$_name}";
-			$_smarty_tpl = $compiler->template;
-			$_filepath = false;
-			eval('$_script = ' . $_attr['script'] . ';');
-			if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
-				$_filepath = $_script;
-			} else {
-				if (isset($compiler->smarty->security_policy)) {
-					$_dir = $compiler->smarty->security_policy->trusted_dir;
-				} else {
-					$_dir = $compiler->smarty->trusted_dir;
-				}
-				if (!empty($_dir)) {
-					foreach ((array)$_dir as $_script_dir) {
-						$_script_dir = rtrim($_script_dir, '/\\') . DS;
-						if (file_exists($_script_dir . $_script)) {
-							$_filepath = $_script_dir . $_script;
-							break;
-						}
-					}
-				}
-			}
-			if ($_filepath == false) {
-				$compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
-			}
-			// code for script file loading
-			$_output .= "require_once '{$_filepath}' ;";
-			require_once $_filepath;
-			if (!is_callable($_function)) {
-				$compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
-			}
-		} else {
-			$_filepath = 'null';
-			$_function = "insert_{$_name}";
-			// function in PHP script ?
-			if (!is_callable($_function)) {
-				// try plugin
-				if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-					$compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
-				}
-			}
-		}
-		// delete {insert} standard attributes
-		unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']);
-		// convert attributes into parameter array string
-		$_paramsArray = array();
-		foreach ($_attr as $_key => $_value) {
-			$_paramsArray[] = "'$_key' => $_value";
-		}
-		$_params = 'array(' . implode(", ", $_paramsArray) . ')';
-		// call insert
-		if (isset($_assign)) {
-			if ($_smarty_tpl->caching) {
-				$_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
-			} else {
-				$_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
-			}
-		} else {
-			$compiler->has_output = true;
-			if ($_smarty_tpl->caching) {
-				$_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
-			} else {
-				$_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
-			}
-		}
-
-		return $_output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
deleted file mode 100644
index 231403c51..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_ldelim.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Ldelim
- * Compiles the {ldelim} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Ldelim Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {ldelim} tag
-	 * This tag does output the left delimiter
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-		// this tag does not return compiled code
-		$compiler->has_code = true;
-
-		return $compiler->smarty->left_delimiter;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_nocache.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
deleted file mode 100644
index d76226222..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_nocache.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Nocache
- * Compiles the {nocache} {/nocache} tags.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Nocache Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {nocache} tag
-	 * This tag does not generate compiled output. It only sets a compiler flag.
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return bool
-	 */
-	public function compile($args, $compiler)
-	{
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-		// enter nocache mode
-		$compiler->nocache = true;
-		// this tag does not return compiled code
-		$compiler->has_code = false;
-
-		return true;
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Nocacheclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/nocache} tag
-	 * This tag does not generate compiled output. It only sets a compiler flag.
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return bool
-	 */
-	public function compile($args, $compiler)
-	{
-		$_attr = $this->getAttributes($compiler, $args);
-		// leave nocache mode
-		$compiler->nocache = false;
-		// this tag does not return compiled code
-		$compiler->has_code = false;
-
-		return true;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
deleted file mode 100644
index 1e7c1b7e7..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Block Plugin
- * Compiles code for the execution of block plugin
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Block Plugin Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the execution of block plugin
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 * @param  string $tag       name of block plugin
-	 * @param  string $function  PHP function name
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter, $tag, $function)
-	{
-		if (!isset($tag[5]) || substr($tag, -5) != 'close') {
-			// opening tag of block plugin
-			// check and get attributes
-			$_attr = $this->getAttributes($compiler, $args);
-			if ($_attr['nocache'] === true) {
-				$compiler->tag_nocache = true;
-			}
-			unset($_attr['nocache']);
-			// convert attributes into parameter array string
-			$_paramsArray = array();
-			foreach ($_attr as $_key => $_value) {
-				if (is_int($_key)) {
-					$_paramsArray[] = "$_key=>$_value";
-				} else {
-					$_paramsArray[] = "'$_key'=>$_value";
-				}
-			}
-			$_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-			$this->openTag($compiler, $tag, array($_params, $compiler->nocache));
-			// maybe nocache because of nocache variables or nocache plugin
-			$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-			// compile code
-			$output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-		} else {
-			// must endblock be nocache?
-			if ($compiler->nocache) {
-				$compiler->tag_nocache = true;
-			}
-			// closing tag of block plugin, restore nocache
-			list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5));
-			// This tag does create output
-			$compiler->has_output = true;
-			// compile code
-			if (!isset($parameter['modifier_list'])) {
-				$mod_pre = $mod_post = '';
-			} else {
-				$mod_pre = ' ob_start(); ';
-				$mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-			}
-			$output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-		}
-
-		return $output . "\n";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
deleted file mode 100644
index 9a4ac30da..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function Plugin
- * Compiles code for the execution of function plugin
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Plugin Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array();
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the execution of function plugin
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 * @param  string $tag       name of function plugin
-	 * @param  string $function  PHP function name
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter, $tag, $function)
-	{
-		// This tag does create output
-		$compiler->has_output = true;
-
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache'] === true) {
-			$compiler->tag_nocache = true;
-		}
-		unset($_attr['nocache']);
-		// convert attributes into parameter array string
-		$_paramsArray = array();
-		foreach ($_attr as $_key => $_value) {
-			if (is_int($_key)) {
-				$_paramsArray[] = "$_key=>$_value";
-			} else {
-				$_paramsArray[] = "'$_key'=>$_value";
-			}
-		}
-		$_params = 'array(' . implode(",", $_paramsArray) . ')';
-		// compile code
-		$output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
deleted file mode 100644
index 48ad2295c..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_modifier.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Modifier
- * Compiles code for modifier execution
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Modifier Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for modifier execution
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		$output = $parameter['value'];
-		// loop over list of modifiers
-		foreach ($parameter['modifierlist'] as $single_modifier) {
-			$modifier = $single_modifier[0];
-			$single_modifier[0] = $output;
-			$params = implode(',', $single_modifier);
-			// check if we know already the type of modifier
-			if (isset($compiler->known_modifier_type[$modifier])) {
-				$modifier_types = array($compiler->known_modifier_type[$modifier]);
-			} else {
-				$modifier_types = array(1, 2, 3, 4, 5, 6);
-			}
-			foreach ($modifier_types as $type) {
-				switch ($type) {
-					case 1:
-						// registered modifier
-						if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) {
-							$function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
-							if (!is_array($function)) {
-								$output = "{$function}({$params})";
-							} else {
-								if (is_object($function[0])) {
-									$output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
-								} else {
-									$output = $function[0] . '::' . $function[1] . '(' . $params . ')';
-								}
-							}
-							$compiler->known_modifier_type[$modifier] = $type;
-							break 2;
-						}
-						break;
-					case 2:
-						// registered modifier compiler
-						if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) {
-							$output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty);
-							$compiler->known_modifier_type[$modifier] = $type;
-							break 2;
-						}
-						break;
-					case 3:
-						// modifiercompiler plugin
-						if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
-							// check if modifier allowed
-							if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-								$plugin = 'smarty_modifiercompiler_' . $modifier;
-								$output = $plugin($single_modifier, $compiler);
-							}
-							$compiler->known_modifier_type[$modifier] = $type;
-							break 2;
-						}
-						break;
-					case 4:
-						// modifier plugin
-						if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
-							// check if modifier allowed
-							if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-								$output = "{$function}({$params})";
-							}
-							$compiler->known_modifier_type[$modifier] = $type;
-							break 2;
-						}
-						break;
-					case 5:
-						// PHP function
-						if (is_callable($modifier)) {
-							// check if modifier allowed
-							if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
-								$output = "{$modifier}({$params})";
-							}
-							$compiler->known_modifier_type[$modifier] = $type;
-							break 2;
-						}
-						break;
-					case 6:
-						// default plugin handler
-						if (isset($compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier]) || (is_callable($compiler->smarty->default_plugin_handler_func) && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))) {
-							$function = $compiler->default_handler_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
-							// check if modifier allowed
-							if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-								if (!is_array($function)) {
-									$output = "{$function}({$params})";
-								} else {
-									if (is_object($function[0])) {
-										$output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
-									} else {
-										$output = $function[0] . '::' . $function[1] . '(' . $params . ')';
-									}
-								}
-							}
-							if (isset($compiler->template->required_plugins['nocache'][$modifier][Smarty::PLUGIN_MODIFIER]['file']) || isset($compiler->template->required_plugins['compiled'][$modifier][Smarty::PLUGIN_MODIFIER]['file'])) {
-								// was a plugin
-								$compiler->known_modifier_type[$modifier] = 4;
-							} else {
-								$compiler->known_modifier_type[$modifier] = $type;
-							}
-							break 2;
-						}
-				}
-			}
-			if (!isset($compiler->known_modifier_type[$modifier])) {
-				$compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
-			}
-		}
-
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
deleted file mode 100644
index 5418fefff..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Block Function
- * Compiles code for registered objects as block function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Block Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of block plugin
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block object
-     * @param  string $method    name of method to call
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $method)
-    {
-        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache'] === true) {
-                $compiler->tag_nocache = true;
-            }
-            unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag . '->' . $method, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-            // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-        } else {
-            $base_tag = substr($tag, 0, - 5);
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag . '->' . $method);
-            // This tag does create output
-            $compiler->has_output = true;
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post = '';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-            }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        }
-
-        return $output . "\n";
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
deleted file mode 100644
index caed9eee2..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_object_function.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Function
- * Compiles code for registered objects as function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the execution of function plugin
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 * @param  string $tag       name of function
-	 * @param  string $method    name of method to call
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter, $tag, $method)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache'] === true) {
-			$compiler->tag_nocache = true;
-		}
-		unset($_attr['nocache']);
-		$_assign = null;
-		if (isset($_attr['assign'])) {
-			$_assign = $_attr['assign'];
-			unset($_attr['assign']);
-		}
-		// method or property ?
-		if (method_exists($compiler->smarty->registered_objects[$tag][0], $method)) {
-			// convert attributes into parameter array string
-			if ($compiler->smarty->registered_objects[$tag][2]) {
-				$_paramsArray = array();
-				foreach ($_attr as $_key => $_value) {
-					if (is_int($_key)) {
-						$_paramsArray[] = "$_key=>$_value";
-					} else {
-						$_paramsArray[] = "'$_key'=>$_value";
-					}
-				}
-				$_params = 'array(' . implode(",", $_paramsArray) . ')';
-				$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
-			} else {
-				$_params = implode(",", $_attr);
-				$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
-			}
-		} else {
-			// object property
-			$return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
-		}
-
-		if (empty($_assign)) {
-			// This tag does create output
-			$compiler->has_output = true;
-			$output = "<?php echo {$return};?>\n";
-		} else {
-			$output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
-		}
-
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
deleted file mode 100644
index 88ec69280..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Print Expression
- * Compiles any tag which will output an expression or variable
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Print Expression Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('assign');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $option_flags = array('nocache', 'nofilter');
-
-	/**
-	 * Compiles code for generating output from any expression
-	 *
-	 * @param array  $args      array with attributes from parser
-	 * @param object $compiler  compiler object
-	 * @param array  $parameter array with compilation parameter
-	 *
-	 * @throws SmartyException
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		// nocache option
-		if ($_attr['nocache'] === true) {
-			$compiler->tag_nocache = true;
-		}
-		if (isset($_attr['assign'])) {
-			// assign output to variable
-			$output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
-		} else {
-			// display value
-			$output = $parameter['value'];
-			// tag modifier
-			if (!empty($parameter['modifierlist'])) {
-				$output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
-			}
-			if (!$_attr['nofilter']) {
-				// default modifier
-				if (!empty($compiler->smarty->default_modifiers)) {
-					if (empty($compiler->default_modifier_list)) {
-						$modifierlist = array();
-						foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
-							preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
-							for ($i = 0, $count = count($mod_array[0]); $i < $count; $i++) {
-								if ($mod_array[0][$i] != ':') {
-									$modifierlist[$key][] = $mod_array[0][$i];
-								}
-							}
-						}
-						$compiler->default_modifier_list = $modifierlist;
-					}
-					$output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
-				}
-				// autoescape html
-				if ($compiler->template->smarty->escape_html) {
-					$output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
-				}
-				// loop over registered filters
-				if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
-					foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
-						if (!is_array($function)) {
-							$output = "{$function}({$output},\$_smarty_tpl)";
-						} elseif (is_object($function[0])) {
-							$output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
-						} else {
-							$output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
-						}
-					}
-				}
-				// auto loaded filters
-				if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
-					foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
-						$result = $this->compile_output_filter($compiler, $name, $output);
-						if ($result !== false) {
-							$output = $result;
-						} else {
-							// not found, throw exception
-							throw new SmartyException("Unable to load filter '{$name}'");
-						}
-					}
-				}
-				if (isset($compiler->template->variable_filters)) {
-					foreach ($compiler->template->variable_filters as $filter) {
-						if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
-							$output = $result;
-						} else {
-							$output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
-						}
-					}
-				}
-			}
-
-			$compiler->has_output = true;
-			$output = "<?php echo {$output};?>";
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param object $compiler compiler object
-	 * @param string $name     name of variable filter
-	 * @param string $output   embedded output
-	 *
-	 * @return string
-	 */
-	private function compile_output_filter($compiler, $name, $output)
-	{
-		$plugin_name = "smarty_variablefilter_{$name}";
-		$path = $compiler->smarty->loadPlugin($plugin_name, false);
-		if ($path) {
-			if ($compiler->template->caching) {
-				$compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-				$compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
-			} else {
-				$compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-				$compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
-			}
-		} else {
-			// not found
-			return false;
-		}
-
-		return "{$plugin_name}({$output},\$_smarty_tpl)";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
deleted file mode 100644
index 68ab644fc..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Block
- * Compiles code for the execution of a registered block function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Block Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase
-{
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of a block function
-     *
-     * @param  array  $args      array with attributes from parser
-     * @param  object $compiler  compiler object
-     * @param  array  $parameter array with compilation parameter
-     * @param  string $tag       name of block function
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag)
-    {
-        if (!isset($tag[5]) || substr($tag, - 5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache']) {
-                $compiler->tag_nocache = true;
-            }
-            unset($_attr['nocache']);
-            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
-                $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
-            } else {
-                $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
-            }
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
-                    $_value = str_replace("'", "^#^", $_value);
-                    $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = !$tag_info[1] | $compiler->nocache | $compiler->tag_nocache;
-            $function = $tag_info[0];
-            // compile code
-            if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } elseif (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            }
-        } else {
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            $base_tag = substr($tag, 0, - 5);
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag);
-            // This tag does create output
-            $compiler->has_output = true;
-            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-            } else {
-                $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-            }
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post = '';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-            }
-            if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);" . $mod_post . " } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } elseif (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;" . $mod_pre . " echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            }
-        }
-
-        return $output . "\n";
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
deleted file mode 100644
index 967c54a8b..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Function
- * Compiles code for the execution of a registered function
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Function Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('_any');
-
-	/**
-	 * Compiles code for the execution of a registered function
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 * @param  string $tag       name of function
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter, $tag)
-	{
-		// This tag does create output
-		$compiler->has_output = true;
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache']) {
-			$compiler->tag_nocache = true;
-		}
-		unset($_attr['nocache']);
-		if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
-			$tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-		} else {
-			$tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-		}
-		// not cachable?
-		$compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[1];
-		// convert attributes into parameter array string
-		$_paramsArray = array();
-		foreach ($_attr as $_key => $_value) {
-			if (is_int($_key)) {
-				$_paramsArray[] = "$_key=>$_value";
-			} elseif ($compiler->template->caching && in_array($_key, $tag_info[2])) {
-				$_value = str_replace("'", "^#^", $_value);
-				$_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-			} else {
-				$_paramsArray[] = "'$_key'=>$_value";
-			}
-		}
-		$_params = 'array(' . implode(",", $_paramsArray) . ')';
-		$function = $tag_info[0];
-		// compile code
-		if (!is_array($function)) {
-			$output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-		} elseif (is_object($function[0])) {
-			$output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-		} else {
-			$output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-		}
-
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
deleted file mode 100644
index 23b17ae14..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Special Smarty Variable
- * Compiles the special $smarty variables
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile special Smarty Variable Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
-{
-    /**
-     * Compiles code for the special $smarty variables
-     *
-     * @param  array  $args     array with attributes from parser
-     * @param  object $compiler compiler object
-     * @param         $parameter
-     *
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        switch ($variable) {
-            case 'foreach':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'section':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'capture':
-                return "Smarty::\$_smarty_vars$parameter";
-            case 'now':
-                return 'time()';
-            case 'cookies':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_COOKIE';
-                break;
-
-            case 'get':
-            case 'post':
-            case 'env':
-            case 'server':
-            case 'session':
-            case 'request':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_' . strtoupper($variable);
-                break;
-
-            case 'template':
-                return 'basename($_smarty_tpl->source->filepath)';
-
-            case 'template_object':
-                return '$_smarty_tpl';
-
-            case 'current_dir':
-                return 'dirname($_smarty_tpl->source->filepath)';
-
-            case 'version':
-                $_version = Smarty::SMARTY_VERSION;
-
-                return "'$_version'";
-
-            case 'const':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                    $compiler->trigger_template_error("(secure mode) constants not permitted");
-                    break;
-                }
-
-                return "@constant({$_index[1]})";
-
-            case 'config':
-                if (isset($_index[2])) {
-                    return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
-                } else {
-                    return "\$_smarty_tpl->getConfigVariable($_index[1])";
-                }
-            case 'ldelim':
-                $_ldelim = $compiler->smarty->left_delimiter;
-
-                return "'$_ldelim'";
-
-            case 'rdelim':
-                $_rdelim = $compiler->smarty->right_delimiter;
-
-                return "'$_rdelim'";
-
-            default:
-                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                break;
-        }
-        if (isset($_index[1])) {
-            array_shift($_index);
-            foreach ($_index as $_ind) {
-                $compiled_ref = $compiled_ref . "[$_ind]";
-            }
-        }
-
-        return $compiled_ref;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
deleted file mode 100644
index 232c68209..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_rdelim.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Rdelim
- * Compiles the {rdelim} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Rdelim Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {rdelim} tag
-	 * This tag does output the right delimiter.
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		$_attr = $this->getAttributes($compiler, $args);
-		if ($_attr['nocache'] === true) {
-			$compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-		}
-		// this tag does not return compiled code
-		$compiler->has_code = true;
-
-		return $compiler->smarty->right_delimiter;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_section.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_section.php
deleted file mode 100644
index 3200292d8..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_section.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Section
- * Compiles the {section} {sectionelse} {/section} tags
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Section Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $required_attributes = array('name', 'loop');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $shorttag_order = array('name', 'loop');
-	/**
-	 * Attribute definition: Overwrites base class.
-	 *
-	 * @var array
-	 * @see Smarty_Internal_CompileBase
-	 */
-	public $optional_attributes = array('start', 'step', 'max', 'show');
-
-	/**
-	 * Compiles code for the {section} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		$this->openTag($compiler, 'section', array('section', $compiler->nocache));
-		// maybe nocache because of nocache variables
-		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-		$output = "<?php ";
-
-		$section_name = $_attr['name'];
-
-		$output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-		$section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
-
-		foreach ($_attr as $attr_name => $attr_value) {
-			switch ($attr_name) {
-				case 'loop':
-					$output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop); unset(\$_loop);\n";
-					break;
-
-				case 'show':
-					if (is_bool($attr_value)) {
-						$show_attr_value = $attr_value ? 'true' : 'false';
-					} else {
-						$show_attr_value = "(bool) $attr_value";
-					}
-					$output .= "{$section_props}['show'] = $show_attr_value;\n";
-					break;
-
-				case 'name':
-					$output .= "{$section_props}['$attr_name'] = $attr_value;\n";
-					break;
-
-				case 'max':
-				case 'start':
-					$output .= "{$section_props}['$attr_name'] = (int) $attr_value;\n";
-					break;
-
-				case 'step':
-					$output .= "{$section_props}['$attr_name'] = ((int) $attr_value) == 0 ? 1 : (int) $attr_value;\n";
-					break;
-			}
-		}
-
-		if (!isset($_attr['show'])) {
-			$output .= "{$section_props}['show'] = true;\n";
-		}
-
-		if (!isset($_attr['loop'])) {
-			$output .= "{$section_props}['loop'] = 1;\n";
-		}
-
-		if (!isset($_attr['max'])) {
-			$output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-		} else {
-			$output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
-		}
-
-		if (!isset($_attr['step'])) {
-			$output .= "{$section_props}['step'] = 1;\n";
-		}
-
-		if (!isset($_attr['start'])) {
-			$output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-		} else {
-			$output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-		}
-
-		$output .= "if ({$section_props}['show']) {\n";
-		if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-			$output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
-		} else {
-			$output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
-		}
-		$output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
-
-		$output .= "if ({$section_props}['show']):\n";
-		$output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-		$output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-		$output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-		$output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-		$output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-		$output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
-
-		$output .= "?>";
-
-		return $output;
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionelse Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {sectionelse} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
-		$this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
-
-		return "<?php endfor; else: ?>";
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/section} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-
-		// must endblock be nocache?
-		if ($compiler->nocache) {
-			$compiler->tag_nocache = true;
-		}
-
-		list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
-
-		if ($openTag == 'sectionelse') {
-			return "<?php endif; ?>";
-		} else {
-			return "<?php endfor; endif; ?>";
-		}
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
deleted file mode 100644
index f8f54cadd..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_setfilter.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Setfilter
- * Compiles code for setfilter tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Setfilter Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for setfilter tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		$compiler->variable_filter_stack[] = $compiler->template->variable_filters;
-		$compiler->template->variable_filters = $parameter['modifier_list'];
-		// this tag does not return compiled code
-		$compiler->has_code = false;
-
-		return true;
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Setfilterclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/setfilter} tag
-	 * This tag does not generate compiled output. It resets variable filter.
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		$_attr = $this->getAttributes($compiler, $args);
-		// reset variable filter to previous state
-		if (count($compiler->variable_filter_stack)) {
-			$compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
-		} else {
-			$compiler->template->variable_filters = array();
-		}
-		// this tag does not return compiled code
-		$compiler->has_code = false;
-
-		return true;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_while.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_while.php
deleted file mode 100644
index 9e98013de..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compile_while.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile While
- * Compiles the {while} tag
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile While Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {while} tag
-	 *
-	 * @param  array  $args      array with attributes from parser
-	 * @param  object $compiler  compiler object
-	 * @param  array  $parameter array with compilation parameter
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler, $parameter)
-	{
-		// check and get attributes
-		$_attr = $this->getAttributes($compiler, $args);
-		$this->openTag($compiler, 'while', $compiler->nocache);
-
-		if (!array_key_exists("if condition", $parameter)) {
-			$compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
-		}
-
-		// maybe nocache because of nocache variables
-		$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-		if (is_array($parameter['if condition'])) {
-			if ($compiler->nocache) {
-				$_nocache = ',true';
-				// create nocache var to make it know for further compiling
-				if (is_array($parameter['if condition']['var'])) {
-					$compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-				} else {
-					$compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-				}
-			} else {
-				$_nocache = '';
-			}
-			if (is_array($parameter['if condition']['var'])) {
-				$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-				$_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . ") {?>";
-			} else {
-				$_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-				$_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . ") {?>";
-			}
-
-			return $_output;
-		} else {
-			return "<?php while ({$parameter['if condition']}) {?>";
-		}
-	}
-}
-
-/**
- * Smarty Internal Plugin Compile Whileclose Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
-{
-	/**
-	 * Compiles code for the {/while} tag
-	 *
-	 * @param  array  $args     array with attributes from parser
-	 * @param  object $compiler compiler object
-	 *
-	 * @return string compiled code
-	 */
-	public function compile($args, $compiler)
-	{
-		// must endblock be nocache?
-		if ($compiler->nocache) {
-			$compiler->tag_nocache = true;
-		}
-		$compiler->nocache = $this->closeTag($compiler, array('while'));
-
-		return "<?php }?>";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compilebase.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compilebase.php
deleted file mode 100644
index 139717307..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_compilebase.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CompileBase
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * This class does extend all internal compile plugins
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_CompileBase
-{
-	/**
-	 * Array of names of required attribute required by tag
-	 *
-	 * @var array
-	 */
-	public $required_attributes = array();
-	/**
-	 * Array of names of optional attribute required by tag
-	 * use array('_any') if there is no restriction of attributes names
-	 *
-	 * @var array
-	 */
-	public $optional_attributes = array();
-	/**
-	 * Shorttag attribute order defined by its names
-	 *
-	 * @var array
-	 */
-	public $shorttag_order = array();
-	/**
-	 * Array of names of valid option flags
-	 *
-	 * @var array
-	 */
-	public $option_flags = array('nocache');
-
-	/**
-	 * This function checks if the attributes passed are valid
-	 * The attributes passed for the tag to compile are checked against the list of required and
-	 * optional attributes. Required attributes must be present. Optional attributes are check against
-	 * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
-	 * as valid
-	 *
-	 * @param  object $compiler   compiler object
-	 * @param  array  $attributes attributes applied to the tag
-	 *
-	 * @return array  of mapped attributes for further processing
-	 */
-	public function getAttributes($compiler, $attributes)
-	{
-		$_indexed_attr = array();
-		// loop over attributes
-		foreach ($attributes as $key => $mixed) {
-			// shorthand ?
-			if (!is_array($mixed)) {
-				// option flag ?
-				if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
-					$_indexed_attr[trim($mixed, '\'"')] = true;
-					// shorthand attribute ?
-				} elseif (isset($this->shorttag_order[$key])) {
-					$_indexed_attr[$this->shorttag_order[$key]] = $mixed;
-				} else {
-					// too many shorthands
-					$compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
-				}
-				// named attribute
-			} else {
-				$kv = each($mixed);
-				// option flag?
-				if (in_array($kv['key'], $this->option_flags)) {
-					if (is_bool($kv['value'])) {
-						$_indexed_attr[$kv['key']] = $kv['value'];
-					} elseif (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
-						if (trim($kv['value']) == 'true') {
-							$_indexed_attr[$kv['key']] = true;
-						} else {
-							$_indexed_attr[$kv['key']] = false;
-						}
-					} elseif (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
-						if ($kv['value'] == 1) {
-							$_indexed_attr[$kv['key']] = true;
-						} else {
-							$_indexed_attr[$kv['key']] = false;
-						}
-					} else {
-						$compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
-					}
-					// must be named attribute
-				} else {
-					reset($mixed);
-					$_indexed_attr[key($mixed)] = $mixed[key($mixed)];
-				}
-			}
-		}
-		// check if all required attributes present
-		foreach ($this->required_attributes as $attr) {
-			if (!array_key_exists($attr, $_indexed_attr)) {
-				$compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
-			}
-		}
-		// check for not allowed attributes
-		if ($this->optional_attributes != array('_any')) {
-			$tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
-			foreach ($_indexed_attr as $key => $dummy) {
-				if (!in_array($key, $tmp_array) && $key !== 0) {
-					$compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
-				}
-			}
-		}
-		// default 'false' for all option flags not set
-		foreach ($this->option_flags as $flag) {
-			if (!isset($_indexed_attr[$flag])) {
-				$_indexed_attr[$flag] = false;
-			}
-		}
-
-		return $_indexed_attr;
-	}
-
-	/**
-	 * Push opening tag name on stack
-	 * Optionally additional data can be saved on stack
-	 *
-	 * @param object $compiler compiler object
-	 * @param string $openTag  the opening tag's name
-	 * @param mixed  $data     optional data saved
-	 */
-	public function openTag($compiler, $openTag, $data = null)
-	{
-		array_push($compiler->_tag_stack, array($openTag, $data));
-	}
-
-	/**
-	 * Pop closing tag
-	 * Raise an error if this stack-top doesn't match with expected opening tags
-	 *
-	 * @param  object       $compiler    compiler object
-	 * @param  array|string $expectedTag the expected opening tag names
-	 *
-	 * @return mixed        any type the opening tag's name or saved data
-	 */
-	public function closeTag($compiler, $expectedTag)
-	{
-		if (count($compiler->_tag_stack) > 0) {
-			// get stacked info
-			list($_openTag, $_data) = array_pop($compiler->_tag_stack);
-			// open tag must match with the expected ones
-			if (in_array($_openTag, (array)$expectedTag)) {
-				if (is_null($_data)) {
-					// return opening tag
-					return $_openTag;
-				} else {
-					// return restored data
-					return $_data;
-				}
-			}
-			// wrong nesting of tags
-			$compiler->trigger_template_error("unclosed {$compiler->smarty->left_delimiter}" . $_openTag . "{$compiler->smarty->right_delimiter} tag");
-
-			return;
-		}
-		// wrong nesting of tags
-		$compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
-
-		return;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_config.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_config.php
deleted file mode 100644
index b66027f4b..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_config.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Config
- * Main class for config variables
- *
- * @package    Smarty
- * @subpackage Config
- * @ignore
- */
-class Smarty_Internal_Config
-{
-	/**
-	 * Smarty instance
-	 *
-	 * @var Smarty object
-	 */
-	public $smarty = null;
-	/**
-	 * Object of config var storage
-	 *
-	 * @var object
-	 */
-	public $data = null;
-	/**
-	 * Config resource
-	 *
-	 * @var string
-	 */
-	public $config_resource = null;
-	/**
-	 * Compiled config file
-	 *
-	 * @var string
-	 */
-	public $compiled_config = null;
-	/**
-	 * filepath of compiled config file
-	 *
-	 * @var string
-	 */
-	public $compiled_filepath = null;
-	/**
-	 * Filemtime of compiled config Filemtime
-	 *
-	 * @var int
-	 */
-	public $compiled_timestamp = null;
-	/**
-	 * flag if compiled config file is invalid and must be (re)compiled
-	 *
-	 * @var bool
-	 */
-	public $mustCompile = null;
-	/**
-	 * Config file compiler object
-	 *
-	 * @var Smarty_Internal_Config_File_Compiler object
-	 */
-	public $compiler_object = null;
-
-	/**
-	 * Constructor of config file object
-	 *
-	 * @param string $config_resource config file resource name
-	 * @param Smarty $smarty          Smarty instance
-	 * @param object $data            object for config vars storage
-	 */
-	public function __construct($config_resource, $smarty, $data = null)
-	{
-		$this->data = $data;
-		$this->smarty = $smarty;
-		$this->config_resource = $config_resource;
-	}
-
-	/**
-	 * Returns the compiled  filepath
-	 *
-	 * @return string the compiled filepath
-	 */
-	public function getCompiledFilepath()
-	{
-		return $this->compiled_filepath === null ?
-			($this->compiled_filepath = $this->buildCompiledFilepath()) :
-			$this->compiled_filepath;
-	}
-
-	/**
-	 * Get file path.
-	 *
-	 * @return string
-	 */
-	public function buildCompiledFilepath()
-	{
-		$_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
-		$_flag = (int)$this->smarty->config_read_hidden + (int)$this->smarty->config_booleanize * 2
-			+ (int)$this->smarty->config_overwrite * 4;
-		$_filepath = sha1(realpath($this->source->filepath) . $_flag);
-		// if use_sub_dirs, break file into directories
-		if ($this->smarty->use_sub_dirs) {
-			$_filepath = substr($_filepath, 0, 2) . DS
-				. substr($_filepath, 2, 2) . DS
-				. substr($_filepath, 4, 2) . DS
-				. $_filepath;
-		}
-		$_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-		if (isset($_compile_id)) {
-			$_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-		}
-		$_compile_dir = $this->smarty->getCompileDir();
-
-		return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
-	}
-
-	/**
-	 * Returns the timestamp of the compiled file
-	 *
-	 * @return integer the file timestamp
-	 */
-	public function getCompiledTimestamp()
-	{
-		return $this->compiled_timestamp === null
-			? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false)
-			: $this->compiled_timestamp;
-	}
-
-	/**
-	 * Returns if the current config file must be compiled
-	 * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
-	 *
-	 * @return boolean true if the file must be compiled
-	 */
-	public function mustCompile()
-	{
-		return $this->mustCompile === null ?
-			$this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp() === false || $this->smarty->compile_check && $this->getCompiledTimestamp() < $this->source->timestamp) :
-			$this->mustCompile;
-	}
-
-	/**
-	 * Returns the compiled config file
-	 * It checks if the config file must be compiled or just read the compiled version
-	 *
-	 * @return string the compiled config file
-	 */
-	public function getCompiledConfig()
-	{
-		if ($this->compiled_config === null) {
-			// see if template needs compiling.
-			if ($this->mustCompile()) {
-				$this->compileConfigSource();
-			} else {
-				$this->compiled_config = file_get_contents($this->getCompiledFilepath());
-			}
-		}
-
-		return $this->compiled_config;
-	}
-
-	/**
-	 * Compiles the config files
-	 *
-	 * @throws Exception
-	 */
-	public function compileConfigSource()
-	{
-		// compile template
-		if (!is_object($this->compiler_object)) {
-			// load compiler
-			$this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
-		}
-		// compile locking
-		if ($this->smarty->compile_locking) {
-			if ($saved_timestamp = $this->getCompiledTimestamp()) {
-				touch($this->getCompiledFilepath());
-			}
-		}
-		// call compiler
-		try {
-			$this->compiler_object->compileSource($this);
-		} catch (Exception $e) {
-			// restore old timestamp in case of error
-			if ($this->smarty->compile_locking && $saved_timestamp) {
-				touch($this->getCompiledFilepath(), $saved_timestamp);
-			}
-			throw $e;
-		}
-		// compiling succeeded
-		// write compiled template
-		Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
-	}
-
-	/**
-	 * load config variables
-	 *
-	 * @param mixed  $sections array of section names, single section or null
-	 * @param string $scope    global,parent or local
-	 *
-	 * @throws Exception
-	 */
-	public function loadConfigVars($sections = null, $scope = 'local')
-	{
-		if ($this->data instanceof Smarty_Internal_Template) {
-			$this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file');
-		}
-		if ($this->mustCompile()) {
-			$this->compileConfigSource();
-		}
-		// pointer to scope
-		if ($scope == 'local') {
-			$scope_ptr = $this->data;
-		} elseif ($scope == 'parent') {
-			if (isset($this->data->parent)) {
-				$scope_ptr = $this->data->parent;
-			} else {
-				$scope_ptr = $this->data;
-			}
-		} elseif ($scope == 'root' || $scope == 'global') {
-			$scope_ptr = $this->data;
-			while (isset($scope_ptr->parent)) {
-				$scope_ptr = $scope_ptr->parent;
-			}
-		}
-		$_config_vars = array();
-		include($this->getCompiledFilepath());
-		// copy global config vars
-		foreach ($_config_vars['vars'] as $variable => $value) {
-			if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-				$scope_ptr->config_vars[$variable] = $value;
-			} else {
-				$scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value);
-			}
-		}
-		// scan sections
-		if (!empty($sections)) {
-			foreach ((array)$sections as $this_section) {
-				if (isset($_config_vars['sections'][$this_section])) {
-					foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
-						if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-							$scope_ptr->config_vars[$variable] = $value;
-						} else {
-							$scope_ptr->config_vars[$variable] = array_merge((array)$scope_ptr->config_vars[$variable], (array)$value);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * set Smarty property in template context
-	 *
-	 * @param  string $property_name property name
-	 * @param  mixed  $value         value
-	 *
-	 * @throws SmartyException if $property_name is not valid
-	 */
-	public function __set($property_name, $value)
-	{
-		switch ($property_name) {
-			case 'source':
-			case 'compiled':
-				$this->$property_name = $value;
-
-				return;
-		}
-
-		throw new SmartyException("invalid config property '$property_name'.");
-	}
-
-	/**
-	 * get Smarty property in template context
-	 *
-	 * @param  string $property_name property name
-	 *
-	 * @return \Smarty_Config_Source|\Smarty_Template_Compiled
-	 * @throws SmartyException if $property_name is not valid
-	 */
-	public function __get($property_name)
-	{
-		switch ($property_name) {
-			case 'source':
-				if (empty($this->config_resource)) {
-					throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
-				}
-				$this->source = Smarty_Resource::config($this);
-
-				return $this->source;
-
-			case 'compiled':
-				$this->compiled = $this->source->getCompiled($this);
-
-				return $this->compiled;
-		}
-
-		throw new SmartyException("config attribute '$property_name' does not exist.");
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
deleted file mode 100644
index 6db9345cf..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config File Compiler
- * This is the config file compiler class. It calls the lexer and parser to
- * perform the compiling.
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Main config file compiler class
- *
- * @package    Smarty
- * @subpackage Config
- */
-class Smarty_Internal_Config_File_Compiler
-{
-	/**
-	 * Lexer object
-	 *
-	 * @var object
-	 */
-	public $lex;
-
-	/**
-	 * Parser object
-	 *
-	 * @var object
-	 */
-	public $parser;
-
-	/**
-	 * Smarty object
-	 *
-	 * @var Smarty object
-	 */
-	public $smarty;
-
-	/**
-	 * Smarty object
-	 *
-	 * @var Smarty_Internal_Config object
-	 */
-	public $config;
-
-	/**
-	 * Compiled config data sections and variables
-	 *
-	 * @var array
-	 */
-	public $config_data = array();
-
-	/**
-	 * Initialize compiler
-	 *
-	 * @param Smarty $smarty base instance
-	 */
-	public function __construct($smarty)
-	{
-		$this->smarty = $smarty;
-		$this->config_data['sections'] = array();
-		$this->config_data['vars'] = array();
-	}
-
-	/**
-	 * Method to compile a Smarty template.
-	 *
-	 * @param  Smarty_Internal_Config $config config object
-	 *
-	 * @return bool                   true if compiling succeeded, false if it failed
-	 */
-	public function compileSource(Smarty_Internal_Config $config)
-	{
-		/* here is where the compiling takes place. Smarty
-		  tags in the templates are replaces with PHP code,
-		  then written to compiled files. */
-		$this->config = $config;
-		// get config file source
-		$_content = $config->source->content . "\n";
-		// on empty template just return
-		if ($_content == '') {
-			return true;
-		}
-		// init the lexer/parser to compile the config file
-		$lex = new Smarty_Internal_Configfilelexer($_content, $this);
-		$parser = new Smarty_Internal_Configfileparser($lex, $this);
-
-		if (function_exists('mb_internal_encoding') && ((int)ini_get('mbstring.func_overload')) & 2) {
-			$mbEncoding = mb_internal_encoding();
-			mb_internal_encoding('ASCII');
-		} else {
-			$mbEncoding = null;
-		}
-
-
-		if ($this->smarty->_parserdebug) {
-			$parser->PrintTrace();
-		}
-		// get tokens from lexer and parse them
-		while ($lex->yylex()) {
-			if ($this->smarty->_parserdebug) {
-				echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
-			}
-			$parser->doParse($lex->token, $lex->value);
-		}
-		// finish parsing process
-		$parser->doParse(0, 0);
-
-		if ($mbEncoding) {
-			mb_internal_encoding($mbEncoding);
-		}
-
-		$config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
-	}
-
-	/**
-	 * display compiler error messages without dying
-	 * If parameter $args is empty it is a parser detected syntax error.
-	 * In this case the parser is called to obtain information about expected tokens.
-	 * If parameter $args contains a string this is used as error message
-	 *
-	 * @param string $args individual error message or null
-	 *
-	 * @throws SmartyCompilerException
-	 */
-	public function trigger_config_file_error($args = null)
-	{
-		$this->lex = Smarty_Internal_Configfilelexer::instance();
-		$this->parser = Smarty_Internal_Configfileparser::instance();
-		// get template source line which has error
-		$line = $this->lex->line;
-		if (isset($args)) {
-			// $line--;
-		}
-		$match = preg_split("/\n/", $this->lex->data);
-		$error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
-		if (isset($args)) {
-			// individual error message
-			$error_text .= $args;
-		} else {
-			// expected token from parser
-			foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-				$exp_token = $this->parser->yyTokenName[$token];
-				if (isset($this->lex->smarty_token_names[$exp_token])) {
-					// token type from lexer
-					$expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-				} else {
-					// otherwise internal token name
-					$expect[] = $this->parser->yyTokenName[$token];
-				}
-			}
-			// output parser error message
-			$error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
-		}
-		throw new SmartyCompilerException($error_text);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_configfilelexer.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
deleted file mode 100644
index 1c9e721b0..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_configfilelexer.php
+++ /dev/null
@@ -1,663 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Configfilelexer
- * This is the lexer to break the config file source into tokens
- *
- * @package    Smarty
- * @subpackage Config
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Configfilelexer
- */
-class Smarty_Internal_Configfilelexer
-{
-
-	public $data;
-	public $counter;
-	public $token;
-	public $value;
-	public $node;
-	public $line;
-	private $state = 1;
-	public $yyTraceFILE;
-	public $yyTracePrompt;
-	public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
-	public $smarty_token_names = array( // Text for parser error messages
-	);
-
-	function __construct($data, $compiler)
-	{
-		// set instance object
-		self::instance($this);
-		$this->data = $data . "\n"; //now all lines are \n-terminated
-		$this->counter = 0;
-		$this->line = 1;
-		$this->compiler = $compiler;
-		$this->smarty = $compiler->smarty;
-	}
-
-	public static function &instance($new_instance = null)
-	{
-		static $instance = null;
-		if (isset($new_instance) && is_object($new_instance)) {
-			$instance = $new_instance;
-		}
-
-		return $instance;
-	}
-
-	public function PrintTrace()
-	{
-		$this->yyTraceFILE = fopen('php://output', 'w');
-		$this->yyTracePrompt = '<br>';
-	}
-
-	private $_yy_state = 1;
-	private $_yy_stack = array();
-
-	public function yylex()
-	{
-		return $this->{'yylex' . $this->_yy_state}();
-	}
-
-	public function yypushstate($state)
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-		array_push($this->_yy_stack, $this->_yy_state);
-		$this->_yy_state = $state;
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-	}
-
-	public function yypopstate()
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-		$this->_yy_state = array_pop($this->_yy_stack);
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-	}
-
-	public function yybegin($state)
-	{
-		$this->_yy_state = $state;
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-	}
-
-	public function yylex1()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-			4 => 0,
-			5 => 0,
-			6 => 0,
-			7 => 0,
-			8 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state START');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r1_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const START = 1;
-
-	function yy_r1_1($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-		$this->yypushstate(self::COMMENT);
-	}
-
-	function yy_r1_2($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-		$this->yypushstate(self::SECTION);
-	}
-
-	function yy_r1_3($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
-	}
-
-	function yy_r1_4($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-		$this->yypushstate(self::VALUE);
-	}
-
-	function yy_r1_5($yy_subpatterns)
-	{
-
-		return false;
-	}
-
-	function yy_r1_6($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-	}
-
-	function yy_r1_7($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_ID;
-	}
-
-	function yy_r1_8($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
-	}
-
-	public function yylex2()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-			4 => 0,
-			5 => 0,
-			6 => 0,
-			7 => 0,
-			8 => 0,
-			9 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state VALUE');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r2_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const VALUE = 2;
-
-	function yy_r2_1($yy_subpatterns)
-	{
-
-		return false;
-	}
-
-	function yy_r2_2($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-		$this->yypopstate();
-	}
-
-	function yy_r2_3($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_INT;
-		$this->yypopstate();
-	}
-
-	function yy_r2_4($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-		$this->yypushstate(self::TRIPPLE);
-	}
-
-	function yy_r2_5($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-		$this->yypopstate();
-	}
-
-	function yy_r2_6($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-		$this->yypopstate();
-	}
-
-	function yy_r2_7($yy_subpatterns)
-	{
-
-		if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no"))) {
-			$this->yypopstate();
-			$this->yypushstate(self::NAKED_STRING_VALUE);
-
-			return true; //reprocess in new state
-		} else {
-			$this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
-			$this->yypopstate();
-		}
-	}
-
-	function yy_r2_8($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-		$this->yypopstate();
-	}
-
-	function yy_r2_9($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-		$this->value = "";
-		$this->yypopstate();
-	}
-
-	public function yylex3()
-	{
-		$tokenMap = array(
-			1 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state NAKED_STRING_VALUE');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r3_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const NAKED_STRING_VALUE = 3;
-
-	function yy_r3_1($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-		$this->yypopstate();
-	}
-
-	public function yylex4()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state COMMENT');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r4_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const COMMENT = 4;
-
-	function yy_r4_1($yy_subpatterns)
-	{
-
-		return false;
-	}
-
-	function yy_r4_2($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-	}
-
-	function yy_r4_3($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-		$this->yypopstate();
-	}
-
-	public function yylex5()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state SECTION');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r5_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const SECTION = 5;
-
-	function yy_r5_1($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_DOT;
-	}
-
-	function yy_r5_2($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-		$this->yypopstate();
-	}
-
-	public function yylex6()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state TRIPPLE');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r6_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const TRIPPLE = 6;
-
-	function yy_r6_1($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-		$this->yypopstate();
-		$this->yypushstate(self::START);
-	}
-
-	function yy_r6_2($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-		if (isset($match[0][1])) {
-			$to = $match[0][1];
-		} else {
-			$this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-		}
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-		$this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
-	}
-}
-
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_configfileparser.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_configfileparser.php
deleted file mode 100644
index 439c79879..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_configfileparser.php
+++ /dev/null
@@ -1,1061 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Configfileparser
- * This is the config file parser.
- * It is generated from the internal.configfileparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class TPC_yyToken implements ArrayAccess
-{
-	public $string = '';
-	public $metadata = array();
-
-	public function __construct($s, $m = array())
-	{
-		if ($s instanceof TPC_yyToken) {
-			$this->string = $s->string;
-			$this->metadata = $s->metadata;
-		} else {
-			$this->string = (string)$s;
-			if ($m instanceof TPC_yyToken) {
-				$this->metadata = $m->metadata;
-			} elseif (is_array($m)) {
-				$this->metadata = $m;
-			}
-		}
-	}
-
-	public function __toString()
-	{
-		return $this->_string;
-	}
-
-	public function offsetExists($offset)
-	{
-		return isset($this->metadata[$offset]);
-	}
-
-	public function offsetGet($offset)
-	{
-		return $this->metadata[$offset];
-	}
-
-	public function offsetSet($offset, $value)
-	{
-		if ($offset === null) {
-			if (isset($value[0])) {
-				$x = ($value instanceof TPC_yyToken) ?
-					$value->metadata : $value;
-				$this->metadata = array_merge($this->metadata, $x);
-
-				return;
-			}
-			$offset = count($this->metadata);
-		}
-		if ($value === null) {
-			return;
-		}
-		if ($value instanceof TPC_yyToken) {
-			if ($value->metadata) {
-				$this->metadata[$offset] = $value->metadata;
-			}
-		} elseif ($value) {
-			$this->metadata[$offset] = $value;
-		}
-	}
-
-	public function offsetUnset($offset)
-	{
-		unset($this->metadata[$offset]);
-	}
-}
-
-class TPC_yyStackEntry
-{
-	public $stateno; /* The state-number */
-	public $major; /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-	public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-}
-
-;
-
-#line 12 "smarty_internal_configfileparser.y"
-class Smarty_Internal_Configfileparser #line 80 "smarty_internal_configfileparser.php"
-{
-	#line 14 "smarty_internal_configfileparser.y"
-
-	// states whether the parse was successful or not
-	public $successful = true;
-	public $retvalue = 0;
-	private $lex;
-	private $internalError = false;
-
-	function __construct($lex, $compiler)
-	{
-		// set instance object
-		self::instance($this);
-		$this->lex = $lex;
-		$this->smarty = $compiler->smarty;
-		$this->compiler = $compiler;
-	}
-
-	public static function &instance($new_instance = null)
-	{
-		static $instance = null;
-		if (isset($new_instance) && is_object($new_instance)) {
-			$instance = $new_instance;
-		}
-
-		return $instance;
-	}
-
-	private function parse_bool($str)
-	{
-		if (in_array(strtolower($str), array('on', 'yes', 'true'))) {
-			$res = true;
-		} else {
-			$res = false;
-		}
-
-		return $res;
-	}
-
-	private static $escapes_single = Array('\\' => '\\',
-										   '\'' => '\''
-	);
-
-	private static function parse_single_quoted_string($qstr)
-	{
-		$escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
-
-		$ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-		$str = "";
-		foreach ($ss as $s) {
-			if (strlen($s) === 2 && $s[0] === '\\') {
-				if (isset(self::$escapes_single[$s[1]])) {
-					$s = self::$escapes_single[$s[1]];
-				}
-			}
-
-			$str .= $s;
-		}
-
-		return $str;
-	}
-
-	private static function parse_double_quoted_string($qstr)
-	{
-		$inner_str = substr($qstr, 1, strlen($qstr) - 2);
-
-		return stripcslashes($inner_str);
-	}
-
-	private static function parse_tripple_double_quoted_string($qstr)
-	{
-		return stripcslashes($qstr);
-	}
-
-	private function set_var(Array $var, Array &$target_array)
-	{
-		$key = $var["key"];
-		$value = $var["value"];
-
-		if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
-			$target_array['vars'][$key] = $value;
-		} else {
-			settype($target_array['vars'][$key], 'array');
-			$target_array['vars'][$key][] = $value;
-		}
-	}
-
-	private function add_global_vars(Array $vars)
-	{
-		if (!isset($this->compiler->config_data['vars'])) {
-			$this->compiler->config_data['vars'] = Array();
-		}
-		foreach ($vars as $var) {
-			$this->set_var($var, $this->compiler->config_data);
-		}
-	}
-
-	private function add_section_vars($section_name, Array $vars)
-	{
-		if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
-			$this->compiler->config_data['sections'][$section_name]['vars'] = Array();
-		}
-		foreach ($vars as $var) {
-			$this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
-		}
-	}
-
-	#line 174 "smarty_internal_configfileparser.php"
-
-	const TPC_OPENB = 1;
-	const TPC_SECTION = 2;
-	const TPC_CLOSEB = 3;
-	const TPC_DOT = 4;
-	const TPC_ID = 5;
-	const TPC_EQUAL = 6;
-	const TPC_FLOAT = 7;
-	const TPC_INT = 8;
-	const TPC_BOOL = 9;
-	const TPC_SINGLE_QUOTED_STRING = 10;
-	const TPC_DOUBLE_QUOTED_STRING = 11;
-	const TPC_TRIPPLE_QUOTES = 12;
-	const TPC_TRIPPLE_TEXT = 13;
-	const TPC_TRIPPLE_QUOTES_END = 14;
-	const TPC_NAKED_STRING = 15;
-	const TPC_OTHER = 16;
-	const TPC_NEWLINE = 17;
-	const TPC_COMMENTSTART = 18;
-	const YY_NO_ACTION = 60;
-	const YY_ACCEPT_ACTION = 59;
-	const YY_ERROR_ACTION = 58;
-
-	const YY_SZ_ACTTAB = 38;
-	static public $yy_action = array(
-		/*     0 */
-		29, 30, 34, 33, 24, 13, 19, 25, 35, 21,
-		/*    10 */
-		59, 8, 3, 1, 20, 12, 14, 31, 20, 12,
-		/*    20 */
-		15, 17, 23, 18, 27, 26, 4, 5, 6, 32,
-		/*    30 */
-		2, 11, 28, 22, 16, 9, 7, 10,
-	);
-	static public $yy_lookahead = array(
-		/*     0 */
-		7, 8, 9, 10, 11, 12, 5, 27, 15, 16,
-		/*    10 */
-		20, 21, 23, 23, 17, 18, 13, 14, 17, 18,
-		/*    20 */
-		15, 2, 17, 4, 25, 26, 6, 3, 3, 14,
-		/*    30 */
-		23, 1, 24, 17, 2, 25, 22, 25,
-	);
-	const YY_SHIFT_USE_DFLT = -8;
-	const YY_SHIFT_MAX = 19;
-	static public $yy_shift_ofst = array(
-		/*     0 */
-		-8, 1, 1, 1, -7, -3, -3, 30, -8, -8,
-		/*    10 */
-		-8, 19, 5, 3, 15, 16, 24, 25, 32, 20,
-	);
-	const YY_REDUCE_USE_DFLT = -21;
-	const YY_REDUCE_MAX = 10;
-	static public $yy_reduce_ofst = array(
-		/*     0 */
-		-10, -1, -1, -1, -20, 10, 12, 8, 14, 7,
-		/*    10 */
-		-11,
-	);
-	static public $yyExpectedTokens = array(
-		/* 0 */
-		array(),
-		/* 1 */
-		array(5, 17, 18,),
-		/* 2 */
-		array(5, 17, 18,),
-		/* 3 */
-		array(5, 17, 18,),
-		/* 4 */
-		array(7, 8, 9, 10, 11, 12, 15, 16,),
-		/* 5 */
-		array(17, 18,),
-		/* 6 */
-		array(17, 18,),
-		/* 7 */
-		array(1,),
-		/* 8 */
-		array(),
-		/* 9 */
-		array(),
-		/* 10 */
-		array(),
-		/* 11 */
-		array(2, 4,),
-		/* 12 */
-		array(15, 17,),
-		/* 13 */
-		array(13, 14,),
-		/* 14 */
-		array(14,),
-		/* 15 */
-		array(17,),
-		/* 16 */
-		array(3,),
-		/* 17 */
-		array(3,),
-		/* 18 */
-		array(2,),
-		/* 19 */
-		array(6,),
-		/* 20 */
-		array(),
-		/* 21 */
-		array(),
-		/* 22 */
-		array(),
-		/* 23 */
-		array(),
-		/* 24 */
-		array(),
-		/* 25 */
-		array(),
-		/* 26 */
-		array(),
-		/* 27 */
-		array(),
-		/* 28 */
-		array(),
-		/* 29 */
-		array(),
-		/* 30 */
-		array(),
-		/* 31 */
-		array(),
-		/* 32 */
-		array(),
-		/* 33 */
-		array(),
-		/* 34 */
-		array(),
-		/* 35 */
-		array(),
-	);
-	static public $yy_default = array(
-		/*     0 */
-		44, 37, 41, 40, 58, 58, 58, 36, 39, 44,
-		/*    10 */
-		44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-		/*    20 */
-		55, 54, 57, 56, 50, 45, 43, 42, 38, 46,
-		/*    30 */
-		47, 52, 51, 49, 48, 53,
-	);
-	const YYNOCODE = 29;
-	const YYSTACKDEPTH = 100;
-	const YYNSTATE = 36;
-	const YYNRULE = 22;
-	const YYERRORSYMBOL = 19;
-	const YYERRSYMDT = 'yy0';
-	const YYFALLBACK = 0;
-	public static $yyFallback = array();
-
-	public function Trace($TraceFILE, $zTracePrompt)
-	{
-		if (!$TraceFILE) {
-			$zTracePrompt = 0;
-		} elseif (!$zTracePrompt) {
-			$TraceFILE = 0;
-		}
-		$this->yyTraceFILE = $TraceFILE;
-		$this->yyTracePrompt = $zTracePrompt;
-	}
-
-	public function PrintTrace()
-	{
-		$this->yyTraceFILE = fopen('php://output', 'w');
-		$this->yyTracePrompt = '<br>';
-	}
-
-	public $yyTraceFILE;
-	public $yyTracePrompt;
-	public $yyidx; /* Index of top element in stack */
-	public $yyerrcnt; /* Shifts left before out of the error */
-	public $yystack = array(); /* The parser's stack */
-
-	public $yyTokenName = array(
-		'$', 'OPENB', 'SECTION', 'CLOSEB',
-		'DOT', 'id', 'EQUAL', 'FLOAT',
-		'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
-		'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
-		'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
-		'start', 'global_vars', 'sections', 'var_list',
-		'section', 'newline', 'var', 'value',
-	);
-
-	public static $yyRuleName = array(
-		/*   0 */
-		"start ::= global_vars sections",
-		/*   1 */
-		"global_vars ::= var_list",
-		/*   2 */
-		"sections ::= sections section",
-		/*   3 */
-		"sections ::=",
-		/*   4 */
-		"section ::= OPENB SECTION CLOSEB newline var_list",
-		/*   5 */
-		"section ::= OPENB DOT SECTION CLOSEB newline var_list",
-		/*   6 */
-		"var_list ::= var_list newline",
-		/*   7 */
-		"var_list ::= var_list var",
-		/*   8 */
-		"var_list ::=",
-		/*   9 */
-		"var ::= id EQUAL value",
-		/*  10 */
-		"value ::= FLOAT",
-		/*  11 */
-		"value ::= INT",
-		/*  12 */
-		"value ::= BOOL",
-		/*  13 */
-		"value ::= SINGLE_QUOTED_STRING",
-		/*  14 */
-		"value ::= DOUBLE_QUOTED_STRING",
-		/*  15 */
-		"value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
-		/*  16 */
-		"value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
-		/*  17 */
-		"value ::= NAKED_STRING",
-		/*  18 */
-		"value ::= OTHER",
-		/*  19 */
-		"newline ::= NEWLINE",
-		/*  20 */
-		"newline ::= COMMENTSTART NEWLINE",
-		/*  21 */
-		"newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-	);
-
-	public function tokenName($tokenType)
-	{
-		if ($tokenType === 0) {
-			return 'End of Input';
-		}
-		if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-			return $this->yyTokenName[$tokenType];
-		} else {
-			return "Unknown";
-		}
-	}
-
-	public static function yy_destructor($yymajor, $yypminor)
-	{
-		switch ($yymajor) {
-			default:
-				break; /* If no destructor action specified: do nothing */
-		}
-	}
-
-	public function yy_pop_parser_stack()
-	{
-		if (!count($this->yystack)) {
-			return;
-		}
-		$yytos = array_pop($this->yystack);
-		if ($this->yyTraceFILE && $this->yyidx >= 0) {
-			fwrite($this->yyTraceFILE,
-				$this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-				"\n"
-			);
-		}
-		$yymajor = $yytos->major;
-		self::yy_destructor($yymajor, $yytos->minor);
-		$this->yyidx--;
-
-		return $yymajor;
-	}
-
-	public function __destruct()
-	{
-		while ($this->yystack !== Array()) {
-			$this->yy_pop_parser_stack();
-		}
-		if (is_resource($this->yyTraceFILE)) {
-			fclose($this->yyTraceFILE);
-		}
-	}
-
-	public function yy_get_expected_tokens($token)
-	{
-		$state = $this->yystack[$this->yyidx]->stateno;
-		$expected = self::$yyExpectedTokens[$state];
-		if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-			return $expected;
-		}
-		$stack = $this->yystack;
-		$yyidx = $this->yyidx;
-		do {
-			$yyact = $this->yy_find_shift_action($token);
-			if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-				// reduce action
-				$done = 0;
-				do {
-					if ($done++ == 100) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						// too much recursion prevents proper detection
-						// so give up
-						return array_unique($expected);
-					}
-					$yyruleno = $yyact - self::YYNSTATE;
-					$this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-					$nextstate = $this->yy_find_reduce_action(
-						$this->yystack[$this->yyidx]->stateno,
-						self::$yyRuleInfo[$yyruleno]['lhs']
-					);
-					if (isset(self::$yyExpectedTokens[$nextstate])) {
-						$expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-						if (in_array($token,
-							self::$yyExpectedTokens[$nextstate], true
-						)
-						) {
-							$this->yyidx = $yyidx;
-							$this->yystack = $stack;
-
-							return array_unique($expected);
-						}
-					}
-					if ($nextstate < self::YYNSTATE) {
-						// we need to shift a non-terminal
-						$this->yyidx++;
-						$x = new TPC_yyStackEntry;
-						$x->stateno = $nextstate;
-						$x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-						$this->yystack[$this->yyidx] = $x;
-						continue 2;
-					} elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						// the last token was just ignored, we can't accept
-						// by ignoring input, this is in essence ignoring a
-						// syntax error!
-						return array_unique($expected);
-					} elseif ($nextstate === self::YY_NO_ACTION) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-
-						// input accepted, but not shifted (I guess)
-						return $expected;
-					} else {
-						$yyact = $nextstate;
-					}
-				} while (true);
-			}
-			break;
-		} while (true);
-		$this->yyidx = $yyidx;
-		$this->yystack = $stack;
-
-		return array_unique($expected);
-	}
-
-	public function yy_is_expected_token($token)
-	{
-		if ($token === 0) {
-			return true; // 0 is not part of this
-		}
-		$state = $this->yystack[$this->yyidx]->stateno;
-		if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-			return true;
-		}
-		$stack = $this->yystack;
-		$yyidx = $this->yyidx;
-		do {
-			$yyact = $this->yy_find_shift_action($token);
-			if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-				// reduce action
-				$done = 0;
-				do {
-					if ($done++ == 100) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						// too much recursion prevents proper detection
-						// so give up
-						return true;
-					}
-					$yyruleno = $yyact - self::YYNSTATE;
-					$this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-					$nextstate = $this->yy_find_reduce_action(
-						$this->yystack[$this->yyidx]->stateno,
-						self::$yyRuleInfo[$yyruleno]['lhs']
-					);
-					if (isset(self::$yyExpectedTokens[$nextstate]) &&
-						in_array($token, self::$yyExpectedTokens[$nextstate], true)
-					) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-
-						return true;
-					}
-					if ($nextstate < self::YYNSTATE) {
-						// we need to shift a non-terminal
-						$this->yyidx++;
-						$x = new TPC_yyStackEntry;
-						$x->stateno = $nextstate;
-						$x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-						$this->yystack[$this->yyidx] = $x;
-						continue 2;
-					} elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						if (!$token) {
-							// end of input: this is valid
-							return true;
-						}
-						// the last token was just ignored, we can't accept
-						// by ignoring input, this is in essence ignoring a
-						// syntax error!
-						return false;
-					} elseif ($nextstate === self::YY_NO_ACTION) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-
-						// input accepted, but not shifted (I guess)
-						return true;
-					} else {
-						$yyact = $nextstate;
-					}
-				} while (true);
-			}
-			break;
-		} while (true);
-		$this->yyidx = $yyidx;
-		$this->yystack = $stack;
-
-		return true;
-	}
-
-	public function yy_find_shift_action($iLookAhead)
-	{
-		$stateno = $this->yystack[$this->yyidx]->stateno;
-
-		/* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-		if (!isset(self::$yy_shift_ofst[$stateno])) {
-			// no shift actions
-			return self::$yy_default[$stateno];
-		}
-		$i = self::$yy_shift_ofst[$stateno];
-		if ($i === self::YY_SHIFT_USE_DFLT) {
-			return self::$yy_default[$stateno];
-		}
-		if ($iLookAhead == self::YYNOCODE) {
-			return self::YY_NO_ACTION;
-		}
-		$i += $iLookAhead;
-		if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-			self::$yy_lookahead[$i] != $iLookAhead
-		) {
-			if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-				&& ($iFallback = self::$yyFallback[$iLookAhead]) != 0
-			) {
-				if ($this->yyTraceFILE) {
-					fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
-						$this->yyTokenName[$iLookAhead] . " => " .
-						$this->yyTokenName[$iFallback] . "\n"
-					);
-				}
-
-				return $this->yy_find_shift_action($iFallback);
-			}
-
-			return self::$yy_default[$stateno];
-		} else {
-			return self::$yy_action[$i];
-		}
-	}
-
-	public function yy_find_reduce_action($stateno, $iLookAhead)
-	{
-		/* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-		if (!isset(self::$yy_reduce_ofst[$stateno])) {
-			return self::$yy_default[$stateno];
-		}
-		$i = self::$yy_reduce_ofst[$stateno];
-		if ($i == self::YY_REDUCE_USE_DFLT) {
-			return self::$yy_default[$stateno];
-		}
-		if ($iLookAhead == self::YYNOCODE) {
-			return self::YY_NO_ACTION;
-		}
-		$i += $iLookAhead;
-		if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-			self::$yy_lookahead[$i] != $iLookAhead
-		) {
-			return self::$yy_default[$stateno];
-		} else {
-			return self::$yy_action[$i];
-		}
-	}
-
-	public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-	{
-		$this->yyidx++;
-		if ($this->yyidx >= self::YYSTACKDEPTH) {
-			$this->yyidx--;
-			if ($this->yyTraceFILE) {
-				fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-			}
-			while ($this->yyidx >= 0) {
-				$this->yy_pop_parser_stack();
-			}
-			#line 125 "smarty_internal_configfileparser.y"
-
-			$this->internalError = true;
-			$this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-
-			#line 601 "smarty_internal_configfileparser.php"
-
-			return;
-		}
-		$yytos = new TPC_yyStackEntry;
-		$yytos->stateno = $yyNewState;
-		$yytos->major = $yyMajor;
-		$yytos->minor = $yypMinor;
-		array_push($this->yystack, $yytos);
-		if ($this->yyTraceFILE && $this->yyidx > 0) {
-			fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-				$yyNewState
-			);
-			fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-			for ($i = 1; $i <= $this->yyidx; $i++) {
-				fprintf($this->yyTraceFILE, " %s",
-					$this->yyTokenName[$this->yystack[$i]->major]
-				);
-			}
-			fwrite($this->yyTraceFILE, "\n");
-		}
-	}
-
-	public static $yyRuleInfo = array(
-		array('lhs' => 20, 'rhs' => 2),
-		array('lhs' => 21, 'rhs' => 1),
-		array('lhs' => 22, 'rhs' => 2),
-		array('lhs' => 22, 'rhs' => 0),
-		array('lhs' => 24, 'rhs' => 5),
-		array('lhs' => 24, 'rhs' => 6),
-		array('lhs' => 23, 'rhs' => 2),
-		array('lhs' => 23, 'rhs' => 2),
-		array('lhs' => 23, 'rhs' => 0),
-		array('lhs' => 26, 'rhs' => 3),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 27, 'rhs' => 3),
-		array('lhs' => 27, 'rhs' => 2),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 27, 'rhs' => 1),
-		array('lhs' => 25, 'rhs' => 1),
-		array('lhs' => 25, 'rhs' => 2),
-		array('lhs' => 25, 'rhs' => 3),
-	);
-
-	public static $yyReduceMap = array(
-		0  => 0,
-		2  => 0,
-		3  => 0,
-		19 => 0,
-		20 => 0,
-		21 => 0,
-		1  => 1,
-		4  => 4,
-		5  => 5,
-		6  => 6,
-		7  => 7,
-		8  => 8,
-		9  => 9,
-		10 => 10,
-		11 => 11,
-		12 => 12,
-		13 => 13,
-		14 => 14,
-		15 => 15,
-		16 => 16,
-		17 => 17,
-		18 => 17,
-	);
-
-	#line 131 "smarty_internal_configfileparser.y"
-	function yy_r0()
-	{
-		$this->_retvalue = null;
-	}
-	#line 675 "smarty_internal_configfileparser.php"
-	#line 136 "smarty_internal_configfileparser.y"
-	function yy_r1()
-	{
-		$this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
-		$this->_retvalue = null;
-	}
-	#line 680 "smarty_internal_configfileparser.php"
-	#line 149 "smarty_internal_configfileparser.y"
-	function yy_r4()
-	{
-		$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-		$this->_retvalue = null;
-	}
-	#line 686 "smarty_internal_configfileparser.php"
-	#line 154 "smarty_internal_configfileparser.y"
-	function yy_r5()
-	{
-		if ($this->smarty->config_read_hidden) {
-			$this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-		}
-		$this->_retvalue = null;
-	}
-	#line 694 "smarty_internal_configfileparser.php"
-	#line 162 "smarty_internal_configfileparser.y"
-	function yy_r6()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-	}
-	#line 699 "smarty_internal_configfileparser.php"
-	#line 166 "smarty_internal_configfileparser.y"
-	function yy_r7()
-	{
-		$this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 704 "smarty_internal_configfileparser.php"
-	#line 170 "smarty_internal_configfileparser.y"
-	function yy_r8()
-	{
-		$this->_retvalue = Array();
-	}
-	#line 709 "smarty_internal_configfileparser.php"
-	#line 176 "smarty_internal_configfileparser.y"
-	function yy_r9()
-	{
-		$this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 714 "smarty_internal_configfileparser.php"
-	#line 181 "smarty_internal_configfileparser.y"
-	function yy_r10()
-	{
-		$this->_retvalue = (float)$this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 719 "smarty_internal_configfileparser.php"
-	#line 185 "smarty_internal_configfileparser.y"
-	function yy_r11()
-	{
-		$this->_retvalue = (int)$this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 724 "smarty_internal_configfileparser.php"
-	#line 189 "smarty_internal_configfileparser.y"
-	function yy_r12()
-	{
-		$this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 729 "smarty_internal_configfileparser.php"
-	#line 193 "smarty_internal_configfileparser.y"
-	function yy_r13()
-	{
-		$this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 734 "smarty_internal_configfileparser.php"
-	#line 197 "smarty_internal_configfileparser.y"
-	function yy_r14()
-	{
-		$this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 739 "smarty_internal_configfileparser.php"
-	#line 201 "smarty_internal_configfileparser.y"
-	function yy_r15()
-	{
-		$this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
-	}
-	#line 744 "smarty_internal_configfileparser.php"
-	#line 205 "smarty_internal_configfileparser.y"
-	function yy_r16()
-	{
-		$this->_retvalue = '';
-	}
-	#line 749 "smarty_internal_configfileparser.php"
-	#line 209 "smarty_internal_configfileparser.y"
-	function yy_r17()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-	}
-
-	#line 754 "smarty_internal_configfileparser.php"
-
-	private $_retvalue;
-
-	public function yy_reduce($yyruleno)
-	{
-		$yymsp = $this->yystack[$this->yyidx];
-		if ($this->yyTraceFILE && $yyruleno >= 0
-			&& $yyruleno < count(self::$yyRuleName)
-		) {
-			fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-				$this->yyTracePrompt, $yyruleno,
-				self::$yyRuleName[$yyruleno]
-			);
-		}
-
-		$this->_retvalue = $yy_lefthand_side = null;
-		if (array_key_exists($yyruleno, self::$yyReduceMap)) {
-			// call the action
-			$this->_retvalue = null;
-			$this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-			$yy_lefthand_side = $this->_retvalue;
-		}
-		$yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-		$yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
-		$this->yyidx -= $yysize;
-		for ($i = $yysize; $i; $i--) {
-			// pop all of the right-hand side parameters
-			array_pop($this->yystack);
-		}
-		$yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-		if ($yyact < self::YYNSTATE) {
-			if (!$this->yyTraceFILE && $yysize) {
-				$this->yyidx++;
-				$x = new TPC_yyStackEntry;
-				$x->stateno = $yyact;
-				$x->major = $yygoto;
-				$x->minor = $yy_lefthand_side;
-				$this->yystack[$this->yyidx] = $x;
-			} else {
-				$this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-			}
-		} elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-			$this->yy_accept();
-		}
-	}
-
-	public function yy_parse_failed()
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-		}
-		while ($this->yyidx >= 0) {
-			$this->yy_pop_parser_stack();
-		}
-	}
-
-	public function yy_syntax_error($yymajor, $TOKEN)
-	{
-		#line 118 "smarty_internal_configfileparser.y"
-
-		$this->internalError = true;
-		$this->yymajor = $yymajor;
-		$this->compiler->trigger_config_file_error();
-		#line 816 "smarty_internal_configfileparser.php"
-	}
-
-	public function yy_accept()
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-		}
-		while ($this->yyidx >= 0) {
-			$stack = $this->yy_pop_parser_stack();
-		}
-		#line 110 "smarty_internal_configfileparser.y"
-
-		$this->successful = !$this->internalError;
-		$this->internalError = false;
-		$this->retvalue = $this->_retvalue;
-		//echo $this->retvalue."\n\n";
-		#line 833 "smarty_internal_configfileparser.php"
-	}
-
-	public function doParse($yymajor, $yytokenvalue)
-	{
-		$yyerrorhit = 0; /* True if yymajor has invoked an error */
-
-		if ($this->yyidx === null || $this->yyidx < 0) {
-			$this->yyidx = 0;
-			$this->yyerrcnt = -1;
-			$x = new TPC_yyStackEntry;
-			$x->stateno = 0;
-			$x->major = 0;
-			$this->yystack = array();
-			array_push($this->yystack, $x);
-		}
-		$yyendofinput = ($yymajor == 0);
-
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sInput %s\n",
-				$this->yyTracePrompt, $this->yyTokenName[$yymajor]
-			);
-		}
-
-		do {
-			$yyact = $this->yy_find_shift_action($yymajor);
-			if ($yymajor < self::YYERRORSYMBOL &&
-				!$this->yy_is_expected_token($yymajor)
-			) {
-				// force a syntax error
-				$yyact = self::YY_ERROR_ACTION;
-			}
-			if ($yyact < self::YYNSTATE) {
-				$this->yy_shift($yyact, $yymajor, $yytokenvalue);
-				$this->yyerrcnt--;
-				if ($yyendofinput && $this->yyidx >= 0) {
-					$yymajor = 0;
-				} else {
-					$yymajor = self::YYNOCODE;
-				}
-			} elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-				$this->yy_reduce($yyact - self::YYNSTATE);
-			} elseif ($yyact == self::YY_ERROR_ACTION) {
-				if ($this->yyTraceFILE) {
-					fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-						$this->yyTracePrompt
-					);
-				}
-				if (self::YYERRORSYMBOL) {
-					if ($this->yyerrcnt < 0) {
-						$this->yy_syntax_error($yymajor, $yytokenvalue);
-					}
-					$yymx = $this->yystack[$this->yyidx]->major;
-					if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
-						if ($this->yyTraceFILE) {
-							fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-								$this->yyTracePrompt, $this->yyTokenName[$yymajor]
-							);
-						}
-						$this->yy_destructor($yymajor, $yytokenvalue);
-						$yymajor = self::YYNOCODE;
-					} else {
-						while ($this->yyidx >= 0 &&
-							$yymx != self::YYERRORSYMBOL &&
-							($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-						) {
-							$this->yy_pop_parser_stack();
-						}
-						if ($this->yyidx < 0 || $yymajor == 0) {
-							$this->yy_destructor($yymajor, $yytokenvalue);
-							$this->yy_parse_failed();
-							$yymajor = self::YYNOCODE;
-						} elseif ($yymx != self::YYERRORSYMBOL) {
-							$u2 = 0;
-							$this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-						}
-					}
-					$this->yyerrcnt = 3;
-					$yyerrorhit = 1;
-				} else {
-					if ($this->yyerrcnt <= 0) {
-						$this->yy_syntax_error($yymajor, $yytokenvalue);
-					}
-					$this->yyerrcnt = 3;
-					$this->yy_destructor($yymajor, $yytokenvalue);
-					if ($yyendofinput) {
-						$this->yy_parse_failed();
-					}
-					$yymajor = self::YYNOCODE;
-				}
-			} else {
-				$this->yy_accept();
-				$yymajor = self::YYNOCODE;
-			}
-		} while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_data.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_data.php
deleted file mode 100644
index 33dab59fc..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_data.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Data
- * This file contains the basic classes and methods for template and variable creation
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Base class with template and variable methods
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Internal_Data
-{
-	/**
-	 * name of class used for templates
-	 *
-	 * @var string
-	 */
-	public $template_class = 'Smarty_Internal_Template';
-	/**
-	 * template variables
-	 *
-	 * @var array
-	 */
-	public $tpl_vars = array();
-	/**
-	 * parent template (if any)
-	 *
-	 * @var Smarty_Internal_Template
-	 */
-	public $parent = null;
-	/**
-	 * configuration settings
-	 *
-	 * @var array
-	 */
-	public $config_vars = array();
-
-	/**
-	 * assigns a Smarty variable
-	 *
-	 * @param  array|string $tpl_var the template variable name(s)
-	 * @param  mixed        $value   the value to assign
-	 * @param  boolean      $nocache if true any output of this variable will be not cached
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function assign($tpl_var, $value = null, $nocache = false)
-	{
-		if (is_array($tpl_var)) {
-			foreach ($tpl_var as $_key => $_val) {
-				if ($_key != '') {
-					$this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
-				}
-			}
-		} else {
-			if ($tpl_var != '') {
-				$this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * assigns a global Smarty variable
-	 *
-	 * @param  string  $varname the global variable name
-	 * @param  mixed   $value   the value to assign
-	 * @param  boolean $nocache if true any output of this variable will be not cached
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function assignGlobal($varname, $value = null, $nocache = false)
-	{
-		if ($varname != '') {
-			Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-			$ptr = $this;
-			while ($ptr instanceof Smarty_Internal_Template) {
-				$ptr->tpl_vars[$varname] = clone Smarty::$global_tpl_vars[$varname];
-				$ptr = $ptr->parent;
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * assigns values to template variables by reference
-	 *
-	 * @param string   $tpl_var the template variable name
-	 * @param          $value
-	 * @param  boolean $nocache if true any output of this variable will be not cached
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function assignByRef($tpl_var, &$value, $nocache = false)
-	{
-		if ($tpl_var != '') {
-			$this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-			$this->tpl_vars[$tpl_var]->value = & $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * appends values to template variables
-	 *
-	 * @param  array|string $tpl_var the template variable name(s)
-	 * @param  mixed        $value   the value to append
-	 * @param  boolean      $merge   flag if array elements shall be merged
-	 * @param  boolean      $nocache if true any output of this variable will be not cached
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function append($tpl_var, $value = null, $merge = false, $nocache = false)
-	{
-		if (is_array($tpl_var)) {
-			// $tpl_var is an array, ignore $value
-			foreach ($tpl_var as $_key => $_val) {
-				if ($_key != '') {
-					if (!isset($this->tpl_vars[$_key])) {
-						$tpl_var_inst = $this->getVariable($_key, null, true, false);
-						if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-							$this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
-						} else {
-							$this->tpl_vars[$_key] = clone $tpl_var_inst;
-						}
-					}
-					if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-						settype($this->tpl_vars[$_key]->value, 'array');
-					}
-					if ($merge && is_array($_val)) {
-						foreach ($_val as $_mkey => $_mval) {
-							$this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-						}
-					} else {
-						$this->tpl_vars[$_key]->value[] = $_val;
-					}
-				}
-			}
-		} else {
-			if ($tpl_var != '' && isset($value)) {
-				if (!isset($this->tpl_vars[$tpl_var])) {
-					$tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-					if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-						$this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-					} else {
-						$this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-					}
-				}
-				if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-					settype($this->tpl_vars[$tpl_var]->value, 'array');
-				}
-				if ($merge && is_array($value)) {
-					foreach ($value as $_mkey => $_mval) {
-						$this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-					}
-				} else {
-					$this->tpl_vars[$tpl_var]->value[] = $value;
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * appends values to template variables by reference
-	 *
-	 * @param  string  $tpl_var the template variable name
-	 * @param  mixed   &$value  the referenced value to append
-	 * @param  boolean $merge   flag if array elements shall be merged
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function appendByRef($tpl_var, &$value, $merge = false)
-	{
-		if ($tpl_var != '' && isset($value)) {
-			if (!isset($this->tpl_vars[$tpl_var])) {
-				$this->tpl_vars[$tpl_var] = new Smarty_variable();
-			}
-			if (!is_array($this->tpl_vars[$tpl_var]->value)) {
-				settype($this->tpl_vars[$tpl_var]->value, 'array');
-			}
-			if ($merge && is_array($value)) {
-				foreach ($value as $_key => $_val) {
-					$this->tpl_vars[$tpl_var]->value[$_key] = & $value[$_key];
-				}
-			} else {
-				$this->tpl_vars[$tpl_var]->value[] = & $value;
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns a single or all template variables
-	 *
-	 * @param  string  $varname        variable name or null
-	 * @param  object  $_ptr           optional pointer to data object
-	 * @param  boolean $search_parents include parent templates?
-	 *
-	 * @return string  variable value or or array of variables
-	 */
-	public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
-	{
-		if (isset($varname)) {
-			$_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-			if (is_object($_var)) {
-				return $_var->value;
-			} else {
-				return null;
-			}
-		} else {
-			$_result = array();
-			if ($_ptr === null) {
-				$_ptr = $this;
-			}
-			while ($_ptr !== null) {
-				foreach ($_ptr->tpl_vars AS $key => $var) {
-					if (!array_key_exists($key, $_result)) {
-						$_result[$key] = $var->value;
-					}
-				}
-				// not found, try at parent
-				if ($search_parents) {
-					$_ptr = $_ptr->parent;
-				} else {
-					$_ptr = null;
-				}
-			}
-			if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-				foreach (Smarty::$global_tpl_vars AS $key => $var) {
-					if (!array_key_exists($key, $_result)) {
-						$_result[$key] = $var->value;
-					}
-				}
-			}
-
-			return $_result;
-		}
-	}
-
-	/**
-	 * clear the given assigned template variable.
-	 *
-	 * @param  string|array $tpl_var the template variable(s) to clear
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function clearAssign($tpl_var)
-	{
-		if (is_array($tpl_var)) {
-			foreach ($tpl_var as $curr_var) {
-				unset($this->tpl_vars[$curr_var]);
-			}
-		} else {
-			unset($this->tpl_vars[$tpl_var]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * clear all the assigned template variables.
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function clearAllAssign()
-	{
-		$this->tpl_vars = array();
-
-		return $this;
-	}
-
-	/**
-	 * load a config file, optionally load just selected sections
-	 *
-	 * @param  string $config_file filename
-	 * @param  mixed  $sections    array of section names, single section or null
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function configLoad($config_file, $sections = null)
-	{
-		// load Config class
-		$config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
-		$config->loadConfigVars($sections);
-
-		return $this;
-	}
-
-	/**
-	 * gets the object of a Smarty variable
-	 *
-	 * @param  string  $variable       the name of the Smarty variable
-	 * @param  object  $_ptr           optional pointer to data object
-	 * @param  boolean $search_parents search also in parent data
-	 * @param bool     $error_enable
-	 *
-	 * @return object  the object of the variable
-	 */
-	public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
-	{
-		if ($_ptr === null) {
-			$_ptr = $this;
-		}
-		while ($_ptr !== null) {
-			if (isset($_ptr->tpl_vars[$variable])) {
-				// found it, return it
-				return $_ptr->tpl_vars[$variable];
-			}
-			// not found, try at parent
-			if ($search_parents) {
-				$_ptr = $_ptr->parent;
-			} else {
-				$_ptr = null;
-			}
-		}
-		if (isset(Smarty::$global_tpl_vars[$variable])) {
-			// found it, return it
-			return Smarty::$global_tpl_vars[$variable];
-		}
-		if ($this->smarty->error_unassigned && $error_enable) {
-			// force a notice
-			$x = $$variable;
-		}
-
-		return new Undefined_Smarty_Variable;
-	}
-
-	/**
-	 * gets  a config variable
-	 *
-	 * @param  string $variable the name of the config variable
-	 * @param bool    $error_enable
-	 *
-	 * @return mixed  the value of the config variable
-	 */
-	public function getConfigVariable($variable, $error_enable = true)
-	{
-		$_ptr = $this;
-		while ($_ptr !== null) {
-			if (isset($_ptr->config_vars[$variable])) {
-				// found it, return it
-				return $_ptr->config_vars[$variable];
-			}
-			// not found, try at parent
-			$_ptr = $_ptr->parent;
-		}
-		if ($this->smarty->error_unassigned && $error_enable) {
-			// force a notice
-			$x = $$variable;
-		}
-
-		return null;
-	}
-
-	/**
-	 * gets  a stream variable
-	 *
-	 * @param  string $variable the stream of the variable
-	 *
-	 * @throws SmartyException
-	 * @return mixed  the value of the stream variable
-	 */
-	public function getStreamVariable($variable)
-	{
-		$_result = '';
-		$fp = fopen($variable, 'r+');
-		if ($fp) {
-			while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-				$_result .= $current_line;
-			}
-			fclose($fp);
-
-			return $_result;
-		}
-
-		if ($this->smarty->error_unassigned) {
-			throw new SmartyException('Undefined stream variable "' . $variable . '"');
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns a single or all config variables
-	 *
-	 * @param  string $varname variable name or null
-	 * @param bool    $search_parents
-	 *
-	 * @return string variable value or or array of variables
-	 */
-	public function getConfigVars($varname = null, $search_parents = true)
-	{
-		$_ptr = $this;
-		$var_array = array();
-		while ($_ptr !== null) {
-			if (isset($varname)) {
-				if (isset($_ptr->config_vars[$varname])) {
-					return $_ptr->config_vars[$varname];
-				}
-			} else {
-				$var_array = array_merge($_ptr->config_vars, $var_array);
-			}
-			// not found, try at parent
-			if ($search_parents) {
-				$_ptr = $_ptr->parent;
-			} else {
-				$_ptr = null;
-			}
-		}
-		if (isset($varname)) {
-			return '';
-		} else {
-			return $var_array;
-		}
-	}
-
-	/**
-	 * Deassigns a single or all config variables
-	 *
-	 * @param  string $varname variable name or null
-	 *
-	 * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function clearConfig($varname = null)
-	{
-		if (isset($varname)) {
-			unset($this->config_vars[$varname]);
-		} else {
-			$this->config_vars = array();
-		}
-
-		return $this;
-	}
-}
-
-/**
- * class for the Smarty data object
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data
-{
-	/**
-	 * Smarty object
-	 *
-	 * @var Smarty
-	 */
-	public $smarty = null;
-
-	/**
-	 * create Smarty data object
-	 *
-	 * @param Smarty|array                    $_parent parent template
-	 * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
-	 *
-	 * @throws SmartyException
-	 */
-	public function __construct($_parent = null, $smarty = null)
-	{
-		$this->smarty = $smarty;
-		if (is_object($_parent)) {
-			// when object set up back pointer
-			$this->parent = $_parent;
-		} elseif (is_array($_parent)) {
-			// set up variable values
-			foreach ($_parent as $_key => $_val) {
-				$this->tpl_vars[$_key] = new Smarty_variable($_val);
-			}
-		} elseif ($_parent != null) {
-			throw new SmartyException("Wrong type for template variables");
-		}
-	}
-}
-
-/**
- * class for the Smarty variable object
- * This class defines the Smarty variable object
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Smarty_Variable
-{
-	/**
-	 * template variable
-	 *
-	 * @var mixed
-	 */
-	public $value = null;
-	/**
-	 * if true any output of this variable will be not cached
-	 *
-	 * @var boolean
-	 */
-	public $nocache = false;
-	/**
-	 * the scope the variable will have  (local,parent or root)
-	 *
-	 * @var int
-	 */
-	public $scope = Smarty::SCOPE_LOCAL;
-
-	/**
-	 * create Smarty variable object
-	 *
-	 * @param mixed   $value   the value to assign
-	 * @param boolean $nocache if true any output of this variable will be not cached
-	 * @param int     $scope   the scope the variable will have  (local,parent or root)
-	 */
-	public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-	{
-		$this->value = $value;
-		$this->nocache = $nocache;
-		$this->scope = $scope;
-	}
-
-	/**
-	 * <<magic>> String conversion
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return (string)$this->value;
-	}
-}
-
-/**
- * class for undefined variable object
- * This class defines an object for undefined variable handling
- *
- * @package    Smarty
- * @subpackage Template
- */
-class Undefined_Smarty_Variable
-{
-	/**
-	 * Returns FALSE for 'nocache' and NULL otherwise.
-	 *
-	 * @param  string $name
-	 *
-	 * @return bool
-	 */
-	public function __get($name)
-	{
-		if ($name == 'nocache') {
-			return false;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Always returns an empty string.
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return "";
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_debug.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_debug.php
deleted file mode 100644
index 58d0c813a..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_debug.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Debug
- * Class to collect data for the Smarty Debugging Consol
- *
- * @package    Smarty
- * @subpackage Debug
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Debug Class
- *
- * @package    Smarty
- * @subpackage Debug
- */
-class Smarty_Internal_Debug extends Smarty_Internal_Data
-{
-	/**
-	 * template data
-	 *
-	 * @var array
-	 */
-	public static $template_data = array();
-
-	/**
-	 * List of uid's which shall be ignored
-	 *
-	 * @var array
-	 */
-	public static $ignore_uid = array();
-
-	/**
-	 * Ignore template
-	 *
-	 * @param object $template
-	 */
-	public static function ignore($template)
-	{
-		// calculate Uid if not already done
-		if ($template->source->uid == '') {
-			$template->source->filepath;
-		}
-		self::$ignore_uid[$template->source->uid] = true;
-	}
-
-	/**
-	 * Start logging of compile time
-	 *
-	 * @param object $template
-	 */
-	public static function start_compile($template)
-	{
-		static $_is_stringy = array('string' => true, 'eval' => true);
-		if (!empty($template->compiler->trace_uid)) {
-			$key = $template->compiler->trace_uid;
-			if (!isset(self::$template_data[$key])) {
-				if (isset($_is_stringy[$template->source->type])) {
-					self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
-				} else {
-					self::$template_data[$key]['name'] = $template->source->filepath;
-				}
-				self::$template_data[$key]['compile_time'] = 0;
-				self::$template_data[$key]['render_time'] = 0;
-				self::$template_data[$key]['cache_time'] = 0;
-			}
-		} else {
-			if (isset(self::$ignore_uid[$template->source->uid])) {
-				return;
-			}
-			$key = self::get_key($template);
-		}
-		self::$template_data[$key]['start_time'] = microtime(true);
-	}
-
-	/**
-	 * End logging of compile time
-	 *
-	 * @param object $template
-	 */
-	public static function end_compile($template)
-	{
-		if (!empty($template->compiler->trace_uid)) {
-			$key = $template->compiler->trace_uid;
-		} else {
-			if (isset(self::$ignore_uid[$template->source->uid])) {
-				return;
-			}
-
-			$key = self::get_key($template);
-		}
-		self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-	}
-
-	/**
-	 * Start logging of render time
-	 *
-	 * @param object $template
-	 */
-	public static function start_render($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['start_time'] = microtime(true);
-	}
-
-	/**
-	 * End logging of compile time
-	 *
-	 * @param object $template
-	 */
-	public static function end_render($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-	}
-
-	/**
-	 * Start logging of cache time
-	 *
-	 * @param object $template cached template
-	 */
-	public static function start_cache($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['start_time'] = microtime(true);
-	}
-
-	/**
-	 * End logging of cache time
-	 *
-	 * @param object $template cached template
-	 */
-	public static function end_cache($template)
-	{
-		$key = self::get_key($template);
-		self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-	}
-
-	/**
-	 * Opens a window for the Smarty Debugging Consol and display the data
-	 *
-	 * @param Smarty_Internal_Template|Smarty $obj object to debug
-	 */
-	public static function display_debug($obj)
-	{
-		// prepare information of assigned variables
-		$ptr = self::get_debug_vars($obj);
-		if ($obj instanceof Smarty) {
-			$smarty = clone $obj;
-		} else {
-			$smarty = clone $obj->smarty;
-		}
-		$_assigned_vars = $ptr->tpl_vars;
-		ksort($_assigned_vars);
-		$_config_vars = $ptr->config_vars;
-		ksort($_config_vars);
-		$smarty->registered_filters = array();
-		$smarty->autoload_filters = array();
-		$smarty->default_modifiers = array();
-		$smarty->force_compile = false;
-		$smarty->left_delimiter = '{';
-		$smarty->right_delimiter = '}';
-		$smarty->debugging = false;
-		$smarty->debugging_ctrl = 'NONE';
-		$smarty->force_compile = false;
-		$_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty);
-		$_template->caching = false;
-		$_template->disableSecurity();
-		$_template->cache_id = null;
-		$_template->compile_id = null;
-		if ($obj instanceof Smarty_Internal_Template) {
-			$_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
-		}
-		if ($obj instanceof Smarty) {
-			$_template->assign('template_data', self::$template_data);
-		} else {
-			$_template->assign('template_data', null);
-		}
-		$_template->assign('assigned_vars', $_assigned_vars);
-		$_template->assign('config_vars', $_config_vars);
-		$_template->assign('execution_time', microtime(true) - $smarty->start_time);
-		echo $_template->fetch();
-	}
-
-	/**
-	 * Recursively gets variables from all template/data scopes
-	 *
-	 * @param  Smarty_Internal_Template|Smarty_Data $obj object to debug
-	 *
-	 * @return StdClass
-	 */
-	public static function get_debug_vars($obj)
-	{
-		$config_vars = $obj->config_vars;
-		$tpl_vars = array();
-		foreach ($obj->tpl_vars as $key => $var) {
-			$tpl_vars[$key] = clone $var;
-			if ($obj instanceof Smarty_Internal_Template) {
-				$tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name;
-			} elseif ($obj instanceof Smarty_Data) {
-				$tpl_vars[$key]->scope = 'Data object';
-			} else {
-				$tpl_vars[$key]->scope = 'Smarty root';
-			}
-		}
-
-		if (isset($obj->parent)) {
-			$parent = self::get_debug_vars($obj->parent);
-			$tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
-			$config_vars = array_merge($parent->config_vars, $config_vars);
-		} else {
-			foreach (Smarty::$global_tpl_vars as $name => $var) {
-				if (!array_key_exists($name, $tpl_vars)) {
-					$clone = clone $var;
-					$clone->scope = 'Global';
-					$tpl_vars[$name] = $clone;
-				}
-			}
-		}
-
-		return (object)array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
-	}
-
-	/**
-	 * Return key into $template_data for template
-	 *
-	 * @param  object $template template object
-	 *
-	 * @return string key into $template_data
-	 */
-	private static function get_key($template)
-	{
-		static $_is_stringy = array('string' => true, 'eval' => true);
-		// calculate Uid if not already done
-		if ($template->source->uid == '') {
-			$template->source->filepath;
-		}
-		$key = $template->source->uid;
-		if (isset(self::$template_data[$key])) {
-			return $key;
-		} else {
-			if (isset($_is_stringy[$template->source->type])) {
-				self::$template_data[$key]['name'] = '\'' . substr($template->source->name, 0, 25) . '...\'';
-			} else {
-				self::$template_data[$key]['name'] = $template->source->filepath;
-			}
-			self::$template_data[$key]['compile_time'] = 0;
-			self::$template_data[$key]['render_time'] = 0;
-			self::$template_data[$key]['cache_time'] = 0;
-
-			return $key;
-		}
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_filter_handler.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_filter_handler.php
deleted file mode 100644
index 79c0b78bf..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_filter_handler.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Filter Handler
- * Smarty filter handler class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * Class for filter processing
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Filter_Handler
-{
-	/**
-	 * Run filters over content
-	 * The filters will be lazy loaded if required
-	 * class name format: Smarty_FilterType_FilterName
-	 * plugin filename format: filtertype.filtername.php
-	 * Smarty2 filter plugins could be used
-	 *
-	 * @param  string                   $type     the type of filter ('pre','post','output') which shall run
-	 * @param  string                   $content  the content which shall be processed by the filters
-	 * @param  Smarty_Internal_Template $template template object
-	 *
-	 * @throws SmartyException
-	 * @return string                   the filtered content
-	 */
-	public static function runFilter($type, $content, Smarty_Internal_Template $template)
-	{
-		$output = $content;
-		// loop over autoload filters of specified type
-		if (!empty($template->smarty->autoload_filters[$type])) {
-			foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
-				$plugin_name = "Smarty_{$type}filter_{$name}";
-				if ($template->smarty->loadPlugin($plugin_name)) {
-					if (function_exists($plugin_name)) {
-						// use loaded Smarty2 style plugin
-						$output = $plugin_name($output, $template);
-					} elseif (class_exists($plugin_name, false)) {
-						// loaded class of filter plugin
-						$output = call_user_func(array($plugin_name, 'execute'), $output, $template);
-					}
-				} else {
-					// nothing found, throw exception
-					throw new SmartyException("Unable to load filter {$plugin_name}");
-				}
-			}
-		}
-		// loop over registerd filters of specified type
-		if (!empty($template->smarty->registered_filters[$type])) {
-			foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-				if (is_array($template->smarty->registered_filters[$type][$key])) {
-					$output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-				} else {
-					$output = $template->smarty->registered_filters[$type][$key]($output, $template);
-				}
-			}
-		}
-
-		// return filtered output
-		return $output;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_function_call_handler.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index 8aad7e761..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Uwe Tews
- */
-
-/**
- * This class does call function defined with the {function} tag
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Function_Call_Handler
-{
-	/**
-	 * This function handles calls to template functions defined by {function}
-	 * It does create a PHP function at the first call
-	 *
-	 * @param string                   $_name     template function name
-	 * @param Smarty_Internal_Template $_template template object
-	 * @param array                    $_params   Smarty variables passed as call parameter
-	 * @param string                   $_hash     nocache hash value
-	 * @param bool                     $_nocache  nocache flag
-	 */
-	public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache)
-	{
-		if ($_nocache) {
-			$_function = "smarty_template_function_{$_name}_nocache";
-		} else {
-			$_function = "smarty_template_function_{$_hash}_{$_name}";
-		}
-		if (!is_callable($_function)) {
-			$_code = "function {$_function}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-			if ($_nocache) {
-				$_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
-											 "!\\\'!"
-					), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']
-				);
-				$_template->smarty->template_functions[$_name]['called_nocache'] = true;
-			} else {
-				$_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-			}
-			$_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
-			eval($_code);
-		}
-		$_function($_template, $_params);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_get_include_path.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index af0ee5b91..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Get_Include_Path
-{
-	/**
-	 * Return full file path from PHP include_path
-	 *
-	 * @param  string $filepath filepath
-	 *
-	 * @return string|boolean full filepath or false
-	 */
-	public static function getIncludePath($filepath)
-	{
-		static $_include_path = null;
-
-		if (function_exists('stream_resolve_include_path')) {
-			// available since PHP 5.3.2
-			return stream_resolve_include_path($filepath);
-		}
-
-		if ($_include_path === null) {
-			$_include_path = explode(PATH_SEPARATOR, get_include_path());
-		}
-
-		foreach ($_include_path as $_path) {
-			if (file_exists($_path . DS . $filepath)) {
-				return $_path . DS . $filepath;
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_nocache_insert.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
deleted file mode 100644
index 0d2facfe9..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_nocache_insert.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Nocache Insert
- * Compiles the {insert} tag into the cache file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Nocache_Insert
-{
-    /**
-     * Compiles code for the {insert} tag into cache file
-     *
-     * @param  string                   $_function insert function name
-     * @param  array                    $_attr     array with parameter
-     * @param  Smarty_Internal_Template $_template template object
-     * @param  string                   $_script   script name to load or 'null'
-     * @param  string                   $_assign   optional variable name
-     *
-     * @return string                   compiled code
-     */
-    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
-    {
-        $_output = '<?php ';
-        if ($_script != 'null') {
-            // script which must be included
-            // code for script file loading
-            $_output .= "require_once '{$_script}';";
-        }
-        // call insert
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>";
-        } else {
-            $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
-        }
-        $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
-            $_tpl = $_tpl->parent;
-        }
-
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_parsetree.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_parsetree.php
deleted file mode 100644
index 76b090aa4..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_parsetree.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parsetrees
- * These are classes to build parsetrees in the template parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Thue Kristensen
- * @author     Uwe Tews
- */
-
-/**
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-abstract class _smarty_parsetree
-{
-	/**
-	 * Parser object
-	 *
-	 * @var object
-	 */
-	public $parser;
-	/**
-	 * Buffer content
-	 *
-	 * @var mixed
-	 */
-	public $data;
-
-	/**
-	 * Subtree array
-	 *
-	 * @var array
-	 */
-	public $subtrees = array();
-
-	/**
-	 * Return buffer
-	 *
-	 * @return string buffer content
-	 */
-	abstract public function to_smarty_php();
-}
-
-/**
- * A complete smarty tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_tag extends _smarty_parsetree
-{
-	/**
-	 * Saved block nesting level
-	 *
-	 * @var int
-	 */
-	public $saved_block_nesting;
-
-	/**
-	 * Create parse tree buffer for Smarty tag
-	 *
-	 * @param object $parser parser object
-	 * @param string $data   content
-	 */
-	public function __construct($parser, $data)
-	{
-		$this->parser = $parser;
-		$this->data = $data;
-		$this->saved_block_nesting = $parser->block_nesting_level;
-	}
-
-	/**
-	 * Return buffer content
-	 *
-	 * @return string content
-	 */
-	public function to_smarty_php()
-	{
-		return $this->data;
-	}
-
-	/**
-	 * Return complied code that loads the evaluated output of buffer content into a temporary variable
-	 *
-	 * @return string template code
-	 */
-	public function assign_to_var()
-	{
-		$var = sprintf('$_tmp%d', ++Smarty_Internal_Templateparser::$prefix_number);
-		$this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var);
-
-		return $var;
-	}
-}
-
-/**
- * Code fragment inside a tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_code extends _smarty_parsetree
-{
-	/**
-	 * Create parse tree buffer for code fragment
-	 *
-	 * @param object $parser parser object
-	 * @param string $data   content
-	 */
-	public function __construct($parser, $data)
-	{
-		$this->parser = $parser;
-		$this->data = $data;
-	}
-
-	/**
-	 * Return buffer content in parentheses
-	 *
-	 * @return string content
-	 */
-	public function to_smarty_php()
-	{
-		return sprintf("(%s)", $this->data);
-	}
-}
-
-/**
- * Double quoted string inside a tag.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_doublequoted extends _smarty_parsetree
-{
-	/**
-	 * Create parse tree buffer for double quoted string subtrees
-	 *
-	 * @param object            $parser  parser object
-	 * @param _smarty_parsetree $subtree parsetree buffer
-	 */
-	public function __construct($parser, _smarty_parsetree $subtree)
-	{
-		$this->parser = $parser;
-		$this->subtrees[] = $subtree;
-		if ($subtree instanceof _smarty_tag) {
-			$this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-		}
-	}
-
-	/**
-	 * Append buffer to subtree
-	 *
-	 * @param _smarty_parsetree $subtree parsetree buffer
-	 */
-	public function append_subtree(_smarty_parsetree $subtree)
-	{
-		$last_subtree = count($this->subtrees) - 1;
-		if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-			if ($subtree instanceof _smarty_code) {
-				$this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
-			} elseif ($subtree instanceof _smarty_dq_content) {
-				$this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
-			} else {
-				$this->subtrees[$last_subtree]->data .= $subtree->data;
-			}
-		} else {
-			$this->subtrees[] = $subtree;
-		}
-		if ($subtree instanceof _smarty_tag) {
-			$this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-		}
-	}
-
-	/**
-	 * Merge subtree buffer content together
-	 *
-	 * @return string compiled template code
-	 */
-	public function to_smarty_php()
-	{
-		$code = '';
-		foreach ($this->subtrees as $subtree) {
-			if ($code !== "") {
-				$code .= ".";
-			}
-			if ($subtree instanceof _smarty_tag) {
-				$more_php = $subtree->assign_to_var();
-			} else {
-				$more_php = $subtree->to_smarty_php();
-			}
-
-			$code .= $more_php;
-
-			if (!$subtree instanceof _smarty_dq_content) {
-				$this->parser->compiler->has_variable_string = true;
-			}
-		}
-
-		return $code;
-	}
-}
-
-/**
- * Raw chars as part of a double quoted string.
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_dq_content extends _smarty_parsetree
-{
-	/**
-	 * Create parse tree buffer with string content
-	 *
-	 * @param object $parser parser object
-	 * @param string $data   string section
-	 */
-	public function __construct($parser, $data)
-	{
-		$this->parser = $parser;
-		$this->data = $data;
-	}
-
-	/**
-	 * Return content as double quoted string
-	 *
-	 * @return string doubled quoted string
-	 */
-	public function to_smarty_php()
-	{
-		return '"' . $this->data . '"';
-	}
-}
-
-/**
- * Template element
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_template_buffer extends _smarty_parsetree
-{
-	/**
-	 * Array of template elements
-	 *
-	 * @var array
-	 */
-	public $subtrees = Array();
-
-	/**
-	 * Create root of parse tree for template elements
-	 *
-	 * @param object $parser parse object
-	 */
-	public function __construct($parser)
-	{
-		$this->parser = $parser;
-	}
-
-	/**
-	 * Append buffer to subtree
-	 *
-	 * @param _smarty_parsetree $subtree
-	 */
-	public function append_subtree(_smarty_parsetree $subtree)
-	{
-		$this->subtrees[] = $subtree;
-	}
-
-	/**
-	 * Sanitize and merge subtree buffers together
-	 *
-	 * @return string template code content
-	 */
-	public function to_smarty_php()
-	{
-		$code = '';
-		for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-			if ($key + 2 < $cnt) {
-				if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
-					$key = $key + 1;
-					continue;
-				}
-				if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
-					$key = $key + 2;
-					continue;
-				}
-			}
-			if (substr($code, -1) == '<') {
-				$subtree = $this->subtrees[$key]->to_smarty_php();
-				if (substr($subtree, 0, 1) == '?') {
-					$code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1);
-				} elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
-					$code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1);
-				} else {
-					$code .= $subtree;
-				}
-				continue;
-			}
-			if ($this->parser->asp_tags && substr($code, -1) == '%') {
-				$subtree = $this->subtrees[$key]->to_smarty_php();
-				if (substr($subtree, 0, 1) == '>') {
-					$code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1);
-				} else {
-					$code .= $subtree;
-				}
-				continue;
-			}
-			if (substr($code, -1) == '?') {
-				$subtree = $this->subtrees[$key]->to_smarty_php();
-				if (substr($subtree, 0, 1) == '>') {
-					$code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1);
-				} else {
-					$code .= $subtree;
-				}
-				continue;
-			}
-			$code .= $this->subtrees[$key]->to_smarty_php();
-		}
-
-		return $code;
-	}
-}
-
-/**
- * template text
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_text extends _smarty_parsetree
-{
-	/**
-	 * Create template text buffer
-	 *
-	 * @param object $parser parser object
-	 * @param string $data   text
-	 */
-	public function __construct($parser, $data)
-	{
-		$this->parser = $parser;
-		$this->data = $data;
-	}
-
-	/**
-	 * Return buffer content
-	 *
-	 * @return strint text
-	 */
-	public function to_smarty_php()
-	{
-		return $this->data;
-	}
-}
-
-/**
- * template linebreaks
- *
- * @package    Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_linebreak extends _smarty_parsetree
-{
-	/**
-	 * Create buffer with linebreak content
-	 *
-	 * @param object $parser parser object
-	 * @param string $data   linebreak string
-	 */
-	public function __construct($parser, $data)
-	{
-		$this->parser = $parser;
-		$this->data = $data;
-	}
-
-	/**
-	 * Return linebrak
-	 *
-	 * @return string linebreak
-	 */
-	public function to_smarty_php()
-	{
-		return $this->data;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_eval.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_eval.php
deleted file mode 100644
index 60c5e3798..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_eval.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Eval
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Eval
- * Implements the strings as resource for Smarty template
- * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
-{
-	/**
-	 * populate Source Object with meta data from Resource
-	 *
-	 * @param  Smarty_Template_Source   $source    source object
-	 * @param  Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-	{
-		$source->uid = $source->filepath = sha1($source->name);
-		$source->timestamp = false;
-		$source->exists = true;
-	}
-
-	/**
-	 * Load template's source from $resource_name into current template object
-	 *
-	 * @uses decode() to decode base64 and urlencoded template_resources
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 template source
-	 */
-	public function getContent(Smarty_Template_Source $source)
-	{
-		return $this->decode($source->name);
-	}
-
-	/**
-	 * decode base64 and urlencode
-	 *
-	 * @param  string $string template_resource to decode
-	 *
-	 * @return string decoded template_resource
-	 */
-	protected function decode($string)
-	{
-		// decode if specified
-		if (($pos = strpos($string, ':')) !== false) {
-			if (!strncmp($string, 'base64', 6)) {
-				return base64_decode(substr($string, 7));
-			} elseif (!strncmp($string, 'urlencode', 9)) {
-				return urldecode(substr($string, 10));
-			}
-		}
-
-		return $string;
-	}
-
-	/**
-	 * modify resource_name according to resource handlers specifications
-	 *
-	 * @param  Smarty  $smarty        Smarty instance
-	 * @param  string  $resource_name resource_name to make unique
-	 * @param  boolean $is_config     flag for config resource
-	 *
-	 * @return string unique resource name
-	 */
-	protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
-	{
-		return get_class($this) . '#' . $this->decode($resource_name);
-	}
-
-	/**
-	 * Determine basename for compiled filename
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 resource's basename
-	 */
-	protected function getBasename(Smarty_Template_Source $source)
-	{
-		return '';
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_extends.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_extends.php
deleted file mode 100644
index 255b74a6b..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_extends.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Extends
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Extends
- * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Extends extends Smarty_Resource
-{
-	/**
-	 * mbstring.overload flag
-	 *
-	 * @var int
-	 */
-	public $mbstring_overload = 0;
-
-	/**
-	 * populate Source Object with meta data from Resource
-	 *
-	 * @param Smarty_Template_Source   $source    source object
-	 * @param Smarty_Internal_Template $_template template object
-	 *
-	 * @throws SmartyException
-	 */
-	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-	{
-		$uid = '';
-		$sources = array();
-		$components = explode('|', $source->name);
-		$exists = true;
-		foreach ($components as $component) {
-			$s = Smarty_Resource::source(null, $source->smarty, $component);
-			if ($s->type == 'php') {
-				throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
-			}
-			$sources[$s->uid] = $s;
-			$uid .= $s->filepath;
-			if ($_template && $_template->smarty->compile_check) {
-				$exists = $exists && $s->exists;
-			}
-		}
-		$source->components = $sources;
-		$source->filepath = $s->filepath;
-		$source->uid = sha1(realpath($uid));
-		if ($_template && $_template->smarty->compile_check) {
-			$source->timestamp = $s->timestamp;
-			$source->exists = $exists;
-		}
-		// need the template at getContent()
-		$source->template = $_template;
-	}
-
-	/**
-	 * populate Source Object with timestamp and exists from Resource
-	 *
-	 * @param Smarty_Template_Source $source source object
-	 */
-	public function populateTimestamp(Smarty_Template_Source $source)
-	{
-		$source->exists = true;
-		foreach ($source->components as $s) {
-			$source->exists = $source->exists && $s->exists;
-		}
-		$source->timestamp = $s->timestamp;
-	}
-
-	/**
-	 * Load template's source from files into current template object
-	 *
-	 * @param Smarty_Template_Source $source source object
-	 *
-	 * @return string template source
-	 * @throws SmartyException if source cannot be loaded
-	 */
-	public function getContent(Smarty_Template_Source $source)
-	{
-		if (!$source->exists) {
-			throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-		}
-
-		$_components = array_reverse($source->components);
-
-		$_content = '';
-		foreach ($_components as $_component) {
-			// read content
-			$_content .= $_component->content;
-		}
-
-		return $_content;
-	}
-
-	/**
-	 * Determine basename for compiled filename
-	 *
-	 * @param Smarty_Template_Source $source source object
-	 *
-	 * @return string resource's basename
-	 */
-	public function getBasename(Smarty_Template_Source $source)
-	{
-		return str_replace(':', '.', basename($source->filepath));
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_file.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_file.php
deleted file mode 100644
index 0abdc4495..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_file.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource File
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource File
- * Implements the file system as resource for Smarty templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_File extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-
-            $source->uid = sha1(realpath($source->filepath));
-            if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->timestamp) {
-            return file_get_contents($source->filepath);
-        }
-        if ($source instanceof Smarty_Config_Source) {
-            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        $_file = $source->name;
-        if (($_pos = strpos($_file, ']')) !== false) {
-            $_file = substr($_file, $_pos + 1);
-        }
-
-        return basename($_file);
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_php.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_php.php
deleted file mode 100644
index 7463c2960..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_php.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Resource PHP
- * Implements the file system as resource for PHP templates
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled
-{
-    /**
-     * container for short_open_tag directive's value before executing PHP templates
-     *
-     * @var string
-     */
-    protected $short_open_tag;
-
-    /**
-     * Create a new PHP Resource
-
-     */
-    public function __construct()
-    {
-        $this->short_open_tag = ini_get('short_open_tag');
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     * @throws SmartyException        if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->timestamp) {
-            return '';
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
-     */
-    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
-    {
-        if (!$source->smarty->allow_php_templates) {
-            throw new SmartyException("PHP templates are disabled");
-        }
-        if (!$source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$source->type} '{$source->name}'{$parent_resource}");
-        }
-
-        // prepare variables
-        extract($_template->getTemplateVars());
-
-        // include PHP template with short open tags enabled
-        ini_set('short_open_tag', '1');
-        /** @var Smarty_Internal_Template $_smarty_template
-         * used in included file
-         */
-        $_smarty_template = $_template;
-        include($source->filepath);
-        ini_set('short_open_tag', $this->short_open_tag);
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_registered.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_registered.php
deleted file mode 100644
index fa9ad0d1a..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_registered.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Registered
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Registered
- * Implements the registered resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @deprecated
- */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource
-{
-	/**
-	 * populate Source Object with meta data from Resource
-	 *
-	 * @param  Smarty_Template_Source   $source    source object
-	 * @param  Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-	{
-		$source->filepath = $source->type . ':' . $source->name;
-		$source->uid = sha1($source->filepath);
-		if ($source->smarty->compile_check) {
-			$source->timestamp = $this->getTemplateTimestamp($source);
-			$source->exists = !!$source->timestamp;
-		}
-	}
-
-	/**
-	 * populate Source Object with timestamp and exists from Resource
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return void
-	 */
-	public function populateTimestamp(Smarty_Template_Source $source)
-	{
-		$source->timestamp = $this->getTemplateTimestamp($source);
-		$source->exists = !!$source->timestamp;
-	}
-
-	/**
-	 * Get timestamp (epoch) the template source was modified
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return integer|boolean        timestamp (epoch) the template was modified, false if resources has no timestamp
-	 */
-	public function getTemplateTimestamp(Smarty_Template_Source $source)
-	{
-		// return timestamp
-		$time_stamp = false;
-		call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty));
-
-		return is_numeric($time_stamp) ? (int)$time_stamp : $time_stamp;
-	}
-
-	/**
-	 * Load template's source by invoking the registered callback into current template object
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 template source
-	 * @throws SmartyException        if source cannot be loaded
-	 */
-	public function getContent(Smarty_Template_Source $source)
-	{
-		// return template string
-		$t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
-		if (is_bool($t) && !$t) {
-			throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-		}
-
-		return $source->content;
-	}
-
-	/**
-	 * Determine basename for compiled filename
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 resource's basename
-	 */
-	protected function getBasename(Smarty_Template_Source $source)
-	{
-		return basename($source->name);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_stream.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_stream.php
deleted file mode 100644
index eef515078..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_stream.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Stream
- * Implements the streams as resource for Smarty template
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Stream
- * Implements the streams as resource for Smarty template
- *
- * @link       http://php.net/streams
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
-{
-	/**
-	 * populate Source Object with meta data from Resource
-	 *
-	 * @param Smarty_Template_Source   $source    source object
-	 * @param Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-	{
-		if (strpos($source->resource, '://') !== false) {
-			$source->filepath = $source->resource;
-		} else {
-			$source->filepath = str_replace(':', '://', $source->resource);
-		}
-		$source->uid = false;
-		$source->content = $this->getContent($source);
-		$source->timestamp = false;
-		$source->exists = !!$source->content;
-	}
-
-	/**
-	 * Load template's source from stream into current template object
-	 *
-	 * @param Smarty_Template_Source $source source object
-	 *
-	 * @return string template source
-	 * @throws SmartyException if source cannot be loaded
-	 */
-	public function getContent(Smarty_Template_Source $source)
-	{
-		$t = '';
-		// the availability of the stream has already been checked in Smarty_Resource::fetch()
-		$fp = fopen($source->filepath, 'r+');
-		if ($fp) {
-			while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-				$t .= $current_line;
-			}
-			fclose($fp);
-
-			return $t;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * modify resource_name according to resource handlers specifications
-	 *
-	 * @param Smarty   $smarty        Smarty instance
-	 * @param string   $resource_name resource_name to make unique
-	 * @param  boolean $is_config     flag for config resource
-	 *
-	 * @return string unique resource name
-	 */
-	protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
-	{
-		return get_class($this) . '#' . $resource_name;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_string.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_string.php
deleted file mode 100644
index bfa069974..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_resource_string.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource String
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Uwe Tews
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource String
- * Implements the strings as resource for Smarty template
- * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_String extends Smarty_Resource
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $source->uid = $source->filepath = sha1($source->name);
-        $source->timestamp = 0;
-        $source->exists = true;
-    }
-
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
-
-    /**
-     * decode base64 and urlencode
-     *
-     * @param  string $string template_resource to decode
-     *
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param  Smarty  $smarty        Smarty instance
-     * @param  string  $resource_name resource_name to make unique
-     * @param  boolean $is_config     flag for config resource
-     *
-     * @return string unique resource name
-     */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
-    {
-        return get_class($this) . '#' . $this->decode($resource_name);
-    }
-
-    /**
-     * Determine basename for compiled filename
-     * Always returns an empty string.
-     *
-     * @param  Smarty_Template_Source $source source object
-     *
-     * @return string                 resource's basename
-     */
-    protected function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
deleted file mode 100644
index 815a5e731..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * @ignore
- */
-include 'smarty_internal_parsetree.php';
-
-/**
- * Class SmartyTemplateCompiler
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
-{
-	/**
-	 * Lexer class name
-	 *
-	 * @var string
-	 */
-	public $lexer_class;
-
-	/**
-	 * Parser class name
-	 *
-	 * @var string
-	 */
-	public $parser_class;
-
-	/**
-	 * Lexer object
-	 *
-	 * @var object
-	 */
-	public $lex;
-
-	/**
-	 * Parser object
-	 *
-	 * @var object
-	 */
-	public $parser;
-
-	/**
-	 * Smarty object
-	 *
-	 * @var object
-	 */
-	public $smarty;
-
-	/**
-	 * array of vars which can be compiled in local scope
-	 *
-	 * @var array
-	 */
-	public $local_var = array();
-
-	/**
-	 * Initialize compiler
-	 *
-	 * @param string $lexer_class  class name
-	 * @param string $parser_class class name
-	 * @param Smarty $smarty       global instance
-	 */
-	public function __construct($lexer_class, $parser_class, $smarty)
-	{
-		$this->smarty = $smarty;
-		parent::__construct();
-		// get required plugins
-		$this->lexer_class = $lexer_class;
-		$this->parser_class = $parser_class;
-	}
-
-	/**
-	 * method to compile a Smarty template
-	 *
-	 * @param  mixed $_content template source
-	 *
-	 * @return bool  true if compiling succeeded, false if it failed
-	 */
-	protected function doCompile($_content)
-	{
-		/* here is where the compiling takes place. Smarty
-		  tags in the templates are replaces with PHP code,
-		  then written to compiled files. */
-		// init the lexer/parser to compile the template
-		$this->lex = new $this->lexer_class($_content, $this);
-		$this->parser = new $this->parser_class($this->lex, $this);
-		if ($this->inheritance_child) {
-			// start state on child templates
-			$this->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY);
-		}
-		if (function_exists('mb_internal_encoding') && ((int)ini_get('mbstring.func_overload')) & 2) {
-			$mbEncoding = mb_internal_encoding();
-			mb_internal_encoding('ASCII');
-		} else {
-			$mbEncoding = null;
-		}
-
-		if ($this->smarty->_parserdebug) {
-			$this->parser->PrintTrace();
-			$this->lex->PrintTrace();
-		}
-		// get tokens from lexer and parse them
-		while ($this->lex->yylex() && !$this->abort_and_recompile) {
-			if ($this->smarty->_parserdebug) {
-				echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-					htmlentities($this->lex->value) . "</pre>";
-			}
-			$this->parser->doParse($this->lex->token, $this->lex->value);
-		}
-
-		if ($this->abort_and_recompile) {
-			// exit here on abort
-			return false;
-		}
-		// finish parsing process
-		$this->parser->doParse(0, 0);
-		if ($mbEncoding) {
-			mb_internal_encoding($mbEncoding);
-		}
-		// check for unclosed tags
-		if (count($this->_tag_stack) > 0) {
-			// get stacked info
-			list($openTag, $_data) = array_pop($this->_tag_stack);
-			$this->trigger_template_error("unclosed {$this->smarty->left_delimiter}" . $openTag . "{$this->smarty->right_delimiter} tag");
-		}
-		// return compiled code
-		// return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-		return $this->parser->retvalue;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_template.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_template.php
deleted file mode 100644
index c2d18333e..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_template.php
+++ /dev/null
@@ -1,737 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Template
- * This file contains the Smarty template engine
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Main class with template data structures and methods
- *
- * @package    Smarty
- * @subpackage Template
- * @property Smarty_Template_Source   $source
- * @property Smarty_Template_Compiled $compiled
- * @property Smarty_Template_Cached   $cached
- */
-class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
-{
-	/**
-	 * cache_id
-	 *
-	 * @var string
-	 */
-	public $cache_id = null;
-	/**
-	 * $compile_id
-	 * @var string
-	 */
-	public $compile_id = null;
-	/**
-	 * caching enabled
-	 *
-	 * @var boolean
-	 */
-	public $caching = null;
-	/**
-	 * cache lifetime in seconds
-	 *
-	 * @var integer
-	 */
-	public $cache_lifetime = null;
-	/**
-	 * Template resource
-	 *
-	 * @var string
-	 */
-	public $template_resource = null;
-	/**
-	 * flag if compiled template is invalid and must be (re)compiled
-	 *
-	 * @var bool
-	 */
-	public $mustCompile = null;
-	/**
-	 * flag if template does contain nocache code sections
-	 *
-	 * @var bool
-	 */
-	public $has_nocache_code = false;
-	/**
-	 * special compiled and cached template properties
-	 *
-	 * @var array
-	 */
-	public $properties = array('file_dependency' => array(),
-							   'nocache_hash'    => '',
-							   'function'        => array()
-	);
-	/**
-	 * required plugins
-	 *
-	 * @var array
-	 */
-	public $required_plugins = array('compiled' => array(), 'nocache' => array());
-	/**
-	 * Global smarty instance
-	 *
-	 * @var Smarty
-	 */
-	public $smarty = null;
-	/**
-	 * blocks for template inheritance
-	 *
-	 * @var array
-	 */
-	public $block_data = array();
-	/**
-	 * variable filters
-	 *
-	 * @var array
-	 */
-	public $variable_filters = array();
-	/**
-	 * optional log of tag/attributes
-	 *
-	 * @var array
-	 */
-	public $used_tags = array();
-	/**
-	 * internal flag to allow relative path in child template blocks
-	 *
-	 * @var bool
-	 */
-	public $allow_relative_path = false;
-	/**
-	 * internal capture runtime stack
-	 *
-	 * @var array
-	 */
-	public $_capture_stack = array(0 => array());
-
-	/**
-	 * Create template data object
-	 * Some of the global Smarty settings copied to template scope
-	 * It load the required template resources and cacher plugins
-	 *
-	 * @param string                   $template_resource template resource string
-	 * @param Smarty                   $smarty            Smarty instance
-	 * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
-	 * @param mixed                    $_cache_id         cache   id or null
-	 * @param mixed                    $_compile_id       compile id or null
-	 * @param bool                     $_caching          use caching?
-	 * @param int                      $_cache_lifetime   cache life-time in seconds
-	 */
-	public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
-	{
-		$this->smarty = & $smarty;
-		// Smarty parameter
-		$this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
-		$this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
-		$this->caching = $_caching === null ? $this->smarty->caching : $_caching;
-		if ($this->caching === true) {
-			$this->caching = Smarty::CACHING_LIFETIME_CURRENT;
-		}
-		$this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
-		$this->parent = $_parent;
-		// Template resource
-		$this->template_resource = $template_resource;
-		// copy block data of template inheritance
-		if ($this->parent instanceof Smarty_Internal_Template) {
-			$this->block_data = $this->parent->block_data;
-		}
-	}
-
-	/**
-	 * Returns if the current template must be compiled by the Smarty compiler
-	 * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
-	 *
-	 * @throws SmartyException
-	 * @return boolean true if the template must be compiled
-	 */
-	public function mustCompile()
-	{
-		if (!$this->source->exists) {
-			if ($this->parent instanceof Smarty_Internal_Template) {
-				$parent_resource = " in '$this->parent->template_resource}'";
-			} else {
-				$parent_resource = '';
-			}
-			throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
-		}
-		if ($this->mustCompile === null) {
-			$this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
-					($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
-		}
-
-		return $this->mustCompile;
-	}
-
-	/**
-	 * Compiles the template
-	 * If the template is not evaluated the compiled template is saved on disk
-	 */
-	public function compileTemplateSource()
-	{
-		if (!$this->source->recompiled) {
-			$this->properties['file_dependency'] = array();
-			if ($this->source->components) {
-				// for the extends resource the compiler will fill it
-				// uses real resource for file dependency
-				// $source = end($this->source->components);
-				// $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type);
-			} else {
-				$this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
-			}
-		}
-		// compile locking
-		if ($this->smarty->compile_locking && !$this->source->recompiled) {
-			if ($saved_timestamp = $this->compiled->timestamp) {
-				touch($this->compiled->filepath);
-			}
-		}
-		// call compiler
-		try {
-			$code = $this->compiler->compileTemplate($this);
-		} catch (Exception $e) {
-			// restore old timestamp in case of error
-			if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) {
-				touch($this->compiled->filepath, $saved_timestamp);
-			}
-			throw $e;
-		}
-		// compiling succeded
-		if (!$this->source->recompiled && $this->compiler->write_compiled_code) {
-			// write compiled template
-			$_filepath = $this->compiled->filepath;
-			if ($_filepath === false) {
-				throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to');
-			}
-			Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty);
-			$this->compiled->exists = true;
-			$this->compiled->isCompiled = true;
-		}
-		// release compiler object to free memory
-		unset($this->compiler);
-	}
-
-	/**
-	 * Writes the cached template output
-	 *
-	 * @param string $content
-	 *
-	 * @return bool
-	 */
-	public function writeCachedContent($content)
-	{
-		if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-			// don't write cache file
-			return false;
-		}
-		$this->properties['cache_lifetime'] = $this->cache_lifetime;
-		$this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-		$content = $this->createTemplateCodeFrame($content, true);
-		/** @var Smarty_Internal_Template $_smarty_tpl
-		 * used in evaluated code
-		 */
-		$_smarty_tpl = $this;
-		eval("?>" . $content);
-		$this->cached->valid = true;
-		$this->cached->processed = true;
-
-		return $this->cached->write($this, $content);
-	}
-
-	/**
-	 * Template code runtime function to get subtemplate content
-	 *
-	 * @param string  $template       the resource handle of the template file
-	 * @param mixed   $cache_id       cache id to be used with this template
-	 * @param mixed   $compile_id     compile id to be used with this template
-	 * @param integer $caching        cache mode
-	 * @param integer $cache_lifetime life time of cache data
-	 * @param         $data
-	 * @param int     $parent_scope   scope in which {include} should execute
-	 *
-	 * @returns string template content
-	 */
-	public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
-	{
-		// already in template cache?
-		if ($this->smarty->allow_ambiguous_resources) {
-			$_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-		} else {
-			$_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-		}
-
-		if (isset($_templateId[150])) {
-			$_templateId = sha1($_templateId);
-		}
-		if (isset($this->smarty->template_objects[$_templateId])) {
-			// clone cached template object because of possible recursive call
-			$tpl = clone $this->smarty->template_objects[$_templateId];
-			$tpl->parent = $this;
-			$tpl->caching = $caching;
-			$tpl->cache_lifetime = $cache_lifetime;
-		} else {
-			$tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-		}
-		// get variables from calling scope
-		if ($parent_scope == Smarty::SCOPE_LOCAL) {
-			$tpl->tpl_vars = $this->tpl_vars;
-			$tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-		} elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-			$tpl->tpl_vars = & $this->tpl_vars;
-		} elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-			$tpl->tpl_vars = & Smarty::$global_tpl_vars;
-		} elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-			$tpl->tpl_vars = & $this->tpl_vars;
-		} else {
-			$tpl->tpl_vars = & $scope_ptr->tpl_vars;
-		}
-		$tpl->config_vars = $this->config_vars;
-		if (!empty($data)) {
-			// set up variable values
-			foreach ($data as $_key => $_val) {
-				$tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-			}
-		}
-
-		return $tpl->fetch(null, null, null, null, false, false, true);
-	}
-
-	/**
-	 * Template code runtime function to set up an inline subtemplate
-	 *
-	 * @param string  $template       the resource handle of the template file
-	 * @param mixed   $cache_id       cache id to be used with this template
-	 * @param mixed   $compile_id     compile id to be used with this template
-	 * @param integer $caching        cache mode
-	 * @param integer $cache_lifetime life time of cache data
-	 * @param         $data
-	 * @param int     $parent_scope   scope in which {include} should execute
-	 * @param string  $hash           nocache hash code
-	 *
-	 * @returns string template content
-	 */
-	public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
-	{
-		$tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-		$tpl->properties['nocache_hash'] = $hash;
-		// get variables from calling scope
-		if ($parent_scope == Smarty::SCOPE_LOCAL) {
-			$tpl->tpl_vars = $this->tpl_vars;
-			$tpl->tpl_vars['smarty'] = clone $this->tpl_vars['smarty'];
-		} elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-			$tpl->tpl_vars = & $this->tpl_vars;
-		} elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-			$tpl->tpl_vars = & Smarty::$global_tpl_vars;
-		} elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-			$tpl->tpl_vars = & $this->tpl_vars;
-		} else {
-			$tpl->tpl_vars = & $scope_ptr->tpl_vars;
-		}
-		$tpl->config_vars = $this->config_vars;
-		if (!empty($data)) {
-			// set up variable values
-			foreach ($data as $_key => $_val) {
-				$tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-			}
-		}
-
-		return $tpl;
-	}
-
-	/**
-	 * Create code frame for compiled and cached templates
-	 *
-	 * @param  string $content optional template content
-	 * @param  bool   $cache   flag for cache file
-	 *
-	 * @return string
-	 */
-	public function createTemplateCodeFrame($content = '', $cache = false)
-	{
-		$plugins_string = '';
-		// include code for plugins
-		if (!$cache) {
-			if (!empty($this->required_plugins['compiled'])) {
-				$plugins_string = '<?php ';
-				foreach ($this->required_plugins['compiled'] as $tmp) {
-					foreach ($tmp as $data) {
-						$file = addslashes($data['file']);
-						if (is_Array($data['function'])) {
-							$plugins_string .= "if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n";
-						} else {
-							$plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
-						}
-					}
-				}
-				$plugins_string .= '?>';
-			}
-			if (!empty($this->required_plugins['nocache'])) {
-				$this->has_nocache_code = true;
-				$plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-				foreach ($this->required_plugins['nocache'] as $tmp) {
-					foreach ($tmp as $data) {
-						$file = addslashes($data['file']);
-						if (is_Array($data['function'])) {
-							$plugins_string .= addslashes("if (!is_callable(array('{$data['function'][0]}','{$data['function'][1]}'))) include '{$file}';\n");
-						} else {
-							$plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
-						}
-					}
-				}
-				$plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
-			}
-		}
-		// build property code
-		$this->properties['has_nocache_code'] = $this->has_nocache_code;
-		$output = '';
-		if (!$this->source->recompiled) {
-			$output = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/";
-			if ($this->smarty->direct_access_security) {
-				$output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-			}
-		}
-		if ($cache) {
-			// remove compiled code of{function} definition
-			unset($this->properties['function']);
-			if (!empty($this->smarty->template_functions)) {
-				// copy code of {function} tags called in nocache mode
-				foreach ($this->smarty->template_functions as $name => $function_data) {
-					if (isset($function_data['called_nocache'])) {
-						foreach ($function_data['called_functions'] as $func_name) {
-							$this->smarty->template_functions[$func_name]['called_nocache'] = true;
-						}
-					}
-				}
-				foreach ($this->smarty->template_functions as $name => $function_data) {
-					if (isset($function_data['called_nocache'])) {
-						unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']);
-						$this->properties['function'][$name] = $function_data;
-					}
-				}
-			}
-		}
-		$this->properties['version'] = Smarty::SMARTY_VERSION;
-		if (!isset($this->properties['unifunc'])) {
-			$this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
-		}
-		if (!$this->source->recompiled) {
-			$output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n";
-			$output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>';
-		}
-		$output .= $plugins_string;
-		$output .= $content;
-		if (!$this->source->recompiled) {
-			$output .= "<?php }} ?>\n";
-		}
-
-		return $output;
-	}
-
-	/**
-	 * This function is executed automatically when a compiled or cached template file is included
-	 * - Decode saved properties from compiled template and cache files
-	 * - Check if compiled or cache file is valid
-	 *
-	 * @param  array $properties special template properties
-	 * @param  bool  $cache      flag if called from cache file
-	 *
-	 * @return bool  flag if compiled or cache file is valid
-	 */
-	public function decodeProperties($properties, $cache = false)
-	{
-		$this->has_nocache_code = $properties['has_nocache_code'];
-		$this->properties['nocache_hash'] = $properties['nocache_hash'];
-		if (isset($properties['cache_lifetime'])) {
-			$this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-		}
-		if (isset($properties['file_dependency'])) {
-			$this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-		}
-		if (!empty($properties['function'])) {
-			$this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
-			$this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
-		}
-		$this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
-		$this->properties['unifunc'] = $properties['unifunc'];
-		// check file dependencies at compiled code
-		$is_valid = true;
-		if ($this->properties['version'] != Smarty::SMARTY_VERSION) {
-			$is_valid = false;
-		} elseif (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) {
-			foreach ($this->properties['file_dependency'] as $_file_to_check) {
-				if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
-					if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
-						// do not recheck current template
-						$mtime = $this->source->timestamp;
-					} else {
-						// file and php types can be checked without loading the respective resource handlers
-						$mtime = @filemtime($_file_to_check[0]);
-					}
-				} elseif ($_file_to_check[2] == 'string') {
-					continue;
-				} else {
-					$source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
-					$mtime = $source->timestamp;
-				}
-				if (!$mtime || $mtime > $_file_to_check[1]) {
-					$is_valid = false;
-					break;
-				}
-			}
-		}
-		if ($cache) {
-			// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
-			if ($this->caching === Smarty::CACHING_LIFETIME_SAVED &&
-				$this->properties['cache_lifetime'] >= 0 &&
-				(time() > ($this->cached->timestamp + $this->properties['cache_lifetime']))
-			) {
-				$is_valid = false;
-			}
-			$this->cached->valid = $is_valid;
-		} else {
-			$this->mustCompile = !$is_valid;
-		}
-		// store data in reusable Smarty_Template_Compiled
-		if (!$cache) {
-			$this->compiled->_properties = $properties;
-		}
-
-		return $is_valid;
-	}
-
-	/**
-	 * Template code runtime function to create a local Smarty variable for array assignments
-	 *
-	 * @param string $tpl_var tempate variable name
-	 * @param bool   $nocache cache mode of variable
-	 * @param int    $scope   scope of variable
-	 */
-	public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-	{
-		if (!isset($this->tpl_vars[$tpl_var])) {
-			$this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
-		} else {
-			$this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
-			if ($scope != Smarty::SCOPE_LOCAL) {
-				$this->tpl_vars[$tpl_var]->scope = $scope;
-			}
-			if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-				settype($this->tpl_vars[$tpl_var]->value, 'array');
-			}
-		}
-	}
-
-	/**
-	 * Template code runtime function to get pointer to template variable array of requested scope
-	 *
-	 * @param  int $scope requested variable scope
-	 *
-	 * @return array array of template variables
-	 */
-	public function &getScope($scope)
-	{
-		if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-			return $this->parent->tpl_vars;
-		} elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-			$ptr = $this->parent;
-			while (!empty($ptr->parent)) {
-				$ptr = $ptr->parent;
-			}
-
-			return $ptr->tpl_vars;
-		} elseif ($scope == Smarty::SCOPE_GLOBAL) {
-			return Smarty::$global_tpl_vars;
-		}
-		$null = null;
-
-		return $null;
-	}
-
-	/**
-	 * Get parent or root of template parent chain
-	 *
-	 * @param  int $scope pqrent or root scope
-	 *
-	 * @return mixed object
-	 */
-	public function getScopePointer($scope)
-	{
-		if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-			return $this->parent;
-		} elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-			$ptr = $this->parent;
-			while (!empty($ptr->parent)) {
-				$ptr = $ptr->parent;
-			}
-
-			return $ptr;
-		}
-
-		return null;
-	}
-
-	/**
-	 * [util function] counts an array, arrayaccess/traversable or PDOStatement object
-	 *
-	 * @param  mixed $value
-	 *
-	 * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
-	 */
-	public function _count($value)
-	{
-		if (is_array($value) === true || $value instanceof Countable) {
-			return count($value);
-		} elseif ($value instanceof IteratorAggregate) {
-			// Note: getIterator() returns a Traversable, not an Iterator
-			// thus rewind() and valid() methods may not be present
-			return iterator_count($value->getIterator());
-		} elseif ($value instanceof Iterator) {
-			return iterator_count($value);
-		} elseif ($value instanceof PDOStatement) {
-			return $value->rowCount();
-		} elseif ($value instanceof Traversable) {
-			return iterator_count($value);
-		} elseif ($value instanceof ArrayAccess) {
-			if ($value->offsetExists(0)) {
-				return 1;
-			}
-		} elseif (is_object($value)) {
-			return count($value);
-		}
-
-		return 0;
-	}
-
-	/**
-	 * runtime error not matching capture tags
-
-	 */
-	public function capture_error()
-	{
-		throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
-	}
-
-	/**
-	 * Empty cache for this template
-	 *
-	 * @param integer $exp_time expiration time
-	 *
-	 * @return integer number of cache files deleted
-	 */
-	public function clearCache($exp_time = null)
-	{
-		Smarty_CacheResource::invalidLoadedCache($this->smarty);
-
-		return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
-	}
-
-	/**
-	 * set Smarty property in template context
-	 *
-	 * @param string $property_name property name
-	 * @param mixed  $value         value
-	 *
-	 * @throws SmartyException
-	 */
-	public function __set($property_name, $value)
-	{
-		switch ($property_name) {
-			case 'source':
-			case 'compiled':
-			case 'cached':
-			case 'compiler':
-				$this->$property_name = $value;
-
-				return;
-
-			// FIXME: routing of template -> smarty attributes
-			default:
-				if (property_exists($this->smarty, $property_name)) {
-					$this->smarty->$property_name = $value;
-
-					return;
-				}
-		}
-
-		throw new SmartyException("invalid template property '$property_name'.");
-	}
-
-	/**
-	 * get Smarty property in template context
-	 *
-	 * @param string $property_name property name
-	 *
-	 * @throws SmartyException
-	 */
-	public function __get($property_name)
-	{
-		switch ($property_name) {
-			case 'source':
-				if (strlen($this->template_resource) == 0) {
-					throw new SmartyException('Missing template name');
-				}
-				$this->source = Smarty_Resource::source($this);
-				// cache template object under a unique id
-				// do not cache eval resources
-				if ($this->source->type != 'eval') {
-					if ($this->smarty->allow_ambiguous_resources) {
-						$_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
-					} else {
-						$_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
-					}
-
-					if (isset($_templateId[150])) {
-						$_templateId = sha1($_templateId);
-					}
-					$this->smarty->template_objects[$_templateId] = $this;
-				}
-
-				return $this->source;
-
-			case 'compiled':
-				$this->compiled = $this->source->getCompiled($this);
-
-				return $this->compiled;
-
-			case 'cached':
-				if (!class_exists('Smarty_Template_Cached')) {
-					include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-				}
-				$this->cached = new Smarty_Template_Cached($this);
-
-				return $this->cached;
-
-			case 'compiler':
-				$this->smarty->loadPlugin($this->source->compiler_class);
-				$this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
-
-				return $this->compiler;
-
-			// FIXME: routing of template -> smarty attributes
-			default:
-				if (property_exists($this->smarty, $property_name)) {
-					return $this->smarty->$property_name;
-				}
-		}
-
-		throw new SmartyException("template property '$property_name' does not exist.");
-	}
-
-	/**
-	 * Template data object destructor
-
-	 */
-	public function __destruct()
-	{
-		if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
-			$this->cached->handler->releaseLock($this->smarty, $this->cached);
-		}
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatebase.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatebase.php
deleted file mode 100644
index 8100394bd..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatebase.php
+++ /dev/null
@@ -1,857 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template  Base
- * This file contains the basic shared methods for template handling
- *
- * @package    Smarty
- * @subpackage Template
- * @author     Uwe Tews
- */
-
-/**
- * Class with shared template methods
- *
- * @package    Smarty
- * @subpackage Template
- */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
-{
-	/**
-	 * fetches a rendered Smarty template
-	 *
-	 * @param  string $template         the resource handle of the template file or template object
-	 * @param  mixed  $cache_id         cache id to be used with this template
-	 * @param  mixed  $compile_id       compile id to be used with this template
-	 * @param  object $parent           next higher level of Smarty variables
-	 * @param  bool   $display          true: display, false: fetch
-	 * @param  bool   $merge_tpl_vars   if true parent template variables merged in to local scope
-	 * @param  bool   $no_output_filter if true do not run output filter
-	 *
-	 * @throws Exception
-	 * @throws SmartyException
-	 * @return string rendered template output
-	 */
-	public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
-	{
-		if ($template === null && $this instanceof $this->template_class) {
-			$template = $this;
-		}
-		if ($cache_id !== null && is_object($cache_id)) {
-			$parent = $cache_id;
-			$cache_id = null;
-		}
-		if ($parent === null && ($this instanceof Smarty || is_string($template))) {
-			$parent = $this;
-		}
-		// create template object if necessary
-		$_template = ($template instanceof $this->template_class)
-			? $template
-			: $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-		// if called by Smarty object make sure we use current caching status
-		if ($this instanceof Smarty) {
-			$_template->caching = $this->caching;
-		}
-		// merge all variable scopes into template
-		if ($merge_tpl_vars) {
-			// save local variables
-			$save_tpl_vars = $_template->tpl_vars;
-			$save_config_vars = $_template->config_vars;
-			$ptr_array = array($_template);
-			$ptr = $_template;
-			while (isset($ptr->parent)) {
-				$ptr_array[] = $ptr = $ptr->parent;
-			}
-			$ptr_array = array_reverse($ptr_array);
-			$parent_ptr = reset($ptr_array);
-			$tpl_vars = $parent_ptr->tpl_vars;
-			$config_vars = $parent_ptr->config_vars;
-			while ($parent_ptr = next($ptr_array)) {
-				if (!empty($parent_ptr->tpl_vars)) {
-					$tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
-				}
-				if (!empty($parent_ptr->config_vars)) {
-					$config_vars = array_merge($config_vars, $parent_ptr->config_vars);
-				}
-			}
-			if (!empty(Smarty::$global_tpl_vars)) {
-				$tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
-			}
-			$_template->tpl_vars = $tpl_vars;
-			$_template->config_vars = $config_vars;
-		}
-		// dummy local smarty variable
-		if (!isset($_template->tpl_vars['smarty'])) {
-			$_template->tpl_vars['smarty'] = new Smarty_Variable;
-		}
-		if (isset($this->smarty->error_reporting)) {
-			$_smarty_old_error_level = error_reporting($this->smarty->error_reporting);
-		}
-		// check URL debugging control
-		if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
-			if (isset($_SERVER['QUERY_STRING'])) {
-				$_query_string = $_SERVER['QUERY_STRING'];
-			} else {
-				$_query_string = '';
-			}
-			if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {
-				if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {
-					// enable debugging for this browser session
-					setcookie('SMARTY_DEBUG', true);
-					$this->smarty->debugging = true;
-				} elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {
-					// disable debugging for this browser session
-					setcookie('SMARTY_DEBUG', false);
-					$this->smarty->debugging = false;
-				} else {
-					// enable debugging for this page
-					$this->smarty->debugging = true;
-				}
-			} else {
-				if (isset($_COOKIE['SMARTY_DEBUG'])) {
-					$this->smarty->debugging = true;
-				}
-			}
-		}
-		// must reset merge template date
-		$_template->smarty->merged_templates_func = array();
-		// get rendered template
-		// disable caching for evaluated code
-		if ($_template->source->recompiled) {
-			$_template->caching = false;
-		}
-		// checks if template exists
-		if (!$_template->source->exists) {
-			if ($_template->parent instanceof Smarty_Internal_Template) {
-				$parent_resource = " in '{$_template->parent->template_resource}'";
-			} else {
-				$parent_resource = '';
-			}
-			throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
-		}
-		// read from cache or render
-		if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {
-			// render template (not loaded and not in cache)
-			if (!$_template->source->uncompiled) {
-				/** @var Smarty_Internal_Template $_smarty_tpl
-				 * used in evaluated code
-				 */
-				$_smarty_tpl = $_template;
-				if ($_template->source->recompiled) {
-					$code = $_template->compiler->compileTemplate($_template);
-					if ($this->smarty->debugging) {
-						Smarty_Internal_Debug::start_render($_template);
-					}
-					try {
-						ob_start();
-						eval("?>" . $code);
-						unset($code);
-					} catch (Exception $e) {
-						ob_get_clean();
-						throw $e;
-					}
-				} else {
-					if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {
-						$_template->compileTemplateSource();
-						$code = file_get_contents($_template->compiled->filepath);
-						eval("?>" . $code);
-						unset($code);
-						$_template->compiled->loaded = true;
-						$_template->compiled->isCompiled = true;
-					}
-					if ($this->smarty->debugging) {
-						Smarty_Internal_Debug::start_render($_template);
-					}
-					if (!$_template->compiled->loaded) {
-						include($_template->compiled->filepath);
-						if ($_template->mustCompile) {
-							// recompile and load again
-							$_template->compileTemplateSource();
-							$code = file_get_contents($_template->compiled->filepath);
-							eval("?>" . $code);
-							unset($code);
-							$_template->compiled->isCompiled = true;
-						}
-						$_template->compiled->loaded = true;
-					} else {
-						$_template->decodeProperties($_template->compiled->_properties, false);
-					}
-					try {
-						ob_start();
-						if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {
-							throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
-						}
-						array_unshift($_template->_capture_stack, array());
-						//
-						// render compiled template
-						//
-						$_template->properties['unifunc']($_template);
-						// any unclosed {capture} tags ?
-						if (isset($_template->_capture_stack[0][0])) {
-							$_template->capture_error();
-						}
-						array_shift($_template->_capture_stack);
-					} catch (Exception $e) {
-						ob_get_clean();
-						throw $e;
-					}
-				}
-			} else {
-				if ($_template->source->uncompiled) {
-					if ($this->smarty->debugging) {
-						Smarty_Internal_Debug::start_render($_template);
-					}
-					try {
-						ob_start();
-						$_template->source->renderUncompiled($_template);
-					} catch (Exception $e) {
-						ob_get_clean();
-						throw $e;
-					}
-				} else {
-					throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");
-				}
-			}
-			$_output = ob_get_clean();
-			if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {
-				$_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-			}
-			if ($_template->parent instanceof Smarty_Internal_Template) {
-				$_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);
-				foreach ($_template->required_plugins as $code => $tmp1) {
-					foreach ($tmp1 as $name => $tmp) {
-						foreach ($tmp as $type => $data) {
-							$_template->parent->required_plugins[$code][$name][$type] = $data;
-						}
-					}
-				}
-			}
-			if ($this->smarty->debugging) {
-				Smarty_Internal_Debug::end_render($_template);
-			}
-			// write to cache when nessecary
-			if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
-				if ($this->smarty->debugging) {
-					Smarty_Internal_Debug::start_cache($_template);
-				}
-				$_template->properties['has_nocache_code'] = false;
-				// get text between non-cached items
-				$cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);
-				// get non-cached items
-				preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);
-				$output = '';
-				// loop over items, stitch back together
-				foreach ($cache_split as $curr_idx => $curr_split) {
-					// escape PHP tags in template content
-					$output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', "<?php echo '\$1'; ?>\n", $curr_split);
-					if (isset($cache_parts[0][$curr_idx])) {
-						$_template->properties['has_nocache_code'] = true;
-						// remove nocache tags from cache output
-						$output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
-					}
-				}
-				if (!$no_output_filter && !$_template->has_nocache_code && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-					$output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
-				}
-				// rendering (must be done before writing cache file because of {function} nocache handling)
-				/** @var Smarty_Internal_Template $_smarty_tpl
-				 * used in evaluated code
-				 */
-				$_smarty_tpl = $_template;
-				try {
-					ob_start();
-					eval("?>" . $output);
-					$_output = ob_get_clean();
-				} catch (Exception $e) {
-					ob_get_clean();
-					throw $e;
-				}
-				// write cache file content
-				$_template->writeCachedContent($output);
-				if ($this->smarty->debugging) {
-					Smarty_Internal_Debug::end_cache($_template);
-				}
-			} else {
-				// var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
-				if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
-					// replace nocache_hash
-					$_output = str_replace("{$_template->properties['nocache_hash']}", $_template->parent->properties['nocache_hash'], $_output);
-					$_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
-				}
-			}
-		} else {
-			if ($this->smarty->debugging) {
-				Smarty_Internal_Debug::start_cache($_template);
-			}
-			try {
-				ob_start();
-				array_unshift($_template->_capture_stack, array());
-				//
-				// render cached template
-				//
-				$_template->properties['unifunc']($_template);
-				// any unclosed {capture} tags ?
-				if (isset($_template->_capture_stack[0][0])) {
-					$_template->capture_error();
-				}
-				array_shift($_template->_capture_stack);
-				$_output = ob_get_clean();
-			} catch (Exception $e) {
-				ob_get_clean();
-				throw $e;
-			}
-			if ($this->smarty->debugging) {
-				Smarty_Internal_Debug::end_cache($_template);
-			}
-		}
-		if ((!$this->caching || $_template->has_nocache_code || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-			$_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);
-		}
-		if (isset($this->error_reporting)) {
-			error_reporting($_smarty_old_error_level);
-		}
-		// display or fetch
-		if ($display) {
-			if ($this->caching && $this->cache_modified_check) {
-				$_isCached = $_template->isCached() && !$_template->has_nocache_code;
-				$_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-				if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {
-					switch (PHP_SAPI) {
-						case 'cgi': // php-cgi < 5.3
-						case 'cgi-fcgi': // php-cgi >= 5.3
-						case 'fpm-fcgi': // php-fpm >= 5.3.3
-							header('Status: 304 Not Modified');
-							break;
-
-						case 'cli':
-							if ( /* ^phpunit */
-							!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
-							) {
-								$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
-							}
-							break;
-
-						default:
-							header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
-							break;
-					}
-				} else {
-					switch (PHP_SAPI) {
-						case 'cli':
-							if ( /* ^phpunit */
-							!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
-							) {
-								$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';
-							}
-							break;
-
-						default:
-							header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');
-							break;
-					}
-					echo $_output;
-				}
-			} else {
-				echo $_output;
-			}
-			// debug output
-			if ($this->smarty->debugging) {
-				Smarty_Internal_Debug::display_debug($_template);
-			}
-			if ($merge_tpl_vars) {
-				// restore local variables
-				$_template->tpl_vars = $save_tpl_vars;
-				$_template->config_vars = $save_config_vars;
-			}
-
-			return;
-		} else {
-			if ($merge_tpl_vars) {
-				// restore local variables
-				$_template->tpl_vars = $save_tpl_vars;
-				$_template->config_vars = $save_config_vars;
-			}
-
-			// return fetched content
-			return $_output;
-		}
-	}
-
-	/**
-	 * displays a Smarty template
-	 *
-	 * @param string $template   the resource handle of the template file or template object
-	 * @param mixed  $cache_id   cache id to be used with this template
-	 * @param mixed  $compile_id compile id to be used with this template
-	 * @param object $parent     next higher level of Smarty variables
-	 */
-	public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
-	{
-		// display template
-		$this->fetch($template, $cache_id, $compile_id, $parent, true);
-	}
-
-	/**
-	 * test if cache is valid
-	 *
-	 * @param  string|object $template   the resource handle of the template file or template object
-	 * @param  mixed         $cache_id   cache id to be used with this template
-	 * @param  mixed         $compile_id compile id to be used with this template
-	 * @param  object        $parent     next higher level of Smarty variables
-	 *
-	 * @return boolean       cache status
-	 */
-	public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
-	{
-		if ($template === null && $this instanceof $this->template_class) {
-			return $this->cached->valid;
-		}
-		if (!($template instanceof $this->template_class)) {
-			if ($parent === null) {
-				$parent = $this;
-			}
-			$template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-		}
-
-		// return cache status of template
-		return $template->cached->valid;
-	}
-
-	/**
-	 * creates a data object
-	 *
-	 * @param object $parent next higher level of Smarty variables
-	 *
-	 * @returns Smarty_Data data object
-	 */
-	public function createData($parent = null)
-	{
-		return new Smarty_Data($parent, $this);
-	}
-
-	/**
-	 * Registers plugin to be used in templates
-	 *
-	 * @param  string   $type       plugin type
-	 * @param  string   $tag        name of template tag
-	 * @param  callback $callback   PHP callback to register
-	 * @param  boolean  $cacheable  if true (default) this fuction is cachable
-	 * @param  array    $cache_attr caching attributes if any
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 * @throws SmartyException              when the plugin tag is invalid
-	 */
-	public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
-	{
-		if (isset($this->smarty->registered_plugins[$type][$tag])) {
-			throw new SmartyException("Plugin tag \"{$tag}\" already registered");
-		} elseif (!is_callable($callback)) {
-			throw new SmartyException("Plugin \"{$tag}\" not callable");
-		} else {
-			$this->smarty->registered_plugins[$type][$tag] = array($callback, (bool)$cacheable, (array)$cache_attr);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Unregister Plugin
-	 *
-	 * @param  string $type of plugin
-	 * @param  string $tag  name of plugin
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function unregisterPlugin($type, $tag)
-	{
-		if (isset($this->smarty->registered_plugins[$type][$tag])) {
-			unset($this->smarty->registered_plugins[$type][$tag]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers a resource to fetch a template
-	 *
-	 * @param  string                $type     name of resource type
-	 * @param  Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function registerResource($type, $callback)
-	{
-		$this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
-
-		return $this;
-	}
-
-	/**
-	 * Unregisters a resource
-	 *
-	 * @param  string $type name of resource type
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function unregisterResource($type)
-	{
-		if (isset($this->smarty->registered_resources[$type])) {
-			unset($this->smarty->registered_resources[$type]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers a cache resource to cache a template's output
-	 *
-	 * @param  string               $type     name of cache resource type
-	 * @param  Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function registerCacheResource($type, Smarty_CacheResource $callback)
-	{
-		$this->smarty->registered_cache_resources[$type] = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * Unregisters a cache resource
-	 *
-	 * @param  string $type name of cache resource type
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function unregisterCacheResource($type)
-	{
-		if (isset($this->smarty->registered_cache_resources[$type])) {
-			unset($this->smarty->registered_cache_resources[$type]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers object to be used in templates
-	 *
-	 * @param          $object_name
-	 * @param  object  $object_impl   the referenced PHP object to register
-	 * @param  array   $allowed       list of allowed methods (empty = all)
-	 * @param  boolean $smarty_args   smarty argument format, else traditional
-	 * @param  array   $block_methods list of block-methods
-	 *
-	 * @throws SmartyException
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-	{
-		// test if allowed methods callable
-		if (!empty($allowed)) {
-			foreach ((array)$allowed as $method) {
-				if (!is_callable(array($object_impl, $method)) && !property_exists($object_impl, $method)) {
-					throw new SmartyException("Undefined method or property '$method' in registered object");
-				}
-			}
-		}
-		// test if block methods callable
-		if (!empty($block_methods)) {
-			foreach ((array)$block_methods as $method) {
-				if (!is_callable(array($object_impl, $method))) {
-					throw new SmartyException("Undefined method '$method' in registered object");
-				}
-			}
-		}
-		// register the object
-		$this->smarty->registered_objects[$object_name] =
-			array($object_impl, (array)$allowed, (boolean)$smarty_args, (array)$block_methods);
-
-		return $this;
-	}
-
-	/**
-	 * return a reference to a registered object
-	 *
-	 * @param  string $name object name
-	 *
-	 * @return object
-	 * @throws SmartyException if no such object is found
-	 */
-	public function getRegisteredObject($name)
-	{
-		if (!isset($this->smarty->registered_objects[$name])) {
-			throw new SmartyException("'$name' is not a registered object");
-		}
-		if (!is_object($this->smarty->registered_objects[$name][0])) {
-			throw new SmartyException("registered '$name' is not an object");
-		}
-
-		return $this->smarty->registered_objects[$name][0];
-	}
-
-	/**
-	 * unregister an object
-	 *
-	 * @param  string $name object name
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function unregisterObject($name)
-	{
-		if (isset($this->smarty->registered_objects[$name])) {
-			unset($this->smarty->registered_objects[$name]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers static classes to be used in templates
-	 *
-	 * @param         $class_name
-	 * @param  string $class_impl the referenced PHP class to register
-	 *
-	 * @throws SmartyException
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function registerClass($class_name, $class_impl)
-	{
-		// test if exists
-		if (!class_exists($class_impl)) {
-			throw new SmartyException("Undefined class '$class_impl' in register template class");
-		}
-		// register the class
-		$this->smarty->registered_classes[$class_name] = $class_impl;
-
-		return $this;
-	}
-
-	/**
-	 * Registers a default plugin handler
-	 *
-	 * @param  callable $callback class/method name
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 * @throws SmartyException              if $callback is not callable
-	 */
-	public function registerDefaultPluginHandler($callback)
-	{
-		if (is_callable($callback)) {
-			$this->smarty->default_plugin_handler_func = $callback;
-		} else {
-			throw new SmartyException("Default plugin handler '$callback' not callable");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers a default template handler
-	 *
-	 * @param  callable $callback class/method name
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 * @throws SmartyException              if $callback is not callable
-	 */
-	public function registerDefaultTemplateHandler($callback)
-	{
-		if (is_callable($callback)) {
-			$this->smarty->default_template_handler_func = $callback;
-		} else {
-			throw new SmartyException("Default template handler '$callback' not callable");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers a default template handler
-	 *
-	 * @param  callable $callback class/method name
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 * @throws SmartyException              if $callback is not callable
-	 */
-	public function registerDefaultConfigHandler($callback)
-	{
-		if (is_callable($callback)) {
-			$this->smarty->default_config_handler_func = $callback;
-		} else {
-			throw new SmartyException("Default config handler '$callback' not callable");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Registers a filter function
-	 *
-	 * @param  string   $type filter type
-	 * @param  callback $callback
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function registerFilter($type, $callback)
-	{
-		$this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * Unregisters a filter function
-	 *
-	 * @param  string   $type filter type
-	 * @param  callback $callback
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function unregisterFilter($type, $callback)
-	{
-		$name = $this->_get_filter_name($callback);
-		if (isset($this->smarty->registered_filters[$type][$name])) {
-			unset($this->smarty->registered_filters[$type][$name]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Return internal filter name
-	 *
-	 * @param  callback $function_name
-	 *
-	 * @return string   internal filter name
-	 */
-	public function _get_filter_name($function_name)
-	{
-		if (is_array($function_name)) {
-			$_class_name = (is_object($function_name[0]) ?
-				get_class($function_name[0]) : $function_name[0]);
-
-			return $_class_name . '_' . $function_name[1];
-		} else {
-			return $function_name;
-		}
-	}
-
-	/**
-	 * load a filter of specified type and name
-	 *
-	 * @param  string $type filter type
-	 * @param  string $name filter name
-	 *
-	 * @throws SmartyException if filter could not be loaded
-	 */
-	public function loadFilter($type, $name)
-	{
-		$_plugin = "smarty_{$type}filter_{$name}";
-		$_filter_name = $_plugin;
-		if ($this->smarty->loadPlugin($_plugin)) {
-			if (class_exists($_plugin, false)) {
-				$_plugin = array($_plugin, 'execute');
-			}
-			if (is_callable($_plugin)) {
-				$this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
-
-				return true;
-			}
-		}
-		throw new SmartyException("{$type}filter \"{$name}\" not callable");
-	}
-
-	/**
-	 * unload a filter of specified type and name
-	 *
-	 * @param  string $type filter type
-	 * @param  string $name filter name
-	 *
-	 * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-	 */
-	public function unloadFilter($type, $name)
-	{
-		$_filter_name = "smarty_{$type}filter_{$name}";
-		if (isset($this->smarty->registered_filters[$type][$_filter_name])) {
-			unset ($this->smarty->registered_filters[$type][$_filter_name]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * preg_replace callback to convert camelcase getter/setter to underscore property names
-	 *
-	 * @param  string $match match string
-	 *
-	 * @return string replacemant
-	 */
-	private function replaceCamelcase($match)
-	{
-		return "_" . strtolower($match[1]);
-	}
-
-	/**
-	 * Handle unknown class methods
-	 *
-	 * @param string $name unknown method-name
-	 * @param array  $args argument array
-	 *
-	 * @throws SmartyException
-	 */
-	public function __call($name, $args)
-	{
-		static $_prefixes = array('set' => true, 'get' => true);
-		static $_resolved_property_name = array();
-		static $_resolved_property_source = array();
-
-		// method of Smarty object?
-		if (method_exists($this->smarty, $name)) {
-			return call_user_func_array(array($this->smarty, $name), $args);
-		}
-		// see if this is a set/get for a property
-		$first3 = strtolower(substr($name, 0, 3));
-		if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
-			if (isset($_resolved_property_name[$name])) {
-				$property_name = $_resolved_property_name[$name];
-			} else {
-				// try to keep case correct for future PHP 6.0 case-sensitive class methods
-				// lcfirst() not available < PHP 5.3.0, so improvise
-				$property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
-				// convert camel case to underscored name
-				$property_name = preg_replace_callback('/([A-Z])/', array($this, 'replaceCamelcase'), $property_name);
-				$_resolved_property_name[$name] = $property_name;
-			}
-			if (isset($_resolved_property_source[$property_name])) {
-				$_is_this = $_resolved_property_source[$property_name];
-			} else {
-				$_is_this = null;
-				if (property_exists($this, $property_name)) {
-					$_is_this = true;
-				} elseif (property_exists($this->smarty, $property_name)) {
-					$_is_this = false;
-				}
-				$_resolved_property_source[$property_name] = $_is_this;
-			}
-			if ($_is_this) {
-				if ($first3 == 'get') {
-					return $this->$property_name;
-				} else {
-					return $this->$property_name = $args[0];
-				}
-			} elseif ($_is_this === false) {
-				if ($first3 == 'get') {
-					return $this->smarty->$property_name;
-				} else {
-					return $this->smarty->$property_name = $args[0];
-				}
-			} else {
-				throw new SmartyException("property '$property_name' does not exist.");
-			}
-		}
-		if ($name == 'Smarty') {
-			throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");
-		}
-		// must be unknown
-		throw new SmartyException("Call of unknown method '$name'.");
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
deleted file mode 100644
index d00bfb8f4..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ /dev/null
@@ -1,823 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Main abstract compiler class
- *
- * @package    Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_TemplateCompilerBase
-{
-    /**
-     * hash for nocache sections
-     *
-     * @var mixed
-     */
-    private $nocache_hash = null;
-
-    /**
-     * suppress generation of nocache code
-     *
-     * @var bool
-     */
-    public $suppressNocacheProcessing = false;
-
-    /**
-     * suppress generation of merged template code
-     *
-     * @var bool
-     */
-    public $suppressMergedTemplates = false;
-
-    /**
-     * compile tag objects
-     *
-     * @var array
-     */
-    public static $_tag_objects = array();
-
-    /**
-     * tag stack
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-
-    /**
-     * current template
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-
-    /**
-     * merged templates
-     *
-     * @var array
-     */
-    public $merged_templates = array();
-
-    /**
-     * sources which must be compiled
-     *
-     * @var array
-     */
-    public $sources = array();
-
-    /**
-     * flag that we are inside {block}
-     *
-     * @var bool
-     */
-    public $inheritance = false;
-
-    /**
-     * flag when compiling inheritance child template
-     *
-     * @var bool
-     */
-    public $inheritance_child = false;
-
-    /**
-     * uid of templates called by {extends} for recursion check
-     *
-     * @var array
-     */
-    public $extends_uid = array();
-
-    /**
-     * source line offset for error messages
-     *
-     * @var int
-     */
-    public $trace_line_offset = 0;
-
-    /**
-     * trace uid
-     *
-     * @var string
-     */
-    public $trace_uid = '';
-
-    /**
-     * trace file path
-     *
-     * @var string
-     */
-    public $trace_filepath = '';
-    /**
-     * stack for tracing file and line of nested {block} tags
-     *
-     * @var array
-     */
-    public $trace_stack = array();
-
-    /**
-     * plugins loaded by default plugin handler
-     *
-     * @var array
-     */
-    public $default_handler_plugins = array();
-
-    /**
-     * saved preprocessed modifier list
-     *
-     * @var mixed
-     */
-    public $default_modifier_list = null;
-
-    /**
-     * force compilation of complete template as nocache
-     *
-     * @var boolean
-     */
-    public $forceNocache = false;
-
-    /**
-     * suppress Smarty header code in compiled template
-     *
-     * @var bool
-     */
-    public $suppressHeader = false;
-
-    /**
-     * suppress template property header code in compiled template
-     *
-     * @var bool
-     */
-    public $suppressTemplatePropertyHeader = false;
-
-    /**
-     * suppress pre and post filter
-     *
-     * @var bool
-     */
-    public $suppressFilter = false;
-
-    /**
-     * flag if compiled template file shall we written
-     *
-     * @var bool
-     */
-    public $write_compiled_code = true;
-
-    /**
-     * flag if currently a template function is compiled
-     *
-     * @var bool
-     */
-    public $compiles_template_function = false;
-
-    /**
-     * called subfuntions from template function
-     *
-     * @var array
-     */
-    public $called_functions = array();
-
-    /**
-     * flags for used modifier plugins
-     *
-     * @var array
-     */
-    public $modifier_plugins = array();
-
-    /**
-     * type of already compiled modifier
-     *
-     * @var array
-     */
-    public $known_modifier_type = array();
-
-    /**
-     * method to compile a Smarty template
-     *
-     * @param  mixed $_content template source
-     *
-     * @return bool  true if compiling succeeded, false if it failed
-     */
-    abstract protected function doCompile($_content);
-
-    /**
-     * Initialize compiler
-     */
-    public function __construct()
-    {
-        $this->nocache_hash = str_replace(array('.', ','), '-', uniqid(rand(), true));
-    }
-
-    /**
-     * Method to compile a Smarty template
-     *
-     * @param  Smarty_Internal_Template $template template object to compile
-     * @param  bool                     $nocache  true is shall be compiled in nocache mode
-     *
-     * @return bool             true if compiling succeeded, false if it failed
-     */
-    public function compileTemplate(Smarty_Internal_Template $template, $nocache = false)
-    {
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
-        } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        }
-        // flag for nochache sections
-        $this->nocache = $nocache;
-        $this->tag_nocache = false;
-        // save template object in compiler class
-        $this->template = $template;
-        // reset has nocache code flag
-        $this->template->has_nocache_code = false;
-        $save_source = $this->template->source;
-        // template header code
-        $template_header = '';
-        if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-        }
-
-        if (empty($this->template->source->components)) {
-            $this->sources = array($template->source);
-        } else {
-            // we have array of inheritance templates by extends: resource
-            $this->sources = array_reverse($template->source->components);
-        }
-        $loop = 0;
-        // the $this->sources array can get additional elements while compiling by the {extends} tag
-        while ($this->template->source = array_shift($this->sources)) {
-            $this->smarty->_current_file = $this->template->source->filepath;
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_compile($this->template);
-            }
-            $no_sources = count($this->sources);
-            if ($loop || $no_sources) {
-                $this->template->properties['file_dependency'][$this->template->source->uid] = array($this->template->source->filepath, $this->template->source->timestamp, $this->template->source->type);
-            }
-            $loop ++;
-            if ($no_sources) {
-                $this->inheritance_child = true;
-            } else {
-                $this->inheritance_child = false;
-            }
-            do {
-                $_compiled_code = '';
-                // flag for aborting current and start recompile
-                $this->abort_and_recompile = false;
-                // get template source
-                $_content = $this->template->source->content;
-                if ($_content != '') {
-                    // run prefilter if required
-                    if ((isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) && !$this->suppressFilter) {
-                        $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
-                    }
-                    // call compiler
-                    $_compiled_code = $this->doCompile($_content);
-                }
-            } while ($this->abort_and_recompile);
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_compile($this->template);
-            }
-        }
-        // restore source
-        $this->template->source = $save_source;
-        unset($save_source);
-        $this->smarty->_current_file = $this->template->source->filepath;
-        // free memory
-        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template);
-        self::$_tag_objects = array();
-        // return compiled code to template object
-        $merged_code = '';
-        if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) {
-            foreach ($this->merged_templates as $code) {
-                $merged_code .= $code;
-            }
-        }
-        // run postfilter if required on compiled template code
-        if ((isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) && !$this->suppressFilter && $_compiled_code != '') {
-            $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
-        }
-        if ($this->suppressTemplatePropertyHeader) {
-            $code = $_compiled_code . $merged_code;
-        } else {
-            $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
-        }
-        // unset content because template inheritance could have replace source with parent code
-        unset ($template->source->content);
-
-        return $code;
-    }
-
-    /**
-     * Compile Tag
-     * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
-     *
-     * @param  string $tag       tag name
-     * @param  array  $args      array with tag attributes
-     * @param  array  $parameter array with compilation parameter
-     *
-     * @throws SmartyCompilerException
-     * @throws SmartyException
-     * @return string compiled code
-     */
-    public function compileTag($tag, $args, $parameter = array())
-    {
-        // $args contains the attributes parsed and compiled by the lexer/parser
-        // assume that tag does compile into code, but creates no HTML output
-        $this->has_code = true;
-        $this->has_output = false;
-        // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-            $this->template->used_tags[] = array($tag, $args);
-        }
-        // check nocache option flag
-        if (in_array("'nocache'", $args) || in_array(array('nocache' => 'true'), $args)
-            || in_array(array('nocache' => '"true"'), $args) || in_array(array('nocache' => "'true'"), $args)
-        ) {
-            $this->tag_nocache = true;
-        }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
-        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->smarty->template_functions[$tag])) {
-                // template defined by {template} tag
-                $args['_attr']['name'] = "'" . $tag . "'";
-                $_output = $this->callTagCompiler('call', $args, $parameter);
-            }
-        }
-        if ($_output !== false) {
-            if ($_output !== true) {
-                // did we get compiled code
-                if ($this->has_code) {
-                    // Does it create output?
-                    if ($this->has_output) {
-                        $_output .= "\n";
-                    }
-                    // return compiled code
-                    return $_output;
-                }
-            }
-            // tag did not produce compiled code
-            return null;
-        } else {
-            // map_named attributes
-            if (isset($args['_attr'])) {
-                foreach ($args['_attr'] as $key => $attribute) {
-                    if (is_array($attribute)) {
-                        $args = array_merge($args, $attribute);
-                    }
-                }
-            }
-            // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, - 5) != 'close') {
-                // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_method'])) {
-                    $method = $parameter['object_method'];
-                    if (!in_array($method, $this->smarty->registered_objects[$tag][3]) &&
-                        (empty($this->smarty->registered_objects[$tag][1]) || in_array($method, $this->smarty->registered_objects[$tag][1]))
-                    ) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
-                    } elseif (in_array($method, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method);
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error('not allowed method "' . $method . '" in registered object "' . $tag . '"', $this->lex->taglineno);
-                    }
-                }
-                // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
-                    if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[$key] = $mixed;
-                                }
-                            }
-                            if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) {
-                                $this->tag_nocache = true;
-                            }
-                            $function = $this->smarty->registered_plugins[$plugin_type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } elseif (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($function, array($new_args, $this));
-                            }
-                        }
-                        // compile registered function or block function
-                        if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
-                        }
-                    }
-                }
-                // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_COMPILER && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
-                        $plugin = 'smarty_compiler_' . $tag;
-                        if (is_callable($plugin)) {
-                            // convert arguments format for old compiler plugins
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                                if (is_array($mixed)) {
-                                    $new_args = array_merge($new_args, $mixed);
-                                } else {
-                                    $new_args[$key] = $mixed;
-                                }
-                            }
-
-                            return $plugin($new_args, $this->smarty);
-                        }
-                        if (class_exists($plugin, false)) {
-                            $plugin_object = new $plugin;
-                            if (method_exists($plugin_object, 'compile')) {
-                                return $plugin_object->compile($args, $this);
-                            }
-                        }
-                        throw new SmartyException("Plugin \"{$tag}\" not callable");
-                    } else {
-                        if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
-                            }
-                        }
-                    }
-                }
-                if (is_callable($this->smarty->default_plugin_handler_func)) {
-                    $found = false;
-                    // look for already resolved tags
-                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        // call default handler
-                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
-                                $found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if ($found) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $mixed) {
-                                $new_args = array_merge($new_args, $mixed);
-                            }
-                            $function = $this->default_handler_plugins[$plugin_type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } elseif (is_object($function[0])) {
-                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($function, array($new_args, $this));
-                            }
-                        } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
-                        }
-                    }
-                }
-            } else {
-                // compile closing tag of block function
-                $base_tag = substr($tag, 0, - 5);
-                // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
-                    $method = $parameter['object_method'];
-                    if (in_array($method, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $method);
-                    } else {
-                        // throw exception
-                        $this->trigger_template_error('not allowed closing tag method "' . $method . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
-                    }
-                }
-                // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
-                }
-                // block plugin?
-                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
-                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
-                }
-                // registered compiler plugin ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag])) {
-                    // if compiler function plugin call it now
-                    $args = array();
-                    if (!$this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][1]) {
-                        $this->tag_nocache = true;
-                    }
-                    $function = $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0];
-                    if (!is_array($function)) {
-                        return $function($args, $this);
-                    } elseif (is_object($function[0])) {
-                        return $this->smarty->registered_plugins[Smarty::PLUGIN_COMPILER][$tag][0][0]->$function[1]($args, $this);
-                    } else {
-                        return call_user_func_array($function, array($args, $this));
-                    }
-                }
-                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
-                    $plugin = 'smarty_compiler_' . $tag;
-                    if (is_callable($plugin)) {
-                        return $plugin($args, $this->smarty);
-                    }
-                    if (class_exists($plugin, false)) {
-                        $plugin_object = new $plugin;
-                        if (method_exists($plugin_object, 'compile')) {
-                            return $plugin_object->compile($args, $this);
-                        }
-                    }
-                    throw new SmartyException("Plugin \"{$tag}\" not callable");
-                }
-            }
-            $this->trigger_template_error("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
-        }
-    }
-
-    /**
-     * lazy loads internal compile plugin for tag and calls the compile method
-     * compile objects cached for reuse.
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
-     *
-     * @param  string $tag    tag name
-     * @param  array  $args   list of tag attributes
-     * @param  mixed  $param1 optional parameter
-     * @param  mixed  $param2 optional parameter
-     * @param  mixed  $param3 optional parameter
-     *
-     * @return string compiled code
-     */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
-    {
-        // re-use object if already exists
-        if (isset(self::$_tag_objects[$tag])) {
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        }
-        // lazy load internal compiler plugin
-        $class_name = 'Smarty_Internal_Compile_' . $tag;
-        if ($this->smarty->loadPlugin($class_name)) {
-            // check if tag allowed by security
-            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                // use plugin if found
-                self::$_tag_objects[$tag] = new $class_name;
-                // compile this tag
-                return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-            }
-        }
-        // no internal compile plugin for this tag
-        return false;
-    }
-
-    /**
-     * Check for plugins and return function name
-     *
-     * @param         $plugin_name
-     * @param  string $plugin_type type of plugin
-     *
-     * @return string call name of function
-     */
-    public function getPlugin($plugin_name, $plugin_type)
-    {
-        $function = null;
-        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            } elseif (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            }
-        } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            } elseif (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            }
-        }
-        if (isset($function)) {
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
-            }
-
-            return $function;
-        }
-        // loop through plugin dirs and find the plugin
-        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
-        $file = $this->smarty->loadPlugin($function, false);
-
-        if (is_string($file)) {
-            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
-            } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
-            }
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
-            }
-
-            return $function;
-        }
-        if (is_callable($function)) {
-            // plugin function is defined in the script
-            return $function;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check for plugins by default plugin handler
-     *
-     * @param  string $tag         name of tag
-     * @param  string $plugin_type type of plugin
-     *
-     * @return boolean true if found
-     */
-    public function getPluginFromDefaultHandler($tag, $plugin_type)
-    {
-        $callback = null;
-        $script = null;
-        $cacheable = true;
-        $result = call_user_func_array(
-            $this->smarty->default_plugin_handler_func, array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable)
-        );
-        if ($result) {
-            $this->tag_nocache = $this->tag_nocache || !$cacheable;
-            if ($script !== null) {
-                if (is_file($script)) {
-                    if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
-                    } else {
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
-                    }
-                    include_once $script;
-                } else {
-                    $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
-                }
-            }
-            if (!is_string($callback) && !(is_array($callback) && is_string($callback[0]) && is_string($callback[1]))) {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" must be a static function name or array of class and function name");
-            }
-            if (is_callable($callback)) {
-                $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
-
-                return true;
-            } else {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Inject inline code for nocache template sections
-     * This method gets the content of each template element from the parser.
-     * If the content is compiled code and it should be not cached the code is injected
-     * into the rendered output.
-     *
-     * @param  string  $content content of template element
-     * @param  boolean $is_code true if content is compiled code
-     *
-     * @return string  content
-     */
-    public function processNocacheCode($content, $is_code)
-    {
-        // If the template is not evaluated and we have a nocache section and or a nocache tag
-        if ($is_code && !empty($content)) {
-            // generate replacement code
-            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
-                ($this->nocache || $this->tag_nocache)
-            ) {
-                $this->template->has_nocache_code = true;
-                $_output = addcslashes($content, '\'\\');
-                $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifier plugins for nocache code
-                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
-                    }
-                }
-            } else {
-                $_output = $content;
-            }
-        } else {
-            $_output = $content;
-        }
-        $this->modifier_plugins = array();
-        $this->suppressNocacheProcessing = false;
-        $this->tag_nocache = false;
-
-        return $_output;
-    }
-
-    /**
-     *  push current file and line offset on stack for tracing {block} source lines
-     *
-     * @param string      $file  new filename
-     * @param string      $uid   uid of file
-     * @param int         $line  line offset to source
-     * @param bool $debug false debug end_compile shall not be called
-     */
-    public function pushTrace($file, $uid, $line, $debug = true)
-    {
-        if ($this->smarty->debugging && $debug) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        array_push($this->trace_stack, array($this->smarty->_current_file, $this->trace_filepath, $this->trace_uid, $this->trace_line_offset));
-        $this->trace_filepath = $this->smarty->_current_file = $file;
-        $this->trace_uid = $uid;
-        $this->trace_line_offset = $line;
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
-        }
-    }
-
-    /**
-     *  restore file and line offset
-
-     */
-    public function popTrace()
-    {
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this->template);
-        }
-        $r = array_pop($this->trace_stack);
-        $this->smarty->_current_file = $r[0];
-        $this->trace_filepath = $r[1];
-        $this->trace_uid = $r[2];
-        $this->trace_line_offset = $r[3];
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this->template);
-        }
-    }
-
-    /**
-     * display compiler error messages without dying
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param  string $args individual error message or null
-     * @param  string $line line-number
-     *
-     * @throws SmartyCompilerException when an unexpected token is found
-     */
-    public function trigger_template_error($args = null, $line = null)
-    {
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
-        }
-        //        $line += $this->trace_line_offset;
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax error in template "' . (empty($this->trace_filepath) ? $this->template->source->filepath : $this->trace_filepath) . '"  on line ' . ($line + $this->trace_line_offset) . ' "' . trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value . '"';
-            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
-                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[$token];
-                    if (isset($this->lex->smarty_token_names[$exp_token])) {
-                        // token type from lexer
-                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-                    } else {
-                        // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[$token];
-                    }
-                }
-                $error_text .= ', expected one of: ' . implode(' , ', $expect);
-            }
-        }
-        $e = new SmartyCompilerException($error_text);
-        $e->line = $line;
-        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
-        $e->desc = $args;
-        $e->template = $this->template->source->filepath;
-        throw $e;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatelexer.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatelexer.php
deleted file mode 100644
index a6f5f2ae7..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templatelexer.php
+++ /dev/null
@@ -1,1582 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templatelexer
- * This is the lexer to break the template source into tokens
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Templatelexer
- */
-class Smarty_Internal_Templatelexer
-{
-	public $data;
-	public $counter;
-	public $token;
-	public $value;
-	public $node;
-	public $line;
-	public $taglineno;
-	public $state = 1;
-	private $heredoc_id_stack = Array();
-	public $yyTraceFILE;
-	public $yyTracePrompt;
-	public $state_name = array(1 => 'TEXT', 2 => 'SMARTY', 3 => 'LITERAL', 4 => 'DOUBLEQUOTEDSTRING', 5 => 'CHILDBODY');
-	public $smarty_token_names = array( // Text for parser error messages
-										'IDENTITY'        => '===',
-										'NONEIDENTITY'    => '!==',
-										'EQUALS'          => '==',
-										'NOTEQUALS'       => '!=',
-										'GREATEREQUAL'    => '(>=,ge)',
-										'LESSEQUAL'       => '(<=,le)',
-										'GREATERTHAN'     => '(>,gt)',
-										'LESSTHAN'        => '(<,lt)',
-										'MOD'             => '(%,mod)',
-										'NOT'             => '(!,not)',
-										'LAND'            => '(&&,and)',
-										'LOR'             => '(||,or)',
-										'LXOR'            => 'xor',
-										'OPENP'           => '(',
-										'CLOSEP'          => ')',
-										'OPENB'           => '[',
-										'CLOSEB'          => ']',
-										'PTR'             => '->',
-										'APTR'            => '=>',
-										'EQUAL'           => '=',
-										'NUMBER'          => 'number',
-										'UNIMATH'         => '+" , "-',
-										'MATH'            => '*" , "/" , "%',
-										'INCDEC'          => '++" , "--',
-										'SPACE'           => ' ',
-										'DOLLAR'          => '$',
-										'SEMICOLON'       => ';',
-										'COLON'           => ':',
-										'DOUBLECOLON'     => '::',
-										'AT'              => '@',
-										'HATCH'           => '#',
-										'QUOTE'           => '"',
-										'BACKTICK'        => '`',
-										'VERT'            => '|',
-										'DOT'             => '.',
-										'COMMA'           => '","',
-										'ANDSYM'          => '"&"',
-										'QMARK'           => '"?"',
-										'id'              => 'identifier',
-										'TEXT'            => 'text',
-										'FAKEPHPSTARTTAG' => 'Fake PHP start tag',
-										'PHPSTARTTAG'     => 'PHP start tag',
-										'PHPENDTAG'       => 'PHP end tag',
-										'LITERALSTART'    => 'Literal start',
-										'LITERALEND'      => 'Literal end',
-										'LDELSLASH'       => 'closing tag',
-										'COMMENT'         => 'comment',
-										'AS'              => 'as',
-										'TO'              => 'to',
-	);
-
-	function __construct($data, $compiler)
-	{
-		//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
-		$this->data = $data;
-		$this->counter = 0;
-		$this->line = 1;
-		$this->smarty = $compiler->smarty;
-		$this->compiler = $compiler;
-		$this->ldel = preg_quote($this->smarty->left_delimiter, '/');
-		$this->ldel_length = strlen($this->smarty->left_delimiter);
-		$this->rdel = preg_quote($this->smarty->right_delimiter, '/');
-		$this->rdel_length = strlen($this->smarty->right_delimiter);
-		$this->smarty_token_names['LDEL'] = $this->smarty->left_delimiter;
-		$this->smarty_token_names['RDEL'] = $this->smarty->right_delimiter;
-	}
-
-	public function PrintTrace()
-	{
-		$this->yyTraceFILE = fopen('php://output', 'w');
-		$this->yyTracePrompt = '<br>';
-	}
-
-	private $_yy_state = 1;
-	private $_yy_stack = array();
-
-	public function yylex()
-	{
-		return $this->{'yylex' . $this->_yy_state}();
-	}
-
-	public function yypushstate($state)
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-		array_push($this->_yy_stack, $this->_yy_state);
-		$this->_yy_state = $state;
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-	}
-
-	public function yypopstate()
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-		$this->_yy_state = array_pop($this->_yy_stack);
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-	}
-
-	public function yybegin($state)
-	{
-		$this->_yy_state = $state;
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
-		}
-	}
-
-	public function yylex1()
-	{
-		$tokenMap = array(
-			1  => 0,
-			2  => 1,
-			4  => 0,
-			5  => 0,
-			6  => 0,
-			7  => 1,
-			9  => 0,
-			10 => 0,
-			11 => 0,
-			12 => 0,
-			13 => 0,
-			14 => 0,
-			15 => 0,
-			16 => 0,
-			17 => 0,
-			18 => 0,
-			19 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(\\{\\})|\G(" . $this->ldel . "\\*([\S\s]*?)\\*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*setfilter\\s+)|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(\\s*" . $this->rdel . ")|\G(<%)|\G(%>)|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state TEXT');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r1_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const TEXT = 1;
-
-	function yy_r1_1($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	function yy_r1_2($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-	}
-
-	function yy_r1_4($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-		}
-	}
-
-	function yy_r1_5($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-		}
-	}
-
-	function yy_r1_6($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-			$this->yypushstate(self::LITERAL);
-		}
-	}
-
-	function yy_r1_7($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r1_9($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r1_10($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r1_11($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r1_12($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r1_13($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDEL;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r1_14($yy_subpatterns)
-	{
-
-		if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-			$this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-		} elseif ($this->value == '<?xml') {
-			$this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-			$this->value = substr($this->value, 0, 2);
-		}
-	}
-
-	function yy_r1_15($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-	}
-
-	function yy_r1_16($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	function yy_r1_17($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-	}
-
-	function yy_r1_18($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-	}
-
-	function yy_r1_19($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		preg_match("/{$this->ldel}|<\?|\?>|<%|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-		if (isset($match[0][1])) {
-			$to = $match[0][1];
-		}
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	public function yylex2()
-	{
-		$tokenMap = array(
-			1  => 0,
-			2  => 0,
-			3  => 1,
-			5  => 0,
-			6  => 0,
-			7  => 0,
-			8  => 0,
-			9  => 0,
-			10 => 0,
-			11 => 0,
-			12 => 0,
-			13 => 0,
-			14 => 0,
-			15 => 1,
-			17 => 1,
-			19 => 1,
-			21 => 0,
-			22 => 0,
-			23 => 0,
-			24 => 0,
-			25 => 0,
-			26 => 0,
-			27 => 0,
-			28 => 0,
-			29 => 0,
-			30 => 0,
-			31 => 0,
-			32 => 0,
-			33 => 0,
-			34 => 0,
-			35 => 0,
-			36 => 0,
-			37 => 0,
-			38 => 3,
-			42 => 0,
-			43 => 0,
-			44 => 0,
-			45 => 0,
-			46 => 0,
-			47 => 0,
-			48 => 0,
-			49 => 0,
-			50 => 1,
-			52 => 1,
-			54 => 0,
-			55 => 0,
-			56 => 0,
-			57 => 0,
-			58 => 0,
-			59 => 0,
-			60 => 0,
-			61 => 0,
-			62 => 0,
-			63 => 0,
-			64 => 0,
-			65 => 0,
-			66 => 0,
-			67 => 0,
-			68 => 0,
-			69 => 0,
-			70 => 1,
-			72 => 0,
-			73 => 0,
-			74 => 0,
-			75 => 0,
-			76 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$]smarty\\.block\\.(child|parent))|\G(\\$)|\G(\\s*" . $this->rdel . ")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(@)|\G(#)|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*=\\s*)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state SMARTY');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r2_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const SMARTY = 2;
-
-	function yy_r2_1($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-		$this->yypushstate(self::DOUBLEQUOTEDSTRING);
-	}
-
-	function yy_r2_2($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-	}
-
-	function yy_r2_3($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
-		$this->taglineno = $this->line;
-	}
-
-	function yy_r2_5($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-	}
-
-	function yy_r2_6($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_RDEL;
-		$this->yypopstate();
-	}
-
-	function yy_r2_7($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISIN;
-	}
-
-	function yy_r2_8($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_AS;
-	}
-
-	function yy_r2_9($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TO;
-	}
-
-	function yy_r2_10($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_STEP;
-	}
-
-	function yy_r2_11($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-	}
-
-	function yy_r2_12($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-	}
-
-	function yy_r2_13($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
-	}
-
-	function yy_r2_14($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_EQUALS;
-	}
-
-	function yy_r2_15($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
-	}
-
-	function yy_r2_17($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-	}
-
-	function yy_r2_19($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-	}
-
-	function yy_r2_21($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-	}
-
-	function yy_r2_22($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
-	}
-
-	function yy_r2_23($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_MOD;
-	}
-
-	function yy_r2_24($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_NOT;
-	}
-
-	function yy_r2_25($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_LAND;
-	}
-
-	function yy_r2_26($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_LOR;
-	}
-
-	function yy_r2_27($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_LXOR;
-	}
-
-	function yy_r2_28($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
-	}
-
-	function yy_r2_29($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
-	}
-
-	function yy_r2_30($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISODD;
-	}
-
-	function yy_r2_31($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
-	}
-
-	function yy_r2_32($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
-	}
-
-	function yy_r2_33($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
-	}
-
-	function yy_r2_34($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
-	}
-
-	function yy_r2_35($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
-	}
-
-	function yy_r2_36($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
-	}
-
-	function yy_r2_37($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
-	}
-
-	function yy_r2_38($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-	}
-
-	function yy_r2_42($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_OPENP;
-	}
-
-	function yy_r2_43($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-	}
-
-	function yy_r2_44($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_OPENB;
-	}
-
-	function yy_r2_45($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-	}
-
-	function yy_r2_46($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_PTR;
-	}
-
-	function yy_r2_47($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_APTR;
-	}
-
-	function yy_r2_48($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-	}
-
-	function yy_r2_49($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-	}
-
-	function yy_r2_50($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-	}
-
-	function yy_r2_52($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_MATH;
-	}
-
-	function yy_r2_54($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_AT;
-	}
-
-	function yy_r2_55($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_HATCH;
-	}
-
-	function yy_r2_56($yy_subpatterns)
-	{
-
-		// resolve conflicts with shorttag and right_delimiter starting with '='
-		if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->rdel_length) == $this->smarty->right_delimiter) {
-			preg_match("/\s+/", $this->value, $match);
-			$this->value = $match[0];
-			$this->token = Smarty_Internal_Templateparser::TP_SPACE;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_ATTR;
-		}
-	}
-
-	function yy_r2_57($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ID;
-	}
-
-	function yy_r2_58($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-	}
-
-	function yy_r2_59($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-		$this->yypopstate();
-	}
-
-	function yy_r2_60($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_VERT;
-	}
-
-	function yy_r2_61($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_DOT;
-	}
-
-	function yy_r2_62($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_COMMA;
-	}
-
-	function yy_r2_63($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-	}
-
-	function yy_r2_64($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-	}
-
-	function yy_r2_65($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_COLON;
-	}
-
-	function yy_r2_66($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-	}
-
-	function yy_r2_67($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_QMARK;
-	}
-
-	function yy_r2_68($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_HEX;
-	}
-
-	function yy_r2_69($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_SPACE;
-	}
-
-	function yy_r2_70($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r2_72($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r2_73($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r2_74($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r2_75($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDEL;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r2_76($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	public function yylex3()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-			4 => 0,
-			5 => 0,
-			6 => 0,
-			7 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state LITERAL');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r3_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const LITERAL = 3;
-
-	function yy_r3_1($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-			$this->yypushstate(self::LITERAL);
-		}
-	}
-
-	function yy_r3_2($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-			$this->yypopstate();
-		}
-	}
-
-	function yy_r3_3($yy_subpatterns)
-	{
-
-		if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-			$this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-			$this->value = substr($this->value, 0, 2);
-		}
-	}
-
-	function yy_r3_4($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-	}
-
-	function yy_r3_5($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-	}
-
-	function yy_r3_6($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-	}
-
-	function yy_r3_7($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-		if (isset($match[0][1])) {
-			$to = $match[0][1];
-		} else {
-			$this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-		}
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-		$this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-	}
-
-	public function yylex4()
-	{
-		$tokenMap = array(
-			1  => 1,
-			3  => 0,
-			4  => 0,
-			5  => 0,
-			6  => 0,
-			7  => 0,
-			8  => 0,
-			9  => 0,
-			10 => 0,
-			11 => 3,
-			15 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(" . $this->ldel . "\\s*(if|elseif|else if|while)\\s+)|\G(" . $this->ldel . "\\s*for\\s+)|\G(" . $this->ldel . "\\s*foreach(?![^\s]))|\G(" . $this->ldel . "\\s*\/)|\G(" . $this->ldel . "\\s*)|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(" . $this->ldel . "|\\$|`\\$|\")))|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state DOUBLEQUOTEDSTRING');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r4_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const DOUBLEQUOTEDSTRING = 4;
-
-	function yy_r4_1($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r4_3($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r4_4($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r4_5($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r4_6($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_LDEL;
-			$this->yypushstate(self::SMARTY);
-			$this->taglineno = $this->line;
-		}
-	}
-
-	function yy_r4_7($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-		$this->yypopstate();
-	}
-
-	function yy_r4_8($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-		$this->value = substr($this->value, 0, -1);
-		$this->yypushstate(self::SMARTY);
-		$this->taglineno = $this->line;
-	}
-
-	function yy_r4_9($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-	}
-
-	function yy_r4_10($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	function yy_r4_11($yy_subpatterns)
-	{
-
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	function yy_r4_15($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-		$this->token = Smarty_Internal_Templateparser::TP_TEXT;
-	}
-
-	public function yylex5()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-			4 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(" . $this->ldel . "\\s*strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/strip\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state CHILDBODY');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r5_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const CHILDBODY = 5;
-
-	function yy_r5_1($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			return false;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-		}
-	}
-
-	function yy_r5_2($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			return false;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-		}
-	}
-
-	function yy_r5_3($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			return false;
-		} else {
-			$this->yypopstate();
-
-			return true;
-		}
-	}
-
-	function yy_r5_4($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		preg_match("/" . $this->ldel . "\s*((\/)?strip\s*" . $this->rdel . "|block\s+)/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-		if (isset($match[0][1])) {
-			$to = $match[0][1];
-		}
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-
-		return false;
-	}
-
-	public function yylex6()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-			4 => 1,
-			6 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*block)|\G(" . $this->ldel . "\\s*\/block)|\G(" . $this->ldel . "\\s*[$]smarty\\.block\\.(child|parent))|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state CHILDBLOCK');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r6_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const CHILDBLOCK = 6;
-
-	function yy_r6_1($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-			$this->yypushstate(self::CHILDLITERAL);
-		}
-	}
-
-	function yy_r6_2($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-		} else {
-			$this->yypopstate();
-
-			return true;
-		}
-	}
-
-	function yy_r6_3($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-		} else {
-			$this->yypopstate();
-
-			return true;
-		}
-	}
-
-	function yy_r6_4($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-		} else {
-			$this->yypopstate();
-
-			return true;
-		}
-	}
-
-	function yy_r6_6($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		preg_match("/" . $this->ldel . "\s*(literal\s*" . $this->rdel . "|(\/)?block(\s|" . $this->rdel . ")|[\$]smarty\.block\.(child|parent))/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-		if (isset($match[0][1])) {
-			$to = $match[0][1];
-		}
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-		$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-	}
-
-	public function yylex7()
-	{
-		$tokenMap = array(
-			1 => 0,
-			2 => 0,
-			3 => 0,
-		);
-		if ($this->counter >= strlen($this->data)) {
-			return false; // end of input
-		}
-		$yy_global_pattern = "/\G(" . $this->ldel . "\\s*literal\\s*" . $this->rdel . ")|\G(" . $this->ldel . "\\s*\/literal\\s*" . $this->rdel . ")|\G([\S\s])/iS";
-
-		do {
-			if (preg_match($yy_global_pattern, $this->data, $yymatches, null, $this->counter)) {
-				$yysubmatches = $yymatches;
-				$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-				if (!count($yymatches)) {
-					throw new Exception('Error: lexing failed because a rule matched' .
-						' an empty string.  Input "' . substr($this->data,
-							$this->counter, 5
-						) . '... state CHILDLITERAL');
-				}
-				next($yymatches); // skip global match
-				$this->token = key($yymatches); // token number
-				if ($tokenMap[$this->token]) {
-					// extract sub-patterns for passing to lex function
-					$yysubmatches = array_slice($yysubmatches, $this->token + 1,
-						$tokenMap[$this->token]
-					);
-				} else {
-					$yysubmatches = array();
-				}
-				$this->value = current($yymatches); // token value
-				$r = $this->{'yy_r7_' . $this->token}($yysubmatches);
-				if ($r === null) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-
-					// accept this token
-					return true;
-				} elseif ($r === true) {
-					// we have changed state
-					// process this token in the new state
-					return $this->yylex();
-				} elseif ($r === false) {
-					$this->counter += strlen($this->value);
-					$this->line += substr_count($this->value, "\n");
-					if ($this->counter >= strlen($this->data)) {
-						return false; // end of input
-					}
-					// skip this token
-					continue;
-				}
-			} else {
-				throw new Exception('Unexpected input at line' . $this->line .
-					': ' . $this->data[$this->counter]);
-			}
-			break;
-		} while (true);
-	} // end function
-
-	const CHILDLITERAL = 7;
-
-	function yy_r7_1($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-			$this->yypushstate(self::CHILDLITERAL);
-		}
-	}
-
-	function yy_r7_2($yy_subpatterns)
-	{
-
-		if ($this->smarty->auto_literal && isset($this->value[$this->ldel_length]) ? strpos(" \n\t\r", $this->value[$this->ldel_length]) !== false : false) {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-		} else {
-			$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-			$this->yypopstate();
-		}
-	}
-
-	function yy_r7_3($yy_subpatterns)
-	{
-
-		$to = strlen($this->data);
-		preg_match("/{$this->ldel}\/?literal\s*{$this->rdel}/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
-		if (isset($match[0][1])) {
-			$to = $match[0][1];
-		} else {
-			$this->compiler->trigger_template_error("missing or misspelled literal closing tag");
-		}
-		$this->value = substr($this->data, $this->counter, $to - $this->counter);
-		$this->token = Smarty_Internal_Templateparser::TP_BLOCKSOURCE;
-	}
-}
-
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templateparser.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templateparser.php
deleted file mode 100644
index ccf8ee63c..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_templateparser.php
+++ /dev/null
@@ -1,4562 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Templateparser
- * This is the template parser.
- * It is generated from the internal.templateparser.y file
- *
- * @package    Smarty
- * @subpackage Compiler
- * @author     Uwe Tews
- */
-class TP_yyToken implements ArrayAccess
-{
-	public $string = '';
-	public $metadata = array();
-
-	public function __construct($s, $m = array())
-	{
-		if ($s instanceof TP_yyToken) {
-			$this->string = $s->string;
-			$this->metadata = $s->metadata;
-		} else {
-			$this->string = (string)$s;
-			if ($m instanceof TP_yyToken) {
-				$this->metadata = $m->metadata;
-			} elseif (is_array($m)) {
-				$this->metadata = $m;
-			}
-		}
-	}
-
-	public function __toString()
-	{
-		return $this->_string;
-	}
-
-	public function offsetExists($offset)
-	{
-		return isset($this->metadata[$offset]);
-	}
-
-	public function offsetGet($offset)
-	{
-		return $this->metadata[$offset];
-	}
-
-	public function offsetSet($offset, $value)
-	{
-		if ($offset === null) {
-			if (isset($value[0])) {
-				$x = ($value instanceof TP_yyToken) ?
-					$value->metadata : $value;
-				$this->metadata = array_merge($this->metadata, $x);
-
-				return;
-			}
-			$offset = count($this->metadata);
-		}
-		if ($value === null) {
-			return;
-		}
-		if ($value instanceof TP_yyToken) {
-			if ($value->metadata) {
-				$this->metadata[$offset] = $value->metadata;
-			}
-		} elseif ($value) {
-			$this->metadata[$offset] = $value;
-		}
-	}
-
-	public function offsetUnset($offset)
-	{
-		unset($this->metadata[$offset]);
-	}
-}
-
-class TP_yyStackEntry
-{
-	public $stateno; /* The state-number */
-	public $major; /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-	public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-}
-
-;
-
-#line 13 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser #line 80 "smarty_internal_templateparser.php"
-{
-	#line 15 "smarty_internal_templateparser.y"
-
-	const Err1 = "Security error: Call to private object member not allowed";
-	const Err2 = "Security error: Call to dynamic object member not allowed";
-	const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
-	// states whether the parse was successful or not
-	public $successful = true;
-	public $retvalue = 0;
-	public static $prefix_number = 0;
-	private $lex;
-	private $internalError = false;
-	private $strip = false;
-
-	function __construct($lex, $compiler)
-	{
-		$this->lex = $lex;
-		$this->compiler = $compiler;
-		$this->smarty = $this->compiler->smarty;
-		$this->template = $this->compiler->template;
-		$this->compiler->has_variable_string = false;
-		$this->compiler->prefix_code = array();
-		$this->block_nesting_level = 0;
-		if ($this->security = isset($this->smarty->security_policy)) {
-			$this->php_handling = $this->smarty->security_policy->php_handling;
-		} else {
-			$this->php_handling = $this->smarty->php_handling;
-		}
-		$this->is_xml = false;
-		$this->asp_tags = (ini_get('asp_tags') != '0');
-		$this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
-	}
-
-	public static function escape_start_tag($tag_text)
-	{
-		$tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1, $count); //Escape tag
-		return $tag;
-	}
-
-	public static function escape_end_tag($tag_text)
-	{
-		return '?<?php ?>>';
-	}
-
-	public function compileVariable($variable)
-	{
-		if (strpos($variable, '(') == 0) {
-			// not a variable variable
-			$var = trim($variable, '\'');
-			$this->compiler->tag_nocache = $this->compiler->tag_nocache | $this->template->getVariable($var, null, true, false)->nocache;
-			$this->template->properties['variables'][$var] = $this->compiler->tag_nocache | $this->compiler->nocache;
-		}
-
-		//       return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)';
-		return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
-	}
-
-	#line 133 "smarty_internal_templateparser.php"
-
-	const TP_VERT = 1;
-	const TP_COLON = 2;
-	const TP_RDEL = 3;
-	const TP_COMMENT = 4;
-	const TP_PHPSTARTTAG = 5;
-	const TP_PHPENDTAG = 6;
-	const TP_ASPSTARTTAG = 7;
-	const TP_ASPENDTAG = 8;
-	const TP_FAKEPHPSTARTTAG = 9;
-	const TP_XMLTAG = 10;
-	const TP_TEXT = 11;
-	const TP_STRIPON = 12;
-	const TP_STRIPOFF = 13;
-	const TP_BLOCKSOURCE = 14;
-	const TP_LITERALSTART = 15;
-	const TP_LITERALEND = 16;
-	const TP_LITERAL = 17;
-	const TP_LDEL = 18;
-	const TP_DOLLAR = 19;
-	const TP_ID = 20;
-	const TP_EQUAL = 21;
-	const TP_PTR = 22;
-	const TP_LDELIF = 23;
-	const TP_LDELFOR = 24;
-	const TP_SEMICOLON = 25;
-	const TP_INCDEC = 26;
-	const TP_TO = 27;
-	const TP_STEP = 28;
-	const TP_LDELFOREACH = 29;
-	const TP_SPACE = 30;
-	const TP_AS = 31;
-	const TP_APTR = 32;
-	const TP_LDELSETFILTER = 33;
-	const TP_SMARTYBLOCKCHILDPARENT = 34;
-	const TP_LDELSLASH = 35;
-	const TP_ATTR = 36;
-	const TP_INTEGER = 37;
-	const TP_COMMA = 38;
-	const TP_OPENP = 39;
-	const TP_CLOSEP = 40;
-	const TP_MATH = 41;
-	const TP_UNIMATH = 42;
-	const TP_ANDSYM = 43;
-	const TP_ISIN = 44;
-	const TP_ISDIVBY = 45;
-	const TP_ISNOTDIVBY = 46;
-	const TP_ISEVEN = 47;
-	const TP_ISNOTEVEN = 48;
-	const TP_ISEVENBY = 49;
-	const TP_ISNOTEVENBY = 50;
-	const TP_ISODD = 51;
-	const TP_ISNOTODD = 52;
-	const TP_ISODDBY = 53;
-	const TP_ISNOTODDBY = 54;
-	const TP_INSTANCEOF = 55;
-	const TP_QMARK = 56;
-	const TP_NOT = 57;
-	const TP_TYPECAST = 58;
-	const TP_HEX = 59;
-	const TP_DOT = 60;
-	const TP_SINGLEQUOTESTRING = 61;
-	const TP_DOUBLECOLON = 62;
-	const TP_AT = 63;
-	const TP_HATCH = 64;
-	const TP_OPENB = 65;
-	const TP_CLOSEB = 66;
-	const TP_EQUALS = 67;
-	const TP_NOTEQUALS = 68;
-	const TP_GREATERTHAN = 69;
-	const TP_LESSTHAN = 70;
-	const TP_GREATEREQUAL = 71;
-	const TP_LESSEQUAL = 72;
-	const TP_IDENTITY = 73;
-	const TP_NONEIDENTITY = 74;
-	const TP_MOD = 75;
-	const TP_LAND = 76;
-	const TP_LOR = 77;
-	const TP_LXOR = 78;
-	const TP_QUOTE = 79;
-	const TP_BACKTICK = 80;
-	const TP_DOLLARID = 81;
-	const YY_NO_ACTION = 570;
-	const YY_ACCEPT_ACTION = 569;
-	const YY_ERROR_ACTION = 568;
-
-	const YY_SZ_ACTTAB = 2407;
-	static public $yy_action = array(
-		/*     0 */
-		219, 309, 305, 301, 302, 303, 304, 310, 311, 317,
-		/*    10 */
-		318, 319, 201, 30, 273, 9, 33, 238, 280, 15,
-		/*    20 */
-		5, 108, 235, 234, 220, 7, 126, 42, 30, 30,
-		/*    30 */
-		259, 211, 256, 495, 15, 15, 10, 33, 495, 280,
-		/*    40 */
-		46, 47, 51, 45, 24, 14, 352, 353, 39, 37,
-		/*    50 */
-		278, 359, 12, 25, 219, 219, 326, 434, 219, 192,
-		/*    60 */
-		434, 569, 95, 263, 227, 306, 360, 361, 358, 357,
-		/*    70 */
-		354, 355, 356, 342, 341, 328, 329, 330, 292, 219,
-		/*    80 */
-		202, 322, 242, 30, 434, 231, 207, 434, 143, 15,
-		/*    90 */
-		434, 35, 158, 434, 46, 47, 51, 45, 24, 14,
-		/*   100 */
-		352, 353, 39, 37, 278, 359, 12, 25, 219, 48,
-		/*   110 */
-		32, 219, 48, 391, 196, 2, 31, 138, 321, 4,
-		/*   120 */
-		360, 361, 358, 357, 354, 355, 356, 342, 341, 328,
-		/*   130 */
-		329, 330, 127, 48, 290, 349, 251, 30, 145, 140,
-		/*   140 */
-		30, 207, 264, 15, 200, 322, 15, 334, 46, 47,
-		/*   150 */
-		51, 45, 24, 14, 352, 353, 39, 37, 278, 359,
-		/*   160 */
-		12, 25, 219, 289, 219, 48, 431, 297, 219, 33,
-		/*   170 */
-		396, 280, 18, 191, 360, 361, 358, 357, 354, 355,
-		/*   180 */
-		356, 342, 341, 328, 329, 330, 300, 285, 286, 287,
-		/*   190 */
-		299, 206, 219, 431, 428, 194, 201, 315, 314, 431,
-		/*   200 */
-		207, 281, 46, 47, 51, 45, 24, 14, 352, 353,
-		/*   210 */
-		39, 37, 278, 359, 12, 25, 219, 33, 48, 280,
-		/*   220 */
-		34, 30, 48, 197, 322, 276, 158, 15, 360, 361,
-		/*   230 */
-		358, 357, 354, 355, 356, 342, 341, 328, 329, 330,
-		/*   240 */
-		230, 338, 16, 289, 103, 179, 244, 219, 295, 2,
-		/*   250 */
-		41, 33, 265, 280, 283, 148, 46, 47, 51, 45,
-		/*   260 */
-		24, 14, 352, 353, 39, 37, 278, 359, 12, 25,
-		/*   270 */
-		219, 207, 145, 43, 132, 189, 109, 333, 307, 227,
-		/*   280 */
-		306, 190, 360, 361, 358, 357, 354, 355, 356, 342,
-		/*   290 */
-		341, 328, 329, 330, 20, 22, 248, 339, 219, 99,
-		/*   300 */
-		174, 48, 324, 33, 346, 280, 18, 288, 207, 283,
-		/*   310 */
-		46, 47, 51, 45, 24, 14, 352, 353, 39, 37,
-		/*   320 */
-		278, 359, 12, 25, 219, 289, 207, 30, 41, 110,
-		/*   330 */
-		275, 2, 41, 15, 272, 266, 360, 361, 358, 357,
-		/*   340 */
-		354, 355, 356, 342, 341, 328, 329, 330, 242, 40,
-		/*   350 */
-		236, 347, 104, 177, 145, 219, 44, 316, 148, 135,
-		/*   360 */
-		228, 27, 283, 269, 46, 47, 51, 45, 24, 14,
-		/*   370 */
-		352, 353, 39, 37, 278, 359, 12, 25, 219, 207,
-		/*   380 */
-		208, 33, 7, 280, 245, 239, 136, 173, 241, 279,
-		/*   390 */
-		360, 361, 358, 357, 354, 355, 356, 342, 341, 328,
-		/*   400 */
-		329, 330, 29, 158, 106, 13, 122, 171, 181, 6,
-		/*   410 */
-		33, 15, 226, 33, 219, 237, 283, 283, 46, 47,
-		/*   420 */
-		51, 45, 24, 14, 352, 353, 39, 37, 278, 359,
-		/*   430 */
-		12, 25, 219, 205, 205, 252, 313, 238, 312, 235,
-		/*   440 */
-		232, 195, 97, 127, 360, 361, 358, 357, 354, 355,
-		/*   450 */
-		356, 342, 341, 328, 329, 330, 28, 320, 230, 105,
-		/*   460 */
-		182, 164, 176, 33, 279, 254, 282, 186, 207, 283,
-		/*   470 */
-		283, 253, 46, 47, 51, 45, 24, 14, 352, 353,
-		/*   480 */
-		39, 37, 278, 359, 12, 25, 219, 205, 260, 107,
-		/*   490 */
-		235, 262, 33, 193, 214, 332, 166, 198, 360, 361,
-		/*   500 */
-		358, 357, 354, 355, 356, 342, 341, 328, 329, 330,
-		/*   510 */
-		137, 175, 167, 291, 308, 344, 185, 261, 267, 161,
-		/*   520 */
-		283, 283, 128, 337, 124, 283, 46, 47, 51, 45,
-		/*   530 */
-		24, 14, 352, 353, 39, 37, 278, 359, 12, 25,
-		/*   540 */
-		219, 38, 205, 203, 141, 169, 257, 134, 35, 130,
-		/*   550 */
-		156, 114, 360, 361, 358, 357, 354, 355, 356, 342,
-		/*   560 */
-		341, 328, 329, 330, 320, 158, 320, 241, 36, 293,
-		/*   570 */
-		298, 94, 21, 26, 284, 219, 292, 168, 271, 162,
-		/*   580 */
-		46, 47, 51, 45, 24, 14, 352, 353, 39, 37,
-		/*   590 */
-		278, 359, 12, 25, 219, 279, 229, 205, 44, 281,
-		/*   600 */
-		187, 17, 270, 331, 98, 127, 360, 361, 358, 357,
-		/*   610 */
-		354, 355, 356, 342, 341, 328, 329, 330, 199, 320,
-		/*   620 */
-		331, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-		/*   630 */
-		331, 331, 331, 331, 46, 47, 51, 45, 24, 14,
-		/*   640 */
-		352, 353, 39, 37, 278, 359, 12, 25, 219, 331,
-		/*   650 */
-		268, 331, 331, 331, 331, 331, 331, 331, 125, 115,
-		/*   660 */
-		360, 361, 358, 357, 354, 355, 356, 342, 341, 328,
-		/*   670 */
-		329, 330, 279, 331, 320, 331, 331, 331, 331, 331,
-		/*   680 */
-		331, 331, 331, 331, 331, 331, 331, 331, 46, 47,
-		/*   690 */
-		51, 45, 24, 14, 352, 353, 39, 37, 278, 359,
-		/*   700 */
-		12, 25, 219, 331, 204, 331, 331, 331, 331, 331,
-		/*   710 */
-		331, 159, 100, 116, 360, 361, 358, 357, 354, 355,
-		/*   720 */
-		356, 342, 341, 328, 329, 330, 320, 320, 320, 331,
-		/*   730 */
-		331, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-		/*   740 */
-		331, 331, 46, 47, 51, 45, 24, 14, 352, 353,
-		/*   750 */
-		39, 37, 278, 359, 12, 25, 219, 331, 331, 331,
-		/*   760 */
-		331, 331, 331, 331, 331, 102, 117, 331, 360, 361,
-		/*   770 */
-		358, 357, 354, 355, 356, 342, 341, 328, 329, 330,
-		/*   780 */
-		320, 320, 331, 331, 331, 331, 331, 331, 331, 331,
-		/*   790 */
-		331, 331, 331, 331, 331, 331, 46, 47, 51, 45,
-		/*   800 */
-		24, 14, 352, 353, 39, 37, 278, 359, 12, 25,
-		/*   810 */
-		331, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-		/*   820 */
-		158, 331, 360, 361, 358, 357, 354, 355, 356, 342,
-		/*   830 */
-		341, 328, 329, 330, 331, 331, 331, 331, 46, 47,
-		/*   840 */
-		51, 45, 24, 14, 352, 353, 39, 37, 278, 359,
-		/*   850 */
-		12, 25, 331, 331, 331, 331, 331, 331, 211, 331,
-		/*   860 */
-		331, 331, 331, 10, 360, 361, 358, 357, 354, 355,
-		/*   870 */
-		356, 342, 341, 328, 329, 330, 331, 331, 331, 331,
-		/*   880 */
-		331, 331, 331, 9, 142, 212, 331, 331, 5, 108,
-		/*   890 */
-		331, 246, 331, 331, 126, 157, 183, 331, 259, 123,
-		/*   900 */
-		256, 331, 250, 331, 23, 283, 331, 52, 277, 331,
-		/*   910 */
-		331, 255, 350, 348, 331, 345, 331, 279, 180, 178,
-		/*   920 */
-		331, 331, 49, 50, 296, 240, 351, 283, 283, 106,
-		/*   930 */
-		1, 274, 331, 147, 331, 331, 331, 331, 331, 279,
-		/*   940 */
-		279, 9, 144, 92, 96, 233, 5, 108, 331, 345,
-		/*   950 */
-		331, 331, 126, 331, 331, 246, 259, 323, 256, 146,
-		/*   960 */
-		250, 331, 23, 123, 184, 52, 331, 331, 331, 331,
-		/*   970 */
-		246, 331, 343, 283, 153, 255, 350, 348, 123, 345,
-		/*   980 */
-		49, 50, 296, 240, 351, 279, 331, 106, 1, 331,
-		/*   990 */
-		255, 350, 348, 331, 345, 33, 331, 280, 331, 9,
-		/*  1000 */
-		142, 224, 96, 331, 5, 108, 331, 30, 331, 247,
-		/*  1010 */
-		126, 246, 331, 15, 259, 149, 256, 331, 250, 123,
-		/*  1020 */
-		23, 331, 331, 52, 331, 331, 331, 331, 331, 331,
-		/*  1030 */
-		331, 255, 350, 348, 331, 345, 331, 331, 49, 50,
-		/*  1040 */
-		296, 240, 351, 331, 331, 106, 1, 331, 331, 331,
-		/*  1050 */
-		331, 331, 33, 331, 280, 331, 331, 9, 135, 224,
-		/*  1060 */
-		96, 331, 5, 108, 30, 246, 258, 331, 126, 151,
-		/*  1070 */
-		15, 246, 259, 123, 256, 154, 250, 331, 11, 123,
-		/*  1080 */
-		331, 52, 331, 331, 331, 255, 350, 348, 331, 345,
-		/*  1090 */
-		331, 255, 350, 348, 331, 345, 49, 50, 296, 240,
-		/*  1100 */
-		351, 331, 331, 106, 1, 331, 331, 331, 331, 331,
-		/*  1110 */
-		331, 331, 331, 331, 331, 9, 142, 210, 96, 331,
-		/*  1120 */
-		5, 108, 331, 331, 331, 331, 126, 246, 331, 331,
-		/*  1130 */
-		259, 155, 256, 331, 216, 123, 23, 331, 331, 52,
-		/*  1140 */
-		331, 331, 331, 331, 331, 331, 331, 255, 350, 348,
-		/*  1150 */
-		331, 345, 331, 331, 49, 50, 296, 240, 351, 331,
-		/*  1160 */
-		331, 106, 1, 331, 331, 331, 331, 331, 331, 331,
-		/*  1170 */
-		331, 331, 331, 9, 131, 224, 96, 331, 5, 108,
-		/*  1180 */
-		331, 331, 331, 331, 126, 246, 331, 331, 259, 152,
-		/*  1190 */
-		256, 331, 250, 123, 3, 331, 331, 52, 331, 331,
-		/*  1200 */
-		331, 331, 331, 331, 331, 255, 350, 348, 331, 345,
-		/*  1210 */
-		331, 331, 49, 50, 296, 240, 351, 331, 331, 106,
-		/*  1220 */
-		1, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-		/*  1230 */
-		331, 9, 142, 213, 96, 331, 5, 108, 331, 331,
-		/*  1240 */
-		331, 331, 126, 246, 331, 331, 259, 150, 256, 331,
-		/*  1250 */
-		250, 123, 23, 331, 331, 52, 331, 331, 331, 331,
-		/*  1260 */
-		331, 331, 331, 255, 350, 348, 331, 345, 331, 331,
-		/*  1270 */
-		49, 50, 296, 240, 351, 331, 331, 106, 1, 331,
-		/*  1280 */
-		219, 331, 401, 331, 331, 331, 331, 331, 331, 9,
-		/*  1290 */
-		142, 209, 96, 331, 5, 108, 331, 331, 331, 331,
-		/*  1300 */
-		126, 249, 331, 331, 259, 331, 256, 331, 250, 30,
-		/*  1310 */
-		23, 190, 163, 52, 331, 15, 331, 331, 2, 331,
-		/*  1320 */
-		331, 283, 331, 331, 20, 22, 331, 331, 49, 50,
-		/*  1330 */
-		296, 240, 351, 331, 331, 106, 1, 331, 207, 331,
-		/*  1340 */
-		331, 145, 331, 331, 331, 432, 331, 9, 139, 224,
-		/*  1350 */
-		96, 331, 5, 108, 331, 331, 331, 331, 126, 331,
-		/*  1360 */
-		331, 331, 259, 243, 256, 331, 250, 331, 23, 190,
-		/*  1370 */
-		188, 52, 432, 331, 331, 331, 331, 331, 432, 283,
-		/*  1380 */
-		331, 2, 20, 22, 331, 331, 49, 50, 296, 240,
-		/*  1390 */
-		351, 331, 331, 106, 1, 331, 207, 331, 331, 331,
-		/*  1400 */
-		331, 331, 331, 331, 145, 9, 135, 224, 96, 331,
-		/*  1410 */
-		5, 108, 331, 331, 331, 331, 126, 331, 331, 331,
-		/*  1420 */
-		259, 331, 256, 331, 250, 331, 11, 101, 160, 52,
-		/*  1430 */
-		331, 331, 331, 331, 331, 331, 331, 283, 331, 331,
-		/*  1440 */
-		20, 22, 331, 331, 49, 50, 296, 240, 351, 331,
-		/*  1450 */
-		331, 106, 331, 331, 207, 331, 331, 331, 331, 331,
-		/*  1460 */
-		331, 331, 331, 9, 135, 225, 96, 331, 5, 108,
-		/*  1470 */
-		331, 331, 331, 331, 126, 331, 331, 331, 259, 331,
-		/*  1480 */
-		256, 331, 250, 331, 11, 331, 477, 52, 331, 331,
-		/*  1490 */
-		331, 331, 331, 331, 331, 331, 331, 331, 331, 331,
-		/*  1500 */
-		331, 331, 49, 50, 296, 240, 351, 331, 477, 106,
-		/*  1510 */
-		477, 477, 331, 477, 477, 331, 331, 331, 331, 477,
-		/*  1520 */
-		331, 477, 2, 477, 96, 331, 331, 331, 331, 331,
-		/*  1530 */
-		331, 331, 331, 331, 331, 246, 331, 331, 477, 120,
-		/*  1540 */
-		331, 331, 84, 123, 331, 145, 331, 331, 331, 477,
-		/*  1550 */
-		331, 294, 327, 331, 331, 255, 350, 348, 331, 345,
-		/*  1560 */
-		331, 331, 331, 477, 331, 331, 331, 246, 331, 218,
-		/*  1570 */
-		362, 120, 331, 331, 84, 123, 331, 331, 331, 331,
-		/*  1580 */
-		331, 331, 331, 294, 327, 331, 331, 255, 350, 348,
-		/*  1590 */
-		246, 345, 331, 331, 129, 331, 331, 61, 119, 232,
-		/*  1600 */
-		331, 246, 335, 331, 331, 129, 294, 327, 80, 123,
-		/*  1610 */
-		255, 350, 348, 331, 345, 331, 331, 294, 327, 331,
-		/*  1620 */
-		331, 255, 350, 348, 331, 345, 246, 331, 331, 331,
-		/*  1630 */
-		129, 331, 215, 80, 123, 331, 331, 331, 331, 331,
-		/*  1640 */
-		331, 331, 294, 327, 331, 331, 255, 350, 348, 331,
-		/*  1650 */
-		345, 331, 331, 331, 246, 190, 170, 221, 129, 331,
-		/*  1660 */
-		331, 55, 119, 133, 331, 283, 331, 331, 20, 22,
-		/*  1670 */
-		294, 327, 331, 331, 255, 350, 348, 246, 345, 331,
-		/*  1680 */
-		331, 129, 207, 331, 80, 123, 331, 331, 331, 331,
-		/*  1690 */
-		331, 331, 331, 294, 327, 331, 246, 255, 350, 348,
-		/*  1700 */
-		129, 345, 331, 89, 123, 331, 331, 331, 223, 331,
-		/*  1710 */
-		331, 331, 294, 327, 331, 331, 255, 350, 348, 246,
-		/*  1720 */
-		345, 331, 331, 129, 331, 331, 70, 123, 331, 331,
-		/*  1730 */
-		246, 331, 331, 331, 111, 294, 327, 67, 123, 255,
-		/*  1740 */
-		350, 348, 331, 345, 331, 331, 294, 327, 331, 246,
-		/*  1750 */
-		255, 350, 348, 129, 345, 331, 86, 123, 331, 331,
-		/*  1760 */
-		331, 331, 331, 331, 331, 294, 327, 331, 246, 255,
-		/*  1770 */
-		350, 348, 129, 345, 331, 90, 123, 331, 331, 331,
-		/*  1780 */
-		331, 331, 331, 331, 294, 327, 331, 246, 255, 350,
-		/*  1790 */
-		348, 129, 345, 331, 77, 123, 331, 331, 331, 331,
-		/*  1800 */
-		331, 331, 331, 294, 327, 331, 246, 255, 350, 348,
-		/*  1810 */
-		129, 345, 331, 74, 123, 331, 331, 246, 331, 331,
-		/*  1820 */
-		331, 129, 294, 327, 66, 123, 255, 350, 348, 331,
-		/*  1830 */
-		345, 331, 331, 294, 327, 331, 246, 222, 350, 348,
-		/*  1840 */
-		129, 345, 331, 69, 123, 331, 331, 331, 331, 331,
-		/*  1850 */
-		331, 331, 294, 327, 331, 246, 255, 350, 348, 129,
-		/*  1860 */
-		345, 331, 78, 123, 331, 331, 331, 331, 331, 331,
-		/*  1870 */
-		331, 294, 327, 331, 246, 255, 350, 348, 129, 345,
-		/*  1880 */
-		331, 60, 123, 331, 331, 331, 331, 331, 331, 331,
-		/*  1890 */
-		294, 327, 331, 246, 255, 350, 348, 129, 345, 331,
-		/*  1900 */
-		53, 123, 331, 331, 246, 331, 331, 331, 129, 294,
-		/*  1910 */
-		327, 65, 123, 255, 350, 348, 331, 345, 331, 331,
-		/*  1920 */
-		294, 327, 336, 331, 255, 350, 348, 331, 345, 8,
-		/*  1930 */
-		331, 331, 331, 331, 5, 108, 331, 331, 331, 331,
-		/*  1940 */
-		126, 331, 331, 246, 259, 331, 256, 129, 331, 331,
-		/*  1950 */
-		72, 123, 331, 331, 331, 331, 331, 331, 331, 294,
-		/*  1960 */
-		327, 331, 246, 255, 350, 348, 129, 345, 331, 85,
-		/*  1970 */
-		123, 331, 331, 331, 331, 331, 331, 331, 294, 327,
-		/*  1980 */
-		331, 246, 255, 350, 348, 129, 345, 331, 81, 123,
-		/*  1990 */
-		331, 19, 340, 331, 331, 331, 331, 294, 327, 331,
-		/*  2000 */
-		246, 255, 350, 348, 113, 345, 331, 82, 123, 331,
-		/*  2010 */
-		331, 246, 331, 331, 331, 93, 294, 327, 54, 121,
-		/*  2020 */
-		255, 350, 348, 331, 345, 331, 331, 294, 327, 331,
-		/*  2030 */
-		246, 217, 350, 348, 129, 345, 331, 58, 123, 331,
-		/*  2040 */
-		331, 331, 331, 331, 331, 331, 294, 327, 331, 336,
-		/*  2050 */
-		255, 350, 348, 331, 345, 331, 8, 331, 331, 331,
-		/*  2060 */
-		331, 5, 108, 331, 331, 331, 331, 126, 246, 331,
-		/*  2070 */
-		331, 259, 129, 256, 331, 88, 123, 331, 331, 246,
-		/*  2080 */
-		331, 331, 331, 129, 294, 327, 56, 123, 255, 350,
-		/*  2090 */
-		348, 331, 345, 331, 331, 294, 327, 331, 331, 255,
-		/*  2100 */
-		350, 348, 331, 345, 246, 331, 331, 331, 129, 331,
-		/*  2110 */
-		331, 68, 123, 331, 331, 331, 331, 325, 19, 340,
-		/*  2120 */
-		294, 327, 331, 331, 255, 350, 348, 331, 345, 331,
-		/*  2130 */
-		331, 331, 331, 246, 331, 331, 331, 118, 331, 331,
-		/*  2140 */
-		59, 123, 331, 331, 331, 331, 190, 172, 331, 294,
-		/*  2150 */
-		327, 331, 331, 255, 350, 348, 283, 345, 246, 20,
-		/*  2160 */
-		22, 331, 93, 331, 331, 57, 121, 331, 331, 331,
-		/*  2170 */
-		331, 331, 331, 207, 294, 327, 331, 246, 255, 350,
-		/*  2180 */
-		348, 129, 345, 331, 64, 123, 331, 331, 246, 331,
-		/*  2190 */
-		331, 331, 129, 294, 327, 63, 123, 255, 350, 348,
-		/*  2200 */
-		331, 345, 331, 331, 294, 327, 331, 246, 255, 350,
-		/*  2210 */
-		348, 129, 345, 331, 73, 123, 331, 331, 331, 331,
-		/*  2220 */
-		190, 165, 331, 294, 327, 331, 331, 255, 350, 348,
-		/*  2230 */
-		283, 345, 331, 20, 22, 331, 246, 331, 331, 331,
-		/*  2240 */
-		129, 331, 331, 87, 123, 331, 331, 207, 331, 331,
-		/*  2250 */
-		331, 331, 294, 327, 331, 331, 255, 350, 348, 331,
-		/*  2260 */
-		345, 246, 331, 331, 331, 129, 331, 331, 75, 123,
-		/*  2270 */
-		331, 331, 246, 331, 331, 331, 129, 294, 327, 61,
-		/*  2280 */
-		123, 255, 350, 348, 331, 345, 331, 331, 294, 327,
-		/*  2290 */
-		331, 246, 255, 350, 348, 129, 345, 331, 71, 123,
-		/*  2300 */
-		331, 331, 246, 331, 331, 331, 129, 294, 327, 83,
-		/*  2310 */
-		123, 255, 350, 348, 331, 345, 331, 331, 294, 327,
-		/*  2320 */
-		331, 331, 255, 350, 348, 331, 345, 246, 331, 331,
-		/*  2330 */
-		331, 112, 331, 331, 76, 123, 331, 331, 331, 331,
-		/*  2340 */
-		331, 331, 331, 294, 327, 331, 331, 255, 350, 348,
-		/*  2350 */
-		331, 345, 246, 331, 331, 331, 129, 331, 331, 91,
-		/*  2360 */
-		123, 331, 331, 246, 331, 331, 331, 129, 294, 327,
-		/*  2370 */
-		62, 123, 255, 350, 348, 331, 345, 331, 331, 294,
-		/*  2380 */
-		327, 331, 246, 255, 350, 348, 129, 345, 331, 79,
-		/*  2390 */
-		123, 331, 331, 331, 331, 331, 331, 331, 294, 327,
-		/*  2400 */
-		331, 331, 255, 350, 348, 331, 345,
-	);
-	static public $yy_lookahead = array(
-		/*     0 */
-		1, 4, 5, 6, 7, 8, 9, 10, 11, 12,
-		/*    10 */
-		13, 14, 15, 30, 66, 18, 18, 2, 20, 36,
-		/*    20 */
-		23, 24, 94, 95, 96, 39, 29, 28, 30, 30,
-		/*    30 */
-		33, 60, 35, 60, 36, 36, 65, 18, 65, 20,
-		/*    40 */
-		41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-		/*    50 */
-		51, 52, 53, 54, 1, 1, 3, 3, 1, 91,
-		/*    60 */
-		3, 83, 84, 85, 86, 87, 67, 68, 69, 70,
-		/*    70 */
-		71, 72, 73, 74, 75, 76, 77, 78, 112, 1,
-		/*    80 */
-		114, 115, 63, 30, 30, 31, 118, 30, 19, 36,
-		/*    90 */
-		36, 21, 22, 36, 41, 42, 43, 44, 45, 46,
-		/*   100 */
-		47, 48, 49, 50, 51, 52, 53, 54, 1, 55,
-		/*   110 */
-		32, 1, 55, 3, 91, 39, 18, 19, 20, 38,
-		/*   120 */
-		67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-		/*   130 */
-		77, 78, 62, 55, 20, 37, 60, 30, 62, 20,
-		/*   140 */
-		30, 118, 66, 36, 114, 115, 36, 66, 41, 42,
-		/*   150 */
-		43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-		/*   160 */
-		53, 54, 1, 26, 1, 55, 3, 37, 1, 18,
-		/*   170 */
-		3, 20, 21, 91, 67, 68, 69, 70, 71, 72,
-		/*   180 */
-		73, 74, 75, 76, 77, 78, 5, 6, 7, 8,
-		/*   190 */
-		9, 20, 1, 30, 3, 100, 15, 16, 17, 36,
-		/*   200 */
-		118, 119, 41, 42, 43, 44, 45, 46, 47, 48,
-		/*   210 */
-		49, 50, 51, 52, 53, 54, 1, 18, 55, 20,
-		/*   220 */
-		21, 30, 55, 114, 115, 26, 22, 36, 67, 68,
-		/*   230 */
-		69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-		/*   240 */
-		86, 80, 32, 26, 91, 92, 31, 1, 109, 39,
-		/*   250 */
-		38, 18, 40, 20, 101, 116, 41, 42, 43, 44,
-		/*   260 */
-		45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-		/*   270 */
-		1, 118, 62, 18, 19, 20, 122, 123, 85, 86,
-		/*   280 */
-		87, 91, 67, 68, 69, 70, 71, 72, 73, 74,
-		/*   290 */
-		75, 76, 77, 78, 104, 105, 63, 80, 1, 91,
-		/*   300 */
-		92, 55, 3, 18, 115, 20, 21, 20, 118, 101,
-		/*   310 */
-		41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-		/*   320 */
-		51, 52, 53, 54, 1, 26, 118, 30, 38, 88,
-		/*   330 */
-		40, 39, 38, 36, 40, 66, 67, 68, 69, 70,
-		/*   340 */
-		71, 72, 73, 74, 75, 76, 77, 78, 63, 21,
-		/*   350 */
-		63, 109, 91, 92, 62, 1, 2, 16, 116, 19,
-		/*   360 */
-		20, 18, 101, 40, 41, 42, 43, 44, 45, 46,
-		/*   370 */
-		47, 48, 49, 50, 51, 52, 53, 54, 1, 118,
-		/*   380 */
-		3, 18, 39, 20, 19, 20, 19, 111, 60, 113,
-		/*   390 */
-		67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-		/*   400 */
-		77, 78, 21, 22, 64, 30, 39, 92, 92, 39,
-		/*   410 */
-		18, 36, 20, 18, 1, 20, 101, 101, 41, 42,
-		/*   420 */
-		43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-		/*   430 */
-		53, 54, 1, 118, 118, 22, 87, 2, 89, 94,
-		/*   440 */
-		95, 91, 98, 62, 67, 68, 69, 70, 71, 72,
-		/*   450 */
-		73, 74, 75, 76, 77, 78, 21, 113, 86, 111,
-		/*   460 */
-		92, 92, 111, 18, 113, 20, 20, 111, 118, 101,
-		/*   470 */
-		101, 40, 41, 42, 43, 44, 45, 46, 47, 48,
-		/*   480 */
-		49, 50, 51, 52, 53, 54, 1, 118, 3, 100,
-		/*   490 */
-		94, 95, 18, 100, 20, 123, 111, 25, 67, 68,
-		/*   500 */
-		69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-		/*   510 */
-		38, 92, 92, 20, 3, 3, 92, 20, 40, 64,
-		/*   520 */
-		101, 101, 19, 3, 19, 101, 41, 42, 43, 44,
-		/*   530 */
-		45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-		/*   540 */
-		1, 2, 118, 20, 19, 64, 20, 19, 21, 98,
-		/*   550 */
-		20, 98, 67, 68, 69, 70, 71, 72, 73, 74,
-		/*   560 */
-		75, 76, 77, 78, 113, 22, 113, 60, 27, 20,
-		/*   570 */
-		37, 20, 56, 2, 101, 1, 112, 111, 116, 111,
-		/*   580 */
-		41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-		/*   590 */
-		51, 52, 53, 54, 1, 113, 97, 118, 2, 119,
-		/*   600 */
-		111, 97, 30, 124, 98, 62, 67, 68, 69, 70,
-		/*   610 */
-		71, 72, 73, 74, 75, 76, 77, 78, 25, 113,
-		/*   620 */
-		124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-		/*   630 */
-		124, 124, 124, 124, 41, 42, 43, 44, 45, 46,
-		/*   640 */
-		47, 48, 49, 50, 51, 52, 53, 54, 1, 124,
-		/*   650 */
-		3, 124, 124, 124, 124, 124, 124, 124, 99, 98,
-		/*   660 */
-		67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-		/*   670 */
-		77, 78, 113, 124, 113, 124, 124, 124, 124, 124,
-		/*   680 */
-		124, 124, 124, 124, 124, 124, 124, 124, 41, 42,
-		/*   690 */
-		43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-		/*   700 */
-		53, 54, 1, 124, 3, 124, 124, 124, 124, 124,
-		/*   710 */
-		124, 98, 98, 98, 67, 68, 69, 70, 71, 72,
-		/*   720 */
-		73, 74, 75, 76, 77, 78, 113, 113, 113, 124,
-		/*   730 */
-		124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-		/*   740 */
-		124, 124, 41, 42, 43, 44, 45, 46, 47, 48,
-		/*   750 */
-		49, 50, 51, 52, 53, 54, 1, 124, 124, 124,
-		/*   760 */
-		124, 124, 124, 124, 124, 98, 98, 124, 67, 68,
-		/*   770 */
-		69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
-		/*   780 */
-		113, 113, 124, 124, 124, 124, 124, 124, 124, 124,
-		/*   790 */
-		124, 124, 124, 124, 124, 124, 41, 42, 43, 44,
-		/*   800 */
-		45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-		/*   810 */
-		124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-		/*   820 */
-		22, 124, 67, 68, 69, 70, 71, 72, 73, 74,
-		/*   830 */
-		75, 76, 77, 78, 124, 124, 124, 124, 41, 42,
-		/*   840 */
-		43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
-		/*   850 */
-		53, 54, 124, 124, 124, 124, 124, 124, 60, 124,
-		/*   860 */
-		124, 124, 124, 65, 67, 68, 69, 70, 71, 72,
-		/*   870 */
-		73, 74, 75, 76, 77, 78, 124, 124, 124, 124,
-		/*   880 */
-		124, 124, 124, 18, 19, 20, 124, 124, 23, 24,
-		/*   890 */
-		124, 86, 124, 124, 29, 90, 92, 124, 33, 94,
-		/*   900 */
-		35, 124, 37, 124, 39, 101, 124, 42, 103, 124,
-		/*   910 */
-		124, 106, 107, 108, 124, 110, 124, 113, 92, 92,
-		/*   920 */
-		124, 124, 57, 58, 59, 60, 61, 101, 101, 64,
-		/*   930 */
-		65, 66, 124, 94, 124, 124, 124, 124, 124, 113,
-		/*   940 */
-		113, 18, 19, 20, 79, 106, 23, 24, 124, 110,
-		/*   950 */
-		124, 124, 29, 124, 124, 86, 33, 34, 35, 90,
-		/*   960 */
-		37, 124, 39, 94, 92, 42, 124, 124, 124, 124,
-		/*   970 */
-		86, 124, 103, 101, 90, 106, 107, 108, 94, 110,
-		/*   980 */
-		57, 58, 59, 60, 61, 113, 124, 64, 65, 124,
-		/*   990 */
-		106, 107, 108, 124, 110, 18, 124, 20, 124, 18,
-		/*  1000 */
-		19, 20, 79, 124, 23, 24, 124, 30, 124, 32,
-		/*  1010 */
-		29, 86, 124, 36, 33, 90, 35, 124, 37, 94,
-		/*  1020 */
-		39, 124, 124, 42, 124, 124, 124, 124, 124, 124,
-		/*  1030 */
-		124, 106, 107, 108, 124, 110, 124, 124, 57, 58,
-		/*  1040 */
-		59, 60, 61, 124, 124, 64, 65, 124, 124, 124,
-		/*  1050 */
-		124, 124, 18, 124, 20, 124, 124, 18, 19, 20,
-		/*  1060 */
-		79, 124, 23, 24, 30, 86, 32, 124, 29, 90,
-		/*  1070 */
-		36, 86, 33, 94, 35, 90, 37, 124, 39, 94,
-		/*  1080 */
-		124, 42, 124, 124, 124, 106, 107, 108, 124, 110,
-		/*  1090 */
-		124, 106, 107, 108, 124, 110, 57, 58, 59, 60,
-		/*  1100 */
-		61, 124, 124, 64, 65, 124, 124, 124, 124, 124,
-		/*  1110 */
-		124, 124, 124, 124, 124, 18, 19, 20, 79, 124,
-		/*  1120 */
-		23, 24, 124, 124, 124, 124, 29, 86, 124, 124,
-		/*  1130 */
-		33, 90, 35, 124, 37, 94, 39, 124, 124, 42,
-		/*  1140 */
-		124, 124, 124, 124, 124, 124, 124, 106, 107, 108,
-		/*  1150 */
-		124, 110, 124, 124, 57, 58, 59, 60, 61, 124,
-		/*  1160 */
-		124, 64, 65, 124, 124, 124, 124, 124, 124, 124,
-		/*  1170 */
-		124, 124, 124, 18, 19, 20, 79, 124, 23, 24,
-		/*  1180 */
-		124, 124, 124, 124, 29, 86, 124, 124, 33, 90,
-		/*  1190 */
-		35, 124, 37, 94, 39, 124, 124, 42, 124, 124,
-		/*  1200 */
-		124, 124, 124, 124, 124, 106, 107, 108, 124, 110,
-		/*  1210 */
-		124, 124, 57, 58, 59, 60, 61, 124, 124, 64,
-		/*  1220 */
-		65, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-		/*  1230 */
-		124, 18, 19, 20, 79, 124, 23, 24, 124, 124,
-		/*  1240 */
-		124, 124, 29, 86, 124, 124, 33, 90, 35, 124,
-		/*  1250 */
-		37, 94, 39, 124, 124, 42, 124, 124, 124, 124,
-		/*  1260 */
-		124, 124, 124, 106, 107, 108, 124, 110, 124, 124,
-		/*  1270 */
-		57, 58, 59, 60, 61, 124, 124, 64, 65, 124,
-		/*  1280 */
-		1, 124, 3, 124, 124, 124, 124, 124, 124, 18,
-		/*  1290 */
-		19, 20, 79, 124, 23, 24, 124, 124, 124, 124,
-		/*  1300 */
-		29, 22, 124, 124, 33, 124, 35, 124, 37, 30,
-		/*  1310 */
-		39, 91, 92, 42, 124, 36, 124, 124, 39, 124,
-		/*  1320 */
-		124, 101, 124, 124, 104, 105, 124, 124, 57, 58,
-		/*  1330 */
-		59, 60, 61, 124, 124, 64, 65, 124, 118, 124,
-		/*  1340 */
-		124, 62, 124, 124, 124, 3, 124, 18, 19, 20,
-		/*  1350 */
-		79, 124, 23, 24, 124, 124, 124, 124, 29, 124,
-		/*  1360 */
-		124, 124, 33, 21, 35, 124, 37, 124, 39, 91,
-		/*  1370 */
-		92, 42, 30, 124, 124, 124, 124, 124, 36, 101,
-		/*  1380 */
-		124, 39, 104, 105, 124, 124, 57, 58, 59, 60,
-		/*  1390 */
-		61, 124, 124, 64, 65, 124, 118, 124, 124, 124,
-		/*  1400 */
-		124, 124, 124, 124, 62, 18, 19, 20, 79, 124,
-		/*  1410 */
-		23, 24, 124, 124, 124, 124, 29, 124, 124, 124,
-		/*  1420 */
-		33, 124, 35, 124, 37, 124, 39, 91, 92, 42,
-		/*  1430 */
-		124, 124, 124, 124, 124, 124, 124, 101, 124, 124,
-		/*  1440 */
-		104, 105, 124, 124, 57, 58, 59, 60, 61, 124,
-		/*  1450 */
-		124, 64, 124, 124, 118, 124, 124, 124, 124, 124,
-		/*  1460 */
-		124, 124, 124, 18, 19, 20, 79, 124, 23, 24,
-		/*  1470 */
-		124, 124, 124, 124, 29, 124, 124, 124, 33, 124,
-		/*  1480 */
-		35, 124, 37, 124, 39, 124, 3, 42, 124, 124,
-		/*  1490 */
-		124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
-		/*  1500 */
-		124, 124, 57, 58, 59, 60, 61, 124, 25, 64,
-		/*  1510 */
-		27, 28, 124, 30, 31, 124, 124, 124, 124, 36,
-		/*  1520 */
-		124, 38, 39, 40, 79, 124, 124, 124, 124, 124,
-		/*  1530 */
-		124, 124, 124, 124, 124, 86, 124, 124, 55, 90,
-		/*  1540 */
-		124, 124, 93, 94, 124, 62, 124, 124, 124, 66,
-		/*  1550 */
-		124, 102, 103, 124, 124, 106, 107, 108, 124, 110,
-		/*  1560 */
-		124, 124, 124, 80, 124, 124, 124, 86, 124, 120,
-		/*  1570 */
-		121, 90, 124, 124, 93, 94, 124, 124, 124, 124,
-		/*  1580 */
-		124, 124, 124, 102, 103, 124, 124, 106, 107, 108,
-		/*  1590 */
-		86, 110, 124, 124, 90, 124, 124, 93, 94, 95,
-		/*  1600 */
-		124, 86, 121, 124, 124, 90, 102, 103, 93, 94,
-		/*  1610 */
-		106, 107, 108, 124, 110, 124, 124, 102, 103, 124,
-		/*  1620 */
-		124, 106, 107, 108, 124, 110, 86, 124, 124, 124,
-		/*  1630 */
-		90, 124, 117, 93, 94, 124, 124, 124, 124, 124,
-		/*  1640 */
-		124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
-		/*  1650 */
-		110, 124, 124, 124, 86, 91, 92, 117, 90, 124,
-		/*  1660 */
-		124, 93, 94, 95, 124, 101, 124, 124, 104, 105,
-		/*  1670 */
-		102, 103, 124, 124, 106, 107, 108, 86, 110, 124,
-		/*  1680 */
-		124, 90, 118, 124, 93, 94, 124, 124, 124, 124,
-		/*  1690 */
-		124, 124, 124, 102, 103, 124, 86, 106, 107, 108,
-		/*  1700 */
-		90, 110, 124, 93, 94, 124, 124, 124, 117, 124,
-		/*  1710 */
-		124, 124, 102, 103, 124, 124, 106, 107, 108, 86,
-		/*  1720 */
-		110, 124, 124, 90, 124, 124, 93, 94, 124, 124,
-		/*  1730 */
-		86, 124, 124, 124, 90, 102, 103, 93, 94, 106,
-		/*  1740 */
-		107, 108, 124, 110, 124, 124, 102, 103, 124, 86,
-		/*  1750 */
-		106, 107, 108, 90, 110, 124, 93, 94, 124, 124,
-		/*  1760 */
-		124, 124, 124, 124, 124, 102, 103, 124, 86, 106,
-		/*  1770 */
-		107, 108, 90, 110, 124, 93, 94, 124, 124, 124,
-		/*  1780 */
-		124, 124, 124, 124, 102, 103, 124, 86, 106, 107,
-		/*  1790 */
-		108, 90, 110, 124, 93, 94, 124, 124, 124, 124,
-		/*  1800 */
-		124, 124, 124, 102, 103, 124, 86, 106, 107, 108,
-		/*  1810 */
-		90, 110, 124, 93, 94, 124, 124, 86, 124, 124,
-		/*  1820 */
-		124, 90, 102, 103, 93, 94, 106, 107, 108, 124,
-		/*  1830 */
-		110, 124, 124, 102, 103, 124, 86, 106, 107, 108,
-		/*  1840 */
-		90, 110, 124, 93, 94, 124, 124, 124, 124, 124,
-		/*  1850 */
-		124, 124, 102, 103, 124, 86, 106, 107, 108, 90,
-		/*  1860 */
-		110, 124, 93, 94, 124, 124, 124, 124, 124, 124,
-		/*  1870 */
-		124, 102, 103, 124, 86, 106, 107, 108, 90, 110,
-		/*  1880 */
-		124, 93, 94, 124, 124, 124, 124, 124, 124, 124,
-		/*  1890 */
-		102, 103, 124, 86, 106, 107, 108, 90, 110, 124,
-		/*  1900 */
-		93, 94, 124, 124, 86, 124, 124, 124, 90, 102,
-		/*  1910 */
-		103, 93, 94, 106, 107, 108, 124, 110, 124, 124,
-		/*  1920 */
-		102, 103, 11, 124, 106, 107, 108, 124, 110, 18,
-		/*  1930 */
-		124, 124, 124, 124, 23, 24, 124, 124, 124, 124,
-		/*  1940 */
-		29, 124, 124, 86, 33, 124, 35, 90, 124, 124,
-		/*  1950 */
-		93, 94, 124, 124, 124, 124, 124, 124, 124, 102,
-		/*  1960 */
-		103, 124, 86, 106, 107, 108, 90, 110, 124, 93,
-		/*  1970 */
-		94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
-		/*  1980 */
-		124, 86, 106, 107, 108, 90, 110, 124, 93, 94,
-		/*  1990 */
-		79, 80, 81, 124, 124, 124, 124, 102, 103, 124,
-		/*  2000 */
-		86, 106, 107, 108, 90, 110, 124, 93, 94, 124,
-		/*  2010 */
-		124, 86, 124, 124, 124, 90, 102, 103, 93, 94,
-		/*  2020 */
-		106, 107, 108, 124, 110, 124, 124, 102, 103, 124,
-		/*  2030 */
-		86, 106, 107, 108, 90, 110, 124, 93, 94, 124,
-		/*  2040 */
-		124, 124, 124, 124, 124, 124, 102, 103, 124, 11,
-		/*  2050 */
-		106, 107, 108, 124, 110, 124, 18, 124, 124, 124,
-		/*  2060 */
-		124, 23, 24, 124, 124, 124, 124, 29, 86, 124,
-		/*  2070 */
-		124, 33, 90, 35, 124, 93, 94, 124, 124, 86,
-		/*  2080 */
-		124, 124, 124, 90, 102, 103, 93, 94, 106, 107,
-		/*  2090 */
-		108, 124, 110, 124, 124, 102, 103, 124, 124, 106,
-		/*  2100 */
-		107, 108, 124, 110, 86, 124, 124, 124, 90, 124,
-		/*  2110 */
-		124, 93, 94, 124, 124, 124, 124, 79, 80, 81,
-		/*  2120 */
-		102, 103, 124, 124, 106, 107, 108, 124, 110, 124,
-		/*  2130 */
-		124, 124, 124, 86, 124, 124, 124, 90, 124, 124,
-		/*  2140 */
-		93, 94, 124, 124, 124, 124, 91, 92, 124, 102,
-		/*  2150 */
-		103, 124, 124, 106, 107, 108, 101, 110, 86, 104,
-		/*  2160 */
-		105, 124, 90, 124, 124, 93, 94, 124, 124, 124,
-		/*  2170 */
-		124, 124, 124, 118, 102, 103, 124, 86, 106, 107,
-		/*  2180 */
-		108, 90, 110, 124, 93, 94, 124, 124, 86, 124,
-		/*  2190 */
-		124, 124, 90, 102, 103, 93, 94, 106, 107, 108,
-		/*  2200 */
-		124, 110, 124, 124, 102, 103, 124, 86, 106, 107,
-		/*  2210 */
-		108, 90, 110, 124, 93, 94, 124, 124, 124, 124,
-		/*  2220 */
-		91, 92, 124, 102, 103, 124, 124, 106, 107, 108,
-		/*  2230 */
-		101, 110, 124, 104, 105, 124, 86, 124, 124, 124,
-		/*  2240 */
-		90, 124, 124, 93, 94, 124, 124, 118, 124, 124,
-		/*  2250 */
-		124, 124, 102, 103, 124, 124, 106, 107, 108, 124,
-		/*  2260 */
-		110, 86, 124, 124, 124, 90, 124, 124, 93, 94,
-		/*  2270 */
-		124, 124, 86, 124, 124, 124, 90, 102, 103, 93,
-		/*  2280 */
-		94, 106, 107, 108, 124, 110, 124, 124, 102, 103,
-		/*  2290 */
-		124, 86, 106, 107, 108, 90, 110, 124, 93, 94,
-		/*  2300 */
-		124, 124, 86, 124, 124, 124, 90, 102, 103, 93,
-		/*  2310 */
-		94, 106, 107, 108, 124, 110, 124, 124, 102, 103,
-		/*  2320 */
-		124, 124, 106, 107, 108, 124, 110, 86, 124, 124,
-		/*  2330 */
-		124, 90, 124, 124, 93, 94, 124, 124, 124, 124,
-		/*  2340 */
-		124, 124, 124, 102, 103, 124, 124, 106, 107, 108,
-		/*  2350 */
-		124, 110, 86, 124, 124, 124, 90, 124, 124, 93,
-		/*  2360 */
-		94, 124, 124, 86, 124, 124, 124, 90, 102, 103,
-		/*  2370 */
-		93, 94, 106, 107, 108, 124, 110, 124, 124, 102,
-		/*  2380 */
-		103, 124, 86, 106, 107, 108, 90, 110, 124, 93,
-		/*  2390 */
-		94, 124, 124, 124, 124, 124, 124, 124, 102, 103,
-		/*  2400 */
-		124, 124, 106, 107, 108, 124, 110,
-	);
-	const YY_SHIFT_USE_DFLT = -53;
-	const YY_SHIFT_MAX = 259;
-	static public $yy_shift_ofst = array(
-		/*     0 */
-		-3, 1213, 981, 1155, 1213, 1155, 981, 981, 923, 923,
-		/*    10 */
-		865, 981, 981, 1097, 981, 981, 981, 981, 981, 981,
-		/*    20 */
-		981, 1329, 981, 981, 981, 981, 1271, 981, 981, 981,
-		/*    30 */
-		1097, 981, 981, 981, 981, 981, 981, 981, 981, 981,
-		/*    40 */
-		981, 981, 981, 981, 1039, 1039, 1387, 1387, 1445, 1387,
-		/*    50 */
-		1387, 1387, 1387, -1, 53, 107, 107, 107, 107, 107,
-		/*    60 */
-		485, 431, 593, 647, 701, 323, 161, 215, 377, 269,
-		/*    70 */
-		539, 755, 755, 755, 755, 755, 755, 755, 755, 755,
-		/*    80 */
-		755, 755, 755, 755, 755, 755, 755, 755, 755, 755,
-		/*    90 */
-		797, 797, 1279, 110, 297, -3, 2038, 977, 1034, 191,
-		/*   100 */
-		-2, 191, -2, 297, 297, 798, 340, 354, 367, 1911,
-		/*   110 */
-		181, 54, 57, 163, 199, 285, 19, 151, 167, 70,
-		/*   120 */
-		78, 381, 367, 543, 363, -17, 375, 365, 363, 246,
-		/*   130 */
-		363, 395, 392, -17, 363, 363, 363, 367, 363, 445,
-		/*   140 */
-		413, 363, 395, 363, 474, 365, 574, 204, 204, 574,
-		/*   150 */
-		574, 574, 574, 574, 574, 574, 574, -53, 255, 233,
-		/*   160 */
-		-17, -27, -29, -17, -17, -17, -29, -17, -29, -27,
-		/*   170 */
-		-17, -17, -17, -29, -17, -17, -29, -17, -17, -17,
-		/*   180 */
-		-17, -17, -17, -17, -17, -17, -29, -29, -17, 343,
-		/*   190 */
-		574, 574, 574, 596, 596, 574, 574, 204, 572, 572,
-		/*   200 */
-		204, 341, 204, 370, -53, -53, -53, -53, -53, 1483,
-		/*   210 */
-		1342, 98, 76, 210, 435, 212, 328, 299, 81, 287,
-		/*   220 */
-		472, 294, 217, 290, 292, 292, 370, 511, 455, 505,
-		/*   230 */
-		520, 528, 478, 481, 541, 527, 446, 15, 114, -14,
-		/*   240 */
-		533, 130, 493, 497, 503, 523, 512, 525, 549, 551,
-		/*   250 */
-		507, 526, 530, 516, 571, 137, 119, -52, 69, 171,
-	);
-	const YY_REDUCE_USE_DFLT = -73;
-	const YY_REDUCE_MAX = 208;
-	static public $yy_reduce_ofst = array(
-		/*     0 */
-		-22, 1449, 1540, 1504, 1481, 1568, 1515, 1591, 1925, 2072,
-		/*    10 */
-		1750, 1818, 1895, 1644, 1663, 1914, 2205, 2277, 1876, 1731,
-		/*    20 */
-		1857, 1633, 1701, 2186, 2150, 2296, 2266, 2091, 2047, 1993,
-		/*    30 */
-		2241, 2102, 1720, 1788, 1982, 1769, 1807, 1610, 1682, 2175,
-		/*    40 */
-		2216, 2121, 1944, 2018, 805, 869, 884, 979, 925, 985,
-		/*    50 */
-		1041, 1157, 1099, 1220, 1336, 2129, 1278, 1336, 1564, 2055,
-		/*    60 */
-		190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
-		/*    70 */
-		190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
-		/*    80 */
-		190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
-		/*    90 */
-		190, 190, 261, 208, 153, 193, 154, 827, 826, 369,
-		/*   100 */
-		804, 315, 872, 316, 424, -34, 839, 82, -72, 372,
-		/*   110 */
-		349, -32, -32, -32, 559, 351, 351, 351, -32, 30,
-		/*   120 */
-		-32, 30, 345, 30, 453, 420, 368, 242, 344, -32,
-		/*   130 */
-		276, 561, 451, 419, 506, 615, 668, 396, 613, 615,
-		/*   140 */
-		350, 614, 615, 667, 615, 139, -32, 30, 109, -32,
-		/*   150 */
-		-32, -32, -32, -32, -32, -32, 23, -32, 462, 482,
-		/*   160 */
-		473, 466, 464, 473, 473, 473, 464, 473, 464, 468,
-		/*   170 */
-		473, 473, 473, 464, 473, 473, 464, 473, 473, 473,
-		/*   180 */
-		473, 473, 473, 473, 473, 473, 464, 464, 473, 489,
-		/*   190 */
-		479, 479, 479, 480, 480, 479, 479, 189, 504, 499,
-		/*   200 */
-		189, 241, 189, 348, 356, 393, 389, 95, 385,
-	);
-	static public $yyExpectedTokens = array(
-		/* 0 */
-		array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
-		/* 1 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 2 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 3 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 4 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 5 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 6 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 7 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 8 */
-		array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 9 */
-		array(18, 19, 20, 23, 24, 29, 33, 34, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 10 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 66, 79,),
-		/* 11 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 12 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 13 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 14 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 15 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 16 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 17 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 18 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 19 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 20 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 21 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 22 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 23 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 24 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 25 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 26 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 27 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 28 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 29 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 30 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 31 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 32 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 33 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 34 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 35 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 36 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 37 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 38 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 39 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 40 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 41 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 42 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 43 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 44 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 45 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 65, 79,),
-		/* 46 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 47 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 48 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 49 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 50 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 51 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 52 */
-		array(18, 19, 20, 23, 24, 29, 33, 35, 37, 39, 42, 57, 58, 59, 60, 61, 64, 79,),
-		/* 53 */
-		array(1, 28, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 54 */
-		array(1, 3, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 55 */
-		array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 56 */
-		array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 57 */
-		array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 58 */
-		array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 59 */
-		array(1, 30, 36, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 60 */
-		array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 61 */
-		array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 62 */
-		array(1, 25, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 63 */
-		array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 64 */
-		array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 65 */
-		array(1, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 66 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 80,),
-		/* 67 */
-		array(1, 31, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 68 */
-		array(1, 3, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 69 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 70 */
-		array(1, 2, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 71 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 72 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 73 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 74 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 75 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 76 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 77 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 78 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 79 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 80 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 81 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 82 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 83 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 84 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 85 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 86 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 87 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 88 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 89 */
-		array(1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 90 */
-		array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 91 */
-		array(41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,),
-		/* 92 */
-		array(1, 3, 22, 30, 36, 39, 62,),
-		/* 93 */
-		array(1, 3, 30, 36, 55,),
-		/* 94 */
-		array(1, 30, 36,),
-		/* 95 */
-		array(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 23, 24, 29, 33, 35,),
-		/* 96 */
-		array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,),
-		/* 97 */
-		array(18, 20, 30, 32, 36,),
-		/* 98 */
-		array(18, 20, 30, 32, 36,),
-		/* 99 */
-		array(1, 3, 30, 36,),
-		/* 100 */
-		array(18, 20, 30, 36,),
-		/* 101 */
-		array(1, 3, 30, 36,),
-		/* 102 */
-		array(18, 20, 30, 36,),
-		/* 103 */
-		array(1, 30, 36,),
-		/* 104 */
-		array(1, 30, 36,),
-		/* 105 */
-		array(22, 60, 65,),
-		/* 106 */
-		array(19, 20, 64,),
-		/* 107 */
-		array(1, 2,),
-		/* 108 */
-		array(19, 39,),
-		/* 109 */
-		array(11, 18, 23, 24, 29, 33, 35, 79, 80, 81,),
-		/* 110 */
-		array(5, 6, 7, 8, 9, 15, 16, 17,),
-		/* 111 */
-		array(1, 3, 30, 31, 36, 55,),
-		/* 112 */
-		array(1, 3, 30, 36, 55,),
-		/* 113 */
-		array(1, 3, 30, 36, 55,),
-		/* 114 */
-		array(18, 20, 21, 26,),
-		/* 115 */
-		array(18, 20, 21, 63,),
-		/* 116 */
-		array(18, 20, 63,),
-		/* 117 */
-		array(18, 20, 21,),
-		/* 118 */
-		array(1, 3, 55,),
-		/* 119 */
-		array(21, 22, 62,),
-		/* 120 */
-		array(1, 32, 55,),
-		/* 121 */
-		array(21, 22, 62,),
-		/* 122 */
-		array(19, 39,),
-		/* 123 */
-		array(22, 62,),
-		/* 124 */
-		array(18, 20,),
-		/* 125 */
-		array(30, 36,),
-		/* 126 */
-		array(30, 36,),
-		/* 127 */
-		array(19, 20,),
-		/* 128 */
-		array(18, 20,),
-		/* 129 */
-		array(1, 55,),
-		/* 130 */
-		array(18, 20,),
-		/* 131 */
-		array(18, 20,),
-		/* 132 */
-		array(18, 20,),
-		/* 133 */
-		array(30, 36,),
-		/* 134 */
-		array(18, 20,),
-		/* 135 */
-		array(18, 20,),
-		/* 136 */
-		array(18, 20,),
-		/* 137 */
-		array(19, 39,),
-		/* 138 */
-		array(18, 20,),
-		/* 139 */
-		array(18, 20,),
-		/* 140 */
-		array(1, 22,),
-		/* 141 */
-		array(18, 20,),
-		/* 142 */
-		array(18, 20,),
-		/* 143 */
-		array(18, 20,),
-		/* 144 */
-		array(18, 20,),
-		/* 145 */
-		array(19, 20,),
-		/* 146 */
-		array(1,),
-		/* 147 */
-		array(22,),
-		/* 148 */
-		array(22,),
-		/* 149 */
-		array(1,),
-		/* 150 */
-		array(1,),
-		/* 151 */
-		array(1,),
-		/* 152 */
-		array(1,),
-		/* 153 */
-		array(1,),
-		/* 154 */
-		array(1,),
-		/* 155 */
-		array(1,),
-		/* 156 */
-		array(1,),
-		/* 157 */
-		array(),
-		/* 158 */
-		array(18, 19, 20,),
-		/* 159 */
-		array(18, 20, 63,),
-		/* 160 */
-		array(30, 36,),
-		/* 161 */
-		array(60, 65,),
-		/* 162 */
-		array(60, 65,),
-		/* 163 */
-		array(30, 36,),
-		/* 164 */
-		array(30, 36,),
-		/* 165 */
-		array(30, 36,),
-		/* 166 */
-		array(60, 65,),
-		/* 167 */
-		array(30, 36,),
-		/* 168 */
-		array(60, 65,),
-		/* 169 */
-		array(60, 65,),
-		/* 170 */
-		array(30, 36,),
-		/* 171 */
-		array(30, 36,),
-		/* 172 */
-		array(30, 36,),
-		/* 173 */
-		array(60, 65,),
-		/* 174 */
-		array(30, 36,),
-		/* 175 */
-		array(30, 36,),
-		/* 176 */
-		array(60, 65,),
-		/* 177 */
-		array(30, 36,),
-		/* 178 */
-		array(30, 36,),
-		/* 179 */
-		array(30, 36,),
-		/* 180 */
-		array(30, 36,),
-		/* 181 */
-		array(30, 36,),
-		/* 182 */
-		array(30, 36,),
-		/* 183 */
-		array(30, 36,),
-		/* 184 */
-		array(30, 36,),
-		/* 185 */
-		array(30, 36,),
-		/* 186 */
-		array(60, 65,),
-		/* 187 */
-		array(60, 65,),
-		/* 188 */
-		array(30, 36,),
-		/* 189 */
-		array(18, 39,),
-		/* 190 */
-		array(1,),
-		/* 191 */
-		array(1,),
-		/* 192 */
-		array(1,),
-		/* 193 */
-		array(2,),
-		/* 194 */
-		array(2,),
-		/* 195 */
-		array(1,),
-		/* 196 */
-		array(1,),
-		/* 197 */
-		array(22,),
-		/* 198 */
-		array(30,),
-		/* 199 */
-		array(30,),
-		/* 200 */
-		array(22,),
-		/* 201 */
-		array(16,),
-		/* 202 */
-		array(22,),
-		/* 203 */
-		array(39,),
-		/* 204 */
-		array(),
-		/* 205 */
-		array(),
-		/* 206 */
-		array(),
-		/* 207 */
-		array(),
-		/* 208 */
-		array(),
-		/* 209 */
-		array(3, 25, 27, 28, 30, 31, 36, 38, 39, 40, 55, 62, 66, 80,),
-		/* 210 */
-		array(3, 21, 30, 36, 39, 62,),
-		/* 211 */
-		array(18, 19, 20, 37,),
-		/* 212 */
-		array(39, 60, 62, 66,),
-		/* 213 */
-		array(32, 39, 62,),
-		/* 214 */
-		array(2, 21,),
-		/* 215 */
-		array(38, 40,),
-		/* 216 */
-		array(21, 60,),
-		/* 217 */
-		array(3, 26,),
-		/* 218 */
-		array(38, 66,),
-		/* 219 */
-		array(20, 63,),
-		/* 220 */
-		array(25, 38,),
-		/* 221 */
-		array(38, 40,),
-		/* 222 */
-		array(26, 80,),
-		/* 223 */
-		array(38, 40,),
-		/* 224 */
-		array(39, 62,),
-		/* 225 */
-		array(39, 62,),
-		/* 226 */
-		array(39,),
-		/* 227 */
-		array(3,),
-		/* 228 */
-		array(64,),
-		/* 229 */
-		array(19,),
-		/* 230 */
-		array(3,),
-		/* 231 */
-		array(19,),
-		/* 232 */
-		array(40,),
-		/* 233 */
-		array(64,),
-		/* 234 */
-		array(27,),
-		/* 235 */
-		array(21,),
-		/* 236 */
-		array(20,),
-		/* 237 */
-		array(2,),
-		/* 238 */
-		array(20,),
-		/* 239 */
-		array(39,),
-		/* 240 */
-		array(37,),
-		/* 241 */
-		array(37,),
-		/* 242 */
-		array(20,),
-		/* 243 */
-		array(20,),
-		/* 244 */
-		array(19,),
-		/* 245 */
-		array(20,),
-		/* 246 */
-		array(3,),
-		/* 247 */
-		array(19,),
-		/* 248 */
-		array(20,),
-		/* 249 */
-		array(20,),
-		/* 250 */
-		array(60,),
-		/* 251 */
-		array(20,),
-		/* 252 */
-		array(20,),
-		/* 253 */
-		array(56,),
-		/* 254 */
-		array(2,),
-		/* 255 */
-		array(26,),
-		/* 256 */
-		array(20,),
-		/* 257 */
-		array(66,),
-		/* 258 */
-		array(19,),
-		/* 259 */
-		array(20,),
-		/* 260 */
-		array(),
-		/* 261 */
-		array(),
-		/* 262 */
-		array(),
-		/* 263 */
-		array(),
-		/* 264 */
-		array(),
-		/* 265 */
-		array(),
-		/* 266 */
-		array(),
-		/* 267 */
-		array(),
-		/* 268 */
-		array(),
-		/* 269 */
-		array(),
-		/* 270 */
-		array(),
-		/* 271 */
-		array(),
-		/* 272 */
-		array(),
-		/* 273 */
-		array(),
-		/* 274 */
-		array(),
-		/* 275 */
-		array(),
-		/* 276 */
-		array(),
-		/* 277 */
-		array(),
-		/* 278 */
-		array(),
-		/* 279 */
-		array(),
-		/* 280 */
-		array(),
-		/* 281 */
-		array(),
-		/* 282 */
-		array(),
-		/* 283 */
-		array(),
-		/* 284 */
-		array(),
-		/* 285 */
-		array(),
-		/* 286 */
-		array(),
-		/* 287 */
-		array(),
-		/* 288 */
-		array(),
-		/* 289 */
-		array(),
-		/* 290 */
-		array(),
-		/* 291 */
-		array(),
-		/* 292 */
-		array(),
-		/* 293 */
-		array(),
-		/* 294 */
-		array(),
-		/* 295 */
-		array(),
-		/* 296 */
-		array(),
-		/* 297 */
-		array(),
-		/* 298 */
-		array(),
-		/* 299 */
-		array(),
-		/* 300 */
-		array(),
-		/* 301 */
-		array(),
-		/* 302 */
-		array(),
-		/* 303 */
-		array(),
-		/* 304 */
-		array(),
-		/* 305 */
-		array(),
-		/* 306 */
-		array(),
-		/* 307 */
-		array(),
-		/* 308 */
-		array(),
-		/* 309 */
-		array(),
-		/* 310 */
-		array(),
-		/* 311 */
-		array(),
-		/* 312 */
-		array(),
-		/* 313 */
-		array(),
-		/* 314 */
-		array(),
-		/* 315 */
-		array(),
-		/* 316 */
-		array(),
-		/* 317 */
-		array(),
-		/* 318 */
-		array(),
-		/* 319 */
-		array(),
-		/* 320 */
-		array(),
-		/* 321 */
-		array(),
-		/* 322 */
-		array(),
-		/* 323 */
-		array(),
-		/* 324 */
-		array(),
-		/* 325 */
-		array(),
-		/* 326 */
-		array(),
-		/* 327 */
-		array(),
-		/* 328 */
-		array(),
-		/* 329 */
-		array(),
-		/* 330 */
-		array(),
-		/* 331 */
-		array(),
-		/* 332 */
-		array(),
-		/* 333 */
-		array(),
-		/* 334 */
-		array(),
-		/* 335 */
-		array(),
-		/* 336 */
-		array(),
-		/* 337 */
-		array(),
-		/* 338 */
-		array(),
-		/* 339 */
-		array(),
-		/* 340 */
-		array(),
-		/* 341 */
-		array(),
-		/* 342 */
-		array(),
-		/* 343 */
-		array(),
-		/* 344 */
-		array(),
-		/* 345 */
-		array(),
-		/* 346 */
-		array(),
-		/* 347 */
-		array(),
-		/* 348 */
-		array(),
-		/* 349 */
-		array(),
-		/* 350 */
-		array(),
-		/* 351 */
-		array(),
-		/* 352 */
-		array(),
-		/* 353 */
-		array(),
-		/* 354 */
-		array(),
-		/* 355 */
-		array(),
-		/* 356 */
-		array(),
-		/* 357 */
-		array(),
-		/* 358 */
-		array(),
-		/* 359 */
-		array(),
-		/* 360 */
-		array(),
-		/* 361 */
-		array(),
-		/* 362 */
-		array(),
-	);
-	static public $yy_default = array(
-		/*     0 */
-		366, 551, 522, 568, 568, 568, 522, 522, 568, 568,
-		/*    10 */
-		568, 568, 568, 568, 568, 568, 568, 568, 568, 568,
-		/*    20 */
-		568, 568, 568, 568, 568, 568, 568, 568, 568, 568,
-		/*    30 */
-		568, 568, 568, 568, 568, 568, 568, 568, 568, 568,
-		/*    40 */
-		568, 568, 568, 568, 568, 568, 568, 568, 568, 568,
-		/*    50 */
-		568, 568, 568, 428, 568, 405, 428, 428, 428, 397,
-		/*    60 */
-		568, 568, 568, 568, 568, 568, 568, 433, 568, 568,
-		/*    70 */
-		568, 553, 449, 520, 552, 457, 433, 452, 439, 462,
-		/*    80 */
-		521, 461, 430, 435, 554, 438, 454, 453, 410, 458,
-		/*    90 */
-		466, 465, 477, 441, 428, 363, 568, 428, 428, 485,
-		/*   100 */
-		428, 448, 428, 428, 428, 534, 568, 419, 568, 568,
-		/*   110 */
-		568, 441, 441, 441, 568, 495, 495, 495, 441, 486,
-		/*   120 */
-		441, 486, 568, 486, 568, 428, 428, 568, 568, 441,
-		/*   130 */
-		495, 568, 568, 407, 568, 568, 568, 568, 568, 568,
-		/*   140 */
-		422, 568, 568, 568, 568, 568, 451, 486, 531, 464,
-		/*   150 */
-		446, 445, 468, 444, 469, 470, 424, 529, 568, 496,
-		/*   160 */
-		395, 489, 492, 412, 392, 406, 514, 409, 490, 491,
-		/*   170 */
-		413, 394, 398, 513, 393, 408, 493, 400, 417, 402,
-		/*   180 */
-		415, 404, 414, 418, 416, 403, 515, 512, 399, 495,
-		/*   190 */
-		448, 420, 485, 523, 524, 423, 425, 532, 567, 567,
-		/*   200 */
-		509, 383, 535, 495, 495, 528, 528, 528, 495, 443,
-		/*   210 */
-		477, 568, 477, 477, 507, 568, 473, 467, 568, 568,
-		/*   220 */
-		568, 568, 467, 568, 477, 463, 507, 568, 568, 568,
-		/*   230 */
-		568, 568, 568, 568, 436, 568, 568, 507, 568, 533,
-		/*   240 */
-		568, 475, 568, 568, 568, 568, 568, 568, 568, 568,
-		/*   250 */
-		473, 568, 568, 479, 507, 467, 568, 568, 568, 568,
-		/*   260 */
-		508, 429, 437, 364, 501, 519, 503, 440, 500, 479,
-		/*   270 */
-		566, 516, 517, 502, 504, 518, 411, 530, 459, 506,
-		/*   280 */
-		507, 527, 525, 427, 426, 388, 389, 390, 526, 471,
-		/*   290 */
-		443, 487, 494, 497, 442, 482, 472, 474, 476, 387,
-		/*   300 */
-		386, 371, 372, 373, 374, 370, 369, 365, 367, 368,
-		/*   310 */
-		375, 376, 382, 384, 385, 381, 380, 377, 378, 379,
-		/*   320 */
-		505, 498, 510, 421, 562, 555, 563, 447, 545, 546,
-		/*   330 */
-		547, 556, 557, 558, 548, 550, 565, 564, 560, 559,
-		/*   340 */
-		561, 544, 543, 450, 484, 488, 511, 483, 481, 499,
-		/*   350 */
-		478, 480, 455, 456, 540, 541, 542, 539, 538, 460,
-		/*   360 */
-		536, 537, 549,
-	);
-	const YYNOCODE = 125;
-	const YYSTACKDEPTH = 500;
-	const YYNSTATE = 363;
-	const YYNRULE = 205;
-	const YYERRORSYMBOL = 82;
-	const YYERRSYMDT = 'yy0';
-	const YYFALLBACK = 0;
-	public static $yyFallback = array();
-
-	public function Trace($TraceFILE, $zTracePrompt)
-	{
-		if (!$TraceFILE) {
-			$zTracePrompt = 0;
-		} elseif (!$zTracePrompt) {
-			$TraceFILE = 0;
-		}
-		$this->yyTraceFILE = $TraceFILE;
-		$this->yyTracePrompt = $zTracePrompt;
-	}
-
-	public function PrintTrace()
-	{
-		$this->yyTraceFILE = fopen('php://output', 'w');
-		$this->yyTracePrompt = '<br>';
-	}
-
-	public $yyTraceFILE;
-	public $yyTracePrompt;
-	public $yyidx; /* Index of top element in stack */
-	public $yyerrcnt; /* Shifts left before out of the error */
-	public $yystack = array(); /* The parser's stack */
-
-	public $yyTokenName = array(
-		'$', 'VERT', 'COLON', 'RDEL',
-		'COMMENT', 'PHPSTARTTAG', 'PHPENDTAG', 'ASPSTARTTAG',
-		'ASPENDTAG', 'FAKEPHPSTARTTAG', 'XMLTAG', 'TEXT',
-		'STRIPON', 'STRIPOFF', 'BLOCKSOURCE', 'LITERALSTART',
-		'LITERALEND', 'LITERAL', 'LDEL', 'DOLLAR',
-		'id', 'EQUAL', 'PTR', 'LDELIF',
-		'LDELFOR', 'SEMICOLON', 'INCDEC', 'TO',
-		'STEP', 'LDELFOREACH', 'SPACE', 'AS',
-		'APTR', 'LDELSETFILTER', 'SMARTYBLOCKCHILDPARENT', 'LDELSLASH',
-		'ATTR', 'INTEGER', 'COMMA', 'OPENP',
-		'CLOSEP', 'MATH', 'UNIMATH', 'ANDSYM',
-		'ISIN', 'ISDIVBY', 'ISNOTDIVBY', 'ISEVEN',
-		'ISNOTEVEN', 'ISEVENBY', 'ISNOTEVENBY', 'ISODD',
-		'ISNOTODD', 'ISODDBY', 'ISNOTODDBY', 'INSTANCEOF',
-		'QMARK', 'NOT', 'TYPECAST', 'HEX',
-		'DOT', 'SINGLEQUOTESTRING', 'DOUBLECOLON', 'AT',
-		'HATCH', 'OPENB', 'CLOSEB', 'EQUALS',
-		'NOTEQUALS', 'GREATERTHAN', 'LESSTHAN', 'GREATEREQUAL',
-		'LESSEQUAL', 'IDENTITY', 'NONEIDENTITY', 'MOD',
-		'LAND', 'LOR', 'LXOR', 'QUOTE',
-		'BACKTICK', 'DOLLARID', 'error', 'start',
-		'template', 'template_element', 'smartytag', 'literal',
-		'literal_elements', 'literal_element', 'value', 'modifierlist',
-		'attributes', 'expr', 'varindexed', 'statement',
-		'statements', 'optspace', 'varvar', 'foraction',
-		'modparameters', 'attribute', 'ternary', 'array',
-		'ifcond', 'lop', 'variable', 'function',
-		'doublequoted_with_quotes', 'static_class_access', 'object', 'arrayindex',
-		'indexdef', 'varvarele', 'objectchain', 'objectelement',
-		'method', 'params', 'modifier', 'modparameter',
-		'arrayelements', 'arrayelement', 'doublequoted', 'doublequotedcontent',
-	);
-
-	public static $yyRuleName = array(
-		/*   0 */
-		"start ::= template",
-		/*   1 */
-		"template ::= template_element",
-		/*   2 */
-		"template ::= template template_element",
-		/*   3 */
-		"template ::=",
-		/*   4 */
-		"template_element ::= smartytag RDEL",
-		/*   5 */
-		"template_element ::= COMMENT",
-		/*   6 */
-		"template_element ::= literal",
-		/*   7 */
-		"template_element ::= PHPSTARTTAG",
-		/*   8 */
-		"template_element ::= PHPENDTAG",
-		/*   9 */
-		"template_element ::= ASPSTARTTAG",
-		/*  10 */
-		"template_element ::= ASPENDTAG",
-		/*  11 */
-		"template_element ::= FAKEPHPSTARTTAG",
-		/*  12 */
-		"template_element ::= XMLTAG",
-		/*  13 */
-		"template_element ::= TEXT",
-		/*  14 */
-		"template_element ::= STRIPON",
-		/*  15 */
-		"template_element ::= STRIPOFF",
-		/*  16 */
-		"template_element ::= BLOCKSOURCE",
-		/*  17 */
-		"literal ::= LITERALSTART LITERALEND",
-		/*  18 */
-		"literal ::= LITERALSTART literal_elements LITERALEND",
-		/*  19 */
-		"literal_elements ::= literal_elements literal_element",
-		/*  20 */
-		"literal_elements ::=",
-		/*  21 */
-		"literal_element ::= literal",
-		/*  22 */
-		"literal_element ::= LITERAL",
-		/*  23 */
-		"literal_element ::= PHPSTARTTAG",
-		/*  24 */
-		"literal_element ::= FAKEPHPSTARTTAG",
-		/*  25 */
-		"literal_element ::= PHPENDTAG",
-		/*  26 */
-		"literal_element ::= ASPSTARTTAG",
-		/*  27 */
-		"literal_element ::= ASPENDTAG",
-		/*  28 */
-		"smartytag ::= LDEL value",
-		/*  29 */
-		"smartytag ::= LDEL value modifierlist attributes",
-		/*  30 */
-		"smartytag ::= LDEL value attributes",
-		/*  31 */
-		"smartytag ::= LDEL expr modifierlist attributes",
-		/*  32 */
-		"smartytag ::= LDEL expr attributes",
-		/*  33 */
-		"smartytag ::= LDEL DOLLAR id EQUAL value",
-		/*  34 */
-		"smartytag ::= LDEL DOLLAR id EQUAL expr",
-		/*  35 */
-		"smartytag ::= LDEL DOLLAR id EQUAL expr attributes",
-		/*  36 */
-		"smartytag ::= LDEL varindexed EQUAL expr attributes",
-		/*  37 */
-		"smartytag ::= LDEL id attributes",
-		/*  38 */
-		"smartytag ::= LDEL id",
-		/*  39 */
-		"smartytag ::= LDEL id PTR id attributes",
-		/*  40 */
-		"smartytag ::= LDEL id modifierlist attributes",
-		/*  41 */
-		"smartytag ::= LDEL id PTR id modifierlist attributes",
-		/*  42 */
-		"smartytag ::= LDELIF expr",
-		/*  43 */
-		"smartytag ::= LDELIF expr attributes",
-		/*  44 */
-		"smartytag ::= LDELIF statement",
-		/*  45 */
-		"smartytag ::= LDELIF statement attributes",
-		/*  46 */
-		"smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes",
-		/*  47 */
-		"foraction ::= EQUAL expr",
-		/*  48 */
-		"foraction ::= INCDEC",
-		/*  49 */
-		"smartytag ::= LDELFOR statement TO expr attributes",
-		/*  50 */
-		"smartytag ::= LDELFOR statement TO expr STEP expr attributes",
-		/*  51 */
-		"smartytag ::= LDELFOREACH attributes",
-		/*  52 */
-		"smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes",
-		/*  53 */
-		"smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes",
-		/*  54 */
-		"smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes",
-		/*  55 */
-		"smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes",
-		/*  56 */
-		"smartytag ::= LDELSETFILTER id modparameters",
-		/*  57 */
-		"smartytag ::= LDELSETFILTER id modparameters modifierlist",
-		/*  58 */
-		"smartytag ::= LDEL SMARTYBLOCKCHILDPARENT",
-		/*  59 */
-		"smartytag ::= LDELSLASH id",
-		/*  60 */
-		"smartytag ::= LDELSLASH id modifierlist",
-		/*  61 */
-		"smartytag ::= LDELSLASH id PTR id",
-		/*  62 */
-		"smartytag ::= LDELSLASH id PTR id modifierlist",
-		/*  63 */
-		"attributes ::= attributes attribute",
-		/*  64 */
-		"attributes ::= attribute",
-		/*  65 */
-		"attributes ::=",
-		/*  66 */
-		"attribute ::= SPACE id EQUAL id",
-		/*  67 */
-		"attribute ::= ATTR expr",
-		/*  68 */
-		"attribute ::= ATTR value",
-		/*  69 */
-		"attribute ::= SPACE id",
-		/*  70 */
-		"attribute ::= SPACE expr",
-		/*  71 */
-		"attribute ::= SPACE value",
-		/*  72 */
-		"attribute ::= SPACE INTEGER EQUAL expr",
-		/*  73 */
-		"statements ::= statement",
-		/*  74 */
-		"statements ::= statements COMMA statement",
-		/*  75 */
-		"statement ::= DOLLAR varvar EQUAL expr",
-		/*  76 */
-		"statement ::= varindexed EQUAL expr",
-		/*  77 */
-		"statement ::= OPENP statement CLOSEP",
-		/*  78 */
-		"expr ::= value",
-		/*  79 */
-		"expr ::= ternary",
-		/*  80 */
-		"expr ::= DOLLAR id COLON id",
-		/*  81 */
-		"expr ::= expr MATH value",
-		/*  82 */
-		"expr ::= expr UNIMATH value",
-		/*  83 */
-		"expr ::= expr ANDSYM value",
-		/*  84 */
-		"expr ::= array",
-		/*  85 */
-		"expr ::= expr modifierlist",
-		/*  86 */
-		"expr ::= expr ifcond expr",
-		/*  87 */
-		"expr ::= expr ISIN array",
-		/*  88 */
-		"expr ::= expr ISIN value",
-		/*  89 */
-		"expr ::= expr lop expr",
-		/*  90 */
-		"expr ::= expr ISDIVBY expr",
-		/*  91 */
-		"expr ::= expr ISNOTDIVBY expr",
-		/*  92 */
-		"expr ::= expr ISEVEN",
-		/*  93 */
-		"expr ::= expr ISNOTEVEN",
-		/*  94 */
-		"expr ::= expr ISEVENBY expr",
-		/*  95 */
-		"expr ::= expr ISNOTEVENBY expr",
-		/*  96 */
-		"expr ::= expr ISODD",
-		/*  97 */
-		"expr ::= expr ISNOTODD",
-		/*  98 */
-		"expr ::= expr ISODDBY expr",
-		/*  99 */
-		"expr ::= expr ISNOTODDBY expr",
-		/* 100 */
-		"expr ::= value INSTANCEOF id",
-		/* 101 */
-		"expr ::= value INSTANCEOF value",
-		/* 102 */
-		"ternary ::= OPENP expr CLOSEP QMARK DOLLAR id COLON expr",
-		/* 103 */
-		"ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
-		/* 104 */
-		"value ::= variable",
-		/* 105 */
-		"value ::= UNIMATH value",
-		/* 106 */
-		"value ::= NOT value",
-		/* 107 */
-		"value ::= TYPECAST value",
-		/* 108 */
-		"value ::= variable INCDEC",
-		/* 109 */
-		"value ::= HEX",
-		/* 110 */
-		"value ::= INTEGER",
-		/* 111 */
-		"value ::= INTEGER DOT INTEGER",
-		/* 112 */
-		"value ::= INTEGER DOT",
-		/* 113 */
-		"value ::= DOT INTEGER",
-		/* 114 */
-		"value ::= id",
-		/* 115 */
-		"value ::= function",
-		/* 116 */
-		"value ::= OPENP expr CLOSEP",
-		/* 117 */
-		"value ::= SINGLEQUOTESTRING",
-		/* 118 */
-		"value ::= doublequoted_with_quotes",
-		/* 119 */
-		"value ::= id DOUBLECOLON static_class_access",
-		/* 120 */
-		"value ::= varindexed DOUBLECOLON static_class_access",
-		/* 121 */
-		"value ::= smartytag RDEL",
-		/* 122 */
-		"value ::= value modifierlist",
-		/* 123 */
-		"variable ::= varindexed",
-		/* 124 */
-		"variable ::= DOLLAR varvar AT id",
-		/* 125 */
-		"variable ::= object",
-		/* 126 */
-		"variable ::= HATCH id HATCH",
-		/* 127 */
-		"variable ::= HATCH id HATCH arrayindex",
-		/* 128 */
-		"variable ::= HATCH variable HATCH",
-		/* 129 */
-		"variable ::= HATCH variable HATCH arrayindex",
-		/* 130 */
-		"varindexed ::= DOLLAR varvar arrayindex",
-		/* 131 */
-		"arrayindex ::= arrayindex indexdef",
-		/* 132 */
-		"arrayindex ::=",
-		/* 133 */
-		"indexdef ::= DOT DOLLAR varvar",
-		/* 134 */
-		"indexdef ::= DOT DOLLAR varvar AT id",
-		/* 135 */
-		"indexdef ::= DOT id",
-		/* 136 */
-		"indexdef ::= DOT INTEGER",
-		/* 137 */
-		"indexdef ::= DOT LDEL expr RDEL",
-		/* 138 */
-		"indexdef ::= OPENB id CLOSEB",
-		/* 139 */
-		"indexdef ::= OPENB id DOT id CLOSEB",
-		/* 140 */
-		"indexdef ::= OPENB expr CLOSEB",
-		/* 141 */
-		"indexdef ::= OPENB CLOSEB",
-		/* 142 */
-		"varvar ::= varvarele",
-		/* 143 */
-		"varvar ::= varvar varvarele",
-		/* 144 */
-		"varvarele ::= id",
-		/* 145 */
-		"varvarele ::= LDEL expr RDEL",
-		/* 146 */
-		"object ::= varindexed objectchain",
-		/* 147 */
-		"objectchain ::= objectelement",
-		/* 148 */
-		"objectchain ::= objectchain objectelement",
-		/* 149 */
-		"objectelement ::= PTR id arrayindex",
-		/* 150 */
-		"objectelement ::= PTR DOLLAR varvar arrayindex",
-		/* 151 */
-		"objectelement ::= PTR LDEL expr RDEL arrayindex",
-		/* 152 */
-		"objectelement ::= PTR id LDEL expr RDEL arrayindex",
-		/* 153 */
-		"objectelement ::= PTR method",
-		/* 154 */
-		"function ::= id OPENP params CLOSEP",
-		/* 155 */
-		"method ::= id OPENP params CLOSEP",
-		/* 156 */
-		"method ::= DOLLAR id OPENP params CLOSEP",
-		/* 157 */
-		"params ::= params COMMA expr",
-		/* 158 */
-		"params ::= expr",
-		/* 159 */
-		"params ::=",
-		/* 160 */
-		"modifierlist ::= modifierlist modifier modparameters",
-		/* 161 */
-		"modifierlist ::= modifier modparameters",
-		/* 162 */
-		"modifier ::= VERT AT id",
-		/* 163 */
-		"modifier ::= VERT id",
-		/* 164 */
-		"modparameters ::= modparameters modparameter",
-		/* 165 */
-		"modparameters ::=",
-		/* 166 */
-		"modparameter ::= COLON value",
-		/* 167 */
-		"modparameter ::= COLON array",
-		/* 168 */
-		"static_class_access ::= method",
-		/* 169 */
-		"static_class_access ::= method objectchain",
-		/* 170 */
-		"static_class_access ::= id",
-		/* 171 */
-		"static_class_access ::= DOLLAR id arrayindex",
-		/* 172 */
-		"static_class_access ::= DOLLAR id arrayindex objectchain",
-		/* 173 */
-		"ifcond ::= EQUALS",
-		/* 174 */
-		"ifcond ::= NOTEQUALS",
-		/* 175 */
-		"ifcond ::= GREATERTHAN",
-		/* 176 */
-		"ifcond ::= LESSTHAN",
-		/* 177 */
-		"ifcond ::= GREATEREQUAL",
-		/* 178 */
-		"ifcond ::= LESSEQUAL",
-		/* 179 */
-		"ifcond ::= IDENTITY",
-		/* 180 */
-		"ifcond ::= NONEIDENTITY",
-		/* 181 */
-		"ifcond ::= MOD",
-		/* 182 */
-		"lop ::= LAND",
-		/* 183 */
-		"lop ::= LOR",
-		/* 184 */
-		"lop ::= LXOR",
-		/* 185 */
-		"array ::= OPENB arrayelements CLOSEB",
-		/* 186 */
-		"arrayelements ::= arrayelement",
-		/* 187 */
-		"arrayelements ::= arrayelements COMMA arrayelement",
-		/* 188 */
-		"arrayelements ::=",
-		/* 189 */
-		"arrayelement ::= value APTR expr",
-		/* 190 */
-		"arrayelement ::= id APTR expr",
-		/* 191 */
-		"arrayelement ::= expr",
-		/* 192 */
-		"doublequoted_with_quotes ::= QUOTE QUOTE",
-		/* 193 */
-		"doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
-		/* 194 */
-		"doublequoted ::= doublequoted doublequotedcontent",
-		/* 195 */
-		"doublequoted ::= doublequotedcontent",
-		/* 196 */
-		"doublequotedcontent ::= BACKTICK variable BACKTICK",
-		/* 197 */
-		"doublequotedcontent ::= BACKTICK expr BACKTICK",
-		/* 198 */
-		"doublequotedcontent ::= DOLLARID",
-		/* 199 */
-		"doublequotedcontent ::= LDEL variable RDEL",
-		/* 200 */
-		"doublequotedcontent ::= LDEL expr RDEL",
-		/* 201 */
-		"doublequotedcontent ::= smartytag RDEL",
-		/* 202 */
-		"doublequotedcontent ::= TEXT",
-		/* 203 */
-		"optspace ::= SPACE",
-		/* 204 */
-		"optspace ::=",
-	);
-
-	public function tokenName($tokenType)
-	{
-		if ($tokenType === 0) {
-			return 'End of Input';
-		}
-		if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-			return $this->yyTokenName[$tokenType];
-		} else {
-			return "Unknown";
-		}
-	}
-
-	public static function yy_destructor($yymajor, $yypminor)
-	{
-		switch ($yymajor) {
-			default:
-				break; /* If no destructor action specified: do nothing */
-		}
-	}
-
-	public function yy_pop_parser_stack()
-	{
-		if (!count($this->yystack)) {
-			return;
-		}
-		$yytos = array_pop($this->yystack);
-		if ($this->yyTraceFILE && $this->yyidx >= 0) {
-			fwrite($this->yyTraceFILE,
-				$this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-				"\n"
-			);
-		}
-		$yymajor = $yytos->major;
-		self::yy_destructor($yymajor, $yytos->minor);
-		$this->yyidx--;
-
-		return $yymajor;
-	}
-
-	public function __destruct()
-	{
-		while ($this->yystack !== Array()) {
-			$this->yy_pop_parser_stack();
-		}
-		if (is_resource($this->yyTraceFILE)) {
-			fclose($this->yyTraceFILE);
-		}
-	}
-
-	public function yy_get_expected_tokens($token)
-	{
-		$state = $this->yystack[$this->yyidx]->stateno;
-		$expected = self::$yyExpectedTokens[$state];
-		if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-			return $expected;
-		}
-		$stack = $this->yystack;
-		$yyidx = $this->yyidx;
-		do {
-			$yyact = $this->yy_find_shift_action($token);
-			if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-				// reduce action
-				$done = 0;
-				do {
-					if ($done++ == 100) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						// too much recursion prevents proper detection
-						// so give up
-						return array_unique($expected);
-					}
-					$yyruleno = $yyact - self::YYNSTATE;
-					$this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-					$nextstate = $this->yy_find_reduce_action(
-						$this->yystack[$this->yyidx]->stateno,
-						self::$yyRuleInfo[$yyruleno]['lhs']
-					);
-					if (isset(self::$yyExpectedTokens[$nextstate])) {
-						$expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-						if (in_array($token,
-							self::$yyExpectedTokens[$nextstate], true
-						)
-						) {
-							$this->yyidx = $yyidx;
-							$this->yystack = $stack;
-
-							return array_unique($expected);
-						}
-					}
-					if ($nextstate < self::YYNSTATE) {
-						// we need to shift a non-terminal
-						$this->yyidx++;
-						$x = new TP_yyStackEntry;
-						$x->stateno = $nextstate;
-						$x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-						$this->yystack[$this->yyidx] = $x;
-						continue 2;
-					} elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						// the last token was just ignored, we can't accept
-						// by ignoring input, this is in essence ignoring a
-						// syntax error!
-						return array_unique($expected);
-					} elseif ($nextstate === self::YY_NO_ACTION) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-
-						// input accepted, but not shifted (I guess)
-						return $expected;
-					} else {
-						$yyact = $nextstate;
-					}
-				} while (true);
-			}
-			break;
-		} while (true);
-		$this->yyidx = $yyidx;
-		$this->yystack = $stack;
-
-		return array_unique($expected);
-	}
-
-	public function yy_is_expected_token($token)
-	{
-		if ($token === 0) {
-			return true; // 0 is not part of this
-		}
-		$state = $this->yystack[$this->yyidx]->stateno;
-		if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-			return true;
-		}
-		$stack = $this->yystack;
-		$yyidx = $this->yyidx;
-		do {
-			$yyact = $this->yy_find_shift_action($token);
-			if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-				// reduce action
-				$done = 0;
-				do {
-					if ($done++ == 100) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						// too much recursion prevents proper detection
-						// so give up
-						return true;
-					}
-					$yyruleno = $yyact - self::YYNSTATE;
-					$this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-					$nextstate = $this->yy_find_reduce_action(
-						$this->yystack[$this->yyidx]->stateno,
-						self::$yyRuleInfo[$yyruleno]['lhs']
-					);
-					if (isset(self::$yyExpectedTokens[$nextstate]) &&
-						in_array($token, self::$yyExpectedTokens[$nextstate], true)
-					) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-
-						return true;
-					}
-					if ($nextstate < self::YYNSTATE) {
-						// we need to shift a non-terminal
-						$this->yyidx++;
-						$x = new TP_yyStackEntry;
-						$x->stateno = $nextstate;
-						$x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-						$this->yystack[$this->yyidx] = $x;
-						continue 2;
-					} elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-						if (!$token) {
-							// end of input: this is valid
-							return true;
-						}
-						// the last token was just ignored, we can't accept
-						// by ignoring input, this is in essence ignoring a
-						// syntax error!
-						return false;
-					} elseif ($nextstate === self::YY_NO_ACTION) {
-						$this->yyidx = $yyidx;
-						$this->yystack = $stack;
-
-						// input accepted, but not shifted (I guess)
-						return true;
-					} else {
-						$yyact = $nextstate;
-					}
-				} while (true);
-			}
-			break;
-		} while (true);
-		$this->yyidx = $yyidx;
-		$this->yystack = $stack;
-
-		return true;
-	}
-
-	public function yy_find_shift_action($iLookAhead)
-	{
-		$stateno = $this->yystack[$this->yyidx]->stateno;
-
-		/* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-		if (!isset(self::$yy_shift_ofst[$stateno])) {
-			// no shift actions
-			return self::$yy_default[$stateno];
-		}
-		$i = self::$yy_shift_ofst[$stateno];
-		if ($i === self::YY_SHIFT_USE_DFLT) {
-			return self::$yy_default[$stateno];
-		}
-		if ($iLookAhead == self::YYNOCODE) {
-			return self::YY_NO_ACTION;
-		}
-		$i += $iLookAhead;
-		if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-			self::$yy_lookahead[$i] != $iLookAhead
-		) {
-			if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-				&& ($iFallback = self::$yyFallback[$iLookAhead]) != 0
-			) {
-				if ($this->yyTraceFILE) {
-					fwrite($this->yyTraceFILE, $this->yyTracePrompt . "FALLBACK " .
-						$this->yyTokenName[$iLookAhead] . " => " .
-						$this->yyTokenName[$iFallback] . "\n"
-					);
-				}
-
-				return $this->yy_find_shift_action($iFallback);
-			}
-
-			return self::$yy_default[$stateno];
-		} else {
-			return self::$yy_action[$i];
-		}
-	}
-
-	public function yy_find_reduce_action($stateno, $iLookAhead)
-	{
-		/* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-		if (!isset(self::$yy_reduce_ofst[$stateno])) {
-			return self::$yy_default[$stateno];
-		}
-		$i = self::$yy_reduce_ofst[$stateno];
-		if ($i == self::YY_REDUCE_USE_DFLT) {
-			return self::$yy_default[$stateno];
-		}
-		if ($iLookAhead == self::YYNOCODE) {
-			return self::YY_NO_ACTION;
-		}
-		$i += $iLookAhead;
-		if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-			self::$yy_lookahead[$i] != $iLookAhead
-		) {
-			return self::$yy_default[$stateno];
-		} else {
-			return self::$yy_action[$i];
-		}
-	}
-
-	public function yy_shift($yyNewState, $yyMajor, $yypMinor)
-	{
-		$this->yyidx++;
-		if ($this->yyidx >= self::YYSTACKDEPTH) {
-			$this->yyidx--;
-			if ($this->yyTraceFILE) {
-				fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
-			}
-			while ($this->yyidx >= 0) {
-				$this->yy_pop_parser_stack();
-			}
-			#line 85 "smarty_internal_templateparser.y"
-
-			$this->internalError = true;
-			$this->compiler->trigger_template_error("Stack overflow in template parser");
-
-			#line 1707 "smarty_internal_templateparser.php"
-
-			return;
-		}
-		$yytos = new TP_yyStackEntry;
-		$yytos->stateno = $yyNewState;
-		$yytos->major = $yyMajor;
-		$yytos->minor = $yypMinor;
-		array_push($this->yystack, $yytos);
-		if ($this->yyTraceFILE && $this->yyidx > 0) {
-			fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
-				$yyNewState
-			);
-			fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
-			for ($i = 1; $i <= $this->yyidx; $i++) {
-				fprintf($this->yyTraceFILE, " %s",
-					$this->yyTokenName[$this->yystack[$i]->major]
-				);
-			}
-			fwrite($this->yyTraceFILE, "\n");
-		}
-	}
-
-	public static $yyRuleInfo = array(
-		array('lhs' => 83, 'rhs' => 1),
-		array('lhs' => 84, 'rhs' => 1),
-		array('lhs' => 84, 'rhs' => 2),
-		array('lhs' => 84, 'rhs' => 0),
-		array('lhs' => 85, 'rhs' => 2),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 85, 'rhs' => 1),
-		array('lhs' => 87, 'rhs' => 2),
-		array('lhs' => 87, 'rhs' => 3),
-		array('lhs' => 88, 'rhs' => 2),
-		array('lhs' => 88, 'rhs' => 0),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 89, 'rhs' => 1),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 4),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 4),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 5),
-		array('lhs' => 86, 'rhs' => 5),
-		array('lhs' => 86, 'rhs' => 6),
-		array('lhs' => 86, 'rhs' => 5),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 5),
-		array('lhs' => 86, 'rhs' => 4),
-		array('lhs' => 86, 'rhs' => 6),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 11),
-		array('lhs' => 99, 'rhs' => 2),
-		array('lhs' => 99, 'rhs' => 1),
-		array('lhs' => 86, 'rhs' => 5),
-		array('lhs' => 86, 'rhs' => 7),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 7),
-		array('lhs' => 86, 'rhs' => 10),
-		array('lhs' => 86, 'rhs' => 7),
-		array('lhs' => 86, 'rhs' => 10),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 4),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 2),
-		array('lhs' => 86, 'rhs' => 3),
-		array('lhs' => 86, 'rhs' => 4),
-		array('lhs' => 86, 'rhs' => 5),
-		array('lhs' => 92, 'rhs' => 2),
-		array('lhs' => 92, 'rhs' => 1),
-		array('lhs' => 92, 'rhs' => 0),
-		array('lhs' => 101, 'rhs' => 4),
-		array('lhs' => 101, 'rhs' => 2),
-		array('lhs' => 101, 'rhs' => 2),
-		array('lhs' => 101, 'rhs' => 2),
-		array('lhs' => 101, 'rhs' => 2),
-		array('lhs' => 101, 'rhs' => 2),
-		array('lhs' => 101, 'rhs' => 4),
-		array('lhs' => 96, 'rhs' => 1),
-		array('lhs' => 96, 'rhs' => 3),
-		array('lhs' => 95, 'rhs' => 4),
-		array('lhs' => 95, 'rhs' => 3),
-		array('lhs' => 95, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 1),
-		array('lhs' => 93, 'rhs' => 1),
-		array('lhs' => 93, 'rhs' => 4),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 1),
-		array('lhs' => 93, 'rhs' => 2),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 2),
-		array('lhs' => 93, 'rhs' => 2),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 2),
-		array('lhs' => 93, 'rhs' => 2),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 93, 'rhs' => 3),
-		array('lhs' => 102, 'rhs' => 8),
-		array('lhs' => 102, 'rhs' => 7),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 3),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 3),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 1),
-		array('lhs' => 90, 'rhs' => 3),
-		array('lhs' => 90, 'rhs' => 3),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 90, 'rhs' => 2),
-		array('lhs' => 106, 'rhs' => 1),
-		array('lhs' => 106, 'rhs' => 4),
-		array('lhs' => 106, 'rhs' => 1),
-		array('lhs' => 106, 'rhs' => 3),
-		array('lhs' => 106, 'rhs' => 4),
-		array('lhs' => 106, 'rhs' => 3),
-		array('lhs' => 106, 'rhs' => 4),
-		array('lhs' => 94, 'rhs' => 3),
-		array('lhs' => 111, 'rhs' => 2),
-		array('lhs' => 111, 'rhs' => 0),
-		array('lhs' => 112, 'rhs' => 3),
-		array('lhs' => 112, 'rhs' => 5),
-		array('lhs' => 112, 'rhs' => 2),
-		array('lhs' => 112, 'rhs' => 2),
-		array('lhs' => 112, 'rhs' => 4),
-		array('lhs' => 112, 'rhs' => 3),
-		array('lhs' => 112, 'rhs' => 5),
-		array('lhs' => 112, 'rhs' => 3),
-		array('lhs' => 112, 'rhs' => 2),
-		array('lhs' => 98, 'rhs' => 1),
-		array('lhs' => 98, 'rhs' => 2),
-		array('lhs' => 113, 'rhs' => 1),
-		array('lhs' => 113, 'rhs' => 3),
-		array('lhs' => 110, 'rhs' => 2),
-		array('lhs' => 114, 'rhs' => 1),
-		array('lhs' => 114, 'rhs' => 2),
-		array('lhs' => 115, 'rhs' => 3),
-		array('lhs' => 115, 'rhs' => 4),
-		array('lhs' => 115, 'rhs' => 5),
-		array('lhs' => 115, 'rhs' => 6),
-		array('lhs' => 115, 'rhs' => 2),
-		array('lhs' => 107, 'rhs' => 4),
-		array('lhs' => 116, 'rhs' => 4),
-		array('lhs' => 116, 'rhs' => 5),
-		array('lhs' => 117, 'rhs' => 3),
-		array('lhs' => 117, 'rhs' => 1),
-		array('lhs' => 117, 'rhs' => 0),
-		array('lhs' => 91, 'rhs' => 3),
-		array('lhs' => 91, 'rhs' => 2),
-		array('lhs' => 118, 'rhs' => 3),
-		array('lhs' => 118, 'rhs' => 2),
-		array('lhs' => 100, 'rhs' => 2),
-		array('lhs' => 100, 'rhs' => 0),
-		array('lhs' => 119, 'rhs' => 2),
-		array('lhs' => 119, 'rhs' => 2),
-		array('lhs' => 109, 'rhs' => 1),
-		array('lhs' => 109, 'rhs' => 2),
-		array('lhs' => 109, 'rhs' => 1),
-		array('lhs' => 109, 'rhs' => 3),
-		array('lhs' => 109, 'rhs' => 4),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 104, 'rhs' => 1),
-		array('lhs' => 105, 'rhs' => 1),
-		array('lhs' => 105, 'rhs' => 1),
-		array('lhs' => 105, 'rhs' => 1),
-		array('lhs' => 103, 'rhs' => 3),
-		array('lhs' => 120, 'rhs' => 1),
-		array('lhs' => 120, 'rhs' => 3),
-		array('lhs' => 120, 'rhs' => 0),
-		array('lhs' => 121, 'rhs' => 3),
-		array('lhs' => 121, 'rhs' => 3),
-		array('lhs' => 121, 'rhs' => 1),
-		array('lhs' => 108, 'rhs' => 2),
-		array('lhs' => 108, 'rhs' => 3),
-		array('lhs' => 122, 'rhs' => 2),
-		array('lhs' => 122, 'rhs' => 1),
-		array('lhs' => 123, 'rhs' => 3),
-		array('lhs' => 123, 'rhs' => 3),
-		array('lhs' => 123, 'rhs' => 1),
-		array('lhs' => 123, 'rhs' => 3),
-		array('lhs' => 123, 'rhs' => 3),
-		array('lhs' => 123, 'rhs' => 2),
-		array('lhs' => 123, 'rhs' => 1),
-		array('lhs' => 97, 'rhs' => 1),
-		array('lhs' => 97, 'rhs' => 0),
-	);
-
-	public static $yyReduceMap = array(
-		0   => 0,
-		1   => 1,
-		2   => 1,
-		4   => 4,
-		5   => 5,
-		6   => 6,
-		7   => 7,
-		8   => 8,
-		9   => 9,
-		10  => 10,
-		11  => 11,
-		12  => 12,
-		13  => 13,
-		14  => 14,
-		15  => 15,
-		16  => 16,
-		17  => 17,
-		20  => 17,
-		204 => 17,
-		18  => 18,
-		77  => 18,
-		19  => 19,
-		105 => 19,
-		107 => 19,
-		108 => 19,
-		131 => 19,
-		169 => 19,
-		21  => 21,
-		22  => 21,
-		48  => 21,
-		70  => 21,
-		71  => 21,
-		78  => 21,
-		79  => 21,
-		84  => 21,
-		104 => 21,
-		109 => 21,
-		110 => 21,
-		115 => 21,
-		117 => 21,
-		118 => 21,
-		125 => 21,
-		142 => 21,
-		168 => 21,
-		170 => 21,
-		186 => 21,
-		191 => 21,
-		203 => 21,
-		23  => 23,
-		24  => 23,
-		25  => 25,
-		26  => 26,
-		27  => 27,
-		28  => 28,
-		29  => 29,
-		30  => 30,
-		32  => 30,
-		31  => 31,
-		33  => 33,
-		34  => 33,
-		35  => 35,
-		36  => 36,
-		37  => 37,
-		38  => 38,
-		39  => 39,
-		40  => 40,
-		41  => 41,
-		42  => 42,
-		43  => 43,
-		45  => 43,
-		44  => 44,
-		46  => 46,
-		47  => 47,
-		49  => 49,
-		50  => 50,
-		51  => 51,
-		52  => 52,
-		54  => 52,
-		53  => 53,
-		55  => 53,
-		56  => 56,
-		57  => 57,
-		58  => 58,
-		59  => 59,
-		60  => 60,
-		61  => 61,
-		62  => 62,
-		63  => 63,
-		64  => 64,
-		73  => 64,
-		158 => 64,
-		162 => 64,
-		166 => 64,
-		167 => 64,
-		65  => 65,
-		159 => 65,
-		165 => 65,
-		66  => 66,
-		67  => 67,
-		68  => 67,
-		69  => 69,
-		72  => 72,
-		74  => 74,
-		75  => 75,
-		76  => 75,
-		80  => 80,
-		81  => 81,
-		82  => 81,
-		83  => 81,
-		85  => 85,
-		122 => 85,
-		86  => 86,
-		89  => 86,
-		100 => 86,
-		87  => 87,
-		88  => 88,
-		90  => 90,
-		91  => 91,
-		92  => 92,
-		97  => 92,
-		93  => 93,
-		96  => 93,
-		94  => 94,
-		99  => 94,
-		95  => 95,
-		98  => 95,
-		101 => 101,
-		102 => 102,
-		103 => 103,
-		106 => 106,
-		111 => 111,
-		112 => 112,
-		113 => 113,
-		114 => 114,
-		116 => 116,
-		119 => 119,
-		120 => 120,
-		121 => 121,
-		123 => 123,
-		124 => 124,
-		126 => 126,
-		127 => 127,
-		128 => 128,
-		129 => 129,
-		130 => 130,
-		132 => 132,
-		188 => 132,
-		133 => 133,
-		134 => 134,
-		135 => 135,
-		136 => 136,
-		137 => 137,
-		140 => 137,
-		138 => 138,
-		139 => 139,
-		141 => 141,
-		143 => 143,
-		144 => 144,
-		145 => 145,
-		146 => 146,
-		147 => 147,
-		148 => 148,
-		149 => 149,
-		150 => 150,
-		151 => 151,
-		152 => 152,
-		153 => 153,
-		154 => 154,
-		155 => 155,
-		156 => 156,
-		157 => 157,
-		160 => 160,
-		161 => 161,
-		163 => 163,
-		164 => 164,
-		171 => 171,
-		172 => 172,
-		173 => 173,
-		174 => 174,
-		175 => 175,
-		176 => 176,
-		177 => 177,
-		178 => 178,
-		179 => 179,
-		180 => 180,
-		181 => 181,
-		182 => 182,
-		183 => 183,
-		184 => 184,
-		185 => 185,
-		187 => 187,
-		189 => 189,
-		190 => 190,
-		192 => 192,
-		193 => 193,
-		194 => 194,
-		195 => 195,
-		196 => 196,
-		197 => 196,
-		199 => 196,
-		198 => 198,
-		200 => 200,
-		201 => 201,
-		202 => 202,
-	);
-
-	#line 96 "smarty_internal_templateparser.y"
-	function yy_r0()
-	{
-		$this->_retvalue = $this->root_buffer->to_smarty_php();
-	}
-	#line 2146 "smarty_internal_templateparser.php"
-	#line 104 "smarty_internal_templateparser.y"
-	function yy_r1()
-	{
-		if ($this->yystack[$this->yyidx + 0]->minor != null) {
-			$this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-		}
-	}
-	#line 2153 "smarty_internal_templateparser.php"
-	#line 124 "smarty_internal_templateparser.y"
-	function yy_r4()
-	{
-		if ($this->compiler->has_code) {
-			$tmp = '';
-			foreach ($this->compiler->prefix_code as $code) {
-				$tmp .= $code;
-			}
-			$this->compiler->prefix_code = array();
-			$this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp . $this->yystack[$this->yyidx + -1]->minor, true));
-		} else {
-			$this->_retvalue = null;
-		}
-		$this->compiler->has_variable_string = false;
-		$this->block_nesting_level = count($this->compiler->_tag_stack);
-	}
-	#line 2165 "smarty_internal_templateparser.php"
-	#line 136 "smarty_internal_templateparser.y"
-	function yy_r5()
-	{
-		$this->_retvalue = null;
-	}
-	#line 2170 "smarty_internal_templateparser.php"
-	#line 141 "smarty_internal_templateparser.y"
-	function yy_r6()
-	{
-		$this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2175 "smarty_internal_templateparser.php"
-	#line 146 "smarty_internal_templateparser.y"
-	function yy_r7()
-	{
-		if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-			$this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-		} elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-			$this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-		} elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-			if (!($this->smarty instanceof SmartyBC)) {
-				$this->compiler->trigger_template_error(self::Err3);
-			}
-			$this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
-		} elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-			$this->_retvalue = null;
-		}
-	}
-	#line 2191 "smarty_internal_templateparser.php"
-	#line 162 "smarty_internal_templateparser.y"
-	function yy_r8()
-	{
-		if ($this->is_xml) {
-			$this->compiler->tag_nocache = true;
-			$this->is_xml = false;
-			$save = $this->template->has_nocache_code;
-			$this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>\n", $this->compiler, true));
-			$this->template->has_nocache_code = $save;
-		} elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-			$this->_retvalue = new _smarty_text($this, '?<?php ?>>');
-		} elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-			$this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
-		} elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-			$this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
-		} elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-			$this->_retvalue = null;
-		}
-	}
-	#line 2210 "smarty_internal_templateparser.php"
-	#line 181 "smarty_internal_templateparser.y"
-	function yy_r9()
-	{
-		if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-			$this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-		} elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-			$this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-		} elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-			if ($this->asp_tags) {
-				if (!($this->smarty instanceof SmartyBC)) {
-					$this->compiler->trigger_template_error(self::Err3);
-				}
-				$this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
-			} else {
-				$this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-			}
-		} elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-			if ($this->asp_tags) {
-				$this->_retvalue = null;
-			} else {
-				$this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-			}
-		}
-	}
-	#line 2234 "smarty_internal_templateparser.php"
-	#line 205 "smarty_internal_templateparser.y"
-	function yy_r10()
-	{
-		if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-			$this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-		} elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-			$this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
-		} elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-			if ($this->asp_tags) {
-				$this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
-			} else {
-				$this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-			}
-		} elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-			if ($this->asp_tags) {
-				$this->_retvalue = null;
-			} else {
-				$this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-			}
-		}
-	}
-	#line 2255 "smarty_internal_templateparser.php"
-	#line 225 "smarty_internal_templateparser.y"
-	function yy_r11()
-	{
-		if ($this->strip) {
-			$this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));
-		} else {
-			$this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-		}
-	}
-	#line 2264 "smarty_internal_templateparser.php"
-	#line 234 "smarty_internal_templateparser.y"
-	function yy_r12()
-	{
-		$this->compiler->tag_nocache = true;
-		$this->is_xml = true;
-		$save = $this->template->has_nocache_code;
-		$this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
-		$this->template->has_nocache_code = $save;
-	}
-	#line 2273 "smarty_internal_templateparser.php"
-	#line 243 "smarty_internal_templateparser.y"
-	function yy_r13()
-	{
-		if ($this->strip) {
-			$this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
-		} else {
-			$this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-		}
-	}
-	#line 2282 "smarty_internal_templateparser.php"
-	#line 252 "smarty_internal_templateparser.y"
-	function yy_r14()
-	{
-		$this->strip = true;
-	}
-	#line 2287 "smarty_internal_templateparser.php"
-	#line 256 "smarty_internal_templateparser.y"
-	function yy_r15()
-	{
-		$this->strip = false;
-	}
-	#line 2292 "smarty_internal_templateparser.php"
-	#line 260 "smarty_internal_templateparser.y"
-	function yy_r16()
-	{
-		if ($this->strip) {
-			SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
-		} else {
-			SMARTY_INTERNAL_COMPILE_BLOCK::blockSource($this->compiler, $this->yystack[$this->yyidx + 0]->minor);
-		}
-	}
-	#line 2301 "smarty_internal_templateparser.php"
-	#line 269 "smarty_internal_templateparser.y"
-	function yy_r17()
-	{
-		$this->_retvalue = '';
-	}
-	#line 2306 "smarty_internal_templateparser.php"
-	#line 273 "smarty_internal_templateparser.y"
-	function yy_r18()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-	}
-	#line 2311 "smarty_internal_templateparser.php"
-	#line 277 "smarty_internal_templateparser.y"
-	function yy_r19()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2316 "smarty_internal_templateparser.php"
-	#line 285 "smarty_internal_templateparser.y"
-	function yy_r21()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2321 "smarty_internal_templateparser.php"
-	#line 293 "smarty_internal_templateparser.y"
-	function yy_r23()
-	{
-		$this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2326 "smarty_internal_templateparser.php"
-	#line 301 "smarty_internal_templateparser.y"
-	function yy_r25()
-	{
-		$this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2331 "smarty_internal_templateparser.php"
-	#line 305 "smarty_internal_templateparser.y"
-	function yy_r26()
-	{
-		$this->_retvalue = '<<?php ?>%';
-	}
-	#line 2336 "smarty_internal_templateparser.php"
-	#line 309 "smarty_internal_templateparser.y"
-	function yy_r27()
-	{
-		$this->_retvalue = '%<?php ?>>';
-	}
-	#line 2341 "smarty_internal_templateparser.php"
-	#line 318 "smarty_internal_templateparser.y"
-	function yy_r28()
-	{
-		$this->_retvalue = $this->compiler->compileTag('private_print_expression', array(), array('value' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2346 "smarty_internal_templateparser.php"
-	#line 322 "smarty_internal_templateparser.y"
-	function yy_r29()
-	{
-		$this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + -2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + -1]->minor));
-	}
-	#line 2351 "smarty_internal_templateparser.php"
-	#line 326 "smarty_internal_templateparser.y"
-	function yy_r30()
-	{
-		$this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + -1]->minor));
-	}
-	#line 2356 "smarty_internal_templateparser.php"
-	#line 330 "smarty_internal_templateparser.y"
-	function yy_r31()
-	{
-		$this->_retvalue = $this->compiler->compileTag('private_print_expression', $this->yystack[$this->yyidx + 0]->minor, array('value' => $this->yystack[$this->yyidx + -2]->minor, 'modifierlist' => $this->yystack[$this->yyidx + -1]->minor));
-	}
-	#line 2361 "smarty_internal_templateparser.php"
-	#line 343 "smarty_internal_templateparser.y"
-	function yy_r33()
-	{
-		$this->_retvalue = $this->compiler->compileTag('assign', array(array('value' => $this->yystack[$this->yyidx + 0]->minor), array('var' => "'" . $this->yystack[$this->yyidx + -2]->minor . "'")));
-	}
-	#line 2366 "smarty_internal_templateparser.php"
-	#line 351 "smarty_internal_templateparser.y"
-	function yy_r35()
-	{
-		$this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + -1]->minor), array('var' => "'" . $this->yystack[$this->yyidx + -3]->minor . "'")), $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2371 "smarty_internal_templateparser.php"
-	#line 355 "smarty_internal_templateparser.y"
-	function yy_r36()
-	{
-		$this->_retvalue = $this->compiler->compileTag('assign', array_merge(array(array('value' => $this->yystack[$this->yyidx + -1]->minor), array('var' => $this->yystack[$this->yyidx + -3]->minor['var'])), $this->yystack[$this->yyidx + 0]->minor), array('smarty_internal_index' => $this->yystack[$this->yyidx + -3]->minor['smarty_internal_index']));
-	}
-	#line 2376 "smarty_internal_templateparser.php"
-	#line 360 "smarty_internal_templateparser.y"
-	function yy_r37()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2381 "smarty_internal_templateparser.php"
-	#line 364 "smarty_internal_templateparser.y"
-	function yy_r38()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor, array());
-	}
-	#line 2386 "smarty_internal_templateparser.php"
-	#line 369 "smarty_internal_templateparser.y"
-	function yy_r39()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + -1]->minor));
-	}
-	#line 2391 "smarty_internal_templateparser.php"
-	#line 374 "smarty_internal_templateparser.y"
-	function yy_r40()
-	{
-		$this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor) . '<?php echo ';
-		$this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + -1]->minor, 'value' => 'ob_get_clean()')) . '?>';
-	}
-	#line 2397 "smarty_internal_templateparser.php"
-	#line 380 "smarty_internal_templateparser.y"
-	function yy_r41()
-	{
-		$this->_retvalue = '<?php ob_start();?>' . $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor, $this->yystack[$this->yyidx + 0]->minor, array('object_method' => $this->yystack[$this->yyidx + -2]->minor)) . '<?php echo ';
-		$this->_retvalue .= $this->compiler->compileTag('private_modifier', array(), array('modifierlist' => $this->yystack[$this->yyidx + -1]->minor, 'value' => 'ob_get_clean()')) . '?>';
-	}
-	#line 2403 "smarty_internal_templateparser.php"
-	#line 386 "smarty_internal_templateparser.y"
-	function yy_r42()
-	{
-		$tag = trim(substr($this->yystack[$this->yyidx + -1]->minor, $this->lex->ldel_length));
-		$this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2409 "smarty_internal_templateparser.php"
-	#line 391 "smarty_internal_templateparser.y"
-	function yy_r43()
-	{
-		$tag = trim(substr($this->yystack[$this->yyidx + -2]->minor, $this->lex->ldel_length));
-		$this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, $this->yystack[$this->yyidx + 0]->minor, array('if condition' => $this->yystack[$this->yyidx + -1]->minor));
-	}
-	#line 2415 "smarty_internal_templateparser.php"
-	#line 396 "smarty_internal_templateparser.y"
-	function yy_r44()
-	{
-		$tag = trim(substr($this->yystack[$this->yyidx + -1]->minor, $this->lex->ldel_length));
-		$this->_retvalue = $this->compiler->compileTag(($tag == 'else if') ? 'elseif' : $tag, array(), array('if condition' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2421 "smarty_internal_templateparser.php"
-	#line 407 "smarty_internal_templateparser.y"
-	function yy_r46()
-	{
-		$this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + -9]->minor), array('ifexp' => $this->yystack[$this->yyidx + -6]->minor), array('var' => $this->yystack[$this->yyidx + -2]->minor), array('step' => $this->yystack[$this->yyidx + -1]->minor))), 1);
-	}
-	#line 2426 "smarty_internal_templateparser.php"
-	#line 411 "smarty_internal_templateparser.y"
-	function yy_r47()
-	{
-		$this->_retvalue = '=' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2431 "smarty_internal_templateparser.php"
-	#line 419 "smarty_internal_templateparser.y"
-	function yy_r49()
-	{
-		$this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + -3]->minor), array('to' => $this->yystack[$this->yyidx + -1]->minor))), 0);
-	}
-	#line 2436 "smarty_internal_templateparser.php"
-	#line 423 "smarty_internal_templateparser.y"
-	function yy_r50()
-	{
-		$this->_retvalue = $this->compiler->compileTag('for', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('start' => $this->yystack[$this->yyidx + -5]->minor), array('to' => $this->yystack[$this->yyidx + -3]->minor), array('step' => $this->yystack[$this->yyidx + -1]->minor))), 0);
-	}
-	#line 2441 "smarty_internal_templateparser.php"
-	#line 428 "smarty_internal_templateparser.y"
-	function yy_r51()
-	{
-		$this->_retvalue = $this->compiler->compileTag('foreach', $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2446 "smarty_internal_templateparser.php"
-	#line 433 "smarty_internal_templateparser.y"
-	function yy_r52()
-	{
-		$this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + -4]->minor), array('item' => $this->yystack[$this->yyidx + -1]->minor))));
-	}
-	#line 2451 "smarty_internal_templateparser.php"
-	#line 437 "smarty_internal_templateparser.y"
-	function yy_r53()
-	{
-		$this->_retvalue = $this->compiler->compileTag('foreach', array_merge($this->yystack[$this->yyidx + 0]->minor, array(array('from' => $this->yystack[$this->yyidx + -7]->minor), array('item' => $this->yystack[$this->yyidx + -1]->minor), array('key' => $this->yystack[$this->yyidx + -4]->minor))));
-	}
-	#line 2456 "smarty_internal_templateparser.php"
-	#line 450 "smarty_internal_templateparser.y"
-	function yy_r56()
-	{
-		$this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array(array_merge(array($this->yystack[$this->yyidx + -1]->minor), $this->yystack[$this->yyidx + 0]->minor))));
-	}
-	#line 2461 "smarty_internal_templateparser.php"
-	#line 454 "smarty_internal_templateparser.y"
-	function yy_r57()
-	{
-		$this->_retvalue = $this->compiler->compileTag('setfilter', array(), array('modifier_list' => array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor), $this->yystack[$this->yyidx + -1]->minor)), $this->yystack[$this->yyidx + 0]->minor)));
-	}
-	#line 2466 "smarty_internal_templateparser.php"
-	#line 459 "smarty_internal_templateparser.y"
-	function yy_r58()
-	{
-		$j = strrpos($this->yystack[$this->yyidx + 0]->minor, '.');
-		if ($this->yystack[$this->yyidx + 0]->minor[$j + 1] == 'c') {
-			// {$smarty.block.child}
-			$this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
-		} else {
-			// {$smarty.block.parent}
-			$this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileParentBlock($this->compiler);
-		}
-	}
-	#line 2478 "smarty_internal_templateparser.php"
-	#line 472 "smarty_internal_templateparser.y"
-	function yy_r59()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor . 'close', array());
-	}
-	#line 2483 "smarty_internal_templateparser.php"
-	#line 476 "smarty_internal_templateparser.y"
-	function yy_r60()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor . 'close', array(), array('modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2488 "smarty_internal_templateparser.php"
-	#line 481 "smarty_internal_templateparser.y"
-	function yy_r61()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2493 "smarty_internal_templateparser.php"
-	#line 485 "smarty_internal_templateparser.y"
-	function yy_r62()
-	{
-		$this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor . 'close', array(), array('object_method' => $this->yystack[$this->yyidx + -1]->minor, 'modifier_list' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2498 "smarty_internal_templateparser.php"
-	#line 493 "smarty_internal_templateparser.y"
-	function yy_r63()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-		$this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2504 "smarty_internal_templateparser.php"
-	#line 499 "smarty_internal_templateparser.y"
-	function yy_r64()
-	{
-		$this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2509 "smarty_internal_templateparser.php"
-	#line 504 "smarty_internal_templateparser.y"
-	function yy_r65()
-	{
-		$this->_retvalue = array();
-	}
-	#line 2514 "smarty_internal_templateparser.php"
-	#line 509 "smarty_internal_templateparser.y"
-	function yy_r66()
-	{
-		if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-			$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor => 'true');
-		} elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-			$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor => 'false');
-		} elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-			$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor => 'null');
-		} else {
-			$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor => "'" . $this->yystack[$this->yyidx + 0]->minor . "'");
-		}
-	}
-	#line 2527 "smarty_internal_templateparser.php"
-	#line 521 "smarty_internal_templateparser.y"
-	function yy_r67()
-	{
-		$this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor, " =\n\r\t") => $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2532 "smarty_internal_templateparser.php"
-	#line 529 "smarty_internal_templateparser.y"
-	function yy_r69()
-	{
-		$this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
-	}
-	#line 2537 "smarty_internal_templateparser.php"
-	#line 541 "smarty_internal_templateparser.y"
-	function yy_r72()
-	{
-		$this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor => $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2542 "smarty_internal_templateparser.php"
-	#line 554 "smarty_internal_templateparser.y"
-	function yy_r74()
-	{
-		$this->yystack[$this->yyidx + -2]->minor[] = $this->yystack[$this->yyidx + 0]->minor;
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
-	}
-	#line 2548 "smarty_internal_templateparser.php"
-	#line 559 "smarty_internal_templateparser.y"
-	function yy_r75()
-	{
-		$this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2553 "smarty_internal_templateparser.php"
-	#line 587 "smarty_internal_templateparser.y"
-	function yy_r80()
-	{
-		$this->_retvalue = '$_smarty_tpl->getStreamVariable(\'' . $this->yystack[$this->yyidx + -2]->minor . '://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
-	}
-	#line 2558 "smarty_internal_templateparser.php"
-	#line 592 "smarty_internal_templateparser.y"
-	function yy_r81()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2563 "smarty_internal_templateparser.php"
-	#line 611 "smarty_internal_templateparser.y"
-	function yy_r85()
-	{
-		$this->_retvalue = $this->compiler->compileTag('private_modifier', array(), array('value' => $this->yystack[$this->yyidx + -1]->minor, 'modifierlist' => $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2568 "smarty_internal_templateparser.php"
-	#line 617 "smarty_internal_templateparser.y"
-	function yy_r86()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2573 "smarty_internal_templateparser.php"
-	#line 621 "smarty_internal_templateparser.y"
-	function yy_r87()
-	{
-		$this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + -2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor . ')';
-	}
-	#line 2578 "smarty_internal_templateparser.php"
-	#line 625 "smarty_internal_templateparser.y"
-	function yy_r88()
-	{
-		$this->_retvalue = 'in_array(' . $this->yystack[$this->yyidx + -2]->minor . ',(array)' . $this->yystack[$this->yyidx + 0]->minor . ')';
-	}
-	#line 2583 "smarty_internal_templateparser.php"
-	#line 633 "smarty_internal_templateparser.y"
-	function yy_r90()
-	{
-		$this->_retvalue = '!(' . $this->yystack[$this->yyidx + -2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-	}
-	#line 2588 "smarty_internal_templateparser.php"
-	#line 637 "smarty_internal_templateparser.y"
-	function yy_r91()
-	{
-		$this->_retvalue = '(' . $this->yystack[$this->yyidx + -2]->minor . ' % ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-	}
-	#line 2593 "smarty_internal_templateparser.php"
-	#line 641 "smarty_internal_templateparser.y"
-	function yy_r92()
-	{
-		$this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + -1]->minor . ')';
-	}
-	#line 2598 "smarty_internal_templateparser.php"
-	#line 645 "smarty_internal_templateparser.y"
-	function yy_r93()
-	{
-		$this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + -1]->minor . ')';
-	}
-	#line 2603 "smarty_internal_templateparser.php"
-	#line 649 "smarty_internal_templateparser.y"
-	function yy_r94()
-	{
-		$this->_retvalue = '!(1 & ' . $this->yystack[$this->yyidx + -2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-	}
-	#line 2608 "smarty_internal_templateparser.php"
-	#line 653 "smarty_internal_templateparser.y"
-	function yy_r95()
-	{
-		$this->_retvalue = '(1 & ' . $this->yystack[$this->yyidx + -2]->minor . ' / ' . $this->yystack[$this->yyidx + 0]->minor . ')';
-	}
-	#line 2613 "smarty_internal_templateparser.php"
-	#line 677 "smarty_internal_templateparser.y"
-	function yy_r101()
-	{
-		self::$prefix_number++;
-		$this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->yystack[$this->yyidx + 0]->minor . ';?>';
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + -1]->minor . '$_tmp' . self::$prefix_number;
-	}
-	#line 2620 "smarty_internal_templateparser.php"
-	#line 686 "smarty_internal_templateparser.y"
-	function yy_r102()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -6]->minor . ' ? ' . $this->compileVariable("'" . $this->yystack[$this->yyidx + -2]->minor . "'") . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2625 "smarty_internal_templateparser.php"
-	#line 690 "smarty_internal_templateparser.y"
-	function yy_r103()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -5]->minor . ' ? ' . $this->yystack[$this->yyidx + -2]->minor . ' : ' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2630 "smarty_internal_templateparser.php"
-	#line 705 "smarty_internal_templateparser.y"
-	function yy_r106()
-	{
-		$this->_retvalue = '!' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2635 "smarty_internal_templateparser.php"
-	#line 726 "smarty_internal_templateparser.y"
-	function yy_r111()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2640 "smarty_internal_templateparser.php"
-	#line 730 "smarty_internal_templateparser.y"
-	function yy_r112()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . '.';
-	}
-	#line 2645 "smarty_internal_templateparser.php"
-	#line 734 "smarty_internal_templateparser.y"
-	function yy_r113()
-	{
-		$this->_retvalue = '.' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2650 "smarty_internal_templateparser.php"
-	#line 739 "smarty_internal_templateparser.y"
-	function yy_r114()
-	{
-		if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-			$this->_retvalue = 'true';
-		} elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-			$this->_retvalue = 'false';
-		} elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-			$this->_retvalue = 'null';
-		} else {
-			$this->_retvalue = "'" . $this->yystack[$this->yyidx + 0]->minor . "'";
-		}
-	}
-	#line 2663 "smarty_internal_templateparser.php"
-	#line 757 "smarty_internal_templateparser.y"
-	function yy_r116()
-	{
-		$this->_retvalue = "(" . $this->yystack[$this->yyidx + -1]->minor . ")";
-	}
-	#line 2668 "smarty_internal_templateparser.php"
-	#line 772 "smarty_internal_templateparser.y"
-	function yy_r119()
-	{
-		if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
-			if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
-				$this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor] . '::' . $this->yystack[$this->yyidx + 0]->minor;
-			} else {
-				$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . '::' . $this->yystack[$this->yyidx + 0]->minor;
-			}
-		} else {
-			$this->compiler->trigger_template_error("static class '" . $this->yystack[$this->yyidx + -2]->minor . "' is undefined or not allowed by security setting");
-		}
-	}
-	#line 2681 "smarty_internal_templateparser.php"
-	#line 784 "smarty_internal_templateparser.y"
-	function yy_r120()
-	{
-		if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') {
-			$this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']) . '::' . $this->yystack[$this->yyidx + 0]->minor;
-		} else {
-			$this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']) . $this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'] . '::' . $this->yystack[$this->yyidx + 0]->minor;
-		}
-	}
-	#line 2690 "smarty_internal_templateparser.php"
-	#line 793 "smarty_internal_templateparser.y"
-	function yy_r121()
-	{
-		self::$prefix_number++;
-		$this->compiler->prefix_code[] = '<?php ob_start();?>' . $this->yystack[$this->yyidx + -1]->minor . '<?php $_tmp' . self::$prefix_number . '=ob_get_clean();?>';
-		$this->_retvalue = '$_tmp' . self::$prefix_number;
-	}
-	#line 2697 "smarty_internal_templateparser.php"
-	#line 808 "smarty_internal_templateparser.y"
-	function yy_r123()
-	{
-		if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
-			$smarty_var = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
-			$this->_retvalue = $smarty_var;
-		} else {
-			// used for array reset,next,prev,end,current
-			$this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-			$this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-			$this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']) . $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-		}
-	}
-	#line 2710 "smarty_internal_templateparser.php"
-	#line 821 "smarty_internal_templateparser.y"
-	function yy_r124()
-	{
-		$this->_retvalue = '$_smarty_tpl->tpl_vars[' . $this->yystack[$this->yyidx + -2]->minor . ']->' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2715 "smarty_internal_templateparser.php"
-	#line 831 "smarty_internal_templateparser.y"
-	function yy_r126()
-	{
-		$this->_retvalue = '$_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + -1]->minor . '\')';
-	}
-	#line 2720 "smarty_internal_templateparser.php"
-	#line 835 "smarty_internal_templateparser.y"
-	function yy_r127()
-	{
-		$this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(\'' . $this->yystack[$this->yyidx + -2]->minor . '\')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' :null)';
-	}
-	#line 2725 "smarty_internal_templateparser.php"
-	#line 839 "smarty_internal_templateparser.y"
-	function yy_r128()
-	{
-		$this->_retvalue = '$_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + -1]->minor . ')';
-	}
-	#line 2730 "smarty_internal_templateparser.php"
-	#line 843 "smarty_internal_templateparser.y"
-	function yy_r129()
-	{
-		$this->_retvalue = '(is_array($tmp = $_smarty_tpl->getConfigVariable(' . $this->yystack[$this->yyidx + -2]->minor . ')) ? $tmp' . $this->yystack[$this->yyidx + 0]->minor . ' : null)';
-	}
-	#line 2735 "smarty_internal_templateparser.php"
-	#line 847 "smarty_internal_templateparser.y"
-	function yy_r130()
-	{
-		$this->_retvalue = array('var' => $this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index' => $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2740 "smarty_internal_templateparser.php"
-	#line 860 "smarty_internal_templateparser.y"
-	function yy_r132()
-	{
-		return;
-	}
-	#line 2745 "smarty_internal_templateparser.php"
-	#line 866 "smarty_internal_templateparser.y"
-	function yy_r133()
-	{
-		$this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + 0]->minor) . ']';
-	}
-	#line 2750 "smarty_internal_templateparser.php"
-	#line 870 "smarty_internal_templateparser.y"
-	function yy_r134()
-	{
-		$this->_retvalue = '[' . $this->compileVariable($this->yystack[$this->yyidx + -2]->minor) . '->' . $this->yystack[$this->yyidx + 0]->minor . ']';
-	}
-	#line 2755 "smarty_internal_templateparser.php"
-	#line 874 "smarty_internal_templateparser.y"
-	function yy_r135()
-	{
-		$this->_retvalue = "['" . $this->yystack[$this->yyidx + 0]->minor . "']";
-	}
-	#line 2760 "smarty_internal_templateparser.php"
-	#line 878 "smarty_internal_templateparser.y"
-	function yy_r136()
-	{
-		$this->_retvalue = "[" . $this->yystack[$this->yyidx + 0]->minor . "]";
-	}
-	#line 2765 "smarty_internal_templateparser.php"
-	#line 882 "smarty_internal_templateparser.y"
-	function yy_r137()
-	{
-		$this->_retvalue = "[" . $this->yystack[$this->yyidx + -1]->minor . "]";
-	}
-	#line 2770 "smarty_internal_templateparser.php"
-	#line 887 "smarty_internal_templateparser.y"
-	function yy_r138()
-	{
-		$this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + -1]->minor . '\'][\'index\']') . ']';
-	}
-	#line 2775 "smarty_internal_templateparser.php"
-	#line 891 "smarty_internal_templateparser.y"
-	function yy_r139()
-	{
-		$this->_retvalue = '[' . $this->compiler->compileTag('private_special_variable', array(), '[\'section\'][\'' . $this->yystack[$this->yyidx + -3]->minor . '\'][\'' . $this->yystack[$this->yyidx + -1]->minor . '\']') . ']';
-	}
-	#line 2780 "smarty_internal_templateparser.php"
-	#line 901 "smarty_internal_templateparser.y"
-	function yy_r141()
-	{
-		$this->_retvalue = '[]';
-	}
-	#line 2785 "smarty_internal_templateparser.php"
-	#line 914 "smarty_internal_templateparser.y"
-	function yy_r143()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . '.' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2790 "smarty_internal_templateparser.php"
-	#line 919 "smarty_internal_templateparser.y"
-	function yy_r144()
-	{
-		$this->_retvalue = '\'' . $this->yystack[$this->yyidx + 0]->minor . '\'';
-	}
-	#line 2795 "smarty_internal_templateparser.php"
-	#line 924 "smarty_internal_templateparser.y"
-	function yy_r145()
-	{
-		$this->_retvalue = '(' . $this->yystack[$this->yyidx + -1]->minor . ')';
-	}
-	#line 2800 "smarty_internal_templateparser.php"
-	#line 931 "smarty_internal_templateparser.y"
-	function yy_r146()
-	{
-		if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') {
-			$this->_retvalue = $this->compiler->compileTag('private_special_variable', array(), $this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']) . $this->yystack[$this->yyidx + 0]->minor;
-		} else {
-			$this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']) . $this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'] . $this->yystack[$this->yyidx + 0]->minor;
-		}
-	}
-	#line 2809 "smarty_internal_templateparser.php"
-	#line 940 "smarty_internal_templateparser.y"
-	function yy_r147()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2814 "smarty_internal_templateparser.php"
-	#line 945 "smarty_internal_templateparser.y"
-	function yy_r148()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2819 "smarty_internal_templateparser.php"
-	#line 950 "smarty_internal_templateparser.y"
-	function yy_r149()
-	{
-		if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor, 0, 1) == '_') {
-			$this->compiler->trigger_template_error(self::Err1);
-		}
-		$this->_retvalue = '->' . $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2827 "smarty_internal_templateparser.php"
-	#line 957 "smarty_internal_templateparser.y"
-	function yy_r150()
-	{
-		if ($this->security) {
-			$this->compiler->trigger_template_error(self::Err2);
-		}
-		$this->_retvalue = '->{' . $this->compileVariable($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor . '}';
-	}
-	#line 2835 "smarty_internal_templateparser.php"
-	#line 964 "smarty_internal_templateparser.y"
-	function yy_r151()
-	{
-		if ($this->security) {
-			$this->compiler->trigger_template_error(self::Err2);
-		}
-		$this->_retvalue = '->{' . $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
-	}
-	#line 2843 "smarty_internal_templateparser.php"
-	#line 971 "smarty_internal_templateparser.y"
-	function yy_r152()
-	{
-		if ($this->security) {
-			$this->compiler->trigger_template_error(self::Err2);
-		}
-		$this->_retvalue = '->{\'' . $this->yystack[$this->yyidx + -4]->minor . '\'.' . $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + 0]->minor . '}';
-	}
-	#line 2851 "smarty_internal_templateparser.php"
-	#line 979 "smarty_internal_templateparser.y"
-	function yy_r153()
-	{
-		$this->_retvalue = '->' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2856 "smarty_internal_templateparser.php"
-	#line 987 "smarty_internal_templateparser.y"
-	function yy_r154()
-	{
-		if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
-			if (strcasecmp($this->yystack[$this->yyidx + -3]->minor, 'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor, 'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor, 'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
-				$func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
-				if ($func_name == 'isset') {
-					if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
-						$this->compiler->trigger_template_error('Illegal number of paramer in "isset()"');
-					}
-					$par = implode(',', $this->yystack[$this->yyidx + -1]->minor);
-					if (strncasecmp($par, '$_smarty_tpl->getConfigVariable', strlen('$_smarty_tpl->getConfigVariable')) === 0) {
-						self::$prefix_number++;
-						$this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . str_replace(')', ', false)', $par) . ';?>';
-						$isset_par = '$_tmp' . self::$prefix_number;
-					} else {
-						$isset_par = str_replace("')->value", "',null,true,false)->value", $par);
-					}
-					$this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(" . $isset_par . ")";
-				} elseif (in_array($func_name, array('empty', 'reset', 'current', 'end', 'prev', 'next'))) {
-					if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
-						$this->compiler->trigger_template_error('Illegal number of paramer in "empty()"');
-					}
-					if ($func_name == 'empty') {
-						$this->_retvalue = $func_name . '(' . str_replace("')->value", "',null,true,false)->value", $this->yystack[$this->yyidx + -1]->minor[0]) . ')';
-					} else {
-						$this->_retvalue = $func_name . '(' . $this->yystack[$this->yyidx + -1]->minor[0] . ')';
-					}
-				} else {
-					$this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + -1]->minor) . ")";
-				}
-			} else {
-				$this->compiler->trigger_template_error("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
-			}
-		}
-	}
-	#line 2892 "smarty_internal_templateparser.php"
-	#line 1025 "smarty_internal_templateparser.y"
-	function yy_r155()
-	{
-		if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor, 0, 1) == '_') {
-			$this->compiler->trigger_template_error(self::Err1);
-		}
-		$this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(" . implode(',', $this->yystack[$this->yyidx + -1]->minor) . ")";
-	}
-	#line 2900 "smarty_internal_templateparser.php"
-	#line 1032 "smarty_internal_templateparser.y"
-	function yy_r156()
-	{
-		if ($this->security) {
-			$this->compiler->trigger_template_error(self::Err2);
-		}
-		self::$prefix_number++;
-		$this->compiler->prefix_code[] = '<?php $_tmp' . self::$prefix_number . '=' . $this->compileVariable("'" . $this->yystack[$this->yyidx + -3]->minor . "'") . ';?>';
-		$this->_retvalue = '$_tmp' . self::$prefix_number . '(' . implode(',', $this->yystack[$this->yyidx + -1]->minor) . ')';
-	}
-	#line 2910 "smarty_internal_templateparser.php"
-	#line 1043 "smarty_internal_templateparser.y"
-	function yy_r157()
-	{
-		$this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor, array($this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2915 "smarty_internal_templateparser.php"
-	#line 1060 "smarty_internal_templateparser.y"
-	function yy_r160()
-	{
-		$this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor, array(array_merge($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor)));
-	}
-	#line 2920 "smarty_internal_templateparser.php"
-	#line 1064 "smarty_internal_templateparser.y"
-	function yy_r161()
-	{
-		$this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor));
-	}
-	#line 2925 "smarty_internal_templateparser.php"
-	#line 1072 "smarty_internal_templateparser.y"
-	function yy_r163()
-	{
-		$this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2930 "smarty_internal_templateparser.php"
-	#line 1080 "smarty_internal_templateparser.y"
-	function yy_r164()
-	{
-		$this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 2935 "smarty_internal_templateparser.php"
-	#line 1114 "smarty_internal_templateparser.y"
-	function yy_r171()
-	{
-		$this->_retvalue = '$' . $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2940 "smarty_internal_templateparser.php"
-	#line 1119 "smarty_internal_templateparser.y"
-	function yy_r172()
-	{
-		$this->_retvalue = '$' . $this->yystack[$this->yyidx + -2]->minor . $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 2945 "smarty_internal_templateparser.php"
-	#line 1125 "smarty_internal_templateparser.y"
-	function yy_r173()
-	{
-		$this->_retvalue = '==';
-	}
-	#line 2950 "smarty_internal_templateparser.php"
-	#line 1129 "smarty_internal_templateparser.y"
-	function yy_r174()
-	{
-		$this->_retvalue = '!=';
-	}
-	#line 2955 "smarty_internal_templateparser.php"
-	#line 1133 "smarty_internal_templateparser.y"
-	function yy_r175()
-	{
-		$this->_retvalue = '>';
-	}
-	#line 2960 "smarty_internal_templateparser.php"
-	#line 1137 "smarty_internal_templateparser.y"
-	function yy_r176()
-	{
-		$this->_retvalue = '<';
-	}
-	#line 2965 "smarty_internal_templateparser.php"
-	#line 1141 "smarty_internal_templateparser.y"
-	function yy_r177()
-	{
-		$this->_retvalue = '>=';
-	}
-	#line 2970 "smarty_internal_templateparser.php"
-	#line 1145 "smarty_internal_templateparser.y"
-	function yy_r178()
-	{
-		$this->_retvalue = '<=';
-	}
-	#line 2975 "smarty_internal_templateparser.php"
-	#line 1149 "smarty_internal_templateparser.y"
-	function yy_r179()
-	{
-		$this->_retvalue = '===';
-	}
-	#line 2980 "smarty_internal_templateparser.php"
-	#line 1153 "smarty_internal_templateparser.y"
-	function yy_r180()
-	{
-		$this->_retvalue = '!==';
-	}
-	#line 2985 "smarty_internal_templateparser.php"
-	#line 1157 "smarty_internal_templateparser.y"
-	function yy_r181()
-	{
-		$this->_retvalue = '%';
-	}
-	#line 2990 "smarty_internal_templateparser.php"
-	#line 1161 "smarty_internal_templateparser.y"
-	function yy_r182()
-	{
-		$this->_retvalue = '&&';
-	}
-	#line 2995 "smarty_internal_templateparser.php"
-	#line 1165 "smarty_internal_templateparser.y"
-	function yy_r183()
-	{
-		$this->_retvalue = '||';
-	}
-	#line 3000 "smarty_internal_templateparser.php"
-	#line 1169 "smarty_internal_templateparser.y"
-	function yy_r184()
-	{
-		$this->_retvalue = ' XOR ';
-	}
-	#line 3005 "smarty_internal_templateparser.php"
-	#line 1176 "smarty_internal_templateparser.y"
-	function yy_r185()
-	{
-		$this->_retvalue = 'array(' . $this->yystack[$this->yyidx + -1]->minor . ')';
-	}
-	#line 3010 "smarty_internal_templateparser.php"
-	#line 1184 "smarty_internal_templateparser.y"
-	function yy_r187()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . ',' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 3015 "smarty_internal_templateparser.php"
-	#line 1192 "smarty_internal_templateparser.y"
-	function yy_r189()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . '=>' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 3020 "smarty_internal_templateparser.php"
-	#line 1196 "smarty_internal_templateparser.y"
-	function yy_r190()
-	{
-		$this->_retvalue = '\'' . $this->yystack[$this->yyidx + -2]->minor . '\'=>' . $this->yystack[$this->yyidx + 0]->minor;
-	}
-	#line 3025 "smarty_internal_templateparser.php"
-	#line 1208 "smarty_internal_templateparser.y"
-	function yy_r192()
-	{
-		$this->_retvalue = "''";
-	}
-	#line 3030 "smarty_internal_templateparser.php"
-	#line 1212 "smarty_internal_templateparser.y"
-	function yy_r193()
-	{
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();
-	}
-	#line 3035 "smarty_internal_templateparser.php"
-	#line 1217 "smarty_internal_templateparser.y"
-	function yy_r194()
-	{
-		$this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-		$this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-	}
-	#line 3041 "smarty_internal_templateparser.php"
-	#line 1222 "smarty_internal_templateparser.y"
-	function yy_r195()
-	{
-		$this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
-	}
-	#line 3046 "smarty_internal_templateparser.php"
-	#line 1226 "smarty_internal_templateparser.y"
-	function yy_r196()
-	{
-		$this->_retvalue = new _smarty_code($this, '(string)' . $this->yystack[$this->yyidx + -1]->minor);
-	}
-	#line 3051 "smarty_internal_templateparser.php"
-	#line 1234 "smarty_internal_templateparser.y"
-	function yy_r198()
-	{
-		$this->_retvalue = new _smarty_code($this, '(string)$_smarty_tpl->tpl_vars[\'' . substr($this->yystack[$this->yyidx + 0]->minor, 1) . '\']->value');
-	}
-	#line 3056 "smarty_internal_templateparser.php"
-	#line 1242 "smarty_internal_templateparser.y"
-	function yy_r200()
-	{
-		$this->_retvalue = new _smarty_code($this, '(string)(' . $this->yystack[$this->yyidx + -1]->minor . ')');
-	}
-	#line 3061 "smarty_internal_templateparser.php"
-	#line 1246 "smarty_internal_templateparser.y"
-	function yy_r201()
-	{
-		$this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + -1]->minor);
-	}
-	#line 3066 "smarty_internal_templateparser.php"
-	#line 1250 "smarty_internal_templateparser.y"
-	function yy_r202()
-	{
-		$this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
-	}
-
-	#line 3071 "smarty_internal_templateparser.php"
-
-	private $_retvalue;
-
-	public function yy_reduce($yyruleno)
-	{
-		$yymsp = $this->yystack[$this->yyidx];
-		if ($this->yyTraceFILE && $yyruleno >= 0
-			&& $yyruleno < count(self::$yyRuleName)
-		) {
-			fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
-				$this->yyTracePrompt, $yyruleno,
-				self::$yyRuleName[$yyruleno]
-			);
-		}
-
-		$this->_retvalue = $yy_lefthand_side = null;
-		if (array_key_exists($yyruleno, self::$yyReduceMap)) {
-			// call the action
-			$this->_retvalue = null;
-			$this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-			$yy_lefthand_side = $this->_retvalue;
-		}
-		$yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-		$yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
-		$this->yyidx -= $yysize;
-		for ($i = $yysize; $i; $i--) {
-			// pop all of the right-hand side parameters
-			array_pop($this->yystack);
-		}
-		$yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-		if ($yyact < self::YYNSTATE) {
-			if (!$this->yyTraceFILE && $yysize) {
-				$this->yyidx++;
-				$x = new TP_yyStackEntry;
-				$x->stateno = $yyact;
-				$x->major = $yygoto;
-				$x->minor = $yy_lefthand_side;
-				$this->yystack[$this->yyidx] = $x;
-			} else {
-				$this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-			}
-		} elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-			$this->yy_accept();
-		}
-	}
-
-	public function yy_parse_failed()
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
-		}
-		while ($this->yyidx >= 0) {
-			$this->yy_pop_parser_stack();
-		}
-	}
-
-	public function yy_syntax_error($yymajor, $TOKEN)
-	{
-		#line 78 "smarty_internal_templateparser.y"
-
-		$this->internalError = true;
-		$this->yymajor = $yymajor;
-		$this->compiler->trigger_template_error();
-		#line 3133 "smarty_internal_templateparser.php"
-	}
-
-	public function yy_accept()
-	{
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
-		}
-		while ($this->yyidx >= 0) {
-			$stack = $this->yy_pop_parser_stack();
-		}
-		#line 70 "smarty_internal_templateparser.y"
-
-		$this->successful = !$this->internalError;
-		$this->internalError = false;
-		$this->retvalue = $this->_retvalue;
-		//echo $this->retvalue."\n\n";
-		#line 3150 "smarty_internal_templateparser.php"
-	}
-
-	public function doParse($yymajor, $yytokenvalue)
-	{
-		$yyerrorhit = 0; /* True if yymajor has invoked an error */
-
-		if ($this->yyidx === null || $this->yyidx < 0) {
-			$this->yyidx = 0;
-			$this->yyerrcnt = -1;
-			$x = new TP_yyStackEntry;
-			$x->stateno = 0;
-			$x->major = 0;
-			$this->yystack = array();
-			array_push($this->yystack, $x);
-		}
-		$yyendofinput = ($yymajor == 0);
-
-		if ($this->yyTraceFILE) {
-			fprintf($this->yyTraceFILE, "%sInput %s\n",
-				$this->yyTracePrompt, $this->yyTokenName[$yymajor]
-			);
-		}
-
-		do {
-			$yyact = $this->yy_find_shift_action($yymajor);
-			if ($yymajor < self::YYERRORSYMBOL &&
-				!$this->yy_is_expected_token($yymajor)
-			) {
-				// force a syntax error
-				$yyact = self::YY_ERROR_ACTION;
-			}
-			if ($yyact < self::YYNSTATE) {
-				$this->yy_shift($yyact, $yymajor, $yytokenvalue);
-				$this->yyerrcnt--;
-				if ($yyendofinput && $this->yyidx >= 0) {
-					$yymajor = 0;
-				} else {
-					$yymajor = self::YYNOCODE;
-				}
-			} elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-				$this->yy_reduce($yyact - self::YYNSTATE);
-			} elseif ($yyact == self::YY_ERROR_ACTION) {
-				if ($this->yyTraceFILE) {
-					fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
-						$this->yyTracePrompt
-					);
-				}
-				if (self::YYERRORSYMBOL) {
-					if ($this->yyerrcnt < 0) {
-						$this->yy_syntax_error($yymajor, $yytokenvalue);
-					}
-					$yymx = $this->yystack[$this->yyidx]->major;
-					if ($yymx == self::YYERRORSYMBOL || $yyerrorhit) {
-						if ($this->yyTraceFILE) {
-							fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
-								$this->yyTracePrompt, $this->yyTokenName[$yymajor]
-							);
-						}
-						$this->yy_destructor($yymajor, $yytokenvalue);
-						$yymajor = self::YYNOCODE;
-					} else {
-						while ($this->yyidx >= 0 &&
-							$yymx != self::YYERRORSYMBOL &&
-							($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-						) {
-							$this->yy_pop_parser_stack();
-						}
-						if ($this->yyidx < 0 || $yymajor == 0) {
-							$this->yy_destructor($yymajor, $yytokenvalue);
-							$this->yy_parse_failed();
-							$yymajor = self::YYNOCODE;
-						} elseif ($yymx != self::YYERRORSYMBOL) {
-							$u2 = 0;
-							$this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-						}
-					}
-					$this->yyerrcnt = 3;
-					$yyerrorhit = 1;
-				} else {
-					if ($this->yyerrcnt <= 0) {
-						$this->yy_syntax_error($yymajor, $yytokenvalue);
-					}
-					$this->yyerrcnt = 3;
-					$this->yy_destructor($yymajor, $yytokenvalue);
-					if ($yyendofinput) {
-						$this->yy_parse_failed();
-					}
-					$yymajor = self::YYNOCODE;
-				}
-			} else {
-				$this->yy_accept();
-				$yymajor = self::YYNOCODE;
-			}
-		} while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_utility.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index 5f0480e8b..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,834 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- * 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 (at your option) any later version.
- * 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.
- * 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
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link       http://www.smarty.net/
- * @copyright  2008 New Digital Group, Inc.
- * @author     Monte Ohrt <monte at ohrt dot com>
- * @author     Uwe Tews
- * @package    Smarty
- * @subpackage PluginsInternal
- * @version    3-SVN$Rev: 3286 $
- */
-
-/**
- * Utility class
- *
- * @package    Smarty
- * @subpackage Security
- */
-class Smarty_Internal_Utility
-{
-	/**
-	 * private constructor to prevent calls creation of new instances
-	 */
-	final private function __construct()
-	{
-		// intentionally left blank
-	}
-
-	/**
-	 * Compile all template files
-	 *
-	 * @param  string $extension     template file name extension
-	 * @param  bool   $force_compile force all to recompile
-	 * @param  int    $time_limit    set maximum execution time
-	 * @param  int    $max_errors    set maximum allowed errors
-	 * @param  Smarty $smarty        Smarty instance
-	 *
-	 * @return integer number of template files compiled
-	 */
-	public static function compileAllTemplates($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-	{
-		// switch off time limit
-		if (function_exists('set_time_limit')) {
-			@set_time_limit($time_limit);
-		}
-		$smarty->force_compile = $force_compile;
-		$_count = 0;
-		$_error_count = 0;
-		// loop over array of template directories
-		foreach ($smarty->getTemplateDir() as $_dir) {
-			$_compileDirs = new RecursiveDirectoryIterator($_dir);
-			$_compile = new RecursiveIteratorIterator($_compileDirs);
-			foreach ($_compile as $_fileinfo) {
-				$_file = $_fileinfo->getFilename();
-				if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-					continue;
-				}
-				if (!substr_compare($_file, $extension, -strlen($extension)) == 0) {
-					continue;
-				}
-				if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-					$_template_file = $_file;
-				} else {
-					$_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-				}
-				echo '<br>', $_dir, '---', $_template_file;
-				flush();
-				$_start_time = microtime(true);
-				try {
-					$_tpl = $smarty->createTemplate($_template_file, null, null, null, false);
-					if ($_tpl->mustCompile()) {
-						$_tpl->compileTemplateSource();
-						$_count++;
-						echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-						flush();
-					} else {
-						echo ' is up to date';
-						flush();
-					}
-				} catch (Exception $e) {
-					echo 'Error: ', $e->getMessage(), "<br><br>";
-					$_error_count++;
-				}
-				// free memory
-				$smarty->template_objects = array();
-				$_tpl->smarty->template_objects = array();
-				$_tpl = null;
-				if ($max_errors !== null && $_error_count == $max_errors) {
-					echo '<br><br>too many errors';
-					exit();
-				}
-			}
-		}
-
-		return $_count;
-	}
-
-	/**
-	 * Compile all config files
-	 *
-	 * @param  string $extension     config file name extension
-	 * @param  bool   $force_compile force all to recompile
-	 * @param  int    $time_limit    set maximum execution time
-	 * @param  int    $max_errors    set maximum allowed errors
-	 * @param  Smarty $smarty        Smarty instance
-	 *
-	 * @return integer number of config files compiled
-	 */
-	public static function compileAllConfig($extension, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-	{
-		// switch off time limit
-		if (function_exists('set_time_limit')) {
-			@set_time_limit($time_limit);
-		}
-		$smarty->force_compile = $force_compile;
-		$_count = 0;
-		$_error_count = 0;
-		// loop over array of template directories
-		foreach ($smarty->getConfigDir() as $_dir) {
-			$_compileDirs = new RecursiveDirectoryIterator($_dir);
-			$_compile = new RecursiveIteratorIterator($_compileDirs);
-			foreach ($_compile as $_fileinfo) {
-				$_file = $_fileinfo->getFilename();
-				if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-					continue;
-				}
-				if (!substr_compare($_file, $extension, -strlen($extension)) == 0) {
-					continue;
-				}
-				if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-					$_config_file = $_file;
-				} else {
-					$_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-				}
-				echo '<br>', $_dir, '---', $_config_file;
-				flush();
-				$_start_time = microtime(true);
-				try {
-					$_config = new Smarty_Internal_Config($_config_file, $smarty);
-					if ($_config->mustCompile()) {
-						$_config->compileConfigSource();
-						$_count++;
-						echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-						flush();
-					} else {
-						echo ' is up to date';
-						flush();
-					}
-				} catch (Exception $e) {
-					echo 'Error: ', $e->getMessage(), "<br><br>";
-					$_error_count++;
-				}
-				if ($max_errors !== null && $_error_count == $max_errors) {
-					echo '<br><br>too many errors';
-					exit();
-				}
-			}
-		}
-
-		return $_count;
-	}
-
-	/**
-	 * Delete compiled template file
-	 *
-	 * @param  string  $resource_name template name
-	 * @param  string  $compile_id    compile id
-	 * @param  integer $exp_time      expiration time
-	 * @param  Smarty  $smarty        Smarty instance
-	 *
-	 * @return integer number of template files deleted
-	 */
-	public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
-	{
-		$_compile_dir = realpath($smarty->getCompileDir()) . '/';
-		$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-		$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-		if (isset($resource_name)) {
-			$_save_stat = $smarty->caching;
-			$smarty->caching = false;
-			$tpl = new $smarty->template_class($resource_name, $smarty);
-			$smarty->caching = $_save_stat;
-
-			// remove from template cache
-			$tpl->source; // have the template registered before unset()
-			if ($smarty->allow_ambiguous_resources) {
-				$_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-			} else {
-				$_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-			}
-			if (isset($_templateId[150])) {
-				$_templateId = sha1($_templateId);
-			}
-			unset($smarty->template_objects[$_templateId]);
-
-			if ($tpl->source->exists) {
-				$_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
-				$_resource_part_1_length = strlen($_resource_part_1);
-			} else {
-				return 0;
-			}
-
-			$_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
-			$_resource_part_2_length = strlen($_resource_part_2);
-		}
-		$_dir = $_compile_dir;
-		if ($smarty->use_sub_dirs && isset($_compile_id)) {
-			$_dir .= $_compile_id . $_dir_sep;
-		}
-		if (isset($_compile_id)) {
-			$_compile_id_part = str_replace('\\', '/', $_compile_dir . $_compile_id . $_dir_sep);
-			$_compile_id_part_length = strlen($_compile_id_part);
-		}
-		$_count = 0;
-		try {
-			$_compileDirs = new RecursiveDirectoryIterator($_dir);
-			// NOTE: UnexpectedValueException thrown for PHP >= 5.3
-		} catch (Exception $e) {
-			return 0;
-		}
-		$_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-		foreach ($_compile as $_file) {
-			if (substr(basename($_file->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
-				continue;
-			}
-
-			$_filepath = str_replace('\\', '/', (string)$_file);
-
-			if ($_file->isDir()) {
-				if (!$_compile->isDot()) {
-					// delete folder if empty
-					@rmdir($_file->getPathname());
-				}
-			} else {
-				$unlink = false;
-				if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-					&& (!isset($resource_name)
-						|| (isset($_filepath[$_resource_part_1_length])
-							&& substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0)
-						|| (isset($_filepath[$_resource_part_2_length])
-							&& substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))
-				) {
-					if (isset($exp_time)) {
-						if (time() - @filemtime($_filepath) >= $exp_time) {
-							$unlink = true;
-						}
-					} else {
-						$unlink = true;
-					}
-				}
-
-				if ($unlink && @unlink($_filepath)) {
-					$_count++;
-				}
-			}
-		}
-		// clear compiled cache
-		Smarty_Resource::$sources = array();
-		Smarty_Resource::$compileds = array();
-
-		return $_count;
-	}
-
-	/**
-	 * Return array of tag/attributes of all tags used by an template
-	 *
-	 * @param Smarty_Internal_Template $template
-	 *
-	 * @throws Exception
-	 * @throws SmartyException
-	 * @return array                    of tag/attributes
-	 */
-	public static function getTags(Smarty_Internal_Template $template)
-	{
-		$template->smarty->get_used_tags = true;
-		$template->compileTemplateSource();
-
-		return $template->used_tags;
-	}
-
-	/**
-	 * diagnose Smarty setup
-	 * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-	 *
-	 * @param  Smarty $smarty Smarty instance to test
-	 * @param  array  $errors array to push results into rather than outputting them
-	 *
-	 * @return bool   status, true if everything is fine, false else
-	 */
-	public static function testInstall(Smarty $smarty, &$errors = null)
-	{
-		$status = true;
-
-		if ($errors === null) {
-			echo "<PRE>\n";
-			echo "Smarty Installation test...\n";
-			echo "Testing template directory...\n";
-		}
-
-		$_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-		// test if all registered template_dir are accessible
-		foreach ($smarty->getTemplateDir() as $template_dir) {
-			$_template_dir = $template_dir;
-			$template_dir = realpath($template_dir);
-			// resolve include_path or fail existence
-			if (!$template_dir) {
-				if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-					// try PHP include_path
-					if ($_stream_resolve_include_path) {
-						$template_dir = stream_resolve_include_path($_template_dir);
-					} else {
-						$template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir);
-					}
-
-					if ($template_dir !== false) {
-						if ($errors === null) {
-							echo "$template_dir is OK.\n";
-						}
-
-						continue;
-					} else {
-						$status = false;
-						$message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-						if ($errors === null) {
-							echo $message . ".\n";
-						} else {
-							$errors['template_dir'] = $message;
-						}
-
-						continue;
-					}
-				} else {
-					$status = false;
-					$message = "FAILED: $_template_dir does not exist";
-					if ($errors === null) {
-						echo $message . ".\n";
-					} else {
-						$errors['template_dir'] = $message;
-					}
-
-					continue;
-				}
-			}
-
-			if (!is_dir($template_dir)) {
-				$status = false;
-				$message = "FAILED: $template_dir is not a directory";
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['template_dir'] = $message;
-				}
-			} elseif (!is_readable($template_dir)) {
-				$status = false;
-				$message = "FAILED: $template_dir is not readable";
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['template_dir'] = $message;
-				}
-			} else {
-				if ($errors === null) {
-					echo "$template_dir is OK.\n";
-				}
-			}
-		}
-
-		if ($errors === null) {
-			echo "Testing compile directory...\n";
-		}
-
-		// test if registered compile_dir is accessible
-		$__compile_dir = $smarty->getCompileDir();
-		$_compile_dir = realpath($__compile_dir);
-		if (!$_compile_dir) {
-			$status = false;
-			$message = "FAILED: {$__compile_dir} does not exist";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['compile_dir'] = $message;
-			}
-		} elseif (!is_dir($_compile_dir)) {
-			$status = false;
-			$message = "FAILED: {$_compile_dir} is not a directory";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['compile_dir'] = $message;
-			}
-		} elseif (!is_readable($_compile_dir)) {
-			$status = false;
-			$message = "FAILED: {$_compile_dir} is not readable";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['compile_dir'] = $message;
-			}
-		} elseif (!is_writable($_compile_dir)) {
-			$status = false;
-			$message = "FAILED: {$_compile_dir} is not writable";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['compile_dir'] = $message;
-			}
-		} else {
-			if ($errors === null) {
-				echo "{$_compile_dir} is OK.\n";
-			}
-		}
-
-		if ($errors === null) {
-			echo "Testing plugins directory...\n";
-		}
-
-		// test if all registered plugins_dir are accessible
-		// and if core plugins directory is still registered
-		$_core_plugins_dir = realpath(dirname(__FILE__) . '/../plugins');
-		$_core_plugins_available = false;
-		foreach ($smarty->getPluginsDir() as $plugin_dir) {
-			$_plugin_dir = $plugin_dir;
-			$plugin_dir = realpath($plugin_dir);
-			// resolve include_path or fail existence
-			if (!$plugin_dir) {
-				if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-					// try PHP include_path
-					if ($_stream_resolve_include_path) {
-						$plugin_dir = stream_resolve_include_path($_plugin_dir);
-					} else {
-						$plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir);
-					}
-
-					if ($plugin_dir !== false) {
-						if ($errors === null) {
-							echo "$plugin_dir is OK.\n";
-						}
-
-						continue;
-					} else {
-						$status = false;
-						$message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-						if ($errors === null) {
-							echo $message . ".\n";
-						} else {
-							$errors['plugins_dir'] = $message;
-						}
-
-						continue;
-					}
-				} else {
-					$status = false;
-					$message = "FAILED: $_plugin_dir does not exist";
-					if ($errors === null) {
-						echo $message . ".\n";
-					} else {
-						$errors['plugins_dir'] = $message;
-					}
-
-					continue;
-				}
-			}
-
-			if (!is_dir($plugin_dir)) {
-				$status = false;
-				$message = "FAILED: $plugin_dir is not a directory";
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['plugins_dir'] = $message;
-				}
-			} elseif (!is_readable($plugin_dir)) {
-				$status = false;
-				$message = "FAILED: $plugin_dir is not readable";
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['plugins_dir'] = $message;
-				}
-			} elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-				$_core_plugins_available = true;
-				if ($errors === null) {
-					echo "$plugin_dir is OK.\n";
-				}
-			} else {
-				if ($errors === null) {
-					echo "$plugin_dir is OK.\n";
-				}
-			}
-		}
-		if (!$_core_plugins_available) {
-			$status = false;
-			$message = "WARNING: Smarty's own libs/plugins is not available";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} elseif (!isset($errors['plugins_dir'])) {
-				$errors['plugins_dir'] = $message;
-			}
-		}
-
-		if ($errors === null) {
-			echo "Testing cache directory...\n";
-		}
-
-		// test if all registered cache_dir is accessible
-		$__cache_dir = $smarty->getCacheDir();
-		$_cache_dir = realpath($__cache_dir);
-		if (!$_cache_dir) {
-			$status = false;
-			$message = "FAILED: {$__cache_dir} does not exist";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['cache_dir'] = $message;
-			}
-		} elseif (!is_dir($_cache_dir)) {
-			$status = false;
-			$message = "FAILED: {$_cache_dir} is not a directory";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['cache_dir'] = $message;
-			}
-		} elseif (!is_readable($_cache_dir)) {
-			$status = false;
-			$message = "FAILED: {$_cache_dir} is not readable";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['cache_dir'] = $message;
-			}
-		} elseif (!is_writable($_cache_dir)) {
-			$status = false;
-			$message = "FAILED: {$_cache_dir} is not writable";
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['cache_dir'] = $message;
-			}
-		} else {
-			if ($errors === null) {
-				echo "{$_cache_dir} is OK.\n";
-			}
-		}
-
-		if ($errors === null) {
-			echo "Testing configs directory...\n";
-		}
-
-		// test if all registered config_dir are accessible
-		foreach ($smarty->getConfigDir() as $config_dir) {
-			$_config_dir = $config_dir;
-			$config_dir = realpath($config_dir);
-			// resolve include_path or fail existence
-			if (!$config_dir) {
-				if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-					// try PHP include_path
-					if ($_stream_resolve_include_path) {
-						$config_dir = stream_resolve_include_path($_config_dir);
-					} else {
-						$config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir);
-					}
-
-					if ($config_dir !== false) {
-						if ($errors === null) {
-							echo "$config_dir is OK.\n";
-						}
-
-						continue;
-					} else {
-						$status = false;
-						$message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-						if ($errors === null) {
-							echo $message . ".\n";
-						} else {
-							$errors['config_dir'] = $message;
-						}
-
-						continue;
-					}
-				} else {
-					$status = false;
-					$message = "FAILED: $_config_dir does not exist";
-					if ($errors === null) {
-						echo $message . ".\n";
-					} else {
-						$errors['config_dir'] = $message;
-					}
-
-					continue;
-				}
-			}
-
-			if (!is_dir($config_dir)) {
-				$status = false;
-				$message = "FAILED: $config_dir is not a directory";
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['config_dir'] = $message;
-				}
-			} elseif (!is_readable($config_dir)) {
-				$status = false;
-				$message = "FAILED: $config_dir is not readable";
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['config_dir'] = $message;
-				}
-			} else {
-				if ($errors === null) {
-					echo "$config_dir is OK.\n";
-				}
-			}
-		}
-
-		if ($errors === null) {
-			echo "Testing sysplugin files...\n";
-		}
-		// test if sysplugins are available
-		$source = SMARTY_SYSPLUGINS_DIR;
-		if (is_dir($source)) {
-			$expected = array(
-				"smarty_cacheresource.php"                                  => true,
-				"smarty_cacheresource_custom.php"                           => true,
-				"smarty_cacheresource_keyvaluestore.php"                    => true,
-				"smarty_config_source.php"                                  => true,
-				"smarty_internal_cacheresource_file.php"                    => true,
-				"smarty_internal_compile_append.php"                        => true,
-				"smarty_internal_compile_assign.php"                        => true,
-				"smarty_internal_compile_block.php"                         => true,
-				"smarty_internal_compile_break.php"                         => true,
-				"smarty_internal_compile_call.php"                          => true,
-				"smarty_internal_compile_capture.php"                       => true,
-				"smarty_internal_compile_config_load.php"                   => true,
-				"smarty_internal_compile_continue.php"                      => true,
-				"smarty_internal_compile_debug.php"                         => true,
-				"smarty_internal_compile_eval.php"                          => true,
-				"smarty_internal_compile_extends.php"                       => true,
-				"smarty_internal_compile_for.php"                           => true,
-				"smarty_internal_compile_foreach.php"                       => true,
-				"smarty_internal_compile_function.php"                      => true,
-				"smarty_internal_compile_if.php"                            => true,
-				"smarty_internal_compile_include.php"                       => true,
-				"smarty_internal_compile_include_php.php"                   => true,
-				"smarty_internal_compile_insert.php"                        => true,
-				"smarty_internal_compile_ldelim.php"                        => true,
-				"smarty_internal_compile_nocache.php"                       => true,
-				"smarty_internal_compile_private_block_plugin.php"          => true,
-				"smarty_internal_compile_private_function_plugin.php"       => true,
-				"smarty_internal_compile_private_modifier.php"              => true,
-				"smarty_internal_compile_private_object_block_function.php" => true,
-				"smarty_internal_compile_private_object_function.php"       => true,
-				"smarty_internal_compile_private_print_expression.php"      => true,
-				"smarty_internal_compile_private_registered_block.php"      => true,
-				"smarty_internal_compile_private_registered_function.php"   => true,
-				"smarty_internal_compile_private_special_variable.php"      => true,
-				"smarty_internal_compile_rdelim.php"                        => true,
-				"smarty_internal_compile_section.php"                       => true,
-				"smarty_internal_compile_setfilter.php"                     => true,
-				"smarty_internal_compile_while.php"                         => true,
-				"smarty_internal_compilebase.php"                           => true,
-				"smarty_internal_config.php"                                => true,
-				"smarty_internal_config_file_compiler.php"                  => true,
-				"smarty_internal_configfilelexer.php"                       => true,
-				"smarty_internal_configfileparser.php"                      => true,
-				"smarty_internal_data.php"                                  => true,
-				"smarty_internal_debug.php"                                 => true,
-				"smarty_internal_filter_handler.php"                        => true,
-				"smarty_internal_function_call_handler.php"                 => true,
-				"smarty_internal_get_include_path.php"                      => true,
-				"smarty_internal_nocache_insert.php"                        => true,
-				"smarty_internal_parsetree.php"                             => true,
-				"smarty_internal_resource_eval.php"                         => true,
-				"smarty_internal_resource_extends.php"                      => true,
-				"smarty_internal_resource_file.php"                         => true,
-				"smarty_internal_resource_registered.php"                   => true,
-				"smarty_internal_resource_stream.php"                       => true,
-				"smarty_internal_resource_string.php"                       => true,
-				"smarty_internal_smartytemplatecompiler.php"                => true,
-				"smarty_internal_template.php"                              => true,
-				"smarty_internal_templatebase.php"                          => true,
-				"smarty_internal_templatecompilerbase.php"                  => true,
-				"smarty_internal_templatelexer.php"                         => true,
-				"smarty_internal_templateparser.php"                        => true,
-				"smarty_internal_utility.php"                               => true,
-				"smarty_internal_write_file.php"                            => true,
-				"smarty_resource.php"                                       => true,
-				"smarty_resource_custom.php"                                => true,
-				"smarty_resource_recompiled.php"                            => true,
-				"smarty_resource_uncompiled.php"                            => true,
-				"smarty_security.php"                                       => true,
-			);
-			$iterator = new DirectoryIterator($source);
-			foreach ($iterator as $file) {
-				if (!$file->isDot()) {
-					$filename = $file->getFilename();
-					if (isset($expected[$filename])) {
-						unset($expected[$filename]);
-					}
-				}
-			}
-			if ($expected) {
-				$status = false;
-				$message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expected));
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['sysplugins'] = $message;
-				}
-			} elseif ($errors === null) {
-				echo "... OK\n";
-			}
-		} else {
-			$status = false;
-			$message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['sysplugins_dir_constant'] = $message;
-			}
-		}
-
-		if ($errors === null) {
-			echo "Testing plugin files...\n";
-		}
-		// test if core plugins are available
-		$source = SMARTY_PLUGINS_DIR;
-		if (is_dir($source)) {
-			$expected = array(
-				"block.textformat.php"                  => true,
-				"function.counter.php"                  => true,
-				"function.cycle.php"                    => true,
-				"function.fetch.php"                    => true,
-				"function.html_checkboxes.php"          => true,
-				"function.html_image.php"               => true,
-				"function.html_options.php"             => true,
-				"function.html_radios.php"              => true,
-				"function.html_select_date.php"         => true,
-				"function.html_select_time.php"         => true,
-				"function.html_table.php"               => true,
-				"function.mailto.php"                   => true,
-				"function.math.php"                     => true,
-				"modifier.capitalize.php"               => true,
-				"modifier.date_format.php"              => true,
-				"modifier.debug_print_var.php"          => true,
-				"modifier.escape.php"                   => true,
-				"modifier.regex_replace.php"            => true,
-				"modifier.replace.php"                  => true,
-				"modifier.spacify.php"                  => true,
-				"modifier.truncate.php"                 => true,
-				"modifiercompiler.cat.php"              => true,
-				"modifiercompiler.count_characters.php" => true,
-				"modifiercompiler.count_paragraphs.php" => true,
-				"modifiercompiler.count_sentences.php"  => true,
-				"modifiercompiler.count_words.php"      => true,
-				"modifiercompiler.default.php"          => true,
-				"modifiercompiler.escape.php"           => true,
-				"modifiercompiler.from_charset.php"     => true,
-				"modifiercompiler.indent.php"           => true,
-				"modifiercompiler.lower.php"            => true,
-				"modifiercompiler.noprint.php"          => true,
-				"modifiercompiler.string_format.php"    => true,
-				"modifiercompiler.strip.php"            => true,
-				"modifiercompiler.strip_tags.php"       => true,
-				"modifiercompiler.to_charset.php"       => true,
-				"modifiercompiler.unescape.php"         => true,
-				"modifiercompiler.upper.php"            => true,
-				"modifiercompiler.wordwrap.php"         => true,
-				"outputfilter.trimwhitespace.php"       => true,
-				"shared.escape_special_chars.php"       => true,
-				"shared.literal_compiler_param.php"     => true,
-				"shared.make_timestamp.php"             => true,
-				"shared.mb_str_replace.php"             => true,
-				"shared.mb_unicode.php"                 => true,
-				"shared.mb_wordwrap.php"                => true,
-				"variablefilter.htmlspecialchars.php"   => true,
-			);
-			$iterator = new DirectoryIterator($source);
-			foreach ($iterator as $file) {
-				if (!$file->isDot()) {
-					$filename = $file->getFilename();
-					if (isset($expected[$filename])) {
-						unset($expected[$filename]);
-					}
-				}
-			}
-			if ($expected) {
-				$status = false;
-				$message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expected));
-				if ($errors === null) {
-					echo $message . ".\n";
-				} else {
-					$errors['plugins'] = $message;
-				}
-			} elseif ($errors === null) {
-				echo "... OK\n";
-			}
-		} else {
-			$status = false;
-			$message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
-			if ($errors === null) {
-				echo $message . ".\n";
-			} else {
-				$errors['plugins_dir_constant'] = $message;
-			}
-		}
-
-		if ($errors === null) {
-			echo "Tests complete.\n";
-			echo "</PRE>\n";
-		}
-
-		return $status;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_write_file.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_write_file.php
deleted file mode 100644
index f46fe2b6c..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_internal_write_file.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Smarty write file plugin
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- * @author     Monte Ohrt
- */
-
-/**
- * Smarty Internal Write File Class
- *
- * @package    Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Write_File
-{
-    /**
-     * Writes file in a safe way to disk
-     *
-     * @param  string $_filepath complete filepath
-     * @param  string $_contents file content
-     * @param  Smarty $smarty    smarty instance
-     *
-     * @throws SmartyException
-     * @return boolean true
-     */
-    public static function writeFile($_filepath, $_contents, Smarty $smarty)
-    {
-        $_error_reporting = error_reporting();
-        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        if ($smarty->_file_perms !== null) {
-            $old_umask = umask(0);
-        }
-
-        $_dirpath = dirname($_filepath);
-        // if subdirs, create dir structure
-        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
-        }
-
-        // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true));
-        if (!file_put_contents($_tmp_file, $_contents)) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_tmp_file}");
-       }
-
-        /*
-         * Windows' rename() fails if the destination exists,
-         * Linux' rename() properly handles the overwrite.
-         * Simply unlink()ing a file might cause other processes
-         * currently reading that file to fail, but linux' rename()
-         * seems to be smart enough to handle that for us.
-         */
-        if (Smarty::$_IS_WINDOWS) {
-            // remove original file
-            @unlink($_filepath);
-            // rename tmp file
-            $success = @rename($_tmp_file, $_filepath);
-        } else {
-            // rename tmp file
-            $success = @rename($_tmp_file, $_filepath);
-            if (!$success) {
-                // remove original file
-                @unlink($_filepath);
-                // rename tmp file
-                $success = @rename($_tmp_file, $_filepath);
-            }
-        }
-
-        if (!$success) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_filepath}");
-        }
-
-        if ($smarty->_file_perms !== null) {
-            // set file permissions
-            chmod($_filepath, $smarty->_file_perms);
-            umask($old_umask);
-        }
-        error_reporting($_error_reporting);
-
-        return true;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource.php
deleted file mode 100644
index 34af28dbe..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource.php
+++ /dev/null
@@ -1,916 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource
-{
-	/**
-	 * cache for Smarty_Template_Source instances
-	 *
-	 * @var array
-	 */
-	public static $sources = array();
-	/**
-	 * cache for Smarty_Template_Compiled instances
-	 *
-	 * @var array
-	 */
-	public static $compileds = array();
-	/**
-	 * cache for Smarty_Resource instances
-	 *
-	 * @var array
-	 */
-	public static $resources = array();
-	/**
-	 * resource types provided by the core
-	 *
-	 * @var array
-	 */
-	protected static $sysplugins = array(
-		'file'    => true,
-		'string'  => true,
-		'extends' => true,
-		'stream'  => true,
-		'eval'    => true,
-		'php'     => true
-	);
-
-	/**
-	 * Name of the Class to compile this resource's contents with
-	 *
-	 * @var string
-	 */
-	public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-
-	/**
-	 * Name of the Class to tokenize this resource's contents with
-	 *
-	 * @var string
-	 */
-	public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-
-	/**
-	 * Name of the Class to parse this resource's contents with
-	 *
-	 * @var string
-	 */
-	public $template_parser_class = 'Smarty_Internal_Templateparser';
-
-	/**
-	 * Load template's source into current template object
-	 * {@internal The loaded source is assigned to $_template->source->content directly.}}
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 template source
-	 * @throws SmartyException        if source cannot be loaded
-	 */
-	abstract public function getContent(Smarty_Template_Source $source);
-
-	/**
-	 * populate Source Object with meta data from Resource
-	 *
-	 * @param Smarty_Template_Source   $source    source object
-	 * @param Smarty_Internal_Template $_template template object
-	 */
-	abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
-
-	/**
-	 * populate Source Object with timestamp and exists from Resource
-	 *
-	 * @param Smarty_Template_Source $source source object
-	 */
-	public function populateTimestamp(Smarty_Template_Source $source)
-	{
-		// intentionally left blank
-	}
-
-	/**
-	 * modify resource_name according to resource handlers specifications
-	 *
-	 * @param  Smarty  $smarty        Smarty instance
-	 * @param  string  $resource_name resource_name to make unique
-	 * @param  boolean $is_config     flag for config resource
-	 *
-	 * @return string unique resource name
-	 */
-	protected function buildUniqueResourceName(Smarty $smarty, $resource_name, $is_config = false)
-	{
-		if ($is_config) {
-			return get_class($this) . '#' . $smarty->joined_config_dir . '#' . $resource_name;
-		} else {
-			return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
-		}
-	}
-
-	/**
-	 * populate Compiled Object with compiled filepath
-	 *
-	 * @param Smarty_Template_Compiled $compiled  compiled object
-	 * @param Smarty_Internal_Template $_template template object
-	 */
-	public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-	{
-		$_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-		$_filepath = $compiled->source->uid;
-		// if use_sub_dirs, break file into directories
-		if ($_template->smarty->use_sub_dirs) {
-			$_filepath = substr($_filepath, 0, 2) . DS
-				. substr($_filepath, 2, 2) . DS
-				. substr($_filepath, 4, 2) . DS
-				. $_filepath;
-		}
-		$_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-		if (isset($_compile_id)) {
-			$_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-		}
-		// caching token
-		if ($_template->caching) {
-			$_cache = '.cache';
-		} else {
-			$_cache = '';
-		}
-		$_compile_dir = $_template->smarty->getCompileDir();
-		// set basename if not specified
-		$_basename = $this->getBasename($compiled->source);
-		if ($_basename === null) {
-			$_basename = basename(preg_replace('![^\w\/]+!', '_', $compiled->source->name));
-		}
-		// separate (optional) basename by dot
-		if ($_basename) {
-			$_basename = '.' . $_basename;
-		}
-
-		$compiled->filepath = $_compile_dir . $_filepath . '.' . $compiled->source->type . $_basename . $_cache . '.php';
-	}
-
-	/**
-	 * Normalize Paths "foo/../bar" to "bar"
-	 *
-	 * @param  string  $_path path to normalize
-	 * @param  boolean $ds    respect windows directory separator
-	 *
-	 * @return string  normalized path
-	 */
-	protected function normalizePath($_path, $ds = true)
-	{
-		if ($ds) {
-			// don't we all just love windows?
-			$_path = str_replace('\\', '/', $_path);
-		}
-
-		$offset = 0;
-
-		// resolve simples
-		$_path = preg_replace('#/\./(\./)*#', '/', $_path);
-		// resolve parents
-		while (true) {
-			$_parent = strpos($_path, '/../', $offset);
-			if (!$_parent) {
-				break;
-			} elseif ($_path[$_parent - 1] === '.') {
-				$offset = $_parent + 3;
-				continue;
-			}
-
-			$_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1);
-			if ($_pos === false) {
-				// don't we all just love windows?
-				$_pos = $_parent;
-			}
-
-			$_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos);
-		}
-
-		if ($ds && DS != '/') {
-			// don't we all just love windows?
-			$_path = str_replace('/', '\\', $_path);
-		}
-
-		return $_path;
-	}
-
-	/**
-	 * build template filepath by traversing the template_dir array
-	 *
-	 * @param  Smarty_Template_Source   $source    source object
-	 * @param  Smarty_Internal_Template $_template template object
-	 *
-	 * @return string                   fully qualified filepath
-	 * @throws SmartyException          if default template handler is registered but not callable
-	 */
-	protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-	{
-		$file = $source->name;
-		if ($source instanceof Smarty_Config_Source) {
-			$_directories = $source->smarty->getConfigDir();
-			$_default_handler = $source->smarty->default_config_handler_func;
-		} else {
-			$_directories = $source->smarty->getTemplateDir();
-			$_default_handler = $source->smarty->default_template_handler_func;
-		}
-
-		// go relative to a given template?
-		$_file_is_dotted = $file[0] == '.' && ($file[1] == '.' || $file[1] == '/' || $file[1] == "\\");
-		if ($_template && $_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted) {
-			if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
-				throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-			}
-			$file = dirname($_template->parent->source->filepath) . DS . $file;
-			$_file_exact_match = true;
-			if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-				// the path gained from the parent template is relative to the current working directory
-				// as expansions (like include_path) have already been done
-				$file = getcwd() . DS . $file;
-			}
-		}
-
-		// resolve relative path
-		if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-			// don't we all just love windows?
-			$_path = DS . trim($file, '/');
-			$_was_relative = true;
-		} else {
-			// don't we all just love windows?
-			$_path = str_replace('\\', '/', $file);
-		}
-		$_path = $this->normalizePath($_path, false);
-		if (DS != '/') {
-			// don't we all just love windows?
-			$_path = str_replace('/', '\\', $_path);
-		}
-		// revert to relative
-		if (isset($_was_relative)) {
-			$_path = substr($_path, 1);
-		}
-
-		// this is only required for directories
-		$file = rtrim($_path, '/\\');
-
-		// files relative to a template only get one shot
-		if (isset($_file_exact_match)) {
-			return $this->fileExists($source, $file) ? $file : false;
-		}
-
-		// template_dir index?
-		if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
-			$_directory = null;
-			// try string indexes
-			if (isset($_directories[$match['key']])) {
-				$_directory = $_directories[$match['key']];
-			} elseif (is_numeric($match['key'])) {
-				// try numeric index
-				$match['key'] = (int)$match['key'];
-				if (isset($_directories[$match['key']])) {
-					$_directory = $_directories[$match['key']];
-				} else {
-					// try at location index
-					$keys = array_keys($_directories);
-					$_directory = $_directories[$keys[$match['key']]];
-				}
-			}
-
-			if ($_directory) {
-				$_file = substr($file, strpos($file, ']') + 1);
-				$_filepath = $_directory . $_file;
-				if ($this->fileExists($source, $_filepath)) {
-					return $_filepath;
-				}
-			}
-		}
-
-		$_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-		// relative file name?
-		if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-			foreach ($_directories as $_directory) {
-				$_filepath = $_directory . $file;
-				if ($this->fileExists($source, $_filepath)) {
-					return $this->normalizePath($_filepath);
-				}
-				if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
-					// try PHP include_path
-					if ($_stream_resolve_include_path) {
-						$_filepath = stream_resolve_include_path($_filepath);
-					} else {
-						$_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
-					}
-
-					if ($_filepath !== false) {
-						if ($this->fileExists($source, $_filepath)) {
-							return $this->normalizePath($_filepath);
-						}
-					}
-				}
-			}
-		}
-
-		// try absolute filepath
-		if ($this->fileExists($source, $file)) {
-			return $file;
-		}
-
-		// no tpl file found
-		if ($_default_handler) {
-			if (!is_callable($_default_handler)) {
-				if ($source instanceof Smarty_Config_Source) {
-					throw new SmartyException("Default config handler not callable");
-				} else {
-					throw new SmartyException("Default template handler not callable");
-				}
-			}
-			$_return = call_user_func_array($_default_handler,
-				array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)
-			);
-			if (is_string($_return)) {
-				$source->timestamp = @filemtime($_return);
-				$source->exists = !!$source->timestamp;
-
-				return $_return;
-			} elseif ($_return === true) {
-				$source->content = $_content;
-				$source->timestamp = $_timestamp;
-				$source->exists = true;
-
-				return $_filepath;
-			}
-		}
-
-		// give up
-		return false;
-	}
-
-	/**
-	 * test is file exists and save timestamp
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 * @param  string                 $file   file name
-	 *
-	 * @return bool                   true if file exists
-	 */
-	protected function fileExists(Smarty_Template_Source $source, $file)
-	{
-		$source->timestamp = is_file($file) ? @filemtime($file) : false;
-
-		return $source->exists = !!$source->timestamp;
-	}
-
-	/**
-	 * Determine basename for compiled filename
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 resource's basename
-	 */
-	protected function getBasename(Smarty_Template_Source $source)
-	{
-		return null;
-	}
-
-	/**
-	 * Load Resource Handler
-	 *
-	 * @param  Smarty $smarty smarty object
-	 * @param  string $type   name of the resource
-	 *
-	 * @throws SmartyException
-	 * @return Smarty_Resource Resource Handler
-	 */
-	public static function load(Smarty $smarty, $type)
-	{
-		// try smarty's cache
-		if (isset($smarty->_resource_handlers[$type])) {
-			return $smarty->_resource_handlers[$type];
-		}
-
-		// try registered resource
-		if (isset($smarty->registered_resources[$type])) {
-			if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
-				$smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
-
-				// note registered to smarty is not kept unique!
-				return $smarty->_resource_handlers[$type];
-			}
-
-			if (!isset(self::$resources['registered'])) {
-				self::$resources['registered'] = new Smarty_Internal_Resource_Registered();
-			}
-			if (!isset($smarty->_resource_handlers[$type])) {
-				$smarty->_resource_handlers[$type] = self::$resources['registered'];
-			}
-
-			return $smarty->_resource_handlers[$type];
-		}
-
-		// try sysplugins dir
-		if (isset(self::$sysplugins[$type])) {
-			if (!isset(self::$resources[$type])) {
-				$_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-				self::$resources[$type] = new $_resource_class();
-			}
-
-			return $smarty->_resource_handlers[$type] = self::$resources[$type];
-		}
-
-		// try plugins dir
-		$_resource_class = 'Smarty_Resource_' . ucfirst($type);
-		if ($smarty->loadPlugin($_resource_class)) {
-			if (isset(self::$resources[$type])) {
-				return $smarty->_resource_handlers[$type] = self::$resources[$type];
-			}
-
-			if (class_exists($_resource_class, false)) {
-				self::$resources[$type] = new $_resource_class();
-
-				return $smarty->_resource_handlers[$type] = self::$resources[$type];
-			} else {
-				$smarty->registerResource($type, array(
-						"smarty_resource_{$type}_source",
-						"smarty_resource_{$type}_timestamp",
-						"smarty_resource_{$type}_secure",
-						"smarty_resource_{$type}_trusted"
-					)
-				);
-
-				// give it another try, now that the resource is registered properly
-				return self::load($smarty, $type);
-			}
-		}
-
-		// try streams
-		$_known_stream = stream_get_wrappers();
-		if (in_array($type, $_known_stream)) {
-			// is known stream
-			if (is_object($smarty->security_policy)) {
-				$smarty->security_policy->isTrustedStream($type);
-			}
-			if (!isset(self::$resources['stream'])) {
-				self::$resources['stream'] = new Smarty_Internal_Resource_Stream();
-			}
-
-			return $smarty->_resource_handlers[$type] = self::$resources['stream'];
-		}
-
-		// TODO: try default_(template|config)_handler
-
-		// give up
-		throw new SmartyException("Unknown resource type '{$type}'");
-	}
-
-	/**
-	 * extract resource_type and resource_name from template_resource and config_resource
-	 * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-	 *
-	 * @param  string $resource_name    template_resource or config_resource to parse
-	 * @param  string $default_resource the default resource_type defined in $smarty
-	 * @param  string &$name            the parsed resource name
-	 * @param  string &$type            the parsed resource type
-	 *
-	 * @return void
-	 */
-	protected static function parseResourceName($resource_name, $default_resource, &$name, &$type)
-	{
-		$parts = explode(':', $resource_name, 2);
-		if (!isset($parts[1]) || !isset($parts[0][1])) {
-			// no resource given, use default
-			// or single character before the colon is not a resource type, but part of the filepath
-			$type = $default_resource;
-			$name = $resource_name;
-		} else {
-			$type = $parts[0];
-			$name = $parts[1];
-		}
-	}
-
-	/**
-	 * modify resource_name according to resource handlers specifications
-	 *
-	 * @param  Smarty $smarty        Smarty instance
-	 * @param  string $resource_name resource_name to make unique
-	 *
-	 * @return string unique resource name
-	 */
-
-	/**
-	 * modify template_resource according to resource handlers specifications
-	 *
-	 * @param  Smarty_Internal_template $template          Smarty instance
-	 * @param  string                   $template_resource template_resource to extract resource handler and name of
-	 *
-	 * @return string unique resource name
-	 */
-	public static function getUniqueTemplateName($template, $template_resource)
-	{
-		self::parseResourceName($template_resource, $template->smarty->default_resource_type, $name, $type);
-		// TODO: optimize for Smarty's internal resource types
-		$resource = Smarty_Resource::load($template->smarty, $type);
-		// go relative to a given template?
-		$_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\");
-		if ($template instanceof Smarty_Internal_Template && $_file_is_dotted && ($template->source->type == 'file' || $template->parent->source->type == 'extends')) {
-			$name = dirname($template->source->filepath) . DS . $name;
-		}
-
-		return $resource->buildUniqueResourceName($template->smarty, $name);
-	}
-
-	/**
-	 * initialize Source Object for given resource
-	 * Either [$_template] or [$smarty, $template_resource] must be specified
-	 *
-	 * @param  Smarty_Internal_Template $_template         template object
-	 * @param  Smarty                   $smarty            smarty object
-	 * @param  string                   $template_resource resource identifier
-	 *
-	 * @return Smarty_Template_Source   Source Object
-	 */
-	public static function source(Smarty_Internal_Template $_template = null, Smarty $smarty = null, $template_resource = null)
-	{
-		if ($_template) {
-			$smarty = $_template->smarty;
-			$template_resource = $_template->template_resource;
-		}
-
-		// parse resource_name, load resource handler, identify unique resource name
-		self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
-		$resource = Smarty_Resource::load($smarty, $type);
-		// go relative to a given template?
-		$_file_is_dotted = isset($name[0]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\");
-		if ($_file_is_dotted && isset($_template) && $_template->parent instanceof Smarty_Internal_Template && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) {
-			$name2 = dirname($_template->parent->source->filepath) . DS . $name;
-		} else {
-			$name2 = $name;
-		}
-		$unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2);
-
-		// check runtime cache
-		$_cache_key = 'template|' . $unique_resource_name;
-		if ($smarty->compile_id) {
-			$_cache_key .= '|' . $smarty->compile_id;
-		}
-		if (isset(self::$sources[$_cache_key])) {
-			return self::$sources[$_cache_key];
-		}
-
-		// create source
-		$source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name, $unique_resource_name);
-		$resource->populate($source, $_template);
-
-		// runtime cache
-		self::$sources[$_cache_key] = $source;
-
-		return $source;
-	}
-
-	/**
-	 * initialize Config Source Object for given resource
-	 *
-	 * @param  Smarty_Internal_Config $_config config object
-	 *
-	 * @throws SmartyException
-	 * @return Smarty_Config_Source   Source Object
-	 */
-	public static function config(Smarty_Internal_Config $_config)
-	{
-		static $_incompatible_resources = array('eval' => true, 'string' => true, 'extends' => true, 'php' => true);
-		$config_resource = $_config->config_resource;
-		$smarty = $_config->smarty;
-
-		// parse resource_name
-		self::parseResourceName($config_resource, $smarty->default_config_type, $name, $type);
-
-		// make sure configs are not loaded via anything smarty can't handle
-		if (isset($_incompatible_resources[$type])) {
-			throw new SmartyException ("Unable to use resource '{$type}' for config");
-		}
-
-		// load resource handler, identify unique resource name
-		$resource = Smarty_Resource::load($smarty, $type);
-		$unique_resource_name = $resource->buildUniqueResourceName($smarty, $name, true);
-
-		// check runtime cache
-		$_cache_key = 'config|' . $unique_resource_name;
-		if (isset(self::$sources[$_cache_key])) {
-			return self::$sources[$_cache_key];
-		}
-
-		// create source
-		$source = new Smarty_Config_Source($resource, $smarty, $config_resource, $type, $name, $unique_resource_name);
-		$resource->populate($source, null);
-
-		// runtime cache
-		self::$sources[$_cache_key] = $source;
-
-		return $source;
-	}
-}
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existence
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Source
-{
-	/**
-	 * Name of the Class to compile this resource's contents with
-	 *
-	 * @var string
-	 */
-	public $compiler_class = null;
-
-	/**
-	 * Name of the Class to tokenize this resource's contents with
-	 *
-	 * @var string
-	 */
-	public $template_lexer_class = null;
-
-	/**
-	 * Name of the Class to parse this resource's contents with
-	 *
-	 * @var string
-	 */
-	public $template_parser_class = null;
-
-	/**
-	 * Unique Template id
-	 *
-	 * @var string
-	 */
-	public $uid = null;
-
-	/**
-	 * Template Resource (Smarty_Internal_Template::$template_resource)
-	 *
-	 * @var string
-	 */
-	public $resource = null;
-
-	/**
-	 * Resource Type
-	 *
-	 * @var string
-	 */
-	public $type = null;
-
-	/**
-	 * Resource Name
-	 *
-	 * @var string
-	 */
-	public $name = null;
-
-	/**
-	 * Unique Resource Name
-	 *
-	 * @var string
-	 */
-	public $unique_resource = null;
-
-	/**
-	 * Source Filepath
-	 *
-	 * @var string
-	 */
-	public $filepath = null;
-
-	/**
-	 * Source is bypassing compiler
-	 *
-	 * @var boolean
-	 */
-	public $uncompiled = null;
-
-	/**
-	 * Source must be recompiled on every occasion
-	 *
-	 * @var boolean
-	 */
-	public $recompiled = null;
-
-	/**
-	 * The Components an extended template is made of
-	 *
-	 * @var array
-	 */
-	public $components = null;
-
-	/**
-	 * Resource Handler
-	 *
-	 * @var Smarty_Resource
-	 */
-	public $handler = null;
-
-	/**
-	 * Smarty instance
-	 *
-	 * @var Smarty
-	 */
-	public $smarty = null;
-
-	/**
-	 * create Source Object container
-	 *
-	 * @param Smarty_Resource $handler         Resource Handler this source object communicates with
-	 * @param Smarty          $smarty          Smarty instance this source object belongs to
-	 * @param string          $resource        full template_resource
-	 * @param string          $type            type of resource
-	 * @param string          $name            resource name
-	 * @param string          $unique_resource unique resource name
-	 */
-	public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-	{
-		$this->handler = $handler; // Note: prone to circular references
-
-		$this->compiler_class = $handler->compiler_class;
-		$this->template_lexer_class = $handler->template_lexer_class;
-		$this->template_parser_class = $handler->template_parser_class;
-		$this->uncompiled = $this->handler instanceof Smarty_Resource_Uncompiled;
-		$this->recompiled = $this->handler instanceof Smarty_Resource_Recompiled;
-
-		$this->smarty = $smarty;
-		$this->resource = $resource;
-		$this->type = $type;
-		$this->name = $name;
-		$this->unique_resource = $unique_resource;
-	}
-
-	/**
-	 * get a Compiled Object of this source
-	 *
-	 * @param  Smarty_Internal_Template|Smarty_Internal_Config $_template template object
-	 *
-	 * @return Smarty_Template_Compiled compiled object
-	 */
-	public function getCompiled($_template)
-	{
-		// check runtime cache
-		$_cache_key = $this->unique_resource . '#' . $_template->compile_id;
-		if (isset(Smarty_Resource::$compileds[$_cache_key])) {
-			return Smarty_Resource::$compileds[$_cache_key];
-		}
-
-		$compiled = new Smarty_Template_Compiled($this);
-		$this->handler->populateCompiledFilepath($compiled, $_template);
-		$compiled->timestamp = @filemtime($compiled->filepath);
-		$compiled->exists = !!$compiled->timestamp;
-
-		// runtime cache
-		Smarty_Resource::$compileds[$_cache_key] = $compiled;
-
-		return $compiled;
-	}
-
-	/**
-	 * render the uncompiled source
-	 *
-	 * @param Smarty_Internal_Template $_template template object
-	 */
-	public function renderUncompiled(Smarty_Internal_Template $_template)
-	{
-		return $this->handler->renderUncompiled($this, $_template);
-	}
-
-	/**
-	 * <<magic>> Generic Setter.
-	 *
-	 * @param  string $property_name valid: timestamp, exists, content, template
-	 * @param  mixed  $value         new value (is not checked)
-	 *
-	 * @throws SmartyException if $property_name is not valid
-	 */
-	public function __set($property_name, $value)
-	{
-		switch ($property_name) {
-			// regular attributes
-			case 'timestamp':
-			case 'exists':
-			case 'content':
-				// required for extends: only
-			case 'template':
-				$this->$property_name = $value;
-				break;
-
-			default:
-				throw new SmartyException("invalid source property '$property_name'.");
-		}
-	}
-
-	/**
-	 * <<magic>> Generic getter.
-	 *
-	 * @param  string $property_name valid: timestamp, exists, content
-	 *
-	 * @return mixed
-	 * @throws SmartyException if $property_name is not valid
-	 */
-	public function __get($property_name)
-	{
-		switch ($property_name) {
-			case 'timestamp':
-			case 'exists':
-				$this->handler->populateTimestamp($this);
-
-				return $this->$property_name;
-
-			case 'content':
-				return $this->content = $this->handler->getContent($this);
-
-			default:
-				throw new SmartyException("source property '$property_name' does not exist.");
-		}
-	}
-}
-
-/**
- * Smarty Resource Data Object
- * Meta Data Container for Template Files
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- * @property string $content compiled content
- */
-class Smarty_Template_Compiled
-{
-	/**
-	 * Compiled Filepath
-	 *
-	 * @var string
-	 */
-	public $filepath = null;
-
-	/**
-	 * Compiled Timestamp
-	 *
-	 * @var integer
-	 */
-	public $timestamp = null;
-
-	/**
-	 * Compiled Existence
-	 *
-	 * @var boolean
-	 */
-	public $exists = false;
-
-	/**
-	 * Compiled Content Loaded
-	 *
-	 * @var boolean
-	 */
-	public $loaded = false;
-
-	/**
-	 * Template was compiled
-	 *
-	 * @var boolean
-	 */
-	public $isCompiled = false;
-
-	/**
-	 * Source Object
-	 *
-	 * @var Smarty_Template_Source
-	 */
-	public $source = null;
-
-	/**
-	 * Metadata properties
-	 * populated by Smarty_Internal_Template::decodeProperties()
-	 *
-	 * @var array
-	 */
-	public $_properties = null;
-
-	/**
-	 * create Compiled Object container
-	 *
-	 * @param Smarty_Template_Source $source source object this compiled object belongs to
-	 */
-	public function __construct(Smarty_Template_Source $source)
-	{
-		$this->source = $source;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_custom.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_custom.php
deleted file mode 100644
index 9b6472ddd..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_custom.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Wrapper Implementation for custom resource plugins
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Custom extends Smarty_Resource
-{
-	/**
-	 * fetch template and its modification time from data source
-	 *
-	 * @param string  $name    template name
-	 * @param string  &$source template source
-	 * @param integer &$mtime  template modification timestamp (epoch)
-	 */
-	abstract protected function fetch($name, &$source, &$mtime);
-
-	/**
-	 * Fetch template's modification timestamp from data source
-	 * {@internal implementing this method is optional.
-	 *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
-	 *
-	 * @param  string $name template name
-	 *
-	 * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-	 */
-	protected function fetchTimestamp($name)
-	{
-		return null;
-	}
-
-	/**
-	 * populate Source Object with meta data from Resource
-	 *
-	 * @param Smarty_Template_Source   $source    source object
-	 * @param Smarty_Internal_Template $_template template object
-	 */
-	public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-	{
-		$source->filepath = $source->type . ':' . $source->name;
-		$source->uid = sha1($source->type . ':' . $source->name);
-
-		$mtime = $this->fetchTimestamp($source->name);
-		if ($mtime !== null) {
-			$source->timestamp = $mtime;
-		} else {
-			$this->fetch($source->name, $content, $timestamp);
-			$source->timestamp = isset($timestamp) ? $timestamp : false;
-			if (isset($content)) {
-				$source->content = $content;
-			}
-		}
-		$source->exists = !!$source->timestamp;
-	}
-
-	/**
-	 * Load template's source into current template object
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 template source
-	 * @throws SmartyException        if source cannot be loaded
-	 */
-	public function getContent(Smarty_Template_Source $source)
-	{
-		$this->fetch($source->name, $content, $timestamp);
-		if (isset($content)) {
-			return $content;
-		}
-
-		throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-	}
-
-	/**
-	 * Determine basename for compiled filename
-	 *
-	 * @param  Smarty_Template_Source $source source object
-	 *
-	 * @return string                 resource's basename
-	 */
-	protected function getBasename(Smarty_Template_Source $source)
-	{
-		return basename($source->name);
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_recompiled.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_recompiled.php
deleted file mode 100644
index d0f154b91..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_recompiled.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins that don't compile cache
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Recompiled extends Smarty_Resource
-{
-	/**
-	 * populate Compiled Object with compiled filepath
-	 *
-	 * @param  Smarty_Template_Compiled $compiled  compiled object
-	 * @param  Smarty_Internal_Template $_template template object
-	 *
-	 * @return void
-	 */
-	public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-	{
-		$compiled->filepath = false;
-		$compiled->timestamp = false;
-		$compiled->exists = false;
-	}
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_uncompiled.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_uncompiled.php
deleted file mode 100644
index 4ee5d7908..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_resource_uncompiled.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package    Smarty
- * @subpackage TemplateResources
- * @author     Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- * Base implementation for resource plugins that don't use the compiler
- *
- * @package    Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
-{
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param  Smarty_Template_Source   $source    source object
-     * @param  Smarty_Internal_Template $_template template object
-     *
-     * @throws SmartyException          on failure
-     */
-    abstract public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
-
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object (is ignored)
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-}
diff --git a/lib/copy_this/www/lib/smarty/sysplugins/smarty_security.php b/lib/copy_this/www/lib/smarty/sysplugins/smarty_security.php
deleted file mode 100644
index 75d8756ec..000000000
--- a/lib/copy_this/www/lib/smarty/sysplugins/smarty_security.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage Security
- * @author     Uwe Tews
- */
-
-/*
- * FIXME: Smarty_Security API
- *      - getter and setter instead of public properties would allow cultivating an internal cache properly
- *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
- *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
- *        as this would lead to (severe) performance penalty! how should this be handled?
- */
-
-/**
- * This class does contain the security settings
- */
-class Smarty_Security
-{
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
-    /**
-     * This is the list of template directories that are considered secure.
-     * $template_dir is in this list implicitly.
-     *
-     * @var array
-     */
-    public $secure_dir = array();
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-    /**
-     * List of regular expressions (PCRE) that include trusted URIs
-     *
-     * @var array
-     */
-    public $trusted_uri = array();
-    /**
-     * This is an array of trusted static classes.
-     * If empty access to all static classes is allowed.
-     * If set to 'none' none is allowed.
-     *
-     * @var array
-     */
-    public $static_classes = array();
-    /**
-     * This is an array of trusted PHP functions.
-     * If empty all functions are allowed.
-     * To disable all PHP functions set $php_functions = null.
-     *
-     * @var array
-     */
-    public $php_functions = array(
-        'isset', 'empty',
-        'count', 'sizeof',
-        'in_array', 'is_array',
-        'time',
-        'nl2br',
-    );
-    /**
-     * This is an array of trusted PHP modifiers.
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $modifiers = null.
-     *
-     * @var array
-     */
-    public $php_modifiers = array(
-        'escape',
-        'count'
-    );
-    /**
-     * This is an array of allowed tags.
-     * If empty no restriction by allowed_tags.
-     *
-     * @var array
-     */
-    public $allowed_tags = array();
-    /**
-     * This is an array of disabled tags.
-     * If empty no restriction by disabled_tags.
-     *
-     * @var array
-     */
-    public $disabled_tags = array();
-    /**
-     * This is an array of allowed modifier plugins.
-     * If empty no restriction by allowed_modifiers.
-     *
-     * @var array
-     */
-    public $allowed_modifiers = array();
-    /**
-     * This is an array of disabled modifier plugins.
-     * If empty no restriction by disabled_modifiers.
-     *
-     * @var array
-     */
-    public $disabled_modifiers = array();
-    /**
-     * This is an array of trusted streams.
-     * If empty all streams are allowed.
-     * To disable all streams set $streams = null.
-     *
-     * @var array
-     */
-    public $streams = array('file');
-    /**
-     * + flag if constants can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_constants = true;
-    /**
-     * + flag if super globals can be accessed from template
-     *
-     * @var boolean
-     */
-    public $allow_super_globals = true;
-
-    /**
-     * Cache for $resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_resource_dir = null;
-    /**
-     * Cache for $template_dir lookup
-     *
-     * @var array
-     */
-    protected $_template_dir = null;
-    /**
-     * Cache for $config_dir lookup
-     *
-     * @var array
-     */
-    protected $_config_dir = null;
-    /**
-     * Cache for $secure_dir lookup
-     *
-     * @var array
-     */
-    protected $_secure_dir = null;
-    /**
-     * Cache for $php_resource_dir lookup
-     *
-     * @var array
-     */
-    protected $_php_resource_dir = null;
-    /**
-     * Cache for $trusted_dir lookup
-     *
-     * @var array
-     */
-    protected $_trusted_dir = null;
-
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    }
-
-    /**
-     * Check if PHP function is trusted.
-     *
-     * @param  string $function_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if function is trusted
-     * @throws SmartyCompilerException if php function is not trusted
-     */
-    public function isTrustedPhpFunction($function_name, $compiler)
-    {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class is trusted.
-     *
-     * @param  string $class_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if class is trusted
-     * @throws SmartyCompilerException if static class is not trusted
-     */
-    public function isTrustedStaticClass($class_name, $compiler)
-    {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if PHP modifier is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if modifier is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedPhpModifier($modifier_name, $compiler)
-    {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if tag is trusted.
-     *
-     * @param  string $tag_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedTag($tag_name, $compiler)
-    {
-        // check for internal always required tags
-        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
-                                      'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))
-        ) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_tags)) {
-            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
-            }
-        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if modifier plugin is trusted.
-     *
-     * @param  string $modifier_name
-     * @param  object $compiler compiler object
-     *
-     * @return boolean                 true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedModifier($modifier_name, $compiler)
-    {
-        // check for internal always allowed modifier
-        if (in_array($modifier_name, array('default'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_modifiers)) {
-            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
-            }
-        } elseif (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if stream is trusted.
-     *
-     * @param  string $stream_name
-     *
-     * @return boolean         true if stream is trusted
-     * @throws SmartyException if stream is not trusted
-     */
-    public function isTrustedStream($stream_name)
-    {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
-            return true;
-        }
-
-        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if directory is not trusted
-     */
-    public function isTrustedResourceDir($filepath)
-    {
-        $_template = false;
-        $_config = false;
-        $_secure = false;
-
-        $_template_dir = $this->smarty->getTemplateDir();
-        $_config_dir = $this->smarty->getConfigDir();
-
-        // check if index is outdated
-        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
-            || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
-            || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
-        ) {
-            $this->_resource_dir = array();
-            $_template = true;
-            $_config = true;
-            $_secure = !empty($this->secure_dir);
-        }
-
-        // rebuild template dir index
-        if ($_template) {
-            $this->_template_dir = $_template_dir;
-            foreach ($_template_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        // rebuild config dir index
-        if ($_config) {
-            $this->_config_dir = $_config_dir;
-            foreach ($_config_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        // rebuild secure dir index
-        if ($_secure) {
-            $this->_secure_dir = $this->secure_dir;
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[$directory] = true;
-            // test if the directory is trusted
-            if (isset($this->_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
-
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        // give up
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
-    }
-
-    /**
-     * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
-     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
-     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     *
-     * @param  string $uri
-     *
-     * @return boolean         true if URI is trusted
-     * @throws SmartyException if URI is not trusted
-     * @uses $trusted_uri for list of patterns to match against $uri
-     */
-    public function isTrustedUri($uri)
-    {
-        $_uri = parse_url($uri);
-        if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
-            $_uri = $_uri['scheme'] . '://' . $_uri['host'];
-            foreach ($this->trusted_uri as $pattern) {
-                if (preg_match($pattern, $_uri)) {
-                    return true;
-                }
-            }
-        }
-
-        throw new SmartyException("URI '{$uri}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param  string $filepath
-     *
-     * @return boolean         true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array) $this->trusted_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_php_resource_dir[$directory] = true;
-            }
-        }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[] = $directory;
-            // test if the directory is trusted
-            if (isset($this->_php_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookup
-                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
-
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
-    }
-}
diff --git a/lib/copy_this/www/lib/sphinx.php b/lib/copy_this/www/lib/sphinx.php
deleted file mode 100644
index 23596385f..000000000
--- a/lib/copy_this/www/lib/sphinx.php
+++ /dev/null
@@ -1,1364 +0,0 @@
-<?php
-/**
- *
- * Sphinx search extension for Newznab.
- * ====================================
- *
- * @package Sphinx
- */
-
-if (!defined("FS_ROOT")) { define('FS_ROOT', realpath(dirname(__FILE__))); }
-require_once(FS_ROOT."/../../www/config.php");
-require_once(FS_ROOT."/../../www/lib/framework/db.php");
-require_once(FS_ROOT."/../../www/lib/category.php");
-require_once(FS_ROOT."/../../www/lib/nzb.php");
-require_once(FS_ROOT."/../../www/lib/releasefiles.php");
-require_once(FS_ROOT."/../../www/lib/util.php");
-
-// Every day
-define("INDEX_MERGE_FREQ", 1440);
-
-// TODO: Make this configurable?
-define("MAX_MATCHES", 10000);
-
-/**
- * This class manages indexing and searching the full-text indexes.
- */
-class Sphinx
-{
-    /**
-     * Constructor creates the necessary variables needed later on.
-     *
-     * @ignore
-     * @access private
-     */
-    function __construct()
-    {
-        $s = new Sites;
-
-		$this->site = $s->get();
-		$this->nzb  = new Nzb;
-		$this->indexes = array("releases", "releasefiles",
-		                       "releasenfo", "nzbs", "predb");
-    }
-
-    /**
-     * Runs a Sphinx command.  This suppresses various lines of output from the
-     * Sphinx binaries.
-     *
-     * @param   string  $cmd    The command to run.
-     * @param   boolean $stdout If ``true`` (default), print to stdout.
-     * @return  array   An array of lines returned from the popen process.
-     */
-    public function runCmd($cmd, $stdout=true)
-    {
-        $output = array();
-        $handle = popen($cmd, "r");
-        while ($line = fgets($handle)) {
-            if (startsWith($line, "Sphinx") ||
-                startsWith($line, "Copyright") ||
-                startsWith($line, "\n") || startsWith($line, "using config"))
-            {
-                continue;
-            }
-
-            $output[] = $line;
-            if ($stdout) {
-                printf("%s", $line);
-            }
-        }
-        return $output;
-    }
-
-    /**
-     * Returns the next merge date as a timestamp.  This value is suitable for
-     * use as the `nextmergedate` value in the database.
-     */
-    public function getNextMergeDate()
-    {
-        return strtotime("tomorrow ".$this->site->sphinxmergefreq);
-    }
-
-    /**
-     * Returns the next rebuild date as a timestamp.  This value is suitable
-     * for use as the `nextrebuilddate` value in the database.
-     */
-    public function getNextRebuildDate()
-    {
-        $rebuildStr = $this->site->sphinxrebuildfreq_day." "
-                    . $this->site->sphinxrebuildfreq;
-        $rebuildDate = strtotime($rebuildStr);
-        if ($rebuildDate < time(true)) {
-            // Date is in the past, pick the next one
-            $rebuildStr = "next ".$rebuildStr;
-            $rebuildDate = strtotime($rebuildStr);
-        }
-        return $rebuildDate;
-    }
-
-    /**
-     * Sets the values for ``lastrebuilddate`` and ``nextrebuilddate`` in the
-     * database for the given ``$index``.
-     *
-     * @param  string    $index              The index to update.
-     * @param  int       $lastRebuildDate    The timestamp of the update.
-     * @return boolean
-     */
-    public function setRebuildDates($index, $lastRebuildDate=0)
-    {
-        if (!$this->isIndexEnabled($index)) {
-            // This is an invalid index or isn't enabled
-            return false;
-        }
-
-        $db = new DB();
-
-        if ($lastRebuildDate == 0) {
-            $lastRebuildDate = "NOW()";
-        } else {
-            $lastRebuildDate = sprintf("FROM_UNIXTIME(%d)", $lastRebuildDate);
-        }
-
-        $index = $db->escapeString($index);
-        $nextRebuildDate = sprintf("FROM_UNIXTIME(%d)",
-                                                $this->getNextRebuildDate());
-
-        $sql = "UPDATE sphinx "
-             . "SET lastrebuilddate = %s, "
-             . "nextrebuilddate = %s "
-             . "WHERE name = %s";
-        $db->queryDirect(sprintf($sql, $lastRebuildDate, $nextRebuildDate,
-                                 $index));
-        return true;
-    }
-
-    /**
-     * Sets the value for ``lastmergedate`` and ``nextmergedate`` in the
-     * database for the given ``$index``.  If ``$lastMergedDate`` is supplied
-     * it will be used as the value for ``lastmergedate``, else ``NOW()`` will
-     * used.
-     *
-     * @param  string    $index          The index to update.
-     * @param  int       $lastMergedDate The timestamp of the update.
-     * @return boolean
-     */
-    public function setMergeDates($index, $lastMergedDate=0)
-    {
-        if (!$this->isIndexEnabled($index)) {
-            // This is an invalid index or isn't enabled
-            return false;
-        }
-
-        $db = new DB();
-
-        if ($lastMergedDate == 0) {
-            $lastMergedDate = "NOW()";
-        } else {
-            $lastMergedDate = sprintf("FROM_UNIXTIME(%d)", $lastMergedDate);
-        }
-
-        $index = $db->escapeString($index);
-        $nextMergeDate = sprintf("FROM_UNIXTIME(%d)",
-                                            $this->getNextMergeDate());
-
-        $sql = "UPDATE sphinx "
-             . "SET lastmergedate = %s, "
-             . "nextmergedate = %s "
-             . "WHERE name = %s";
-        $db->queryDirect(sprintf($sql, $lastMergedDate, $nextMergeDate,
-                                 $index));
-        return true;
-    }
-
-    /**
-     * Updates the given index $index.  If $full is `true`, then the
-     * 'main' index is updated, otherwise the 'delta' index is updated.
-     *
-     * @param   string  $index
-     * @param   boolean $full
-     * @return  null
-     */
-    public function updateIndex($index, $full=false)
-    {
-        $index = strtolower($index);
-        if (!$this->isIndexEnabled($index)) {
-            // This is an invalid index or isn't enabled
-            return false;
-        }
-
-        if (!$full) {
-            // We're doing a delta update instead
-            $index .= "_delta";
-        }
-
-        // Path to `indexer` binary
-        $indexer = $this->getSphinxBinPath("indexer");
-        $cmd = sprintf("%s --rotate %s", $indexer, $index);
-        $this->runCmd($cmd);
-
-        if ($full) {
-            // Since we just updated the main index, we need to update dates.
-            // Notice that we also update the merge dates--we do this because a
-            // rebuild is essentially a "merge" and updating these dates will
-            // force the delta indexes to be "reset" on their next update, which
-            // is what we want.
-            $this->setMergeDates($index);
-            $this->setRebuildDates($index);
-        }
-    }
-
-    /**
-     * Merges a 'delta' index with a 'main' index, but only if the index is
-     * enabled.
-     *
-     * @param   string  $index          The index to merge.
-     * @param   boolean $updateDates    True (default) to update merge dates.
-     * @return  null
-     */
-    public function mergeIndex($index, $updateDates=True)
-    {
-        $index = strtolower($index);
-        if (!$this->isIndexEnabled($index)) {
-            // This is an invalid index or isn't enabled
-            return false;
-        }
-        $indexer = $this->getSphinxBinPath("indexer");
-        $cmd = sprintf("%s --rotate --merge %s %s", $indexer, $index,
-                                                    $index."_delta");
-        $this->runCmd($cmd);
-
-        if ($updateDates) {
-            $this->setMergeDates($index);
-        }
-
-        // TODO: Return false if the merge fails
-        return true;
-    }
-
-    /**
-     * Extracts all of the information about a given ``$index`` via the
-     * ``indextool`` program provided by Sphinx.
-     *
-     * @param string    $index  The index to query.
-     * @param boolean   $main   If ``false`` (default), query delta index.
-     * @return  Array of information about the index.
-     */
-    public function indexDetails($index, $main=False) {
-        $details = array(
-            "enabled"     => false,
-            "field_list"  => array(),
-            "attr_list"   => array()
-        );
-
-        if ($this->isIndexEnabled($index)) {
-            $details["enabled"] = true;
-
-            if (!$main) {
-                $index .= "_delta";
-            }
-
-            $handle = fopen($this->site->sphinxconfpath, 'r');
-            if ($handle) {
-                $indexPath = "";
-                while ($line = fgets($handle)) {
-                    $pattern = sprintf("/^[ ]*path[ ]*=[ ]*(.*%s)$/", $index);
-                    preg_match($pattern, $line, $matches);
-                    if ($matches) {
-                        $indexPath = $matches[1];
-                    }
-                }
-
-                if ($indexPath) {
-                    $indexer = $this->getSphinxBinPath("indextool");
-                    $cmd = sprintf("%s --dumpheader %s.sph", $indexer,
-                                        $indexPath);
-                    foreach($this->runCmd($cmd, false) as $line) {
-                        preg_match("/^[ ]*(?P<key>[\d\w- ]+)[ ]*:[ ]*(?P<value>.+)$/", $line, $matches);
-                        if ($matches) {
-                            preg_match("/(?P<key>attr|field)[ ]+(?P<num>[\d]+)/", $matches["key"], $m);
-                            if ($m) {
-                                switch($m["key"]) {
-                                    case "attr":
-                                        $details["attr_list"][] = $matches["value"];
-                                        break;
-                                    case "field":
-                                        $details["field_list"][] = $matches["value"];
-                                        break;
-                                }
-                            } else {
-                                $details[$matches["key"]] = $matches["value"];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return $details;
-    }
-
-    /**
-     * Updates indexes.  This function does quite a lot of stuff:
-     *
-     *  1) Rebuilds any indexes that are due
-     *  2) Merges any indexes that are due
-     *  3) Updates delta indexes
-     *
-     * The first two items listed occur conditionally--they must be "due" in
-     * order to be processed.  The last item, updating of delta indexes, occurs
-     * unconditionally and will happen every time this function is called.
-     */
-    public function update()
-    {
-        $db = new DB();
-
-        if (!$this->site->sphinxenabled) {
-            // Sphinx is disabled, so we don't do anything.
-            return;
-        }
-
-        // Loop over the enabled indexes and see what operations are due
-        $sql = "SELECT * FROM sphinx";
-        $res = $db->queryDirect($sql);
-        while ($row = $db->getAssocArray($res)) {
-            $index = $row["name"];
-
-            if (!$this->isIndexEnabled($row["name"])) {
-                continue;
-            }
-
-            $indexDetails = $this->indexDetails($index);
-            $isMergeDueDate = (strtotime($row['nextmergedate']) <= time(true));
-            $isMergeDueSize = (intval($indexDetails["total-documents"]) >=
-                               intval($this->site->sphinxmergefreq_count));
-
-            if (strtotime($row['nextrebuilddate']) <= time(true) &&
-                $this->site->sphinxrebuildfreq_day != "")
-            {
-                // Rebuild required
-                printf("Index '%s' is going to be rebuilt.\n", $index);
-
-                // TODO: Check for success or failure.
-                $this->updateIndex($index, true);
-            } else if ($isMergeDueDate || $isMergeDueSize) {
-                // A merge is due, print out why
-                if ($isMergeDueDate) {
-                    printf("Index '%s_delta' is due for merging.\n", $index);
-                } else if ($isMergeDueSize) {
-                    printf("Index '%s_delta' has grown above critical size ".
-                           "and will be merged (contains %s records).\n",
-                           $index, $indexDetails["total-documents"]);
-                }
-
-                if ($this->mergeIndex($index)) {
-                    printf("Merge successful.\n");
-                } else {
-                    // TODO: Error message
-                    printf("[Error]: Merge failed.\n");
-                }
-            }
-        }
-
-        printf("Updating delta indexes\n");
-        foreach($this->getAllEnabledIndexes() as $index) {
-            // Index `nzbs` is never updated this way because it is a RT index
-            // and doesn't use the main+delta scheme
-            if ($index != "nzbs") {
-                printf("Updating '%s'\n", $index);
-                $this->updateIndex($index);
-            }
-        }
-    }
-
-    /**
-     * Returns the path to the Sphinx binary ``$bin``.  For example, if the
-     * path to Sphinx's "indexer" binary is desired, this function can be used
-     * to get the full path to it.  It is also desirable to use this function
-     * as it properly sets the ``sphinx.conf`` file to use.
-     *
-     * @param   string $bin The Sphinx binary to run (indexer, searchd, etc.).
-     * @return  string      The path to the binary.
-     */
-    public function getSphinxBinPath($bin)
-    {
-        $path = rtrim($this->site->sphinxbinpath, DIRECTORY_SEPARATOR);
-        $conf = $this->site->sphinxconfpath;
-
-        if ($path) {
-            // $path is a path to a directory.
-            $path .= DIRECTORY_SEPARATOR ;
-        }
-        $path .= $bin;
-
-        // The '-c' sets the config file (sphinx.conf).
-		$path = sprintf("\"%s\" -c \"%s\"", trim($path), $conf);
-        return $path;
-    }
-
-    /**
-     * Returns ``true`` if ``$index`` is enabled, ``false`` otherwise.
-     *
-     * @param   string  $index  The index to check.
-     * @return  boolean
-     */
-    public function isIndexEnabled($index)
-    {
-        // Is Sphinx enabled?
-        if (!$this->site->sphinxenabled) {
-            return false;
-        }
-
-        // Only check "main" index, since the delta will be enabled
-        // if main is as well.
-        $index = strtolower(str_replace("_delta", "", $index));
-        switch ($index) {
-            case "releases":
-                return true;    // Always enabled, as long as Sphinx is
-            case "releasenfo":
-                return (bool)$this->site->sphinxindexnfos;
-            case "releasefiles":
-                return (bool)$this->site->sphinxindexreleasefiles;
-            case "nzbs":
-                return (bool)$this->site->sphinxindexnzbs;
-            case "predb":
-                return (bool)$this->site->sphinxindexpredb;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Returns an array of all the indexes that are enabled.  If Sphinx support
-     * isn't enabled, then this returns an empty array.
-     *
-     * @param   boolean Whether or not to include the delta indexes as well.
-     * @return  array   An array of string of the enabled indexes.
-     */
-    public function getAllEnabledIndexes($deltas=false, $exclude=array())
-    {
-        $enabled = array();
-        foreach($this->indexes as $index) {
-            if ($this->isIndexEnabled($index) && !in_array($index, $exclude)) {
-                $enabled[] = $index;
-                if ($deltas && $index != "nzbs") {
-                    $enabled[] = $index."_delta";
-                }
-            }
-        }
-        return $enabled;
-    }
-
-    /**
-     * Generates and returns a string of the of ``sphinx.conf`` file.
-     * ``$sphinxDir`` should be a string representing the directory in which to
-     * store the indexes.
-     *
-     * @param   string $sphinxDir   Path to where indexes should be stored.
-     * @return  string
-     */
-    public function generateSphinxConf($sphinxDir="", $sphinxConf="")
-    {
-        /**
-         * Simple "python-like" key->value string substitution:
-         *
-         *  // Create a string: "hi there"
-         *  subst("%(a)s %(b)s", array("a" => "hi", "b" => "there"));
-         *
-         * @param   string    $str
-         * @param   array     $dict
-         * @return  string
-         */
-        function subst($str, $dict)
-        {
-            $fn  = create_function('$a', 'return "/%\\($a\\)s/";');
-            $map = array_map($fn, array_keys($dict));
-            return preg_replace($map, array_values($dict), $str);
-        }
-
-        $nnRoot = realpath(FS_ROOT."/../../");
-
-        if (!$sphinxDir) {
-            $sphinxDir = $nnRoot."/db/sphinxdata";
-        }
-
-        if (!$sphinxConf) {
-            $sphinxConf = $sphinxDir."/sphinx.conf";
-        }
-
-        $sphinxConfFile = fopen($sphinxConf, 'w');
-
-        $filename = $nnRoot."/misc/sphinx/sphinx.tpl";
-        $handle = fopen($filename, "r");
-        $conf = fread($handle, filesize($filename));
-        $vars = array(
-            "db_host"           => DB_HOST,
-            "db_user"           => DB_USER,
-            "db_pass"           => DB_PASSWORD,
-            "db_name"           => DB_NAME,
-            "sphinx_dir"        => $sphinxDir
-        );
-
-        fwrite($sphinxConfFile, subst($conf, $vars));
-        fclose($sphinxConfFile);
-
-        return $sphinxConf;
-    }
-
-    /**
-     * Indexing function for NZB contents.  Unlink the other indexes, 'nzbs'
-     * can't be indexed from MySQL data directly since the data to be indexed
-     * is contained within the compress NZB files on disk.  This function
-     * decompresses the NZBs in memory, parses them, extracts the useful
-     * bits which are to be store in the indexer and then updates the index
-     * in real time.
-     *
-     * If ``$startingID`` is negative, then the last successfully indexed
-     * release will be identified and this will resume indexing from that id
-     * onwards.  If this is a positive value, then only releases with an id
-     * larger than or equal to this will be indexed.  In order to re-index
-     * everything, pass 0.
-     *
-     * Returns the number of of NZBs that were successfully indexed.
-     *
-     * @param   int $startingID The id of the first release to index.
-     * @return  int
-     *
-     */
-    public function indexNZBs($startingID=-1)
-    {
-
-        // TODO: Use batching
-        //       See: http://sphinxsearch.com/docs/2.0.1/rt-caveats.html
-        //
-        if (!$this->isIndexEnabled("nzbs")) {
-            return 0;
-        }
-
-        $out = fopen("php://stdout", 'w');
-
-        // Get connection to Sphinx's MySQL interface.
-        // Connect to Sphinx
-		$hostport = explode (":", $this->site->sphinxserverhost);
-        $sdb = mysqli_connect($hostport[0], "root", "", "", $hostport[1]);
-        if (!$sdb) {
-            // Couldn't connect to Sphinx.
-            return false;
-        }
-
-        // Get connection to Newznab's MySQL database
-        $ndb = new DB;
-
-        // Determine which release to start with
-        if ($startingID < 0) {
-            $sql = "SELECT id FROM nzbs ORDER BY id DESC LIMIT 1";
-            $result = mysqli_query($sdb, $sql);
-            if (!$result) {
-                $startingID = 0;
-            } else {
-                $row = mysqli_fetch_row($result);
-                $startingID = (int)$row[0];
-            }
-        }
-
-        // Get the number of NZBs to do
-        $sql = "SELECT COUNT(id) as num FROM releases WHERE id >= %d";
-        $row = $ndb->queryOneRow(sprintf($sql, $startingID));
-        $recordCount = (int)$row["num"];
-
-        // Start looping over the releases and build the NZB index
-        printf("starting from id %d\n", $startingID);
-        $numIndexed = 0;
-        $sql = "SELECT id, guid FROM releases "
-             . "WHERE id >= %d ORDER BY id ASC";
-        $result = $ndb->queryDirect(sprintf($sql, $startingID));
-        $startTime = microtime(true);
-        while ($row = $ndb->getAssocArray($result)) {
-            $fileNames = "";
-            $fileCount = 0;
-            $nzbpath = $this->nzb->getNZBPath($row['guid'], $this->site->nzbpath);
-            if (file_exists($nzbpath)) {
-            	$nzbfile = file_get_contents('compress.zlib://'.$nzbpath);
-            	$files = $this->nzb->nzbFileList($nzbfile);
-            	if ($files) {
-            	    foreach($files as $f) {
-                	    $fileNames .= $f['title']." ";
-                	    $fileCount++;
-            	    }
-        	    }
-            }
-            $sql = sprintf("REPLACE INTO nzbs VALUES (%d, %s, %d)",
-                            $row['id'], $ndb->escapeString($fileNames),
-                            $fileCount);
-            if (!mysqli_query($sdb, $sql)) {
-                printf("error indexing NZB: %s\n", mysqli_error($sdb));
-                continue;
-            }
-            $numIndexed++;
-            $nowTime = microtime(true);
-            $msg = "\rindexed %d of %s NZBs (avg: %0.2f/sec, eta: %s)\033[0K";
-            $avg = $numIndexed/($nowTime-$startTime);
-            $eta = ($recordCount-$numIndexed) / $avg;
-            fprintf($out, $msg, $numIndexed, $recordCount, $avg, $this->secs_to_h($eta));
-            fflush($out);
-        }
-        return $numIndexed;
-    }
-
-    /**
-     * Query the indexer directly.  Returns an array of the results, unless
-     * there was an error in which case ``false`` is returned.  However, if
-     * Sphinx returns an "invalid query" error (1064), then an empty result
-     * array is returned.  Note that an empty "result array" is not the same as
-     * an empty array and will instead look like::
-     *
-     *      array({"_totalrows": 0})
-     *
-     * If  ``$lookupQuery`` is an empty string, then the results returned will
-     * be the data from the index--this is not guaranteed to be the most recent
-     * data that is in the MySQL database.  If you absolutely need the most
-     * recent data from MySQL, then ``$lookupQuery`` should be a valid SQL
-     * query that has contains "releases.id IN (%s)".
-     *
-     * @param   string      $sphinxQuery    The raw SphinxQL query.
-     * @param   string      $lookupQuery    The SQL to use to lookup the results.
-     * @param   bool/int    $useCache    	The ttl to store the item in the cache.
-     * @return  array|false
-     */
-    public function searchDirect($sphinxQuery, $lookupQuery="", $useCache=false)
-    {
-        $cache = new Cache;
-		if ($useCache !== false && $cache->enabled && $cache->exists($sphinxQuery))
-		{
-			$ret = $cache->fetch($sphinxQuery);
-			if ($ret !== false)
-				return $ret;
-		}
-
-        // Connect to Sphinx
-        $hostport = explode (":", $this->site->sphinxserverhost);
-        $sdb = mysqli_connect($hostport[0], "root", "", "", $hostport[1]);
-        if (!$sdb) {
-            // Couldn't connect to Sphinx.
-            return false;
-        }
-
-        // Get the results from Sphinx.
-		$lev = error_reporting();
-		error_reporting(0);
-        $result = mysqli_query($sdb, $sphinxQuery);
-		error_reporting($lev);
-
-        $error = mysqli_error($sdb);
-        // A 1064 error means that the query is invalid, so we don't care
-        // about that.
-        if ($error && mysqli_errno($sdb) != 1064) {
-            // All other errors we will considered a failure.
-            return false;
-        }
-
-        // Get the query metadata.
-        $meta = array();
-        $mresult = mysqli_query($sdb,"SHOW META");
-        if (!$mresult) {
-            return false;
-        }
-        while ($row = mysqli_fetch_row($mresult)) {
-            $meta[$row[0]] = $row[1];
-        }
-
-        $results = array();
-		if ($result)
-		{
-			while($row = mysqli_fetch_assoc($result)) {
-				if ($lookupQuery) {
-					// Save the IDs for a batch lookup.
-					$results[] = $row["id"];
-				} else {
-					$results[] = $row;
-				}
-			}
-		}
-
-        if ($lookupQuery && count($results) > 0) {
-            $ndb = new DB;
-            $sql = sprintf($lookupQuery, implode(",", $results));
-            $result = $ndb->queryDirect($sql);
-			if ($result)
-			{
-				$results = array();
-				while ($row = $ndb->getAssocArray($result)) {
-					$results[] = $row;
-				}
-			}
-        }
-
-        $count = 0;
-        if ( count($results) > 0 && array_key_exists("total", $meta) ) {
-            $count = (int)$meta["total_found"];
-            $results[0]["_totalrows"] = ($count > MAX_MATCHES) ? MAX_MATCHES : $count;
-        }
-
-        if ($useCache !== false && $cache->enabled)
-			$cache->store($sphinxQuery, $results, $useCache);
-
-        return $results;
-    }
-    /**
-     * Constructs a SphinxQL query.
-     *
-     * @param   array   $search
-     * @param   array   $cat
-     * @param   int     $offset
-     * @param   int     $limit
-     * @param   array   $order
-     * @param   int     $maxage
-     * @param   array   $excludedcats
-     * @param   array   $grp
-     * @param   array   $indexes
-     * @param   boolean $lookup
-     * @param   array   $where
-     * @param   string  $lookupQuery
-     *
-     */
-    public function buildQuery($search, $cat=array(), $offset=0, $limit=100,
-                           $order=array("postdate", "desc"), $maxage=-1,
-                           $excludedcats=array(), $grp=array(),
-                           $indexes=array(), $lookup=true, $where=array(),
-                           &$lookupQuery="")
-    {
-        $ndb = new DB;
-
-        $offset = intval($offset);
-        $limit = intval($limit);
-
-        if ($lookup) {
-            // Since we're going to look up the data from MySQL, we don't need
-            // to get all the fields from Sphinx.
-            $select = "id, name ";
-        } else {
-            $select = "* ";
-        }
-
-        // Create a comma separated string of indexes, but only of enabled
-        // indexes
-        $searchIndexes = array();
-        foreach($indexes as $index) {
-            if ($this->isIndexEnabled($index)) {
-                $searchIndexes[] = $index;
-            }
-        }
-        if (count($searchIndexes) == 0) {
-            $searchIndexes = array_reverse($this->getAllEnabledIndexes(true));
-        }
-        $from = implode(", ", $searchIndexes);
-
-        // Check to see if this is an extended query.  If it is, remove the
-        // leading "!" and don't touch the rest of the query.
-        if (count($search) > 0) {
-            if (substr($search[0], 0, 2) == "! ") {
-                /*
-                    Extended Query
-                 */
-                $search[0] = substr($search[0], 2, strlen($search[0])-2);
-            } else {
-                /*
-                    Basic Query
-                 */
-
-                // Check to see if the the query contains any field specifiers like:
-                // "@(field1,field2)"--if not, add in the default search fields.
-                foreach($search as $i => $q) {
-                    if ($q && !preg_match('/@\(?\w+/i', $q)) {
-                        // No field specifiers were found, so use the site-defaults.  This
-                        // turns the query for "ubuntu" into something like:
-                        //  "@(name,searchname) ubuntu"
-                        $fields = str_replace(" ", "", $this->site->sphinxsearchfields);
-
-                        // Remove single "-" so that Sphinx doesn't use it as an
-                        // exclusion modifier
-                        $q = preg_replace('/([^\-])\-/', '\1 ', $q);
-
-                        // "basic" search syntax allows a "--" exclusion modifier,
-                        // but Sphinx uses "-" as a the exclusion modifier
-                        $q = str_replace("--", "-", $q);
-
-						// always add on * to Season based searches
-						$q = preg_replace('/([\. ]S\d{2})( |$)/i', '\1*\2', $q);
-
-                        // Construct the basic query
-                        $search[$i] = sprintf("@(%s) ", $fields).$q;
-                    }
-                }
-            }
-        }
-
-        // Create the actual MATCH() query.  Per the Sphinx docs, each query
-        // can only have one MATCH() statement.
-        if (count($search) > 0) {
-            if (!(count($search) == 1 && $search[0] == "")) {
-                // If we are searching across multiple indexes, it is safer to prepend
-                // "@@relaxed" to the query to ensure that Sphinx doesn't choke on
-                // differences in schemas.  See:
-                //      http://sphinxsearch.com/docs/2.0.2/extended-syntax.html
-                if (count($searchIndexes) > 1 && strpos($search[0], "@@relaxed") !== 0) {
-                    // We are searching across multiple indexes and the term
-                    // "@@relaxed" wasn't found at the beginning,
-                    $search[0] = "@@relaxed ".$search[0];
-                }
-
-                $where[] = sprintf("MATCH(%s)", $ndb->escapeString(implode(' ', $search)));
-            }
-        }
-
-        // Build the category query.  If any of the categories are a "parent"
-        // then we need to explicitly include their children as well.
-        $categoryIDs = array();
-        if (count($cat) > 0 && $cat[0] != -1) {
-            foreach ($cat as $category) {
-                if ($category != -1) {
-                    if (!in_array($category, $categoryIDs)) {
-                        $categoryIDs[] = $category;
-                    }
-
-                    $categ = new Category();
-                    if ($categ->isParent($category)) {
-                        // Inlcude all children
-                        $children = $categ->getChildren($category);
-                        foreach ($children as $child) {
-                            if (!in_array($child["id"], $categoryIDs)) {
-                                $categoryIDs[] = $child["id"];
-                            }
-						}
-                    }
-                }
-            }
-        }
-
-        // Only include the category filter if we created one.
-        if ($categoryIDs) {
-            $where[] = sprintf("categoryid IN (%s)", implode(",", $categoryIDs));
-        }
-
-        // Filter on postdate.
-        if ($maxage > 0) {
-            // TODO: This probably isn't the best way to do this...
-            $where[] = sprintf("postdate >= %d", time()-($maxage*86400));
-        }
-
-        // Categories to exclude.
-        if (count($excludedcats) > 0) {
-            $where[] = sprintf("categoryid NOT IN (%s)", implode(",",
-                                                            $excludedcats));
-        }
-
-        // Usenet groups to include.
-        if ($grp) {
-            foreach($grp as $i => $g) {
-                if (strpos($g, "a.b.") !== false) {
-                    $sql = sprintf("SELECT id FROM groups "
-                                   ."WHERE name = %s",
-                                   $ndb->escapeString(str_replace("a.b.",
-                                                        "alt.binaries.", $g)));
-                    $row = $ndb->queryOneRow($sql);
-                    $grp[$i] = $row["id"];
-                }
-            }
-            $where[] = sprintf("groupid IN (%s)", implode(",", $grp));
-        }
-
-        // Order the results.
-        // TODO: implement better default ordering behavior.
-        $orderby = "";
-        if (count($order) == 2) {
-            $orderby = sprintf("ORDER BY %s %s", $order[0], $order[1]);
-
-            // Add in the ORDER BY parameters if there is a $lookupQuery
-            if ($lookupQuery) {
-                $lookupQuery = $lookupQuery." ".$orderby;
-            }
-        }
-
-        // Build the full query.
-        $q = sprintf("SELECT %s FROM %s ".(!empty($where)?"WHERE ":"")." %s %s LIMIT %d,%d",
-                        $select, $from, implode(" AND ", $where), $orderby,
-                        $offset, $limit);
-
-        // Sphinx imposes a 1000 result limit (max_matches) by default, so in
-        // order to access results beyond this, we need to tell it to do so
-        if ($offset >= 1000) {
-            $q .= sprintf(" OPTION max_matches=%d", $offset+$limit);
-        }
-
-        return $q;
-    }
-
-    /**
-     * Search ``$indexes`` for ``$search`` term(s).  ``$search`` should be a
-     * string containing a valid Sphinx query, see `query syntax`_ for
-     * examples.  The default behavior is to query the indexes for release IDs
-     * and then return the releases from MySQL, but if ``$lookup`` is ``false``
-     * then the data from the indexes will be returned.  This will bypass MySQL
-     * all together, but may result in stale data.
-     *
-     * .. _query syntax: http://sphinxsearch.com/docs/2.0.1/extended-syntax.html
-     *
-     * @param   string          $search         Search term to query for.
-     * @param   array           $cat            Category IDs to filter for.
-     * @param   int             $offset         Offset from first result.
-     * @param   int             $limit          Number of results to return.
-     * @param   string          $orderby        Field to order results by.
-     * @param   int             $maxage         Don't include results older than this (in days).
-     * @param   array           $excludedcats   Category IDs to exclude.
-     * @param   array           $grp            Group IDs to filter for.
-     * @param   string|array    $indexes        Only search within certain indexes.
-     * @param   boolean         $lookup         Retrieve latest data from database.
-     * @return  array|false
-     */
-    public function search($search, $cat=array(), $offset=0, $limit=1000,
-                           $order=array("postdate", "desc"), $maxage=-1,
-                           $excludedcats=array(), $grp=array(),
-                           $indexes=array(), $lookup=true, $minsize=-1, $maxsize=-1)
-    {
-        if (count($indexes) == 0) {
-            // Remove predb from the default list of indexes to search
-            $indexes = $this->getAllEnabledIndexes(true, array('predb'));
-        }
-
-        $lookupQuery = "";
-        if ($lookup) {
-            $lookupQuery .= "SELECT releases.*, "
-                          . "CONCAT(cp.title, ' > ', c.title) AS category_name, "
-                          . "CONCAT(cp.id, ',', c.id) AS category_ids, "
-                          . "groups.name as group_name, rn.id AS nfoid, "
-                          . "re.releaseid as reID, cp.id AS categoryParentID, "
-                          . "pre.ctime, pre.nuketype, "
-                          . "COALESCE(movieinfo.id, 0) AS movieinfoID "
-                          . "FROM releases "
-                          . "LEFT OUTER JOIN movieinfo "
-                          . "ON movieinfo.imdbid = releases.imdbid "
-                          . "LEFT OUTER JOIN releasevideo re "
-                          . "ON re.releaseid = releases.id "
-                          . "LEFT OUTER JOIN releasenfo rn "
-                          . "ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL "
-                          . "LEFT OUTER JOIN groups "
-                          . "ON groups.id = releases.groupid "
-                          . "LEFT OUTER JOIN category c "
-                          . "ON c.id = releases.categoryid "
-                          . "LEFT OUTER JOIN category cp "
-                          . "ON cp.id = c.parentid "
-                          . "LEFT OUTER JOIN predb pre "
-                          . "ON pre.id = releases.preid "
-                          . "WHERE releases.passwordstatus <= (SELECT value "
-                          .      "FROM site WHERE setting='showpasswordedrelease') "
-                          . "AND releases.id IN (%s)";
-        }
-
-		$where = array();
-		if ($minsize != -1) {
-			$where[] = sprintf("size > %d ", $minsize);
-		}
-		if ($maxsize != -1) {
-		   $where[] = sprintf("size < %d ", $maxsize);
-		}
-
-        $sphinxQuery = $this->buildQuery(array($search), $cat, $offset, $limit,
-                                         $order, $maxage, $excludedcats, $grp,
-                                         $indexes, $lookup, $where, $lookupQuery);
-        return $this->searchDirect($sphinxQuery, $lookupQuery, 180);
-    }
-
-    /**
-     * Returns an array of all the releases matching the given query.  This
-     * presents the same interface as :php:meth:`Releases::searchbyRageId`.
-     */
-    public function searchbyRageId($rageId, $series="", $episode="", $offset=0,
-                                   $limit=100, $name="", $cat=array(-1),
-                                   $maxage=-1, $indexes=array(), $lookup=true)
-    {
-        $db = new DB();
-        $order = array("postdate", "desc");
-        $search = array($name);
-        if ($series != "") {
-			//
-			// Exclude four digit series, which will be the year 2010 etc
-			//
-			if (is_numeric($series) && strlen($series) != 4) {
-			    $series = sprintf('S%02d', $series);
-			}
-			$search[] = sprintf("@season %s", $db->escapeString($series));
-		}
-
-		if ($episode != "") {
-			if (is_numeric($episode)) {
-			    $episode = sprintf('E%02d', $episode);
-			}
-			$search[] = sprintf("@episode %s", $db->escapeString($episode));
-		}
-
-		$where = array();
-		if ($rageId != "-1") {
-		    $where[] = "rageid = ".$rageId;
-		}
-
-		if (count($indexes) == 0) {
-            // Remove predb from the default list of indexes to search
-            $indexes = $this->getAllEnabledIndexes(true, array('predb'));
-        }
-
-        $lookupQuery = "";
-        if ($lookup) {
-            $lookupQuery .= "SELECT releases.*, "
-                          . "CONCAT(cp.title, ' > ', c.title) AS category_name, "
-                          . "CONCAT(cp.id, ',', c.id) AS category_ids, "
-                          . "groups.name AS group_name, rn.id AS nfoid, "
-                          . "re.releaseid AS reID "
-                          . "FROM releases "
-                          . "LEFT OUTER JOIN category c "
-                          . "ON c.id = releases.categoryid "
-                          . "LEFT OUTER JOIN groups "
-                          . "ON groups.id = releases.groupid "
-                          . "LEFT OUTER JOIN releasevideo re "
-                          . "ON re.releaseid = releases.id "
-                          . "LEFT OUTER JOIN releasenfo rn "
-                          . "ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL "
-                          . "LEFT OUTER JOIN category cp "
-                          . "ON cp.id = c.parentid "
-                          . "WHERE releases.passwordstatus <= (SELECT value "
-                          .      "FROM site WHERE setting='showpasswordedrelease') "
-                          . "AND releases.id IN (%s)";
-        }
-        $sphinxQuery = $this->buildQuery($search, $cat, $offset, $limit, $order,
-                                         $maxage, array(), array(), $indexes,
-                                         $lookup, $where, $lookupQuery);
-        return $this->searchDirect($sphinxQuery, $lookupQuery, 180);
-    }
-
-    /**
-     * Returns an array of all the releases matching the given query.  This
-     * presents the same interface as :php:meth:`Releases::searchbyImdbId`.
-     */
-    public function searchbyImdbId($imdbId, $offset=0, $limit=100, $name="",
-                                   $cat=array(-1), $genre="", $maxage=-1,
-                                   $indexes=array(), $lookup=true)
-    {
-        $db = new DB();
-        $search = array();
-        $order = array("postdate", "desc");
-        $where = array();
-        if ($imdbId != "-1" && is_numeric($imdbId)) {
-			// Pad id with zeros just in case.
-			$imdbId = str_pad($imdbId, 7, "0", STR_PAD_LEFT);
-			$where[] = sprintf("imdbid = %d", $imdbId);
-		} else {
-			$where[] = sprintf("imdbid != 0", $imdbId);
-		}
-
-		if ($genre != "") {
-		    $search[] = sprintf("@movieinfo_genre %s", $db->escapeString($genre));
-		}
-
-		if (count($indexes) == 0) {
-            // Remove predb from the default list of indexes to search
-            $indexes = $this->getAllEnabledIndexes(true, array('predb'));
-        }
-
-        $lookupQuery = "";
-        if ($lookup) {
-            $lookupQuery .= "SELECT releases.*, "
-                          . "movieinfo.title AS moi_title, "
-                          . "movieinfo.tagline AS moi_tagline, "
-                          . "movieinfo.rating AS moi_rating, "
-                          . "movieinfo.plot AS moi_plot, "
-                          . "movieinfo.year AS moi_year, "
-                          . "movieinfo.genre AS moi_genre, "
-                          . "movieinfo.director AS moi_director, "
-                          . "movieinfo.actors AS moi_actors, "
-                          . "movieinfo.cover AS moi_cover, "
-                          . "movieinfo.backdrop AS moi_backdrop, "
-                          . "CONCAT(cp.title, ' > ', c.title) AS category_name, "
-                          . "CONCAT(cp.id, ',', c.id) AS category_ids, "
-                          . "groups.name AS group_name, "
-                          . "rn.id AS nfoid FROM releases "
-                          . "LEFT OUTER JOIN groups "
-                          . "ON groups.id = releases.groupid "
-                          . "LEFT OUTER JOIN category c "
-                          . "ON c.id = releases.categoryid "
-                          . "LEFT OUTER JOIN releasenfo rn "
-                          . "ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL "
-                          . "LEFT OUTER JOIN category cp "
-                          . "ON cp.id = c.parentid "
-                          . "LEFT OUTER JOIN movieinfo "
-                          . "ON releases.imdbid = movieinfo.imdbid "
-                          . "WHERE releases.passwordstatus <= (SELECT value "
-                          .      "FROM site WHERE setting='showpasswordedrelease') "
-                          . "AND releases.id IN (%s)";
-        }
-        $sphinxQuery = $this->buildQuery($search, $cat, $offset, $limit, $order,
-                                         $maxage, array(), array(), $indexes,
-                                         $lookup, $where, $lookupQuery);
-        return $this->searchDirect($sphinxQuery, $lookupQuery, 180);
-    }
-
-    /**
-     * Returns an array of all the releases matching the given query.  This
-     * presents the same interface as :php:meth:`Releases::searchAudio`.
-     */
-    public function searchAudio($artist, $album, $label, $track, $year,
-                                $genre=array(-1), $offset=0, $limit=100,
-                                $cat=array(-1), $maxage=-1, $indexes=array(),
-                                $lookup=true)
-    {
-        $db = new DB();
-        $search = array();
-        $where = array();
-        $order = array("postdate", "desc");
-        if ($artist != "") {
-            $search[] = sprintf("@musicinfo_artist %s", $db->escapeString($artist));
-        }
-
-		if ($album != "") {
-		    $search[] = sprintf("@musicinfo_title %s", $db->escapeString($album));
-		}
-
-		if ($label != "") {
-		    $search[] = sprintf("@musicinfo_publisher %s", $db->escapeString($label));
-		}
-
-		if ($track != "") {
-		    $search[] = sprintf("@musicinfo_tracks %s", $db->escapeString($track));
-		}
-
-		if ($year != "") {
-		    $where[] = sprintf("musicinfo_year = %d", $year);
-		}
-
-		if (count($genre) > 0 && $genre[0] != -1) {
-		    $where[] = sprintf("musicinfo_genreID IN (%s)", implode(",", $genre));
-		}
-
-		if (count($indexes) == 0) {
-            // Remove predb from the default list of indexes to search
-            $indexes = $this->getAllEnabledIndexes(true, array('predb'));
-        }
-
-        $lookupQuery = "";
-        if ($lookup) {
-            $lookupQuery .= "SELECT releases.*, "
-                          . "musicinfo.cover AS mi_cover, "
-                          . "musicinfo.review AS mi_review, "
-                          . "musicinfo.tracks AS mi_tracks, "
-                          . "musicinfo.publisher AS mi_publisher, "
-                          . "musicinfo.title AS mi_title, "
-                          . "musicinfo.artist AS mi_artist, "
-                          . "genres.title AS music_genrename, "
-                          . "CONCAT(cp.title, ' > ', c.title) AS category_name, "
-                          . "CONCAT(cp.id, ',', c.id) AS category_ids, "
-                          . "groups.name AS group_name, "
-                          . "rn.id AS nfoid FROM releases "
-                          . "LEFT OUTER JOIN musicinfo "
-                          . "ON musicinfo.id = releases.musicinfoid "
-                          . "LEFT JOIN genres "
-                          . "ON genres.id = musicinfo.genreID "
-                          . "LEFT OUTER JOIN groups "
-                          . "ON groups.id = releases.groupid "
-                          . "LEFT OUTER JOIN category c "
-                          . "ON c.id = releases.categoryid "
-                          . "LEFT OUTER JOIN releasenfo rn "
-                          . "ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL "
-                          . "LEFT OUTER JOIN category cp "
-                          . "ON cp.id = c.parentid "
-                          . "WHERE releases.passwordstatus <= (SELECT value "
-                          .      "FROM site WHERE setting='showpasswordedrelease') "
-                          . "AND releases.id IN (%s)";
-        }
-        $sphinxQuery = $this->buildQuery($search, $cat, $offset, $limit, $order,
-                                         $maxage, array(), array(), $indexes,
-                                         $lookup, $where, $lookupQuery);
-        return $this->searchDirect($sphinxQuery, $lookupQuery, 180);
-    }
-
-    /**
-     * Returns an array of all the releases matching the given query.  This
-     * presents the same interface as :php:meth:`Releases::searchBook`.
-     */
-    public function searchBook($author, $title, $offset=0, $limit=100,
-                               $maxage=-1, $indexes=array(), $lookup=true)
-    {
-        $db = new DB();
-        $order = array("postdate", "desc");
-        $search = array();
-        if ($author != "") {
-            $search[] = sprintf("@bookinfo_author %s", $db->escapeString($author));
-        }
-
-		if ($title != "") {
-		    $search[] = sprintf("@bookinfo_title %s", $db->escapeString($title));
-		}
-
-		if (count($indexes) == 0) {
-            // Remove predb from the default list of indexes to search
-            $indexes = $this->getAllEnabledIndexes(true, array('predb'));
-        }
-
-		$lookupQuery = "";
-		if ($lookup) {
-		    $lookupQuery .= "SELECT releases.*, "
-		                  . "bookinfo.cover AS bi_cover, "
-		                  . "bookinfo.review AS bi_review, "
-		                  . "bookinfo.publisher AS bi_publisher, "
-		                  . "bookinfo.pages AS bi_pages, "
-		                  . "bookinfo.publishdate AS bi_publishdate, "
-		                  . "bookinfo.title AS bi_title, "
-		                  . "bookinfo.author AS bi_author, "
-		                  . "genres.title AS book_genrename, "
-		                  . "concat(cp.title, ' > ', c.title) AS category_name, "
-		                  . "concat(cp.id, ',', c.id) AS category_ids, "
-		                  . "groups.name AS group_name, "
-		                  . "rn.id AS nfoid "
-		                  . "FROM releases "
-		                  . "LEFT OUTER JOIN bookinfo "
-		                  . "ON bookinfo.id = releases.bookinfoid "
-		                  . "LEFT JOIN genres "
-		                  . "ON genres.id = bookinfo.genreID "
-		                  . "LEFT OUTER JOIN groups "
-		                  . "ON groups.id = releases.groupid "
-		                  . "LEFT OUTER JOIN category c "
-		                  . "ON c.id = releases.categoryid "
-		                  . "LEFT OUTER JOIN releasenfo rn "
-		                  . "ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL "
-		                  . "LEFT OUTER JOIN category cp "
-		                  . "ON cp.id = c.parentid "
-		                  . "WHERE releases.passwordstatus <= (SELECT value "
-		                  .     "FROM site WHERE setting='showpasswordedrelease')"
-		                  . "AND releases.id IN (%s)";
-		}
-
-		$sphinxQuery = $this->buildQuery($search, array(-1), $offset, $limit,
-		                                 $order, $maxage, array(), array(),
-		                                 $indexes, $lookup, array(), $lookupQuery);
-		return $this->searchDirect($sphinxQuery, $lookupQuery, 180);
-    }
-
-    /**
-     * Returns an array of all the releases matching the given query.  This
-     * presents the same interface as :php:meth:`Releases::searchbyAnidbId`.
-     */
-    public function searchbyAnidbId($anidbID, $epno='', $offset=0, $limit=100,
-                                    $name='', $maxage=-1, $indexes=array(),
-                                    $lookup=true)
-    {
-        $db = new DB();
-        $where = array();
-        $search = array();
-        $order = array("postdate", "desc");
-        if ($anidbID > -1) {
-            $where[] = sprintf("anidbid = %d", $anidbID);
-        }
-
-        if (is_numeric($epno)) {
-			$search[] = sprintf("@episode %s", $db->escapeString($epno));
-		}
-
-		if (count($indexes) == 0) {
-            // Remove predb from the default list of indexes to search
-            $indexes = $this->getAllEnabledIndexes(true, array('predb'));
-        }
-
-		$lookupQuery = "";
-		if ($lookup) {
-		    $lookupQuery .= "SELECT releases.*, "
-		                  . "CONCAT(cp.title, ' > ', c.title) AS category_name, "
-		                  . "CONCAT(cp.id, ',', c.id) AS category_ids, "
-		                  . "groups.name AS group_name, "
-		                  . "rn.id AS nfoid "
-			              . "FROM releases "
-			              . "LEFT OUTER JOIN category c "
-			              . "ON c.id = releases.categoryid "
-			              . "LEFT OUTER JOIN groups "
-			              . "ON groups.id = releases.groupid "
-			              . "LEFT OUTER JOIN releasenfo rn "
-			              . "ON rn.releaseid = releases.id AND rn.nfo IS NOT NULL "
-			              . "LEFT OUTER JOIN category cp "
-			              . "ON cp.id = c.parentid "
-			              . "WHERE releases.passwordstatus <= (SELECT value "
-			              .     "FROM site WHERE setting='showpasswordedrelease')"
-			              . "AND releases.id IN (%s)";
-		}
-		$sphinxQuery = $this->buildQuery($search, array(-1), $offset, $limit,
-		                                 $order, $maxage, array(), array(),
-		                                 $indexes, $lookup, $where, $lookupQuery);
-		return $this->searchDirect($sphinxQuery, $lookupQuery, 180);
-    }
-
-    /**
-     * Get predb rows by limit and filter.  This presents the same interface as
-     * :php:meth:`PreDB::getPreRange`.
-     */
-    public function getPreRange($start=0, $num, $dirname='', $category='')
-    {
-        $db = new DB();
-        $dirname = empty($category) ? $dirname : $dirname." @category =".$category;
-        $sphinxQuery = sprintf("SELECT id "
-                               ."FROM predb, predb_delta "
-                               ."WHERE MATCH(%s) "
-                               ."ORDER BY ctime DESC "
-                               ."LIMIT %d,%d",
-                               $db->escapeString($dirname),
-                               $start, $num);
-        $lookupQuery = "SELECT predb.*, r.guid "
-                     . "FROM predb "
-                     . "LEFT OUTER JOIN releases r "
-                     . "ON r.preid = predb.id "
-                     . "WHERE predb.id IN (%s) "
-                     . "ORDER BY predb.ctime DESC";
-        return $this->searchDirect($sphinxQuery, $lookupQuery, 120);
-    }
-
-    /**
-     * Get count of all predb rows that match the query.  This presents the
-     * same interface as :php:meth:`PreDB::getPreCount`.  If there is an issue
-     * running the query (i.e. if the query fails), then this returns -1.
-     *
-     * @param   string  $dirname    The query; this is passed into MATCH().
-     * @param   string  $category   The category to limit to.
-     * @return  int                 The number of results, or -1 on error.
-     */
-    public function getPreCount($dirname='', $category='')
-    {
-        $results = $this->getPreRange(0, 1, $dirname, $category);
-        if (is_array($results)) {
-            return $results[0]['_totalrows'];
-        }
-        return -1;
-    }
-
-    /**
-     * Convert seconds to human readable text.  From:
-     * http://csl.sublevel3.org/php-secs-to-human-text/
-     *
-     * @ignore
-     * @param   int     $secs
-     * @return  string
-     */
-    public function secs_to_h($secs)
-    {
-        $units = array(
-                "week"   => 7*24*3600,
-                "day"    =>   24*3600,
-                "hour"   =>      3600,
-                "minute" =>        60,
-        );
-
-    	// specifically handle zero
-        if ( $secs == 0 ) return "0 seconds";
-        $s = "";
-        foreach ( $units as $name => $divisor ) {
-            if ( $quot = intval($secs / $divisor) ) {
-                $s .= "$quot $name";
-                $s .= (abs($quot) > 1 ? "s" : "") . ", ";
-                $secs -= $quot * $divisor;
-            }
-        }
-
-        return substr($s, 0, -2);
-    }
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/spotnab.php b/lib/copy_this/www/lib/spotnab.php
deleted file mode 100644
index bcb524fbb..000000000
--- a/lib/copy_this/www/lib/spotnab.php
+++ /dev/null
@@ -1,2554 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/nntp.php");
-require_once(WWW_DIR."/lib/nzb.php");
-require_once(WWW_DIR."/lib/site.php");
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/releasecomments.php");
-require_once(WWW_DIR."/lib/releaseimage.php");
-require_once(WWW_DIR."/lib/nzbinfo.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/users.php");
-
-// Help out those who don't have SSL enabled
-if(!defined('OPENSSL_KEYTYPE_RSA')) {
-	// OPENSSL_KEYTYPE_RSA is defined as 0 in php v4 and v5
-	// so just give it a value to silence possible Notice Errors
-	// for Windows Users (and give it the correct value)
-    define('OPENSSL_KEYTYPE_RSA', 0);
-}
-
-// Define OpenSSL Config File
-define('OPENSSL_CFG_PATH', WWW_DIR.'/lib/openssl/openssl.cnf');
-
-// JSON Encode Support (for those missing the constants)
-if(!defined('JSON_HEX_TAG')) define('JSON_HEX_TAG', 1);
-if(!defined('JSON_HEX_AMP')) define('JSON_HEX_AMP', 2);
-if(!defined('JSON_HEX_APOS')) define('JSON_HEX_APOS', 4);
-if(!defined('JSON_HEX_QUOT')) define('JSON_HEX_QUOT', 8);
-if(!defined('JSON_UNESCAPED_UNICODE')) define('JSON_UNESCAPED_UNICODE', 256);
-
-// Silent Error Handler (used to shut up noisy XML exceptions)
-// we use the silent error handler for remote connection failures as well
-function snHandleError($errno, $errstr, $errfile, $errline, array $errcontext){
-	if (0 === error_reporting())
-		return false;
-	if(!defined('E_STRICT'))define('E_STRICT', 2048);
-	switch($errno){
-		case E_WARNING:
-		case E_NOTICE:
-		case E_STRICT:
-			return;
-		default:
-			break;
-	};
-	throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-}
-
-// Create a NNTP Exception type so we can identify it from others
-class SpotNabException extends Exception { }
-
-class SpotNab {
-	// Segment Identifier domain is used to help build segments
-	// prior to them being posted.
-	const SEGID_DOMAIN = 'sample.com';
-
-	// Subject line can look like this:
-	// 01c9478809c80ccb07246d19852ed33b0a5f5d8d-20130125030511
-	// 517a6210bd588e964654f75b807d65d55d420f5e-20130125002943
-	// 33012186754c9c75050848d825ad6c2ae1af2e4d-20130125002849
-	// To speed up fetch process, we can parse this to determine wether
-	// or not to continue or not.
-
-	// The TYPE is always prefixed on the subject, in this case, all
-	// Comment types are always 00
-	const FETCH_COMMENT_TYPE = "00";
-	const FETCH_COMMENT_SUBJECT_REGEX =
-			'/^(?P<checksum>[0-9a-z]{40})-(?P<utcref>[0-9]{14})$/i';
-
-	// Discovery types are always 01
-	const FETCH_DISCOVERY_TYPE = "01";
-	const FETCH_DISCOVERY_SUBJECT_REGEX =
-			'/^(?P<checksum>[0-9a-z]{40})-(?P<utcref>[0-9]{14})$/i';
-
-	// The Message id can be parsed as follows
-	const FETCH_MSGID_REGEX =
-		'/^<(?P<crap>[a-z0-9]{30})\.(?P<type>[0-9]{2})\.(?P<local>[0-9]+)[^@]*@(?P<domain>.*)>$/i';
-
-	// How many consecutive misses in a row do we allow while trying to retrieve
-	// historic messages do we allow before assuming that we've exceeded the
-	// the retention area.  In which case we just return the last date we
-	// matched before the miss count started
-	const FETCH_MAX_MISSES = 15;
-
-	// Maximum number of messages to process at one time
-	// Setting this to too large of a value can cause your usenet to
-	// ignore and deny your request.
-	const FETCH_USENET_BATCH = 25000;
-
-	// Maximum number of messages to look back if one source
-	// is lookin like it hasn't posted anything in a very long
-	// time... we stop counting back headers when we reached
-	// this figure
-	const FETCH_MAXIMUM_HEADERS = 200000;
-
-	// Maximum age (in seconds) we look back for a source
-	const FETCH_MAXIMUM_AGE = 172800;
-
-	// The maximum number of comments that can exist within 1 post to usenet
-	const POST_MAXIMUM_COMMENTS = 500;
-
-	// The number of seconds to wait before sending a new broadcast
-	const POST_BROADCAST_INTERVAL = 2592000;
-
-	// Verify Fetch Range; This is the number of records to look back after
-	// a post to be sure that the post was successful.  The number may appear
-	// kind of high, but consider a large active group and
-	// this number makes sense.  Plus it doesn't take that long to rescan
-	// a few headers.
-	const VERIFY_FETCH_HEADER_COUNT = 300;
-
-	// The php function openssl_public_encrypt() seems to fail whenever it's
-	// passed more then this many characters into its buffer, therefore
-	// we need to encrypt in batches if the content is longer or we
-	// fail hard. DO NOT CHANGE THIS VALUE!! - EVER
-	const SSL_MAX_BUF_LEN = 117;
-
-	// If SSL_MAX_BUF_LEN is to large, we need to use delimiters
-	// to help separate the batches as they are processed
-	const SSL_BUF_DELIMITER = "\n";
-
-	// Auto Discovery Functionality
-	// Autodisovery allows us to post encrypted information other potential
-	// sources we can use. We also post our source information so others can
-	// refer to our comments as well.
-	const AUTODISCOVER_POST_GROUP = "alt.binaries.aac";
-
-	const AUTODISCOVER_POST_USER = "auto";
-
-	const AUTODISCOVER_POST_EMAIL = "auto@ohnohs.ru";
-
-	protected $_nntp;
-	private $_site;
-	protected $_globals;
-
-	// Meta Information is fetched from DB
-	private $_post_site;
-	private $_post_code;
-	private $_post_privacy;
-	private $_post_title;
-
-	private $_post_user;
-	private $_post_email;
-	private $_post_group;
-
-	/* SSL Public & Private Keys */
-	private $_ssl_pubkey;
-	private $_ssl_prvkey;
-
-	/* SSL Auto Discovery Public & Private Keys */
-	protected $_ssl_auto_pubkey;
-	protected $_ssl_auto_prvkey;
-
-	/* Some booleans to make code reading easier */
-	private $_can_post;
-	private $_can_discover;
-	private $_can_broadcast;
-	private $_auto_enable;
-
-	/* Track the last article scanned when preforming a discovery */
-	private $_discovery_lastarticle;
-
-	public function __construct($post_user = Null, $post_email = Null, $post_group = Null) {
-		$this->_pdo = new DB();
-		$this->_nntp = new NNTP(['Settings' => $this->_pdo]);
-		$this->_releaseImage =  new \ReleaseImage($this->_pdo);
-		$this->_nzb = new \NZB($this->_pdo);
-		$s = new Sites();
-		$this->_site = $s->get();
-		$this->_globals = $this->_site;
-
-		$this->_post_user = $post_user;
-		$this->_post_email = $post_email;
-		$this->_post_group = $post_group;
-
-		// Fetch Meta information
-		$this->_post_code = trim($this->_globals->code)?
-			$this->_globals->code:Null;
-		$this->_post_title = trim($this->_globals->title)?
-			$this->_globals->title:Null;
-
-		if ($this->_post_user === Null){
-			// Fetch the SpotNab UserID
-			$this->_post_user = trim($this->_globals->spotnabuser)?
-				$this->_globals->spotnabuser:Null;
-		}
-
-		if ($this->_post_email === Null){
-			// Fetch the SpotNab EmailID
-			$this->_post_email = trim($this->_globals->spotnabemail)?
-				$this->_globals->spotnabemail:Null;
-		}
-
-		if ($this->_post_group === Null){
-			// Fetch the SpotNab Usenet Group
-			$this->_post_group = trim($this->_globals->spotnabgroup)?
-				$this->_globals->spotnabgroup:Null;
-		}
-
-		// Public Key
-		$this->_ssl_pubkey = trim($this->_globals->spotnabsitepubkey)?
-			$this->_globals->spotnabsitepubkey:false;
-		if($this->_ssl_pubkey)
-			$this->_ssl_pubkey = $this->decompstr($this->_ssl_pubkey);
-
-		// Private Key
-		$this->_ssl_prvkey = trim($this->_globals->spotnabsiteprvkey)?
-			$this->_globals->spotnabsiteprvkey:false;
-		if($this->_ssl_prvkey)
-			$this->_ssl_prvkey = $this->decompstr($this->_ssl_prvkey);
-
-		// Track Discovery Article
-		$this->_discovery_lastarticle = intval($this->_globals->spotnablastarticle);
-
-		// Posting Flag
-		$this->_can_post = (trim($this->_globals->spotnabpost) == 1)?
-			true:false;
-
-		// Auto Enable Flag
-		$this->_auto_enable = (trim($this->_globals->spotnabautoenable) == 1)?
-			true:false;
-
-		// Spotnab Privacy Posting
-		$this->_post_privacy = (trim($this->_globals->spotnabprivacy) == 1)?
-			true:false;
-
-		// Auto-Discovery Private Key (used for Posting)
-		$this->_ssl_auto_prvkey = "eJxtk7mOo0AARHO+YnI0Moe5woYGppv7PjLABmzAgDFg"
-			."/PU7u/FWWlJJT6X3/f0bWdWR/eUH4Mv1UQxC9ctQs7/FN2EhpKQekgEw5MZTTi+Kt"
-			."9pujGz84DeF8xeLY2vXODzDIbvERbWEs4TFGqebjAeXlXjb8Qa7kHrd6P1Ie646ng"
-			."DBmYU1zOmZmrJE+7j4yCjf2XgDxbpc4NlVteGVikgTCyLb4z7Q1fPakDGXinjqKkE"
-			."riorE1dzA/FHSil5Eu4/yNbRu0UMXlUF7OxLeEQQekAkw6jLAL9gmaRvKca7pyy4D"
-			."S9zLoWx4LP/Q67EKaluREVSG8GzXdLOdaVHk2TZE4odQaOQNkc+8nGCxEzWQIsBQk"
-			."GNV6vr8fD4K3bpzdrqLG0zNZkhLvxyi5Urz6w5v/Xw+iLW/to9Zv5SqA6kkNbTYg5"
-			."Jl66Em2u2cvvAx2EWSM3JxWyiNa0GnAikzHkZdaA4pSIRDlYO0OE8Xf/rkTPth46d"
-			."vuTaXPGx20TKXNBszaIKHhl3bAsGJ1zuW3DSGa6lB22Oi1nM0P6al2vEvej16m96i"
-			."4/QDynQF49oIw4QaAMiBbYO+T19Xw8NVuyZ9K9zeXKgSMnifYIXbe/PBjIHuvHWTs"
-			."/BqUQFJKXy6UiyleDpv5Wo0i+1lnATEps7RVcut8OMgIEyuSRcU90d+rNTGh3g3Yc"
-			."/zUyHQLDlxjTazOx2bCZWZqxxgm0PlpRREyAa/w55CEre7Go2DNxWkC9vRVHqhflR"
-			."NVduIZhOoJOdho9jeZRjxMtAuNae29fNze0p2Zr6PbFKJJezphdnOgXE+CrFJLq+S"
-			."A528knKChLjTlKovVc3gJ5fpX6F8uY/syDXPg/xsu9wpKsEvmznLcENOVUXSVXova"
-			."pt/CnrA5O8BuOqAbvAO/Qy8d0j800e14f+1+gPs3xif";
-
-		// Auto-Discovery Public Key (used for discovering)
-		$this->_ssl_auto_pubkey = "eJxlz7lygkAAgOGep7BnGCEIwXLv2UWOBTk7ZAZkUCKR"
-			."Q/L0Odr85d99mvYTJIz7uzCBJ452Lil+n6Z4nDUe0BmKRxbzi4klgUAmAByYDzCCn"
-			."XRhK9F+0m3v2n8kvhjsBVnR07PMJnQ3RbqB2mchb46iyExBLXZ6k/g5v/x0wf1Znz"
-			."pj3fKbVW+fgOPRxA0ujVF/FBn9CsVWKHoULLbLUwYrMYaE3qfc4dSpijW9xYwc5lZ"
-			."NrdwRj75+p1VVq6IeW1wOFwOxKlkjhZfz2euSgTnoTl/BUawcAwmg8ickPv6H/gbI"
-			."LVDl";
-
-		// Auto-Discovery Flags
-		$this->_can_broadcast = (trim($this->_globals->spotnabbroadcast) == 1)?
-			true:false;
-		$this->_can_broadcast = ($this->_can_broadcast && $this->_can_post);
-
-		$this->_can_discover = (trim($this->_globals->spotnabdiscover) == 1)?
-			true:false;
-
-		if (!$this->has_openssl()){
-			// Can SpotNab even work; if not, we disable all flags
-			$this->_can_broadcast = false;
-			$this->_can_post = false;
-		}
-	}
-
-	// ***********************************************************************
-	public function has_openssl(){
-		// return true if ssl is correctly configured and installed
-		// otherwise return a fail
-		return (is_readable(OPENSSL_CFG_PATH) && extension_loaded("openssl"));
-	}
-
-	// ***********************************************************************
-	public function auto_clean($max_days=90){
-		$db = new DB();
-		// automatically sweep old sources lingering that have not shown any
-		// sort of life what-so-ever for more then 90 days
-		$sql = "DELETE FROM spotnabsources WHERE "
-			."lastbroadcast IS NOT NULL AND "
-			."lastbroadcast < NOW() - INTERVAL $max_days DAY";
-		$res = $db->queryExec($sql);
-	}
-
-	// ***********************************************************************
-	public function orphan_comment_clean($max_days=1, $batch=500){
-		// Clean out orphan comments that are older then at least 1 day
-		// this is to address people who do not wish to hold on to
-		// comments they do not have a release for... Makes sense :)
-		$offset = 0;
-		$sql = "SELECT DISTINCT(GID) as GID FROM releasecomment "
-				."WHERE releaseid = 0 "
-				."AND createddate < NOW() - INTERVAL $max_days DAY "
-				."ORDER BY createddate "
-				."LIMIT %d,%d";
-
-		$sql_rel = "SELECT GID FROM releases WHERE GID IN ('%s') ";
-		$sql_del = "DELETE FROM releasecomment WHERE GID IN ('%s')";
-		$total_delcnt = 0;
-		$db = new DB();
-		while(1)
-		{
-			$res = $db->query(sprintf($sql, $offset, $batch));
-			if(!$res)break;
-
-			# Assemble results into list
-            $gids_found = array();
-            $gids_matched = array();
-            foreach($res as $item)
-            	$gids_found[] = $item['GID'];
-
-			#echo 'B:'.sprintf($sql_rel, implode("','", $gids_found))."\n";
-			$res2 = $db->query(sprintf($sql_rel, implode("','", $gids_found)));
-            foreach($res2 as $item)
-            	$gids_matched[] = $item['GID'];
-			# Now we want to create an inverted list by eliminating the
-			# matches we just fetched
-			$gids_missing = array_diff($gids_found, $gids_matched);
-			//print_r($gids_missing);
-			if(count($gids_missing)){
-				$s_gids_missing = implode("','", $gids_missing);
-				$dresc = $db->queryExec(sprintf($sql_del, $s_gids_missing));
-				$total_delcnt += count($gids_missing);
-				$offset += $batch - count($gids_missing);
-			}else{
-				$offset += $batch;
-			}
-			# make noise
-			echo '.';
-
-			if(!count($res))break;
-		}
-		return $total_delcnt;
-	}
-
-	// ***********************************************************************
-	public function soft_reset(){
-		// A harmless function that resets spotnab without losing sources
-		// Calling this function will reset spotnab to think:
-		//	- it hasn't fetched anything yet from existing sources
-		//	- it needs to gracefully build a starting point from scratch
-		//    using existing sources
-		//  - it has never posted discovery information
-		//  - it has never scanned for existing discoveries
-		$db = new DB();
-
-		// resets sources so they need to query again
-		$sources = "UPDATE spotnabsources SET "
-			."lastupdate = NULL,"
-			."lastbroadcast = NULL,"
-			."lastarticle = 0";
-		$discovery_a = "UPDATE site SET "
-			."value = '0' "
-			."WHERE setting = 'spotnablastarticle'";
-		$broadcast = "UPDATE site SET "
-			."updateddate = '1980-01-01 00:00:00' "
-			."WHERE setting = 'spotnabbroadcast'";
-
-		// Discovery should only be set back X days worth defined
-		// by the maximum age a broadcast can be.
-		$reftime = date("Y-m-d H:i:s",
-			time()-(SpotNab::POST_BROADCAST_INTERVAL));
-		$discovery_b = "UPDATE site SET "
-			."updateddate = '1980-01-01 00:00:00' "
-			."WHERE setting = 'spotnabdiscover'";
-
-		$post = "UPDATE site SET "
-			."updateddate = '$reftime' "
-			."WHERE setting = 'spotnabpost'";
-		$db->queryExec($sources);
-		$db->queryExec($discovery_a);
-		$db->queryExec($discovery_b);
-		$db->queryExec($broadcast);
-		$db->queryExec($post);
-	}
-
-	// ***********************************************************************
-	public function fetch_discovery($reftime=Null, $retries=3){
-		$db = new DB();
-		$last = $first = Null;
-
-		// Return Value; Initialize it to Okay
-		// we'll change it to false if we have to.
-		$fetch_okay = true;
-
-		// Track how many records were inserted, updated
-		$inserted = 0;
-		$updated = 0;
-
-		if (!$this->_can_discover){
-			// discovery disabled
-			return false;
-		}
-
-		if($reftime === Null){
-			$q = "SELECT updateddate FROM site WHERE "
-				."setting = 'spotnabdiscover'";
-			$res = $db->queryOneRow($q);
-			if($res){
-				$reftime = $res['updateddate'];
-			}else{
-				// Fetch local time (but look back the maximum duration
-				// that a discovery message can exist for
-				$reftime = $this->utc2local((time()-(SpotNab::POST_BROADCAST_INTERVAL)));
-			}
-		}
-
-		// Now we fetch headers
-		set_error_handler('snHandleError');
-
-		// Connect to server
-		try{
-			if (($this->_site->alternate_nntp == 1 ? $this->_nntp->doConnect(true, true) : $this->_nntp->doConnect()) !== true) {
-				exit($this->_pdo->log->error("Unable to connect to usenet." . PHP_EOL));
-			}
-		}
-		catch(Exception $e){
-			printf("Failed to connect to Usenet\n");
-			// Restore handler
-			restore_error_handler();
-			return false;
-		}
-
-		echo "Spotnab : Discovery ";
-		$summary = $this->_nntp->selectGroup(
-			SpotNab::AUTODISCOVER_POST_GROUP);
-		while(PEAR::isError($summary))
-		{
-			// Reset Connection (This happens first time
-			// around since _nntpReset() will perform
-			// the initial connect if it hasn't been already
-			$summary = $this->_nntpReset(
-				SpotNab::AUTODISCOVER_POST_GROUP);
-
-			// Track retry attempts
-			$retries--;
-			if($retries <= 0){
-				// Retry Atempts exausted
-				echo "Failed\n";
-				// Restore handler
-				restore_error_handler();
-				return false;
-			}
-		}
-
-		$first = $this->_discovery_lastarticle;
-		if($first <= 0 || $first > $summary['last'] ){
-			// Look back until reftime
-			$first = $this->_first_article_by_date(
-				SpotNab::AUTODISCOVER_POST_GROUP,
-				$reftime
-			);
-		}
-
-		if($first === false){
-			// Fail
-			echo "Failed\n";
-			restore_error_handler();
-			return false;
-		}
-
-		// Group Processing Initialization
-		$processed = 0;
-		$batch = $last = intval($summary['last']);
-		$total = abs($last-$first);
-
-		// Select Group
-		while($fetch_okay && $processed < $total)
-		{
-			try
-			{
-				// Prepare Initial Batch
-				if ($total > SpotNab::FETCH_USENET_BATCH)
-					$batch = $first + SpotNab::FETCH_USENET_BATCH;
-
-				// Batch Processing
-				while ($processed < $total)
-				{
-					$headers = $this->_get_headers(SpotNab::AUTODISCOVER_POST_GROUP,
-						"$first-$batch", $retries);
-
-					if($headers === false){
-						// Retry Atempts exausted
-						$fetch_okay = false;
-						break;
-					}
-
-					// Process the header batch
-					$saved = $this->process_discovery_headers($headers);
-					if($saved !== false)
-					{
-						$inserted += $saved[0];
-						$updated += $saved[1];
-					}
-
-					$processed += ($batch-$first);
-					// Increment starting index
-					$first += ($batch-$first);
-
-					if ($last-$first >= SpotNab::FETCH_USENET_BATCH){
-						// Fetch next batch
-						$batch = $first + SpotNab::FETCH_USENET_BATCH;
-					}else{
-						$batch = $last;
-					}
-					//echo "$first-$batch, processed=$processed\n";
-					//print_r($headers);
-				}
-
-			}catch(Exception $e){
-				// Reset Connection
-				$fetch_okay = $this->_nntpReset(SpotNab::AUTODISCOVER_POST_GROUP);
-
-				// Track retry attempts
-				$retries--;
-				if($retries <= 0){
-					// Retry Atempts exausted
-					$fetch_okay = false;
-					break;
-				}
-				continue;
-			}
-		}
-		$sql = sprintf("UPDATE site SET value = '%d' "
-					."WHERE setting = 'spotnablastarticle'", $last);
-		$db->queryExec($sql);
-		printf("%d new and %d updated source(s).\n", $inserted, $updated);
-
-		// Update reference point
-		$q = "UPDATE site SET updateddate = NOW() WHERE "
-				."setting = 'spotnabdiscover'";
-		$db->queryExec($q);
-
-		// Restore handler
-		restore_error_handler();
-		return $inserted + $updated;
-	}
-
-	// ***********************************************************************
-	public function auto_post_discovery($repost_sec=SpotNab::POST_BROADCAST_INTERVAL){
-		$db = new DB();
-		// performs a post discovery once the time in seconds has elapsed
-		$q = "SELECT updateddate FROM site WHERE "
-			."setting = 'spotnabbroadcast'";
-		$res = $db->queryOneRow($q);
-		$then = strtotime($res['updateddate']);
-		$now = time();
-		if(($now - $then) > $repost_sec){
-			// perform a post
-			if($this->post_discovery())
-			{
-				// Update post time
-				$q = "UPDATE site SET updateddate = NOW() WHERE "
-					."setting = 'spotnabbroadcast'";
-					$res = $db->queryExec($q);
-			}
-		}
-	}
-
-	// ***********************************************************************
-	public function post_discovery($reftime=Null, $retries=3){
-		$reftime_local = $reftime;
-		$article = Null;
-		$rc = new ReleaseComments();
-		$us = new Users();
-
-		if($reftime_local === Null){
-			// Fetch local time
-			$reftime_local = $this->utc2local();
-		}
-		// some error checking....
-		if(!$this->_can_broadcast){
-			// Broadcasting not possible
-			return false;
-		}
-
-		// Generate keys if one doesn't exist
-		if(!($this->_ssl_prvkey && $this->_ssl_pubkey))
-			if($this->keygen(false, true) === false)
-				return false;
-
-		// Get Discovery Private Key
-		$prvkey = $this->decompstr($this->_ssl_auto_prvkey);
-		if (!$prvkey){
-			// This is a serious problem because the hard-coded discovery
-			// key should always decrypt!
-			return false;
-		}
-
-		printf("Spotnab : Broadcast ...");
-
-		// Fetch some date ranges
-		$last_month = date("Y-m-d",strtotime(
-			date("Y-m-d", mktime()) . " - 30 day"));
-		$last_year = date('Y-m-d',strtotime(
-			date("Y-m-d", mktime()) . " - 365 day"));
-
-		// Header
-		$message = array(
-			'site' => array(
-				// title & code taken out to keep things anonymous for now
-				//'title' => $this->_post_title,
-				//'code' => $this->_post_code,
-				'id' => md5($this->_globals->siteseed),
-				'users' => $us->getCount()
-			),
-			'posts' => array(
-				'user' => $this->_post_user,
-				'email' => $this->_post_email,
-				'group' => $this->_post_group,
-				'privacy' => $this->_post_privacy,
-				'public_key' => $this->compstr($this->_ssl_pubkey)
-			),
-			'comments' => array(
-				'past_month' => $rc->getCommentCount($last_month, true),
-				'past_year' => $rc->getCommentCount($last_year, true),
-				'total' => $rc->getCommentCount(Null, true)
-			),
-			'postdate_utc' => $this->local2utc($reftime_local),
-		);
-
-		// DEBUG Post
-		//print_r($message);
-		//die();
-
-		// Encode Message so it can be posted
-		$article = $this->encodePost(
-			$message, $reftime_local, false,
-			$prvkey, Null, true,
-			SpotNab::FETCH_DISCOVERY_TYPE,
-			SpotNab::AUTODISCOVER_POST_USER,
-			SpotNab::AUTODISCOVER_POST_EMAIL,
-			SpotNab::AUTODISCOVER_POST_GROUP
-		);
-		// DEBUG Post
-		//print_r($article);
-		//die();
-
-		if($article === false){
-			echo "Failed.\n";
-			return false;
-		}
-
-		// Post message
-		if ($this->_postArticle($article, $retries))
-		{
-			// Post is good; update database
-			//echo "Done.\n";
-			return true;
-		}
-		echo "Failed.\n";
-		return false;
-	}
-
-	// ***********************************************************************
-	public function fetch($reftime=Null, $retries=3){
-		/*
-		* This function queries all enabled sources and fetches any content
-		* they are sharing.
-
-		* The specified $reftime is presumed to be local *not utc*
-		*/
-
-		$db = new DB();
-		$last = $first = Null;
-
-		// Return Value; Initialize it to Okay
-		// we'll change it to false if we have to.
-		$fetch_okay = true;
-		$backfill = false;
-
-		// We set a cap on how many days in the past we look
-		$_max_age = time() - SpotNab::FETCH_MAXIMUM_AGE;
-		if($reftime === Null){
-			// Fetch local time (but look back X days)
-			$reftime = $this->utc2local($_max_age);
-		}else{
-			// Someone specified a date range to query from
-			$backfill = true;
-
-			if(is_string($reftime)){
-				$reftime = date("Y-m-d H:i:s", strtotime($reftime));
-			}else if(is_int($reftime)){
-				$reftime = date("Y-m-d H:i:s", $reftime);
-			}
-			$_max_age = strtotime($reftime);
-		}
-
-		// First we find all active sources and build a hash table we can
-		// use to simplify fetching.
-		$sql = "SELECT * FROM spotnabsources WHERE active = 1 ".
-				"ORDER BY usenetgroup,lastupdate DESC";
-		$res = $db->query($sql);
-		$group_hash = array();
-		$group_article_start = array();
-		$id_hash = array();
-
-		if(!count($res))
-			return true;
-
-		foreach($res as $source){
-			$ghash = trim($source['usenetgroup']);
-			if(!array_key_exists($ghash, $group_hash)){
-				// Because our results are sorted by group, if we enter
-				// here then we're processing a brand new group...
-				$group_hash[$ghash] = array();
-
-				// Initialize our article start point
-				$group_article_start[$ghash] = 0;
-
-				// Initialize id Hash
-				$id_hash[$ghash] = array();
-			}
-
-			// Reference time is in UTC on Usenet but local in our database
-			// this isn't intentionally confusing, this is done so all our local
-			// times reflect those across the world, and it also makes joins to
-			// the table much easier since they join doesn't have to accomodate
-			// for the utc time itself.
-
-			// Therefore, we need to take the lastupdate time and convert it to
-			// UTC for processing.
-			$ref = $backfill?date("Y-m-d H:i:s", $_max_age):$source['lastupdate'];
-
-			if(!$ref){
-				// We've never fetched from the group before, so we'll use
-				// the reftime passed to the function
-				$ref = $reftime;
-			}
-
-			// Therefore, we need to take the lastupdate time and convert it to
-			// UTC for processing.
-			$article = abs(intval($source['lastarticle']));
-			if($article > 0){
-				if($group_article_start[$ghash] == 0)
-					$group_article_start[$ghash] = $article;
-				else
-					$group_article_start[$ghash] = ($article < $group_article_start[$ghash])?
-						$article:$group_article_start[$ghash];
-			}
-
-			// Store id
-			$id_hash[$ghash][] = $source['id'];
-
-			// Store Source Details
-			$group_hash[$ghash][] = array(
-				'id' => $source['id'],
-				'key' => $this->decompstr(trim($source['publickey'])),
-				'user' => trim($source['username']),
-				'email' => trim($source['useremail']),
-
-				// Store local reference time
-				'ref' => strtotime($ref),
-
-				// Store last article reference
-				'article' => $article
-			);
-		}
-
-		// We want to resort the internal arrays by they're ref time
-		// so that the oldest (longest without an update) is processed
-		// first
-		foreach(array_keys($group_hash) as $key){
-			$_ref = array();
-			foreach($group_hash[$key] as $id => $source){
-				# Source Time (within reason)
-				if($backfill)
-					$_ref[$id] = $_max_age;
-				else
-					$_ref[$id] =
-						($source['ref'] < $_max_age)?$_max_age:$source['ref'];
-			}
-			// Sort results (oldest in time first)
-			array_multisort($_ref, SORT_ASC, $group_hash[$key]);
-		}
-
-		// Now we fetch headers
-		set_error_handler('snHandleError');
-
-		// Connect to server
-		try{
-			if (($this->_site->alternate_nntp == 1 ? $this->_nntp->doConnect(true, true) : $this->_nntp->doConnect()) !== true) {
-				exit($this->_pdo->log->error("Unable to connect to usenet." . PHP_EOL));
-			}
-		}
-		catch(Exception $e){
-			printf("Failed to connect to Usenet");
-			// Restore handler
-			restore_error_handler();
-			return false;
-		}
-
-		// Track how many records were inserted, updated
-		$inserted = 0;
-		$updated = 0;
-
-		foreach($group_hash as $group => $hash){
-			printf("Spotnab : %d source(s)...", count($hash));
-
-			$summary = $this->_nntp->selectGroup($group);
-			while(PEAR::isError($summary))
-			{
-				// Reset Connection (This happens first time
-				// around since _nntpReset() will perform
-				// the initial connect if it hasn't been already
-				$summary = $this->_nntpReset($group);
-
-				// Track retry attempts
-				$retries--;
-				if($retries <= 0){
-					// Retry Atempts exausted
-					printf("Spotnab : lost connection...");
-					// Restore handler
-					restore_error_handler();
-					return false;
-				}
-			}
-
-			// Get our article id
-			$first = ($backfill)?0:$group_article_start[$group];
-			if($first == 0){
-				// We can safely use the first $hash entry since we've
-				// already sorted it in ascending order above, so this
-				// is the time furthest back
-				$first = $this->_first_article_by_date($group, $hash[0]['ref']);
-				if($first === false){
-					continue;
-				}
-			}
-
-			// Group Processing Initialization
-			$processed = 0;
-			$batch = $last = intval($summary['last']);
-			$total = abs($last-$first);
-
-			// Select Group
-			while($fetch_okay && $processed < $total)
-			{
-				try
-				{
-					// Prepare Initial Batch
-					if ($total > SpotNab::FETCH_USENET_BATCH)
-						$batch = $first + SpotNab::FETCH_USENET_BATCH;
-
-					// Batch Processing
-					while ($processed>=0 && $processed < $total)
-					{
-						$headers = $this->_get_headers($group,
-							"$first-$batch", $retries);
-
-						if($headers === false){
-							// Retry Atempts exausted
-							$fetch_okay = false;
-							break;
-						}
-
-						// Process the header batch
-						$saved = $this->process_comment_headers($headers, $hash);
-						if($saved !== false)
-						{
-							$inserted += $saved[0];
-							$updated += $saved[1];
-						}
-
-						$processed += ($batch-$first);
-						// Increment starting index
-						$first += ($batch-$first);
-
-						if ($last-$first >= SpotNab::FETCH_USENET_BATCH){
-							// Fetch next batch
-							$batch = $first + SpotNab::FETCH_USENET_BATCH;
-						}else{
-							$batch = $last;
-						}
-						//echo "$first-$batch, processed=$processed\n";
-						//print_r($headers);
-					}
-
-				}catch(Exception $e){
-					// Reset Connection
-					$fetch_okay = $this->_nntpReset($group);
-
-					// Track retry attempts
-					$retries--;
-					if($retries <= 0){
-						// Retry Atempts exausted
-						$fetch_okay = false;
-						break;
-					}
-					continue;
-				}
-			}
-			/*$sql = sprintf("UPDATE spotnabsources "
-					."SET lastarticle = %d WHERE id IN (%s)",
-					$last,
-					implode(",", $id_hash[$group]));*/
-			$db->queryExec(sprintf('UPDATE spotnabsources '
-					.'SET lastarticle = %d WHERE id IN (%s)',
-					$last,
-					implode(",", $id_hash[$group])));
-			echo "\n";
-		}
-		// Restore handler
-		restore_error_handler();
-
-		// Ensure We're not connected
-		try{$this->_nntp->doQuit();}
-		catch(Exception $e)
-		{/* do nothing */}
-
-		return $inserted + $updated;
-	}
-
-	public function processGID($limit=500, $batch=5000, $delete_broken_releases=false){
-		// Process until someone presses cntrl-c
-
-		$db = new DB();
-		$nzb = new NZB();
-
-		$processed = 0;
-
-		// We need an offset for tracking unhandled issues
-		$offset = 0;
-
-		$fsql = 'SELECT id, name, guid FROM releases '
-				.'WHERE GID IS NULL ORDER BY adddate DESC LIMIT %d,%d';
-		$usql = "UPDATE releases SET GID = '%s' WHERE id = %d";
-
-		while(1){
-			// finish
-			if($limit > 0 && $processed >= $limit)
-				break;
-        	$batch=($limit > 0 && $batch > $limit)?$limit:$batch;
-			$res = $db->query(sprintf($fsql, $offset, $batch));
-			if(!$res)break;
-			if(count($res) <= 0)break;
-			$offset += $batch;
-
-			foreach ($res as $r){
-				$nzbfile = $nzb->getNZBPath($r["guid"]);
-				if($nzbfile === Null){
-					continue;
-				}
-
-				$nzbInfo = new NzbInfo();
-				if (!$nzbInfo->loadFromFile($nzbfile))
-				{
-					if($delete_broken_releases){
-						$release = new Releases();
-						$release->deleteSingle(['g' => $r['guid'], 'i' => $r['id']], $this->_nzb, $this->_releaseImage);
-						// Free the variable in an attempt to recover memory
-						unset($release);
-				        echo '-';
-					}else{
-					    // Skip over this one for future fetches
-						$offset++;
-					}
-					continue;
-				}
-				$gid = false;
-				if (!empty($nzbInfo->gid))
-					$gid = $nzbInfo->gid;
-				// Free the variable in an attempt to recover memory
-				unset($nzbInfo);
-
-				if(!$gid){
-					if($delete_broken_releases){
-						$release = new Releases();
-						$release->$release->deleteSingle(['g' => $r['guid'], 'i' => $r['id']], $this->_nzb, $this->_releaseImage);
-						unset($release);
-				        echo '-';
-					}else{
-					    // Skip over this one for future fetches
-						$offset++;
-					}
-					continue;
-				}
-
-				// Update DB With Global Identifer
-				$ures = $db->queryExec(sprintf("UPDATE releases SET gid = '%s' WHERE id = %d", $gid, $r['id']));
-				if($ures < 0){
-					printf("\nPostPrc : Failed to update: %s\n", $r['name']);
-				}
-				// make noise...
-				echo '.';
-				$processed += 1;
-			}
-		}
-
-		# Batch update for comment table
-		/*$usql = 'UPDATE releasecomment, releases '
-				.'SET releasecomment.gid = releases.gid, '
-				.'releasecomment.nzb_guid = releases.nzb_guid '
-				.'WHERE releases.id = releasecomment.releaseid '
-				.'AND releasecomment.gid IS NULL '
-				.'AND releasecomment.nzb_guid = "" '
-				.'AND releases.nzb_guid IS NOT NULL '
-				.'AND releases.gid IS NOT NULL ';*/
-
-        $affected = $db->queryExec(sprintf('UPDATE releasecomment, releases SET releasecomment.gid = releases.gid,
-											releasecomment.nzb_guid = releases.nzb_guid
-											WHERE releases.id = releasecomment.releaseid
-											AND releasecomment.gid IS NULL
-											AND releasecomment.nzb_guid = ""
-											AND releases.nzb_guid IS NOT NULL
-											AND releases.gid IS NOT NULL '
-			)
-		);
-		$rows = $affected->rowCount();
-		if($rows > 0)
-			$processed += $rows;
-		return $processed;
-	}
-
-	// ***********************************************************************
-	public function keygen($print=true, $force_regen=false){
-		// Simply generate a Public/Private Key pair if they don't already
-		// exist
-		$db = new DB();
-
-		// A small boolean we safely toggle after performing
-		// a few checks first to make sure it's safe to do so
-		$do_keygen = true;
-
-		if($force_regen === false){
-			// Not forcing, so we immediately toggle the keygen
-			// flag, we'll toggle it back if we feel the need
-			$do_keygen = false;
-
-			if($this->_ssl_pubkey && $this->_ssl_prvkey){
-
-				$str_in = $this->getRandomStr(80);
-				$str_out = $this->decrypt($this->encrypt($str_in));
-
-				if($str_in != $str_out){
-					// Our key isn't good for nothin...
-					// regen a new one
-					$do_keygen = true;
-				}
-			}
-		}
-
-		if($do_keygen)
-		{
-			// Set new Key
-			$keys = $this->_keygen();
-			if(is_array($keys)){
-				// Force New Username
-				$sql = sprintf("UPDATE site SET value = %s "
-								."WHERE setting = 'spotnabuser'",
-				$db->escapeString(sprintf("nntp-%s",substr(md5($keys['pubkey']), 0, 4))));
-				$db->queryExec($sql);
-				// Force New Email
-				$sql = sprintf("UPDATE site SET value = %s "
-								."WHERE setting = 'spotnabemail'",
-				$db->escapeString(sprintf("nntp-%s@%s.com",
-					substr(md5($keys['pubkey']), 4, 8),
-					substr(md5($keys['pubkey']), 8, 16)
-				)));
-				$db->queryExec($sql);
-				// Save Keys
-				$sql = sprintf("UPDATE site SET value = %s ".
-						"WHERE setting = 'spotnabsitepubkey'",
-						$db->escapeString($keys['pubkey']));
-				$db->queryExec($sql);
-				//echo $keys['pubkey']."\n";
-
-				$sql = sprintf("UPDATE site SET value = %s ".
-						"WHERE setting = 'spotnabsiteprvkey'",
-						$db->escapeString($keys['prvkey']));
-				$db->queryExec($sql);
-
-				// Update Site Information
-				$this->_globals = $this->_site;
-				$this->_post_user = trim($this->_globals->spotnabuser);
-				$this->_post_email = trim($this->_globals->spotnabemail);
-				$this->_ssl_pubkey = $this->decompstr($this->_globals->spotnabsitepubkey);
-				$this->_ssl_prvkey = $this->decompstr($this->_globals->spotnabsiteprvkey);
-			}else{
-				// echo "Failed.";
-				return false;
-			}
-		}
-
-		if($print){
-			printf("SPOTNAB USER  : %s\n", $this->_post_user);
-			printf("SPOTNAB EMAIL : %s\n", $this->_post_email);
-			printf("SPOTNAB GROUP : %s\n", $this->_post_group);
-			printf("SPOTNAB PUBLIC KEY (Begin copy from next line):\n%s\n",
-				$this->_globals->spotnabsitepubkey);
-		}
-
-		return array(
-			'pubkey' => $this->_globals->spotnabsitepubkey,
-			'prvkey' => $this->_globals->spotnabsiteprvkey
-		);
-	}
-
-	// ***********************************************************************
-	protected function _first_article_by_date($group, $refdate, $limit=SpotNab::FETCH_MAXIMUM_HEADERS, $retries=3){
-		// fetches the first article starting at the time specified
-		// by ref time.
-		//
-		// ref time is expected to be a local time in format:
-		// YYYY-MM-DD hh:mm:ss or as integer
-		//
-		// This function returns the first message id to scan from
-		// based on the time specified.  If no articles are found
-		// or something bad happens, false is returned.
-
-		$interval = 1;
-
-		// if we start charting into an area where retention period
-		// isn't present, we're dealing with a blank/dead record that
-		// is lost.... to many blanks and we have to abort.
-		$misses = 0;
-
-		// curfews are a way of not letting an infinit while
-		// loop from taking over while we hunt for a date...
-		// since usenet is not always listed chronologically
-		// we can get in endless loops trying to find the ealiest
-		// date.  To handle that we set a curfew and drop back
-		// a set amount of records and work with that
-		// no one is perfect right?
-		$curfew = 10;
-
-		if(is_string($refdate)){
-			// Convert to Integer (Local Time)
-			$refdate = strtotime($refdate);
-		}
-
-		while(($retries > 0) && ($interval > 0)){
-			$summary = $this->_nntp->selectGroup($group);
-			if(PEAR::isError($summary))
-			{
-				// Reset Connection
-				$this->_nntpReset();
-
-				// Track retry attempts
-				$retries--;
-				if($retries <= 0){
-					// Retry Atempts exausted
-					break;
-				}
-				continue;
-			}
-
-			$_last = $last = intval($summary['last']);
-			$_first = $first = intval($summary['first']);
-
-			$curdate = $lastdate = Null;
-			$curid = $lastid = $first;
-			$interval = 0;
-			while($retries > 0){
-
-				// Save Last Interval
-				$lastinterval = $interval;
-
-				// Adjust Interval
-				if(($last - $first) > 3)
-					$interval = floor(($last - $first)/2);
-				else
-					$interval = 1;
-
-				if($misses >= SpotNab::FETCH_MAX_MISSES){
-					// Misses reached
-					$last = intval($summary['last']);
-					// Adjust pointer
-					$lastid = ($lastid===false)?$first:$lastid;
-					if($lastid >0){
-						if (($last-$lastid) > $limit){
-							// We exceeded our maximum header limit
-							// adjust accordingly
-							$lastid = $last - $limit;
-						}
-						echo " ".(abs($last-$lastid))." record(s) back.";
-						return $lastid;
-					}else{
-					    if (($_last-$last) > $limit){
-					    	// We exceeded our maximum header limit
-					    	// adjust accordingly
-					    	$last = $_last - $limit;
-					    }
-					    echo " ".(abs($_last-$last))." record(s) back.";
-						return $last;
-					}
-				}
-
-				// Swap
-				$lastdate = $curdate;
-				if($curid > 0)
-					$lastid = $curid;
-
-				$msgs = $this->_get_headers(
-					$group, ($last-$interval), $retries);
-
-				if($msgs === false){
-					if (($_last-$last) > $limit){
-						// We exceeded our maximum header limit
-						// adjust accordingly
-						$last = $_last - $limit;
-					}
-					echo " ".(abs($_last-$last))." record(s) back.";
-					return $last;
-				}
-
-				// Reset Miss Count
-				$misses = 0;
-
-				// Save Tracker
-				$curdate = strtotime($msgs[0]['Date']);
-				$curid = intval($msgs[0]['Number']);
-				if($curid <= 0){
-					$lastid = ($lastid===false)?$first:$lastid;
-					if($lastid >0){
-						if (($_last-$lastid) > $limit){
-							// We exceeded our maximum header limit
-							// adjust accordingly
-							$lastid = $_last - $limit;
-						}
-						echo " ".(abs($_last-$lastid))." record(s) back.";
-						return $lastid;
-					}else{
-					    if (($_last-$last) > $limit){
-					    	// We exceeded our maximum header limit
-					    	// adjust accordingly
-					    	$last = $_last - $limit;
-					    }
-					    echo " ".(abs($_last-$last))." record(s) back.";
-						return $last;
-					}
-				}
-
-				//echo "\nCUR($curid):".date("Y-m-d H:i:s", $curdate)
-				//		." REF:".date("Y-m-d H:i:s", $refdate)
-				//		." LAST:".date("Y-m-d H:i:s", $lastdate)
-				//		." $interval\n";
-
-				if($interval == 1){
-					// We're soo close now...
-					$curfew --;
-					if($curfew <= 0)
-					{
-						if (($_last-$curid) > $limit){
-							// We exceeded our maximum header limit
-							// adjust accordingly
-							$curid = $_last - $limit;
-						}
-						// curfew met... just deal with our current spot
-						echo " ".($_last-$curid)." record(s) back.";
-						return $curid;
-					}
-
-					if($refdate > $curdate && $refdate > $lastdate){
-						if (($_last-$curid) > $limit){
-							// We exceeded our maximum header limit
-							// adjust accordingly
-							$curid = $_last - $limit;
-						}
-						// Found content
-						echo " ".($_last-$curid)." record(s) back.";
-						return $curid;
-					}else if($refdate > $curdate && $refdate > $lastdate){
-						// Close... Shuffle forward a bit
-						$first+=2;
-					}else{
-						// Slide window and try again
-						$last-=2;
-					}
-					$interval=2;
-					continue;
-				}
-
-				// Make some noise
-				if($interval%2)echo ".";
-
-				// Adjust Boundaries
-				if($curdate > $refdate){
-					// We need to look further forward
-					$last = $curid+1;
-				}else if ($curdate <= $refdate){
-					// We need To look further back
-					$first = $curid-1;
-				}
-			}
-		}
-		//echo "n/a m:$misses,i:$interval\n";
-		return false;
-	}
-
-	// ***********************************************************************
-	public function process_comment_headers($headers, $group_hash, $save=true){
-		/*
-		*	We iterate over the provided headers (generated by
-		*	$this->_get_headers() to a structure that is at the very
-		*	minimum looking like this:
-		*
-		*	array (
-		*		[0] => array (
-		*				'Number': <int>
-		*				'Subject': <string>
-		*				'From': <string>
-		*				'Date': <string>
-		*				'Message-ID': <string>
-		*				'Bytes': <int>
-		*				'Lines': <int>
-		*				'Epoch': <int>
-		*			),
-		*			...
-		*		)
-		*	From the structure above, we process our group hash and retrieve
-		*	all the binary data we need on valid content.
-		*
-		*	A group_hash() record looks like this:
-		*		array(
-		*			array(
-		*				'id': <int>,
-		*				'key': <string>,
-		*				'user': <string>,
-		*				'email': <string>,
-		*				'ref': <int>,
-		*			),
-		*			array(
-		*				'id': <int>,
-		*				'key': <string>,
-		*				'user': <string>,
-		*				'email': <string>,
-		*				'ref': <int>,
-		*			),
-		*		)
-		*/
-
-		if(!count($group_hash)){
-			// Nothing to process
-			return array();
-		}
-
-		//
-		// Prepare some general SQL Commands for saving later if all goes well
-		//
-
-		$db = new DB();
-		$rc = new ReleaseComments();
-
-		// Comments
-		$sql_new_cmt = "INSERT INTO releasecomment (".
-			"id, sourceid, username, userid, gid, cid, isvisible, ".
-			"releaseid, `text`, createddate, issynced, nzb_guid) VALUES (".
-			"NULL, %d, %s, 0, %s, %s, %d, 0, %s, %s, 1, %s)";
-		$sql_upd_cmt = "UPDATE releasecomment SET ".
-			"isvisible = %d, `text` = %s".
-			"WHERE sourceid = %d AND gid = %s AND cid = %s AND nzb_guid = %s";
-		$sql_fnd_cmt = "SELECT count(id) as cnt FROM releasecomment ".
-			"WHERE sourceid = %d AND gid = %s AND cid = %s";
-
-		// Sync Times
-		$sql_sync = "UPDATE spotnabsources SET lastupdate = %s ".
-			"WHERE id = %d";
-
-		$matches = Null;
-		$processed = 0;
-		$updates = 0;
-		$inserts = 0;
-		foreach ($headers as $header){
-			// Preform some general scanning the header to determine
-			// if it could possibly be a valid post.
-			if(!preg_match(SpotNab::FETCH_MSGID_REGEX,
-				$header['Message-ID'], $matches)){
-				continue;
-			}
-			if($matches['domain'] != SpotNab::SEGID_DOMAIN)
-				continue;
-
-			if($matches['type'] != SpotNab::FETCH_COMMENT_TYPE)
-				continue;
-
-			// Now we check the subject line; it provides the first part of
-			// the key to determining if we should handle the message or not
-			if(!preg_match(SpotNab::FETCH_COMMENT_SUBJECT_REGEX,
-				$header['Subject'], $matches)){
-				continue;
-			}
-
-			// We have a match; So populate potential variables
-			$checksum = $matches['checksum'];
-			$refdate = $matches['utcref'];
-			$refdate_epoch = @strtotime($matches['utcref']. " UTC");
-			if($refdate_epoch === false || $refdate_epoch < 0){
-				// Bad time specified
-				continue;
-			}
-			// PreKey is used to attempt to run the decode algorithm
-			// a head of time.. if we can decrypt this we can probably
-			// assume the body will decode too (and won't be a waste of
-			// time to download it)
-
-			foreach($group_hash as $hash){
-				// Track how many records we handled
-				$processed++;
-
-				// First check the ref date... if it's newer then what we've
-				// already processed, then we'll just keep on chugging along.
-				if($refdate_epoch <= $hash['ref']){
-					continue;
-				}
-
-				// Scan header information for supported matches
-				if(!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
-						$header['From'], $matches))
-					continue;
-
-				// Match against our sources posts
-				if(trim($matches['user']) != $hash['user'])
-					continue;
-				if(trim($matches['email']) != $hash['email'])
-					continue;
-
-				// If we reach here, we've found a header we can process
-				// The next step is to download the header's body
-
-				// We'll do some final verifications on it such as detect
-				// if the checksum is okay, and verify that the timestamp
-				// within the body matches that of the header... then we
-				// can start processing the guts of the body.
-
-				if($save){
-					// Download Body
-					$body = $this->_get_body($header['Group'],
-								$header['Message-ID']);
-					if($body === false){
-						continue;
-					}
-					//echo "DEBUG Close Match:\n";
-					//print_r($header);
-
-					// Decode Body
-					$body = $this->decodePost($body, $hash['key']);
-					if($body === false)
-						continue; // Decode failed
-
-					// Verify Body
-					if(!is_array($body))
-						continue; // not any array
-
-					if(!(bool)count(array_filter(array_keys($body), 'is_string')))
-						continue; // not an associative array
-
-					if((!array_key_exists('server', $body)) ||
-						(!array_key_exists('postdate_utc', $body)))
-						continue; // base structure missing
-
-					// Compare postdate_utc and ensure it matches header
-					// timestamp
-					if(preg_replace('/[^0-9]/', '',
-						$body['postdate_utc']) != $refdate)
-						continue;
-
-					// Comment Handling
-					if(array_key_exists('comments',$body) &&
-						is_array($body['comments'])){
-						$rc = new ReleaseComments();
-
-						foreach($body['comments'] as $comment){
-
-							// Verify Comment is parseable
-							if(!is_array($comment))
-								continue; // not an array
-							if(!count(array_filter(array_keys($comment))))
-								continue; // not an associative array
-
-							// Store isvisible flag
-							$is_visible = 1;
-							if(array_key_exists('is_visible', $comment))
-								$is_visible = (intval($comment['is_visible'])>0)?1:0;
-
-							// Check that comment doesn't already exist
-							$res = $db->queryOneRow(sprintf($sql_fnd_cmt,
-								$hash['id'],
-								$db->escapeString($comment['gid']),
-								$db->escapeString($comment['cid'])));
-
-							// Store Results in DB
-							if($res && intval($res['cnt'])>0){
-								// Make some noise
-								echo '.';
-                                $updates += ($db->queryExec(sprintf($sql_upd_cmt,
-									$is_visible,
-									$db->escapeString($comment['comment']),
-									$hash['id'],
-									$db->escapeString($comment['gid']),
-									$db->escapeString($comment['cid']),
-										$db->escapeString($comment['gid'])
-								))>0)?1:0;
-							}else{
-								// Make some noise
-								echo '+';
-								// Perform Insert
-								$res = $db->queryInsert(sprintf($sql_new_cmt,
-									$hash['id'],
-									$db->escapeString($comment['username']),
-									$db->escapeString($comment['gid']),
-									$db->escapeString($comment['cid']),
-									$is_visible,
-									$db->escapeString($comment['comment']),
-									// Convert createddate to Local
-									$db->escapeString($this->utc2local(
-														$comment['postdate_utc'])),
-									$db->escapeString($comment['gid'])
-								));
-								$inserts += 1;
-							}
-							$rc->updateReleaseCommentCount($comment['gid']);
-						}
-					}
-
-					// Update spotnabsources table, set lastupdate to the
-					// timestamp parsed from the header.
-					$db->queryExec(sprintf($sql_sync,
-						$db->escapeString(
-							$this->utc2local($body['postdate_utc'])),
-							$hash['id']
-						)
-					);
-				}else{
-					// Debug non/save mode; mark update
-					$updates += 1;
-				}
-
-				// always break if we made it this far... no mater how many
-				// other groups are being processed, we've already matched
-				// for this article, so we don't need to process it for
-				// other sources.
-				break;
-			}
-		}
-		return array($inserts, $updates);
-	}
-
-	// ***********************************************************************
-	public function process_discovery_headers($headers, $save=true){
-		/*
-		*	We iterate over the provided headers (generated by
-		*	$this->_get_headers() to a structure that is at the very
-		*	minimum looking like this:
-		*
-		*	array (
-		*		[0] => array (
-		*				'Number': <int>
-		*				'Subject': <string>
-		*				'From': <string>
-		*				'Date': <string>
-		*				'Message-ID': <string>
-		*				'Bytes': <int>
-		*				'Lines': <int>
-		*				'Epoch': <int>
-		*			),
-		*			...
-		*		)
-		*/
-
-		//
-		// Prepare some general SQL Commands for saving later if all goes well
-		//
-
-		$db = new DB();
-
-        // Auto Enable Flag (used for inserts only)
-		$auto_enable = ($this->_auto_enable)?"1":"0";
-
-		// Spotnab Sources
-		$sql_new_cmt = "INSERT INTO spotnabsources (".
-			"id, username, useremail, usenetgroup, publickey, ".
-			"active, description, lastupdate, lastbroadcast, dateadded) VALUES (".
-			"NULL, %s, %s, %s, %s, $auto_enable, %s, NULL, %s, NOW())";
-		$sql_upd_cmt = "UPDATE spotnabsources SET ".
-			"lastbroadcast = %s ".
-			"WHERE username = %s AND useremail = %s AND usenetgroup = %s";
-		$sql_fnd_cmt = "SELECT count(id) as cnt FROM spotnabsources ".
-			"WHERE username = %s AND useremail = %s AND usenetgroup = %s";
-
-		$matches = Null;
-		$processed = 0;
-		$inserts = 0;
-		$updates = 0;
-		foreach ($headers as $header){
-			// Preform some general scanning the header to determine
-			// if it could possibly be a valid post.
-
-			// Now we check the subject line; it provides the first part of
-			// the key to determining if we should handle the message or not
-			if(!preg_match(SpotNab::FETCH_MSGID_REGEX,
-				$header['Message-ID'], $matches)){
-				continue;
-			}
-			if($matches['domain'] != SpotNab::SEGID_DOMAIN)
-				continue;
-
-			if($matches['type'] != SpotNab::FETCH_DISCOVERY_TYPE)
-				continue;
-
-			// Now we check the subject line; it provides the first part of
-			// the key to determining if we should handle the message or not
-			if(!preg_match(SpotNab::FETCH_DISCOVERY_SUBJECT_REGEX,
-				$header['Subject'], $matches)){
-				continue;
-			}
-
-			// We have a match; So populate potential variables
-			$checksum = $matches['checksum'];
-			$refdate = $matches['utcref'];
-			$refdate_epoch = @strtotime($matches['utcref']. " UTC");
-			if($refdate_epoch === false || $refdate_epoch < 0){
-				// Bad time specified
-				continue;
-			}
-			// PreKey is used to attempt to run the decode algorithm
-			// a head of time.. if we can decrypt this we can probably
-			// assume the body will decode too (and won't be a waste of
-			// time to download it)
-
-			// Track how many records we handled
-			$processed++;
-
-			// Scan header information for supported matches
-			if(!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
-					$header['From'], $matches))
-				continue;
-
-			// Match against our sources posts
-			if(trim($matches['user']) != SpotNab::AUTODISCOVER_POST_USER)
-				continue;
-			if(trim($matches['email']) != SpotNab::AUTODISCOVER_POST_EMAIL)
-				continue;
-
-			// If we reach here, we've found a header we can process
-			// The next step is to download the header's body
-
-			// We'll do some final verifications on it such as detect
-			// if the checksum is okay, and verify that the timestamp
-			// within the body matches that of the header... then we
-			// can start processing the guts of the body.
-
-			if($save){
-				// Download Body
-				$body = $this->_get_body($header['Group'],
-							$header['Message-ID']);
-				if($body === false){
-					continue;
-				}
-				//echo "DEBUG Close Match:\n";
-				//print_r($header);
-
-				// Decode Body
-				$body = $this->decodePost(
-					$body,
-					$this->decompstr($this->_ssl_auto_pubkey)
-				);
-				if($body === false)
-					continue; // Decode failed
-
-				//echo "DEBUG Close Match:\n";
-				//print_r($header);
-
-				// Verify Body
-				if(!is_array($body))
-					continue; // not any array
-
-				if(!(bool)count(array_filter(array_keys($body), 'is_string')))
-					continue; // not an associative array
-
-				if(!(array_key_exists('site', $body) &&
-					array_key_exists('posts', $body) &&
-					array_key_exists('comments', $body) &&
-					array_key_exists('postdate_utc', $body)))
-					continue; // base structure missing
-
-				// Compare postdate_utc and ensure it matches header
-				// timestamp
-				if(preg_replace('/[^0-9]/', '',
-					$body['postdate_utc']) != $refdate)
-					continue;
-
-				$posts = $body['posts'];
-				$p_user = array_key_exists('user', $posts)?trim($posts['user']):Null;
-				$p_email = array_key_exists('email', $posts)?trim($posts['email']):Null;
-				$p_group = array_key_exists('group', $posts)?trim($posts['group']):Null;
-				$p_key = array_key_exists('public_key', $posts)?trim($posts['public_key']):Null;
-
-				if(!($p_user && $p_email && $p_group && $p_key))
-					// basic error checking
-					continue;
-
-				// Check to make sure the discovery isn't 'this' site
-				if($p_user == $this->_post_user && $p_email == $this->_post_email)
-					continue;
-
-				// Check that comment doesn't already exist
-				$res = $db->queryOneRow(sprintf($sql_fnd_cmt,
-					$db->escapeString($p_user),
-					$db->escapeString($p_email),
-					$db->escapeString($p_group))
-				);
-
-				if(!$res)
-					// Uh oh
-					continue;
-
-				// Store Results in DB
-				if(intval($res['cnt'])==0){
-					// Make some noise
-					echo '+';
-					// Perform Insert
-					$res = $db->queryInsert(sprintf($sql_new_cmt,
-						$db->escapeString($p_user),
-						$db->escapeString($p_email),
-						$db->escapeString($p_group),
-						$db->escapeString($p_key),
-						// store user as description for now
-						$db->escapeString($p_user),
-						$db->escapeString($this->utc2local($refdate)))
-					);
-					$inserts += 1;
-				}else{
-					echo '.';
-					$res = $db->queryExec(sprintf($sql_upd_cmt,
-						$db->escapeString($this->utc2local($refdate)),
-						$db->escapeString($p_user),
-						$db->escapeString($p_email),
-						$db->escapeString($p_group)));
-					$updates += 1;
-				}
-			}
-		}
-		return array($inserts, $updates);
-	}
-
-	// ***********************************************************************
-	protected function _get_body($group, $id, $retries=3){
-		/*
-		*	Fetch the body of a given Message-ID taken from the headers
-		*	The function then returns the raw content
-		*/
-
-		$matches = Null;
-		if(preg_match("/^\s*<(.*)>\s*$/", $id, $matches))
-			// Ensure we're always dealing with a properly
-			// formatted id
-			$id = $matches[1];
-
-		// The returned result will be stored in $raw
-		$raw = Null;
-		do
-		{
-			$raw = $this->_nntp->getBody("<".$id.">", true);
-			if(PEAR::isError($raw))
-			{
-				// Reset Connection (This happens first time
-				// around since _nntpReset() will perform
-				// the initial connect if it hasn't been already
-				$this->_nntpReset($group);
-				// Track retry attempts
-				$retries--;
-				if($retries <= 0){
-					// Retry Atempts exausted
-					printf("%s ERROR - Failed Segment Fetch: %s/%s ...\n",
-						date("Y-m-d H:i:s"), $group, $id);
-					return false;
-				}
-				continue;
-			}
-
-			// Retrieved Data
-			return $raw;
-		}while($retries > 0);
-
-		// Fail
-		return false;
-	}
-
-	// ***********************************************************************
-	protected function _get_headers($group, $range, $retries=3, $sort=true){
-		/*
-		*
-		*	There is to much involved with fetching article headers
-		*	that bloat and make a lot of code repetative...
-		*	This function returns the headers of the specified range
-		*	in an array() of associative array() always to make life
-		*	easy... alternativly, if this function fails then false
-		*	is returned.
-		*
-		*	We also convert all time scanned into its Epoch value
-		*	with the returned results for easier parsing; this
-		*	is done to order results as well.
-		*/
-
-		// epoch array is used for sorting fetched results
-		$epoch = array();
-
-		// Header parsing for associative array returned
-		$min_headers = array('Number', 'Subject', 'From', 'Date',
-							'Message-ID', 'Bytes', 'Lines');
-		do
-		{
-			$msgs = $this->_nntp->getOverview($range, true, false);
-			if(PEAR::isError($msgs))
-			{
-				$this->_nntpReset($group);
-				// Track retry attempts
-				$retries--;
-				if($retries <= 0){
-					// Retry Atempts exausted
-					break;
-				}
-				continue;
-			}
-			// If we get here, then we fetched the header block okay
-
-			// Clean up bad results but don't mark fetch as a failure
-			// just report what it found.. (nothing). We do this because
-			// PEAR::isError() never threw, so the response has to be valid
-			// even though it's inconsistent
-			if(!$msgs)return array();
-			if(!is_array($msgs))return array();
-
-			// For whatever reason, we sometimes get an array of
-			// associative array returned, and all other times we just
-			// get an associative array.  Convert the associative array
-			// if we get one to an array of associative array just to
-			// simplify the response and make it esier to work with
-			if((bool)count(array_filter(array_keys($msgs), 'is_string'))){
-				// convert to an array of assocative array
-				$msgs = array($msgs);
-			}
-
-			for($i=0;$i<count($msgs);$i++){
-				$skip=false;
-				foreach($min_headers as $key){
-					if(!array_key_exists($key, $msgs[$i])){
-						unset($msgs[$i]);
-						$i--;
-						$skip=true;
-						break;
-					}
-				}
-				if($skip)continue;
-
-				// Update Record With Epoch Value (# of sec from Jan, 1980)
-				$epoch[$i] = $msgs[$i]['Epoch'] = strtotime($msgs[$i]['Date']);
-				// It's easier to track the group information if it's
-				// stored with the header segment
-				$epoch[$i] = $msgs[$i]['Group'] = $group;
-			}
-
-			if($sort && count($msgs)>1)
-				// Content is already sorted by articles, but if the
-				// sort flag is specified, then content is re-sorted by the
-				// messages stored epoch time
-				array_multisort($epoch, SORT_ASC, $msgs);
-
-			return $msgs;
-
-		}while($retries >0);
-
-		return false;
-	}
-
-	// ***********************************************************************
-	public function post($reftime=Null, $retries=3){
-		/*
-		* This function posts to usenet if there are any new updates
-		* to report that are flagged for transmit.
-		*
-		* The specified $reftime is presumed to be local *not utc*
-		*/
-
-		// Make sure we can post
-		if(!$this->_can_post){
-			// Disabled
-			return false;
-		}
-
-		$reftime_local = $reftime;
-		$article = Null;
-		if($reftime_local === Null){
-			// Fetch local time
-			$reftime_local = $this->utc2local();
-		}
-		// Header
-		$message = array(
-			'server' => array(
-				'code' => $this->_post_site,
-				'title' => $this->_post_title,
-				),
-			'postdate_utc' => $this->local2utc($reftime_local),
-			'comments' => array()
-		);
-
-		// Store Comments
-		while(($data = $this->unPostedComments()) !== Null)
-		{
-			$message['comments'] = $data['comments'];
-
-			$db = new DB();
-			$sql = sprintf("UPDATE releasecomment "
-					."SET issynced = 1 WHERE id IN (%s)",
-					implode(",", $data['ids']));
-
-			// Generate keys if one doesn't exist
-			if(!($this->_ssl_prvkey && $this->_ssl_pubkey))
-			{
-				if($this->keygen(false, true) !== false)
-					// Post a discovery message if enabled
-					$this->post_discovery();
-				else
-					return false;
-			}
-
-			//printf("%s INFO - Encoding article ...", date("Y-m-d H:i:s"));
-			// Encode Message so it can be posted
-			$article = $this->encodePost($message, $reftime_local);
-			if($article === false){
-				echo "Failed.\n";
-				return false;
-			}
-			//echo "Done.\n";
-
-			// Post message
-			printf("Spotnab : %d posting ...\n", count($message['comments']));
-			if (!$this->_postArticle($article, $retries))
-			{
-				// Post is good; update database
-				$res = $db->queryExec($sql);
-				echo "Failed.\n";
-				return false;
-			}
-			//echo "Done.\n";
-
-			// Update Database
-			$res = $db->queryExec($sql);
-		}
-
-		// If code reached here then we're good
-		return true;
-	}
-
-	// ***********************************************************************
-	private function _postArticle ($article, $retries=3)
-	{
-		// Extract message id
-		if(!preg_match('/Message-ID: <(?P<id>[^>]+)>/', $article[0], $matches)){
-			// we couldn't extract the message id
-			return false;
-		}
-
-		$msg_id = $matches['id'];
-
-		set_error_handler('snHandleError');
-
-		// Connect to server
-		if (($this->_site->alternate_nntp == 1 ? $this->_nntp->doConnect(true, true) : $this->_nntp->doConnect()) !== true) {
-			exit($this->_pdo->log->error("Unable to connect to usenet." . PHP_EOL));
-		}
-		while($retries > 0)
-		{
-			try
-			{
-				$summary = $this->_nntp->selectGroup($this->_post_group);
-				if(PEAR::isError($summary)){
-					$summary = $this->_nntpReset($this->_post_group);
-					$retries--;
-					continue;
-				}
-				// Check if server will receive an article
-				$_err = $this->_nntp->cmdPost();
-				if (PEAR::isError($_err)) {
-					$summary = $this->_nntpReset($this->_post_group);
-					$retries--;
-					continue;
-				}
-
-				// Actually send the article
-				$_err = $this->_nntp->cmdPost2($article);
-
-			}catch(Exception $e){
-				// Ensure We're not connected
-				try{$this->_nntp->doQuit();}
-				catch(Exception $e)
-				{/* do nothing */}
-
-				// Post failed
-				$retries--;
-				// try again
-				continue;
-			}
-
-			// Now we verify the post worked okay
-			// The below code was commented out but not removed as it
-			// is good reference on how to quickly scan for an article.
-			// The problem with the below code is some providers were
-			// taking up to 20 min for the post to show... so checking
-			// right after posting was failing for this group.
-
-			// $summary = $this->_nntp->selectGroup($this->_post_group);
-			// if(PEAR::isError($summary)) {
-			// 	$summary = $this->_nntpReset($this->_post_group);
-			// 	$retries--;
-			// 	continue;
-			// }
-			// $last = intval($summary['last']);
-			// $batch = $last - SpotNab::VERIFY_FETCH_HEADER_COUNT;
-			// $headers = $this->_get_headers($this->_post_group,
-			// 			"$batch-$last", $retries);
-
-			// // Ensure We're not connected
-			// try{$this->_nntp->doQuit();}
-			// catch(Exception $e)
-			// {/* do nothing */}
-
-			// if($headers === false){
-			// 	// We failed
-			// 	return false;
-			// }
-
-			// // Okay we have headers to scan (we'll work back from the end to
-			// // the front to speed the process up)
-			// for($i=count($headers)-1; $i >0; $i--){
-			// 	if(!array_key_exists('Message-ID', $headers[$i]))
-			// 		continue;
-
-			// 	if ($headers[$i]['Message-ID'] == "<$msg_id>")
-			// 		// Great! we found the post we just posted
-			// 		return true;
-			// }
-			// // Otherwise we didn't find the Message-ID so we fail
-			// return false;
-
-			// Restore handler
-			restore_error_handler();
-
-			// We're done
-			return true;
-		}
-		// Restore handler
-		restore_error_handler();
-		return false;
-	}
-
-	// ***********************************************************************
-	private function _nntpReset ($group=Null)
-	{
-		// Reset Connection
-		try{$this->_nntp->doQuit();}
-		catch(Exception $e)
-		{/* do nothing */}
-
-		// Attempt to reconnect
-		try{
-			if (($this->_site->alternate_nntp == 1 ? $this->_nntp->doConnect(true, true) : $this->_nntp->doConnect()) !== true) {
-			exit($this->_pdo->log->error("Unable to connect to usenet." . PHP_EOL));
-		}
-		}
-		catch(Exception $e){return false;}
-
-		if($group !== Null)
-		{
-			// Reselect group if specified
-			$summary = $this->_nntp->selectGroup($this->_post_group);
-			if(PEAR::isError($summary))
-				return false;
-			return $summary;
-		}
-		return true;
-	}
-
-	// ***********************************************************************
-	public function getRandomStr($len) {
-		// Valid Characters
-		static $vc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-
-		$unique = '';
-		for($i = 0; $i < $len; $i++)
-			$unique .= $vc[mt_rand(0, strlen($vc) - 1)];
-
-		return $unique;
-	}
-
-	// ***********************************************************************
-	public function decodePost($message, $key=Null, $decrypt=true) {
-
-		// Decode Yenc
-		$message = $this->_nntp->decodeYenc2($message);
-
-		// Decompress Messsage
-		$message = @gzuncompress($message);
-
-		if ($key === Null)
-			$key = $this->_ssl_pubkey;
-
-		// Decrypt Message
-		if($decrypt){
-			$message = $this->decrypt($message, $key);
-			if($message === false){
-				// fail
-				return false;
-			}
-		}else{
-			// Convert from base64
-			$message = base64_decode($message);
-			if($message === false){
-				// Fail
-				return false;
-			}
-		}
-
-		$message = json_decode($message, true);
-		if($message === false){
-			// Fail
-			return false;
-		}
-
-		return $message;
-	}
-
-	// ***********************************************************************
-	public function encodePost($message, $reftime=Null, $debug=False,
-								$prvkey=Null, $passphrase=Null, $encrypt=True,
-								$msgtype=SpotNab::FETCH_COMMENT_TYPE,
-								$user=Null, $email=Null, $group=Null) {
-		/*
-
-		Assembles and encodes a message ready to be posted onto
-		a usenet server.
-
-		false is returned if the function fails,
-
-		If a reftime is specified, it is presumed that it will be in
-		an integer format and it will be localtime
-
-		If the debug is set to true, then a third part of the
-		article is returned containing header information that would
-		look as though _get_header() returned it
-		*/
-
-		// Assumed to be in Y-m-d H:i:s format or int
-		// convert local time into UTC
-		$reftime = $this->local2utc($reftime, "YmdHis");
-		$s = new Sites();
-
-		$msgid = sprintf('<%s.%s.%d@%s>',
-			$this->getRandomStr(30),
-			$msgtype,
-			time(),
-			SpotNab::SEGID_DOMAIN
-		);
-
-		if(!is_string($message)){
-			// If message is not already in string format, then
-			// it's in it's assembled mixed array format... we
-			// need to convert it to json before proceeding
-			$message = json_encode($message, JSON_HEX_TAG|JSON_HEX_APOS|
-						JSON_HEX_QUOT|JSON_HEX_AMP|JSON_UNESCAPED_UNICODE);
-			if($message === false){
-				// Fail
-				return false;
-			}
-		}
-
-		// nntp posting expects an array as follows:
-		//	array(
-		//		[0] => 'Message Header'
-		//		[1] => 'Message	Body'
-		//	);
-
-		if($encrypt){
-			// Encrypt Message
-			$message = $this->encrypt($message, $prvkey, $passphrase);
-			if($message === false){
-				// fail
-				return false;
-			}
-		}else{
-			// Convert to base64
-			$message = base64_encode($message);
-		}
-
-		// Compress Messsage
-		$message = @gzcompress($message, 9);
-
-		// Yenc Binary Content
-		$message = $this->_nntp->encodeYenc2($message, md5($message));
-
-		//
-		// Prepare Header
-		//
-
-		// Checksum id
-		$checksum = sha1($message);
-
-		// Prepare Subject
-		$subject = sprintf("%s-%s",
-			// checksum against message transmitted
-			$checksum,
-			// Save UTC Time
-			$reftime
-		);
-
-		if($user === Null)
-			$user = trim($this->_post_user);
-		if($email === Null)
-			$email = trim($this->_post_email);
-		if($group === Null)
-			$group = trim($this->_post_group);
-
-		$header  = "Subject: " . $subject . "\r\n";
-		$header .= "Newsgroups: " . $group . "\r\n";
-		$header .= "Message-ID: $msgid\r\n";
-		$header .= "X-Newsreader: NewzNab v" . $s->version() ."\r\n";
-		$header .= "X-No-Archive: yes\r\n";
-
-		$header .= "From: ".$user. " <" . $email . ">\r\n";
-
-		// Binary Content
-		$header .= 'Content-Type: text/plain; charset=ISO-8859-1' . "\r\n";
-		$header .= 'Content-Transfer-Encoding: 8bit' . "\r\n";
-
-		// Assemble Article in structure NNTP expects
-		$article = array($header, $message);
-
-		if($debug){
-			// Append some debug data to the article
-			$article[] = array(
-				'Number' => 1234,
-				'Subject' => $subject,
-				'From' => sprintf('%s <%s>', $user, $email),
-				'Date' => date(DATE_RFC822, strtotime(
-								$this->utc2local($reftime))),
-				'Message-ID' => $msgid,
-				'Bytes' => strlen($message),
-				'Lines' => '1',
-				'Epoch' => strtotime($this->utc2local($reftime)),
-				'Group' => $group
-			);
-		}
-		return $article;
-	}
-
-	// ***********************************************************************
-	public function unPostedComments($limit=SpotNab::POST_MAXIMUM_COMMENTS) {
-		/*
-		*	This function returns a list of comments that have not been
-		*	otherwise posted to usenet.
-		*
-		*	$from and $to will configure themselves if set to NULL
-		*	but otherwise it's expected format is string "Y-m-d H:i:s"
-		*/
-
-		$db = new DB();
-
-		// Now we fetch for any new posts since reference point
-		$sql = sprintf("SELECT r.gid, rc.id, rc.text, u.username, "
-				."rc.isvisible, rc.createddate, rc.host "
-				."FROM releasecomment rc "
-				."JOIN releases r ON r.id = rc.releaseid AND rc.releaseid != 0 "
-				."JOIN users u ON rc.userid = u.id AND rc.userid != 0 "
-				."WHERE r.gid IS NOT NULL "
-				."AND sourceid = 0 AND issynced = 0 "
-				."LIMIT %d", $limit);
-
-		$res = $db->query($sql);
-		if(!$res)
-			return Null;
-
-		// Now we prepare a comments array to return with
-		$comments = array();
-		$ids = array();
-
-		foreach($res as $comment){
-			// If we don't have a GID then we can't make the post;
-			// the user hasn't set up there database to store the GID's
-			// correctly
-
-			if(empty($comment['gid']))
-				continue;
-
-			// Privacy options (scramble username or not)
-			if ($this->_post_privacy)
-				$username = sprintf(
-					"sn-%s",
-					substr(md5($comment['username'].$this->_globals->siteseed), 0, 6)
-				);
-			else
-				$username = $comment['username'];
-
-			// Hash a unique Comment id to associate with this message
-			$cid = md5($comment['id'].$comment['username'].$comment['createddate'].$comment['host']);
-
-			// Keep list of IDs (required for cleanup)
-			$ids[] = $comment['id'];
-
-			// Build Comment
-			$comments[] = array(
-				// Release Global id
-				'gid' => $comment['gid'],
-				// Comment id
-				'cid' => $cid,
-				// Store comment
-				'comment' => $comment['text'],
-				// Store comment
-				'username' => $username,
-				// Store visibility flag
-				'is_visible' => $comment['isvisible'],
-				// Convert createddate to UTC
-				'postdate_utc' => $this->local2utc($comment['createddate'])
-			);
-		}
-
-		// Return Results if they are present
-		return (count($comments)>0)?
-			array('comments' => $comments, 'ids' => $ids):Null;
-	}
-
-	// ***********************************************************************
-	public function utc2local($utc=Null, $format="Y-m-d H:i:s") {
-		/*
-		* Takes a utc time as input and outputs local
-		* If no argument is specified then current local
-		* time is returned.
-		*/
-		if(is_string($utc)){
-			return date($format, strtotime($utc. " UTC"));
-		}else if(is_int($utc)){
-			return date($format,  strtotime(date($format, $utc)." UTC"));
-		}
-		return date($format);
-	}
-
-	// ***********************************************************************
-	public function local2utc($local=Null, $format="Y-m-d H:i:s") {
-		/*
-		* Takes a local time as input and outputs UTC
-		* If no argument is specified then current UTC
-		* time is returned.
-		*/
-		if(is_string($local)){
-			return gmdate($format, strtotime($local));
-		}else if(is_int($local)){
-			return gmdate($format, $local);
-		}
-		return gmdate($format);
-	}
-
-	// ***********************************************************************
-	private function _keygen($passphrase=Null, $bits=1024,
-							$type=OPENSSL_KEYTYPE_RSA)
-	{
-		if(!function_exists('openssl_pkey_new'))
-			return false;
-
-		//Generate Key
-		$res = openssl_pkey_new(
-			array(
-				'private_key_bits' => $bits,
-				'private_key_type' => $type,
-				'config' => OPENSSL_CFG_PATH
-			)
-		);
-
-		if ($res === false)
-		{
-			//print_r(openssl_error_string() );
-			return false;
-		}
-
-		// Get Private Key
-		openssl_pkey_export($res, $prvkey, $passphrase,
-			array('config' => OPENSSL_CFG_PATH));
-
-		// Get Public Key
-		$details = openssl_pkey_get_details($res);
-		if($details === false){
-			return false;
-		}
-		$pubkey = $details['key'];
-
-		return array(
-			'pubkey' => $this->compstr($pubkey),
-			'prvkey' => $this->compstr($prvkey),
-		);
-	}
-
-	// ***********************************************************************
-	public function encrypt ($source, $prvkey=Null, $passphrase=Null){
-		// Encryption performed using private key
-		if($prvkey === Null)
-			// Default Key if none is specified
-			$prvkey = $this->_ssl_prvkey;
-
-		if(!$prvkey)
-			// Still no key...
-			return false;
-
-		if(!function_exists('openssl_get_privatekey'))
-			return false;
-
-		// Load Public Key into array
-		$crypttext='';
-		$pkey = openssl_get_privatekey($prvkey, $passphrase);
-		if($pkey === false)
-			// bad key
-			return false;
-
-		$batch = $len = strlen($source);
-		$ptr = 0;
-		$encrypted = '';
-
-		while($len > 0){
-			// Prepare batch size
-			$batch = (($len - SpotNab::SSL_MAX_BUF_LEN) > 0)?SpotNab::SSL_MAX_BUF_LEN:$len;
-
-			$res = openssl_private_encrypt(substr($source, $ptr, $batch), $crypttext, $pkey);
-			if($res === false){
-				// Encryption failed
-				openssl_free_key($pkey);
-				return false;
-			}
-			$encrypted .=  base64_encode($crypttext) . SpotNab::SSL_BUF_DELIMITER;
-			$len -= $batch;
-			$ptr += $batch;
-		}
-		openssl_free_key($pkey);
-		return $encrypted;
-	}
-
-	// ***********************************************************************
-	public function decrypt ($source, $pubkey=Null){
-		// Decryption performed using public key
-		if($pubkey === Null)
-			// Default Key if none is specified
-			$pubkey = $this->_ssl_pubkey;
-
-		if(!$pubkey)
-			// Still no key...
-			return false;
-
-		if(!function_exists('openssl_get_publickey'))
-			return false;
-
-		$pkey = openssl_get_publickey($pubkey);
-		if($pkey === false){
-			// bad key
-			//echo openssl_error_string();
-			return false;
-		}
-
-		$cryptlist = explode(SpotNab::SSL_BUF_DELIMITER, $source);
-
-		$decrypted = '';
-		foreach($cryptlist as $crypt){
-			if(!strlen($crypt))break;
-			$_crypt = base64_decode($crypt);
-			if($_crypt === false){
-				// Fail
-				return false;
-			}
-
-			$res = openssl_public_decrypt($_crypt, $out, $pkey, OPENSSL_PKCS1_PADDING);
-			if($res === false){
-				// Decryption failed
-				//echo "DEBUG: ".openssl_error_string()."\n";
-				openssl_free_key($pkey);
-				return false;
-			}
-			$decrypted .= $out;
-		}
-		openssl_free_key($pkey);
-
-		return $decrypted;
-	}
-
-	// ***********************************************************************
-	public function compstr ($str){
-	/*
-	*	Compress a string
-	*/
-		$str = @gzcompress($str);
-		return base64_encode($str);
-	}
-
-	// ***********************************************************************
-	public function decompstr ($str){
-	/*
-	*	De-compress a string
-	*/
-		$str = base64_decode($str);
-		return @gzuncompress($str);
-	}
-
-	public function getSources()
-	{
-		$db = new DB();
-		return $db->query("SELECT id, lastupdate,lastbroadcast, active, description, "
-					."(SELECT count(id) from releasecomment where sourceid = s.id)"
-					." AS comments FROM spotnabsources s");
-	}
-
-	public function getSourceById($id)
-	{
-		$db = new DB();
-		$sql = sprintf("SELECT * FROM spotnabsources WHERE id = %d", $id);
-		return $db->queryOneRow($sql);
-	}
-
-	public function addSource($description,$username,$usermail,$usenetgroup,$publickey)
-	{
-		$db = new DB();
-		$sql = sprintf("INSERT INTO spotnabsources "
-				."(description, username, useremail,"
-				." usenetgroup, publickey, active) "
-				."VALUES (%s, %s, %s, %s, %s, 0)",
-				$db->escapeString($description), $db->escapeString($username),
-				$db->escapeString($usermail), $db->escapeString($usenetgroup),
-				$db->escapeString($publickey));
-		return $db->queryInsert($sql);
-	}
-
-	public function updateSource($id, $description,$username,$usermail,$usenetgroup,$publickey)
-	{
-		$db = new DB();
-		return $db->queryExec(
-			sprintf("UPDATE spotnabsources SET "
-				."description = %s, username = %s, useremail = %s,"
-				." usenetgroup = %s, publickey = %s WHERE id= %d",
-				$db->escapeString($description), $db->escapeString($username),
-				$db->escapeString($usermail), $db->escapeString($usenetgroup),
-				$db->escapeString($publickey), $id));
-	}
-
-	public function deleteSource($id)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("DELETE FROM spotnabsources WHERE id = %d", $id));
-	}
-
-	public function toggleSource($id, $active)
-	{
-		$db = new DB();
-		return $db->queryExec(sprintf("update spotnabsources SET active = %d WHERE id = %d", $active, $id));
-	}
-
-	public function getDefaultValue($table,$field)
-	{
-		$db = new DB();
-		return $db->query(sprintf("SHOW COLUMNS FROM %s WHERE field = %s", $table, $db->escapeString($field)));
-	}
-}
diff --git a/lib/copy_this/www/lib/thetvdb.php b/lib/copy_this/www/lib/thetvdb.php
deleted file mode 100644
index f2dc048da..000000000
--- a/lib/copy_this/www/lib/thetvdb.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/postprocess.php");
-require_once(WWW_DIR."/lib/episode.php");
-require_once(WWW_DIR."/lib/category.php");
-
-
-class TheTVDB
-{
-	const PROJECT	= 'newznab';
-	const APIKEY	= '5F84ECB91B42D719';
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	public function __construct($echooutput = true)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$this->MIRROR = 'http://www.thetvdb.com';
-		$this->pdo = new DB();
-	}
-
-	public function addSeries($TheTVDBAPIArray)
-	{
-
-		$airstime = $TheTVDBAPIArray['airstime'];
-		if($airstime != "")
-			$airstime = $this->pdo->escapeString(date('H:i:s', strtotime($airstime)));
-		else
-			$airstime = "null";
-
-		$firstaired = $TheTVDBAPIArray['firstaired'];
-		if ($firstaired != "")
-			$firstaired = $this->pdo->escapeString($firstaired);
-		else
-			$firstaired = "null";
-
-		$rating = $TheTVDBAPIArray['rating'];
-		if ($rating != "")
-			$rating = $this->pdo->escapeString($rating);
-		else
-			$rating = "null";
-
-		$this->pdo->queryInsert(sprintf("INSERT INTO thetvdb
-		(tvdbid, actors, airsday, airstime, contentrating, firstaired, genre, imdbid, network, overview, rating, ratingcount, runtime, seriesname, status, createddate)
-		VALUES (%d, %s, %s, %s, %s, %s, %s, %d, %s, %s, %F, %d, %d, %s, %s, now())",
-				$TheTVDBAPIArray['tvdbid'], $this->pdo->escapeString($TheTVDBAPIArray['actors']), $this->pdo->escapeString($TheTVDBAPIArray['airsday']),
-				$airstime, $this->pdo->escapeString($TheTVDBAPIArray['contentrating']), $firstaired,
-				$this->pdo->escapeString($TheTVDBAPIArray['genre']), $TheTVDBAPIArray['imdbid'], $this->pdo->escapeString($TheTVDBAPIArray['network']), $this->pdo->escapeString($TheTVDBAPIArray['overview']),
-				$rating, $TheTVDBAPIArray['ratingcount'], $TheTVDBAPIArray['runtime'], $this->pdo->escapeString($TheTVDBAPIArray['seriesname']),
-				$this->pdo->escapeString($TheTVDBAPIArray['status'])));
-	}
-
-	public function addEpisodes($TheTVDBAPIArray)
-	{
-
-		for($i=0; $i < count($TheTVDBAPIArray['episodetvdbID']); $i++) {
-			$airdate = strftime('%Y-%m-%d %H:%M:%S', strtotime($TheTVDBAPIArray['episodefirstaired'][$i].' '.$TheTVDBAPIArray['airstime']));
-			if(!$airdate)
-				continue;
-
-			$this->pdo->queryInsert(sprintf('INSERT INTO episodeinfo
-			(rageid, tvdbid, imdbid, showtitle, airdate, fullep, eptitle, director, gueststars, overview, rating, writer, epabsolute)
-			VALUES (0, %d, %d, %s, %s, %s, %s, %s, %s, %s, %F, %s, %d)
-			ON DUPLICATE KEY UPDATE
-			tvdbid=%1$d, imdbid=%2$d, showtitle=%3$s, airdate=%4$s, fullep=%5$s, eptitle=%6$s, director=%7$s,
-			gueststars=%8$s, overview=%9$s, rating=%10$F, writer=%11$s, epabsolute=%12$s',
-					$TheTVDBAPIArray['episodetvdbID'][$i], $TheTVDBAPIArray['episodeimdbID'][$i], $this->pdo->escapeString($TheTVDBAPIArray['seriesname']), $this->pdo->escapeString($airdate),
-					$this->pdo->escapeString(str_pad($TheTVDBAPIArray['episodeseason'][$i], 2, '0', STR_PAD_LEFT).'x'.str_pad($TheTVDBAPIArray['episodenumber'][$i], 2, '0', STR_PAD_LEFT)),
-					$this->pdo->escapeString($TheTVDBAPIArray['episodename'][$i]), $this->pdo->escapeString($TheTVDBAPIArray['episodedirector'][$i]),
-					$this->pdo->escapeString($TheTVDBAPIArray['episodegueststars'][$i]), $this->pdo->escapeString(substr($TheTVDBAPIArray['episodeoverview'][$i],0,10000)),
-					$TheTVDBAPIArray['episoderating'][$i], $this->pdo->escapeString($TheTVDBAPIArray['episodewriter'][$i]), $TheTVDBAPIArray['episodeabsolutenumber'][$i]));
-		}
-	}
-
-	public function updateSeries($tvdbID, $actors, $airsday, $airstime, $contentrating, $firstaired, $genre, $imdbID, $network, $overview, $rating, $ratingcount, $runtime, $seriesname, $status)
-	{
-		if ($airstime != "")
-			$airstime = $this->pdo->escapeString(date("H:i:s", strtotime($airstime)));
-		else
-			$airstime = "null";
-
-		if ($firstaired != "")
-			$firstaired = $this->pdo->escapeString($firstaired);
-		else
-			$firstaired = "null";
-
-		if ($rating != "")
-			$rating = $this->pdo->escapeString($rating);
-		else
-			$rating = "null";
-
-		$sql = sprintf('UPDATE thetvdb
-		SET actors=%s, airsday=%s, airstime=%s, contentrating=%s, firstaired=%s, genre=%s, imdbid=%d, network=%s,
-		overview=%s, rating=%s, ratingcount=%d, runtime=%d, seriesname=%s, status=%s, createddate=now()
-		WHERE tvdbid = %d', $this->pdo->escapeString($actors), $this->pdo->escapeString($airsday), $airstime, $this->pdo->escapeString($contentrating),
-			$firstaired, $this->pdo->escapeString($genre), $imdbID, $this->pdo->escapeString($network), $this->pdo->escapeString($overview), $rating,
-			$ratingcount, $runtime, $this->pdo->escapeString($seriesname), $this->pdo->escapeString($status), $tvdbID);
-
-		$this->pdo->queryExec($sql);
-	}
-
-	public function deleteTitle($tvdbID)
-	{
-		$this->pdo->queryExec(sprintf("DELETE FROM thetvdb WHERE tvdbid = %d", $tvdbID));
-	}
-
-	public function addEmptySeries($seriesname)
-	{
-		$this->pdo->queryInsert(sprintf("INSERT INTO thetvdb (tvdbid, seriesname, createddate) VALUES (0, %s, now())", $this->pdo->escapeString($seriesname)));
-	}
-
-	public function getSeriesInfoByID($tvdbID)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM thetvdb WHERE tvdbid = %d", $tvdbID));
-	}
-
-	public function getSeriesInfoByName($seriesname)
-	{
-		return $this->pdo->queryOneRow(sprintf("SELECT * FROM thetvdb WHERE seriesname = %s", $this->pdo->escapeString($seriesname)));
-	}
-
-	public function getSeriesRange($start, $num, $seriesname='')
-	{
-		$limit = ($start === false) ? '' : " LIMIT ".$start.",".$num;
-
-		$rsql = '';
-		if ($seriesname != '')
-			$rsql .= sprintf("AND thetvdb.seriesname LIKE %s ", $this->pdo->escapeString("%".$seriesname."%"));
-
-		return $this->pdo->query(sprintf(" SELECT id, tvdbid, seriesname, overview FROM thetvdb WHERE 1=1 %s AND tvdbid > %d ORDER BY tvdbid ASC".$limit, $rsql, 0));
-	}
-
-	public function getSeriesCount($seriesname='')
-	{
-
-		$rsql = '';
-		if ($seriesname != '')
-			$rsql .= sprintf("AND thetvdb.seriesname LIKE %s ", $this->pdo->escapeString("%".$seriesname."%"));
-
-		$res = $this->pdo->queryOneRow(sprintf("SELECT count(id) AS num FROM thetvdb WHERE 1=1 %s ", $rsql));
-
-		return $res["num"];
-	}
-
-	public function lookupSeriesID($seriesname)
-	{
-
-		$apiresponse = Utility::getUrl(['url' => $this->MIRROR.'/api/GetSeries.php?seriesname='.preg_replace('/\s+/', '+', $seriesname).'&language=all']);
-
-		if(!$apiresponse)
-			return false;
-
-		$seriesidXML = @simplexml_load_string($apiresponse);
-		if(!$seriesidXML)
-			return false;
-
-		$seriesid = 0;
-		foreach($seriesidXML as $item)
-			if(preg_match('/^'.preg_replace('/\+/', ' ', str_replace('/', '\/', $seriesname)).'$/i', (string) $item->SeriesName)) {
-				$seriesid = (int) $item->seriesid;
-				break;
-			}
-
-		return $seriesid;
-	}
-
-	public function notFound($seriesName, $fullep, $releaseID, $echooutput=true)
-	{
-		if($this->echooutput && $echooutput)
-			echo 'TheTVDB : '.$seriesName.' '.$fullep." Not found\n";
-		$this->pdo->queryExec(sprintf('UPDATE releases SET episodeinfoid = -2 WHERE id = %d', $releaseID));
-	}
-
-	public function processReleases()
-	{
-
-		$results = $this->pdo->queryDirect(sprintf("SELECT id, searchname, rageid, anidbid, seriesfull, season, episode, tvtitle FROM releases WHERE episodeinfoid IS NULL AND categoryid IN ( SELECT id FROM category WHERE parentid = %d ) LIMIT 150", Category::CAT_PARENT_TV));
-
-		if ($this->pdo->getNumRows($results) > 0)
-		{
-			if ($this->echooutput)
-				echo "TheTVDB : Looking up last ".$this->pdo->getNumRows($results)." releases\n";
-
-			while ($arr = $this->pdo->getAssocArray($results))
-			{
-				unset($TheTVDBAPIArray, $episodeArray, $fullep, $epabsolute, $additionalSql);
-
-				$seriesName = '';
-				if($arr['rageid'] > 0) {
-					$seriesName = $this->pdo->queryOneRow(sprintf('SELECT releasetitle AS seriesName FROM tvrage WHERE rageid = %d', $arr['rageid']));
-				}
-				elseif($arr['anidbid'] > 0) {
-					$seriesName = $this->pdo->queryOneRow(sprintf('SELECT title AS seriesName FROM anidb WHERE anidbid = %d', $arr['anidbid']));
-				}
-
-				if(empty($seriesName) || !$seriesName)
-				{
-					$this->notFound($seriesName, "", $arr['id'], false);
-					continue;
-				}
-
-				$seriesName = str_replace('`', '\'', $seriesName['seriesName']);
-				if(!preg_match('/[21]\d{3}\/\d{2}\/\d{2}/', $arr['seriesfull']))
-					$fullep = str_pad(str_replace('S', '', $arr['season']), 2, '0', STR_PAD_LEFT).'x'.str_pad(str_replace('E', '', $arr['episode']), 2, '0', STR_PAD_LEFT);
-				else
-					$fullep = str_replace('/', '-', $arr['seriesfull']);
-
-				$TheTVDBAPIArray = $this->getSeriesInfoByName($seriesName);
-				if(!$TheTVDBAPIArray)
-				{
-					$seriesid = $this->lookupSeriesID($seriesName);
-					if($seriesid > 0)
-					{
-						$TheTVDBAPIArray = $this->TheTVDBAPI($seriesid, $seriesName);
-						if($TheTVDBAPIArray)
-						{
-							$this->addSeries($TheTVDBAPIArray);
-							$this->addEpisodes($TheTVDBAPIArray);
-						}
-						else
-						{
-							$this->addEmptySeries($seriesName);
-							$this->notFound($seriesName, $fullep, $arr['id']);
-							continue;
-						}
-					}
-					else
-					{
-						$this->addEmptySeries($seriesName);
-						$this->notFound($seriesName, $fullep, $arr['id']);
-						continue;
-					}
-				}
-				else if($TheTVDBAPIArray['tvdbid'] > 0 && ((time() - strtotime($TheTVDBAPIArray['createddate'])) > 604800))
-				{
-					$TheTVDBAPIArray = $this->TheTVDBAPI($TheTVDBAPIArray['tvdbid'], $seriesName);
-
-					$this->updateSeries($TheTVDBAPIArray['tvdbid'], $TheTVDBAPIArray['actors'], $TheTVDBAPIArray['airsday'],
-						$TheTVDBAPIArray['airstime'], $TheTVDBAPIArray['contentrating'], $TheTVDBAPIArray['firstaired'], $TheTVDBAPIArray['genre'],
-						$TheTVDBAPIArray['imdbid'], $TheTVDBAPIArray['network'], $TheTVDBAPIArray['overview'], $TheTVDBAPIArray['rating'],
-						$TheTVDBAPIArray['ratingcount'], $TheTVDBAPIArray['runtime'], $TheTVDBAPIArray['seriesname'], $TheTVDBAPIArray['status']);
-
-					$this->addEpisodes($TheTVDBAPIArray);
-				}
-
-				if($TheTVDBAPIArray['tvdbid'] > 0)
-				{
-					$epabsolute = '0';
-					if($arr['anidbid'] > 0)
-					{
-						if(preg_match('/S(?P<season>\d+)[ED](?P<episode>\d+)/', $arr['episode'], $seasonEpisode))
-						{
-							$arr['season'] = $seasonEpisode['season'];
-							$arr['episode'] = $seasonEpisode['episode'];
-						}
-						else
-							$epabsolute = $arr['episode'];
-					}
-
-					$Episode = new Episode();
-					$episodeArray = $Episode->getEpisodeInfoByName($seriesName, $fullep, (string) $epabsolute);
-					if(!$episodeArray)
-					{
-						$this->notFound($seriesName, $fullep, $arr['id']);
-						continue;
-					}
-				}
-				else
-				{
-					$this->notFound($seriesName, $fullep, $arr['id']);
-					continue;
-				}
-
-				$additionalSql = '';
-				if($arr['anidbid'] > 0 && $episodeArray['epabsolute'] > 0)
-				{
-					$additionalSql = sprintf(', season = NULL, episode = %d, tvtitle = %s, tvairdate = %s',
-						$episodeArray['epabsolute'],
-						$this->pdo->escapeString($episodeArray['epabsolute'].' - '.str_replace('\'', '`', $episodeArray['eptitle'])),
-						$this->pdo->escapeString($episodeArray['airdate']));
-				}
-
-				$this->pdo->queryExec(sprintf('UPDATE releases SET tvdbid = %d, episodeinfoid = %d %s WHERE id = %d',
-						$TheTVDBAPIArray['tvdbid'], $episodeArray['id'], $additionalSql, $arr['id']));
-
-				if($this->echooutput)
-				{
-					echo 'TheTVDB : '.$seriesName.' '.$fullep." returned ".$episodeArray['tvdbid']."\n";
-				}
-			}
-		}
-	}
-
-	public function TheTVDBAPI($seriesid, $seriesName)
-	{
-		$apiresponse = Utility::getUrl([$this->MIRROR.'/api/'.self::APIKEY.'/series/'.$seriesid.'/all/en.xml']); //.zip?
-
-		if(!$apiresponse)
-			return false;
-
-		$TheTVDBAPIXML = @simplexml_load_string($apiresponse);
-		if(!$TheTVDBAPIXML)
-			return false;
-
-		foreach($TheTVDBAPIXML->Episode as $episode) {
-			$episodetvdbIDArray[] = (int) $episode->id;
-			$episodenumberArray[] = (int) $episode->Combined_episodenumber;
-			$episodeseasonArray[] = (int) $episode->Combined_season;
-			$episodedirectorArray[] = preg_replace('/^\||\|$/', '', (string) $episode->Director);
-			$episodenameArray[] = preg_replace('/^\||\|$/', '', (string) $episode->EpisodeName);
-			$episodefirstairedArray[] = (string) $episode->FirstAired;
-			$episodegueststarsArray[] = preg_replace('/^\||\|$/', '', (string) $episode->GuestStars);
-			$episodeimdbID[] = str_replace('tt', '', (string) $episode->IMDB_ID);
-			$episodeoverviewArray[] = preg_replace('/^\||\|$/', '', (string) $episode->Overview);
-			$episoderatingArray[] = preg_replace('/^\||\|$/', '', (string) $episode->Rating);
-			$episodewriterArray[] = preg_replace('/^\||\|$/', '', (string) $episode->Writer);
-			$episodeabsolutenumberArray[] = (int) $episode->absolute_number;
-		}
-
-		$TheTVDBAPIArray = array(
-			'tvdbid' => $seriesid,
-			'actors' => preg_replace('/^\||\|$/', '', (string) $TheTVDBAPIXML->Series->Actors),
-			'airsday' => preg_replace('/^\||\|$/', '', (string) $TheTVDBAPIXML->Series->Airs_DayOfWeek),
-			'airstime' => preg_replace('/^\||\|$/', '', (string) $TheTVDBAPIXML->Series->Airs_Time),
-			'contentrating' => (string) $TheTVDBAPIXML->Series->ContentRating,
-			'firstaired' => (string) $TheTVDBAPIXML->Series->FirstAired,
-			'genre' => preg_replace('/^\||\|$/', '', (string) $TheTVDBAPIXML->Series->Genre),
-			'imdbid' => (int) preg_replace('/^[^\d]+/', '', (string) $TheTVDBAPIXML->Series->IMDB_ID),
-			'network' => (string) $TheTVDBAPIXML->Series->Network,
-			'overview' => (string) $TheTVDBAPIXML->Series->Overview,
-			'rating' => (float) $TheTVDBAPIXML->Series->Rating,
-			'ratingcount' => (int) $TheTVDBAPIXML->Series->RatingCount,
-			'runtime' => (int) $TheTVDBAPIXML->Series->Runtime,
-			//'seriesname' => ((string) $TheTVDBAPIXML->Series->SeriesName != '') ? (string) $TheTVDBAPIXML->Series->SeriesName : $seriesName,
-			'seriesname' => $seriesName,
-			'status' => (string) $TheTVDBAPIXML->Series->Status,
-			'episodetvdbID' => isset($episodetvdbIDArray) ? $episodetvdbIDArray : array(),
-			'episodenumber' => isset($episodenumberArray) ? $episodenumberArray : array(),
-			'episodeseason' => isset($episodeseasonArray) ? $episodeseasonArray : array(),
-			'episodedirector' => isset($episodedirectorArray) ? $episodedirectorArray : array(),
-			'episodename' => isset($episodenameArray) ? $episodenameArray : array(),
-			'episodefirstaired' => isset($episodefirstairedArray) ? $episodefirstairedArray : array(),
-			'episodegueststars' => isset($episodegueststarsArray) ? $episodegueststarsArray : array(),
-			'episodeimdbID' => isset($episodeimdbID) ? $episodeimdbID : array(),
-			'episodeoverview' => isset($episodeoverviewArray) ? $episodeoverviewArray : array(),
-			'episoderating' => isset($episoderatingArray) ? $episoderatingArray : array(),
-			'episodewriter' => isset($episodewriterArray) ? $episodewriterArray : array(),
-			'episodeabsolutenumber' => isset($episodeabsolutenumberArray) ? $episodeabsolutenumberArray : array(),
-		);
-
-		return $TheTVDBAPIArray;
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/tvrage.php b/lib/copy_this/www/lib/tvrage.php
deleted file mode 100644
index 07eea6be0..000000000
--- a/lib/copy_this/www/lib/tvrage.php
+++ /dev/null
@@ -1,1068 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/nfo.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/framework/cache.php");
-
-class TvRage
-{
-	const APIKEY = '7FwjZ8loweFcOhHfnU3E';
-	const MATCH_PROBABILITY = 75;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var bool
-	 */
-	public $echooutput;
-
-	public function __construct($echooutput = false)
-	{
-		$this->echooutput = (NN_ECHOCLI && $echooutput);
-		$this->pdo = new DB();
-
-		$this->xmlFullSearchUrl = "http://services.tvrage.com/feeds/full_search.php?show=";
-		$this->xmlFullShowInfoUrl = "http://services.tvrage.com/feeds/full_show_info.php?sid=";
-		$this->xmlEpisodeInfoUrl = "http://services.tvrage.com/myfeeds/episodeinfo.php?key=".TvRage::APIKEY;
-		$this->xmlFullScheduleUrl = "http://services.tvrage.com/feeds/fullschedule.php?country=";
-
-		$this->showInfoUrl = "http://www.tvrage.com/shows/id-";
-	}
-
-	/**
-	 * Find an tvrage URL in an string.
-	 */
-	public function parseRageIdFromNfo($str)
-	{
-		preg_match('/tvrage\.com\/shows\/id-(\d{1,6})/si', $str, $matches);
-		if (isset($matches[1]))
-			return trim($matches[1]);
-		return false;
-	}
-
-	public function getByID($id)
-	{
-		return $this->pdo->queryOneRow(sprintf("select * from tvrage where id = %d", $id ));
-	}
-
-	public function getByRageID($id)
-	{
-		return $this->pdo->query(sprintf("select * from tvrage where rageid = %d", $id ));
-	}
-
-	public function getByTitle($title)
-	{
-		// check if we already have an entry for this show
-		$sql = sprintf("SELECT rageid from tvrage where (releasetitle = %s or releasetitle = %s)", $this->pdo->escapeString($title), $this->pdo->escapeString(str_replace(' and ', ' & ', $title)));
-		$res = $this->pdo->queryOneRow($sql);
-		if ($res)
-			return $res["rageid"];
-
-		return false;
-	}
-
-	public function add($rageid, $releasename, $desc, $genre, $country, $imgbytes)
-	{
-		$releasename = str_replace(array('.','_'), array(' ',' '), $releasename);
-
-		return $this->pdo->queryInsert(sprintf("insert into tvrage (rageid, releasetitle, description, genre, country, createddate, imgdata) values (%d, %s, %s, %s, %s, now(), %s)",
-			$rageid, $this->pdo->escapeString($releasename), $this->pdo->escapeString($desc), $this->pdo->escapeString($genre), $this->pdo->escapeString($country), $this->pdo->escapeString($imgbytes)));
-	}
-
-	public function update($id, $rageid, $releasename, $desc, $genre, $country, $imgbytes)
-	{
-
-		if ($imgbytes != "")
-			$imgbytes = sprintf(", imgdata = %s", $this->pdo->escapeString($imgbytes));
-
-		$this->pdo->queryExec(sprintf("update tvrage set rageid = %d, releasetitle = %s, description = %s, genre = %s, country = %s %s where id = %d",
-			$rageid, $this->pdo->escapeString($releasename), $this->pdo->escapeString($desc), $this->pdo->escapeString($genre), $this->pdo->escapeString($country), $imgbytes, $id ));
-	}
-
-	public function delete($id)
-	{
-		return $this->pdo->queryExec(sprintf("DELETE from tvrage where id = %d",$id));
-	}
-
-	public function getRange($start, $num, $ragename="")
-	{
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT ".$start.",".$num;
-
-		$rsql = '';
-		if ($ragename != "")
-			$rsql .= sprintf("and tvrage.releasetitle like %s ", $this->pdo->escapeString("%".$ragename."%"));
-
-		return $this->pdo->query(sprintf(" SELECT id, rageid, releasetitle, description, createddate from tvrage where 1=1 %s order by rageid asc".$limit, $rsql));
-	}
-
-	public function getCount($ragename="")
-	{
-
-		$rsql = '';
-		if ($ragename != "")
-			$rsql .= sprintf("and tvrage.releasetitle like %s ", $this->pdo->escapeString("%".$ragename."%"));
-
-		$res = $this->pdo->queryOneRow(sprintf("select count(id) as num from tvrage where 1=1 %s ", $rsql));
-		return $res["num"];
-	}
-
-	public function getCalendar($date = "")
-	{
-		if(!preg_match('/\d{4}-\d{2}-\d{2}/',$date))
-			$date = date("Y-m-d");
-		$sql = sprintf("SELECT * FROM episodeinfo WHERE rageid > %d AND DATE(airdate) = %s order by airdate asc ", 0, $this->pdo->escapeString($date));
-		return $this->pdo->query($sql);
-	}
-
-	public function getSeriesList($uid, $letter="", $ragename="")
-	{
-
-		$rsql = '';
-		if ($letter != "")
-		{
-			if ($letter == '0-9')
-				$letter = '[0-9]';
-
-			$rsql .= sprintf("and tvrage.releasetitle REGEXP %s", $this->pdo->escapeString('^'.$letter));
-		}
-		$tsql = '';
-		if ($ragename != '')
-		{
-			$tsql .= sprintf("and tvrage.releasetitle like %s", $this->pdo->escapeString("%".$ragename."%"));
-		}
-
-		$sql = sprintf(" SELECT tvrage.id, tvrage.rageid, tvrage.releasetitle, tvrage.genre, tvrage.country, tvrage.createddate, tvrage.prevdate, tvrage.nextdate, userseries.id as userseriesID from tvrage left outer join userseries on userseries.userid = %d and userseries.rageid = tvrage.rageid where tvrage.rageid > 0 %s %s group by tvrage.rageid order by tvrage.releasetitle asc", $uid, $rsql, $tsql);
-		return $this->pdo->query($sql);
-	}
-
-	public function updateSchedule()
-	{
-
-		$countries = $this->pdo->query("select distinct(country) as country from tvrage where country != ''");
-		$showsindb = $this->pdo->query("select distinct(rageid) as rageid from tvrage");
-		$showarray = array();
-		foreach($showsindb as $show)
-		{
-			$showarray[] = $show['rageid'];
-		}
-
-		if ($this->echooutput)
-			echo 'TVRage  : Updating schedule...';
-
-		foreach($countries as $country)
-		{
-			if ($this->echooutput)
-				echo '..'.strtoupper($country['country'])."..";
-
-			try
-			{
-				$raw = getURL($this->xmlFullScheduleUrl.$country['country']);
-				$xml = new SimpleXMLElement($raw);
-				$sched = $xml->xpath('/schedule/DAY');
-			}catch(Exception $e){
-            # Simply no data or unparseable
-				continue;
-			}
-
-			if ($sched !== false)
-			{
-				$tzOffset = 60*60*6;
-				$yesterday = strtotime("-1 day") - $tzOffset;
-				$xmlSchedule = array();
-
-				foreach ($sched as $dayObj)
-				{
-					$currDay = (string)$dayObj['attr'];
-					foreach ($dayObj->time as $sTime)
-					{
-						$currTime = (string) $sTime['attr'];
-						foreach ($sTime as $sShow)
-						{
-							$currShowName = (string) $sShow['name'];
-							$currShowId = (string) $sShow->sid;
-							$day_time= strtotime($currDay.' '.$currTime);
-							$tag = ($currDay < $yesterday) ? 'prev' : 'next';
-							if ($tag == 'prev' || ($tag == 'next' && !isset($xmlSchedule[$currShowId]['next'])))
-							{
-								$xmlSchedule[$currShowId][$tag] = array(
-									'name'=> $currShowName,
-									'day' => $currDay,
-									'time' => $currTime,
-									'day_time' => $day_time,
-									'day_date' => date("Y-m-d H:i:s", $day_time),
-									'title' => html_entity_decode((string)$sShow->title, ENT_QUOTES, 'UTF-8'),
-									'episode' =>  html_entity_decode((string)$sShow->ep, ENT_QUOTES, 'UTF-8'),
-								);
-								$xmlSchedule[$currShowId]['showname'] = $currShowName;
-							}
-							if($sShow->ep == "01x01")
-								{
-								// Only add it here, no point adding it to tvrage aswell
-								// that will automatically happen when an ep gets posted
-								$showarray[] = $sShow->sid;
-								}
-							if(in_array($currShowId,$showarray)) //only stick current shows and new shows in there
-							{
-								$showname = $this->pdo->escapeString($currShowName);
-								$title = $this->pdo->escapeString($sShow->title);
-								$fullep = $this->pdo->escapeString($sShow->ep);
-								$link = $this->pdo->escapeString($sShow->link);
-								$airdate = $this->pdo->escapeString(date("Y-m-d H:i:s", $day_time));
-								$sql = sprintf('INSERT into episodeinfo (rageid,showtitle,fullep,airdate,link,eptitle) VALUES (%d,%s,%s,%s,%s,%s)
-										ON DUPLICATE KEY UPDATE rageid = %1$d, airdate = %4$s, link = %5$s, eptitle = %6$s, showtitle = %2$s',
-										$sShow->sid,$showname,$fullep,$airdate,$link,$title);
-								$this->pdo->queryInsert($sql);
-							}
-						}
-					}
-				}
-				// update series info
-				foreach ($xmlSchedule as $showId=>$epInfo)
-				{
-					$res = $this->pdo->query(sprintf("select *, UNIX_TIMESTAMP(nextdate) as nextDateU, UNIX_TIMESTAMP(DATE(nextdate)) as nextDateDay from tvrage where rageid = %d", $showId));
-					if (sizeof($res) > 0)
-					{
-						foreach ($res as $arr)
-						{
-							$prev_ep = $next_ep = "";
-							$query = array();
-
-							// previous episode
-							if (isset($epInfo['prev']) && $epInfo['prev']['episode'] != '')
-							{
-								$prev_ep = $epInfo['prev']['episode'].', "'.$epInfo['prev']['title'].'"';
-								$query[] = sprintf("prevdate = FROM_UNIXTIME(%s), previnfo = %s", $epInfo['prev']['day_time'], $this->pdo->escapeString($prev_ep));
-							}
-
-							// next episode
-							if (isset($epInfo['next']) && $epInfo['next']['episode'] != '')
-							{
-								if ($prev_ep == "" && $arr['nextinfo'] != '' && $epInfo['next']['day_time'] > $arr['nextDateU'] && $arr['nextDateDay'] < $yesterday)
-								{
-									$this->pdo->queryExec(sprintf("update tvrage set prevdate = nextdate, previnfo = nextinfo where id = %d", $arr['id']));
-									$prev_ep = "SWAPPED with: ".$arr['nextinfo']." - ".date("r", $arr['nextDateU']);
-								}
-								$next_ep = $epInfo['next']['episode'].', "'.$epInfo['next']['title'].'"';
-								$query[] = sprintf("nextdate = FROM_UNIXTIME(%s), nextinfo = %s", $epInfo['next']['day_time'], $this->pdo->escapeString($next_ep));
-							}
-							else
-							{
-								$query[] = "nextdate = null, nextinfo = null";
-							}
-
-							// output
-							/*
-							if ($this->echooutput)
-							{
-								echo $epInfo['showname']." (".$showId."):\n";
-								echo " -prev: {$prev_ep} - ".(isset($epInfo['prev']['day_time']) ? date("r",$epInfo['prev']['day_time']) : "")."\n";
-								echo " -next: {$next_ep} - ".(isset($epInfo['next']['day_time']) ? date("r",$epInfo['next']['day_time']) : "")."\n";
-							}
-							*/
-
-							// update info
-							if (count($query) > 0)
-							{
-								$sql = str_ireplace("%", "%%", join(", ", $query));
-								$sql = sprintf("update tvrage set {$sql} where id = %d", $arr['id']);
-								$this->pdo->queryExec($sql);
-							}
-						}
-					}
-				} // end update series info
-			}
-		} // end foreach country
-
-		if ($this->echooutput)
-			echo "TVRage  : Schedule complete...\n";
-	}
-
-	public function getEpisodeInfo($rageid, $series, $episode)
-	{
-		$result = array('title'=>'', 'airdate'=>'');
-
-		$series = str_ireplace("s", "", $series);
-		$episode = str_ireplace("e", "", $episode);
-
-		$lookupUrl = $this->xmlEpisodeInfoUrl."&sid=".$rageid."&ep=".$series."x".$episode;
-
-		$xml = $this->fetchCache($lookupUrl);
-		if ($xml === false)
-			$xml = Utility::getUrl(['url' => $lookupUrl]);
-
-		if ($xml !== false)
-		{
-			$this->storeCache($lookupUrl, $xml);
-
-			if (preg_match('/no show found/i', $xml))
-				return false;
-
-			$xmlObj = @simplexml_load_string($xml);
-			$arrXml = objectsIntoArray($xmlObj);
-			if (is_array($arrXml))
-			{
-				if (isset($arrXml['episode']['airdate']) && $arrXml['episode']['airdate'] != '0000-00-00')
-					$result['airdate'] = $arrXml['episode']['airdate'];
-				if (isset($arrXml['episode']['title']))
-					$result['title'] = $arrXml['episode']['title'];
-
-				return $result;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	public function getRageInfoFromPage($rageid)
-	{
-		$result = array('desc'=>'', 'imgurl'=>'');
-
-		$lookupUrl = $this->showInfoUrl.$rageid;
-
-		$page = $this->fetchCache($lookupUrl);
-		if ($page === false)
-			$page = Utility::getUrl([$lookupUrl]);
-
-		if ($page !== false)
-		{
-			$this->storeCache($lookupUrl, $page);
-
-			//description
-			preg_match('@<div class="show_synopsis">(.*?)</div>@is', $page, $matches);
-			if (isset($matches[1])) {
-				$desc = $matches[1];
-				$desc = preg_replace('/<hr>.*/s', '', $desc);
-				$desc = preg_replace('/&nbsp;?/', '', $desc);
-				$desc = preg_replace('/<br>(\n)?<br>/', ' / ', $desc);
-				$desc = preg_replace('/\n/', ' ', $desc);
-				$desc = preg_replace('/<a href.*?<\/a>/', '', $desc);
-				$desc = preg_replace('/<script.*?<\/script>/', '', $desc);
-				$desc = preg_replace('/<.*?>/', '', $desc);
-				$desc = str_replace('()', '', $desc);
-				$desc = trim(preg_replace('/\s{2,}/', ' ', $desc));
-				$result['desc'] = $desc;
-			}
-			// image
-			preg_match("@src=[\"'](http://images.tvrage.com/shows.*?)[\"']@i", $page, $matches);
-			if (isset($matches[1])) {
-				$result['imgurl'] = $matches[1];
-			}
-		}
-		return $result;
-	}
-
-	public function getRageInfoFromService($rageid)
-	{
-		$result = array('genres'=>'', 'country'=>'', 'showid'=>$rageid);
-
-		$lookupUrl = $this->xmlFullShowInfoUrl.$rageid;
-
-		$xml = $this->fetchCache($lookupUrl);
-		if ($xml === false)
-			$xml = Utility::getUrl([$lookupUrl]);
-
-		if ($xml !== false)
-		{
-			$this->storeCache($lookupUrl, $xml);
-
-			$xml = str_replace('<genre></genre>', '', $xml);
-			$xmlObj = @simplexml_load_string($xml);
-			$arrXml = objectsIntoArray($xmlObj);
-
-			if (is_array($arrXml))
-			{
-				$result['genres'] = (isset($arrXml['genres'])) ? $arrXml['genres'] : '';
-				$result['country'] = (isset($arrXml['origin_country'])) ? $arrXml['origin_country'] : '';
-				return $result;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	public function updateEpInfo($show, $relid)
-	{
-		$this->pdo = new Db;
-
-        if (empty($show['airdate']) || !strtotime($show['airdate'])) {
-            $tvairdate = "null";
-        } else {
-            $tvairdate = $this->pdo->escapestring($show['airdate']);
-        }
-		$this->pdo->queryExec(sprintf("update releases set seriesfull = %s, season = %s, episode = %s, tvairdate=%s where id = %d",
-					$this->pdo->escapeString($show['seriesfull']), $this->pdo->escapeString($show['season']), $this->pdo->escapeString($show['episode']), $tvairdate, $relid));
-	}
-
-	public function refreshRageInfo($id)
-	{
-		$row = $this->getByID($id);
-		$rageid = $row["rageid"];
-
-		$rInfo = $this->getRageInfoFromPage($rageid);
-		$desc = '';
-		if (isset($rInfo['desc']) && !empty($rInfo['desc']))
-			$desc = $rInfo['desc'];
-
-		$imgbytes = '';
-		if (isset($rInfo['imgurl']) && !empty($rInfo['imgurl']))
-		{
-			$img = Utility::getUrl([$rInfo['imgurl']]);
-			if ($img !== false)
-			{
-				$im = @imagecreatefromstring($img);
-				if($im !== false)
-					$imgbytes = $img;
-			}
-		}
-
-		$sql = sprintf("update tvrage set description = %s, imgdata = %s where id = %d", $this->pdo->escapeString($desc), $this->pdo->escapeString($imgbytes), $id);
-		return $this->pdo->queryExec($sql);
-
-	}
-
-	public function updateRageInfo($rageid, $show, $tvrShow, $relid)
-	{
-		$this->pdo = new Db;
-
-		$idCheck = $this->getByRageID($rageid);
-
-		$epinfo = false;
-
-		//check local releases to see if we already have the data
-		if ($idCheck && sizeof($idCheck) > 0)
-		{
-			$epinfo = $this->pdo->queryOneRow(sprintf("select tvtitle as title, tvairdate as airdate from releases where tvairdate is not null and season = %s and episode = %s and rageid = %d", $this->pdo->escapeString($show['season']), $this->pdo->escapeString($show['episode']), $idCheck[0]['rageid']));
-
-			//check tvdb episodeinfo data
-			if ($epinfo == false)
-				$epinfo = $this->pdo->queryOneRow(sprintf("select eptitle as title, airdate as airdate from episodeinfo where airdate is not null and fullep = %s and rageid = %d", $this->pdo->escapeString(str_replace('S', '', $show['season']).'x'.str_replace('E', '', $show['episode'])), $idCheck[0]['rageid']));
-		}
-
-		// try and get the episode specific info from tvrage if its not available locally
-		if ($epinfo == false)
-			$epinfo = $this->getEpisodeInfo($rageid, $show['season'], $show['episode']);
-
-		if ($epinfo !== false)
-		{
-			$tvairdate = (!empty($epinfo['airdate'])) ? $this->pdo->escapeString($epinfo['airdate']) : "null";
-			$tvtitle = (!empty($epinfo['title'])) ? $this->pdo->escapeString($epinfo['title']) : "null";
-
-			$this->pdo->queryExec(sprintf("update releases set tvtitle=trim(%s), tvairdate=%s, rageid = %d where id = %d", $tvtitle, $tvairdate, $tvrShow['showid'], $relid));
-		}
-		else
-		{
-			$this->pdo->queryExec(sprintf("update releases set rageid = %d where id = %d", $tvrShow['showid'], $relid));
-		}
-
-		$genre = '';
-		if (isset($tvrShow['genres']) && is_array($tvrShow['genres']) && !empty($tvrShow['genres']))
-		{
-			if (is_array($tvrShow['genres']['genre']))
-				$genre = implode('|', $tvrShow['genres']['genre']);
-			else
-				$genre = $tvrShow['genres']['genre'];
-		}
-
-		$country = '';
-		if (isset($tvrShow['country']) && !empty($tvrShow['country']))
-			$country = $tvrShow['country'];
-
-		$rInfo = $this->getRageInfoFromPage($rageid);
-		$desc = '';
-		if (isset($rInfo['desc']) && !empty($rInfo['desc']))
-			$desc = $rInfo['desc'];
-
-		$imgbytes = '';
-		if (isset($rInfo['imgurl']) && !empty($rInfo['imgurl']))
-		{
-			$img = Utility::getUrl([$rInfo['imgurl']]);
-			if ($img !== false)
-			{
-				$im = @imagecreatefromstring($img);
-				if($im !== false)
-					$imgbytes = $img;
-			}
-		}
-
-		$this->add($rageid, $show['cleanname'], $desc, $genre, $country, $imgbytes);
-	}
-
-	public function processTvReleases($lookupTvRage=true, $numtoProcess=100)
-	{
-		$ret = 0;
-		$nfo = new Nfo();
-
-		// get all releases without a rageid which are in a tv category.
-		$result = $this->pdo->queryDirect(sprintf("SELECT searchname, id from releases where rageid = -1 and categoryid in ( select id from category where parentid = %d ) order by postdate desc limit %d ", Category::CAT_PARENT_TV, $numtoProcess));
-
-        if ($this->pdo->getNumRows($result) > 0)
-        {
-            if ($this->echooutput)
-                echo "TVRage  : Looking up ".$this->pdo->getNumRows($result)." releases".($lookupTvRage?" using local and web\n":" local only\n");
-
-            while ($arr = $this->pdo->getAssocArray($result))
-            {
-                $rageID = false;
-                /* Preliminary Rage id Detection from NFO file */
-                $rawnfo = '';
-                if($nfo->getNfo($arr['id'], $rawnfo))
-                    $rageID = $this->parseRageIdFromNfo($rawnfo);
-
-                if($rageID){
-                    // Set RageID (if matched db) and move along
-                    $res = $this->pdo->query(sprintf("SELECT count(id) as cnt from tvrage where rageid = %d", $rageID));
-                    if(count($res) >= 1 && intval($res[0]['cnt']) > 1)
-                    {
-                        $this->pdo->queryExec(sprintf("update releases set rageid = %d where id = %d", $rageID, $arr["id"]));
-                        continue;
-                    }
-                }
-
-                $show = $this->parseNameEpSeason($arr['searchname']);
-                if (is_array($show) && $show['name'] != '')
-                {
-                    // update release with season, ep, and airdate info (if available) from releasetitle
-                    $this->updateEpInfo($show, $arr['id']);
-
-                    // find the rageid
-                    $id = $this->getByTitle($show['cleanname']);
-
-                    if ($id === false && $lookupTvRage)
-                    {
-                        // if it doesnt exist locally and lookups are allowed lets try to get it
-                        if ($this->echooutput)
-                            echo "TVRage  : Didnt find ".$show['cleanname']." locally, checking web\n";
-
-                        $tvrShow = $this->getRageMatch($show);
-                        if ($tvrShow !== false && is_array($tvrShow))
-                        {
-                            // get all tv info and add show
-                            $this->updateRageInfo($tvrShow['showid'], $show, $tvrShow, $arr['id']);
-                        }
-                        elseif ($tvrShow === false)
-                        {
-                            // no match
-                            //add to tvrage with rageid = -2 and $show['cleanname'] title only
-                            $this->add(-2, $show['cleanname'], '', '', '', '');
-                        }
-                        else
-                        {
-                            // $tvrShow probably equals -1 but we'll do this as a catchall instead of a specific elseif
-
-                            //skip because we couldnt connect to tvrage.com
-                        }
-
-                    }
-                    elseif ($id > 0)
-                    {
-                        $tvairdate = (isset($show['airdate']) && !empty($show['airdate'])) ? $this->pdo->escapeString($show['airdate']) : "null";
-                        $tvtitle = "null";
-
-                        if ($lookupTvRage)
-                        {
-                            if ($tvairdate == "null")
-                            {
-
-                                //check local releases to see if we already have the data
-                                $epinfo = $this->pdo->queryOneRow(sprintf("select tvtitle as title, tvairdate as airdate from releases where tvairdate is not null and season = %s and episode = %s and rageid = %d", $this->pdo->escapeString($show['season']), $this->pdo->escapeString($show['episode']), $id));
-
-                                //check tvdb episodeinfo data
-                                if ($epinfo == false)
-                                {
-                                    $sql = sprintf("select eptitle as title, airdate as airdate from episodeinfo where airdate is not null and fullep = %s and rageid = %d", $this->pdo->escapeString(str_replace('S', '', $show['season']).'x'.str_replace('E', '', $show['episode'])), $id);
-                                    $epinfo = $this->pdo->queryOneRow($sql);
-                                }
-
-                                if ($epinfo == false)
-                                    $epinfo = $this->getEpisodeInfo($id, $show['season'], $show['episode']);
-
-                                if ($epinfo !== false)
-                                {
-                                    if (!empty($epinfo['airdate']))
-                                        $tvairdate = $this->pdo->escapeString($epinfo['airdate']);
-
-                                    if (!empty($epinfo['title']))
-                                        $tvtitle = $this->pdo->escapeString($epinfo['title']);
-                                }
-                            }
-                        }
-                        $this->pdo->queryExec(sprintf("update releases set tvtitle=trim(%s), tvairdate=%s, rageid = %d where id = %d", $tvtitle, $tvairdate, $id, $arr["id"]));
-                    }
-                    else
-                    {
-                        // cant find rageid, so set rageid to n/a
-                        $this->pdo->queryExec(sprintf("update releases set rageid = -2 where id = %d", $arr["id"]));
-                    }
-                }
-                else
-                {
-                    // not a tv episode, so set rageid to n/a
-                    $this->pdo->queryExec(sprintf("update releases set rageid = -2 where id = %d", $arr["id"]));
-                }
-                $ret++;
-            }
-
-        }
-
-		return $ret;
-	}
-
-	public function getRageMatch($showInfo)
-	{
-		$title = $showInfo['cleanname'];
-
-		$lookupUrl = $this->xmlFullSearchUrl.urlencode(strtolower($title));
-
-		$xml = $this->fetchCache($lookupUrl);
-		if ($xml === false)
-			$xml = Utility::getUrl([$lookupUrl]); //full search gives us the akas
-
-		if ($xml !== false)
-		{
-			$this->storeCache($lookupUrl, $xml);
-
-			$xml = str_replace('<genre></genre>', '', $xml);
-			$xmlObj = @simplexml_load_string($xml);
-			$arrXml = objectsIntoArray($xmlObj);
-
-			if (isset($arrXml['show']) && is_array($arrXml['show']))
-			{
-				// we got a valid xml response
-				$titleMatches = array();
-				$urlMatches = array();
-				$akaMatches = array();
-
-				if (isset($arrXml['show']['showid']))
-				{
-					// we got exactly 1 match so lets convert it to an array so we can use it in the logic below
-					$newArr = array();
-					$newArr[] = $arrXml['show'];
-					unset($arrXml);
-					$arrXml['show'] = $newArr;
-				}
-
-				foreach ($arrXml['show'] as $arr)
-				{
-					$titlepct = $urlpct = $akapct = 0;
-
-					// get a match percentage based on our name and the name returned from tvr
-					$titlepct = $this->checkMatch($title, $arr['name']);
-					if ($titlepct !== false)
-						$titleMatches[$titlepct][] = array('title'=>$arr['name'], 'showid'=>$arr['showid'], 'country'=>$arr['country'], 'genres'=>$arr['genres'], 'tvr'=>$arr);
-
-					// get a match percentage based on our name and the url returned from tvr
-					if (isset($arr['link']) && preg_match('/tvrage\.com\/((?!shows)[^\/]*)$/i', $arr['link'], $tvrlink))
-					{
-						$urltitle = str_replace('_', ' ', $tvrlink[1]);
-						$urlpct = $this->checkMatch($title, $urltitle);
-						if ($urlpct !== false)
-							$urlMatches[$urlpct][] = array('title'=>$urltitle, 'showid'=>$arr['showid'], 'country'=>$arr['country'], 'genres'=>$arr['genres'], 'tvr'=>$arr);
-					}
-
-					// check if there are any akas for this result and get a match percentage for them too
-					if (isset($arr['akas']))
-					{
-						if (is_array($arr['akas']['aka']))
-						{
-							// multuple akas
-							foreach($arr['akas']['aka'] as $aka)
-							{
-								$akapct = $this->checkMatch($title, $aka);
-								if ($akapct !== false)
-									$akaMatches[$akapct][] = array('title'=>$aka, 'showid'=>$arr['showid'], 'country'=>$arr['country'], 'genres'=>$arr['genres'], 'tvr'=>$arr);
-							}
-						} else {
-							// one aka
-							$akapct = $this->checkMatch($title, $arr['akas']['aka']);
-							if ($akapct !== false)
-								$akaMatches[$akapct][] = array('title'=>$arr['akas']['aka'], 'showid'=>$arr['showid'], 'country'=>$arr['country'], 'genres'=>$arr['genres'], 'tvr'=>$arr);
-						}
-					}
-
-				}
-
-				// reverse sort our matches so highest matches are first
-				krsort($titleMatches);
-				krsort($urlMatches);
-				krsort($akaMatches);
-
-				// look for 100% title matches first
-				if (isset($titleMatches[100]))
-				{
-					if ($this->echooutput)
-						echo 'TVRage  : Found 100% match: "'.$titleMatches[100][0]['title'].'"'."\n";
-					return $titleMatches[100][0];
-				}
-
-				// look for 100% url matches next
-				if (isset($urlMatches[100]))
-				{
-					if ($this->echooutput)
-						echo 'TVRage  : Found 100% url match: "'.$urlMatches[100][0]['title'].'"'."\n";
-					return $urlMatches[100][0];
-				}
-
-				// look for 100% aka matches next
-				if (isset($akaMatches[100]))
-				{
-					if ($this->echooutput)
-						echo 'TVRage  : Found 100% aka match: "'.$akaMatches[100][0]['title'].'"'."\n";
-					return $akaMatches[100][0];
-				}
-
-				// no 100% matches, loop through what we got and if our next closest match is more than TvRage::MATCH_PROBABILITY % of the title lets take it
-				foreach($titleMatches as $mk=>$mv)
-				{
-					// since its not 100 match if we have country info lets use that to make sure we get the right show
-					if (isset($showInfo['country']) && !empty($showInfo['country']) && !empty($mv[0]['country']))
-						if (strtolower($showInfo['country']) != strtolower($mv[0]['country']))
-							continue;
-
-					if ($this->echooutput)
-						echo 'TVRage  : Found '.$mk.'% match: "'.$titleMatches[$mk][0]['title'].'"'."\n";
-					return $titleMatches[$mk][0];
-				}
-
-				// same as above but for akas
-				foreach($akaMatches as $ak=>$av)
-				{
-					if (isset($showInfo['country']) && !empty($showInfo['country']) && !empty($av[0]['country']))
-						if (strtolower($showInfo['country']) != strtolower($av[0]['country']))
-							continue;
-
-					if ($this->echooutput)
-						echo 'TVRage  : Found '.$ak.'% aka match: "'.$akaMatches[$ak][0]['title'].'"'."\n";
-					return $akaMatches[$ak][0];
-				}
-
-				return false;
-
-			} else {
-				return false;
-			}
-
-		} else {
-			if ($this->echooutput)
-				echo 'TVRage  : Error connecting to tvrage'."\n";
-			return -1;
-		}
-
-		if ($this->echooutput)
-			echo 'TVRage  : No match found online'."\n";
-		return false;
-	}
-
-	public function checkMatch($ourName, $tvrName)
-	{
-		// clean up name ($ourName is already clean)
-		$tvrName = $this->cleanName($tvrName);
-		$tvrName = preg_replace('/ of /i', '', $tvrName);
-		$ourName = preg_replace('/ of /i', '', $ourName);
-
-		// create our arrays
-		$ourArr = explode(' ', $ourName);
-		$tvrArr = explode(' ', $tvrName);
-
-		// set our match counts
-		$numMatches = 0;
-		$totalMatches = sizeof($ourArr)+sizeof($tvrArr);
-
-		// loop through each array matching again the opposite value, if they match increment!
-		foreach($ourArr as $oname)
-		{
-			if (preg_match('/ '.preg_quote($oname, '/').' /i', ' '.$tvrName.' '))
-				$numMatches++;
-		}
-		foreach($tvrArr as $tname)
-		{
-			if (preg_match('/ '.preg_quote($tname, '/').' /i', ' '.$ourName.' '))
-				$numMatches++;
-		}
-
-		// check what we're left with
-		if ($numMatches <= 0)
-			return false;
-		else
-			$matchpct = ($numMatches/$totalMatches)*100;
-
-		if ($matchpct >= TvRage::MATCH_PROBABILITY)
-			return $matchpct;
-		else
-			return false;
-	}
-
-	public function cleanName($str)
-	{
-		$str = str_replace(array('.', '_', '-'), ' ', $str);
-
-		$str = str_replace(array('à','á','â','ã','ä','æ','À','�','Â','Ã','Ä'), 'a', $str);
-		$str = str_replace(array('ç','Ç'), 'c', $str);
-		$str = str_replace(array('Σ','è','é','ê','ë','È','É','Ê','Ë'), 'e', $str);
-		$str = str_replace(array('ì','í','î','ï','Ì','�','Î','�'), 'i', $str);
-		$str = str_replace(array('ò','ó','ô','õ','ö','Ò','Ó','Ô','Õ','Ö'), 'o', $str);
-		$str = str_replace(array('ù','ú','û','ü','ū','Ú','Û','Ü','Ū'), 'u', $str);
-		$str = str_replace('ß', 'ss', $str);
-
-		$str = str_replace('&', 'and', $str);
-		$str = preg_replace('/^(history|discovery) channel/i', '', $str);
-		$str = str_replace(array('\'', ':', '!', '"', '#', '*', '’', ',', '(', ')', '?'), '', $str);
-		$str = str_replace('$', 's', $str);
-		$str = preg_replace('/\s{2,}/', ' ', $str);
-
-		return trim($str);
-	}
-
-	public function fetchCache($key)
-	{
-		$cache = new Cache;
-		if ($cache->enabled && $cache->exists($key))
-		{
-			$ret = $cache->fetch($key);
-			if ($ret !== false)
-				return $ret;
-		}
-		return false;
-	}
-
-	public function storeCache($key, $data)
-	{
-		$cache = new Cache;
-		if ($cache->enabled)
-			return $cache->store($key, $data);
-
-		return false;
-	}
-
-	public function parseNameEpSeason($relname)
-	{
-		$showInfo = array(
-			'name' => '',
-			'season' => '',
-			'episode' => '',
-			'seriesfull' => '',
-			'airdate' => '',
-			'country' => '',
-			'year' => '',
-			'cleanname' => ''
-		);
-
-		//S01E01-E02
-		//S01E01-02
-		if (preg_match('/^(.*?)[\. \-]s(\d{1,2})\.?e(\d{1,3})(?:\-e?|\-?e)(\d{1,3})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = array(intval($matches[3]), intval($matches[4]));
-		//S01E0102 - lame no delimit numbering, regex would collide if there was ever 1000 ep season
-		} elseif (preg_match('/^(.*?)[\. \-]s(\d{2})\.?e(\d{2})(\d{2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = array(intval($matches[3]), intval($matches[4]));
-		//S01E01
-		//S01.E01
-		} elseif (preg_match('/^(.*?)[\. \-]s(\d{1,2})\.?e(\d{1,3})\.?/i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = intval($matches[3]);
-		//S01
-		} elseif (preg_match('/^(.*?)[\. \-]s(\d{1,2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = 'all';
-		//S01D1
-		//S1D1
-		} elseif (preg_match('/^(.*?)[\. \-]s(\d{1,2})d\d{1}\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = 'all';
-		//1x01
-		} elseif (preg_match('/^(.*?)[\. \-](\d{1,2})x(\d{1,3})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = intval($matches[3]);
-		//2009.01.01
-		//2009-01-01
-		} elseif (preg_match('/^(.*?)[\. \-](19|20)(\d{2})[\.\-](\d{2})[\.\-](\d{2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = $matches[2].$matches[3];
-			$showInfo['episode'] = $matches[4].'/'.$matches[5];
-			$showInfo['airdate'] = $matches[2].$matches[3].'-'.$matches[4].'-'.$matches[5]; //yy-m-d
-		//01.01.2009
-		} elseif (preg_match('/^(.*?)[\. \-](\d{2}).(\d{2})\.(19|20)(\d{2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = $matches[4].$matches[5];
-			$showInfo['episode'] = $matches[2].'/'.$matches[3];
-			$showInfo['airdate'] = $matches[4].$matches[5].'-'.$matches[2].'-'.$matches[3]; //yy-m-d
-		//01.01.09
-		} elseif (preg_match('/^(.*?)[\. \-](\d{2}).(\d{2})\.(\d{2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = ($matches[4] <= 99 && $matches[4] > 15) ? '19'.$matches[4] : '20'.$matches[4];
-			$showInfo['episode'] = $matches[2].'/'.$matches[3];
-			$showInfo['airdate'] = $showInfo['season'].'-'.$matches[2].'-'.$matches[3]; //yy-m-d
-		//2009.E01
-		} elseif (preg_match('/^(.*?)[\. \-]20(\d{2})\.e(\d{1,3})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = '20'.$matches[2];
-			$showInfo['episode'] = intval($matches[3]);
-		//2009.Part1
-		} elseif (preg_match('/^(.*?)[\. \-]20(\d{2})\.Part(\d{1,2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = '20'.$matches[2];
-			$showInfo['episode'] = intval($matches[3]);
-		//Part1/Pt1
-		} elseif (preg_match('/^(.*?)[\. \-](?:Part|Pt)\.?(\d{1,2})\./i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = 1;
-			$showInfo['episode'] = intval($matches[2]);
-		//The.Pacific.Pt.VI.HDTV.XviD-XII / Part.IV
-		} elseif (preg_match('/^(.*?)[\. \-](?:Part|Pt)\.?([ivx]+)/i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = 1;
-			$epLow = strtolower($matches[2]);
-			switch($epLow) {
-				case 'i': $e = 1; break;
-				case 'ii': $e = 2; break;
-				case 'iii': $e = 3; break;
-				case 'iv': $e = 4; break;
-				case 'v': $e = 5; break;
-				case 'vi': $e = 6; break;
-				case 'vii': $e = 7; break;
-				case 'viii': $e = 8; break;
-				case 'ix': $e = 9; break;
-				case 'x': $e = 10; break;
-				case 'xi': $e = 11; break;
-				case 'xii': $e = 12; break;
-				case 'xiii': $e = 13; break;
-				case 'xiv': $e = 14; break;
-				case 'xv': $e = 15; break;
-				case 'xvi': $e = 16; break;
-				case 'xvii': $e = 17; break;
-				case 'xviii': $e = 18; break;
-				case 'xix': $e = 19; break;
-				case 'xx': $e = 20; break;
-			}
-			$showInfo['episode'] = $e;
-		//Band.Of.Brothers.EP06.Bastogne.DVDRiP.XviD-DEiTY
-		} elseif (preg_match('/^(.*?)[\. \-]EP?\.?(\d{1,3})/i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = 1;
-			$showInfo['episode'] = intval($matches[2]);
-		//Season.1
-		} elseif (preg_match('/^(.*?)[\. \-]Seasons?\.?(\d{1,2})/i', $relname, $matches)) {
-			$showInfo['name'] = $matches[1];
-			$showInfo['season'] = intval($matches[2]);
-			$showInfo['episode'] = 'all';
-		}
-
-		if (!empty($showInfo['name'])) {
-			//country or origin matching
-			if (preg_match('/[\._ ](US|UK|AU|NZ|CA|NL|Canada|Australia|America)/', $showInfo['name'], $countryMatch))
-			{
-				if (strtolower($countryMatch[1]) == 'canada')
-					$showInfo['country'] = 'CA';
-				elseif (strtolower($countryMatch[1]) == 'australia')
-					$showInfo['country'] = 'AU';
-				elseif (strtolower($countryMatch[1]) == 'america')
-					$showInfo['country'] = 'US';
-				else
-					$showInfo['country'] = strtoupper($countryMatch[1]);
-			}
-
-			//clean show name
-			$showInfo['cleanname'] = $this->cleanName($showInfo['name']);
-
-			//check for dates instead of seasons
-			if (strlen($showInfo['season']) == 4) {
-				$showInfo['seriesfull'] = $showInfo['season']."/".$showInfo['episode'];
-			} else {
-				//get year if present (not for releases with dates as seasons)
-				if (preg_match('/[\._ ](19|20)(\d{2})/i', $relname, $yearMatch))
-					$showInfo['year'] = $yearMatch[1].$yearMatch[2];
-
-				$showInfo['season'] = sprintf('S%02d', $showInfo['season']);
-				//check for multi episode release
-				if (is_array($showInfo['episode'])) {
-					$tmpArr = array();
-					foreach ($showInfo['episode'] as $ep) {
-						$tmpArr[] = sprintf('E%02d', $ep);
-					}
-					$showInfo['episode'] = implode('', $tmpArr);
-				} else {
-					$showInfo['episode'] = sprintf('E%02d', $showInfo['episode']);
-				}
-				$showInfo['seriesfull'] = $showInfo['season'].$showInfo['episode'];
-			}
-			$showInfo['airdate'] = (!empty($showInfo['airdate'])) ? $showInfo['airdate'].' 00:00:00' : '';
-			return $showInfo;
-		}
-
-		return false;
-	}
-
-	public function getGenres()
-    {
-    	return array(
-    		'Action',
-			'Adult/Porn',
-			'Adventure',
-			'Anthology',
-			'Arts & Crafts',
-			'Automobiles',
-			'Buy, Sell & Trade',
-			'Celebrities',
-			'Children',
-			'Cinema/Theatre',
-			'Comedy',
-			'Cooking/Food',
-			'Crime',
-			'Current Events',
-			'Dance',
-			'Debate',
-			'Design/Decorating',
-			'Discovery/Science',
-			'Drama',
-			'Educational',
-			'Family',
-			'Fantasy',
-			'Fashion/Make-up',
-			'Financial/Business',
-			'Fitness',
-			'Garden/Landscape',
-			'History',
-			'Horror/Supernatural',
-			'Housing/Building',
-			'How To/Do It Yourself',
-			'Interview',
-			'Lifestyle',
-			'Literature',
-			'Medical',
-			'Military/War',
-			'Music',
-			'Mystery',
-			'Pets/Animals',
-			'Politics',
-			'Puppets',
-			'Religion',
-			'Romance/Dating',
-			'Sci-Fi',
-			'Sketch/Improv',
-			'Soaps',
-			'Sports',
-			'Super Heroes',
-			'Talent',
-			'Tech/Gaming',
-			'Teens',
-			'Thriller',
-			'Travel',
-			'Western',
-			'Wildlife'
-		);
-    }
-}
diff --git a/lib/copy_this/www/lib/usermovies.php b/lib/copy_this/www/lib/usermovies.php
deleted file mode 100644
index d31c1aa1b..000000000
--- a/lib/copy_this/www/lib/usermovies.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-
-class UserMovies
-{
-	public function addMovie($uid, $imdbid, $catid=array())
-	{
-		$db = new DB();
-
-		$catid = (!empty($catid)) ? $db->escapeString(implode('|', $catid)) : "null";
-
-		$sql = sprintf("insert into usermovies (userid, imdbid, categoryid, createddate) values (%d, %d, %s, now())", $uid, $imdbid, $catid);
-		return $db->queryInsert($sql);
-	}
-
-	public function getMovies($uid)
-	{
-		$db = new DB();
-		$sql = sprintf("select usermovies.*, movieinfo.year, movieinfo.plot, movieinfo.cover, movieinfo.title from usermovies left outer join movieinfo on movieinfo.imdbid = usermovies.imdbid where userid = %d order by movieinfo.title asc", $uid);
-		return $db->query($sql);
-	}
-
-	public function delMovie($uid, $imdbid)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from usermovies where userid = %d and imdbid = %d ", $uid, $imdbid));
-	}
-
-	public function getMovie($uid, $imdbid)
-	{
-		$db = new DB();
-		$sql = sprintf("select usermovies.*, movieinfo.title from usermovies left outer join movieinfo on movieinfo.imdbid = usermovies.imdbid where usermovies.userid = %d and usermovies.imdbid = %d ", $uid, $imdbid);
-		return $db->queryOneRow($sql);
-	}
-
-	public function delMovieForUser($uid)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from usermovies where userid = %d", $uid));
-	}
-
-	public function updateMovie($uid, $imdbid, $catid=array())
-	{
-		$db = new DB();
-
-		$catid = (!empty($catid)) ? $db->escapeString(implode('|', $catid)) : "null";
-
-		$sql = sprintf("update usermovies set categoryid = %s where userid = %d and imdbid = %d", $catid, $uid, $imdbid);
-		$db->queryExec($sql);
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/users.php b/lib/copy_this/www/lib/users.php
deleted file mode 100644
index e5d4b1b20..000000000
--- a/lib/copy_this/www/lib/users.php
+++ /dev/null
@@ -1,1042 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/forum.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/releasecomments.php");
-require_once(WWW_DIR . "/lib/usermovies.php");
-require_once(WWW_DIR . "/lib/userseries.php");
-
-class Users
-{
-	const ERR_SIGNUP_BADUNAME = -1;
-	const ERR_SIGNUP_BADPASS = -2;
-	const ERR_SIGNUP_BADEMAIL = -3;
-	const ERR_SIGNUP_UNAMEINUSE = -4;
-	const ERR_SIGNUP_EMAILINUSE = -5;
-	const ERR_SIGNUP_BADINVITECODE = -6;
-	const ERR_SIGNUP_BADCAPTCHA = -7;
-	const SUCCESS = 1;
-
-	const ROLE_GUEST = 0;
-	const ROLE_USER = 1;
-	const ROLE_ADMIN = 2;
-	const ROLE_DISABLED = 3;
-
-	const DEFAULT_INVITES = 1;
-	const DEFAULT_INVITE_EXPIRY_DAYS = 7;
-
-	const SALTLEN = 4;
-	const SHA1LEN = 40;
-
-	/**
-	 * Users select queue type.
-	 */
-	const QUEUE_NONE = 0;
-	const QUEUE_SABNZBD = 1;
-	const QUEUE_NZBGET = 2;
-
-	public static function checkPassword($password, $hash)
-	{
-		$salt = substr($hash, -self::SALTLEN);
-		$site = new Sites();
-		$s = $site->get();
-
-		return self::hashSHA1($s->siteseed . $password . $salt . $s->siteseed) === substr($hash, 0, self::SHA1LEN);
-	}
-
-	public function get()
-	{
-		$db = new DB();
-
-		return $db->query("select * from users");
-	}
-
-	public function delete($id)
-	{
-		$db = new DB();
-		$this->delCartForUser($id);
-		$this->delUserCategoryExclusions($id);
-		$this->delDownloadRequests($id);
-		$this->delApiRequests($id);
-
-		$rc = new ReleaseComments();
-		$rc->deleteCommentsForUser($id);
-
-		$um = new UserMovies();
-		$um->delMovieForUser($id);
-
-		$us = new UserSeries();
-		$us->delShowForUser($id);
-
-		$forum = new Forum();
-		$forum->deleteUser($id);
-
-		$db->exec(sprintf("DELETE from users where id = %d", $id));
-	}
-
-	public function delCartForUser($uid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("DELETE from usercart where userid = %d", $uid));
-	}
-
-	public function delUserCategoryExclusions($uid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("DELETE from userexcat where userid = %d", $uid));
-	}
-
-	public function delDownloadRequests($userid)
-	{
-		$db = new DB();
-
-		return $db->queryInsert(sprintf("delete from userdownloads where userid = %d", $userid));
-	}
-
-	public function delApiRequests($userid)
-	{
-		$db = new DB();
-
-		return $db->queryInsert(sprintf("delete from userrequests where userid = %d", $userid));
-	}
-
-	public function getRange($start, $num, $orderby, $username = '', $email = '', $host = '', $role = '')
-	{
-		$db = new DB();
-
-		if ($start === false)
-			$limit = "";
-		else
-			$limit = " LIMIT " . $start . "," . $num;
-
-		$usql = '';
-		if ($username != '')
-			$usql = sprintf(" and users.username like %s ", $db->escapeString("%" . $username . "%"));
-
-		$esql = '';
-		if ($email != '')
-			$esql = sprintf(" and users.email like %s ", $db->escapeString("%" . $email . "%"));
-
-		$hsql = '';
-		if ($host != '')
-			$hsql = sprintf(" and users.host like %s ", $db->escapeString("%" . $host . "%"));
-
-		$rsql = '';
-		if ($role != '')
-			$rsql = sprintf(" and users.role = %d ", $role);
-
-		$order = $this->getBrowseOrder($orderby);
-
-		return $db->query(sprintf(" SELECT users.*, userroles.name as rolename from users inner join userroles on userroles.id = users.role where 1=1 %s %s %s %s AND email != 'sharing@nZEDb.com' order by %s %s" . $limit, $usql, $esql, $hsql, $rsql, $order[0], $order[1]));
-	}
-
-	public function getBrowseOrder($orderby)
-	{
-		$order = ($orderby == '') ? 'username_desc' : $orderby;
-		$orderArr = explode("_", $order);
-		switch ($orderArr[0]) {
-			case 'username':
-				$orderfield = 'username';
-				break;
-			case 'email':
-				$orderfield = 'email';
-				break;
-			case 'host':
-				$orderfield = 'host';
-				break;
-			case 'createddate':
-				$orderfield = 'createddate';
-				break;
-			case 'lastlogin':
-				$orderfield = 'lastlogin';
-				break;
-			case 'apiaccess':
-				$orderfield = 'apiaccess';
-				break;
-			case 'grabs':
-				$orderfield = 'grabs';
-				break;
-			case 'role':
-				$orderfield = 'role';
-				break;
-			default:
-				$orderfield = 'username';
-				break;
-		}
-		$ordersort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
-
-		return array($orderfield, $ordersort);
-	}
-
-	public function getCount()
-	{
-		$db = new DB();
-		$res = $db->queryOneRow("select count(id) as num from users WHERE email != 'sharing@nZEDb.com'");
-
-		return $res["num"];
-	}
-
-	public function update($id, $uname, $email, $grabs, $role, $notes, $invites, $movieview, $musicview, $gameview, $xxxview, $consoleview, $bookview, $queueType = '', $nzbgetURL = '', $nzbgetUsername = '', $nzbgetPassword = '', $saburl = '', $sabapikey = '', $sabpriority = '', $sabapikeytype = '', $nzbvortexServerUrl = false, $nzbvortexApiKey = false, $cp_url = false, $cp_api = false)
-	{
-		$db = new DB();
-
-		$uname = trim($uname);
-		$email = trim($email);
-
-		if (!$this->isValidUsername($uname))
-			return Users::ERR_SIGNUP_BADUNAME;
-
-		if (!$this->isValidEmail($email))
-			return Users::ERR_SIGNUP_BADEMAIL;
-
-		$res = $this->getByUsername($uname);
-		if ($res)
-			if ($res["id"] != $id)
-				return Users::ERR_SIGNUP_UNAMEINUSE;
-
-		$res = $this->getByEmail($email);
-		if ($res)
-			if ($res["id"] != $id)
-				return Users::ERR_SIGNUP_EMAILINUSE;
-
-		$sql = array();
-
-		$sql[] = sprintf('username = %s', $db->escapeString($uname));
-		$sql[] = sprintf('email = %s', $db->escapeString($email));
-		$sql[] = sprintf('grabs = %d', $grabs);
-		$sql[] = sprintf('role = %d', $role);
-		$sql[] = sprintf('notes = %s', $db->escapeString(substr($notes, 0, 255)));
-		$sql[] = sprintf('invites = %d', $invites);
-		$sql[] = sprintf('movieview = %d', $movieview);
-		$sql[] = sprintf('musicview = %d', $musicview);
-		$sql[] = sprintf('gameview = %d', $gameview);
-		$sql[] = sprintf('xxxview = %d', $xxxview);
-		$sql[] = sprintf('consoleview = %d', $consoleview);
-		$sql[] = sprintf('bookview = %d', $bookview);
-
-		if ($queueType !== '') {
-			$sql[] = sprintf('queuetype = %d', $queueType);
-		}
-
-		if ($nzbgetURL !== '') {
-			$sql[] = sprintf('nzbgeturl = %s', $db->escapeString($nzbgetURL));
-		}
-
-		$sql[] = sprintf('nzbgetusername = %s', $db->escapeString($nzbgetUsername));
-		$sql[] = sprintf('nzbgetpassword = %s', $db->escapeString($nzbgetPassword));
-
-		if ($saburl !== '') {
-			$sql[] = sprintf('saburl = %s', $db->escapeString($saburl));
-		}
-		if ($sabapikey !== '') {
-			$sql[] = sprintf('sabapikey = %s', $db->escapeString($sabapikey));
-		}
-		if ($sabpriority !== '') {
-			$sql[] = sprintf('sabpriority = %d', $sabpriority);
-		}
-		if ($sabapikeytype !== '') {
-			$sql[] = sprintf('sabapikeytype = %d', $sabapikeytype);
-		}
-		if ($nzbvortexServerUrl !== false) {
-			$sql[] = sprintf("nzbvortex_server_url = '%s'", $nzbvortexServerUrl);
-		}
-		if ($nzbvortexApiKey !== false) {
-			$sql[] = sprintf("nzbvortex_api_key = '%s'", $nzbvortexApiKey);
-		}
-		if ($cp_url !== false) {
-			$sql[] = sprintf('cp_url = %s', $db->escapeString($cp_url));
-		}
-		if ($cp_api !== false) {
-			$sql[] = sprintf('cp_api = %s', $db->escapeString($cp_api));
-		}
-
-		$db->queryExec(sprintf("update users set %s where id = %d", implode(', ', $sql), $id));
-
-		return self::SUCCESS;
-	}
-
-	public function isValidUsername($uname)
-	{
-		return preg_match("/^[a-z][a-z0-9]{2,}$/i", $uname);
-	}
-
-	/**
-	 * When a user is registering or updating their profile, check if the email is valid.
-	 *
-	 * @param string $email
-	 *
-	 * @return bool
-	 */
-	public function isValidEmail($email)
-	{
-		return (bool)preg_match('/^([\w\+-]+)(\.[\w\+-]+)*@([a-z0-9-]+\.)+[a-z]{2,6}$/i', $email);
-	}
-
-	public function getByUsername($uname)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select users.*, userroles.name as rolename, userroles.apirequests, userroles.downloadrequests from users inner join userroles on userroles.id = users.role where username = %s ", $db->escapeString($uname)));
-	}
-
-	public function getByEmail($email)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select * from users where lower(email) = %s ", $db->escapeString(strtolower($email))));
-	}
-
-	public function updateUserRole($uid, $role)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users set role = %d where id = %d", $role, $uid));
-
-		return Users::SUCCESS;
-	}
-
-	public function updateUserRoleChangeDate($uid, $date)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users SET rolechangedate = '%s' WHERE id = %d", $date, $uid));
-
-		return Users::SUCCESS;
-	}
-
-	public function updateExpiredRoles($uprole, $downrole, $msgsubject, $msgbody)
-	{
-		$db = new DB();
-
-		$site = new Sites;
-		$s = $site->get();
-
-		$data = $db->query(sprintf("select id,email from users WHERE role = %d and rolechangedate < now()", $uprole));
-		foreach ($data as $u) {
-			Utility::sendEmail($u["email"], $msgsubject, $msgbody, $s->email);
-			$db->exec(sprintf("update users SET role = %d, rolechangedate=null WHERE id = %d", $downrole, $u["id"]));
-		}
-
-		return Users::SUCCESS;
-	}
-
-	public function updateRssKey($uid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users set rsstoken = md5(%s) where id = %d", $db->escapeString(uniqid()), $uid));
-
-		return Users::SUCCESS;
-	}
-
-	public function updatePassResetGuid($id, $guid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users set resetguid = %s where id = %d", $db->escapeString($guid), $id));
-
-		return Users::SUCCESS;
-	}
-
-	public function updatePassword($id, $password)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users set password = %s, userseed=md5(%s) where id = %d", $db->escapeString($this->hashPassword($password)), $db->escapeString(generateUuid()), $id));
-
-		return Users::SUCCESS;
-	}
-
-	public static function hashPassword($password)
-	{
-		$salt = Users::randomKey(Users::SALTLEN);
-		$site = new Sites();
-		$s = $site->get();
-
-		return Users::hashSHA1($s->siteseed . $password . $salt . $s->siteseed) . $salt;
-	}
-
-	function randomKey($amount)
-	{
-		$keyset = "abcdefghijklmABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-		$randkey = "";
-		for ($i = 0; $i < $amount; $i++)
-			$randkey .= substr($keyset, rand(0, strlen($keyset) - 1), 1);
-
-		return $randkey;
-	}
-
-	public static function hashSHA1($string)
-	{
-		return sha1($string);
-	}
-
-	public function getByPassResetGuid($guid)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select * from users where resetguid = %s ", $db->escapeString($guid)));
-	}
-
-	public function incrementGrabs($id, $num = 1)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users set grabs = grabs + %d where id = %d ", $num, $id));
-	}
-
-	public function getByIdAndRssToken($id, $rsstoken)
-	{
-		$db = new DB();
-		$res = $this->getById($id);
-
-		return ($res && $res["rsstoken"] == $rsstoken ? $res : null);
-	}
-
-	public function getById($id)
-	{
-		$db = new DB();
-		$sql = sprintf("select users.*, userroles.name as rolename, userroles.hideads, userroles.canpreview, userroles.canpre, userroles.apirequests, userroles.downloadrequests, NOW() as now from users inner join userroles on userroles.id = users.role where users.id = %d ", $id);
-
-		return $db->queryOneRow($sql);
-	}
-
-	public function getByRssToken($rsstoken)
-	{
-		$db = new DB();
-
-		return $db->queryOneRow(sprintf("select users.*, userroles.apirequests, userroles.downloadrequests, NOW() as now from users inner join userroles on userroles.id = users.role where users.rsstoken = %s ", $db->escapeString($rsstoken)));
-	}
-
-	public function getBrowseOrdering()
-	{
-		return array('username_asc', 'username_desc', 'email_asc', 'email_desc', 'host_asc', 'host_desc', 'createddate_asc', 'createddate_desc', 'lastlogin_asc', 'lastlogin_desc', 'apiaccess_asc', 'apiaccess_desc', 'grabs_asc', 'grabs_desc', 'role_asc', 'role_desc');
-	}
-
-	public function isDisabled($username)
-	{
-		$db = new DB();
-		$role = $db->queryOneRow(sprintf("select role as role from users where username = %s ", $db->escapeString($username)));
-
-		return ($role["role"] == Users::ROLE_DISABLED);
-	}
-
-	public function isValidUrl($url)
-	{
-		return (!preg_match('/^(http|https|ftp):\/\/([A-Z0-9][A-Z0-9_-]*(?:\.[A-Z0-9][A-Z0-9_-]*)+):?(\d+)?\/?/i', $url)) ? false : true;
-	}
-
-	/**
-	 * Create a random username.
-	 *
-	 * @param string $email
-	 *
-	 * @return string
-	 */
-	public function generateUsername($email)
-	{
-		$string = '';
-		if (preg_match('/[A-Za-z0-9]+/', $email, $matches)) {
-			$string = $matches[0];
-		}
-
-		return "u" . substr(md5(uniqid()), 0, 7) . $string;
-	}
-
-	public function generatePassword()
-	{
-		return substr(md5(uniqid()), 0, 8);
-	}
-
-	public function signup($uname, $pass, $email, $host, $role = self::ROLE_USER, $notes, $invites = self::DEFAULT_INVITES, $invitecode = '', $forceinvitemode = false, $recaptcha_challenge = false, $recaptcha_response = false, $skip_recaptcha = false)
-	{
-		$site = new Sites;
-		$s = $site->get();
-
-		$uname = trim($uname);
-		$pass = trim($pass);
-		$email = trim($email);
-
-		if (!$this->isValidUsername($uname))
-			return Users::ERR_SIGNUP_BADUNAME;
-
-		if (!$this->isValidPassword($pass))
-			return Users::ERR_SIGNUP_BADPASS;
-
-		if (!$this->isValidEmail($email)) {
-			return self::ERR_SIGNUP_BADEMAIL;
-		}
-
-		$res = $this->getByUsername($uname);
-		if ($res)
-			return Users::ERR_SIGNUP_UNAMEINUSE;
-
-		$res = $this->getByEmail($email);
-		if ($res)
-			return Users::ERR_SIGNUP_EMAILINUSE;
-
-		// Check Captcha
-		if (!$skip_recaptcha) {
-			if (!$this->isValidCaptcha($s, $recaptcha_challenge, $recaptcha_response))
-				return Users::ERR_SIGNUP_BADCAPTCHA;
-		}
-
-		//
-		// make sure this is the last check, as if a further validation check failed,
-		// the invite would still have been used up
-		//
-		$invitedby = 0;
-		if (($s->registerstatus == Sites::REGISTER_STATUS_INVITE) && !$forceinvitemode) {
-			if ($invitecode == '')
-				return Users::ERR_SIGNUP_BADINVITECODE;
-
-			$invitedby = $this->checkAndUseInvite($invitecode);
-			if ($invitedby < 0)
-				return Users::ERR_SIGNUP_BADINVITECODE;
-		}
-
-		return $this->add($uname, $pass, $email, $role, $notes, $host, $invites, $invitedby);
-	}
-
-	public function isValidPassword($pass)
-	{
-		return (strlen($pass) > 5);
-	}
-
-	public function isValidCaptcha($site, $challenge, $response)
-	{
-		if ($site->registerrecaptcha != 1)
-			return true;
-
-		require_once(WWW_DIR . "/lib/recaptchalib.php");
-
-		$resp = recaptcha_check_answer($site->recaptchaprivatekey, $_SERVER["REMOTE_ADDR"], $challenge, $response);
-
-		return $resp->is_valid;
-	}
-
-	public function checkAndUseInvite($invitecode)
-	{
-		$invite = $this->getInvite($invitecode);
-		if (!$invite)
-			return -1;
-
-		$db = new DB();
-		$db->exec(sprintf("update users set invites = case when invites <= 0 then 0 else invites-1 end where id = %d ", $invite["userid"]));
-		$this->deleteInvite($invitecode);
-
-		return $invite["userid"];
-	}
-
-	public function getInvite($inviteToken)
-	{
-		$db = new DB();
-
-		//
-		// Tidy any old invites sent greater than DEFAULT_INVITE_EXPIRY_DAYS days ago.
-		//
-		$db->queryExec(sprintf("DELETE from userinvite where createddate < now() - INTERVAL %d DAY", self::DEFAULT_INVITE_EXPIRY_DAYS));
-
-		return $db->queryOneRow(
-			sprintf(
-				"SELECT * FROM userinvite WHERE guid = %s",
-				$db->escapeString($inviteToken)
-			)
-		);
-	}
-
-	public function deleteInvite($inviteToken)
-	{
-		$db = new DB();
-		$db->exec(sprintf("DELETE from userinvite where guid = %s ", $db->escapeString($inviteToken)));
-	}
-
-	public function add($uname, $pass, $email, $role, $notes, $host, $invites = self::DEFAULT_INVITES, $invitedby = 0)
-	{
-		$db = new DB();
-
-		$site = new Sites();
-		$s = $site->get();
-		if ($s->storeuserips != "1")
-			$host = "";
-
-		if ($invitedby == 0)
-			$invitedby = "null";
-
-		$sql = sprintf("insert into users (username, password, email, role, notes, createddate, host, rsstoken, invites, invitedby, userseed) values (%s, %s, lower(%s), %d, %s, now(), %s, md5(%s), %d, %s, md5(%s))",
-			$db->escapeString($uname), $db->escapeString($this->hashPassword($pass)), $db->escapeString($email), $role, $db->escapeString($notes), $db->escapeString($host), $db->escapeString(uniqid()), $invites, $invitedby, $db->escapeString(uniqid())
-		);
-
-		return $db->queryInsert($sql);
-	}
-
-	public function isLoggedIn()
-	{
-		if (isset($_SESSION['uid'])) {
-			return true;
-		} elseif (isset($_COOKIE['uid']) && isset($_COOKIE['idh'])) {
-			$u = $this->getById($_COOKIE['uid']);
-
-			if (($_COOKIE['idh'] == $this->hashSHA1($u["userseed"] . $_COOKIE['uid'])) && ($u["role"] != Users::ROLE_DISABLED)) {
-				$this->login($_COOKIE['uid'], $_SERVER['REMOTE_ADDR']);
-			}
-		}
-
-		return isset($_SESSION['uid']);
-	}
-
-	public function login($uid, $host = "", $remember = "")
-	{
-		$_SESSION['uid'] = $uid;
-
-		$site = new Sites();
-		$s = $site->get();
-
-		if ($s->storeuserips != "1")
-			$host = '';
-
-		$this->updateSiteAccessed($uid, $host);
-
-		if ($remember == 1)
-			$this->setCookies($uid);
-	}
-
-	public function updateSiteAccessed($uid, $host = "")
-	{
-		$db = new DB();
-		$hostSql = '';
-		if ($host != '')
-			$hostSql = sprintf(', host = %s', $db->escapeString($host));
-
-		$db->exec(sprintf("update users set lastlogin = now() %s where id = %d ", $hostSql, $uid));
-	}
-
-	public function setCookies($uid)
-	{
-		$u = $this->getById($uid);
-		$idh = $this->hashSHA1($u["userseed"] . $uid);
-		setcookie('uid', $uid, (time() + 2592000), '/', $_SERVER['SERVER_NAME'], (isset($_SERVER['HTTPS']) ? true : false));
-		setcookie('idh', $idh, (time() + 2592000), '/', $_SERVER['SERVER_NAME'], (isset($_SERVER['HTTPS']) ? true : false));
-	}
-
-	public function currentUserId()
-	{
-		return (isset($_SESSION['uid']) ? $_SESSION['uid'] : -1);
-	}
-
-	public function logout()
-	{
-		session_unset();
-		session_destroy();
-		setcookie('uid', '', (time() - 2592000), '/', $_SERVER['SERVER_NAME'], (isset($_SERVER['HTTPS']) ? true : false));
-		setcookie('idh', '', (time() - 2592000), '/', $_SERVER['SERVER_NAME'], (isset($_SERVER['HTTPS']) ? true : false));
-	}
-
-	public function updateApiAccessed($uid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("update users set apiaccess = now() where id = %d ", $uid));
-	}
-
-	public function addCart($uid, $releaseid)
-	{
-		$db = new DB();
-		$sql = sprintf("insert into usercart (userid, releaseid, createddate) values (%d, %d, now())", $uid, $releaseid);
-
-		return $db->queryInsert($sql);
-	}
-
-	public function getCart($uid, $releaseid = "")
-	{
-		$db = new DB();
-		if ($releaseid != "")
-			$releaseid = " and releases.id = " . $db->escapeString($releaseid);
-
-		return $db->query(sprintf("select usercart.*, releases.searchname,releases.guid from usercart inner join releases on releases.id = usercart.releaseid where userid = %d %s", $uid, $releaseid));
-	}
-
-	public function delCartByGuid($guids, $uid)
-	{
-		$db = new DB();
-		if (!is_array($guids))
-			return false;
-
-		$del = array();
-		foreach ($guids as $id) {
-			$id = sprintf("%s", $db->escapeString($id));
-			if (!empty($id))
-				$del[] = $id;
-		}
-
-		$sql = sprintf("delete from usercart where userid = %d and releaseid IN (select id from releases where guid IN (%s)) ", $uid, implode(',', $del));
-		$db->query($sql);
-	}
-
-	public function delCartByUserAndRelease($guid, $uid)
-	{
-		$db = new DB();
-		$rel = $db->queryOneRow(sprintf("select id from releases where guid = %s", $db->escapeString($guid)));
-		if ($rel)
-			$db->exec(sprintf("DELETE FROM usercart WHERE userid = %d AND releaseid = %d", $uid, $rel["id"]));
-	}
-
-	public function delCartForRelease($rid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("DELETE from usercart where releaseid = %d", $rid));
-	}
-
-	public function addCategoryExclusions($uid, $catids)
-	{
-		$db = new DB();
-		$this->delUserCategoryExclusions($uid);
-		if (count($catids) > 0) {
-			foreach ($catids as $catid) {
-				$db->queryInsert(sprintf("insert into userexcat (userid, categoryid, createddate) values (%d, %d, now())", $uid, $catid));
-			}
-		}
-	}
-
-	public function getRoleCategoryExclusion($role)
-	{
-		$db = new DB();
-		$ret = array();
-		$data = $db->query(sprintf("select categoryid from roleexcat where role = %d", $role));
-		foreach ($data as $d)
-			$ret[] = $d["categoryid"];
-
-		return $ret;
-	}
-
-	public function addRoleCategoryExclusions($role, $catids)
-	{
-		$db = new DB();
-		$this->delRoleCategoryExclusions($role);
-		if (count($catids) > 0) {
-			foreach ($catids as $catid) {
-				$db->queryInsert(sprintf("insert into roleexcat (role, categoryid, createddate) values (%d, %d, now())", $role, $catid));
-			}
-		}
-	}
-
-	public function delRoleCategoryExclusions($role)
-	{
-		$db = new DB();
-		$db->exec(sprintf("DELETE from roleexcat where role = %d", $role));
-	}
-
-	public function getCategoryExclusionNames($uid)
-	{
-		$data = $this->getCategoryExclusion($uid);
-		$ret = array();
-
-		if ($data) {
-			$db = new DB();
-			$category = new Category();
-			$data = $category->getByIds($data);
-			foreach ($data as $d)
-				$ret[] = $d["title"];
-		}
-
-		return $ret;
-	}
-
-	public function getCategoryExclusion($uid)
-	{
-		$db = new DB();
-		$ret = array();
-		$data = $db->query(sprintf("select categoryid from userexcat where userid = %d union distinct select categoryid from roleexcat inner join users on users.role = roleexcat.role where users.id = %d", $uid, $uid));
-		foreach ($data as $d)
-			$ret[] = $d["categoryid"];
-
-		return $ret;
-	}
-
-	public function delCategoryExclusion($uid, $catid)
-	{
-		$db = new DB();
-		$db->exec(sprintf("DELETE from userexcat where userid = %d and categoryid = %d", $uid, $catid));
-	}
-
-	public function sendInvite($sitetitle, $siteemail, $serverurl, $uid, $emailto)
-	{
-		$sender = $this->getById($uid);
-		$token = $this->hashSHA1(uniqid());
-		$subject = $sitetitle . " Invitation";
-		$url = $serverurl . "register?invitecode=" . $token;
-		$contents = $sender["username"] . " has sent an invite to join " . $sitetitle . " to this email address. To accept the invitation click the following link.\n\n " . $url;
-
-		Utility::sendEmail($emailto, $subject, $contents, $siteemail);
-		$this->addInvite($uid, $token);
-
-		return $url;
-	}
-
-	public function addInvite($uid, $inviteToken)
-	{
-		$db = new DB();
-		$db->queryInsert(sprintf("insert into userinvite (guid, userid, createddate) values (%s, %d, now())", $db->escapeString($inviteToken), $uid));
-	}
-
-	public function getTopGrabbers()
-	{
-		$db = new DB();
-
-		return $db->query("SELECT id, username, SUM(grabs) as grabs FROM users
-							GROUP BY id, username
-							HAVING SUM(grabs) > 0
-							ORDER BY grabs DESC
-							LIMIT 10"
-		);
-	}
-
-	public function getUsersByMonth()
-	{
-		$db = new DB();
-
-		return $db->query("SELECT DATE_FORMAT(createddate, '%M %Y') AS mth, COUNT(*) AS num
-							FROM users
-							WHERE createddate IS NOT NULL AND createddate != '0000-00-00 00:00:00'
-							GROUP BY DATE_FORMAT(createddate, '%M %Y')
-							ORDER BY createddate DESC"
-		);
-	}
-
-	public function getUsersByHostHash()
-	{
-		$db = new DB();
-
-		$site = new Sites();
-		$s = $site->get();
-		$ipsql = "('-1')";
-
-		if ($s->userhostexclusion != '') {
-			$ipsql = "";
-			$ips = explode(",", $s->userhostexclusion);
-			foreach ($ips as $ip) {
-				$ipsql .= $db->escapeString($this->getHostHash($ip, $s->siteseed)) . ",";
-			}
-			$ipsql = "(" . $ipsql . " '-1')";
-		}
-
-		$sql = sprintf("select hosthash, group_concat(userid) as user_string, group_concat(username) as user_names
-							from
-							(
-							select hosthash, userid, username from userdownloads left outer join users on users.id = userdownloads.userid where hosthash is not null and hosthash not in %s group by hosthash, userid
-							union distinct
-							select hosthash, userid, username from userrequests left outer join users on users.id = userrequests.userid where hosthash is not null and hosthash not in %s group by hosthash, userid
-							) x
-							group by hosthash
-							having CAST((LENGTH(group_concat(userid)) - LENGTH(REPLACE(group_concat(userid), ',', ''))) / LENGTH(',') AS UNSIGNED) < 9
-							order by CAST((LENGTH(group_concat(userid)) - LENGTH(REPLACE(group_concat(userid), ',', ''))) / LENGTH(',') AS UNSIGNED) desc
-							limit 10", $ipsql, $ipsql
-		);
-
-		return $db->query($sql);
-	}
-
-	public static function getHostHash($host, $siteseed = "")
-	{
-		if ($siteseed == "") {
-			$site = new Sites();
-			$s = $site->get();
-			$siteseed = $s->siteseed;
-		}
-
-		return self::hashSHA1($siteseed . $host . $siteseed);
-	}
-
-	public function getUsersByRole()
-	{
-		$db = new DB();
-
-		return $db->query("select ur.name, count(u.id) as num from users u
-							inner join userroles ur on ur.id = u.role
-							group by ur.name
-							order by count(u.id) desc;"
-		);
-	}
-
-	public function getLoginCountsByMonth()
-	{
-		$db = new DB();
-
-		return $db->query("select 'Login' as type,
-			sum(case when lastlogin > curdate() - INTERVAL 1 DAY then 1 else 0 end) as 1day,
-			sum(case when lastlogin > curdate() - INTERVAL 7 DAY and lastlogin < curdate() - INTERVAL 1 DAY then 1 else 0 end) as 7day,
-			sum(case when lastlogin > curdate() - INTERVAL 1 MONTH and lastlogin < curdate() - INTERVAL 7 DAY then 1 else 0 end) as 1month,
-			sum(case when lastlogin > curdate() - INTERVAL 3 MONTH and lastlogin < curdate() - INTERVAL 1 MONTH then 1 else 0 end) as 3month,
-			sum(case when lastlogin > curdate() - INTERVAL 6 MONTH and lastlogin < curdate() - INTERVAL 3 MONTH then 1 else 0 end) as 6month,
-			sum(case when lastlogin < curdate() - INTERVAL 6 MONTH then 1 else 0 end) as 12month
-			from users
-			union
-			select 'Api' as type,
-			sum(case when apiaccess > curdate() - INTERVAL 1 DAY then 1 else 0 end) as 1day,
-			sum(case when apiaccess > curdate() - INTERVAL 7 DAY and apiaccess < curdate() - INTERVAL 1 DAY then 1 else 0 end) as 7day,
-			sum(case when apiaccess > curdate() - INTERVAL 1 MONTH and apiaccess < curdate() - INTERVAL 7 DAY then 1 else 0 end) as 1month,
-			sum(case when apiaccess > curdate() - INTERVAL 3 MONTH and apiaccess < curdate() - INTERVAL 1 MONTH then 1 else 0 end) as 3month,
-			sum(case when apiaccess > curdate() - INTERVAL 6 MONTH and apiaccess < curdate() - INTERVAL 3 MONTH then 1 else 0 end) as 6month,
-			sum(case when apiaccess < curdate() - INTERVAL 6 MONTH then 1 else 0 end) as 12month
-			from users"
-		);
-	}
-
-	public function getRoles()
-	{
-		$db = new DB();
-
-		return $db->query("select * from userroles");
-	}
-
-	public function getRoleById($id)
-	{
-		$db = new DB();
-		$sql = sprintf("select * from userroles where id = %d", $id);
-
-		return $db->queryOneRow($sql);
-	}
-
-	public function addRole($name, $apirequests, $downloadrequests, $defaultinvites, $canpreview, $canpre, $hideads)
-	{
-		$db = new DB();
-		$sql = sprintf("insert into userroles (name, apirequests, downloadrequests, defaultinvites, canpreview, canpre, hideads) VALUES (%s, %d, %d, %d, %d, %d)", $db->escapeString($name), $apirequests, $downloadrequests, $defaultinvites, $canpreview, $canpre, $hideads);
-
-		return $db->queryInsert($sql);
-	}
-
-	public function updateRole($id, $name, $apirequests, $downloadrequests, $defaultinvites, $isdefault, $canpreview, $canpre, $hideads)
-	{
-		$db = new DB();
-		if ($isdefault == 1)
-			$db->exec("update userroles set isdefault=0");
-
-		return $db->exec(sprintf("update userroles set name=%s, apirequests=%d, downloadrequests=%d, defaultinvites=%d, isdefault=%d, canpreview=%d, canpre=%d, hideads=%d WHERE id=%d", $db->escapeString($name), $apirequests, $downloadrequests, $defaultinvites, $isdefault, $canpreview, $canpre, $hideads, $id));
-	}
-
-	public function deleteRole($id)
-	{
-		$db = new DB();
-		$res = $db->query(sprintf("select id from users where role = %d", $id));
-		if (sizeof($res) > 0) {
-			$userids = array();
-			foreach ($res as $user)
-				$userids[] = $user['id'];
-
-			$defaultrole = $this->getDefaultRole();
-			$db->exec(sprintf("update users set role=%d where id IN (%s)", $defaultrole['id'], implode(',', $userids)));
-		}
-
-		return $db->exec(sprintf("DELETE from userroles WHERE id=%d", $id));
-	}
-
-	public function getDefaultRole()
-	{
-		$db = new DB();
-
-		return $db->queryOneRow("select * from userroles where isdefault = 1");
-	}
-
-	public function getApiRequests($userid)
-	{
-		$db = new DB();
-		//clear old requests
-		//$db->exec(sprintf("DELETE FROM userrequests WHERE (userid = %d AND timestamp < DATE_SUB(NOW(), INTERVAL 1 DAY))", $userid));
-		$db->exec(sprintf("DELETE FROM userrequests WHERE timestamp < DATE_SUB(NOW(), INTERVAL 1 DAY)", $userid));
-
-		$sql = sprintf("select COUNT(id) as num, TIME_TO_SEC(TIMEDIFF(DATE_ADD(MIN(TIMESTAMP), INTERVAL 1 DAY), NOW())) AS nextrequest FROM userrequests WHERE userid = %d AND timestamp > DATE_SUB(NOW(), INTERVAL 1 DAY)", $userid);
-
-		return $db->queryOneRow($sql);
-	}
-
-	public function addApiRequest($userid, $request)
-	{
-		$db = new DB();
-
-		$sql = sprintf("insert into userrequests (userid, request, timestamp) VALUES (%d, %s, now())", $userid, $db->escapeString($request));
-
-		return $db->queryInsert($sql);
-	}
-
-	/**
-	 * deletes old rows from the userrequest and userdownloads tables.
-	 * if site->userdownloadpurgedays set to 0 then all release history is removed but
-	 * the download/request rows must remain for at least one day to allow the role based
-	 * limits to apply.
-	 */
-	public function pruneRequestHistory($days = 0)
-	{
-		$db = new DB();
-		if ($days == 0) {
-			$days = 1;
-			$db->exec("update userdownloads set releaseid = null");
-		}
-
-		$db->exec(sprintf("DELETE from userrequests where timestamp < DATE_SUB(NOW(), INTERVAL %d DAY)", $days));
-		$db->exec(sprintf("DELETE from userdownloads where timestamp < DATE_SUB(NOW(), INTERVAL %d DAY)", $days));
-	}
-
-	/**
-	 * Get the count of how many NZB's the user has downloaded in the past day.
-	 *
-	 * @param int $userID
-	 *
-	 * @return array|bool
-	 */
-	public function getDownloadRequests($userID)
-	{
-		$db = new DB();
-		// Clear old requests.
-		$db->queryExec(
-			sprintf(
-				'DELETE FROM userdownloads WHERE userid = %d AND timestamp < DATE_SUB(NOW(), INTERVAL 1 DAY)',
-				$userID
-			)
-		);
-		return $db->queryOneRow(
-			sprintf(
-				'SELECT COUNT(id) AS num FROM userdownloads WHERE userid = %d AND timestamp > DATE_SUB(NOW(), INTERVAL 1 DAY)',
-				$userID
-			)
-		);
-	}
-
-	public function getDownloadRequestsForUserAndAllHostHashes($userid)
-	{
-		$db = new DB();
-
-		/*$sql = sprintf("select distinct hosthash from userdownloads where userid = %d and hosthash is not null and hosthash != ''", $userid);
-		$rows = $db->query($sql);
-		$hashsql = "";
-		foreach ($rows as $row)
-			$hashsql .= sprintf("userdownloads.hosthash = %s or ", $db->escapeString($row["hosthash"]));
-
-		$hashsql .= " 1=2 ";
-		*/
-
-		$sql = sprintf("select userdownloads.*, releases.guid, releases.searchname from userdownloads left outer join releases on releases.id = userdownloads.releaseid where userdownloads.userid = %d order by userdownloads.timestamp desc", $userid);
-
-		return $db->query($sql);
-	}
-
-	/**
-	 * If a user downloads a NZB, log it.
-	 *
-	 * @param int $userID id of the user.
-	 *
-	 * @return bool|int
-	 */
-	public function addDownloadRequest($userID, $releaseID)
-	{
-		$db = new DB();
-		return $db->queryInsert(
-			sprintf(
-				"INSERT INTO userdownloads (userid, releaseid, timestamp) VALUES (%d, %d, NOW())",
-				$userID,
-				$releaseID
-			)
-		);
-	}
-
-	public function delDownloadRequestsForRelease($releaseID)
-	{
-		$db = new DB();
-
-		return $db->queryInsert(sprintf("delete from userdownloads where releaseid = %d", $releaseID));
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/userseries.php b/lib/copy_this/www/lib/userseries.php
deleted file mode 100644
index 16ef8bbf5..000000000
--- a/lib/copy_this/www/lib/userseries.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-
-class UserSeries
-{
-	public function addShow($uid, $rageid, $catid=array())
-	{
-		$db = new DB();
-
-		$catid = (!empty($catid)) ? $db->escapeString(implode('|', $catid)) : "null";
-
-		$sql = sprintf("insert into userseries (userid, rageid, categoryid, createddate) values (%d, %d, %s, now())", $uid, $rageid, $catid);
-		return $db->queryInsert($sql);
-	}
-
-	public function getShows($uid)
-	{
-		$db = new DB();
-		$sql = sprintf("select userseries.*, tvrage.releasetitle from userseries inner join (SELECT id, releasetitle, rageid FROM tvrage GROUP BY rageid) tvrage on tvrage.rageid = userseries.rageid where userid = %d order by tvrage.releasetitle asc", $uid);
-		return $db->query($sql);
-	}
-
-	public function delShow($uid, $rageid)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from userseries where userid = %d and rageid = %d ", $uid, $rageid));
-	}
-
-	public function getShow($uid, $rageid)
-	{
-		$db = new DB();
-		$sql = sprintf("select userseries.*, tvrage.releasetitle from userseries left outer join (SELECT id, releasetitle, rageid FROM tvrage GROUP BY rageid) tvrage on tvrage.rageid = userseries.rageid where userseries.userid = %d and userseries.rageid = %d ", $uid, $rageid);
-		return $db->queryOneRow($sql);
-	}
-
-	public function delShowForUser($uid)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from userseries where userid = %d", $uid));
-	}
-
-	public function delShowForSeries($sid)
-	{
-		$db = new DB();
-		$db->queryExec(sprintf("DELETE from userseries where rageid = %d", $sid));
-	}
-
-	public function updateShow($uid, $rageid, $catid=array())
-	{
-		$db = new DB();
-
-		$catid = (!empty($catid)) ? $db->escapeString(implode('|', $catid)) : "null";
-
-		$sql = sprintf("update userseries set categoryid = %s where userid = %d and rageid = %d", $catid, $uid, $rageid);
-		$db->queryExec($sql);
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/lib/util.php b/lib/copy_this/www/lib/util.php
deleted file mode 100644
index f57880a1d..000000000
--- a/lib/copy_this/www/lib/util.php
+++ /dev/null
@@ -1,1134 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/site.php");
-require_once(NN_TMUX . 'lib' . DS . 'PHPMailer' . DS . 'class.phpmailer.php');
-
-/*
- * General util functions.
- * Class Utility
- */
-class Utility
-{
-	/**
-	 *  Regex for detecting multi-platform path. Use it where needed so it can be updated in one location as required characters get added.
-	 */
-	const PATH_REGEX = '(?P<drive>[A-Za-z]:|)(?P<path>[/\w.-]+|)';
-
-	static public function clearScreen()
-	{
-		if (self::isCLI())
-		{
-			if (self::isWin())
-			{
-				passthru('cls');
-			} else {
-				passthru('clear');
-			}
-		}
-	}
-
-	/**
-	 * Replace all white space chars for a single space.
-	 *
-	 * @param string $text
-	 *
-	 * @return string
-	 *
-	 * @static
-	 * @access public
-	 */
-	static public function collapseWhiteSpace($text)
-	{
-		// Strip leading/trailing white space.
-		return trim(
-		// Replace 2 or more white space for a single space.
-			preg_replace('/\s{2,}/',
-				' ',
-				// Replace new lines and carriage returns. DO NOT try removing '\r' or '\n' as they are valid in queries which uses this method.
-				str_replace(["\n", "\r"], ' ', $text)
-			)
-		);
-	}
-
-	/**
-	 * Removes the preceeding or proceeding portion of a string
-	 * relative to the last occurrence of the specified character.
-	 * The character selected may be retained or discarded.
-	 *
-	 * @param string $character      the character to search for.
-	 * @param string $string         the string to search through.
-	 * @param string $side           determines whether text to the left or the right of the character is returned.
-	 *                               Options are: left, or right.
-	 * @param bool   $keep_character determines whether or not to keep the character.
-	 *                               Options are: true, or false.
-	 *
-	 * @return string
-	 */
-	static public function cutStringUsingLast($character, $string, $side, $keep_character = true)
-	{
-		$offset = ($keep_character ? 1 : 0);
-		$whole_length = strlen($string);
-		$right_length = (strlen(strrchr($string, $character)) - 1);
-		$left_length = ($whole_length - $right_length - 1);
-		switch ($side) {
-			case 'left':
-				$piece = substr($string, 0, ($left_length + $offset));
-				break;
-			case 'right':
-				$start = (0 - ($right_length + $offset));
-				$piece = substr($string, $start);
-				break;
-			default:
-				$piece = false;
-				break;
-		}
-
-		return ($piece);
-	}
-
-	static public function getDirFiles(array $options = null)
-	{
-		$defaults = [
-			'dir'   => false,
-			'ext'   => '', // no full stop (period) separator should be used.
-			'path'  => '',
-			'regex' => '',
-		];
-		$options += $defaults;
-
-		$files = [];
-		$dir = new \DirectoryIterator($options['path']);
-		foreach ($dir as $fileinfo) {
-			$file = $fileinfo->getFilename();
-			switch (true) {
-				case $fileinfo->isDot():
-					break;
-				case !$options['dir'] && $fileinfo->isDir():
-					break;
-				case !empty($options['ext']) && $fileinfo->getExtension() != $options['ext'];
-					break;
-				case !preg_match($options['regex'], str_replace('\\', '/', $file)):
-					break;
-				default:
-					$files[] = $fileinfo->getPathname();
-			}
-		}
-
-		return $files;
-	}
-
-	/**
-	 * Detect if the command is accessible on the system.
-	 *
-	 * @param $cmd
-	 *
-	 * @return bool|null Returns true if found, false if not found, and null if which is not detected.
-	 */
-	static public function hasCommand($cmd)
-	{
-		if ('HAS_WHICH') {
-			$returnVal = shell_exec("which $cmd");
-
-			return (empty($returnVal) ? false : true);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Check for availability of which command
-	 */
-	static public function hasWhich()
-	{
-		exec('which which', $output, $error);
-
-		return !$error;
-	}
-
-	/**
-	 * Check if user is running from CLI.
-	 *
-	 * @return bool
-	 */
-	static public function isCLI()
-	{
-		return ((strtolower(PHP_SAPI) === 'cli') ? true : false);
-	}
-
-	static public function isGZipped($filename)
-	{
-		$gzipped = null;
-		if (($fp = fopen($filename, 'r')) !== false) {
-			if (@fread($fp, 2) == "\x1F\x8B") { // this is a gzip'd file
-				fseek($fp, -4, SEEK_END);
-				if (strlen($datum = @fread($fp, 4)) == 4) {
-					$gzipped = $datum;
-				}
-			}
-			fclose($fp);
-		}
-
-		return ($gzipped);
-	}
-
-	static public function isWin()
-	{
-		return (strtolower(substr(PHP_OS, 0, 3)) === 'win');
-	}
-
-	static public function stripBOM(&$text)
-	{
-		$bom = pack("CCC", 0xef, 0xbb, 0xbf);
-		if (0 == strncmp($text, $bom, 3)) {
-			$text = substr($text, 3);
-		}
-	}
-
-	/**
-	 * Strips non-printing characters from a string.
-	 *
-	 * Operates directly on the text string, but also returns the result for situations requiring a
-	 * return value (use in ternary, etc.)/
-	 *
-	 * @param $text        String variable to strip.
-	 *
-	 * @return string    The stripped variable.
-	 */
-	static public function stripNonPrintingChars(&$text)
-	{
-		$lowChars = [
-			"\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07",
-			"\x08", "\x09", "\x0A", "\x0B", "\x0C", "\x0D", "\x0E", "\x0F",
-			"\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
-			"\x18", "\x19", "\x1A", "\x1B", "\x1C", "\x1D", "\x1E", "\x1F",
-		];
-		$text = str_replace($lowChars, '', $text);
-
-		return $text;
-	}
-
-	static public function trailingSlash($path)
-	{
-		if (substr($path, strlen($path) - 1) != '/') {
-			$path .= '/';
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Unzip a gzip file, return the output. Return false on error / empty.
-	 *
-	 * @param string $filePath
-	 *
-	 * @return bool|string
-	 */
-	static public function unzipGzipFile($filePath)
-	{
-		/* Potential issues with this, so commenting out.
-		$length = Utility::isGZipped($filePath);
-		if ($length === false || $length === null) {
-			return false;
-		}*/
-
-		$string = '';
-		$gzFile = @gzopen($filePath, 'rb', 0);
-		if ($gzFile) {
-			while (!gzeof($gzFile)) {
-				$temp = gzread($gzFile, 1024);
-				// Check for empty string.
-				// Without this the loop would be endless and consume 100% CPU.
-				// Do not set $string empty here, as the data might still be good.
-				if (!$temp) {
-					break;
-				}
-				$string .= $temp;
-			}
-			gzclose($gzFile);
-		}
-		return ($string === '' ? false : $string);
-	}
-
-	/**
-	 * Creates an array to be used with stream_context_create() to verify openssl certificates
-	 * when connecting to a tls or ssl connection when using stream functions (fopen/file_get_contents/etc).
-	 *
-	 * @param bool $forceIgnore Force ignoring of verification.
-	 *
-	 * @return array
-	 * @static
-	 * @access public
-	 */
-	static public function streamSslContextOptions($forceIgnore = false)
-	{
-		$options = [
-			'verify_peer'       => ($forceIgnore ? false : (bool)NN_SSL_VERIFY_PEER),
-			'verify_peer_name'  => ($forceIgnore ? false : (bool)NN_SSL_VERIFY_HOST),
-			'allow_self_signed' => ($forceIgnore ? true : (bool)NN_SSL_ALLOW_SELF_SIGNED),
-		];
-		if (NN_SSL_CAFILE) {
-			$options['cafile'] = NN_SSL_CAFILE;
-		}
-		if (NN_SSL_CAPATH) {
-			$options['capath'] = NN_SSL_CAPATH;
-		}
-		// If we set the transport to tls and the server falls back to ssl,
-		// the context options would be for tls and would not apply to ssl,
-		// so set both tls and ssl context in case the server does not support tls.
-		return ['tls' => $options, 'ssl' => $options];
-	}
-
-	/**
-	 * Set curl context options for verifying SSL certificates.
-	 *
-	 * @param bool $verify false = Ignore config.php and do not verify the openssl cert.
-	 *                     true  = Check config.php and verify based on those settings.
-	 *                     If you know the certificate will be self-signed, pass false.
-	 *
-	 * @return array
-	 * @static
-	 * @access public
-	 */
-	static public function curlSslContextOptions($verify = true)
-	{
-		$options = [];
-		if ($verify && NN_SSL_VERIFY_HOST) {
-			$options += [
-				CURLOPT_CAINFO         => NN_SSL_CAFILE,
-				CURLOPT_CAPATH         => NN_SSL_CAPATH,
-				CURLOPT_SSL_VERIFYPEER => (bool)NN_SSL_VERIFY_PEER,
-				CURLOPT_SSL_VERIFYHOST => (NN_SSL_VERIFY_HOST ? 2 : 0),
-			];
-		} else {
-			$options += [
-				CURLOPT_SSL_VERIFYPEER => false,
-				CURLOPT_SSL_VERIFYHOST => 0,
-			];
-		}
-		return $options;
-	}
-
-	/**
-	 * Use cURL To download a web page into a string.
-	 *
-	 * @param array $options See details below.
-	 *
-	 * @return bool|mixed
-	 * @access public
-	 * @static
-	 */
-	public static function getUrl(array $options = [])
-	{
-		$defaults = [
-			'url'        => '',    // The URL to download.
-			'method'     => 'get', // Http method, get/post/etc..
-			'postdata'   => '',    // Data to send on post method.
-			'enctype'	 => '',    // Encoding type
-			'language'   => '',    // Language in header string.
-			'debug'      => false, // Show curl debug information.
-			'useragent'  => '',    // User agent string.
-			'cookie'     => '',    // Cookie string.
-			'verifycert' => true,  /* Verify certificate authenticity?
-									  Since curl does not have a verify self signed certs option,
-									  you should use this instead if your cert is self signed. */
-		];
-
-		$options += $defaults;
-
-		if (!$options['url']) {
-			return false;
-		}
-
-		switch ($options['language']) {
-			case 'fr':
-			case 'fr-fr':
-				$language = "fr-fr";
-				break;
-			case 'de':
-			case 'de-de':
-				$language = "de-de";
-				break;
-			case 'en-us':
-				$language = "en-us";
-				break;
-			case 'en-gb':
-				$language = "en-gb";
-				break;
-			case '':
-			case 'en':
-			default:
-				$language = 'en';
-		}
-		$header = array();
-		$header[] = "Accept-Language: " . $language;
-
-		$ch = curl_init();
-
-		$context = [
-			CURLOPT_URL            => $options['url'],
-			CURLOPT_HTTPHEADER     => $header,
-			CURLOPT_RETURNTRANSFER => 1,
-			CURLOPT_FOLLOWLOCATION => 1,
-			CURLOPT_TIMEOUT        => 15
-		];
-		$context += self::curlSslContextOptions($options['verifycert']);
-		if ($options['useragent'] !== '') {
-			$context += [CURLOPT_USERAGENT => $options['useragent']];
-		}
-		if ($options['cookie'] !== '') {
-			$context += [CURLOPT_COOKIE => $options['cookie']];
-		}
-		if ($options['method'] === 'post') {
-			$context += [
-				CURLOPT_POST       => 1,
-				CURLOPT_POSTFIELDS => $options['postdata']
-			];
-		}
-		if ($options['enctype'] !== '') {
-			$context += [CURLOPT_ENCODING  => $options['enctype']];
-		}
-		if ($options['debug']) {
-			$context += [
-				CURLOPT_HEADER      => true,
-				CURLINFO_HEADER_OUT => true,
-				CURLOPT_NOPROGRESS  => false,
-				CURLOPT_VERBOSE     => true
-			];
-		}
-		curl_setopt_array($ch, $context);
-
-		$buffer = curl_exec($ch);
-		$err    = curl_errno($ch);
-		curl_close($ch);
-
-		if ($err !== 0) {
-			return false;
-		} else {
-			return $buffer;
-		}
-	}
-
-
-	/**
-	 * Get human readable size string from bytes.
-	 *
-	 * @param int $bytes     Bytes number to convert.
-	 * @param int $precision How many floating point units to add.
-	 *
-	 * @return string
-	 */
-	static public function bytesToSizeString($bytes, $precision = 0)
-	{
-		if ($bytes == 0) {
-			return '0B';
-		}
-		$unit = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'];
-
-		return round($bytes / pow(1024, ($i = floor(log($bytes, 1024)))), $precision) . $unit[(int)$i];
-	}
-
-	public static function getCoverURL(array $options = [])
-	{
-		$defaults = [
-			'id' => null,
-			'suffix' => '-cover.jpg',
-			'type' => '',
-		];
-		$options += $defaults;
-		$fileSpecTemplate = '%s/%s%s';
-		$fileSpec = '';
-
-		if (!empty($options['id']) && in_array($options['type'],
-				['anime', 'audio', 'audiosample', 'book', 'console',  'games', 'movies', 'music', 'preview', 'sample', 'tvrage', 'video', 'xxx'])) {
-			$fileSpec = sprintf($fileSpecTemplate, $options['type'], $options['id'], $options['suffix']);
-			$fileSpec = file_exists(NN_COVERS . $fileSpec) ? $fileSpec :
-				sprintf($fileSpecTemplate, $options['type'], 'no', $options['suffix']);
-		}
-
-		return $fileSpec;
-	}
-
-	// Central function for sending site email.
-	static public function sendEmail($to, $subject, $contents, $from)
-	{
-		$mail = new \PHPMailer;
-
-		//Setup the body first since we need it regardless of sending method.
-		$eol = PHP_EOL;
-
-		$body = '<html>' . $eol;
-		$body .= '<body style=\'font-family:Verdana, Verdana, Geneva, sans-serif; font-size:12px; color:#666666;\'>' . $eol;
-		$body .= $contents;
-		$body .= '</body>' . $eol;
-		$body .= '</html>' . $eol;
-
-		// If the mailer couldn't instantiate there's a good chance the user has an incomplete update & we should fallback to php mail()
-		// @todo Log this failure.
-		if (!defined('PHPMAILER_ENABLED') || PHPMAILER_ENABLED !== true || !($mail instanceof PHPMailer)) {
-			$headers = 'From: ' . $from . $eol;
-			$headers .= 'Reply-To: ' . $from . $eol;
-			$headers .= 'Return-Path: ' . $from . $eol;
-			$headers .= 'X-Mailer: newznab' . $eol;
-			$headers .= 'MIME-Version: 1.0' . $eol;
-			$headers .= 'Content-type: text/html; charset=iso-8859-1' . $eol;
-			$headers .= $eol;
-
-			return mail($to, $subject, $body, $headers);
-		}
-
-		// Check to make sure the user has their settings correct.
-		if (PHPMAILER_USE_SMTP == true) {
-			if ((!defined('PHPMAILER_SMTP_HOST') || PHPMAILER_SMTP_HOST === '') ||
-				(!defined('PHPMAILER_SMTP_PORT') || PHPMAILER_SMTP_PORT === '')
-			) {
-				throw new \phpmailerException(
-					'You opted to use SMTP but the PHPMAILER_SMTP_HOST and/or PHPMAILER_SMTP_PORT is/are not defined correctly! Either fix the missing/incorrect values or change PHPMAILER_USE_SMTP to false in the www/settings.php'
-				);
-			}
-
-			// If the user enabled SMTP & Auth but did not setup credentials, throw an exception.
-			if (defined('PHPMAILER_SMTP_AUTH') && PHPMAILER_SMTP_AUTH == true)
-			{
-				if ((!defined('PHPMAILER_SMTP_USER') || PHPMAILER_SMTP_USER === '') ||
-					(!defined('PHPMAILER_SMTP_PASSWORD') || PHPMAILER_SMTP_PASSWORD === '')
-				) {
-					throw new \phpmailerException(
-						'You opted to use SMTP and SMTP Auth but the PHPMAILER_SMTP_USER and/or PHPMAILER_SMTP_PASSWORD is/are not defined correctly. Please set them in www/settings.php'
-					);
-				}
-			}
-		}
-
-		//Finally we can send the mail.
-		$mail->isHTML(true);
-
-		if (PHPMAILER_USE_SMTP) {
-			$mail->isSMTP();
-
-			$mail->Host = PHPMAILER_SMTP_HOST;
-			$mail->Port = PHPMAILER_SMTP_PORT;
-
-			$mail->SMTPSecure = PHPMAILER_SMTP_SECURE;
-
-			if (PHPMAILER_SMTP_AUTH) {
-				$mail->SMTPAuth = true;
-				$mail->Username = PHPMAILER_SMTP_USER;
-				$mail->Password = PHPMAILER_SMTP_PASSWORD;
-			}
-		}
-		$s = new Sites();
-		$settings = $s->get();
-
-		$site_email = $settings->email;
-
-		$fromEmail = (PHPMAILER_FROM_EMAIL === '') ? $site_email : PHPMAILER_FROM_EMAIL;
-		$fromName  = (PHPMAILER_FROM_NAME === '') ? $settings->title : PHPMAILER_FROM_NAME;
-		$replyTo   = (PHPMAILER_REPLYTO === '') ? $site_email : PHPMAILER_REPLYTO;
-
-		(PHPMAILER_BCC !== '') ?	$mail->addBCC(PHPMAILER_BCC) : null;
-
-		$mail->setFrom($fromEmail, $fromName);
-		$mail->addAddress($to);
-		$mail->addReplyTo($replyTo);
-		$mail->Subject = $subject;
-		$mail->Body = $body;
-		$mail->AltBody = $mail->html2text($body, true);
-
-		$sent = $mail->send();
-
-		if (!$sent) {
-			//@todo Log failed email send attempt.
-			throw new \phpmailerException('Unable to send mail. Error: ' . $mail->ErrorInfo);
-		}
-
-		return $sent;
-	}
-
-	/**
-	 * Return file type/info using magic numbers.
-	 * Try using `file` program where available, fallback to using PHP's finfo class.
-	 *
-	 * @param string $path Path to the file / folder to check.
-	 *
-	 * @return string File info. Empty string on failure.
-	 */
-	static public function fileInfo($path)
-	{
-		$output = '';
-		$magicPath = (new Sites())->get()->magic_file_path;
-		if (self::hasCommand('file') && (!self::isWin() || !empty($magicPath))) {
-			$magicSwitch = empty($magicPath) ? '' : " -m $magicPath";
-			$output = runCmd('file' . $magicSwitch . ' -b "' . $path . '"');
-
-			if (is_array($output)) {
-				switch (count($output)) {
-					case 0:
-						$output = '';
-						break;
-					case 1:
-						$output = $output[0];
-						break;
-					default:
-						$output = implode(' ', $output);
-						break;
-				}
-			} else {
-				$output = '';
-			}
-		} else {
-			$fileInfo = empty($magicPath) ? new finfo(FILEINFO_RAW) : new finfo(FILEINFO_RAW, $magicPath);
-
-			$output = $fileInfo->file($path);
-			if (empty($output)) {
-				$output = '';
-			}
-			$fileInfo->close();
-		}
-
-		return $output;
-	}
-
-}
-
-function checkStatus ($code)
-{
-	return ($code == 0) ? true : false;
-}
-
-/**
- * Convert Code page 437 chars to UTF.
- *
- * @param string $str
- *
- * @return string
- */
-function cp437toUTF ($str)
-{
-	$out = '';
-	for ($i = 0; $i < strlen($str); $i++) {
-		$ch = ord($str{$i});
-		switch ($ch) {
-			case 128:
-				$out .= 'Ç';
-				break;
-			case 129:
-				$out .= 'ü';
-				break;
-			case 130:
-				$out .= 'é';
-				break;
-			case 131:
-				$out .= 'â';
-				break;
-			case 132:
-				$out .= 'ä';
-				break;
-			case 133:
-				$out .= 'à';
-				break;
-			case 134:
-				$out .= 'Ã¥';
-				break;
-			case 135:
-				$out .= 'ç';
-				break;
-			case 136:
-				$out .= 'ê';
-				break;
-			case 137:
-				$out .= 'ë';
-				break;
-			case 138:
-				$out .= 'è';
-				break;
-			case 139:
-				$out .= 'ï';
-				break;
-			case 140:
-				$out .= 'î';
-				break;
-			case 141:
-				$out .= 'ì';
-				break;
-			case 142:
-				$out .= 'Ä';
-				break;
-			case 143:
-				$out .= 'Ã…';
-				break;
-			case 144:
-				$out .= 'É';
-				break;
-			case 145:
-				$out .= 'æ';
-				break;
-			case 146:
-				$out .= 'Æ';
-				break;
-			case 147:
-				$out .= 'ô';
-				break;
-			case 148:
-				$out .= 'ö';
-				break;
-			case 149:
-				$out .= 'ò';
-				break;
-			case 150:
-				$out .= 'û';
-				break;
-			case 151:
-				$out .= 'ù';
-				break;
-			case 152:
-				$out .= 'ÿ';
-				break;
-			case 153:
-				$out .= 'Ö';
-				break;
-			case 154:
-				$out .= 'Ü';
-				break;
-			case 155:
-				$out .= '¢';
-				break;
-			case 156:
-				$out .= '£';
-				break;
-			case 157:
-				$out .= 'Â¥';
-				break;
-			case 158:
-				$out .= '₧';
-				break;
-			case 159:
-				$out .= 'Æ’';
-				break;
-			case 160:
-				$out .= 'á';
-				break;
-			case 161:
-				$out .= 'í';
-				break;
-			case 162:
-				$out .= 'ó';
-				break;
-			case 163:
-				$out .= 'ú';
-				break;
-			case 164:
-				$out .= 'ñ';
-				break;
-			case 165:
-				$out .= 'Ñ';
-				break;
-			case 166:
-				$out .= 'ª';
-				break;
-			case 167:
-				$out .= 'º';
-				break;
-			case 168:
-				$out .= '¿';
-				break;
-			case 169:
-				$out .= '�';
-				break;
-			case 170:
-				$out .= '¬';
-				break;
-			case 171:
-				$out .= '½';
-				break;
-			case 172:
-				$out .= '¼';
-				break;
-			case 173:
-				$out .= '¡';
-				break;
-			case 174:
-				$out .= '«';
-				break;
-			case 175:
-				$out .= '»';
-				break;
-			case 176:
-				$out .= 'â–‘';
-				break;
-			case 177:
-				$out .= 'â–’';
-				break;
-			case 178:
-				$out .= 'â–“';
-				break;
-			case 179:
-				$out .= '│';
-				break;
-			case 180:
-				$out .= '┤';
-				break;
-			case 181:
-				$out .= 'â•¡';
-				break;
-			case 182:
-				$out .= 'â•¢';
-				break;
-			case 183:
-				$out .= 'â•–';
-				break;
-			case 184:
-				$out .= 'â••';
-				break;
-			case 185:
-				$out .= 'â•£';
-				break;
-			case 186:
-				$out .= 'â•‘';
-				break;
-			case 187:
-				$out .= 'â•—';
-				break;
-			case 188:
-				$out .= '�';
-				break;
-			case 189:
-				$out .= '╜';
-				break;
-			case 190:
-				$out .= 'â•›';
-				break;
-			case 191:
-				$out .= '�';
-				break;
-			case 192:
-				$out .= 'â””';
-				break;
-			case 193:
-				$out .= 'â”´';
-				break;
-			case 194:
-				$out .= '┬';
-				break;
-			case 195:
-				$out .= '├';
-				break;
-			case 196:
-				$out .= '─';
-				break;
-			case 197:
-				$out .= '┼';
-				break;
-			case 198:
-				$out .= 'â•ž';
-				break;
-			case 199:
-				$out .= 'â•Ÿ';
-				break;
-			case 200:
-				$out .= 'â•š';
-				break;
-			case 201:
-				$out .= 'â•”';
-				break;
-			case 202:
-				$out .= 'â•©';
-				break;
-			case 203:
-				$out .= '╦';
-				break;
-			case 204:
-				$out .= 'â• ';
-				break;
-			case 205:
-				$out .= '�';
-				break;
-			case 206:
-				$out .= '╬';
-				break;
-			case 207:
-				$out .= '╧';
-				break;
-			case 208:
-				$out .= '╨';
-				break;
-			case 209:
-				$out .= '╤';
-				break;
-			case 210:
-				$out .= 'â•¥';
-				break;
-			case 211:
-				$out .= 'â•™';
-				break;
-			case 212:
-				$out .= '╘';
-				break;
-			case 213:
-				$out .= 'â•’';
-				break;
-			case 214:
-				$out .= 'â•“';
-				break;
-			case 215:
-				$out .= 'â•«';
-				break;
-			case 216:
-				$out .= '╪';
-				break;
-			case 217:
-				$out .= '┘';
-				break;
-			case 218:
-				$out .= '┌';
-				break;
-			case 219:
-				$out .= 'â–ˆ';
-				break;
-			case 220:
-				$out .= 'â–„';
-				break;
-			case 221:
-				$out .= '▌';
-				break;
-			case 222:
-				$out .= 'â–�';
-				break;
-			case 223:
-				$out .= 'â–€';
-				break;
-			case 224:
-				$out .= 'α';
-				break;
-			case 225:
-				$out .= 'ß';
-				break;
-			case 226:
-				$out .= 'Γ';
-				break;
-			case 227:
-				$out .= 'Ï€';
-				break;
-			case 228:
-				$out .= 'Σ';
-				break;
-			case 229:
-				$out .= 'σ';
-				break;
-			case 230:
-				$out .= 'µ';
-				break;
-			case 231:
-				$out .= 'Ï„';
-				break;
-			case 232:
-				$out .= 'Φ';
-				break;
-			case 233:
-				$out .= 'Θ';
-				break;
-			case 234:
-				$out .= 'Ω';
-				break;
-			case 235:
-				$out .= 'δ';
-				break;
-			case 236:
-				$out .= '∞';
-				break;
-			case 237:
-				$out .= 'φ';
-				break;
-			case 238:
-				$out .= 'ε';
-				break;
-			case 239:
-				$out .= '∩';
-				break;
-			case 240:
-				$out .= '≡';
-				break;
-			case 241:
-				$out .= '±';
-				break;
-			case 242:
-				$out .= '≥';
-				break;
-			case 243:
-				$out .= '≤';
-				break;
-			case 244:
-				$out .= '⌠';
-				break;
-			case 245:
-				$out .= '⌡';
-				break;
-			case 246:
-				$out .= '÷';
-				break;
-			case 247:
-				$out .= '≈';
-				break;
-			case 248:
-				$out .= '°';
-				break;
-			case 249:
-				$out .= '∙';
-				break;
-			case 250:
-				$out .= '·';
-				break;
-			case 251:
-				$out .= '√';
-				break;
-			case 252:
-				$out .= '�';
-				break;
-			case 253:
-				$out .= '²';
-				break;
-			case 254:
-				$out .= 'â– ';
-				break;
-			case 255:
-				$out .= ' ';
-				break;
-			default :
-				$out .= chr($ch);
-		}
-	}
-	return $out;
-}
-
-/**
- * Fetches an embeddable video to a IMDB trailer from http://www.traileraddict.com
- *
- * @param $imdbID
- *
- * @return string
- */
-function imdb_trailers($imdbID)
-{
-	$xml = Utility::getUrl(['http://api.traileraddict.com/?imdb=' . $imdbID]);
-	if ($xml !== false) {
-		if (preg_match('/(<iframe.+?<\/iframe>)/i', $xml, $html)) {
-			return $html[1];
-		}
-	}
-	return '';
-}
-
-// Check if O/S is windows.
-function isWindows ()
-{
-	return Utility::isWin();
-}
-
-// Convert obj to array.
-function objectsIntoArray ($arrObjData, $arrSkipIndices = [])
-{
-	$arrData = [];
-
-	// If input is object, convert into array.
-	if (is_object($arrObjData)) {
-		$arrObjData = get_object_vars($arrObjData);
-	}
-
-	if (is_array($arrObjData)) {
-		foreach ($arrObjData as $index => $value) {
-			// Recursive call.
-			if (is_object($value) || is_array($value)) {
-				$value = objectsIntoArray($value, $arrSkipIndices);
-			}
-			if (in_array($index, $arrSkipIndices)) {
-				continue;
-			}
-			$arrData[$index] = $value;
-		}
-	}
-	return $arrData;
-}
-
-/**
- * Run CLI command.
- *
- * @param string $command
- * @param bool   $debug
- *
- * @return array
- */
-function runCmd ($command, $debug = false)
-{
-	$nl = PHP_EOL;
-	if (isWindows() && strpos(phpversion(), "5.2") !== false) {
-		$command = "\"" . $command . "\"";
-	}
-
-	if ($debug) {
-		echo '-Running Command: ' . $nl . '   ' . $command . $nl;
-	}
-
-	$output = [];
-	$status = 1;
-	@exec($command, $output, $status);
-
-	if ($debug) {
-		echo '-Command Output: ' . $nl . '   ' . implode($nl . '  ', $output) . $nl;
-	}
-
-	return $output;
-}
-
-/**
- * Remove unsafe chars from a filename.
- *
- * @param string $filename
- *
- * @return string
- */
-function safeFilename ($filename)
-{
-	return trim(preg_replace('/[^\w\s.-]*/i', '', $filename));
-}
-
-function generateUuid()
-{
-	$key = sprintf
-	(
-		'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-		// 32 bits for "time_low"
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-		// 16 bits for "time_mid"
-		mt_rand( 0, 0xffff ),
-		// 16 bits for "time_hi_and_version",
-		// four most significant bits holds version number 4
-		mt_rand( 0, 0x0fff ) | 0x4000,
-		// 16 bits, 8 bits for "clk_seq_hi_res",
-		// 8 bits for "clk_seq_low",
-		// two most significant bits holds zero and one for variant DCE1.1
-		mt_rand( 0, 0x3fff ) | 0x8000,
-		// 48 bits for "node"
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-	);
-
-	return $key;
-}
-
-function startsWith($haystack, $needle)
-{
-	$length = strlen($needle);
-	return (substr($haystack, 0, $length) === $needle);
-}
-
-function endsWith($haystack, $needle)
-{
-	$length = strlen($needle);
-	$start  = $length * -1;
-	return (substr($haystack, $start) === $needle);
-}
-
-function responseXmlToObject($input)
-{
-	$input = str_replace('<newznab:', '<', $input);
-	$xml = @simplexml_load_string($input);
-	return $xml;
-}
-
diff --git a/lib/copy_this/www/lib/zipfile.php b/lib/copy_this/www/lib/zipfile.php
deleted file mode 100644
index 769e47435..000000000
--- a/lib/copy_this/www/lib/zipfile.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @version $Id$
- * @package phpMyAdmin
- */
-
-/**
- * Zip file creation class.
- * Makes zip files.
- *
- * Based on :
- *
- *  http://www.zend.com/codex.php?id=535&single=1
- *  By Eric Mueller <eric@themepark.com>
- *
- *  http://www.zend.com/codex.php?id=470&single=1
- *  by Denis125 <webmaster@atlant.ru>
- *
- *  a patch from Peter Listiak <mlady@users.sourceforge.net> for last modified
- *  date and time of the compressed file
- *
- * Official ZIP file format: http://www.pkware.com/appnote.txt
- *
- * @access  public
- * @package phpMyAdmin
- */
-class zipfile
-{
-    /**
-     * Array to store compressed data
-     *
-     * @var  array    $datasec
-     */
-    var $datasec      = array();
-
-    /**
-     * Central directory
-     *
-     * @var  array    $ctrl_dir
-     */
-    var $ctrl_dir     = array();
-
-    /**
-     * End of central directory record
-     *
-     * @var  string   $eof_ctrl_dir
-     */
-    var $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00";
-
-    /**
-     * Last offset position
-     *
-     * @var  integer  $old_offset
-     */
-    var $old_offset   = 0;
-
-
-    /**
-     * Converts an Unix timestamp to a four byte DOS date and time format (date
-     * in high two bytes, time in low two bytes allowing magnitude comparison).
-     *
-     * @param  integer  the current Unix timestamp
-     *
-     * @return integer  the current date in a four byte DOS format
-     *
-     * @access private
-     */
-    function unix2DosTime($unixtime = 0) {
-        $timearray = ($unixtime == 0) ? getdate() : getdate($unixtime);
-
-        if ($timearray['year'] < 1980) {
-            $timearray['year']    = 1980;
-            $timearray['mon']     = 1;
-            $timearray['mday']    = 1;
-            $timearray['hours']   = 0;
-            $timearray['minutes'] = 0;
-            $timearray['seconds'] = 0;
-        } // end if
-
-        return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) |
-                ($timearray['hours'] << 11) | ($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1);
-    } // end of the 'unix2DosTime()' method
-
-
-    /**
-     * Adds "file" to archive
-     *
-     * @param  string   file contents
-     * @param  string   name of the file in the archive (may contains the path)
-     * @param  integer  the current timestamp
-     *
-     * @access public
-     */
-    function addFile($data, $name, $time = 0)
-    {
-        $name     = str_replace('\\', '/', $name);
-
-        $dtime    = dechex($this->unix2DosTime($time));
-        $hexdtime = '\x' . $dtime[6] . $dtime[7]
-                  . '\x' . $dtime[4] . $dtime[5]
-                  . '\x' . $dtime[2] . $dtime[3]
-                  . '\x' . $dtime[0] . $dtime[1];
-        eval('$hexdtime = "' . $hexdtime . '";');
-
-        $fr   = "\x50\x4b\x03\x04";
-        $fr   .= "\x14\x00";            // ver needed to extract
-        $fr   .= "\x00\x00";            // gen purpose bit flag
-        $fr   .= "\x08\x00";            // compression method
-        $fr   .= $hexdtime;             // last mod time and date
-
-        // "local file header" segment
-        $unc_len = strlen($data);
-        $crc     = crc32($data);
-        $zdata   = gzcompress($data);
-        $zdata   = substr(substr($zdata, 0, strlen($zdata) - 4), 2); // fix crc bug
-        $c_len   = strlen($zdata);
-        $fr      .= pack('V', $crc);             // crc32
-        $fr      .= pack('V', $c_len);           // compressed filesize
-        $fr      .= pack('V', $unc_len);         // uncompressed filesize
-        $fr      .= pack('v', strlen($name));    // length of filename
-        $fr      .= pack('v', 0);                // extra field length
-        $fr      .= $name;
-
-        // "file data" segment
-        $fr .= $zdata;
-
-        // "data descriptor" segment (optional but necessary if archive is not
-        // served as file)
-        // nijel(2004-10-19): this seems not to be needed at all and causes
-        // problems in some cases (bug #1037737)
-        //$fr .= pack('V', $crc);                 // crc32
-        //$fr .= pack('V', $c_len);               // compressed filesize
-        //$fr .= pack('V', $unc_len);             // uncompressed filesize
-
-        // add this entry to array
-        $this -> datasec[] = $fr;
-
-        // now add to central directory record
-        $cdrec = "\x50\x4b\x01\x02";
-        $cdrec .= "\x00\x00";                // version made by
-        $cdrec .= "\x14\x00";                // version needed to extract
-        $cdrec .= "\x00\x00";                // gen purpose bit flag
-        $cdrec .= "\x08\x00";                // compression method
-        $cdrec .= $hexdtime;                 // last mod time & date
-        $cdrec .= pack('V', $crc);           // crc32
-        $cdrec .= pack('V', $c_len);         // compressed filesize
-        $cdrec .= pack('V', $unc_len);       // uncompressed filesize
-        $cdrec .= pack('v', strlen($name)); // length of filename
-        $cdrec .= pack('v', 0);             // extra field length
-        $cdrec .= pack('v', 0);             // file comment length
-        $cdrec .= pack('v', 0);             // disk number start
-        $cdrec .= pack('v', 0);             // internal file attributes
-        $cdrec .= pack('V', 32);            // external file attributes - 'archive' bit set
-
-        $cdrec .= pack('V', $this -> old_offset); // relative offset of local header
-        $this -> old_offset += strlen($fr);
-
-        $cdrec .= $name;
-
-        // optional extra field, file comment goes here
-        // save to central directory
-        $this -> ctrl_dir[] = $cdrec;
-    } // end of the 'addFile()' method
-
-
-    /**
-     * Dumps out file
-     *
-     * @return  string  the zipped file
-     *
-     * @access public
-     */
-    function file()
-    {
-        $data    = implode('', $this -> datasec);
-        $ctrldir = implode('', $this -> ctrl_dir);
-
-        return
-            $data .
-            $ctrldir .
-            $this -> eof_ctrl_dir .
-            pack('v', sizeof($this -> ctrl_dir)) .  // total # of entries "on this disk"
-            pack('v', sizeof($this -> ctrl_dir)) .  // total # of entries overall
-            pack('V', strlen($ctrldir)) .           // size of central dir
-            pack('V', strlen($data)) .              // offset to start of central dir
-            "\x00\x00";                             // .zip file comment length
-    } // end of the 'file()' method
-
-}
diff --git a/lib/copy_this/www/pages/ajax_mediainfo.php b/lib/copy_this/www/pages/ajax_mediainfo.php
deleted file mode 100644
index 2fb05a2d8..000000000
--- a/lib/copy_this/www/pages/ajax_mediainfo.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releaseextra.php");
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-if (!isset($_REQUEST['id'])) {
-	$page->show404();
-}
-
-$re = new ReleaseExtra();
-$redata = $re->getBriefByGuid($_REQUEST['id']);
-
-if (!$redata) {
-	print 'No media info';
-} else {
-	print "<table>\n";
-	if ($redata["videocodec"] != "" && $redata["containerformat"] != "") {
-		$redata["videocodec"] = $re->makeCodecPretty($redata["videocodec"]);
-		print "<tr><th>Format:</th><td>" . htmlentities($redata["videocodec"], ENT_QUOTES) . " - " . htmlentities($redata["containerformat"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	if ($redata["videoduration"] != "") {
-		print "<tr><th>Duration:</th><td>" . htmlentities($redata["videoduration"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	if ($redata["size"] != "") {
-		print "<tr><th>Resolution:</th><td>" . htmlentities($redata["size"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	if ($redata["videoaspect"] != "") {
-		print "<tr><th>Aspect Ratio:</th><td>" . htmlentities($redata["videoaspect"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	if ($redata["audio"] != "" && $redata["audio"] != ", ") {
-		print "<tr><th>Audio Languages:</th><td>" . htmlentities($redata["audio"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	if ($redata["audioformat"] != "" && $redata["audioformat"] != ", ") {
-		print "<tr><th>Audio Format:</th><td>" . htmlentities($redata["audioformat"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	if ($redata["subs"] != "") {
-		print "<tr><th>Subtitles:</th><td>" . htmlentities($redata["subs"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	print "</table>";
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/ajax_prehashinfo.php b/lib/copy_this/www/pages/ajax_prehashinfo.php
deleted file mode 100644
index 8e243054e..000000000
--- a/lib/copy_this/www/pages/ajax_prehashinfo.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-require_once(NN_TMUX . 'lib/prehash.php');
-require_once(NN_TMUX . 'lib/IRCScraper.php');
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-if (!isset($_REQUEST["id"])) {
-	$page->show404();
-}
-
-$pre = new PreHash();
-$predata = $pre->getOne($_REQUEST["id"]);
-
-if (!$predata) {
-	print "No pre info";
-} else {
-	print "<table>\n";
-	if (isset($predata['nuked'])) {
-		$nuked = '';
-		switch($predata['nuked']) {
-			case PreHash::PRE_NUKED:
-				$nuked = 'NUKED';
-				break;
-			case PreHash::PRE_MODNUKE:
-				$nuked = 'MODNUKED';
-				break;
-			case PreHash::PRE_OLDNUKE:
-				$nuked = 'OLDNUKE';
-				break;
-			case PreHash::PRE_RENUKED:
-				$nuked = 'RENUKE';
-				break;
-			case PreHash::PRE_UNNUKED:
-				$nuked = 'UNNUKED';
-				break;
-		}
-		if ($nuked !== '') {
-			print "<tr><th>" . $nuked . ":</th><td>" . htmlentities((isset($predata['nukereason']) ? $predata['nukereason'] : ''), ENT_QUOTES) . "</td></tr>\n";
-		}
-	}
-	print "<tr><th>Title:</th><td>" . htmlentities($predata["title"], ENT_QUOTES) . "</td></tr>\n";
-	if (isset($predata["category"]) && $predata["category"] != "") {
-		print "<tr><th>Cat:</th><td>" . htmlentities($predata["category"], ENT_QUOTES) . "</td></tr>\n";
-	}
-	print "<tr><th>Source:</th><td>" . htmlentities($predata["source"], ENT_QUOTES) . "</td></tr>\n";
-	if (isset($predata["size"])) {
-		if (preg_match('/\d+/', $predata["size"], $size)) {
-			;
-		}
-		if (isset($size[0]) && $size[0] > 0) {
-			print "<tr><th>Size:</th><td>" . htmlentities($predata["size"], ENT_QUOTES) . "</td></tr>\n";
-		}
-	}
-	if (isset($predata['files'])) {
-		print "<tr><th>Files:</th><td>" . htmlentities((preg_match('/F|B/', $predata['files'], $match) ? $predata["files"] : ($predata["files"] . 'MB')), ENT_QUOTES) . "</td></tr>\n";
-	}
-	print "<tr><th>Pred:</th><td>" . htmlentities($predata["predate"], ENT_QUOTES) . "</td></tr>\n";
-	print "</table>";
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/ajax_preinfo.php b/lib/copy_this/www/pages/ajax_preinfo.php
deleted file mode 100644
index d2076ee9d..000000000
--- a/lib/copy_this/www/pages/ajax_preinfo.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-require_once(WWW_DIR.'/lib/predb.php');
-
-if(!$users->isLoggedIn() || $page->userdata["canpre"] != 1)
-	$page->show403();
-
-if(!isset($_REQUEST['searchname']))
-	$page->show404();
-
-$PreDB = new PreDB(true);
-$preRow = $PreDB->getByDirname($_REQUEST['searchname']);
-
-print "<table class=\"ui-tooltip-tmux\">\n";
-print "<tr><th>Date:</th><td>".htmlentities(date('Y-m-d H:i:s', $preRow['ctime']), ENT_QUOTES)."</td></tr>\n";
-print "<tr><th>Category:</th><td>".htmlentities($preRow['category'], ENT_QUOTES)."</td></tr>\n";
-if(!empty($preRow['filesize']))
-	print "<tr><th>Filesize:</th><td>".htmlentities($preRow['filesize'].'MB', ENT_QUOTES)."</td></tr>\n";
-if(!empty($preRow['filecount']))
-	print "<tr><th>Filecount:</th><td>".htmlentities($preRow['filecount'].'F', ENT_QUOTES)."</td></tr>\n";
-if(!empty($preRow['filename']))
-	print "<tr><th>Filename:</th><td>".htmlentities($preRow['filename'], ENT_QUOTES)."</td></tr>\n";
-if($preRow['nuketype'] && !empty($preRow['nukereason']))
-	print "\n<tr><th>".$preRow['nuketype'].":</th><td>".htmlentities($preRow['nukereason'], ENT_QUOTES)."</td></tr>\n";
-print "</table>";
-
-
diff --git a/lib/copy_this/www/pages/anime.php b/lib/copy_this/www/pages/anime.php
deleted file mode 100644
index 0b75f5280..000000000
--- a/lib/copy_this/www/pages/anime.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-require_once(WWW_DIR.'/lib/releases.php');
-require_once(WWW_DIR.'/lib/anidb.php');
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-$Releases = new Releases(['Settings' => $page->settings]);
-$AniDB = new AniDB(['Settings' => $page->settings]);
-
-if (isset($_GET['id']) && ctype_digit($_GET['id'])) {
-
-	# force the category to 5070 as it should be for anime, as $catarray was NULL and we know the category for sure for anime
-	$releases = $Releases->searchbyAnidbId($_GET['id'], '', 0, 1000, '', array('5070'), -1);
-	$anidb = $AniDB->getAnimeInfo($_GET['id']);
-
-	if (!$releases && !$anidb) {
-		$page->show404();
-	} else if (!$anidb) {
-		$page->smarty->assign('nodata', 'No AniDB information for this series.');
-	} elseif (!$releases) {
-		$page->smarty->assign('nodata', 'No releases for this series.');
-	} else {
-		// Sort releases by season, episode, date posted.
-		$season = $episode = $posted = array();
-
-		foreach ($releases as $rlk => $rlv) {
-			$season[$rlk] = $rlv['season'];
-			$episode[$rlk] = $rlv['episode'];
-			$posted[$rlk] = $rlv['postdate'];
-		}
-
-		array_multisort($episode, SORT_DESC, $posted, SORT_DESC, $releases);
-
-		$seasons = array();
-		foreach ($releases as $r) {
-			$seasons[$r['season']][$r['episode']][] = $r;
-		}
-
-		$page->smarty->assign('seasons', $seasons);
-		$page->smarty->assign('anidb', $anidb);
-
-		$animeEpisodeTitles = array();
-		foreach ($releases as $r) {
-			$animeEpisodeTitles[$r['tvtitle']][] = $r;
-		}
-
-		$page->smarty->assign('animeEpisodeTitlesSize', count($animeEpisodeTitles));
-		$page->smarty->assign('animeEpisodeTitles', $animeEpisodeTitles);
-		$page->smarty->assign('animeAnidbID', $anidb['anidbid']);
-		# case is off on old variable this resolves that, I do not think the other is ever used, but left if anyways
-		$page->smarty->assign('animeAnidbid', $anidb['anidbid']);
-		$page->smarty->assign('animeTitle', $anidb['title']);
-		$page->smarty->assign('animeType', $anidb['type']);
-		$page->smarty->assign('animePicture', $anidb['picture']);
-		$page->smarty->assign('animeStartDate', $anidb['startdate']);
-		$page->smarty->assign('animeEndDate', $anidb['enddate']);
-		$page->smarty->assign('animeDescription', $anidb['description']);
-		$page->smarty->assign('animeRating', $anidb['rating']);
-		$page->smarty->assign('animeRelated', $anidb['related']);
-		$page->smarty->assign('animeSimilar', $anidb['similar']);
-		$page->smarty->assign('animeCategories', $anidb['categories']);
-
-		$page->title = $anidb['title'];
-		$page->meta_title = 'View Anime ' . $anidb['title'];
-		$page->meta_keywords = 'view,anime,anidb,description,details';
-		$page->meta_description = 'View ' . $anidb['title'] . ' Anime';
-	}
-	$page->content = $page->smarty->fetch('viewanime.tpl');
-	$page->render();
-} else {
-	$letter = (isset($_GET['id']) && preg_match('/^(0\-9|[A-Z])$/i', $_GET['id'])) ? $_GET['id'] : '0-9';
-
-	$animetitle = (isset($_GET['title']) && !empty($_GET['title'])) ? $_GET['title'] : '';
-
-	if ($animetitle != '' && !isset($_GET['id'])) {
-		$letter = '';
-	}
-
-	$masterserieslist = $AniDB->getAnimeList($letter, $animetitle);
-
-	$page->title = 'Anime List';
-	$page->meta_title = 'View Anime List';
-	$page->meta_keywords = 'view,anime,series,description,details';
-	$page->meta_description = 'View Anime List';
-
-	$animelist = array();
-	if ($masterserieslist instanceof \Traversable) {
-		foreach ($masterserieslist as $s) {
-			if (preg_match('/^[0-9]/', $s['title'])) {
-				$thisrange = '0-9';
-			} else {
-				preg_match('/([A-Z]).*/i', $s['title'], $matches);
-				$thisrange = strtoupper($matches[1]);
-			}
-			$animelist[$thisrange][] = $s;
-		}
-		ksort($animelist);
-	}
-
-	$page->smarty->assign('animelist', $animelist);
-	$page->smarty->assign('animerange', range('A', 'Z'));
-	$page->smarty->assign('animeletter', $letter);
-	$page->smarty->assign('animetitle', $animetitle);
-
-	$page->content = $page->smarty->fetch('viewanimelist.tpl');
-	$page->render();
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/api.php b/lib/copy_this/www/pages/api.php
deleted file mode 100644
index 5f2161fde..000000000
--- a/lib/copy_this/www/pages/api.php
+++ /dev/null
@@ -1,677 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/releasecomments.php");
-
-$rc = new ReleaseComments;
-
-
-// API functions.
-$function = 's';
-if (isset($_GET['t'])) {
-	switch ($_GET['t']) {
-		case 'd':
-		case 'details':
-			$function = 'd';
-			break;
-		case 'g':
-		case 'get':
-			$function = 'g';
-			break;
-		case 's':
-		case 'search':
-			$function = 's';
-			break;
-		case 'c':
-		case 'caps':
-			$function = 'c';
-			break;
-		case 'gn':
-		case 'getnfo':
-			$function = 'gn';
-			break;
-		case 'comm':
-		case 'comments':
-			$function = 'co';
-			break;
-		case 'commadd':
-		case 'commentadd':
-			$function = 'ca';
-			break;
-		case 'b':
-		case 'book':
-			$function = 'b';
-			break;
-		case 'mu':
-			case 'music':
-			$function = 'mu';
-			break;
-		case 'tv':
-		case 'tvsearch':
-			$function = 'tv';
-			break;
-		case 'm':
-		case 'movie':
-			$function = 'm';
-			break;
-		case 'u':
-		case 'user':
-			$function = 'u';
-			break;
-		case 'r':
-		case 'register':
-			$function = 'r';
-			break;
-		default:
-			showApiError(202, 'No such function (' . $_GET['t'] . ')');
-	}
-} else {
-	showApiError(200, 'Missing parameter (t)');
-}
-
-$uid = $apiKey = '';
-$hosthash = '';
-$catExclusions = [];
-$maxRequests = 0;
-// Page is accessible only by the apikey, or logged in users.
-if ($users->isLoggedIn()) {
-	$uid = $page->userdata['id'];
-	$apiKey = $page->userdata['rsstoken'];
-	$catExclusions = $page->userdata['categoryexclusions'];
-	$maxRequests = $page->userdata['apirequests'];
-} else {
-	if ($function != 'c' && $function != 'r') {
-		if (!isset($_GET['apikey'])) {
-			showApiError(200, 'Missing parameter (apikey)');
-		}
-		$res = $users->getByRssToken($_GET['apikey']);
-		$apiKey = $_GET['apikey'];
-
-		if (!$res) {
-			showApiError(100, 'Incorrect user credentials (wrong API key)');
-		}
-
-		$uid = $res['id'];
-		$catExclusions = $users->getCategoryExclusion($uid);
-		//
-		// A hash of the users ip to record against the api hit
-		//
-		if ($page->site->storeuserips == 1)
-			$hosthash = $users->getHostHash($_SERVER["REMOTE_ADDR"], $page->site->siteseed);
-		$maxRequests = $res['apirequests'];
-	}
-}
-
-$page->smarty->assign('uid', $uid);
-$page->smarty->assign('rsstoken', $apiKey);
-
-// Record user access to the api, if its been called by a user (i.e. capabilities request do not require a user to be logged in or key provided).
-if ($uid != '') {
-	$users->updateApiAccessed($uid);
-	$apiRequests = $users->getApiRequests($uid);
-	if ($apiRequests['num'] > $maxRequests) {
-		showApiError(500, 'Request limit reached (' . $apiRequests['num'] . '/' . $maxRequests . ')');
-	}
-}
-
-$releases = new Releases(['Settings' => $page->settings]);
-
-if (isset($_GET['extended']) && $_GET['extended'] == 1) {
-	$page->smarty->assign('extended', '1');
-}
-if (isset($_GET['del']) && $_GET['del'] == 1) {
-	$page->smarty->assign('del', '1');
-}
-
-// Output is either json or xml.
-$outputXML = true;
-if (isset($_GET['o'])) {
-	if ($_GET['o'] == 'json') {
-		$outputXML = false;
-	}
-}
-
-switch ($function) {
-	// Search releases.
-	case 's':
-		verifyEmptyParameter('q');
-		$maxAge = maxAge();
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-		$categoryID = categoryid();
-		$limit = limit();
-		$offset = offset();
-
-		if (isset($_GET['q'])) {
-			$relData = $releases->search(
-				$_GET['q'], -1, -1, -1, $categoryID, -1, -1, 0, 0, -1, -1, $offset, $limit, '', $maxAge, $catExclusions
-			);
-		} else {
-			$totalRows = $releases->getBrowseCount($categoryID, $maxAge, $catExclusions);
-			$relData = $releases->getBrowseRange($categoryID, $offset, $limit, '', $maxAge, $catExclusions);
-			if ($totalRows > 0 && count($relData) > 0) {
-				$relData[0]['_totalrows'] = $totalRows;
-			}
-		}
-
-		printOutput($relData, $outputXML, $page, $offset);
-		break;
-
-	// Search tv releases.
-	case 'tv':
-		verifyEmptyParameter('q');
-		verifyEmptyParameter('rid');
-		verifyEmptyParameter('season');
-		verifyEmptyParameter('ep');
-		$maxAge = maxAge();
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-		$offset = offset();
-
-		$relData = $releases->searchbyRageId(
-			(isset($_GET['rid']) ? $_GET['rid'] : '-1'),
-			(isset($_GET['season']) ? $_GET['season'] : ''),
-			(isset($_GET['ep']) ? $_GET['ep'] : ''),
-			$offset,
-			limit(),
-			(isset($_GET['q']) ? $_GET['q'] : ''),
-			categoryid(),
-			$maxAge
-		);
-
-		addLanguage($relData, $page->settings);
-		printOutput($relData, $outputXML, $page, $offset);
-		break;
-
-	//
-	// get nfo
-	//
-	case "gn":
-		if (!isset($_GET["id"]))
-			showApiError(200);
-
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-
-		$reldata = $releases->getByGuid($_GET["id"]);
-		if (!$reldata)
-			showApiError(300);
-
-		$nfo = $releases->getReleaseNfo($reldata["id"], true);
-		if (!$nfo)
-			showApiError(300);
-
-		$nforaw = cp437toUTF($nfo["nfo"]);
-		$page->smarty->assign('release',$reldata);
-		$page->smarty->assign('nfo',$nfo);
-		$page->smarty->assign('nfoutf',$nforaw);
-
-		if (isset($_GET["raw"]))
-		{
-			header("Content-type: text/x-nfo");
-			header("Content-Disposition: attachment; filename=".str_replace(" ", "_", $reldata["searchname"]).".nfo");
-			echo $nforaw;
-			die();
-		}
-		else
-		{
-			$page->smarty->assign('rsstitle',"NFO");
-			$page->smarty->assign('rssdesc',"NFO");
-			$page->smarty->assign('rsshead',$page->smarty->fetch('rssheader.tpl'));
-			$content = trim($page->smarty->fetch('apinfo.tpl'));
-
-			printOutput($relData, $outputXML, $page, $offset);
-		}
-		break;
-
-	//
-	// get comments
-	//
-	case "co":
-		if (!isset($_GET["id"]))
-			showApiError(200);
-
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-
-		$data = $rc->getCommentsByGuid($_GET["id"]);
-		if ($data)
-			$reldata = $data;
-		else
-			$reldata = array();
-
-		$page->smarty->assign('comments',$reldata);
-		$page->smarty->assign('rsstitle',"API Comments");
-		$page->smarty->assign('rssdesc',"API Comments");
-		$page->smarty->assign('rsshead',$page->smarty->fetch('rssheader.tpl'));
-		$content = trim($page->smarty->fetch('apicomments.tpl'));
-
-		printOutput($relData, $outputXML, $page, $offset);
-
-		break;
-
-	//
-	// add comment
-	//
-	case "ca":
-		if (!isset($_GET["id"]))
-			showApiError(200);
-
-		if (!isset($_GET["text"]))
-			showApiError(200);
-
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-
-		$reldata = $releases->getByGuid($_GET["id"]);
-		if ($reldata)
-		{
-			$ret = $rc->addComment($reldata["id"], $reldata["gid"], $_GET["text"], $uid, $_SERVER['REMOTE_ADDR']);
-
-			$content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-			$content.= "<commentadd id=\"".$ret."\" />\n";
-
-			printOutput($content, $outputXML, $page);
-		}
-		else
-		{
-			showApiError(300);
-		}
-
-		break;
-
-	//
-	// search book releases
-	//
-	case "b":
-		if (isset($_GET["author"]) && $_GET["author"]=="" && isset($_GET["title"]) && $_GET["title"]=="")
-			showApiError(200);
-
-		$maxage = -1;
-		if (isset($_GET["maxage"]))
-		{
-			if ($_GET["maxage"]=="")
-				showApiError(200);
-			elseif (!is_numeric($_GET["maxage"]))
-				showApiError(201);
-			else
-				$maxage = $_GET["maxage"];
-		}
-
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-
-		$limit = 100;
-		if (isset($_GET["limit"]) && is_numeric($_GET["limit"]) && $_GET["limit"] < 100)
-			$limit = $_GET["limit"];
-
-		$offset = 0;
-		if (isset($_GET["offset"]) && is_numeric($_GET["offset"]))
-			$offset = $_GET["offset"];
-		$reldata = $releases->searchBook((isset($_GET["author"]) ? $_GET["author"] : ""), (isset($_GET["title"]) ? $_GET["title"] : ""), $offset, $limit, $maxage );
-
-		$page->smarty->assign('offset',$offset);
-		$page->smarty->assign('releases',$reldata);
-		$page->smarty->assign('rsshead',$page->smarty->fetch('rssheader.tpl'));
-		$output = trim($page->smarty->fetch('apiresult.tpl'));
-
-		printOutput($relData, $outputXML, $page, $offset);
-		break;
-
-	//
-	// search music releases
-	//
-	case "mu":
-		if (isset($_GET["artist"]) && $_GET["artist"]=="" && isset($_GET["album"]) && $_GET["album"]=="")
-			showApiError(200);
-		$categoryId = array();
-		if (isset($_GET["cat"]))
-			$categoryId = explode(",",$_GET["cat"]);
-		else
-			$categoryId[] = -1;
-
-		$maxage = -1;
-		if (isset($_GET["maxage"]))
-		{
-			if ($_GET["maxage"]=="")
-				showApiError(200);
-			elseif (!is_numeric($_GET["maxage"]))
-				showApiError(201);
-			else
-				$maxage = $_GET["maxage"];
-		}
-
-		$genreId = array();
-		if (isset($_GET["genre"]))
-			$genreId = explode(",",$_GET["genre"]);
-		else
-			$genreId[] = -1;
-
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-
-		$limit = 100;
-		if (isset($_GET["limit"]) && is_numeric($_GET["limit"]) && $_GET["limit"] < 100)
-			$limit = $_GET["limit"];
-
-		$offset = 0;
-		if (isset($_GET["offset"]) && is_numeric($_GET["offset"]))
-			$offset = $_GET["offset"];
-		$reldata = $releases->searchAudio((isset($_GET["artist"]) ? $_GET["artist"] : ""), (isset($_GET["album"]) ? $_GET["album"] : ""), (isset($_GET["label"]) ? $_GET["label"] : ""), (isset($_GET["track"]) ? $_GET["track"] : ""), (isset($_GET["year"]) ? $_GET["year"] : ""), $genreId, $offset, $limit, $categoryId, $maxage );
-
-		$page->smarty->assign('offset',$offset);
-		$page->smarty->assign('releases',$reldata);
-		$page->smarty->assign('rsshead',$page->smarty->fetch('rssheader.tpl'));
-		$output = trim($page->smarty->fetch('apiresult.tpl'));
-
-		printOutput($relData, $outputXML, $page, $offset);
-		break;
-
-	// Search movie releases.
-	case 'm':
-		verifyEmptyParameter('q');
-		verifyEmptyParameter('imdbid');
-		$maxAge = maxAge();
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-		$offset = offset();
-
-		$imdbId = (isset($_GET['imdbid']) ? $_GET['imdbid'] : '-1');
-
-		$relData = $releases->searchbyImdbId(
-			$imdbId,
-			$offset,
-			limit(),
-			(isset($_GET['q']) ? $_GET['q'] : ''),
-			categoryid(),
-			$maxAge
-		);
-
-		addCoverURL($relData,
-			function ($release) {
-				return Utility::getCoverURL(['type' => 'movies', 'id' => $release['imdbid']]);
-			}
-		);
-
-		addLanguage($relData, $page->settings);
-		printOutput($relData, $outputXML, $page, $offset);
-		break;
-
-	// Get NZB.
-	case 'g':
-		if (!isset($_GET['id'])) {
-			showApiError(200, 'Missing parameter (id is required for downloading an NZB)');
-		}
-
-		$relData = $releases->getByGuid($_GET['id']);
-		if ($relData) {
-			header(
-				'Location:' .
-				WWW_TOP .
-				'/getnzb?i=' .
-				$uid .
-				'&r=' .
-				$apiKey .
-				'&id=' .
-				$relData['guid'] .
-				((isset($_GET['del']) && $_GET['del'] == '1') ? '&del=1' : '')
-			);
-		} else {
-			showApiError(300, 'No such item (the guid you provided has no release in our database)');
-		}
-		break;
-
-	// Get individual NZB details.
-	case 'd':
-		if (!isset($_GET['id'])) {
-			showApiError(200, 'Missing parameter (id is required for downloading an NZB)');
-		}
-
-		$users->addApiRequest($uid, $_SERVER['REQUEST_URI'], $hosthash);
-		$data = $releases->getByGuid($_GET['id']);
-
-		$relData = [];
-		if ($data) {
-			$relData[] = $data;
-		}
-
-		printOutput($relData, $outputXML, $page, offset());
-		break;
-
-	// Capabilities request.
-	case 'c':
-		$category = new Category(['Settings' => $page->settings]);
-		$page->smarty->assign('parentcatlist', $category->getForMenu());
-		header('Content-type: text/xml');
-		echo $page->smarty->fetch('apicaps.tpl');
-		break;
-
-	// Register request.
-	case 'r':
-		verifyEmptyParameter('email');
-
-		if (!in_array((int)$page->site->registerstatus, [Sites::REGISTER_STATUS_OPEN, Sites::REGISTER_STATUS_API_ONLY])) {
-			showApiError(104);
-		}
-
-		// Check email is valid format.
-		if (!$users->isValidEmail($_GET['email'])) {
-			showApiError(106);
-		}
-
-		// Check email isn't taken.
-		$ret = $users->getByEmail($_GET['email']);
-		if (isset($ret['id'])) {
-			showApiError(105);
-		}
-
-		// Create username/pass and register.
-		$username = $users->generateUsername($_GET['email']);
-		$password = $users->generatePassword();
-
-		// Register.
-		$userDefault = $users->getDefaultRole();
-		$uid = $users->signup(
-			$username, $password, $_GET['email'], $_SERVER['REMOTE_ADDR'], $userDefault['id'], "", $userDefault['defaultinvites'], "", false, false, false, true
-		);
-
-		// Check if it succeeded.
-		$userData = $users->getById($uid);
-		if (!$userData) {
-			showApiError(107);
-		}
-
-		header('Content-type: text/xml');
-		echo
-			"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" .
-			'<register username="' . $username .
-			'" password="' . $password .
-			'" apikey="' . $userdata['rsstoken'] .
-			"\"/>\n";
-		break;
-}
-
-/**
- * Display error/error code.
- * @param int    $errorCode
- * @param string $errorText
- */
-function showApiError($errorCode = 900, $errorText = '')
-{
-	if ($errorText === '') {
-		switch ($errorCode) {
-			case 100:
-				$errorText = 'Incorrect user credentials';
-				break;
-			case 101:
-				$errorText = 'Account suspended';
-				break;
-			case 102:
-				$errorText = 'Insufficient privileges/not authorized';
-				break;
-			case 103:
-				$errorText = 'Registration denied';
-				break;
-			case 104:
-				$errorText = 'Registrations are closed';
-				break;
-			case 105:
-				$errorText = 'Invalid registration (Email Address Taken)';
-				break;
-			case 106:
-				$errorText = 'Invalid registration (Email Address Bad Format)';
-				break;
-			case 107:
-				$errorText = 'Registration Failed (Data error)';
-				break;
-			case 200:
-				$errorText = 'Missing parameter';
-				break;
-			case 201:
-				$errorText = 'Incorrect parameter';
-				break;
-			case 202:
-				$errorText = 'No such function';
-				break;
-			case 203:
-				$errorText = 'Function not available';
-				break;
-			case 300:
-				$errorText = 'No such item';
-				break;
-			case 500:
-				$errorText = 'Request limit reached';
-				break;
-			case 501:
-				$errorText = 'Download limit reached';
-				break;
-			default:
-				$errorText = 'Unknown error';
-				break;
-		}
-	}
-
-	header('Content-type: text/xml');
-	header('X-newznab: API ERROR [' . $errorCode . '] ' . $errorText);
-	exit("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<error code=\"$errorCode\" description=\"$errorText\"/>\n");
-}
-
-/**
- * Verify maxage parameter.
- * @return int
- */
-function maxAge()
-{
-	$maxAge = -1;
-	if (isset($_GET['maxage'])) {
-		if ($_GET['maxage'] == '') {
-			showApiError(201, 'Incorrect parameter (maxage must not be empty)');
-		} elseif (!is_numeric($_GET['maxage'])) {
-			showApiError(201, 'Incorrect parameter (maxage must be numeric)');
-		} else {
-			$maxAge = (int)$_GET['maxage'];
-		}
-	}
-	return $maxAge;
-}
-
-/**
- * Verify cat parameter.
- * @return array
- */
-function categoryid()
-{
-	$categoryID = array();
-	$categoryID[] = -1;
-	if (isset($_GET['cat'])) {
-		$categoryIDs = $_GET['cat'];
-		// Append Web-DL category id if HD present for SickBeard / NZBDrone compatibility.
-		if (strpos($_GET['cat'], (string)Category::CAT_TV_HD) !== false &&
-			strpos($_GET['cat'], (string)Category::CAT_TV_WEBDL) === false) {
-			$categoryIDs .= (',' . Category::CAT_TV_WEBDL);
-		}
-		$categoryID = explode(',', $categoryIDs);
-	}
-	return $categoryID;
-}
-
-/**
- * Verify limit parameter.
- * @return int
- */
-function limit()
-{
-	$limit = 100;
-	if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] < 100) {
-		$limit = (int)$_GET['limit'];
-	}
-	return $limit;
-}
-
-/**
- * Verify offset parameter.
- * @return int
- */
-function offset()
-{
-	$offset = 0;
-	if (isset($_GET['offset']) && is_numeric($_GET['offset'])) {
-		$offset = (int)$_GET['offset'];
-	}
-	return $offset;
-}
-
-/**
- * Print XML or JSON output.
- * @param array    $data   Data to print.
- * @param bool     $xml    True: Print as XML False: Print as JSON.
- * @param BasePage $page
- * @param int      $offset Offset for limit.
- */
-function printOutput($data, $xml = true, $page, $offset = 0)
-{
-	if ($xml) {
-		$page->smarty->assign('offset', $offset);
-		$page->smarty->assign('releases', $data);
-		$page->smarty->assign('rsshead',$page->smarty->fetch('rssheader.tpl'));
-		header('Content-type: text/xml');
-		echo trim($page->smarty->fetch('apiresult.tpl'));
-	} else {
-		header('Content-type: application/json');
-		echo json_encode($data);
-	}
-}
-
-/**
- * Check if a parameter is empty.
- * @param string $parameter
- */
-function verifyEmptyParameter($parameter)
-{
-	if (isset($_GET[$parameter]) && $_GET[$parameter] == '') {
-		showApiError(201, 'Incorrect parameter (' . $parameter . ' must not be empty)');
-	}
-}
-
-function addCoverURL(&$releases, callable $getCoverURL)
-{
-	if ($releases && count($releases)) {
-		foreach ($releases as $key => $release) {
-			$coverURL = $getCoverURL($release);
-			$releases[$key]['coverurl'] = $coverURL;
-		}
-	}
-}
-
-/**
- * Add language from media info XML to release search names.
- * @param array             $releases
- * @param \DB $settings
- * @return array
- */
-function addLanguage(&$releases, DB $settings)
-{
-	if ($releases && count($releases)) {
-		foreach ($releases as $key => $release) {
-			if (isset($release['id'])) {
-				$language = $settings->queryOneRow(sprintf('SELECT audiolanguage FROM releaseaudio WHERE releaseid = %d', $release['id']));
-				if ($language !== false) {
-					$releases[$key]['searchname'] = $releases[$key]['searchname'] . ' ' . $language['audiolanguage'];
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/books.php b/lib/copy_this/www/pages/books.php
deleted file mode 100644
index c29ccbcfc..000000000
--- a/lib/copy_this/www/pages/books.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/book.php");
-require_once(WWW_DIR."/lib/category.php");
-
-$b = new Book;
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-$category = Category::CAT_BOOK_EBOOK;
-$page->smarty->assign('category', $category);
-
-$browsecount = $b->getBookCount();
-
-$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-$ordering = $b->getBookOrdering();
-$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-$results = $b->getBookRange($offset, ITEMS_PER_COVER_PAGE, $orderby);
-
-$title = (isset($_REQUEST['title']) && !empty($_REQUEST['title'])) ? stripslashes($_REQUEST['title']) : '';
-$page->smarty->assign('title', $title);
-
-$author = (isset($_REQUEST['author']) && !empty($_REQUEST['author'])) ? stripslashes($_REQUEST['author']) : '';
-$page->smarty->assign('author', $author);
-
-$browseby_link = '?title='.$title.'&amp;author='.$author;
-
-$page->smarty->assign('pagertotalitems',$browsecount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_COVER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP."/books".$browseby_link."&amp;ob=".$orderby."&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-foreach($ordering as $ordertype)
-	$page->smarty->assign('orderby'.$ordertype, WWW_TOP."/books".$browseby_link."&amp;ob=".$ordertype."&amp;offset=0");
-
-$page->smarty->assign('results',$results);
-
-$page->meta_title = "Browse Books";
-$page->meta_keywords = "browse,nzb,ebooks,books,e-books";
-$page->meta_description = "Browse for Books";
-
-$page->content = $page->smarty->fetch('books.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/browse.php b/lib/copy_this/www/pages/browse.php
deleted file mode 100644
index 9b711e8a8..000000000
--- a/lib/copy_this/www/pages/browse.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/category.php");
-
-$releases = new Releases(['Settings' => $page->settings]);
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-$category = -1;
-if (isset($_REQUEST["t"]) && ctype_digit($_REQUEST["t"]))
-	$category = $_REQUEST["t"];
-
-$grp = "";
-if (isset($_REQUEST["g"])) {
-	$grp = $_REQUEST["g"];
-}
-
-$catarray = array();
-$catarray[] = $category;
-
-$page->smarty->assign('category', $category);
-$browsecount = $releases->getBrowseCount($catarray, -1, $page->userdata["categoryexclusions"], $grp);
-
-$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-$ordering = $releases->getBrowseOrdering();
-$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-$results = array();
-$results = $releases->getBrowseRange($catarray, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"], $grp);
-
-$page->smarty->assign('pagertotalitems',$browsecount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/browse?t=" . $category . "&amp;g=" . $grp . "&amp;ob=" . $orderby . "&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$covgroup = '';
-if ($category == -1 && $grp == "") {
-	$page->smarty->assign("catname", "All");
-} elseif ($category != -1 && $grp == "") {
-	$cat = new Category(['Settings' => $releases->pdo]);
-	$cdata = $cat->getById($category);
-	if ($cdata) {
-		$page->smarty->assign('catname', $cdata["title"]);
-		if ($cdata['parentid'] == Category::CAT_PARENT_GAME || $cdata['id'] == Category::CAT_PARENT_GAME) {
-			$covgroup = 'console';
-		} elseif ($cdata['parentid'] == Category::CAT_PARENT_MOVIE || $cdata['id'] == Category::CAT_PARENT_MOVIE) {
-			$covgroup = 'movies';
-		} elseif ($cdata['parentid'] == Category::CAT_PARENT_XXX || $cdata['id'] == Category::CAT_PARENT_XXX) {
-			$covgroup = 'xxx';
-		} elseif ($cdata['parentid'] == Category::CAT_PARENT_PC || $cdata['id'] == Category::CAT_PC_GAMES) {
-			$covgroup = 'games';
-		} elseif ($cdata['parentid'] == Category::CAT_PARENT_MUSIC || $cdata['id'] == Category::CAT_PARENT_MUSIC) {
-			$covgroup = 'music';
-		} elseif ($cdata['parentid'] == Category::CAT_PARENT_BOOK || $cdata['id'] == Category::CAT_PARENT_BOOK) {
-			$covgroup = 'books';
-		}
-	} else {
-		$page->show404();
-	}
-} elseif ($grp != "") {
-	$page->smarty->assign('catname', $grp);
-}
-
-$page->smarty->assign('covgroup', $covgroup);
-
-foreach ($ordering as $ordertype) {
-	$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/browse?t=" . $category . "&amp;g=" . $grp . "&amp;ob=" . $ordertype . "&amp;offset=0");
-}
-$page->smarty->assign('lastvisit',$page->userdata['lastlogin']);
-
-$page->smarty->assign('results',$results);
-
-$page->meta_title = "Browse Nzbs";
-$page->meta_keywords = "browse,nzb,description,details";
-$page->meta_description = "Browse for Nzbs";
-
-$page->content = $page->smarty->fetch('browse.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/calendar.php b/lib/copy_this/www/pages/calendar.php
deleted file mode 100644
index a8d74cc53..000000000
--- a/lib/copy_this/www/pages/calendar.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-require_once(NN_TMUX. 'lib' . DS . 'TvAnger.php');
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$tvrage = new TvAnger(['Settings' => $page->settings]);
-
-$date = date("Y-m-d");
-if (isset($_GET["date"])) {
-	$date = $_GET["date"];
-}
-
-$timestamp = mktime(0, 0, 0, substr($date, 5, 2), substr($date, 8, 2), substr($date, 0, 4));
-// Make it 7 days before, 7 days after.
-$start = $timestamp - (86400 * 7);
-$cal = array();
-for ($i = 0; $i <= 13; $i++) {
-	$start = $start + 86400;
-	$cal[] = date("Y-m-d", $start);
-}
-
-$prettydate = date("l, jS F Y", $timestamp);
-$prepretty = date("l, jS F Y", ($timestamp - 86400));
-$nxtpretty = date("l, jS F Y", ($timestamp + 86400));
-$predaydata = $tvrage->getCalendar(date("Y-m-d", ($timestamp - 86400)));
-$nxtdaydata = $tvrage->getCalendar(date("Y-m-d", ($timestamp + 86400)));
-$daydata = $tvrage->getCalendar($date);
-
-$page->title = 'Calendar';
-$page->meta_title = "View Calendar";
-$page->meta_keywords = "view,calendar,tv,";
-$page->meta_description = "View Calendar";
-
-$page->smarty->assign('date', $prettydate);
-$page->smarty->assign('predate', $prepretty);
-$page->smarty->assign('nxtdate', $nxtpretty);
-$page->smarty->assign('daydata', $daydata);
-$page->smarty->assign('predata', $predaydata);
-$page->smarty->assign('nxtdata', $nxtdaydata);
-$page->smarty->assign('cal', $cal);
-$page->content = $page->smarty->fetch('viewcalendar.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/console.php b/lib/copy_this/www/pages/console.php
deleted file mode 100644
index 743e43293..000000000
--- a/lib/copy_this/www/pages/console.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/console.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/genres.php");
-
-$console = new Console;
-$cat = new Category;
-$gen = new Genres;
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-
-$concats = $cat->getChildren(Category::CAT_PARENT_GAME);
-$ctmp = array();
-foreach($concats as $ccat) {
-	$ctmp[$ccat['id']] = $ccat;
-}
-$category = Category::CAT_PARENT_GAME;
-if (isset($_REQUEST["t"]) && array_key_exists($_REQUEST['t'], $ctmp))
-	$category = $_REQUEST["t"] + 0;
-
-$catarray = array();
-$catarray[] = $category;
-
-$page->smarty->assign('catlist', $ctmp);
-$page->smarty->assign('category', $category);
-
-$browsecount = $console->getConsoleCount($catarray, -1, $page->userdata["categoryexclusions"]);
-
-$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-$ordering = $console->getConsoleOrdering();
-$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-$results = $consoles = array();
-$results = $console->getConsoleRange($catarray, $offset, ITEMS_PER_COVER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
-
-$maxwords = 50;
-foreach($results as $result) {
-	if (!empty($result['review'])) {
-		$words = explode(' ', $result['review']);
-		if (sizeof($words) > $maxwords) {
-			$newwords = array_slice($words, 0, $maxwords);
-			$result['review'] = implode(' ', $newwords).'...';
-		}
-	}
-	$consoles[] = $result;
-}
-
-$platform = (isset($_REQUEST['platform']) && !empty($_REQUEST['platform'])) ? stripslashes($_REQUEST['platform']) : '';
-$page->smarty->assign('platform', $platform);
-
-$title = (isset($_REQUEST['title']) && !empty($_REQUEST['title'])) ? stripslashes($_REQUEST['title']) : '';
-$page->smarty->assign('title', $title);
-
-$genres = $gen->getGenres(Genres::CONSOLE_TYPE, true, true);
-$tmpgnr = array();
-foreach($genres as $gn) {
-	$tmpgnr[$gn['id']] = $gn['title'];
-}
-$genre = (isset($_REQUEST['genre']) && array_key_exists($_REQUEST['genre'], $tmpgnr)) ? $_REQUEST['genre'] : '';
-$page->smarty->assign('genres', $genres);
-$page->smarty->assign('genre', $genre);
-
-$browseby_link = '&amp;title='.$title.'&amp;platform='.$platform;
-
-$page->smarty->assign('pagertotalitems',$browsecount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage', ITEMS_PER_COVER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP."/console?t=".$category.$browseby_link."&amp;ob=".$orderby."&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-if ($category == -1)
-	$page->smarty->assign("catname","All");
-else
-{
-	$cat = new Category();
-	$cdata = $cat->getById($category);
-	if ($cdata)
-		$page->smarty->assign('catname',$cdata["title"]);
-	else
-		$page->show404();
-}
-
-foreach($ordering as $ordertype)
-	$page->smarty->assign('orderby'.$ordertype, WWW_TOP."/console?t=".$category.$browseby_link."&amp;ob=".$ordertype."&amp;offset=0");
-
-$page->smarty->assign('results',$consoles);
-
-$page->meta_title = "Browse Console";
-$page->meta_keywords = "browse,nzb,console,games,description,details";
-$page->meta_description = "Browse for Games";
-
-$page->content = $page->smarty->fetch('console.tpl');
-$page->render();
-
diff --git a/lib/copy_this/www/pages/contact-us.php b/lib/copy_this/www/pages/contact-us.php
deleted file mode 100644
index d989d60cd..000000000
--- a/lib/copy_this/www/pages/contact-us.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-require_once(WWW_DIR . 'lib' . DS . 'util.php');
-
-if (isset($_POST["useremail"]))
-{
-	//
-	// send the contact info and report back to user.
-	//
-
-	$email = $_POST["useremail"];
-	$mailto = $page->site->email;
-	$mailsubj = "Contact Form Submitted";
-	$mailhead = "From: $email\n";
-	$mailbody = "Values submitted from contact form:\n";
-
-	while (list ($key, $val) = each ($_POST))
-	{
-		if ($key != "submit") {
-			$mailbody .= "$key : $val<br />\r\n";
-		}
-	}
-
-	if (!preg_match("/\n/i",$_POST["useremail"]))
-	{
-		Utility::sendEmail($mailto, $mailsubj, $mailbody, $email);
-	}
-
-	$page->smarty->assign("msg", "<h2 style='padding-top:25px;'>Thanks for getting in touch with ".$page->site->title.".</h2>");
-}
-
-$page->title = "Contact ".$page->site->title;
-$page->meta_title = "Contact ".$page->site->title;
-$page->meta_keywords = "contact us,contact,get in touch,email";
-$page->meta_description = "Contact us at ".$page->site->title." and submit your feedback";
-
-$page->content = $page->smarty->fetch('contact.tpl');
-
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/details.php b/lib/copy_this/www/pages/details.php
deleted file mode 100644
index e9a9c5ef3..000000000
--- a/lib/copy_this/www/pages/details.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/releasefiles.php");
-require_once(WWW_DIR."/lib/releasecomments.php");
-require_once(WWW_DIR."/lib/releaseextra.php");
-require_once(WWW_DIR."/lib/tvrage.php");
-require_once(WWW_DIR."/lib/anidb.php");
-require_once(WWW_DIR."/lib/predb.php");
-require_once(WWW_DIR."/lib/Musik.php");
-require_once(WWW_DIR."/lib/episode.php");
-require_once(WWW_DIR . "/lib/XXX.php");
-require_once(WWW_DIR . "/lib/Games.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/Film.php");
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/TraktTv.php");
-require_once(WWW_DIR . "../misc/update_scripts/nix_scripts/tmux/lib/TvAnger.php");
-
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-if (isset($_GET["id"]))
-{
-	$releases = new Releases;
-	$rc = new ReleaseComments;
-	$re = new ReleaseExtra;
-	$data = $releases->getByGuid($_GET["id"]);
-
-	if (!$data)
-		$page->show404();
-
-	if ($page->isPostBack())
-		$rc->addComment($data["id"], $data["gid"], $_POST["txtAddComment"], $users->currentUserId(), $_SERVER['REMOTE_ADDR']);
-
-	$nfo = $releases->getReleaseNfo($data["id"], false);
-	$reVideo = $re->getVideo($data["id"]);
-	$reAudio = $re->getAudio($data["id"]);
-	$reSubs = $re->getSubs($data["id"]);
-	$comments = $rc->getCommentsByGid($data["gid"]);
-
-	$rage = '';
-	if ($data["rageid"] != '')
-	{
-		$tvrage = new TvAnger();
-
-		$rageinfo = $tvrage->getByRageID($data["rageid"]);
-		if (count($rageinfo) > 0)
-		{
-			$seriesnames = $seriesdescription = $seriescountry = $seriesgenre = $seriesimg = $seriesid = array();
-			foreach($rageinfo as $r)
-			{
-				$seriesnames[] = $r['releasetitle'];
-				if (!empty($r['description']))
-					$seriesdescription[] = $r['description'];
-
-				if (!empty($r['country']))
-					$seriescountry[] = $r['country'];
-
-				if (!empty($r['genre']))
-					$seriesgenre[] = $r['genre'];
-
-				if (!empty($r['imgdata'])) {
-					$seriesimg[] = $r['imgdata'];
-					$seriesid[] = $r['id'];
-				}
-			}
-			$rage = array(
-				'releasetitle' => array_shift($seriesnames),
-				'description'  => array_shift($seriesdescription),
-				'country'      => array_shift($seriescountry),
-				'genre'        => array_shift($seriesgenre),
-				'imgdata'      => array_shift($seriesimg),
-				'id'=>array_shift($seriesid)
-			);
-		}
-	}
-
-	$episodeArray = '';
-	if ($data['episodeinfoid'] > 0)
-	{
-		$episode = new Episode();
-		$episodeArray = $episode->getEpisodeInfoByID($data['episodeinfoid']);
-	}
-
-	$mov = '';
-	if ($data['imdbid'] != '' && $data['imdbid'] != 0000000) {
-		$movie = new Film();
-		$mov = $movie->getMovieInfo($data['imdbid']);
-
-		$trakt = new TraktTv();
-		$traktSummary = $trakt->traktMoviesummary('tt' . $data['imdbid'], true);
-		if ($traktSummary !== false &&
-			isset($traktSummary['trailer']) &&
-			$traktSummary['trailer'] !== '' &&
-			preg_match('/[\/?]v[\/\=](\w+)$/i', $traktSummary['trailer'], $youtubeM)
-		) {
-			$mov['trailer'] =
-				'<embed width="480" height="345" src="' .
-				'https://www.youtube.com/v/' . $youtubeM[1] .
-				'" type="application/x-shockwave-flash"></embed>';
-		} else {
-			$mov['trailer'] = imdb_trailers($data['imdbid']);
-		}
-
-		if ($mov && isset($mov['title'])) {
-			$mov['title'] = str_replace(array('/', '\\'), '', $mov['title']);
-			$mov['actors'] = $movie->makeFieldLinks($mov, 'actors');
-			$mov['genre'] = $movie->makeFieldLinks($mov, 'genre');
-			$mov['director'] = $movie->makeFieldLinks($mov, 'director');
-		} else if ($traktSummary !== false) {
-			$mov['title'] = str_replace(array('/', '\\'), '', $traktSummary['title']);
-		} else {
-			$mov = false;
-		}
-	}
-
-	$xxx = '';
-	if ($data['xxxinfo_id'] != '' && $data['xxxinfo_id'] != 0) {
-		$x = new XXX();
-		$xxx = $x->getXXXInfo($data['xxxinfo_id']);
-
-		if (isset($xxx['trailers'])) {
-			$xxx['trailers'] = $x->insertSwf($xxx['classused'], $xxx['trailers']);
-		}
-
-		if ($xxx && isset($xxx['title'])) {
-			$xxx['title'] = str_replace(array('/', '\\'), '', $xxx['title']);
-			$xxx['actors'] = $x->makeFieldLinks($xxx, 'actors');
-			$xxx['genre'] = $x->makeFieldLinks($xxx, 'genre');
-			$xxx['director'] = $x->makeFieldLinks($xxx, 'director');
-		} else {
-			$xxx = false;
-		}
-	}
-
-	$game = '';
-	if ($data['gamesinfo_id'] != '') {
-		$g = new Games();
-		$game = $g->getGamesInfo($data['gamesinfo_id']);
-	}
-
-	$mus = '';
-	if ($data['musicinfoid'] != '') {
-		require_once(WWW_DIR."/lib/music.php");
-		$music = new Musik(['Settings' => $page->settings]);
-		$mus = $music->getMusicInfo($data['musicinfoid']);
-	}
-
-	$book = '';
-	if ($data['bookinfoid'] != '') {
-		require_once(WWW_DIR."/lib/book.php");
-		$b = new Book();
-		$book = $b->getBookInfo($data['bookinfoid']);
-	}
-
-	$con = '';
-	if ($data['consoleinfoid'] != '') {
-		require_once(WWW_DIR."/lib/console.php");
-		$c = new Console();
-		$con = $c->getConsoleInfo($data['consoleinfoid']);
-	}
-
-	$AniDBAPIArray = '';
-	if ($data["anidbid"] > 0)
-	{
-		$AniDB = new AniDB(['Settings' => $releases->pdo]);
-		$AniDBAPIArray = $AniDB->getAnimeInfo($data["anidbid"]);
-	}
-
-	$predbQuery = '';
-	if ($data["preid"] > 0)
-	{
-		$PreDB = new PreDB();
-		$predbQuery = $PreDB->getByID($data["preid"]);
-	}
-
-	$prehash = new PreHash();
-	$pre = $prehash->getForRelease($data["prehashid"]);
-
-	$rf = new ReleaseFiles;
-	$releasefiles = $rf->get($data["id"]);
-
-	$page->smarty->assign('releasefiles',$releasefiles);
-	$page->smarty->assign('release',$data);
-	$page->smarty->assign('reVideo',$reVideo);
-	$page->smarty->assign('reAudio',$reAudio);
-	$page->smarty->assign('reSubs',$reSubs);
-	$page->smarty->assign('nfo',$nfo);
-	$page->smarty->assign('rage',$rage);
-	$page->smarty->assign('movie',$mov);
-	$page->smarty->assign('xxx', $xxx);
-	$page->smarty->assign('episode',$episodeArray);
-	$page->smarty->assign('anidb',$AniDBAPIArray);
-	$page->smarty->assign('music',$mus);
-	$page->smarty->assign('con',$con);
-	$page->smarty->assign('game', $game);
-	$page->smarty->assign('book',$book);
-	$page->smarty->assign('predb',$predbQuery);
-	$page->smarty->assign('prehash', $pre);
-	$page->smarty->assign('comments',$comments);
-	$page->smarty->assign('searchname',$releases->getSimilarName($data['searchname']));
-
-	$page->meta_title = "View NZB";
-	$page->meta_keywords = "view,nzb,description,details";
-	$page->meta_description = "View NZB for".$data["searchname"] ;
-
-	$page->content = $page->smarty->fetch('viewnzb.tpl');
-	$page->render();
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/failed.php b/lib/copy_this/www/pages/failed.php
deleted file mode 100644
index 44e47c059..000000000
--- a/lib/copy_this/www/pages/failed.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/users.php");
-require_once(WWW_DIR . "/lib/page.php");
-
-$releases = new Releases(['Settings' => $page->settings]);
-$users = new Users();
-$page = new Page();
-
-if (isset($_GET['userid']) && is_numeric($_GET['userid']) && isset($_GET['rsstoken']) && isset($_GET['guid'])) {
-	$rel = $releases->getByGuid($_GET["guid"]);
-	$userid = $_GET['userid'];
-	$rsstoken = $_GET['rsstoken'];
-
-	if (!$rel) {
-		$page->show404();
-	}
-
-	$alt = $releases->getAlternate($rel['guid'], $rel['searchname'], $userid);
-	if (!$alt) {
-		$page->show404();
-	}
-	$url = $page->serverurl . 'getnzb/' . $alt['guid'] . '.nzb' . '&i=' . $userid . '&r=' . $rsstoken;
-	header('Location: ' . $url . '');
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/filelist.php b/lib/copy_this/www/pages/filelist.php
deleted file mode 100644
index e48f0e9b1..000000000
--- a/lib/copy_this/www/pages/filelist.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/nzb.php");
-require_once(WWW_DIR."/lib/util.php");
-
-$releases = new Releases;
-$nzb = new Nzb;
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-if (isset($_GET["id"]))
-{
-	$rel = $releases->getByGuid($_GET["id"]);
-	if (!$rel) {
-		$page->show404();
-	}
-
-	$nzbpath = $nzb->getNZBPath($_GET["id"], $page->site->nzbpath);
-
-	if (!file_exists($nzbpath)) {
-		$page->show404();
-	}
-
-	$nzbfile = Utility::unzipGzipFile($nzbpath);
-
-	$ret = $nzb->nzbFileList($nzbfile);
-
-	$page->smarty->assign('rel', $rel);
-	$page->smarty->assign('files', $ret);
-
-	$page->title = "File List";
-	$page->meta_title = "View Nzb file list";
-	$page->meta_keywords = "view,nzb,file,list,description,details";
-	$page->meta_description = "View Nzb File List";
-
-	$modal = false;
-	if (isset($_GET['modal']))
-	{
-		$modal = true;
-		$page->smarty->assign('modal', true);
-	}
-
-	$page->content = $page->smarty->fetch('viewfilelist.tpl');
-
-	if ($modal) {
-		echo $page->content;
-	} else {
-		$page->render();
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/forgottenpassword.php b/lib/copy_this/www/pages/forgottenpassword.php
deleted file mode 100644
index 0df73a111..000000000
--- a/lib/copy_this/www/pages/forgottenpassword.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/util.php");
-
-if ($users->isLoggedIn())
-	$page->show404();
-
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-switch($action)
-{
-	case "reset":
-		if (!isset($_REQUEST['guid']))
-		{
-			$page->smarty->assign('error', "No reset code provided.");
-			break;
-		}
-
-		$ret = $users->getByPassResetGuid($_REQUEST['guid']);
-		if (!$ret)
-		{
-			$page->smarty->assign('error', "Bad reset code provided.");
-			break;
-		}
-		else
-		{
-			//
-			// reset the password, inform the user, send out the email
-			//
-			$users->updatePassResetGuid($ret["id"], "");
-			$newpass = $users->generatePassword();
-			$users->updatePassword($ret["id"], $newpass);
-
-			$to = $ret["email"];
-			$subject = $page->site->title." Password Reset";
-			$contents = "Your password has been reset to ".$newpass;
-			Utility::sendEmail($to, $subject, $contents, $page->site->email);
-
-			$page->smarty->assign('confirmed', "true");
-
-			break;
-		}
-
-		break;
-	case 'submit':
-
-		$page->smarty->assign('email', $_POST['email']);
-
-		if ($_POST['email'] =="")
-		{
-			$page->smarty->assign('error', "Missing Email");
-		}
-		else
-		{
-			//
-			// Check users exists and send an email
-			//
-			$ret = $users->getByEmail($_POST['email']);
-			if (!$ret)
-			{
-				$page->smarty->assign('error', "The email address is not recognised.");
-				break;
-			}
-			else
-			{
-				//
-				// Generate a forgottenpassword guid, store it in the user table
-				//
-				$guid = md5(uniqid());
-				$users->updatePassResetGuid($ret["id"], $guid);
-
-				//
-				// Send the email
-				//
-				$to = $ret["email"];
-				$subject = $page->site->title." Forgotten Password Request";
-				$contents = "Someone has requested a password reset for this email address. To reset the password use the following link.\n\n ".$page->serverurl."forgottenpassword?action=reset&guid=".$guid;
-				$page->smarty->assign('sent', "true");
-				Utility::sendEmail($to, $subject, $contents, $page->site->email);
-				break;
-			}
-		}
-		break;
-}
-
-$page->title = "Forgotten Password";
-$page->meta_title = "Forgotten Password";
-$page->meta_keywords = "forgotten,password,signup,registration";
-$page->meta_description = "Forgotten Password";
-
-$page->content = $page->smarty->fetch('forgottenpassword.tpl');
-$page->render();
-
diff --git a/lib/copy_this/www/pages/games.php b/lib/copy_this/www/pages/games.php
deleted file mode 100644
index 8a416ade2..000000000
--- a/lib/copy_this/www/pages/games.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/Games.php");
-require_once(WWW_DIR . "/lib/genres.php");
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$games = new Games();
-$cat = new Category();
-$gen = new Genres();
-
-$concats = $cat->getChildren(Category::CAT_PARENT_PC);
-$ctmp = array();
-foreach ($concats as $ccat) {
-	$ctmp[$ccat['id']] = $ccat;
-}
-$category = Category::CAT_PC_GAMES;
-if (isset($_REQUEST["t"]) && array_key_exists($_REQUEST['t'], $ctmp)) {
-	$category = $_REQUEST["t"] + 0;
-}
-
-$catarray = array();
-$catarray[] = $category;
-
-$page->smarty->assign('catlist', $ctmp);
-$page->smarty->assign('category', $category);
-
-$browsecount = $games->getgamesCount($catarray, -1, $page->userdata["categoryexclusions"]);
-
-$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-$ordering = $games->getgamesOrdering();
-
-$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-$results = $games2 = array();
-$results = $games->getgamesRange($catarray, $offset, ITEMS_PER_COVER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
-$maxwords = 50;
-foreach ($results as $result) {
-	if (!empty($result['review'])) {
-		$words = explode(' ', $result['review']);
-		if (sizeof($words) > $maxwords) {
-			$newwords = array_slice($words, 0, $maxwords);
-			$result['review'] = implode(' ', $newwords) . '...';
-		}
-	}
-	$games2[] = $result;
-}
-$platform = (isset($_REQUEST['platform']) && !empty($_REQUEST['platform'])) ? stripslashes($_REQUEST['platform']) : '';
-$page->smarty->assign('platform', $platform);
-
-$title = (isset($_REQUEST['title']) && !empty($_REQUEST['title'])) ? stripslashes($_REQUEST['title']) : '';
-$page->smarty->assign('title', $title);
-
-$genres = $gen->getGenres(Genres::GAME_TYPE, true);
-$tmpgnr = array();
-foreach ($genres as $gn) {
-	$tmpgnr[$gn['id']] = $gn['title'];
-}
-$genre = (isset($_REQUEST['genre']) && array_key_exists($_REQUEST['genre'], $tmpgnr)) ? $_REQUEST['genre'] : '';
-$page->smarty->assign('genres', $genres);
-$page->smarty->assign('genre', $genre);
-
-$browseby_link = '&amp;title=' . $title . '&amp;platform=' . $platform;
-
-$page->smarty->assign('pagertotalitems', $browsecount);
-$page->smarty->assign('pageroffset', $offset);
-$page->smarty->assign('pageritemsperpage', ITEMS_PER_COVER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/games?t=" . $category . $browseby_link . "&amp;ob=" . $orderby . "&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-if ($category == -1) {
-	$page->smarty->assign("catname", "All");
-} else {
-	$cdata = $cat->getById($category);
-	if ($cdata) {
-		$page->smarty->assign('catname', $cdata["title"]);
-	} else {
-		$page->show404();
-	}
-}
-
-foreach ($ordering as $ordertype) {
-	$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/games?t=" . $category . $browseby_link . "&amp;ob=" . $ordertype . "&amp;offset=0");
-}
-
-$page->smarty->assign('results', $games2);
-
-$page->meta_title = "Browse Games";
-$page->meta_keywords = "browse,nzb,games,description,details";
-$page->meta_description = "Browse for Games";
-
-$page->content = $page->smarty->fetch('games.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/getnzb.php b/lib/copy_this/www/pages/getnzb.php
deleted file mode 100644
index 70dfc6cd4..000000000
--- a/lib/copy_this/www/pages/getnzb.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-
-$nzb = new NZB($page->settings);
-$rel = new Releases(['Settings' => $page->settings]);
-$uid = 0;
-
-// Page is accessible only by the rss token, or logged in users.
-if ($users->isLoggedIn()) {
-	$uid = $users->currentUserId();
-	$maxdls = $page->userdata["downloadrequests"];
-	$rsstoken = $page->userdata['rsstoken'];
-} else {
-	if ($page->site->registerstatus == Sites::REGISTER_STATUS_API_ONLY) {
-		$res = $users->getById(0);
-	} else {
-		if ((!isset($_GET["i"]) || !isset($_GET["r"]))) {
-			header("X-DNZB-RCode: 400");
-			header("X-DNZB-RText: Bad request, please supply all parameters!");
-			$page->show403();
-		}
-
-		$res = $users->getByIdAndRssToken($_GET["i"], $_GET["r"]);
-		if (!$res) {
-			header("X-DNZB-RCode: 401");
-			header("X-DNZB-RText: Unauthorised, wrong user ID or rss key!");
-			$page->show403();
-		}
-	}
-	$uid = $res["id"];
-	$rsstoken = $res['rsstoken'];
-	$maxdls = $res["downloadrequests"];
-}
-
-// Remove any suffixed id with .nzb which is added to help weblogging programs see nzb traffic.
-if (isset($_GET['id'])) {
-	$_GET['id'] = str_ireplace('.nzb','', $_GET['id']);
-}
-//
-// A hash of the users ip to record against the download
-//
-$hosthash = "";
-if ($page->site->storeuserips == 1) {
-	$hosthash = $users->getHostHash($_SERVER["REMOTE_ADDR"], $page->site->siteseed);
-}
-// Check download limit on user role.
-$dlrequests = $users->getDownloadRequests($uid);
-if ($dlrequests['num'] > $maxdls) {
-	header("X-DNZB-RCode: 503");
-	header("X-DNZB-RText: User has exceeded maximum downloads for the day!");
-	$page->show503();
-}
-
-// User requested a zip of guid,guid,guid releases.
-if (isset($_GET["id"]) && isset($_GET["zip"]) && $_GET["zip"] == "1") {
-	$guids = explode(",", $_GET["id"]);
-	if ($dlrequests['num'] + sizeof($guids) > $maxdls) {
-		header("X-DNZB-RCode: 503");
-		header("X-DNZB-RText: User has exceeded maximum downloads for the day!");
-		$page->show503();
-	}
-
-	$zip = $rel->getZipped($guids);
-	if (strlen($zip) > 0) {
-		$users->incrementGrabs($uid, count($guids));
-		foreach ($guids as $guid) {
-			$rel->updateGrab($guid);
-			$users->addDownloadRequest($uid, $rel['id']);
-
-			if (isset($_GET["del"]) && $_GET["del"] == 1) {
-				$users->delCartByUserAndRelease($guid, $uid);
-			}
-		}
-
-		$filename = date("Ymdhis") . ".nzb.zip";
-		header("Content-type: application/octet-stream");
-		header("Content-disposition: attachment; filename=" . $filename);
-		echo $zip;
-		die();
-	} else {
-		$page->show404();
-	}
-}
-
-if (isset($_GET["id"])) {
-	$reldata = $rel->getByGuid($_GET["id"]);
-	$nzbpath = $nzb->getNZBPath($_GET["id"]);
-
-	if (!file_exists($nzbpath)) {
-		header("X-DNZB-RCode: 404");
-		header("X-DNZB-RText: NZB file not found!");
-		$page->show404();
-	}
-
-	if ($reldata) {
-		$rel->updateGrab($_GET["id"]);
-		$users->addDownloadRequest($uid, $reldata['id']);
-		$users->incrementGrabs($uid);
-		if (isset($_GET["del"]) && $_GET["del"] == 1) {
-			$users->delCartByUserAndRelease($_GET["id"], $uid);
-		}
-	} else {
-		header("X-DNZB-RCode: 404");
-		header("X-DNZB-RText: Release not found!");
-		$page->show404();
-	}
-
-	// Start reading output buffer.
-	ob_start();
-	// De-gzip the NZB and store it in the output buffer.
-	readgzfile($nzbpath);
-
-	// Set the NZB file name.
-	header("Content-Disposition: attachment; filename=" . str_replace(array(',', ' '), '_', $reldata["searchname"]) . ".nzb");
-	// Get the size of the NZB file.
-	header("Content-Length: " . ob_get_length());
-	header("Content-Type: application/x-nzb");
-	header("Expires: " . date('r', time() + 31536000));
-	// Set X-DNZB header data.
-	header("X-DNZB-Failure: " . $page->serverurl . 'failed/' . '?guid=' . $_GET['id'] . '&userid=' . $uid . '&rsstoken=' . $rsstoken);
-	header("X-DNZB-Category: " . $reldata["category_name"]);
-	header("X-DNZB-Details: " . $page->serverurl . 'details/' . $_GET["id"]);
-	if (!empty($reldata['imdbid']) && $reldata['imdbid'] > 0) {
-		header("X-DNZB-MoreInfo: http://www.imdb.com/title/tt" . $reldata['imdbid']);
-	} else if (!empty($reldata['rageid']) && $reldata['rageid'] > 0) {
-		header("X-DNZB-MoreInfo: http://www.tvrage.com/shows/id-" . $reldata['rageid']);
-	}
-	header("X-DNZB-Name: " . $reldata["searchname"]);
-	if ($reldata['nfostatus'] == 1) {
-		header("X-DNZB-NFO: " . $page->serverurl . 'nfo/' . $_GET["id"]);
-	}
-	header("X-DNZB-RCode: 200");
-	header("X-DNZB-RText: OK, NZB content follows.");
-
-	// Print buffer and flush it.
-	ob_end_flush();
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/login.php b/lib/copy_this/www/pages/login.php
deleted file mode 100644
index b8bd69547..000000000
--- a/lib/copy_this/www/pages/login.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-if ($page->isPostBack())
-{
-	if (!isset($_POST["username"]) || !isset($_POST["password"]))
-		$page->smarty->assign('error', "Please enter your username and password.");
-	else
-	{
-		$username = htmlspecialchars($_POST["username"]);
-		$page->smarty->assign('username', $username);
-		$users = new Users();
-		$res = $users->getByUsername($username);
-		$dis = $users->isDisabled($username);
-
-		if (!$res)
-			$res = $users->getByEmail($username);
-
-		if ($res)
-		{
-			if ($dis)
-			{
-				$page->smarty->assign('error', "Your account has been disabled.");
-			}
-			else if ($users->checkPassword($_POST["password"], $res["password"]))
-			{
-				$rememberMe = (isset($_POST['rememberme']) && $_POST['rememberme'] == 'on') ? 1 : 0;
-				$users->login($res["id"], $_SERVER['REMOTE_ADDR'], $rememberMe);
-
-				if (isset($_POST["redirect"]) && $_POST["redirect"] != "")
-					header("Location: ".$_POST["redirect"]);
-				else
-					header("Location: ".WWW_TOP.$page->site->home_link);
-				die();
-			}
-			else
-			{
-				$page->smarty->assign('error', "Incorrect username or password.");
-			}
-		}
-		else
-		{
-			$page->smarty->assign('error', "Incorrect username or password.");
-		}
-	}
-}
-
-$page->smarty->assign('redirect', (isset($_GET['redirect'])) ? $_GET['redirect'] : '');
-$page->meta_title = "Login";
-$page->meta_keywords = "Login";
-$page->meta_description = "Login";
-$page->content = $page->smarty->fetch('login.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/movies.php b/lib/copy_this/www/pages/movies.php
deleted file mode 100644
index 58ca99c3b..000000000
--- a/lib/copy_this/www/pages/movies.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/movie.php");
-require_once(WWW_DIR."/lib/category.php");
-
-$movie = new Movie;
-$cat = new Category(['Settings' => $page->settings]);
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-
-$moviecats = $cat->getChildren(Category::CAT_PARENT_MOVIE);
-$mtmp = array();
-foreach($moviecats as $mcat) {
-	$mtmp[$mcat['id']] = $mcat;
-}
-
-$category = (isset($_GET["imdb"]) ? -1 : Category::CAT_PARENT_MOVIE);
-if (isset($_REQUEST["t"]) && array_key_exists($_REQUEST['t'], $mtmp))
-	$category = $_REQUEST["t"] + 0;
-
-$user = $users->getById($users->currentUserId());
-$cpapi = $user['cp_api'];
-$cpurl = $user['cp_url'];
-$page->smarty->assign('cpapi', $cpapi);
-$page->smarty->assign('cpurl', $cpurl);
-
-$catarray = array();
-if ($category != -1) $catarray[] = $category;
-
-$page->smarty->assign('catlist', $mtmp);
-$page->smarty->assign('category', $category);
-
-$browsecount = $movie->getMovieCount($catarray, -1, $page->userdata["categoryexclusions"]);
-
-$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-$ordering = $movie->getMovieOrdering();
-$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-$results = $movies = array();
-$results = $movie->getMovieRange($catarray, $offset, ITEMS_PER_COVER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
-foreach($results as $result) {
-	$result['genre'] = $movie->makeFieldLinks($result, 'genre');
-	$result['actors'] = $movie->makeFieldLinks($result, 'actors');
-	$result['director'] = $movie->makeFieldLinks($result, 'director');
-	$result['languages'] = explode(", ", $result['language']);
-
-	$movies[] = $result;
-}
-
-$title = (isset($_REQUEST['title']) && !empty($_REQUEST['title'])) ? stripslashes($_REQUEST['title']) : '';
-$page->smarty->assign('title', $title);
-
-$actors = (isset($_REQUEST['actors']) && !empty($_REQUEST['actors'])) ? stripslashes($_REQUEST['actors']) : '';
-$page->smarty->assign('actors', $actors);
-
-$director = (isset($_REQUEST['director']) && !empty($_REQUEST['director'])) ? stripslashes($_REQUEST['director']) : '';
-$page->smarty->assign('director', $director);
-
-$ratings = range(1, 9);
-$rating = (isset($_REQUEST['rating']) && in_array($_REQUEST['rating'], $ratings)) ? $_REQUEST['rating'] : '';
-$page->smarty->assign('ratings', $ratings);
-$page->smarty->assign('rating', $rating);
-
-$genres = $movie->getGenres();
-$genre = (isset($_REQUEST['genre']) && in_array($_REQUEST['genre'], $genres)) ? $_REQUEST['genre'] : '';
-$page->smarty->assign('genres', $genres);
-$page->smarty->assign('genre', $genre);
-
-$years = range(1903, (date("Y")+1));
-rsort($years);
-$year = (isset($_REQUEST['year']) && in_array($_REQUEST['year'], $years)) ? $_REQUEST['year'] : '';
-$page->smarty->assign('years', $years);
-$page->smarty->assign('year', $year);
-
-$browseby_link = '&amp;title='.$title.'&amp;actors='.$actors.'&amp;director='.$director.'&amp;rating='.$rating.'&amp;genre='.$genre.'&amp;year='.$year;
-
-$page->smarty->assign('pagertotalitems',$browsecount);
-$page->smarty->assign('pageroffset',$offset);
-$page->smarty->assign('pageritemsperpage',ITEMS_PER_COVER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP."/movies?t=".$category.$browseby_link."&amp;ob=".$orderby."&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-if ($category == -1)
-	$page->smarty->assign("catname","All");
-else
-{
-	$cat = new Category();
-	$cdata = $cat->getById($category);
-	if ($cdata)
-		$page->smarty->assign('catname',$cdata["title"]);
-	else
-		$page->show404();
-}
-
-foreach($ordering as $ordertype)
-	$page->smarty->assign('orderby'.$ordertype, WWW_TOP."/movies?t=".$category.$browseby_link."&amp;ob=".$ordertype."&amp;offset=0");
-
-$page->smarty->assign('results',$movies);
-
-$page->meta_title = "Browse Nzbs";
-$page->meta_keywords = "browse,nzb,description,details";
-$page->meta_description = "Browse for Nzbs";
-
-if (isset($_GET["imdb"]))
-	$page->content = $page->smarty->fetch('viewmoviefull.tpl');
-else
-	$page->content = $page->smarty->fetch('movies.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/music.php b/lib/copy_this/www/pages/music.php
deleted file mode 100644
index 6b18f5a24..000000000
--- a/lib/copy_this/www/pages/music.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/Musik.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/genres.php");
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$music = new Musik(['Settings' => $page->settings]);
-$cat = new Category(['Settings' => $page->settings]);
-$gen = new Genres(['Settings' => $page->settings]);
-
-$musiccats = $cat->getChildren(Category::CAT_PARENT_MUSIC);
-$mtmp = array();
-foreach ($musiccats as $mcat) {
-	$mtmp[$mcat['id']] = $mcat;
-}
-$category = Category::CAT_PARENT_MUSIC;
-if (isset($_REQUEST['t']) && array_key_exists($_REQUEST['t'], $mtmp)) {
-	$category = $_REQUEST['t'] + 0;
-}
-
-$catarray = array();
-$catarray[] = $category;
-
-$page->smarty->assign('catlist', $mtmp);
-$page->smarty->assign('category', $category);
-
-$browsecount = $music->getMusicCount($catarray, -1, $page->userdata['categoryexclusions']);
-
-$offset = (isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST['offset'] : 0;
-$ordering = $music->getMusicOrdering();
-$orderby = isset($_REQUEST['ob']) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST['ob'] : '';
-
-$results = $musics = array();
-$results = $music->getMusicRange($catarray, $offset, ITEMS_PER_COVER_PAGE, $orderby, $page->userdata['categoryexclusions']);
-foreach ($results as $result) {
-	//$result['genre'] = $music->makeFieldLinks($result, 'genre');
-	$musics[] = $result;
-}
-
-$artist = (isset($_REQUEST['artist']) && !empty($_REQUEST['artist'])) ? stripslashes($_REQUEST['artist']) : '';
-$page->smarty->assign('artist', $artist);
-
-$title = (isset($_REQUEST['title']) && !empty($_REQUEST['title'])) ? stripslashes($_REQUEST['title']) : '';
-$page->smarty->assign('title', $title);
-
-$genres = $gen->getGenres(Genres::MUSIC_TYPE, true);
-$tmpgnr = array();
-foreach ($genres as $gn) {
-	$tmpgnr[$gn['id']] = $gn['title'];
-}
-$genre = (isset($_REQUEST['genre']) && array_key_exists($_REQUEST['genre'], $tmpgnr)) ? $_REQUEST['genre'] : '';
-$page->smarty->assign('genres', $genres);
-$page->smarty->assign('genre', $genre);
-
-$years = range(1950, (date("Y") + 1));
-rsort($years);
-$year = (isset($_REQUEST['year']) && in_array($_REQUEST['year'], $years)) ? $_REQUEST['year'] : '';
-$page->smarty->assign('years', $years);
-$page->smarty->assign('year', $year);
-
-$browseby_link = '&amp;title=' . $title . '&amp;artist=' . $artist . '&amp;genre=' . $genre . '&amp;year=' . $year;
-
-$page->smarty->assign('pagertotalitems', $browsecount);
-$page->smarty->assign('pageroffset', $offset);
-$page->smarty->assign('pageritemsperpage', ITEMS_PER_COVER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/music?t=" . $category . $browseby_link . "&amp;ob=" . $orderby . "&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-if ($category == -1) {
-	$page->smarty->assign("catname", "All");
-} else {
-	$cdata = $cat->getById($category);
-	if ($cdata) {
-		$page->smarty->assign('catname', $cdata['title']);
-	} else {
-		$page->show404();
-	}
-}
-
-foreach ($ordering as $ordertype) {
-	$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/music?t=" . $category . $browseby_link . "&amp;ob=" . $ordertype . "&amp;offset=0");
-}
-
-$page->smarty->assign('results', $musics);
-
-$page->meta_title = "Browse Albums";
-$page->meta_keywords = "browse,nzb,albums,description,details";
-$page->meta_description = "Browse for Albums";
-
-$page->content = $page->smarty->fetch('music.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/newposterwall.php b/lib/copy_this/www/pages/newposterwall.php
deleted file mode 100644
index d02ed564f..000000000
--- a/lib/copy_this/www/pages/newposterwall.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/content.php");
-require_once(WWW_DIR . "/lib/category.php");
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$releases = new Releases();
-$contents = new Contents();
-$category = new Category();
-$error = false;
-
-// Array with all the possible poster wall types.
-$startTypes = array('Books', 'Console', 'Movies', 'XXX', 'Audio', 'PC', 'TV'/*, 'Recent'*/);
-// Array that will contain the poster wall types (the above array minus whatever they have disabled in admin).
-$types = array();
-// Get the names of all enabled parent categories.
-$categories = $category->getEnabledParentNames();
-// Loop through our possible ones and check if they are in the enabled categories.
-if (count($categories) > 0) {
-	foreach ($categories as $pType) {
-		if (in_array($pType['title'], $startTypes)) {
-			$types[] = $pType['title'];
-		}
-	}
-} else {
-	$error = "No categories are enabled!";
-}
-
-if (count($types) === 0) {
-	$error = 'No categories enabled for the new poster wall. Possible choices are: ' . implode(', ', $startTypes) . '.';
-}
-
-if (!$error) {
-
-	// Check if the user did not pass the required t parameter, set it to the first type.
-	if (!isset($_REQUEST['t'])) {
-		$_REQUEST['t'] = $types[0];
-	}
-
-	// Check if the user passed an invalid t parameter.
-	if (!in_array($_REQUEST['t'], $types)) {
-		$_REQUEST['t'] = $types[0];
-	}
-
-	$page->smarty->assign('types', $types);
-	$page->smarty->assign('type', $_REQUEST['t']);
-
-	switch ($_REQUEST['t']) {
-		case 'Movies':
-			$getnewestmovies = $releases->getNewestMovies();
-			$page->smarty->assign('newest', $getnewestmovies);
-
-			$user = $users->getById($users->currentUserId());
-			$page->smarty->assign('cpapi', $user['cp_api']);
-			$page->smarty->assign('cpurl', $user['cp_url']);
-			$page->smarty->assign('goto', 'movies');
-			break;
-
-		case 'Console':
-			$getnewestconsole = $releases->getNewestConsole();
-			$page->smarty->assign('newest', $getnewestconsole);
-			$page->smarty->assign('goto', 'console');
-			break;
-
-		case 'XXX':
-			$getnewestxxx = $releases->getNewestXXX();
-			$page->smarty->assign('newest', $getnewestxxx);
-			$page->smarty->assign('goto', 'xxx');
-			break;
-
-		case 'PC':
-			$getnewestgame = $releases->getNewestGames();
-			$page->smarty->assign('newest', $getnewestgame);
-			$page->smarty->assign('goto', 'games');
-			break;
-
-		case 'Audio':
-			$getnewestmp3 = $releases->getnewestMP3s();
-			$page->smarty->assign('newest', $getnewestmp3);
-			$page->smarty->assign('goto', 'music');
-			break;
-
-		case 'Books':
-			$getnewestbooks = $releases->getNewestBooks();
-			$page->smarty->assign('newest', $getnewestbooks);
-			$page->smarty->assign('goto', 'books');
-			break;
-
-		case 'TV':
-			$getnewesttv = $releases->getNewestTV();
-			$page->smarty->assign('newest', $getnewesttv);
-			$page->smarty->assign('goto', 'tv');
-			break;
-
-		case 'Recent':
-			$recent = $releases->getRecentlyAdded();
-			$page->smarty->assign('newest', $recent);
-			$page->smarty->assign('goto', 'browse');
-			break;
-
-		default:
-			$error = "ERROR: Invalid ?t parameter (" . $_REQUEST['t'] . ").";
-	}
-}
-$page->title = 'New ' . $_REQUEST['t'] . ' Releases';
-$page->meta_title = $_REQUEST['t'] . ' Poster Wall';
-$page->meta_keywords = "view,new,releases,posters,wall";
-$page->meta_description = "The newest " . $_REQUEST['t'] . ' releases';
-$page->smarty->assign('error', $error);
-$page->content = $page->smarty->fetch('newposterwall.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/nfo.php b/lib/copy_this/www/pages/nfo.php
deleted file mode 100644
index 9c72b1eab..000000000
--- a/lib/copy_this/www/pages/nfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/util.php");
-
-$releases = new Releases;
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-if (isset($_GET["id"])) {
-	$rel = $releases->getByGuid($_GET["id"]);
-
-	if (!$rel)
-		$page->show404();
-
-	$nfo = $releases->getReleaseNfo($rel['id']);
-	$nfo['nfoUTF'] = cp437toUTF($nfo['nfo']);
-
-	$page->smarty->assign('rel', $rel);
-	$page->smarty->assign('nfo', $nfo);
-
-	$page->title = "NFO File";
-	$page->meta_title = "View Nfo";
-	$page->meta_keywords = "view,nzb,nfo,description,details";
-	$page->meta_description = "View Nfo File";
-
-	$modal = false;
-	if (isset($_GET['modal'])) {
-		$modal = true;
-		$page->smarty->assign('modal', true);
-	}
-
-	$page->content = $page->smarty->fetch('viewnfo.tpl');
-
-	if ($modal)
-		echo $page->content;
-	else
-		$page->render();
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/nzbgetqueuedata.php b/lib/copy_this/www/pages/nzbgetqueuedata.php
deleted file mode 100644
index 283489d8c..000000000
--- a/lib/copy_this/www/pages/nzbgetqueuedata.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-require_once(WWW_DIR.'../misc/update_scripts/nix_scripts/tmux/lib/NZBGet.php');
-require_once(WWW_DIR.'lib/util.php');
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$nzbget = new NZBGet($page);
-
-$output = "";
-$data = $nzbget->getQueue();
-
-if ($data !== false) {
-	if (count($data > 0)) {
-
-		$status = $nzbget->status();
-
-		if ($status !== false) {
-			$output .=
-			"<div class='container text-center' style='display:block;'>
-				<div style='width:16.666666667%;float:left;'><b>Avg Speed:</b><br /> " . Utility::bytesToSizeString($status['AverageDownloadRate'], 2) . "/s </div>
-				<div style='width:16.666666667%;float:left;'><b>Speed:</b><br /> " . Utility::bytesToSizeString($status['DownloadRate'], 2) . "/s </div>
-				<div style='width:16.666666667%;float:left;'><b>Limit:</b><br /> " . Utility::bytesToSizeString($status['DownloadLimit'], 2) . "/s </div>
-				<div style='width:16.666666667%;float:left;'><b>Queue Left(no pars):</b><br /> " . Utility::bytesToSizeString($status['RemainingSizeLo'], 2) . " </div>
-				<div style='width:16.666666667%;float:left;'><b>Free Space:</b><br /> " . Utility::bytesToSizeString($status['FreeDiskSpaceMB'] * 1024000, 2) . " </div>
-				<div style='width:16.666666667%;float:left;'><b>Status:</b><br /> " . ($status['Download2Paused'] == 1 ? 'Paused' : 'Downloading') . " </div>
-			</div>";
-		}
-
-		$count = 1;
-		$output .=
-			"<table class='table table-striped table-condensed table-highlight data'>
-				<thead>
-					<tr >
-						<th style='width=10px;text-align:center;'>#</th>
-						<th style='text-align:left;'>Name</th>
-						<th style='width:80px;text-align:center;'>Size</th>
-						<th style='width:80px;text-align:center;'>Left(+pars)</th>
-						<th style='width:50px;text-align:center;'>Done</th>
-						<th style='width:80px;text-align:center;'>Status</th>
-						<th style='width:50px;text-align:center;'>Delete</th>
-						<th style='width:80px;text-align:center;'><a href='?pall'>Pause all</a></th>
-						<th style='width:80px;text-align:center;'><a href='?rall'>Resume all</a></th>
-					</tr>
-				</thead>
-				<tbody>";
-
-		foreach ($data as $item) {
-			$output .=
-				"<tr>" .
-				"<td style='text-align:center;width:10px'>" . $count . "</td>" .
-				"<td style='text-align:left;'>" . $item['NZBName'] . "</td>" .
-				"<td style='text-align:center;'>" . $item['FileSizeMB'] . " MB</td>" .
-				"<td style='text-align:center;'>" . $item['RemainingSizeMB'] . " MB</td>" .
-				"<td style='text-align:center;'>" . ($item['FileSizeMB'] == 0 ? 0 : round(100 - ($item['RemainingSizeMB'] / $item['FileSizeMB']) * 100)) . "%</td>" .
-				"<td style='text-align:center;'>" . ($item['ActiveDownloads'] > 0 ? 'Downloading' : 'Paused') . "</td>" .
-				"<td style='text-align:center;'><a  onclick=\"return confirm('Are you sure?');\" href='?del=" .  $item['LastID'] . "'>Delete</a></td>" .
-				"<td style='text-align:center;'><a href='?pause=" . $item['LastID'] . "'>Pause</a></td>" .
-				"<td style='text-align:center;'><a href='?resume=" . $item['LastID'] . "'>Resume</a></td>" .
-				"</tr>";
-			$count++;
-		}
-		$output .=
-			"</tbody>
-		</table>";
-	} else {
-		$output .= "<br /><br /><p style='text-align:center;'>The queue is currently empty.</p>";
-	}
-} else {
-	$output .= "<p style='text-align:center;'>Error retreiving queue.</p>";
-}
-
-print $output;
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/prehash.php b/lib/copy_this/www/pages/prehash.php
deleted file mode 100644
index 65490e141..000000000
--- a/lib/copy_this/www/pages/prehash.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-require_once(WWW_DIR.'/../misc/update_scripts/nix_scripts/tmux/lib/prehash.php');
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$predb = new PreHash();
-
-$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-
-if (isset($_REQUEST['prehashsearch'])) {
-	$lastSearch = $_REQUEST['prehashsearch'];
-	$parr = $predb->getAll($offset, ITEMS_PER_PAGE, $_REQUEST['prehashsearch']);
-} else {
-	$lastSearch = '';
-	$parr = $predb->getAll($offset, ITEMS_PER_PAGE);
-}
-
-$page->smarty->assign('pagertotalitems', $parr['count']);
-$page->smarty->assign('pageroffset', $offset);
-$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/prehash/&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-$page->smarty->assign('results', $parr['arr']);
-
-$page->title = "Browse Prehash";
-$page->meta_title = "View Prehash info";
-$page->meta_keywords = "view,prehash,info,description,details";
-$page->meta_description = "View Prehash info";
-
-$page->content = $page->smarty->fetch('prehash.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/prehashinfo.php b/lib/copy_this/www/pages/prehashinfo.php
deleted file mode 100644
index 13522262b..000000000
--- a/lib/copy_this/www/pages/prehashinfo.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-require_once(WWW_DIR . "/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . '/../misc/update_scripts/nix_scripts/tmux/lib/functions.php');
-
-/**
- * This page prints an XML (or JSON, see extras) on the browser with predb data based on criteria.
- *
- * NOTE: By default only 1 result is returned, see the Extras for returning more than 1 result.
- * NOTE: This page is only accessible by logged in users or users providing their API key.
- *       If you wish to make this open to anybody, you can change the if (true) to if (false) lower in this file.
- *
- * Search Types:
- * ------------
- * These are the search types you can use: requestid, title, md5, sha1, all
- * They all have shorter versions, in order: r, t, m, s, a
- *
- *     requestid:
- *         This is an re-implementation of the http://predb_irc.nzedb.com/predb_irc.php?reqid=[REQUEST_ID]&group=[GROUP_NM]
- *
- *         Parameters:
- *         ----------
- *         reqid : The request id
- *         group : The group name.
- *
- *         Example URL:
- *         -----------
- *         http://example.com/preinfo?t=requestid&reqid=123&group=alt.binaries.example
- *
- *     title:
- *         This loosely searches for a title (using like '%TITLE%').
- *         NOTE: The title MUST be encoded.
- *
- *         Parameters:
- *         ----------
- *         title: The pre title you are searching for.
- *
- *         Example URL:
- *         http://example.com/preinfo?t=title&title=debian
- *
- *     md5:
- *         Searches for a PRE using the provided MD5.
- *
- *         Parameters:
- *         ----------
- *         md5 : An MD5 hash.
- *
- *         Example URL:
- *         -----------
- *         http://example.com/preinfo?t=md5&md5=6e9552c9bd8e61c8f277c21220160234
- *
- *     sha1:
- *         Searches for a PRE using the provided SHA1.
- *
- *         Parameters:
- *         ----------
- *         sha1: An SHA1 hash.
- *
- *         Example URL:
- *         -----------
- *         http://example.com/preinfo?t=sha1&sha1=a6eb4d9d7f99ca47abe56f3220597663cf37ca4a
- *
- *     all:
- *        Returns the newest pre(s). (see the Extras - limit option)
- *
- *        Example URL:
- *        -----------
- *        http://example.com/preinfo?t=all
- *
- * Extra Parameters:
- * ----------------
- *
- *     limit  : By default only 1 result is returned, you can pass limit to increase this (the max is 100).
- *     offset : Gets the next set of results when using limit.
- *              ie If you limit to 100, then you add offset 0, you get the 100 newest, offset 100, you would get the next 100 after the 100 newest and so on.
- *     json   : By default a XML is returned, you can pass json=1 to return in json. (anything else after json will return in XML)
- *     newer  : Search for pre's newer than this date (must be in unix time).
- *     older  : Search pre pre's older than this date (must be in unix time).
- *     nuked  : nuked=0 Means search pre's that have never been nuked. nuked=1 Means search pre's that are nuked, or have previously been nuked.
- *     apikey : The user's API key (from the profile page).
- *
- * Example URLs (using various parameters):
- * --------------------------------------
- *
- *     Returns the 10 newest pre's.
- *     http://example.com/preinfo?type=all&limit=10&apikey=227a0e58049d2e30efded245d0f447c8
- *
- *     Returns 25 pre's between april 1st and april 30th 2014.
- *     http://example.com/preinfo?type=all&limit=25&apikey=227a0e58049d2e30efded245d0f447c8&older=1398902399&newer=1396310400
- *
- *     Returns 1 pre with this MD5: 694dfdf3220bdb6219553262b8be37df
- *     http://example.com/preinfo?type=md5&md5=94dfdf3220bdb6219553262b8be37df&apikey=227a0e58049d2e30efded245d0f447c8
- *
- *     Returns 1 pre with this SHA1: e7782508663d40248ccaf1c9bd2a961348b2301b
- *     http://example.com/preinfo?type=sha1&sha1=e7782508663d40248ccaf1c9bd2a961348b2301b&apikey=227a0e58049d2e30efded245d0f447c8
- *
- *     Returns 1 pre with this requestid and group : 188247 alt.binaries.teevee
- *     http://example.com/preinfo?type=requestid&reqid=188247&group=alt.binaries.teevee&apikey=227a0e58049d2e30efded245d0f447c8
- */
-
-// You can make this page accessible by all (even people without an API key) by setting this to false :
-if (true) {
-	if (!$users->isLoggedIn()) {
-		if (!isset($_GET['apikey'])) {
-			apiError('Missing parameter (apikey)', 200);
-		}
-
-		if (!$users->getByRssToken($_GET['apikey'])) {
-			apiError('Incorrect user credentials (api key is wrong)', 100);
-		}
-	}
-}
-
-$preData = array();
-$json = false;
-if (isset($_GET['json']) && $_GET['json'] == 1) {
-	$json = true;
-}
-if (isset($_GET['type'])) {
-
-	$limit = 1;
-	if (isset($_GET['limit']) && is_numeric($_GET['limit'])) {
-		$limit = $_GET['limit'];
-		if ($limit > 100) {
-			$limit = 100;
-		}
-	}
-
-	$offset = 0;
-	if (isset($_GET['offset']) && is_numeric($_GET['offset'])) {
-		$offset = $_GET['offset'];
-	}
-
-	$newer = $older = $nuked = '';
-	if (isset($_GET['newer']) && is_numeric($_GET['newer'])) {
-		$newer = ' AND p.predate > FROM_UNIXTIME(' . $_GET['newer'] . ') ';
-	}
-
-	if (isset($_GET['lower']) && is_numeric($_GET['lower'])) {
-		$older = ' AND p.predate < FROM_UNIXTIME(' . $_GET['older'] . ') ';
-	}
-
-	if (isset($_GET['nuked'])) {
-		if ($_GET['nuked'] == 0) {
-			$nuked = ' AND p.nuked = 0';
-		} else if ($_GET['nuked'] == 1) {
-			$nuked = ' AND p.nuked > 0';
-		}
-	}
-
-	switch ($_GET['type']) {
-		case 'r':
-		case 'requestid':
-			if (isset($_GET['reqid']) && is_numeric($_GET['reqid']) && isset($_GET['group']) && is_string($_GET['group'])) {
-				$db = new DB();
-				$preData = $db->query(
-					sprintf('
-					SELECT p.*
-					FROM prehash p
-					INNER JOIN groups g ON g.id = p.groupid
-					WHERE requestid = %d
-					AND g.name = %s
-					%s %s %s
-					LIMIT %d
-					OFFSET %d',
-						$_GET['reqid'],
-						$db->escapeString($_GET['group']),
-						$newer,
-						$older,
-						$nuked,
-						$limit,
-						$offset
-					)
-				);
-			}
-			break;
-
-		case 't':
-		case 'title':
-			if (isset($_GET['title'])) {
-				$db = new DB();
-				$preData = $db->query(
-					sprintf('SELECT * FROM prehash p WHERE p.title %s %s %s LIKE %s LIMIT %d OFFSET %d',
-						$newer,
-						$older,
-						$nuked,
-						$db->likeString(urldecode($_GET['title'])),
-						$limit,
-						$offset
-					)
-				);
-			}
-
-			break;
-
-		case 'm':
-		case 'md5':
-			if (isset($_GET['md5']) && strlen($_GET['title']) === 32) {
-				$db = new DB();
-				$preData = $db->query(
-					sprintf('SELECT * FROM prehash p INNER JOIN predbhash ph ON ph.pre_id = p.id WHERE MATCH(hashes) AGAINST (%s) %s %s %s LIMIT %d OFFSET %d',
-						$db->escapeString($_GET['md5']),
-						$newer,
-						$older,
-						$nuked,
-						$limit,
-						$offset
-					)
-				);
-			}
-			break;
-
-		case 's':
-		case 'sha1':
-			if (isset($_GET['sha1']) && strlen($_GET['sha1']) === 40) {
-				$db = new DB();
-				$preData = $db->query(
-					sprintf('SELECT * FROM prehash p INNER JOIN predbhash ph ON ph.pre_id = p.id WHERE MATCH(hashes) AGAINST (%s) %s %s %s LIMIT %d OFFSET %d',
-						$db->escapeString($_GET['sha1']),
-						$newer,
-						$older,
-						$nuked,
-						$limit,
-						$offset
-					)
-				);
-			}
-			break;
-
-		case 'a':
-		case 'all':
-			$db = new DB();
-			$preData = $db->query(
-				sprintf('SELECT * FROM prehash p WHERE 1=1 %s %s %s ORDER BY p.predate DESC LIMIT %d OFFSET %d',
-					$newer,
-					$older,
-					$nuked,
-					$limit,
-					$offset
-				)
-			);
-			break;
-	}
-}
-
-if ($json === false) {
-	header('Content-type: text/xml');
-	echo
-	'<?xml version="1.0" encoding="UTF-8"?>', PHP_EOL,
-	'<requests>', PHP_EOL;
-
-	if (count($preData) > 0) {
-		foreach ($preData as $data) {
-			echo
-			'<request',
-				' reqid="' . (!empty($data['requestid']) ? $data['requestid'] : '') . '"',
-				' md5="' . (!empty($data['md5']) ? $data['md5'] : '') . '"',
-				' sha1="' . (!empty($data['sha1']) ? $data['sha1'] : '') . '"',
-				' nuked="' . (!empty($data['nuked']) ? $data['nuked'] : '') . '"',
-				' category="' . (!empty($data['category']) ? $data['category'] : '') . '"',
-				' source="' . (!empty($data['source']) ? $data['source'] : '') . '"',
-				' nukereason="' . (!empty($data['nukereason']) ? $data['nukereason'] : '') . '"',
-				' files="' . (!empty($data['files']) ? $data['files'] : '') . '"',
-				' name="' . (!empty($data['title']) ? sanitize($data['title']) : '') . '"',
-				' date="' . (!empty($data['predate']) ? strtotime($data['predate']) : '') . '"',
-				' size="' . (!empty($data['size']) && $data['size'] != 'NULL' ? $data['size'] : '') . '"',
-			'/>';
-		}
-	}
-
-	echo '</requests>';
-} else {
-	header('Content-type: application/json');
-	echo json_encode($preData);
-}
-
-function apiError($error, $code)
-{
-	header('Content-type: text/xml');
-	exit(
-		'<?xml version="1.0" encoding="UTF-8"?>' .
-		PHP_EOL .
-		'<error code="' .
-		$code .
-		'" description="' .
-		$error .
-		'"/>' .
-		PHP_EOL
-	);
-}
-
-// There's some weird encoding issues in some of the pre titles.
-function sanitize($string)
-{
-	//return $string;
-	return preg_replace('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', '.', $string);
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/profileedit.php b/lib/copy_this/www/pages/profileedit.php
deleted file mode 100644
index 069898c60..000000000
--- a/lib/copy_this/www/pages/profileedit.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/sabnzbd.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/users.php");
-require_once(WWW_DIR . '/../misc/update_scripts/nix_scripts/tmux/lib/NZBGet.php');
-
-$category = new Category;
-$sab = new SABnzbd($page);
-$nzbGet = new NZBGet($page);
-$users = new Users();
-
-if (!$users->isLoggedIn())
-	$page->show403();
-
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-$userid = $users->currentUserId();
-$data = $users->getById($userid);
-if (!$data)
-	$page->show404();
-
-$errorStr = '';
-
-switch ($action) {
-	case 'newapikey':
-		$users->updateRssKey($userid);
-		header("Location: profileedit");
-		break;
-	case 'clearcookies':
-		$sab->unsetCookie();
-		header("Location: profileedit");
-		break;
-	case 'submit':
-
-		$data["email"] = $_POST['email'];
-		if (isset($_POST['saburl']) && strlen(trim($_POST['saburl'])) > 0 && !endsWith($_POST['saburl'], "/"))
-			$_POST['saburl'] = $_POST['saburl'] . "/";
-
-		if ($_POST['password'] != "" && $_POST['password'] != $_POST['confirmpassword']) {
-			$errorStr = "Password Mismatch";
-		} else if ($_POST['password'] != "" && !$users->isValidPassword($_POST['password'])) {
-			$errorStr = "Your password must be longer than five characters.";
-		} else if (isset($_POST['nzbgeturl']) && $nzbGet->verifyURL($_POST['nzbgeturl']) === false) {
-			$errorStr = "The NZBGet URL you entered is invalid!";
-		} else if (!$users->isValidEmail($_POST['email'])) {
-			$errorStr = "Your email is not a valid format.";
-		} else {
-			$res = $users->getByEmail($_POST['email']);
-			if ($res && $res["id"] != $userid) {
-				$errorStr = "Sorry, the email is already in use.";
-			} elseif ((empty($_POST['saburl']) && !empty($_POST['sabapikey'])) || (!empty($_POST['saburl']) && empty($_POST['sabapikey']))) {
-				$errorStr = "Insert a SABnzdb URL and API key.";
-			} else {
-				if (isset($_POST['sabsetting']) && $_POST['sabsetting'] == 2) {
-					$sab->setCookie($_POST['saburl'], $_POST['sabapikey'], $_POST['sabpriority'], $_POST['sabapikeytype']);
-					$_POST['saburl'] = $_POST['sabapikey'] = $_POST['sabpriority'] = $_POST['sabapikeytype'] = false;
-				}
-
-				$users->update(
-					$userid,
-					$data["username"],
-					$_POST['email'],
-					$data["grabs"],
-					$data["role"],
-					$data["notes"],
-					$data["invites"],
-					(isset($_POST['movieview']) ? "1" : "0"),
-					(isset($_POST['musicview']) ? "1" : "0"),
-					(isset($_POST['gameview']) ? "1" : "0"),
-					(isset($_POST['xxxview']) ? "1" : "0"),
-					(isset($_POST['consoleview']) ? "1" : "0"),
-					(isset($_POST['bookview']) ? "1" : "0"),
-					$_POST['queuetypeids'],
-					(isset($_POST['nzbgeturl']) ? $_POST['nzbgeturl'] : ''),
-					(isset($_POST['nzbgetusername']) ? $_POST['nzbgetusername'] : ''),
-					(isset($_POST['nzbgetpassword']) ? $_POST['nzbgetpassword'] : ''),
-					(isset($_POST['saburl']) ? $_POST['saburl'] : ''),
-					(isset($_POST['sabapikey']) ? $_POST['sabapikey'] : ''),
-					(isset($_POST['sabpriority']) ? $_POST['sabpriority'] : ''),
-					(isset($_POST['sabapikeytype']) ? $_POST['sabapikeytype'] : ''),
-					(isset($_POST['nzbvortex_server_url']) ? $_POST['nzbvortex_server_url'] : false),
-					(isset($_POST['nzbvortex_api_key']) ? $_POST['nzbvortex_api_key'] : false),
-					$_POST['cp_url'],
-					$_POST['cp_api']
-				);
-
-				$_POST['exccat'] = (!isset($_POST['exccat']) || !is_array($_POST['exccat'])) ? array() : $_POST['exccat'];
-				$users->addCategoryExclusions($userid, $_POST['exccat']);
-
-				if ($_POST['password'] != "")
-					$users->updatePassword($userid, $_POST['password']);
-
-				header("Location:" . WWW_TOP . "/profile");
-				die();
-			}
-		}
-		break;
-
-	case 'view':
-	default:
-		break;
-}
-
-
-$page->smarty->assign('error', $errorStr);
-$page->smarty->assign('user', $data);
-$page->smarty->assign('userexccat', $users->getCategoryExclusion($userid));
-
-$page->smarty->assign('saburl_selected', $sab->url);
-$page->smarty->assign('sabapikey_selected', $sab->apikey);
-
-$page->smarty->assign('sabapikeytype_ids', array(SABnzbd::API_TYPE_NZB, SABnzbd::API_TYPE_FULL));
-$page->smarty->assign('sabapikeytype_names', array('Nzb Api Key', 'Full Api Key'));
-$page->smarty->assign('sabapikeytype_selected', ($sab->apikeytype == '') ? SABnzbd::API_TYPE_NZB : $sab->apikeytype);
-
-$page->smarty->assign('sabpriority_ids', array(SABnzbd::PRIORITY_FORCE, SABnzbd::PRIORITY_HIGH, SABnzbd::PRIORITY_NORMAL, SABnzbd::PRIORITY_LOW, SABnzbd::PRIORITY_PAUSED));
-$page->smarty->assign('sabpriority_names', array('Force', 'High', 'Normal', 'Low', 'Paused'));
-$page->smarty->assign('sabpriority_selected', ($sab->priority == '') ? SABnzbd::PRIORITY_NORMAL : $sab->priority);
-
-$page->smarty->assign('sabsetting_ids', array(1, 2));
-$page->smarty->assign('sabsetting_names', array('Site', 'Cookie'));
-$page->smarty->assign('sabsetting_selected', ($sab->checkCookie() === true ? 2 : 1));
-
-switch ($sab->integrated) {
-	case SABnzbd::INTEGRATION_TYPE_USER:
-		$queueTypes = array('None', 'Sabnzbd', 'NZBGet');
-		$queueTypeIDs = array(Users::QUEUE_NONE, Users::QUEUE_SABNZBD, Users::QUEUE_NZBGET);
-		break;
-	case SABnzbd::INTEGRATION_TYPE_SITEWIDE:
-	case SABnzbd::INTEGRATION_TYPE_NONE:
-		$queueTypes = array('None', 'NZBGet');
-		$queueTypeIDs = array(Users::QUEUE_NONE, Users::QUEUE_NZBGET);
-		break;
-}
-
-$page->smarty->assign(array(
-		'queuetypes'   => $queueTypes,
-		'queuetypeids' => $queueTypeIDs
-	)
-);
-
-$page->meta_title = "Edit User Profile";
-$page->meta_keywords = "edit,profile,user,details";
-$page->meta_description = "Edit User Profile for " . $data["username"];
-
-$page->smarty->assign('cp_url_selected', $data['cp_url']);
-$page->smarty->assign('cp_api_selected', $data['cp_api']);
-
-
-$page->smarty->assign('catlist', $category->getForSelect(false));
-
-$page->content = $page->smarty->fetch('profileedit.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/queue.php b/lib/copy_this/www/pages/queue.php
deleted file mode 100644
index a5a5f3827..000000000
--- a/lib/copy_this/www/pages/queue.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/sabnzbd.php");
-require_once(WWW_DIR.'/../misc/update_scripts/nix_scripts/tmux/lib/NZBGet.php');
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$userData = $users->getById($users->currentUserId());
-if (!$userData) {
-	$page->show404();
-}
-$page->smarty->assign('user', $userData);
-
-$queueType = $error = '';
-$queue = null;
-switch($page->site->sabintegrationtype) {
-	case SABnzbd::INTEGRATION_TYPE_NONE:
-		if ($userData['queuetype'] == 2) {
-			$queueType = 'NZBGet';
-			$queue = new NZBGet($page);
-		}
-		break;
-	case SABnzbd::INTEGRATION_TYPE_SITEWIDE:
-		$queueType = 'Sabnzbd';
-		$queue = new SABnzbd($page);
-		break;
-	case SABnzbd::INTEGRATION_TYPE_USER:
-		switch((int)$userData['queuetype']) {
-			case 1:
-				$queueType = 'Sabnzbd';
-				$queue = new SABnzbd($page);
-				break;
-			case 2:
-				$queueType = 'NZBGet';
-				$queue = new NZBGet($page);
-				break;
-		}
-		break;
-}
-
-if (!is_null($queue)) {
-
-	if ($queueType === 'Sabnzbd') {
-		if (empty($queue->url)) {
-			$error = 'ERROR: The Sabnzbd URL is missing!';
-		}
-
-		if (empty($queue->apikey)) {
-			if ($error === '') {
-				$error = 'ERROR: The Sabnzbd API key is missing!';
-			} else {
-				$error .= ' The Sabnzbd API key is missing!';
-			}
-		}
-	}
-
-	if ($error === '') {
-		if (isset($_REQUEST["del"])) {
-			$queue->delFromQueue($_REQUEST['del']);
-		}
-
-		if (isset($_REQUEST["pause"])) {
-			$queue->pauseFromQueue($_REQUEST['pause']);
-		}
-
-		if (isset($_REQUEST["resume"])) {
-			$queue->resumeFromQueue($_REQUEST['resume']);
-		}
-
-		if (isset($_REQUEST["pall"])) {
-			$queue->pauseAll();
-		}
-
-		if (isset($_REQUEST["rall"])) {
-			$queue->resumeAll();
-		}
-
-		$page->smarty->assign('serverURL', $queue->url);
-	}
-}
-
-$page->smarty->assign(array('queueType' => $queueType, 'error' => $error, 'user', $users));
-$page->title = "Your $queueType Download Queue";
-$page->meta_title = "View $queueType Queue";
-$page->meta_keywords = "view," . strtolower($queueType) .",queue";
-$page->meta_description = "View $queueType Queue";
-
-$page->content = $page->smarty->fetch('viewqueue.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/register.php b/lib/copy_this/www/pages/register.php
deleted file mode 100644
index be1b696ec..000000000
--- a/lib/copy_this/www/pages/register.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/site.php");
-
-if ($users->isLoggedIn())
-	$page->show404();
-
-$showregister = 1;
-
-if ($page->site->registerstatus == Sites::REGISTER_STATUS_CLOSED)
-{
-	$page->smarty->assign('error', "Registrations are currently disabled.");
-	$showregister = 0;
-}
-elseif ($page->site->registerstatus == Sites::REGISTER_STATUS_INVITE && (!isset($_REQUEST['invitecode']) || empty($_REQUEST['invitecode'])))
-{
-	$page->smarty->assign('error', "Registrations are currently invite only.");
-	$showregister = 0;
-}
-
-// Use recaptcha?
-if ($page->site->registerrecaptcha == 1)
-{
-	require_once(WWW_DIR."/lib/recaptchalib.php");
-	$page->smarty->assign('recaptcha', recaptcha_get_html($page->site->recaptchapublickey, null, $page->secure_connection));
-}
-
-if ($showregister == 0)
-{
-	$page->smarty->assign('showregister', "0");
-}
-else {
-
-	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'view';
-
-	switch ($action) {
-		case 'submit':
-
-			$username = htmlspecialchars($_POST['username']);
-			$password = htmlspecialchars($_POST['password']);
-			$confirmpassword = htmlspecialchars($_POST['confirmpassword']);
-			$email = htmlspecialchars($_POST['email']);
-			$invitecode = htmlspecialchars($_POST['invitecode']);
-
-			$page->smarty->assign('username', $username);
-			$page->smarty->assign('password', $password);
-			$page->smarty->assign('confirmpassword', $confirmpassword);
-			$page->smarty->assign('email', $email);
-			$page->smarty->assign('invitecode', $invitecode);
-
-			//
-			// check uname/email isnt in use, password valid.
-			// if all good create new user account and redirect back to home page
-			//
-			if ($password != $confirmpassword) {
-				$page->smarty->assign('error', "Password Mismatch");
-			} else {
-				//get the default user role
-				$userdefault = $users->getDefaultRole();
-
-				$ret = $users->signup($username, $password, $email, $_SERVER['REMOTE_ADDR'], $userdefault['id'], "", $userdefault['defaultinvites'], $invitecode, false, isset($_POST['recaptcha_challenge_field']) ? $_POST['recaptcha_challenge_field'] : null, isset($_POST['recaptcha_response_field']) ? $_POST['recaptcha_response_field'] : null);
-				if ($ret > 0) {
-					$users->login($ret, $_SERVER['REMOTE_ADDR']);
-					header("Location: " . WWW_TOP . "/");
-				} else {
-					switch ($ret) {
-						case Users::ERR_SIGNUP_BADUNAME:
-							$page->smarty->assign('error', "Your username must be longer than three characters.");
-							break;
-						case Users::ERR_SIGNUP_BADPASS:
-							$page->smarty->assign('error', "Your password must be longer than five characters.");
-							break;
-						case Users::ERR_SIGNUP_BADEMAIL:
-							$page->smarty->assign('error', "Your email is not a valid format.");
-							break;
-						case Users::ERR_SIGNUP_UNAMEINUSE:
-							$page->smarty->assign('error', "Sorry, the username is already taken.");
-							break;
-						case Users::ERR_SIGNUP_EMAILINUSE:
-							$page->smarty->assign('error', "Sorry, the email is already in use.");
-							break;
-						case Users::ERR_SIGNUP_BADINVITECODE:
-							$page->smarty->assign('error', "Sorry, the invite code is old or has been used.");
-							break;
-						case Users::ERR_SIGNUP_BADCAPTCHA:
-							$page->smarty->assign('error', "Sorry, your captcha code was incorrect.");
-							break;
-						default:
-							$page->smarty->assign('error', "Failed to register.");
-							break;
-					}
-				}
-			}
-			break;
-		case "view": {
-			$invitecode = isset($_GET["invitecode"]) ? htmlspecialchars($_GET["invitecode"]) : null;
-			if (isset($invitecode)) {
-					//
-					// see if it is a valid invite
-					//
-					$invite = $users->getInvite($invitecode);
-					if (!$invite) {
-						$page->smarty->assign('error', sprintf("Bad or invite code older than %d days.", Users::DEFAULT_INVITE_EXPIRY_DAYS));
-						$page->smarty->assign('showregister', "0");
-					} else {
-						$page->smarty->assign('invitecode', $invite["guid"]);
-					}
-				}
-				break;
-			}
-		}
-	}
-
-$page->meta_title = "Register";
-$page->meta_keywords = "register,signup,registration";
-$page->meta_description = "Register";
-
-$page->content = $page->smarty->fetch('register.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/search.php b/lib/copy_this/www/pages/search.php
deleted file mode 100644
index 17b5fb3b0..000000000
--- a/lib/copy_this/www/pages/search.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/groups.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/ReleaseSearch.php");
-
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$grp = new Groups();
-$releases = new Releases();
-$c = new Category();
-
-$page->meta_title = "Search Nzbs";
-$page->meta_keywords = "search,nzb,description,details";
-$page->meta_description = "Search for Nzbs";
-
-$results = array();
-$searchtype = "basic";
-$searchStr = "";
-
-if (isset($_REQUEST["search_type"]) && $_REQUEST["search_type"] == "adv") {
-	$searchtype = "advanced";
-}
-
-if (isset($_REQUEST["id"]) && !isset($_REQUEST["searchadvr"]) && !isset($_REQUEST["subject"])) {
-	$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-	$ordering = $releases->getBrowseOrdering();
-	$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-	if ($searchtype == "basic") {
-		$searchStr = (string) $_REQUEST["id"];
-		$categoryId = array();
-		if (isset($_REQUEST["t"])) {
-			$categoryId = explode(",", $_REQUEST["t"]);
-		} else {
-			$categoryId[] = -1;
-		}
-
-		foreach ($ordering as $ordertype) {
-			$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/search/" . htmlentities($searchStr) . "?t=" . (implode(',', $categoryId)) . "&amp;ob=" . $ordertype);
-		}
-
-		$page->smarty->assign('category', $categoryId);
-		$page->smarty->assign('pagerquerybase', WWW_TOP . "/search/" . htmlentities($searchStr) . "?t=" . (implode(',', $categoryId)) . "&amp;ob=" . $orderby . "&amp;offset=");
-		$page->smarty->assign('search', $searchStr);
-		if (isset ($_REQUEST['subject'])) {
-			$page->smarty->assign('subject', $_REQUEST['subject']);
-		}
-		$results = $releases->search($searchStr, -1, -1, -1, $categoryId, -1, -1, 0, 0, -1, -1, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
-	}
-
-	$page->smarty->assign('lastvisit', $page->userdata['lastlogin']);
-	if (sizeof($results) > 0) {
-		$totalRows = $results[0]['_totalrows'];
-	} else {
-		$totalRows = 0;
-	}
-
-	$page->smarty->assign('pagertotalitems', $totalRows);
-	$page->smarty->assign('pageroffset', $offset);
-	$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
-	$page->smarty->assign('pagerquerysuffix', "#results");
-
-	$pager = $page->smarty->fetch("pager.tpl");
-	$page->smarty->assign('pager', $pager);
-}
-
-if (isset($_REQUEST["subject"]) && !isset($_REQUEST["searchadvr"]) && !isset($_REQUEST["id"])) {
-	$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-	$ordering = $releases->getBrowseOrdering();
-	$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-	if ($searchtype == "basic") {
-		$searchStr = (string) $_REQUEST["subject"];
-
-		$categoryId = array();
-		if (isset($_REQUEST["t"])) {
-			$categoryId = explode(",", $_REQUEST["t"]);
-		} else {
-			$categoryId[] = -1;
-		}
-
-		foreach ($ordering as $ordertype) {
-			$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/search/" . htmlentities($searchStr) . "?t=" . (implode(',', $categoryId)) . "&amp;ob=" . $ordertype);
-		}
-
-		$page->smarty->assign('category', $categoryId);
-		$page->smarty->assign('pagerquerybase', WWW_TOP . "/search/" . htmlentities($searchStr) . "?t=" . (implode(',', $categoryId)) . "&amp;ob=" . $orderby . "&amp;offset=");
-		$page->smarty->assign('subject', $searchStr);
-		$results = $releases->search($searchStr, -1, -1, -1, $categoryId, -1, -1, 0, 0, -1, -1, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"]);
-	}
-
-	$page->smarty->assign('lastvisit', $page->userdata['lastlogin']);
-	if (sizeof($results) > 0) {
-		$totalRows = $results[0]['_totalrows'];
-	} else {
-		$totalRows = 0;
-	}
-
-	$page->smarty->assign('pagertotalitems', $totalRows);
-	$page->smarty->assign('pageroffset', $offset);
-	$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
-	$page->smarty->assign('pagerquerysuffix', "#results");
-
-	$pager = $page->smarty->fetch("pager.tpl");
-	$page->smarty->assign('pager', $pager);
-}
-
-if (isset($_REQUEST["searchadvr"]) && !isset($_REQUEST["id"]) && !isset($_REQUEST["subject"])) {
-	$offset = (isset($_REQUEST["offset"]) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-	$ordering = $releases->getBrowseOrdering();
-	$orderby = isset($_REQUEST["ob"]) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST["ob"] : '';
-
-	if ($searchtype !== "basic") {
-
-		$searchSearchName = (string) $_REQUEST["searchadvr"];
-		$searchUsenetName = (string) $_REQUEST["searchadvsubject"];
-		$searchPoster = (string) $_REQUEST["searchadvposter"];
-		$searchdaysnew = (string) $_REQUEST["searchadvdaysnew"];
-		$searchdaysold = (string) $_REQUEST["searchadvdaysold"];
-		$searchGroups = (string) $_REQUEST["searchadvgroups"];
-		$searchCat = (string) $_REQUEST["searchadvcat"];
-		$searchSizeFrom = (string) $_REQUEST["searchadvsizefrom"];
-		$searchSizeTo = (string) $_REQUEST["searchadvsizeto"];
-		$searchHasNFO = (string) $_REQUEST["searchadvhasnfo"];
-		$searchHascomments = (string) $_REQUEST["searchadvhascomments"];
-
-		$page->smarty->assign('searchadvr', $searchSearchName);
-		$page->smarty->assign('searchadvsubject', $searchUsenetName);
-		$page->smarty->assign('searchadvposter', $searchPoster);
-		$page->smarty->assign('searchadvdaysnew', $searchdaysnew);
-		$page->smarty->assign('searchadvdaysold', $searchdaysold);
-		$page->smarty->assign('selectedgroup', $searchGroups);
-		$page->smarty->assign('selectedcat', $searchCat);
-		$page->smarty->assign('selectedsizefrom', $searchSizeFrom);
-		$page->smarty->assign('selectedsizeto', $searchSizeTo);
-		$page->smarty->assign('searchadvhasnfo', $searchHasNFO);
-		$page->smarty->assign('searchadvhascomments', $searchHascomments);
-		foreach ($ordering as $ordertype) {
-			$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/search?searchadvr=" . htmlentities($searchSearchName) . "&searchadvsubject=" . htmlentities($searchUsenetName) . "&searchadvposter=" . htmlentities($searchPoster) . "&searchadvdaysnew=" . htmlentities($searchdaysnew) . "&searchadvdaysold=" . htmlentities($searchdaysold) . "&searchadvgroups=" . htmlentities($searchGroups) . "&searchadvcat=" . htmlentities($searchCat) . "&searchadvsizefrom=" . htmlentities($searchSizeFrom) . "&searchadvsizeto=" . htmlentities($searchSizeTo) . "&searchadvhasnfo=" . htmlentities($searchHasNFO) . "&searchadvhascomments=" . htmlentities($searchHascomments) . "&search_type=adv" . "&amp;ob=" . $ordertype);
-		}
-
-		$page->smarty->assign('pagerquerybase', WWW_TOP . "/search?searchadvr=" . htmlentities($searchSearchName) . "&searchadvsubject=" . htmlentities($searchUsenetName) . "&searchadvposter=" . htmlentities($searchPoster) . "&searchadvdaysnew=" . htmlentities($searchdaysnew) . "&searchadvdaysold=" . htmlentities($searchdaysold) . "&searchadvgroups=" . htmlentities($searchGroups) . "&searchadvcat=" . htmlentities($searchCat) . "&searchadvsizefrom=" . htmlentities($searchSizeFrom) . "&searchadvsizeto=" . htmlentities($searchSizeTo) . "&searchadvhasnfo=" . htmlentities($searchHasNFO) . "&searchadvhascomments=" . htmlentities($searchHascomments) . "&search_type=adv" . "&amp;ob=" . $orderby . "&amp;offset=");
-		if ($_REQUEST["searchadvr"] == "") {
-			$searchSearchName = -1;
-		}
-		if ($_REQUEST["searchadvsubject"] == "") {
-			$searchUsenetName = -1;
-		}
-		if ($_REQUEST["searchadvposter"] == "") {
-			$searchPoster = -1;
-		}
-		if ($_REQUEST["searchadvdaysnew"] == "") {
-			$searchdaysnew = -1;
-		}
-		if ($_REQUEST["searchadvdaysold"] == "") {
-			$searchdaysold = -1;
-		}
-		if ($_REQUEST["searchadvcat"] == "") {
-			$searchCat = -1;
-		}
-		$results = $releases->search($searchSearchName, $searchUsenetName, $searchPoster, $searchGroups, [$searchCat], $searchSizeFrom, $searchSizeTo, $searchHasNFO, $searchHascomments, $searchdaysnew, $searchdaysold, $offset, ITEMS_PER_PAGE, $orderby, -1, $page->userdata["categoryexclusions"], "advanced");
-	}
-
-	$page->smarty->assign('lastvisit', $page->userdata['lastlogin']);
-	if (sizeof($results) > 0) {
-		$totalRows = $results[0]['_totalrows'];
-	} else {
-		$totalRows = 0;
-	}
-
-	$page->smarty->assign('pagertotalitems', $totalRows);
-	$page->smarty->assign('pageroffset', $offset);
-	$page->smarty->assign('pageritemsperpage', ITEMS_PER_PAGE);
-	$page->smarty->assign('pagerquerysuffix', "#results");
-
-	$pager = $page->smarty->fetch("pager.tpl");
-	$page->smarty->assign('pager', $pager);
-}
-
-$grouplist = $grp->getGroupsForSelect();
-$page->smarty->assign('grouplist', $grouplist);
-
-$catlist = $c->getForSelect();
-$page->smarty->assign('catlist', $catlist);
-
-$sizelist = array(-1 => '--Select--',
-	1 => '100MB',
-	2 => '250MB',
-	3 => '500MB',
-	4 => '1GB',
-	5 => '2GB',
-	6 => '3GB',
-	7 => '4GB',
-	8 => '8GB',
-	9 => '16GB',
-	10 => '32GB',
-	11 => '64GB'
-);
-
-$page->smarty->assign('sizelist', $sizelist);
-$page->smarty->assign('results', $results);
-$page->smarty->assign('sadvanced', ($searchtype != "basic"));
-
-$ft1 = $page->settings->checkIndex('releases', 'ix_releases_name_searchname_ft');
-$ft2 = $page->settings->checkIndex('releases', 'ix_releases_name_ft');
-$ft3 = $page->settings->checkIndex('releases', 'ix_releases_searchname_ft');
-switch (NN_RELEASE_SEARCH_TYPE) {
-	case ReleaseSearch::FULLTEXT:
-		$search_description =
-'MySQL Full Text Search Rules:<br />
-A leading exclamation point(! in place of +) indicates that this word must be present in each row that is returned.<br />
-A leading minus sign indicates that this word must not be present in any of the rows that are returned.<br />
-By default (when neither + nor - is specified) the word is optional, but the rows that contain it are rated higher.<br />
-See <a target="_blank" href=\'http://dev.mysql.com/doc/refman/5.0/en/fulltext-boolean.html\'>docs</a> for more operators.';
-		break;
-	case ReleaseSearch::LIKE:
-		$search_description = 'Include ^ to indicate search must start with term, -- to exclude words.';
-		break;
-	case ReleaseSearch::SPHINX:
-	default:
-		$search_description =
-'Sphinx Search Rules:<br />
-The search is case insensitive.<br />
-All words must be separated by spaces.
-Do not seperate words using . or _ or -, sphinx will match a space against those automatically.<br />
-Putting | between words makes any of those words optional.<br />
-Putting << between words makes the word on the left have to be before the word on the right.<br />
-Putting - or ! in front of a word makes that word excluded. Do not add a space between the - or ! and the word.<br />
-Quoting all the words using " will look for an exact match.<br />
-Putting ^ at the start will limit searches to releases that start with that word.<br />
-Putting $ at the end will limit searches to releases that end with that word.<br />
-Putting a * after a word will do a partial word search. ie: fish* will match fishing.<br />
-If your search is only words seperated by spaces, all those words will be mandatory, the order of the words is not important.<br />
-You can enclose words using paranthesis. ie: (^game*|^dex*)s03*(x264<&lt;nogrp$)<br />
-You can combine some of these rules, but not all.<br />';
-		break;
-}
-$page->smarty->assign('search_description', $search_description);
-
-
-$page->content = $page->smarty->fetch('search.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/sendtoqueue.php b/lib/copy_this/www/pages/sendtoqueue.php
deleted file mode 100644
index c8b512f12..000000000
--- a/lib/copy_this/www/pages/sendtoqueue.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/sabnzbd.php");
-require_once(WWW_DIR.'/../misc/update_scripts/nix_scripts/tmux/lib/NZBGet.php');
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-if (empty($_GET["id"])) {
-	$page->show404();
-}
-
-$user = $users->getById($users->currentUserId());
-if ($user['queuetype'] != 2) {
-
-	$sab = new SABnzbd($page);
-	if (empty($sab->url)) {
-		$page->show404();
-	}
-	if (empty($sab->apikey)) {
-		$page->show404();
-	}
-	$sab->sendToSab($_GET["id"]);
-
-} elseif ($user['queuetype'] == 2) {
-	$nzbget = new NZBGet($page);
-	$nzbget->sendURLToNZBGet($_GET['id']);
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/series.php b/lib/copy_this/www/pages/series.php
deleted file mode 100644
index 34bd8603b..000000000
--- a/lib/copy_this/www/pages/series.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/releases.php");
-require_once(WWW_DIR."/lib/category.php");
-require_once(WWW_DIR."/lib/userseries.php");
-require_once(WWW_DIR.'/../misc/update_scripts/nix_scripts/tmux/lib/TvAnger.php');
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$releases = new Releases();
-$tvrage = new TvAnger();
-$cat = new Category();
-$us = new UserSeries();
-
-if (isset($_GET["id"]) && ctype_digit($_GET['id'])) {
-	$category = -1;
-	if (isset($_REQUEST["t"]) && ctype_digit($_REQUEST["t"])) {
-		$category = $_REQUEST["t"];
-	}
-
-	$catarray = array();
-	$catarray[] = $category;
-
-	$rel = $releases->searchbyRageId($_GET["id"], '', '', 0, 1000, "", $catarray, -1);
-	$rage = $tvrage->getByRageID($_GET['id']);
-
-	if (!$rage) {
-		$page->smarty->assign("nodata", "No tvrage information for this series.");
-	} elseif (!$rel) {
-		$page->smarty->assign("nodata", "No releases for this series.");
-	} else {
-		$myshows = $us->getShow($users->currentUserId(), $rage[0]['rageid']);
-
-		// Sort releases by season, episode, date posted.
-		$season = $episode = $posted = array();
-		foreach ($rel as $rlk => $rlv) {
-			$season[$rlk] = $rlv['season'];
-			$episode[$rlk] = $rlv['episode'];
-			$posted[$rlk] = $rlv['postdate'];
-		}
-		array_multisort($season, SORT_DESC, $episode, SORT_DESC, $posted, SORT_DESC, $rel);
-
-		$seasons = array();
-		foreach ($rel as $r) {
-			$seasons[$r['season']][$r['episode']][] = $r;
-		}
-
-		$page->smarty->assign('seasons', $seasons);
-		$page->smarty->assign('rage', $rage);
-		$page->smarty->assign('myshows', $myshows);
-
-		//get series name(s), description, country and genre
-		$seriesnames = $seriesdescription = $seriescountry = $seriesgenre = array();
-		foreach ($rage as $r) {
-			$seriesnames[] = $r['releasetitle'];
-			if (!empty($r['description'])) {
-				$seriesdescription[] = $r['description'];
-			}
-
-			if (!empty($r['country'])) {
-				$seriescountry[] = $r['country'];
-			}
-
-			if (!empty($r['genre'])) {
-				$seriesgenre[] = str_replace('|', ' - ', $r['genre']);
-			}
-		}
-		$seriesnames = implode('/', array_map("trim", $seriesnames));
-		$page->smarty->assign('seriesnames', $seriesnames);
-		$page->smarty->assign('seriesdescription', array_shift($seriesdescription));
-		$page->smarty->assign('seriescountry', array_shift($seriescountry));
-		$page->smarty->assign('seriesgenre', array_shift($seriesgenre));
-
-		$page->title = "$seriesnames";
-		$page->meta_title = "View TV Series $seriesnames";
-		$page->meta_keywords = "view,series,tv,show,description,details";
-		$page->meta_description = "View $seriesnames Series";
-
-		if ($category != -1) {
-			$cdata = $cat->getById($category);
-			$catid = $category;
-		} else {
-			$cdata = array('title' => '');
-			$catid = '';
-		}
-		$page->smarty->assign('catname', $cdata["title"]);
-		$page->smarty->assign('category', $catid);
-	}
-	$page->content = $page->smarty->fetch('viewseries.tpl');
-	$page->render();
-} else {
-	$letter = (isset($_GET["id"]) && preg_match('/^(0\-9|[A-Z])$/i', $_GET['id'])) ? $_GET['id'] : '0-9';
-
-	$ragename = (isset($_GET['title']) && !empty($_GET['title'])) ? $_GET['title'] : '';
-
-	if ($ragename != "" && !isset($_GET["id"])) {
-		$letter = "";
-	}
-
-	$masterserieslist = $tvrage->getSeriesList($users->currentUserId(), $letter, $ragename);
-
-	$page->title = 'Series List';
-	$page->meta_title = "View Series List";
-	$page->meta_keywords = "view,series,tv,show,description,details";
-	$page->meta_description = "View Series List";
-
-	$serieslist = array();
-	foreach ($masterserieslist as $s) {
-		if (preg_match('/^[0-9]/', $s['releasetitle'])) {
-			$thisrange = '0-9';
-		} else {
-			preg_match('/([A-Z]).*/i', $s['releasetitle'], $matches);
-			$thisrange = strtoupper($matches[1]);
-		}
-		$serieslist[$thisrange][] = $s;
-	}
-	ksort($serieslist);
-
-	$page->smarty->assign('serieslist', $serieslist);
-	$page->smarty->assign('seriesrange', range('A', 'Z'));
-	$page->smarty->assign('seriesletter', $letter);
-	$page->smarty->assign('ragename', $ragename);
-
-	$page->content = $page->smarty->fetch('viewserieslist.tpl');
-	$page->render();
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/upcoming.php b/lib/copy_this/www/pages/upcoming.php
deleted file mode 100644
index 6b63f55c1..000000000
--- a/lib/copy_this/www/pages/upcoming.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-require_once (NN_TMUX . 'lib' . DS . 'Film.php');
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$m = new Film();
-
-if (!isset($_GET["id"])) {
-	$_GET["id"] = 1;
-}
-$user = $users->getById($users->currentUserId());
-$cpapi = $user['cp_api'];
-$cpurl = $user['cp_url'];
-$page->smarty->assign('cpapi', $cpapi);
-$page->smarty->assign('cpurl', $cpurl);
-
-$data = $m->getUpcoming($_GET["id"]);
-//print_r(json_decode($data["info"])->movies);die();
-if ($data["info"] == "") {
-	$page->smarty->assign("nodata", "No upcoming data.");
-} else {
-	$data = json_decode($data["info"]);
-
-	if (isset($data->error)) {
-		$page->smarty->assign("nodata", $data->error);
-	} else if (!isset($data->movies)) {
-		$page->smarty->assign("nodata", 'Unspecified error.');
-	} else {
-		$page->smarty->assign('data', $data->movies);
-
-		switch ($_GET["id"]) {
-			case Film::SRC_BOXOFFICE;
-				$page->title = "Box Office";
-				break;
-			case Film::SRC_INTHEATRE;
-				$page->title = "In Theater";
-				break;
-			case Film::SRC_OPENING;
-				$page->title = "Opening";
-				break;
-			case Film::SRC_UPCOMING;
-				$page->title = "Upcoming";
-				break;
-			case Film::SRC_DVD;
-				$page->title = "DVD Releases";
-				break;
-		}
-	}
-	$page->meta_title = "View upcoming theatre releases";
-	$page->meta_keywords = "view,series,theatre,dvd";
-	$page->meta_description = "View upcoming theatre releases";
-}
-
-/**
- * Replace _tmb.jpg with user setting from site edit.
- *
- * @param string $imageURL    The url to change.
- * @param string $userSetting The users's setting.
- *
- * @return string
- */
-function replace_quality($imageURL, $userSetting)
-{
-	$types = array('thumbnail' => '_tmb.', 'profile' => '_pro.', 'detailed' => '_det.', 'original' => '_ori.');
-	return preg_replace("#http://resizing\.flixster\.com(/[\w=+-]+){3}\.cloudfront\.net#i", "https://content6.flixster.com", str_replace('_ori.', $types[$userSetting], $imageURL));
-}
-
-$page->content = $page->smarty->fetch('upcoming.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/xxx.php b/lib/copy_this/www/pages/xxx.php
deleted file mode 100644
index 65cf90fe3..000000000
--- a/lib/copy_this/www/pages/xxx.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/XXX.php");
-require_once(WWW_DIR . "/lib/category.php");
-
-if (!$users->isLoggedIn()) {
-	$page->show403();
-}
-
-$movie = new XXX();
-$cat = new Category();
-
-$moviecats = $cat->getChildren(Category::CAT_PARENT_XXX);
-$mtmp = array();
-foreach ($moviecats as $mcat) {
-	$mtmp[$mcat['id']] = $mcat;
-}
-$category = Category::CAT_PARENT_XXX;
-if (isset($_REQUEST['t']) && array_key_exists($_REQUEST['t'], $mtmp)) {
-	$category = $_REQUEST['t'] + 0;
-}
-$catarray = array();
-$catarray[] = $category;
-
-$page->smarty->assign('catlist', $mtmp);
-$page->smarty->assign('category', $category);
-
-$browsecount = $movie->getXXXCount($catarray, -1, $page->userdata['categoryexclusions']);
-
-$offset = (isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset'])) ? $_REQUEST["offset"] : 0;
-$ordering = $movie->getXXXOrdering();
-$orderby = isset($_REQUEST['ob']) && in_array($_REQUEST['ob'], $ordering) ? $_REQUEST['ob'] : '';
-
-$results = $movies = array();
-$results = $movie->getXXXRange($catarray, $offset, ITEMS_PER_COVER_PAGE, $orderby, -1, $page->userdata['categoryexclusions']);
-foreach ($results as $result) {
-	$result['genre'] = $movie->makeFieldLinks($result, 'genre');
-	$result['actors'] = $movie->makeFieldLinks($result, 'actors');
-	$result['director'] = $movie->makeFieldLinks($result, 'director');
-	$movies[] = $result;
-}
-$title = (isset($_REQUEST['title']) && !empty($_REQUEST['title'])) ? stripslashes($_REQUEST['title']) : '';
-$page->smarty->assign('title', stripslashes($title));
-
-$actors = (isset($_REQUEST['actors']) && !empty($_REQUEST['actors'])) ? stripslashes($_REQUEST['actors']) : '';
-$page->smarty->assign('actors', $actors);
-
-$director = (isset($_REQUEST['director']) && !empty($_REQUEST['director'])) ? stripslashes($_REQUEST['director']) : '';
-$page->smarty->assign('director', $director);
-
-$genres = (array)$movie->getAllGenres(true);
-$genre = (isset($_REQUEST['genre']) && in_array($_REQUEST['genre'], $genres)) ? $_REQUEST['genre'] : '';
-$page->smarty->assign('genres', $genres);
-$page->smarty->assign('genre', $genre);
-
-$browseby_link = '&amp;title=' . $title . '&amp;actors=' . $actors . '&amp;director=' . $director . '&amp;genre=' . $genre;
-
-$page->smarty->assign('pagertotalitems', $browsecount);
-$page->smarty->assign('pageroffset', $offset);
-$page->smarty->assign('pageritemsperpage', ITEMS_PER_COVER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP . "/xxx?t=" . $category . $browseby_link . "&amp;ob=" . $orderby . "&amp;offset=");
-$page->smarty->assign('pagerquerysuffix', "#results");
-
-$pager = $page->smarty->fetch("pager.tpl");
-$page->smarty->assign('pager', $pager);
-
-if ($category == -1) {
-	$page->smarty->assign("catname", "All");
-} else {
-	$cdata = $cat->getById($category);
-	if ($cdata) {
-		$page->smarty->assign('catname', $cdata['title']);
-	} else {
-		$page->show404();
-	}
-}
-
-foreach ($ordering as $ordertype) {
-	$page->smarty->assign('orderby' . $ordertype, WWW_TOP . "/xxx?t=" . $category . $browseby_link . "&amp;ob=" . $ordertype . "&amp;offset=0");
-}
-
-$page->smarty->assign('results', $movies);
-
-$page->meta_title = "Browse XXX";
-$page->meta_keywords = "browse,xxx,nzb,description,details";
-$page->meta_description = "Browse for XXX Movies";
-
-$page->content = $page->smarty->fetch('xxx.tpl');
-$page->render();
\ No newline at end of file
diff --git a/lib/copy_this/www/pages/xxxmodal.php b/lib/copy_this/www/pages/xxxmodal.php
deleted file mode 100644
index fa26e0724..000000000
--- a/lib/copy_this/www/pages/xxxmodal.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/XXX.php");
-
-if (!$page->users->isLoggedIn()) {
-	$page->show403();
-}
-
-$movie = new XXX();
-
-if (isset($_GET["id"]) && ctype_digit($_GET["id"])) {
-	$mov = $movie->getXXXInfo($_GET['id']);
-	if (!$mov) {
-		$page->show404();
-	}
-
-	$mov['actors'] = $movie->makeFieldLinks($mov, 'actors');
-	$mov['genre'] = $movie->makeFieldLinks($mov, 'genre');
-	$mov['director'] = $movie->makeFieldLinks($mov, 'director');
-
-	$page->smarty->assign('movie', $mov);
-
-	$page->title = "Info for " . $mov['title'];
-	$page->meta_title = "";
-	$page->meta_keywords = "";
-	$page->meta_description = "";
-	$page->smarty->registerPlugin('modifier', 'ss', 'stripslashes');
-
-	$modal = false;
-	if (isset($_GET['modal'])) {
-		$modal = true;
-		$page->smarty->assign('modal', true);
-	}
-
-	$page->content = $page->smarty->fetch('viewxxx.tpl');
-
-	if ($modal) {
-		echo $page->content;
-	} else {
-		$page->render();
-	}
-}
diff --git a/lib/copy_this/www/populate/AniDB.php b/lib/copy_this/www/populate/AniDB.php
deleted file mode 100644
index c5f3e8686..000000000
--- a/lib/copy_this/www/populate/AniDB.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(NN_TMUX . 'lib' . DS . 'simple_html_dom.php');
-
-
-class PopulateAniDB
-{
-	const CLIENT_VERSION = 2;
-
-	/**
-	 * Whether or not to echo message output
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * The directory to store AniDB covers
-	 * @var string
-	 */
-	public $imgSavePath;
-
-	/**
-	 * @var \DB
-	 */
-	public $pdo;
-
-	/**
-	 * The AniDB id we are looking up
-	 * @var bool
-	 */
-	private $anidbId;
-
-	/**
-	 * The name of the nZEDb client for AniDB lookups
-	 * @var string
-	 */
-	private $apiKey;
-
-	/**
-	 * Whether or not AniDB thinks our client is banned
-	 * @var bool
-	 */
-	private $banned;
-
-	/**
-	 * The last unixtime a full AniDB update was run
-	 * @var string
-	 */
-	private $lastUpdate;
-
-	/**
-	 * The number of days between full AniDB updates
-	 * @var string
-	 */
-	private $updateInterval;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = [])
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo        = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$s = new \Sites();
-		$this->site = $s->get();
-
-		//		$maxanidbprocessed = $this->pdo->getSetting('maxanidbprocessed');
-		$anidbupdint = $this->site->intanidbupdate;
-		$lastupdated = $this->site->lastanidbupdate;
-
-		$this->imgSavePath = NN_COVERS . 'anime' . DS;
-		$this->apiKey      = $this->site->anidbkey;
-
-		$this->updateInterval = (isset($anidbupdint) ? $anidbupdint : '7');
-		$this->lastUpdate     = (isset($lastupdated) ? $lastupdated : '0');
-		$this->banned         = false;
-	}
-
-	/**
-	 * Main switch that initiates AniDB table population
-	 *
-	 * @param string  $type
-	 * @param integer $anidbId
-	 */
-	public function populateTable($type = '', $anidbId = 0)
-	{
-		switch ($type) {
-			case 'full':
-				$this->populateMainTable();
-				break;
-			case 'info':
-				$this->anidbId = $anidbId;
-				$this->populateInfoTable();
-		}
-	}
-
-	/**
-	 * Checks for an existing anime title in anidb table
-	 *
-	 * @param int    $id    The AniDB id to be inserted
-	 * @param string $type  The title type
-	 * @param string $lang  The title language
-	 * @param string $title The title of the Anime
-	 *
-	 * @return array|bool
-	 */
-	private function checkDuplicateDbEntry($id, $type, $lang, $title)
-	{
-		return $this->pdo->queryOneRow(
-						 sprintf('
-							SELECT anidbid
-							FROM anidb_titles
-							WHERE anidbid = %d
-							AND type = %s
-							AND lang = %s
-							AND title = %s',
-								 $id,
-								 $this->pdo->escapeString($type),
-								 $this->pdo->escapeString($lang),
-								 $this->pdo->escapeString($title)
-						 )
-		);
-	}
-
-	/**
-	 * Retrieves supplemental anime info from the AniDB API
-	 *
-	 * @param int    $id    The AniDB id to be inserted
-	 * @param string $type  The title type
-	 * @param string $lang  The title language
-	 * @param string $title The title of the Anime
-	 *
-	 * @return array|bool
-	 */
-	private function getAniDbAPI()
-	{
-		$timestamp = $this->site->banned + 90000;
-		if ($timestamp > time()) {
-			echo "Banned from AniDB lookups until " . date('Y-m-d H:i:s', $timestamp) . "\n";
-			return false;
-		}
-		$apiresponse = $this->getAniDbResponse();
-
-		$AniDBAPIArray = array();
-
-		if (!$apiresponse) {
-			echo "AniDB: Error getting response." . PHP_EOL;
-		} elseif (preg_match("/\<error\>Banned\<\/error\>/", $apiresponse)) {
-			$this->banned = true;
-			$time = time();
-			$this->pdo->queryExec(sprintf('UPDATE `site` SET VALUE = %s WHERE setting = `banned`', $time));
-		} elseif (preg_match("/\<error\>Anime not found\<\/error\>/", $apiresponse)) {
-			echo "AniDB   : Anime not yet on site. Remove until next update.\n";
-		} elseif ($AniDBAPIXML = new \SimpleXMLElement($apiresponse)) {
-			$AniDBAPIArray['similar'] = $this->processAPIResponceElement($AniDBAPIXML->similaranime, 'anime');
-
-			$AniDBAPIArray['related'] = $this->processAPIResponceElement($AniDBAPIXML->relatedanime, 'anime');
-
-			$AniDBAPIArray['creators'] = $this->processAPIResponceElement($AniDBAPIXML->creators);
-
-			$AniDBAPIArray['characters'] = $this->processAPIResponceElement($AniDBAPIXML->characters);
-
-			$AniDBAPIArray['categories'] = $this->processAPIResponceElement($AniDBAPIXML->categories);
-
-			if ($AniDBAPIXML->episodes && $AniDBAPIXML->episodes[0]->attributes()) {
-				$i = 1;
-				foreach ($AniDBAPIXML->episodes->episode AS $episode) {
-					$titleArray = array();
-
-					$episodeArray = array();
-					$episodeArray[$i]['episode_id'] = (int)$episode->attributes()->id[0];
-					$episodeArray[$i]['episode_no'] = (int)$episode->epno;
-					$episodeArray[$i]['airdate']    = (string)$episode->airdate;
-
-					if ($AniDBAPIXML->title && $AniDBAPIXML->title[0]->attributes()) {
-						foreach ($AniDBAPIXML->title->children() AS $title) {
-							$xmlAttribs = $title->attributes('xml', true);
-							// only english, x-jat imploded episode titles for now
-							if (in_array($xmlAttribs->lang, ['en', 'x-jat'])) {
-								$titleArray[] = $title[0];
-							}
-						}
-					}
-
-					$episodeArray[$i]['episode_title'] = empty($titleArray) ? '' :
-						implode(', ', $titleArray);
-					$i++;
-				}
-			}
-
-			$episodeArray = [];
-			//start and end date come from AniDB API as date strings -- no manipulation needed
-			$AniDBAPIArray['startdate'] = isset($AniDBAPIXML->startdate) ? $AniDBAPIXML->startdate :
-				'0000-00-00';
-			$AniDBAPIArray['enddate']   = isset($AniDBAPIXML->enddate) ? $AniDBAPIXML->enddate :
-				'0000-00-00';
-
-			if (isset($AniDBAPIXML->ratings->permanent)) {
-				$AniDBAPIArray['rating'] = $AniDBAPIXML->ratings->permanent;
-			} else {
-				$AniDBAPIArray['rating'] = isset($AniDBAPIXML->ratings->temporary) ?
-					$AniDBAPIXML->ratings->temporary : $AniDBAPIArray['rating'] = '';
-			}
-
-			$AniDBAPIArray += array(
-				'type'        => isset($AniDBAPIXML->type[0]) ? (string)$AniDBAPIXML->type : '',
-				'description' => isset($AniDBAPIXML->description) ?
-						(string)$AniDBAPIXML->description : '',
-				'picture'     => isset($AniDBAPIXML->picture[0]) ? (string)$AniDBAPIXML->picture :
-						'',
-				'epsarr'      => $episodeArray,
-			);
-
-			return $AniDBAPIArray;
-		}
-		return false;
-	}
-
-	/**
-	 * @param \SimpleXMLElement $element
-	 * @param string            $item
-	 * @param string            $property
-	 *
-	 * @return string
-	 */
-	private function processAPIResponceElement(\SimpleXMLElement $element, $property = null)
-	{
-		$property = empty($property) ? 'name' : $property;
-		$temp     = '';
-		if ($element && $element[0]->attributes()) {
-			foreach ($element->children() AS $entry) {
-				$temp .= (string)$entry->$property . ', ';
-			}
-		}
-		return (empty($temp) ? '' : substr($temp, 0, -2));
-	}
-
-	/**
-	 * Requests and returns the API data from AniDB
-	 *
-	 * @return xmlobject
-	 */
-	private function getAniDbResponse()
-	{
-		$curlString = sprintf(
-			'http://api.anidb.net:9001/httpapi?request=anime&client=%s&clientver=%d&protover=1&aid=%d',
-			$this->apiKey,
-			self::CLIENT_VERSION,
-			$this->anidbId
-		);
-
-		$ch = curl_init($curlString);
-
-		$curlOpts = array(
-			CURLOPT_RETURNTRANSFER => 1,
-			CURLOPT_HEADER         => 0,
-			CURLOPT_FAILONERROR    => 1,
-			CURLOPT_ENCODING       => 'gzip'
-		);
-
-		curl_setopt_array($ch, $curlOpts);
-		$apiresponse = curl_exec($ch);
-		curl_close($ch);
-		return $apiresponse;
-	}
-
-	/**
-	 * Inserts new anime info from AniDB to anidb table
-	 *
-	 * @param int    $id    The AniDB id to be inserted
-	 * @param string $type  The title type
-	 * @param string $lang  The title language
-	 * @param string $title The title of the Anime
-	 */
-	private function insertAniDb($id, $type, $lang, $title)
-	{
-		$check = $this->checkDuplicateDbEntry($id, $type, $lang, $title);
-
-		if ($check === false) {
-			$this->pdo->queryInsert(
-					  sprintf('
-								INSERT IGNORE INTO anidb_titles
-									(anidbid, type, lang, title)
-								VALUES
-									(%d, %s, %s, %s)',
-							  $id,
-							  $this->pdo->escapeString($type),
-							  $this->pdo->escapeString($lang),
-							  $this->pdo->escapeString($title)
-					  ));
-		} else {
-			echo $this->pdo->log->warning("Duplicate: $id");
-		}
-	}
-
-	/**
-	 * Inserts new anime info from AniDB to anidb table
-	 *
-	 * @param array $AniDBInfoArray
-	 *
-	 * @return string
-	 */
-	private function insertAniDBInfoEps(array $AniDBInfoArray = [])
-	{
-		$this->pdo->queryInsert(
-				  sprintf('
-						INSERT INTO anidb_info (anidbid, type, startdate, enddate, related, similar, creators, description, rating, picture, categories, characters, updated)
-						VALUES
-							(%d, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, NOW())',
-						  $this->anidbId,
-						  $this->pdo->escapeString($AniDBInfoArray['type']),
-						  $this->pdo->escapeString($AniDBInfoArray['startdate']),
-						  $this->pdo->escapeString($AniDBInfoArray['enddate']),
-						  $this->pdo->escapeString($AniDBInfoArray['related']),
-						  $this->pdo->escapeString($AniDBInfoArray['similar']),
-						  $this->pdo->escapeString($AniDBInfoArray['creators']),
-						  $this->pdo->escapeString($AniDBInfoArray['description']),
-						  $this->pdo->escapeString($AniDBInfoArray['rating']),
-						  $this->pdo->escapeString($AniDBInfoArray['picture']),
-						  $this->pdo->escapeString($AniDBInfoArray['categories']),
-						  $this->pdo->escapeString($AniDBInfoArray['characters'])
-				  )
-		);
-
-		if (isset($AniDBInfoArray['epsarr'])) {
-			$this->insertAniDBEpisodes($AniDBInfoArray['epsarr']);
-		}
-		return $AniDBInfoArray['picture'];
-	}
-
-	/**
-	 * Inserts new anime info from AniDB to anidb table
-	 *
-	 * @param array $episodeArr
-	 */
-	private function insertAniDBEpisodes(array $episodeArr = [])
-	{
-		if (!empty($episodeArr)) {
-			foreach ($episodeArr AS $episode) {
-				$this->pdo->queryInsert(
-						  sprintf('
-								INSERT IGNORE INTO anidb_episodes (anidbid, episodeid, episode_no, episode_title, airdate)
-								VALUES (%d, %d, %d, %s, %s)',
-								  $this->anidbId,
-								  $episode['episode_id'],
-								  $episode['episode_no'],
-								  $this->pdo->escapeString($episode['episode_title']),
-								  $this->pdo->escapeString($episode['airdate'])
-						  )
-				);
-			}
-		}
-	}
-
-	/**
-	 *  Grabs AniDB Full Dump XML and inserts it into anidb table
-	 */
-	private function populateMainTable()
-	{
-		if ((time() - (int)$this->lastUpdate) > ((int)$this->updateInterval * 86400)) {
-
-			if ($this->echooutput) {
-				echo $this->pdo->log->header("Updating anime titles by grabbing full data AniDB dump.");
-			}
-
-			$animetitles = new \SimpleXMLElement("compress.zlib://http://anidb.net/api/anime-titles.xml.gz", null, true);
-			/*
-			$lines = gzfile(realpath(NN_ROOT . '..' . DS . 'anime-titles.xml.gz'));
-			$file = implode('', $lines);
-			$animetitles = new \SimpleXMLElement($file, 0, false);
-			*/
-
-			//Even if the update process fails,
-			//we must mark the last update time or risk ban
-			$this->setLastUpdated();
-
-			if ($animetitles instanceof \Traversable) {
-				$count = count($animetitles);
-				if ($this->echooutput) {
-					echo $this->pdo->log->header(
-										"Total of " . number_format($count) .
-										" titles to add." . PHP_EOL
-					);
-				}
-
-				foreach ($animetitles AS $anime) {
-					echo "Remaining: $count  \r";
-					foreach ($anime->title AS $title) {
-						$xmlAttribs = $title->attributes('xml', true);
-						$this->insertAniDb((string)$anime['aid'],
-										   (string)$title['type'],
-										   (string)$xmlAttribs->lang,
-										   (string)$title[0]);
-						$this->pdo->log->primary(
-									   "Inserting: %d, %s, %s, %s",
-									   $anime['aid'],
-									   $title['type'],
-									   $xmlAttribs->lang,
-									   $title[0]);
-					}
-					$count--;
-				}
-			} else {
-				echo PHP_EOL .
-					 $this->pdo->log->error("Error retrieving XML data from AniDB. Please try again later.") .
-					 PHP_EOL;
-			}
-		} else {
-			echo PHP_EOL . $this->pdo->log->info(
-										  "AniDB has been updated within the past {$this->updateInterval} days.  " .
-										  "Either set this value lower in Site Edit (at your own risk of being banned) or try again later.") .
-				 PHP_EOL;
-		}
-	}
-
-	/**
-	 * Directs flow for populating the AniDB Info/Episodes table
-	 */
-	private function populateInfoTable()
-	{
-		$AniDBAPIArray = $this->getAniDbAPI();
-
-		if ($this->banned === true) {
-			$this->pdo->log->doEcho($this->pdo->log->error("AniDB Banned, import will fail, please wait 24 hours before retrying."),
-									true);
-			exit;
-		} elseif ($AniDBAPIArray === false && $this->echooutput) {
-			$this->pdo->log->doEcho($this->pdo->log->info("Anime id: {$this->anidbId} not available for update yet."),
-									true);
-		} else {
-			$this->updateAniChildTables($AniDBAPIArray);
-			if (NN_DEBUG) {
-				$this->pdo->log->doEcho($this->pdo->log->headerOver("Added/Updated AniDB id: {$this->anidbId}"),
-										true);
-			}
-		}
-	}
-
-	/**
-	 * Sets the database time for last full AniDB update
-	 */
-	private function setLastUpdated()
-	{
-		$time = time();
-		$this->pdo->queryExec(sprintf('UPDATE `site` SET VALUE = $s WHERE setting = `lastanidbupdate`', $time));
-	}
-
-	/**
-	 * Updates existing anime info in anidb info/episodes tables
-	 *
-	 * @param array $AniDBInfoArray
-	 *
-	 * @return string
-	 */
-	private function updateAniDBInfoEps($AniDBInfoArray = array())
-	{
-		$this->pdo->queryExec(
-				  sprintf('
-						UPDATE anidb_info
-						SET type = %s, startdate = %s, enddate = %s, related = %s,
-							similar = %s, creators = %s, description = %s,
-							rating = %s, picture = %s, categories = %s, characters = %s,
-							updated = NOW()
-						WHERE anidbid = %d',
-						  $this->pdo->escapeString($AniDBInfoArray['type']),
-						  $this->pdo->escapeString($AniDBInfoArray['startdate']),
-						  $this->pdo->escapeString($AniDBInfoArray['enddate']),
-						  $this->pdo->escapeString($AniDBInfoArray['related']),
-						  $this->pdo->escapeString($AniDBInfoArray['similar']),
-						  $this->pdo->escapeString($AniDBInfoArray['creators']),
-						  $this->pdo->escapeString($AniDBInfoArray['description']),
-						  $this->pdo->escapeString($AniDBInfoArray['rating']),
-						  $this->pdo->escapeString($AniDBInfoArray['picture']),
-						  $this->pdo->escapeString($AniDBInfoArray['categories']),
-						  $this->pdo->escapeString($AniDBInfoArray['characters']),
-						  $this->anidbId
-				  )
-		);
-
-		$this->insertAniDBEpisodes($AniDBInfoArray['epsarr']);
-		return $AniDBInfoArray['picture'];
-	}
-
-	/**
-	 * Directs flow for updating child AniDB tables
-	 *
-	 * @param array $AniDBInfoArray
-	 */
-	private function updateAniChildTables($AniDBInfoArray = array())
-	{
-		$check = $this->pdo->queryOneRow(
-						   sprintf('
-							SELECT ai.anidbid AS info
-							FROM anidb_info ai
-							WHERE ai.anidbid = %d',
-								   $this->anidbId
-						   )
-		);
-
-		if ($check === false) {
-			$picture = $this->insertAniDBInfoEps($AniDBInfoArray);
-		} else {
-			$picture = $this->updateAniDBInfoEps($AniDBInfoArray);
-		}
-
-		if (!empty($picture) && !file_exists($this->imgSavePath . $this->anidbId . ".jpg")) {
-			(new \ReleaseImage($this->pdo))->saveImage(
-										   $this->anidbId,
-										   'http://img7.anidb.net/pics/anime/' . $picture,
-										   $this->imgSavePath
-			);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/post/AniDB.php b/lib/copy_this/www/post/AniDB.php
deleted file mode 100644
index 249c9eac8..000000000
--- a/lib/copy_this/www/post/AniDB.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/populate/AniDB.php");
-require_once(NN_TMUX . 'lib' . DS . 'Enzebe.php');
-
-class PostAniDB
-{
-	const PROC_EXTFAIL = -1; // Release Anime title/episode # could not be extracted from searchname
-	const PROC_NOMATCH = -2; // AniDB id was not found in anidb table using extracted title/episode #
-
-	const REGEX_NOFORN = 'English|Japanese|German|Danish|Flemish|Dutch|French|Swe(dish|sub)|Deutsch|Norwegian';
-
-	/**
-	 * @var bool Whether or not to echo messages to CLI
-	 */
-	public $echooutput;
-
-	/**
-	 * @var \AniDB
-	 */
-	public $padb;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var int number of AniDB releases to process
-	 */
-	private $aniqty;
-
-	/**
-	 * @var int The status of the release being processed
-	 */
-	private $status;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo        = ($options['Settings'] instanceof \DB ? $options['Settings'] : new \DB());
-		$s = new \Sites();
-		$this->site = $s->get();
-
-		$qty          = $this->site->maxanidbprocessed;
-		$this->aniqty = !empty($qty) ? $qty : 100;
-
-		$this->status = 'NULL';
-	}
-
-	/**
-	 * Queues anime releases for processing
-	 */
-	public function processAnimeReleases()
-	{
-		$results = $this->pdo->queryDirect(
-							 sprintf('
-							SELECT searchname, id
-							FROM releases
-							WHERE nzbstatus = %d
-							AND anidbid IS NULL
-							AND categoryid = %d
-							ORDER BY postdate DESC
-							LIMIT %d',
-									 \Enzebe::NZB_ADDED,
-									 \Category::CAT_TV_ANIME,
-									 $this->aniqty
-							 )
-		);
-
-		if ($results instanceof \Traversable) {
-
-			$this->doRandomSleep();
-
-			$this->padb = new \PopulateAniDB([
-														   'Echo'     => $this->echooutput,
-														   'Settings' => $this->pdo
-													   ]);
-
-			foreach ($results as $release) {
-				$matched = $this->matchAnimeRelease($release);
-				if ($matched === false) {
-					$this->pdo->queryExec(
-							  sprintf('
-									UPDATE releases
-									SET anidbid = %d
-									WHERE id = %d',
-									  $this->status,
-									  $release['id']
-							  )
-					);
-				}
-			}
-		} else {
-			$this->pdo->log->doEcho($this->pdo->log->info("No work to process."), true);
-		}
-	}
-
-	/**
-	 * Selects episode info for a local match
-	 *
-	 * @param int $anidbId
-	 * @param int $episode
-	 *
-	 * @return array|bool
-	 */
-	private function checkAniDBInfo($anidbId, $episode = -1)
-	{
-		return $this->pdo->queryOneRow(
-						 sprintf('
-							SELECT ae.anidbid, ae.episode_no,
-								ae.airdate, ae.episode_title
-							FROM anidb_episodes ae
-							WHERE ae.anidbid = %d
-							AND ae.episode_no = %d',
-								 $anidbId,
-								 $episode
-						 )
-		);
-	}
-
-	/**
-	 * Sleeps between 10 and 15 seconds for AniDB API cooldown
-	 */
-	private function doRandomSleep()
-	{
-		sleep(rand(10, 15));
-	}
-
-	/**
-	 * Extracts anime title and episode info from release searchname
-	 *
-	 * @param string $cleanName
-	 *
-	 * @return array
-	 */
-	private function extractTitleEpisode($cleanName = '')
-	{
-		if (preg_match('/(^|.*\")(\[[a-zA-Z\.\!?-]+\][\s_]*)?(\[BD\][\s_]*)?(\[\d{3,4}[ip]\][\s_]*)?(?P<title>[\w\s_.+!?\'-\(\)]+)(New Edit|(Blu-?ray)?( ?Box)?( ?Set)?)?([ _]-[ _]|([ ._-]Epi?(sode)?[ ._-]?0?)?[ ._-]?|[ ._-]Vol\.|[ ._-]E)(?P<epno>\d{1,3}|Movie|O[VA]{2}|Complete Series)(v\d|-\d+)?[-_. ].*[\[\(\"]/i',
-					   $cleanName,
-					   $matches)
-		) {
-			$matches['epno'] = (int)$matches['epno'];
-			if (in_array($matches['epno'], ['Movie', 'OVA'])) {
-				$matches['epno'] = (int)1;
-			}
-		} else if (preg_match('/^(\[[a-zA-Z\.\-!?]+\][\s_]*)?(\[BD\])?(\[\d{3,4}[ip]\])?(?P<title>[\w\s_.+!?\'-\(\)]+)(New Edit|(Blu-?ray)?( ?Box)?( ?Set)?)?\s*[\(\[](BD|\d{3,4}[ipx])/i',
-							  $cleanName,
-							  $matches)
-		) {
-			$matches['epno'] = (int)1;
-		} else {
-			if (NN_DEBUG) {
-				$this->pdo->log->doEcho(PHP_EOL . "Could not parse searchname {$cleanName}.", true);
-			}
-			$this->status = self::PROC_EXTFAIL;
-		}
-
-		if (!empty($matches['title'])) {
-			$matches['title'] = trim(str_replace(['_', '.'], ' ', $matches['title']));
-		}
-
-		return $matches;
-	}
-
-	/**
-	 * Retrieves AniDB Info using a cleaned name
-	 *
-	 * @param string $searchName
-	 *
-	 * @return array|bool
-	 */
-	private function getAnidbByName($searchName = '')
-	{
-		return $this->pdo->queryOneRow(
-						 sprintf("
-							SELECT at.anidbid, at.title
-							FROM anidb_titles AS at
-							WHERE at.title %s",
-								 $this->pdo->likeString($searchName, true, true)
-						 )
-		);
-	}
-
-	/**
-	 * Matches the anime release to AniDB Info
-	 * If no info is available locally the AniDB API is invoked
-	 *
-	 * @param array $release
-	 *
-	 * @return bool
-	 */
-	private function matchAnimeRelease($release = array())
-	{
-		$matched = false;
-		$type    = 'Local';
-
-		// clean up the release name to ensure we get a good chance at getting a valid title
-		$cleanArr = $this->extractTitleEpisode($release['searchname']);
-
-		if (is_array($cleanArr) && isset($cleanArr['title']) && is_numeric($cleanArr['epno'])) {
-
-			echo $this->pdo->log->header(PHP_EOL . "Looking Up: ") .
-				 $this->pdo->log->primary("   Title: {$cleanArr['title']}" . PHP_EOL .
-										  "   Episode: {$cleanArr['epno']}");
-
-			// get anidb number for the title of the name
-			$anidbId = $this->getAnidbByName($cleanArr['title']);
-
-			if ($anidbId === false) {
-				$tmpName = preg_replace('/\s/', '%', $cleanArr['title']);
-				$anidbId = $this->getAnidbByName($tmpName);
-			}
-
-			if (!empty($anidbId) && is_numeric($anidbId['anidbid']) && $anidbId['anidbid'] > 0) {
-
-				$updatedAni = $this->checkAniDBInfo($anidbId['anidbid'], $cleanArr['epno']);
-
-				if ($updatedAni === false) {
-					if ($this->updateTimeCheck($anidbId['anidbid']) === false) {
-						$this->padb->populateTable('info', $anidbId['anidbid']);
-						$this->doRandomSleep();
-						$updatedAni = $this->checkAniDBInfo($anidbId['anidbid']);
-						$type       = 'Remote';
-					} else {
-						echo PHP_EOL .
-							 $this->pdo->log->info("This AniDB id was not found to be accurate locally, but has been updated too recently to check AniDB.") .
-							 PHP_EOL;
-					}
-				}
-
-				$this->updateRelease($anidbId['anidbid'],
-									 $cleanArr['epno'],
-									 $updatedAni['episode_title'],
-									 $updatedAni['airdate'],
-									 $release['id']);
-
-				$this->pdo->log->doEcho(
-							   $this->pdo->log->headerOver("Matched {$type} AniDB id: ") .
-							   $this->pdo->log->primary($anidbId['anidbid']) .
-							   $this->pdo->log->alternateOver("   Title: ") .
-							   $this->pdo->log->primary($anidbId['title']) .
-							   $this->pdo->log->alternateOver("   Episode #: ") .
-							   $this->pdo->log->primary($cleanArr['epno']) .
-							   $this->pdo->log->alternateOver("   Episode Title: ") .
-							   $this->pdo->log->primary($updatedAni['episode_title'])
-				);
-
-				$matched = true;
-			} else {
-				if (NN_DEBUG) {
-					$this->pdo->log->doEcho(PHP_EOL .
-											"Could not match searchname: {$release['searchname']}.",
-											true);
-				}
-				$this->status = self::PROC_NOMATCH;
-			}
-		}
-		return $matched;
-	}
-
-	/**
-	 * Updates releases based on matched Anime info
-	 *
-	 * @param int    $anidbId
-	 * @param int    $epno
-	 * @param string $title
-	 * @param string $airdate
-	 * @param int    $relId
-	 *
-	 * @return array|bool
-	 */
-	private function updateRelease($anidbId, $epno, $title, $airdate, $relId)
-	{
-
-		$epno = 'E' . ($epno < 10 ? '0' : '') . $epno;
-
-		$this->pdo->queryExec(
-				  sprintf("
-						UPDATE releases
-						SET anidbid = %d, seriesfull = %s, season = 'S01', episode = %s,
-							tvtitle = %s, tvairdate = %s
-						WHERE id = %d",
-						  $anidbId,
-						  $this->pdo->escapeString('S01' . $epno),
-						  $this->pdo->escapeString($epno),
-						  $this->pdo->escapeString($title),
-						  $this->pdo->escapeString($airdate),
-						  $relId
-				  )
-		);
-	}
-
-	/**
-	 * Checks a specific Anime title's last update time
-	 *
-	 * @param int $anidbId
-	 *
-	 * @return array|bool
-	 */
-	private function updateTimeCheck($anidbId)
-	{
-		return $this->pdo->queryOneRow(
-						 sprintf("
-							SELECT anidbid
-							FROM anidb_info ai
-							WHERE DATEDIFF(NOW(), ai.updated) < 7
-							AND ai.anidbid = %d",
-								 $anidbId
-						 )
-		);
-	}
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/resources/logs/.gitignore b/lib/copy_this/www/resources/logs/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/resources/logs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/resources/tmp/.gitignore b/lib/copy_this/www/resources/tmp/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/resources/tmp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/settings.php.example b/lib/copy_this/www/settings.php.example
deleted file mode 100644
index ac0a42910..000000000
--- a/lib/copy_this/www/settings.php.example
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////// Copy this file to settings.php and edit the options. //////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**********************************************************************************************************************/
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////// Web Settings //////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * How many releases to show per page in list view.
- *
- * @default '50'
- */
-define('ITEMS_PER_PAGE', '50');
-
-/**
- * How many releases to show per page in cover view.
- *
- * @default '20'
- */
-define('ITEMS_PER_COVER_PAGE', '20');
-
-/**
- * How many releases maximum to display in total on browse/search/etc.
- * If you have ITEMS_PER_PAGE set to 50, and NN_MAX_PAGER_RESULTS set to 125000, you would get a maximum of
- * 2,500 pages of results in searches/browse.
- *
- * @note This setting can speed up browsing releases tremendously if you have millions of releases and you keep it
- * a relatively low value.
- *
- * @default '125000'
- */
-define('NN_MAX_PAGER_RESULTS', '125000');
-
-
-/**
- * If the PRE API page (preinfo) is open to the public or only accessible by registered / api users.
- *
- * @default false
- */
-define('NN_PREINFO_OPEN', false);
-
-/**
- * Whether to check if a person is trying to send too many requests in a given amount of time,
- * lock out the person of the site for a amount of time.
- *
- * @default false
- */
-define('NN_FLOOD_CHECK', false);
-
-/**
- * How many seconds should the person be locked out of the site.
- *
- * @default 5
- */
-define('NN_FLOOD_WAIT_TIME', 5);
-
-/**
- * How many requests in a second can a person send to the site max before being locked out for
- * NN_FLOOD_WAIT_TIME seconds.
- *
- * @default 5
- */
-define('NN_FLOOD_MAX_REQUESTS_PER_SECOND', 5);
-
-/**
- * The higher this number, the more secure the password algorithm for the website will be, at the cost
- * of server resources.
- * To find a good number for your server, run the misc/testing/Dev/find_password_hash_cost.php script.
- *
- * @note It is not recommended to set this under 11.
- * @default 11
- */
-define('NN_PASSWORD_HASH_COST', 11);
-
-/**
- * The type of search system to use on the site.
- *
- * 0 = The default system, which uses fulltext indexing (very fast but search results can be unexpected).
- * 1 = The old search system from newznab classic (much slower but produces better search results).
- * 2 = Search using sphinx real time index, see misc/sphinxsearch/README.md for installation details.
- *
- * @default 0
- */
-define('NN_RELEASE_SEARCH_TYPE', 0);
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////// Sphinx Settings ////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * This is the hostname to use when connecting to the SphinxQL server,
- *
- * @note Using localhost / 127.0.0.1 has caused me issues and only 0 worked on my local server.
- * @note See misc/sphinxsearch/README.md for installation details.
- * @default '0'
- */
-define('NN_SPHINXQL_HOST_NAME', '0');
-
-/**
- * This is the port to the SphinxQL server.
- *
- * @default 9306
- */
-define('NN_SPHINXQL_PORT', 9306);
-
-/**
- * This is the (optional) location to the SphinxQL server socket file, if you set the "listen" setting to a sock file.
- *
- * @default ''
- */
-define('NN_SPHINXQL_SOCK_FILE', '');
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////// CLI Settings //////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Display text to console(terminal) output.
- *
- * @default true
- */
-define('NN_ECHOCLI', true);
-
-/**
- * Rename releases using PAR2 files (if they match on PRE titles)?
- *
- * @default true
- */
-define('NN_RENAME_PAR2', true);
-
-/**
- * Rename music releases using media info from the MP3/FLAC/etc tags (names are created using info found in the tags)?
- *
- * @default true
- */
-define('NN_RENAME_MUSIC_MEDIAINFO', true);
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////// Cache Settings /////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Type of cache server(s) to use:
- * 0 - disabled   ; No cache server(s) will be used.
- * 1 - memcached  ; Memcached server(s) will be used for caching.
- * 2 - redis      ; Redis server(s) will be used for caching.
- *
- * @note We use the Redis extension by nicolasff.
- * @see https://github.com/nicolasff/phpredis
- * @default 0
- */
-define('NN_CACHE_TYPE', 0);
-
-/**
- * List of redis or memcached servers to connect to. Separate them by comma.
- * Host:   (string)  Address for the cache server. '127.0.0.1' for a local server.
- * Port:   (integer) Default for memcached is 11211, Default for redis is 6379
- * Weight: (integer) On redis, this is unused, set it to 0.
- *                   On memcached if you have 1 memcached server, you set this to 100.
- *                   If you have more than 1 memcached server, see the memcached documentation for more info:
- *                   http://php.net/manual/en/memcached.addserver.php
- */
-define(
-	'NN_CACHE_HOSTS',
-	serialize(
-		[
-			'Server1' => [
-				'host'   => '127.0.0.1',
-				'port'   => 11211,
-				'weight' => 0
-			],
-		]
-	)
-);
-
-/**
- * Optional path to unix socket file, leave '' if to not use.
- * If using a unix socket file, the server list is overridden.
- * This should be faster than using the host/port if your cache server is local.
- *
- * @example '/var/run/redis/redis.sock'
- * @note By default, redis and memcached do not have a socket file, you must configure them.
- * @note Read and write access is required to the socket file.
- * @default ''
- */
-define('NN_CACHE_SOCKET_FILE', '');
-
-/**
- * Timeout for connecting to cache server(s).
- *
- * @default 10
- */
-define('NN_CACHE_TIMEOUT', 10);
-
-/**
- * Memcached allows to compress the data, saving RAM at the expense of CPU time.
- *
- * @note Does nothing on redis.
- * @default false
- */
-define('NN_CACHE_COMPRESSION', false);
-
-/**
- * 0 - Use the PHP serializer.
- * 1 - [Requires igbinary] Use igbinary serializer which is faster and uses less memory, works on both Memcached and Redis.
- * 2 - [Redis Only] Use no serializer.
- *
- * @note igbinary must be compiled and enabled in php.ini
- * @note Memcached/Redis must be compiled with igbinary support as well to use igbinary.
- * @see https://github.com/phadej/igbinary
- * @see https://github.com/nicolasff/phpredis
- * @default 0
- */
-define('NN_CACHE_SERIALIZER', 0);
-
-/**
- * Amount of time in seconds to expire data from the cache server.
- * The developers of NN decide what should be set as short/medium/long, depending on the type of data.
- *
- * @defaults 300/600/900
- */
-define('NN_CACHE_EXPIRY_SHORT', 300);
-define('NN_CACHE_EXPIRY_MEDIUM', 600);
-define('NN_CACHE_EXPIRY_LONG', 900);
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////// Log Settings //////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Display debug messages on console or web page.
- *
- * @default false
- */
-define('NN_DEBUG', false);
-
-/**
- * Log debug messages to newznab/resources/debug.log
- *
- * @default false
- */
-define('NN_LOGGING', false);
-
-/**
- * var_dump missing autoloader files.
- *
- * @note Dev setting.
- * @default false
- */
-define('NN_LOGAUTOLOADER', false);
-
-/**
- * How many log files to keep in the log folder.
- *
- * @default 20
- */
-define('NN_LOGGING_MAX_LOGS', 20);
-
-/**
- * How large can the log files be in MegaBytes before we create a new one? The old files are compressed.
- *
- * @default 30
- */
-define('NN_LOGGING_MAX_SIZE', 30);
-
-/**
- * The folder to put the log files in. Put quotes, example : '/var/log/NN/'
- * The default is in the NN root folder /resources/logs/
- *
- * @example '/var/log/NN/'
- * @default NN_LOGS
- */
-define('NN_LOGGING_LOG_FOLDER', NN_LOGS);
-
-/**
- * The name of the log file.
- * Must be alphanumeric (a-z 0-9) and contain no file extensions.
- *
- * @default 'newznab'
- */
-define('NN_LOGGING_LOG_NAME', 'newznab');
-
-/**
- * Display memory usage in log file and debug message output?
- *
- * @default true
- */
-define('NN_LOGGING_LOG_MEMORY_USAGE', true);
-
-/**
- * Display CPU load in log file and debug message output?
- *
- * @default true
- */
-define('NN_LOGGING_LOG_CPU_LOAD', true);
-
-/**
- * Display running time in log file and debug message output?
- *
- * @default true
- */
-define('NN_LOGGING_LOG_RUNNING_TIME', true);
-
-/**
- * Display resource usage in log file and debug message output?
- *
- * @default false
- */
-define('NN_LOGGING_LOG_RESOURCE_USAGE', false);
-
-/*********************************************************************************
- * The following options require either NN_DEBUG OR NN_LOGGING to be true: *
- *********************************************************************************/
-
-/**
- * Log and/or echo debug Info messages.
- *
- * @default false
- */
-define('NN_LOGINFO', false);
-
-/**
- * Log and/or echo debug Notice messages.
- *
- * @default false
- */
-define('NN_LOGNOTICE', false);
-
-/**
- * Log and/or echo debug Warning messages.
- *
- * @default false
- */
-define('NN_LOGWARNING', false);
-
-/**
- * Log and/or echo debug Error messages.
- *
- * @default false
- */
-define('NN_LOGERROR', false);
-
-/**
- * Log and/or echo debug Fatal messages.
- *
- * @default false
- */
-define('NN_LOGFATAL', false);
-
-/**
- * Log and/or echo debug failed SQL queries.
- *
- * @default false
- */
-define('NN_LOGQUERIES', false);
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////// SQL Settings //////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Strip white space (space, carriage return, new line, tab, etc) from queries before sending to MySQL.
- * This is useful if you use the MySQL slow query log.
- *
- * @note This slows down query processing, leave it false unless you turn on the MySQL slow query log.
- * @default false
- */
-define('NN_QUERY_STRIP_WHITESPACE', false);
-
-/**
- * Use transactions when doing certain SQL jobs.
- * This has advantages and disadvantages.
- * If there's a problem during a transaction, MySQL can revert the row inserts which is beneficial.
- * Transactions can cause deadlocks however if you are trying to insert into the same table from another process.
- *
- * @note If all your tables are MyISAM you can set this to false, as MyISAM does not support transactions.
- * @default true
- */
-define('NN_USE_SQL_TRANSACTIONS', true);
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////// PHPMailer Settings //////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Simple constant to let us know this file is included and we should use PHPMailer library.
- * Uncomment the line below after setting the other constants.
- */
-//define('PHPMAILER_ENABLED', true);
-
-/**
- * Should we use a SMTP server to send mail?
- * If false, it will use your default settings from php.ini.
- *
- * @note If set to true, be sure to set the server settings below.
- * @default false
- */
-define('PHPMAILER_USE_SMTP', false);
-
-/**
- * Global "From" Address.
- * This address will be set as the From: address on every email sent by newznab.
- *
- * @example 'noreply@example.com'
- * @note Depending on server configurations, it may not respect this value.
- * @default '' (uses the contact email configured in 'Edit Site' settings)
- */
-define('PHPMAILER_FROM_EMAIL', '');
-
-/**
- * Global "From" Name.
- * Along with the email above, this will display as the name.
- *
- * @example 'KingCat'
- * @note Depending on server configurations, it may not respect this value.
- * @default '' (uses the site title configured in 'Edit Site' settings)
- */
-define('PHPMAILER_FROM_NAME', '');
-
-/**
- * Global "Reply-to" Address.
- * This address will be set as the Reply-to: address on every email sent by newznab.
- *
- * @example 'support@example.com'
- * @note It's a good idea to set this to your support email account (if possible)
- * @default '' (uses the contact email configured in 'Edit Site' settings)
- */
-define('PHPMAILER_REPLYTO', '');
-
-/**
- * Always BCC.
- * This email address will be blind carbon copied on every email sent from this site.
- *
- * @note This has very specific uses, don't enable unless you're sure you want to get the deluge.
- * @default ''
- */
-define('PHPMAILER_BCC', '');
-
-
-
-/*********************************************************************************
- * The following options require PHPMAILER_USE_SMTP to be true: *
- *********************************************************************************/
-
-
-/**
- * This is the hostname to use if connecting to a SMTP server.
- *
- * @note You can specify main and backup hosts, delimit with a semicolon. (i.e. 'main.host.com;backup.host.com')
- * @default ''
- */
-define('PHPMAILER_SMTP_HOST', '');
-
-/**
- * TLS & SSL Support for your SMTP server.
- *
- * @note Possible values: false, 'tls', 'ssl'
- * @default 'tls'
- */
-define('PHPMAILER_SMTP_SECURE','tls');
-
-/**
- * SMTP Port
- *
- * @note Usually this is 25, 465, or 587
- * @default 587
- */
-define('PHPMAILER_SMTP_PORT', 587);
-
-/**
- * Does your SMTP host require authentication?
- *
- * @note Be sure to set credentials below if changing to true.
- * @default false
- */
-define('PHPMAILER_SMTP_AUTH', false);
-
-
-/*********************************************************************************
- * The following options require both PHPMAILER_USE_SMTP & PHPMAILER_SMTP_AUTH to be true: *
- *********************************************************************************/
-
-
-/**
- * SMTP username for authentication.
- *
- * @default ''
- */
-define('PHPMAILER_SMTP_USER','');
-
-/**
- * SMTP password for authentication.
- *
- * @default ''
- */
-define('PHPMAILER_SMTP_PASSWORD', '');
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.eot b/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index b93a4953f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.svg b/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 94fb5490a..000000000
--- a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph horiz-adv-x="0" />
-<glyph horiz-adv-x="400" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
-<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
-<glyph unicode="&#x2000;" horiz-adv-x="650" />
-<glyph unicode="&#x2001;" horiz-adv-x="1300" />
-<glyph unicode="&#x2002;" horiz-adv-x="650" />
-<glyph unicode="&#x2003;" horiz-adv-x="1300" />
-<glyph unicode="&#x2004;" horiz-adv-x="433" />
-<glyph unicode="&#x2005;" horiz-adv-x="325" />
-<glyph unicode="&#x2006;" horiz-adv-x="216" />
-<glyph unicode="&#x2007;" horiz-adv-x="216" />
-<glyph unicode="&#x2008;" horiz-adv-x="162" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="325" />
-<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
-<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
-<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
-<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
-<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
-<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
-<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
-<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
-<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
-<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
-<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
-<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
-<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
-<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
-<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
-<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
-<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
-<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
-<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
-<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
-<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
-<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
-<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
-<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
-<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
-<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
-<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
-<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
-<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
-<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
-<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
-<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
-<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
-<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
-<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
-<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
-<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
-<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
-<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
-<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
-<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
-<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
-<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
-<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
-<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
-<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
-<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
-<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
-<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
-<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
-<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
-<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
-<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
-<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
-<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
-<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
-<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
-<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
-<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
-<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
-<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
-<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
-<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
-<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
-<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
-<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
-<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
-<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
-<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
-<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
-<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
-<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
-<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
-<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
-<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
-<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
-<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
-<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
-<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
-<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
-<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
-<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
-<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
-<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
-<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
-<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
-<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
-<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
-<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
-<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
-<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
-<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
-<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
-<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
-<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
-<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
-<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
-<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
-<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
-<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
-<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
-<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
-<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
-<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
-<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
-<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
-<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
-<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
-<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
-<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
-<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
-<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
-<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
-<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
-<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
-<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
-<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
-<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
-<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
-<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
-<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
-<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
-<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
-<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
-<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
-<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
-<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
-<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
-<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
-<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
-<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
-<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
-<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
-<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
-<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
-<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
-<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
-<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
-<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
-<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
-<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
-<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
-<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
-<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
-<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
-<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
-<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
-<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
-<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
-<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
-<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
-<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
-<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
-<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
-<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
-<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
-<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
-<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
-<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
-<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
-<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
-<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
-<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
-<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
-<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
-<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
-<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
-<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
-<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.ttf b/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 1413fc609..000000000
Binary files a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.woff b/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 9e612858f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.woff2 b/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.woff2
deleted file mode 100644
index 64539b54c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/astra.png b/lib/copy_this/www/templates/nntmux/images/astra.png
deleted file mode 100644
index 2e4ce594d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/astra.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/banner.jpg b/lib/copy_this/www/templates/nntmux/images/banner.jpg
deleted file mode 100644
index 2e82665ae..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/banner.jpg and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/banner_nnplushigh.jpg b/lib/copy_this/www/templates/nntmux/images/banner_nnplushigh.jpg
deleted file mode 100644
index 01d0ade11..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/banner_nnplushigh.jpg and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/body-bg.png b/lib/copy_this/www/templates/nntmux/images/body-bg.png
deleted file mode 100644
index e85c4fd25..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/body-bg.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/bullet.jpg b/lib/copy_this/www/templates/nntmux/images/bullet.jpg
deleted file mode 100644
index b61637a9b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/bullet.jpg and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/bullet_hov.jpg b/lib/copy_this/www/templates/nntmux/images/bullet_hov.jpg
deleted file mode 100644
index 97c76c38c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/bullet_hov.jpg and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/bullet_hov.png b/lib/copy_this/www/templates/nntmux/images/bullet_hov.png
deleted file mode 100644
index e80e298e8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/bullet_hov.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/clearlogo.png b/lib/copy_this/www/templates/nntmux/images/clearlogo.png
deleted file mode 100644
index fd0e19bf0..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/clearlogo.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/border1-dark.png b/lib/copy_this/www/templates/nntmux/images/colorbox/border1-dark.png
deleted file mode 100644
index df6507865..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/border1-dark.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/border1.png b/lib/copy_this/www/templates/nntmux/images/colorbox/border1.png
deleted file mode 100644
index 2d0a04d61..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/border1.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/border2-dark.png b/lib/copy_this/www/templates/nntmux/images/colorbox/border2-dark.png
deleted file mode 100644
index 9d02c3d97..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/border2-dark.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/border2.png b/lib/copy_this/www/templates/nntmux/images/colorbox/border2.png
deleted file mode 100644
index be02ef492..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/border2.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/controls-dark.png b/lib/copy_this/www/templates/nntmux/images/colorbox/controls-dark.png
deleted file mode 100644
index aca68844a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/controls-dark.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/controls.png b/lib/copy_this/www/templates/nntmux/images/colorbox/controls.png
deleted file mode 100644
index 8569b57f1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/controls.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/controls2.png b/lib/copy_this/www/templates/nntmux/images/colorbox/controls2.png
deleted file mode 100644
index 8569b57f1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/controls2.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomCenter.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomCenter.png
deleted file mode 100644
index 12e0e9ac0..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomCenter.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomLeft.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomLeft.png
deleted file mode 100644
index b7a474ae0..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomLeft.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomRight.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomRight.png
deleted file mode 100644
index 6b6cb159b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderBottomRight.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderMiddleLeft.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderMiddleLeft.png
deleted file mode 100644
index 8f248ac12..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderMiddleLeft.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderMiddleRight.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderMiddleRight.png
deleted file mode 100644
index 336e19c16..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderMiddleRight.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopCenter.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopCenter.png
deleted file mode 100644
index 7cb1da43e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopCenter.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopLeft.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopLeft.png
deleted file mode 100644
index d733b6c86..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopLeft.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopRight.png b/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopRight.png
deleted file mode 100644
index 0d8868399..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/internet_explorer/borderTopRight.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/colorbox/loading.gif b/lib/copy_this/www/templates/nntmux/images/colorbox/loading.gif
deleted file mode 100644
index 602ce3c3a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/colorbox/loading.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/couchpotato.png b/lib/copy_this/www/templates/nntmux/images/couchpotato.png
deleted file mode 100644
index 2f61b495e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/couchpotato.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/favicon.ico b/lib/copy_this/www/templates/nntmux/images/favicon.ico
deleted file mode 100644
index 316fd5bf4..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/favicon.ico and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/7z.png b/lib/copy_this/www/templates/nntmux/images/fileicons/7z.png
deleted file mode 100644
index 52f7d5d72..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/7z.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/ai.png b/lib/copy_this/www/templates/nntmux/images/fileicons/ai.png
deleted file mode 100644
index a999762c8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/ai.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/aiff.png b/lib/copy_this/www/templates/nntmux/images/fileicons/aiff.png
deleted file mode 100644
index 82d523fdb..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/aiff.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/asc.png b/lib/copy_this/www/templates/nntmux/images/fileicons/asc.png
deleted file mode 100644
index d9fa4a8aa..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/asc.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/audio.png b/lib/copy_this/www/templates/nntmux/images/fileicons/audio.png
deleted file mode 100644
index 98883256d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/audio.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/avi.png b/lib/copy_this/www/templates/nntmux/images/fileicons/avi.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/avi.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/bin.png b/lib/copy_this/www/templates/nntmux/images/fileicons/bin.png
deleted file mode 100644
index fbd174e2d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/bin.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/bz2.png b/lib/copy_this/www/templates/nntmux/images/fileicons/bz2.png
deleted file mode 100644
index d48cae038..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/bz2.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/c.png b/lib/copy_this/www/templates/nntmux/images/fileicons/c.png
deleted file mode 100644
index efe18f439..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/c.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/cfc.png b/lib/copy_this/www/templates/nntmux/images/fileicons/cfc.png
deleted file mode 100644
index 09c149d64..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/cfc.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/cfm.png b/lib/copy_this/www/templates/nntmux/images/fileicons/cfm.png
deleted file mode 100644
index d755f286f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/cfm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/chm.png b/lib/copy_this/www/templates/nntmux/images/fileicons/chm.png
deleted file mode 100644
index 53d48f3b5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/chm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/class.png b/lib/copy_this/www/templates/nntmux/images/fileicons/class.png
deleted file mode 100644
index a39f70c16..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/class.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/conf.png b/lib/copy_this/www/templates/nntmux/images/fileicons/conf.png
deleted file mode 100644
index ddffe6fd1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/conf.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/cpp.png b/lib/copy_this/www/templates/nntmux/images/fileicons/cpp.png
deleted file mode 100644
index 79464401b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/cpp.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/cs.png b/lib/copy_this/www/templates/nntmux/images/fileicons/cs.png
deleted file mode 100644
index d5db29ba5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/cs.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/css.png b/lib/copy_this/www/templates/nntmux/images/fileicons/css.png
deleted file mode 100644
index 04012041c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/css.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/csv.png b/lib/copy_this/www/templates/nntmux/images/fileicons/csv.png
deleted file mode 100644
index 3a8835360..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/csv.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/deb.png b/lib/copy_this/www/templates/nntmux/images/fileicons/deb.png
deleted file mode 100644
index 9229d8783..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/deb.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/divx.png b/lib/copy_this/www/templates/nntmux/images/fileicons/divx.png
deleted file mode 100644
index 98dab8f80..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/divx.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/doc.png b/lib/copy_this/www/templates/nntmux/images/fileicons/doc.png
deleted file mode 100644
index 932567f8a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/doc.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/dot.png b/lib/copy_this/www/templates/nntmux/images/fileicons/dot.png
deleted file mode 100644
index 9f2da1add..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/dot.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/eml.png b/lib/copy_this/www/templates/nntmux/images/fileicons/eml.png
deleted file mode 100644
index 02828e173..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/eml.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/enc.png b/lib/copy_this/www/templates/nntmux/images/fileicons/enc.png
deleted file mode 100644
index cb2d7d47e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/enc.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/file.png b/lib/copy_this/www/templates/nntmux/images/fileicons/file.png
deleted file mode 100644
index 24d5f328c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/file.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/folder.png b/lib/copy_this/www/templates/nntmux/images/fileicons/folder.png
deleted file mode 100644
index 784e8fa48..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/folder.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/gif.png b/lib/copy_this/www/templates/nntmux/images/fileicons/gif.png
deleted file mode 100644
index b4c07a912..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/gif.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/gz.png b/lib/copy_this/www/templates/nntmux/images/fileicons/gz.png
deleted file mode 100644
index 2426bd169..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/gz.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/hlp.png b/lib/copy_this/www/templates/nntmux/images/fileicons/hlp.png
deleted file mode 100644
index 4417d8e2c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/hlp.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/htm.png b/lib/copy_this/www/templates/nntmux/images/fileicons/htm.png
deleted file mode 100644
index 1a6812185..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/htm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/html.png b/lib/copy_this/www/templates/nntmux/images/fileicons/html.png
deleted file mode 100644
index 672cbce42..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/html.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/image.png b/lib/copy_this/www/templates/nntmux/images/fileicons/image.png
deleted file mode 100644
index f83e2898d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/image.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/iso.png b/lib/copy_this/www/templates/nntmux/images/fileicons/iso.png
deleted file mode 100644
index 1b2ff19ca..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/iso.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/jar.png b/lib/copy_this/www/templates/nntmux/images/fileicons/jar.png
deleted file mode 100644
index 4db70a2c7..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/jar.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/java.png b/lib/copy_this/www/templates/nntmux/images/fileicons/java.png
deleted file mode 100644
index 7489b9721..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/java.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/jpeg.png b/lib/copy_this/www/templates/nntmux/images/fileicons/jpeg.png
deleted file mode 100644
index aa4cc23a5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/jpeg.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/jpg.png b/lib/copy_this/www/templates/nntmux/images/fileicons/jpg.png
deleted file mode 100644
index 1fb6cc1fb..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/jpg.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/js.png b/lib/copy_this/www/templates/nntmux/images/fileicons/js.png
deleted file mode 100644
index 7db4de7e9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/js.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/lua.png b/lib/copy_this/www/templates/nntmux/images/fileicons/lua.png
deleted file mode 100644
index 7c07d023f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/lua.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/m.png b/lib/copy_this/www/templates/nntmux/images/fileicons/m.png
deleted file mode 100644
index aa0cbae8b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/m.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/m4v.png b/lib/copy_this/www/templates/nntmux/images/fileicons/m4v.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/m4v.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/mkv.png b/lib/copy_this/www/templates/nntmux/images/fileicons/mkv.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/mkv.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/mm.png b/lib/copy_this/www/templates/nntmux/images/fileicons/mm.png
deleted file mode 100644
index b737571c5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/mm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/mov.png b/lib/copy_this/www/templates/nntmux/images/fileicons/mov.png
deleted file mode 100644
index 7e7aa368f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/mov.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/mp3.png b/lib/copy_this/www/templates/nntmux/images/fileicons/mp3.png
deleted file mode 100644
index 928705d7a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/mp3.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/mpg.png b/lib/copy_this/www/templates/nntmux/images/fileicons/mpg.png
deleted file mode 100644
index 9a3f8ea51..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/mpg.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/nfo.png b/lib/copy_this/www/templates/nntmux/images/fileicons/nfo.png
deleted file mode 100644
index da20009c6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/nfo.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/nzb.png b/lib/copy_this/www/templates/nntmux/images/fileicons/nzb.png
deleted file mode 100644
index fbd174e2d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/nzb.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/odc.png b/lib/copy_this/www/templates/nntmux/images/fileicons/odc.png
deleted file mode 100644
index 47f65c84d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/odc.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/odf.png b/lib/copy_this/www/templates/nntmux/images/fileicons/odf.png
deleted file mode 100644
index a2fbc5195..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/odf.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/odg.png b/lib/copy_this/www/templates/nntmux/images/fileicons/odg.png
deleted file mode 100644
index 434f18262..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/odg.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/odi.png b/lib/copy_this/www/templates/nntmux/images/fileicons/odi.png
deleted file mode 100644
index 74f6303d3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/odi.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/odp.png b/lib/copy_this/www/templates/nntmux/images/fileicons/odp.png
deleted file mode 100644
index a5c77f845..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/odp.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/ods.png b/lib/copy_this/www/templates/nntmux/images/fileicons/ods.png
deleted file mode 100644
index 2ab1273f0..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/ods.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/odt.png b/lib/copy_this/www/templates/nntmux/images/fileicons/odt.png
deleted file mode 100644
index b0c21fc1f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/odt.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/ogg.png b/lib/copy_this/www/templates/nntmux/images/fileicons/ogg.png
deleted file mode 100644
index 62cea6aaa..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/ogg.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/par2.png b/lib/copy_this/www/templates/nntmux/images/fileicons/par2.png
deleted file mode 100644
index ddffe6fd1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/par2.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/pdf.png b/lib/copy_this/www/templates/nntmux/images/fileicons/pdf.png
deleted file mode 100644
index 638066dea..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/pdf.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/pgp.png b/lib/copy_this/www/templates/nntmux/images/fileicons/pgp.png
deleted file mode 100644
index e6b35f36e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/pgp.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/php.png b/lib/copy_this/www/templates/nntmux/images/fileicons/php.png
deleted file mode 100644
index 44c0fe0a0..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/php.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/pl.png b/lib/copy_this/www/templates/nntmux/images/fileicons/pl.png
deleted file mode 100644
index ad2324e35..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/pl.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/png.png b/lib/copy_this/www/templates/nntmux/images/fileicons/png.png
deleted file mode 100644
index f0b5b00ee..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/png.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/ppt.png b/lib/copy_this/www/templates/nntmux/images/fileicons/ppt.png
deleted file mode 100644
index adaefc602..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/ppt.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/ps.png b/lib/copy_this/www/templates/nntmux/images/fileicons/ps.png
deleted file mode 100644
index 487c3cb7c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/ps.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/py.png b/lib/copy_this/www/templates/nntmux/images/fileicons/py.png
deleted file mode 100644
index 9e31edb55..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/py.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/ram.png b/lib/copy_this/www/templates/nntmux/images/fileicons/ram.png
deleted file mode 100644
index 1a54d7654..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/ram.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/rar.png b/lib/copy_this/www/templates/nntmux/images/fileicons/rar.png
deleted file mode 100644
index a6af4d1ca..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/rar.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/rb.png b/lib/copy_this/www/templates/nntmux/images/fileicons/rb.png
deleted file mode 100644
index 30670165f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/rb.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/rm.png b/lib/copy_this/www/templates/nntmux/images/fileicons/rm.png
deleted file mode 100644
index a2db68e32..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/rm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/rpm.png b/lib/copy_this/www/templates/nntmux/images/fileicons/rpm.png
deleted file mode 100644
index 22212eafa..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/rpm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/rtf.png b/lib/copy_this/www/templates/nntmux/images/fileicons/rtf.png
deleted file mode 100644
index d8bada5fe..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/rtf.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sfv.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sfv.png
deleted file mode 100644
index da20009c6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sfv.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sig.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sig.png
deleted file mode 100644
index 3d8b19d2b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sig.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sql.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sql.png
deleted file mode 100644
index f60054a3a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sql.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/srr.png b/lib/copy_this/www/templates/nntmux/images/fileicons/srr.png
deleted file mode 100644
index da20009c6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/srr.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/srs.png b/lib/copy_this/www/templates/nntmux/images/fileicons/srs.png
deleted file mode 100644
index fbd174e2d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/srs.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/srt.png b/lib/copy_this/www/templates/nntmux/images/fileicons/srt.png
deleted file mode 100644
index da20009c6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/srt.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/swf.png b/lib/copy_this/www/templates/nntmux/images/fileicons/swf.png
deleted file mode 100644
index 0729ed020..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/swf.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sxc.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sxc.png
deleted file mode 100644
index 419c183c1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sxc.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sxd.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sxd.png
deleted file mode 100644
index 5801bb23a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sxd.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sxi.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sxi.png
deleted file mode 100644
index 2a94290d7..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sxi.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/sxw.png b/lib/copy_this/www/templates/nntmux/images/fileicons/sxw.png
deleted file mode 100644
index 6da97beb3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/sxw.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/tar.png b/lib/copy_this/www/templates/nntmux/images/fileicons/tar.png
deleted file mode 100644
index 5a2f717fc..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/tar.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/tex.png b/lib/copy_this/www/templates/nntmux/images/fileicons/tex.png
deleted file mode 100644
index e46a5166f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/tex.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/tgz.png b/lib/copy_this/www/templates/nntmux/images/fileicons/tgz.png
deleted file mode 100644
index 141acf564..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/tgz.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/txt.png b/lib/copy_this/www/templates/nntmux/images/fileicons/txt.png
deleted file mode 100644
index da20009c6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/txt.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/url.png b/lib/copy_this/www/templates/nntmux/images/fileicons/url.png
deleted file mode 100644
index 672cbce42..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/url.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/vcf.png b/lib/copy_this/www/templates/nntmux/images/fileicons/vcf.png
deleted file mode 100644
index 195ab38bc..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/vcf.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/video.png b/lib/copy_this/www/templates/nntmux/images/fileicons/video.png
deleted file mode 100644
index b89fc5299..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/video.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/vsd.png b/lib/copy_this/www/templates/nntmux/images/fileicons/vsd.png
deleted file mode 100644
index d14b81d98..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/vsd.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/wav.png b/lib/copy_this/www/templates/nntmux/images/fileicons/wav.png
deleted file mode 100644
index 79e80760e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/wav.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/wma.png b/lib/copy_this/www/templates/nntmux/images/fileicons/wma.png
deleted file mode 100644
index 6854de772..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/wma.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/wmv.png b/lib/copy_this/www/templates/nntmux/images/fileicons/wmv.png
deleted file mode 100644
index b26f45d5f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/wmv.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/xls.png b/lib/copy_this/www/templates/nntmux/images/fileicons/xls.png
deleted file mode 100644
index e8cd58dc0..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/xls.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/xml.png b/lib/copy_this/www/templates/nntmux/images/fileicons/xml.png
deleted file mode 100644
index eb4632397..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/xml.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/xpi.png b/lib/copy_this/www/templates/nntmux/images/fileicons/xpi.png
deleted file mode 100644
index 5e537e237..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/xpi.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/xvid.png b/lib/copy_this/www/templates/nntmux/images/fileicons/xvid.png
deleted file mode 100644
index d8429dc1a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/xvid.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/fileicons/zip.png b/lib/copy_this/www/templates/nntmux/images/fileicons/zip.png
deleted file mode 100644
index 999ffbe80..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/fileicons/zip.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/cn.png b/lib/copy_this/www/templates/nntmux/images/flags/cn.png
deleted file mode 100644
index 891441462..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/cn.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/cz.png b/lib/copy_this/www/templates/nntmux/images/flags/cz.png
deleted file mode 100644
index c8403dd21..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/cz.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/de.png b/lib/copy_this/www/templates/nntmux/images/flags/de.png
deleted file mode 100644
index ac4a97736..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/de.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/dk.png b/lib/copy_this/www/templates/nntmux/images/flags/dk.png
deleted file mode 100644
index 5253b65ff..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/dk.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/en.png b/lib/copy_this/www/templates/nntmux/images/flags/en.png
deleted file mode 100644
index 6a7ae5f9f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/en.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/es.png b/lib/copy_this/www/templates/nntmux/images/flags/es.png
deleted file mode 100644
index c2de2d711..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/es.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/fi.png b/lib/copy_this/www/templates/nntmux/images/flags/fi.png
deleted file mode 100644
index 14ec091b8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/fi.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/fr.png b/lib/copy_this/www/templates/nntmux/images/flags/fr.png
deleted file mode 100644
index 8332c4ec2..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/fr.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/gb.png b/lib/copy_this/www/templates/nntmux/images/flags/gb.png
deleted file mode 100644
index 01a9e073d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/gb.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/gr.png b/lib/copy_this/www/templates/nntmux/images/flags/gr.png
deleted file mode 100644
index 8651ade7c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/gr.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/hu.png b/lib/copy_this/www/templates/nntmux/images/flags/hu.png
deleted file mode 100644
index 7baafe44d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/hu.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/il.png b/lib/copy_this/www/templates/nntmux/images/flags/il.png
deleted file mode 100644
index 2ca772d0b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/il.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/in.png b/lib/copy_this/www/templates/nntmux/images/flags/in.png
deleted file mode 100644
index e4d7e81a9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/in.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/it.png b/lib/copy_this/www/templates/nntmux/images/flags/it.png
deleted file mode 100644
index 89692f74f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/it.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/jp.png b/lib/copy_this/www/templates/nntmux/images/flags/jp.png
deleted file mode 100644
index 325fbad3f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/jp.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/kr.png b/lib/copy_this/www/templates/nntmux/images/flags/kr.png
deleted file mode 100644
index 9c0a78eb9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/kr.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/nl.png b/lib/copy_this/www/templates/nntmux/images/flags/nl.png
deleted file mode 100644
index fe44791e3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/nl.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/no.png b/lib/copy_this/www/templates/nntmux/images/flags/no.png
deleted file mode 100644
index 160b6b5b7..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/no.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/ph.png b/lib/copy_this/www/templates/nntmux/images/flags/ph.png
deleted file mode 100644
index b89e15935..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/ph.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/pk.png b/lib/copy_this/www/templates/nntmux/images/flags/pk.png
deleted file mode 100644
index e9df70ca4..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/pk.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/pl.png b/lib/copy_this/www/templates/nntmux/images/flags/pl.png
deleted file mode 100644
index d413d010b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/pl.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/pt.png b/lib/copy_this/www/templates/nntmux/images/flags/pt.png
deleted file mode 100644
index ece798015..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/pt.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/ro.png b/lib/copy_this/www/templates/nntmux/images/flags/ro.png
deleted file mode 100644
index 57e74a651..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/ro.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/ru.png b/lib/copy_this/www/templates/nntmux/images/flags/ru.png
deleted file mode 100644
index 47da4214f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/ru.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/se.png b/lib/copy_this/www/templates/nntmux/images/flags/se.png
deleted file mode 100644
index 1994653da..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/se.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/th.png b/lib/copy_this/www/templates/nntmux/images/flags/th.png
deleted file mode 100644
index dd8ba9171..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/th.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/tr.png b/lib/copy_this/www/templates/nntmux/images/flags/tr.png
deleted file mode 100644
index be32f77e9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/tr.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/tw.png b/lib/copy_this/www/templates/nntmux/images/flags/tw.png
deleted file mode 100644
index f31c654c9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/tw.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/us.png b/lib/copy_this/www/templates/nntmux/images/flags/us.png
deleted file mode 100644
index 22afb1abd..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/us.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/flags/vn.png b/lib/copy_this/www/templates/nntmux/images/flags/vn.png
deleted file mode 100644
index ec7cd48a3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/flags/vn.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/ade.png b/lib/copy_this/www/templates/nntmux/images/icons/ade.png
deleted file mode 100644
index 6a94eb4b2..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/ade.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/aebn.png b/lib/copy_this/www/templates/nntmux/images/icons/aebn.png
deleted file mode 100644
index 91d45b5c7..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/aebn.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/allmusic.png b/lib/copy_this/www/templates/nntmux/images/icons/allmusic.png
deleted file mode 100644
index c2ef310e8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/allmusic.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/amazon.png b/lib/copy_this/www/templates/nntmux/images/icons/amazon.png
deleted file mode 100644
index 70f8d4fd5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/amazon.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/binsearch.png b/lib/copy_this/www/templates/nntmux/images/icons/binsearch.png
deleted file mode 100644
index afe5c23a3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/binsearch.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/broken.png b/lib/copy_this/www/templates/nntmux/images/icons/broken.png
deleted file mode 100644
index 9af03554f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/broken.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/cartdown.png b/lib/copy_this/www/templates/nntmux/images/icons/cartdown.png
deleted file mode 100644
index f7326419e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/cartdown.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/cartup.png b/lib/copy_this/www/templates/nntmux/images/icons/cartup.png
deleted file mode 100644
index a817a9f19..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/cartup.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/check.png b/lib/copy_this/www/templates/nntmux/images/icons/check.png
deleted file mode 100644
index daf00c05f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/check.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/couch.png b/lib/copy_this/www/templates/nntmux/images/icons/couch.png
deleted file mode 100644
index ab14bb06b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/couch.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/desura.png b/lib/copy_this/www/templates/nntmux/images/icons/desura.png
deleted file mode 100644
index 23c0391ca..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/desura.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/discogs.png b/lib/copy_this/www/templates/nntmux/images/icons/discogs.png
deleted file mode 100644
index 1de9bb920..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/discogs.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/edit.gif b/lib/copy_this/www/templates/nntmux/images/icons/edit.gif
deleted file mode 100644
index 5e82fa9ea..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/edit.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/exclamation.png b/lib/copy_this/www/templates/nntmux/images/icons/exclamation.png
deleted file mode 100644
index c37bd062e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/exclamation.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/fresh.png b/lib/copy_this/www/templates/nntmux/images/icons/fresh.png
deleted file mode 100644
index eedb799be..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/fresh.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/gamespot.png b/lib/copy_this/www/templates/nntmux/images/icons/gamespot.png
deleted file mode 100644
index 42d01f7e8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/gamespot.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/giantbomb.png b/lib/copy_this/www/templates/nntmux/images/icons/giantbomb.png
deleted file mode 100644
index e1f450c5f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/giantbomb.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/go.png b/lib/copy_this/www/templates/nntmux/images/icons/go.png
deleted file mode 100644
index 1dab13594..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/go.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/goodreads.png b/lib/copy_this/www/templates/nntmux/images/icons/goodreads.png
deleted file mode 100644
index 58091f3b1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/goodreads.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/greenlight.png b/lib/copy_this/www/templates/nntmux/images/icons/greenlight.png
deleted file mode 100644
index 8947f93b1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/greenlight.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/hotmovies.png b/lib/copy_this/www/templates/nntmux/images/icons/hotmovies.png
deleted file mode 100644
index 376a1472c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/hotmovies.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/iafd.png b/lib/copy_this/www/templates/nntmux/images/icons/iafd.png
deleted file mode 100644
index 1673ab6f4..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/iafd.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/ign.png b/lib/copy_this/www/templates/nntmux/images/icons/ign.png
deleted file mode 100644
index dc9f0cd76..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/ign.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/imdb.png b/lib/copy_this/www/templates/nntmux/images/icons/imdb.png
deleted file mode 100644
index 16c2d97dd..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/imdb.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/information.png b/lib/copy_this/www/templates/nntmux/images/icons/information.png
deleted file mode 100644
index 12cd1aef9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/information.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/lastfm.png b/lib/copy_this/www/templates/nntmux/images/icons/lastfm.png
deleted file mode 100644
index 74320e783..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/lastfm.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/lock.gif b/lib/copy_this/www/templates/nntmux/images/icons/lock.gif
deleted file mode 100644
index 0a225b852..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/lock.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/lock2.png b/lib/copy_this/www/templates/nntmux/images/icons/lock2.png
deleted file mode 100644
index ad12261a5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/lock2.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/magnifier.png b/lib/copy_this/www/templates/nntmux/images/icons/magnifier.png
deleted file mode 100644
index 545a6a907..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/magnifier.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/note.png b/lib/copy_this/www/templates/nntmux/images/icons/note.png
deleted file mode 100644
index 244e6ca04..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/note.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/note_add.png b/lib/copy_this/www/templates/nntmux/images/icons/note_add.png
deleted file mode 100644
index abdad91eb..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/note_add.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/note_edit.png b/lib/copy_this/www/templates/nntmux/images/icons/note_edit.png
deleted file mode 100644
index 291bfc764..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/note_edit.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/nuke.png b/lib/copy_this/www/templates/nntmux/images/icons/nuke.png
deleted file mode 100644
index 2d0e42f02..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/nuke.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/nuked.png b/lib/copy_this/www/templates/nntmux/images/icons/nuked.png
deleted file mode 100644
index 558e95bf8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/nuked.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/nzbdown.png b/lib/copy_this/www/templates/nntmux/images/icons/nzbdown.png
deleted file mode 100644
index 7dd6bcf0d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/nzbdown.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/nzbindex.png b/lib/copy_this/www/templates/nntmux/images/icons/nzbindex.png
deleted file mode 100644
index eb18ea0af..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/nzbindex.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/nzbup.png b/lib/copy_this/www/templates/nntmux/images/icons/nzbup.png
deleted file mode 100644
index 391f3abc9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/nzbup.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/popporn.png b/lib/copy_this/www/templates/nntmux/images/icons/popporn.png
deleted file mode 100644
index 7e90684f9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/popporn.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/predbme.png b/lib/copy_this/www/templates/nntmux/images/icons/predbme.png
deleted file mode 100644
index 9bfbc4dde..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/predbme.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/queuedown.png b/lib/copy_this/www/templates/nntmux/images/icons/queuedown.png
deleted file mode 100644
index ba96aac6e..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/queuedown.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/queueup.png b/lib/copy_this/www/templates/nntmux/images/icons/queueup.png
deleted file mode 100644
index 4d0f9a569..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/queueup.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/rotten.png b/lib/copy_this/www/templates/nntmux/images/icons/rotten.png
deleted file mode 100644
index 4ef2358c3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/rotten.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/rottentomatoes.png b/lib/copy_this/www/templates/nntmux/images/icons/rottentomatoes.png
deleted file mode 100644
index e771d12ab..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/rottentomatoes.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/sabdown.png b/lib/copy_this/www/templates/nntmux/images/icons/sabdown.png
deleted file mode 100644
index 237313d1c..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/sabdown.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/sabup.png b/lib/copy_this/www/templates/nntmux/images/icons/sabup.png
deleted file mode 100644
index ed512086d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/sabup.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/shelfari.png b/lib/copy_this/www/templates/nntmux/images/icons/shelfari.png
deleted file mode 100644
index 99d752eac..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/shelfari.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/steam.png b/lib/copy_this/www/templates/nntmux/images/icons/steam.png
deleted file mode 100644
index 8947f93b1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/steam.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/switch.png b/lib/copy_this/www/templates/nntmux/images/icons/switch.png
deleted file mode 100644
index 7accb6ac4..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/switch.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/trakt.png b/lib/copy_this/www/templates/nntmux/images/icons/trakt.png
deleted file mode 100644
index a96881526..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/trakt.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/tvrage.png b/lib/copy_this/www/templates/nntmux/images/icons/tvrage.png
deleted file mode 100644
index 1fcc64614..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/tvrage.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/unnuked.png b/lib/copy_this/www/templates/nntmux/images/icons/unnuked.png
deleted file mode 100644
index 14bade3d2..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/unnuked.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow2_n.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow2_n.png
deleted file mode 100644
index dc41b02cf..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow2_n.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow2_s.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow2_s.png
deleted file mode 100644
index 0bbfe97d2..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow2_s.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow3_n.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow3_n.png
deleted file mode 100644
index c2ef2cd6a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow3_n.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow3_s.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow3_s.png
deleted file mode 100644
index d654f40f5..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/arrow3_s.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/bigsmile.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/bigsmile.png
deleted file mode 100644
index 5edfa84b6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/bigsmile.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/bigsmiledown.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/bigsmiledown.png
deleted file mode 100644
index e9519a0a3..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/bigsmiledown.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/blah.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/blah.png
deleted file mode 100644
index f46608de9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/blah.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/edit.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/edit.png
deleted file mode 100644
index 6f582ec47..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/edit.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/frown.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/frown.png
deleted file mode 100644
index bc56f7c82..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/frown.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/pause.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/pause.png
deleted file mode 100644
index b3b058760..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/pause.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/play.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/play.png
deleted file mode 100644
index a8b88e102..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/play.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/stop.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/stop.png
deleted file mode 100644
index ae257e6d9..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/stop.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/trash.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/trash.png
deleted file mode 100644
index 8ea124f88..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/trash.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/vortex/tv.png b/lib/copy_this/www/templates/nntmux/images/icons/vortex/tv.png
deleted file mode 100644
index 935e6f2f8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/vortex/tv.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/icons/warning.png b/lib/copy_this/www/templates/nntmux/images/icons/warning.png
deleted file mode 100644
index 14c51d6c1..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/icons/warning.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/logo_large.png b/lib/copy_this/www/templates/nntmux/images/logo_large.png
deleted file mode 100644
index 71ccfc2f4..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/logo_large.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/logo_largeplus.png b/lib/copy_this/www/templates/nntmux/images/logo_largeplus.png
deleted file mode 100644
index de4167db7..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/logo_largeplus.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/logo_largeplushigh.png b/lib/copy_this/www/templates/nntmux/images/logo_largeplushigh.png
deleted file mode 100644
index 24cacf486..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/logo_largeplushigh.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/menu.gif b/lib/copy_this/www/templates/nntmux/images/menu.gif
deleted file mode 100644
index 6d0ae0ad8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/menu.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/multimedia/audio.png b/lib/copy_this/www/templates/nntmux/images/multimedia/audio.png
deleted file mode 100644
index d67a4bb2a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/multimedia/audio.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/multimedia/video.png b/lib/copy_this/www/templates/nntmux/images/multimedia/video.png
deleted file mode 100644
index 2a6bfc24a..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/multimedia/video.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/nav-tile.png b/lib/copy_this/www/templates/nntmux/images/nav-tile.png
deleted file mode 100644
index 171b3c369..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/nav-tile.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/newwindow.png b/lib/copy_this/www/templates/nntmux/images/newwindow.png
deleted file mode 100644
index b8782b585..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/newwindow.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/nn_small.jpg b/lib/copy_this/www/templates/nntmux/images/nn_small.jpg
deleted file mode 100644
index 33b38918f..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/nn_small.jpg and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/nzbget.png b/lib/copy_this/www/templates/nntmux/images/nzbget.png
deleted file mode 100644
index 1d9d1177b..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/nzbget.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/powered.png b/lib/copy_this/www/templates/nntmux/images/powered.png
deleted file mode 100644
index d7ed21cf6..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/powered.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/sabnzbd.png b/lib/copy_this/www/templates/nntmux/images/sabnzbd.png
deleted file mode 100644
index 99ca8c9d8..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/sabnzbd.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/sickbeard.png b/lib/copy_this/www/templates/nntmux/images/sickbeard.png
deleted file mode 100644
index 5a5115eb4..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/sickbeard.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/sorting/arrow_down.gif b/lib/copy_this/www/templates/nntmux/images/sorting/arrow_down.gif
deleted file mode 100644
index 861bd1c6d..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/sorting/arrow_down.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/sorting/arrow_up.gif b/lib/copy_this/www/templates/nntmux/images/sorting/arrow_up.gif
deleted file mode 100644
index 677684dde..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/sorting/arrow_up.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/tvrage_small.gif b/lib/copy_this/www/templates/nntmux/images/tvrage_small.gif
deleted file mode 100644
index 6d8ec8993..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/tvrage_small.gif and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/images/valid-xhtml10.png b/lib/copy_this/www/templates/nntmux/images/valid-xhtml10.png
deleted file mode 100644
index b81de9160..000000000
Binary files a/lib/copy_this/www/templates/nntmux/images/valid-xhtml10.png and /dev/null differ
diff --git a/lib/copy_this/www/templates/nntmux/scripts/bootstrap.min.js b/lib/copy_this/www/templates/nntmux/scripts/bootstrap.min.js
deleted file mode 100644
index 87313dbdd..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/bootstrap.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.3.4 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.4",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.4",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.4",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.4",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="menu"]',g.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="listbox"]',g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in").attr("aria-hidden",!1),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a('<div class="modal-backdrop '+e+'" />').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.3.4",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport),this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-m<p.top?"bottom":"right"==h&&k.right+l>p.width?"left":"left"==h&&k.left-l<p.left?"right":h,f.removeClass(n).addClass(h)}var q=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(q,h);var r=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",r).emulateTransitionEnd(c.TRANSITION_DURATION):r()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top=b.top+g,b.left=b.left+h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.4",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.4",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.4",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){
-    var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.4",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a(document.body).height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/holder.js b/lib/copy_this/www/templates/nntmux/scripts/holder.js
deleted file mode 100644
index 13612b12f..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/holder.js
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
-
-Holder - 2.0 - client side image placeholders
-(c) 2012-2013 Ivan Malopinsky / http://imsky.co
-
-Provided under the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0
-Commercial use requires attribution.
-
-*/
-
-var Holder = Holder || {};
-(function (app, win) {
-
-var preempted = false,
-fallback = false,
-canvas = document.createElement('canvas');
-
-//getElementsByClassName polyfill
-document.getElementsByClassName||(document.getElementsByClassName=function(e){var t=document,n,r,i,s=[];if(t.querySelectorAll)return t.querySelectorAll("."+e);if(t.evaluate){r=".//*[contains(concat(' ', @class, ' '), ' "+e+" ')]",n=t.evaluate(r,t,null,0,null);while(i=n.iterateNext())s.push(i)}else{n=t.getElementsByTagName("*"),r=new RegExp("(^|\\s)"+e+"(\\s|$)");for(i=0;i<n.length;i++)r.test(n[i].className)&&s.push(n[i])}return s})
-
-//getComputedStyle polyfill
-window.getComputedStyle||(window.getComputedStyle=function(e,t){return this.el=e,this.getPropertyValue=function(t){var n=/(\-([a-z]){1})/g;return t=="float"&&(t="styleFloat"),n.test(t)&&(t=t.replace(n,function(){return arguments[2].toUpperCase()})),e.currentStyle[t]?e.currentStyle[t]:null},this})
-
-//http://javascript.nwbox.com/ContentLoaded by Diego Perini with modifications
-function contentLoaded(n,t){var l="complete",s="readystatechange",u=!1,h=u,c=!0,i=n.document,a=i.documentElement,e=i.addEventListener?"addEventListener":"attachEvent",v=i.addEventListener?"removeEventListener":"detachEvent",f=i.addEventListener?"":"on",r=function(e){(e.type!=s||i.readyState==l)&&((e.type=="load"?n:i)[v](f+e.type,r,u),!h&&(h=!0)&&t.call(n,null))},o=function(){try{a.doScroll("left")}catch(n){setTimeout(o,50);return}r("poll")};if(i.readyState==l)t.call(n,"lazy");else{if(i.createEventObject&&a.doScroll){try{c=!n.frameElement}catch(y){}c&&o()}i[e](f+"DOMContentLoaded",r,u),i[e](f+s,r,u),n[e](f+"load",r,u)}};
-
-//https://gist.github.com/991057 by Jed Schmidt with modifications
-function selector(a){
-	a=a.match(/^(\W)?(.*)/);var b=document["getElement"+(a[1]?a[1]=="#"?"ById":"sByClassName":"sByTagName")](a[2]);
-	var ret=[];	b!=null&&(b.length?ret=b:b.length==0?ret=b:ret=[b]);	return ret;
-}
-
-//shallow object property extend
-function extend(a,b){var c={};for(var d in a)c[d]=a[d];for(var e in b)c[e]=b[e];return c}
-
-//hasOwnProperty polyfill
-if (!Object.prototype.hasOwnProperty)
-	Object.prototype.hasOwnProperty = function(prop) {
-		var proto = this.__proto__ || this.constructor.prototype;
-		return (prop in this) && (!(prop in proto) || proto[prop] !== this[prop]);
-	}
-
-function text_size(width, height, template) {
-	height = parseInt(height,10);
-	width = parseInt(width,10);
-	var bigSide = Math.max(height, width)
-	var smallSide = Math.min(height, width)
-	var scale = 1 / 12;
-	var newHeight = Math.min(smallSide * 0.75, 0.75 * bigSide * scale);
-	return {
-		height: Math.round(Math.max(template.size, newHeight))
-	}
-}
-
-function draw(ctx, dimensions, template, ratio) {
-	var ts = text_size(dimensions.width, dimensions.height, template);
-	var text_height = ts.height;
-	var width = dimensions.width * ratio,
-		height = dimensions.height * ratio;
-	var font = template.font ? template.font : "sans-serif";
-	canvas.width = width;
-	canvas.height = height;
-	ctx.textAlign = "center";
-	ctx.textBaseline = "middle";
-	ctx.fillStyle = template.background;
-	ctx.fillRect(0, 0, width, height);
-	ctx.fillStyle = template.foreground;
-	ctx.font = "bold " + text_height + "px " + font;
-	var text = template.text ? template.text : (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
-	var text_width = ctx.measureText(text).width;
-	if (text_width / width >= 0.75) {
-		text_height = Math.floor(text_height * 0.75 * (width/text_width));
-	}
-	//Resetting font size if necessary
-	ctx.font = "bold " + (text_height * ratio) + "px " + font;
-	ctx.fillText(text, (width / 2), (height / 2), width);
-	return canvas.toDataURL("image/png");
-}
-
-function render(mode, el, holder, src) {
-	var dimensions = holder.dimensions,
-		theme = holder.theme,
-		text = holder.text ? decodeURIComponent(holder.text) : holder.text;
-	var dimensions_caption = dimensions.width + "x" + dimensions.height;
-	theme = (text ? extend(theme, {
-		text: text
-	}) : theme);
-	theme = (holder.font ? extend(theme, {
-		font: holder.font
-	}) : theme);
-	if (mode == "image") {
-		el.setAttribute("data-src", src);
-		el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
-		if (fallback || !holder.auto) {
-			el.style.width = dimensions.width + "px";
-			el.style.height = dimensions.height + "px";
-		}
-		if (fallback) {
-			el.style.backgroundColor = theme.background;
-		} else {
-			el.setAttribute("src", draw(ctx, dimensions, theme, ratio));
-		}
-	} else if (mode == "background") {
-		if (!fallback) {
-			el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")";
-			el.style.backgroundSize = dimensions.width + "px " + dimensions.height + "px";
-		}
-	} else if (mode == "fluid") {
-		el.setAttribute("data-src", src);
-		el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
-		if (dimensions.height.substr(-1) == "%") {
-			el.style.height = dimensions.height
-		} else {
-			el.style.height = dimensions.height + "px"
-		}
-		if (dimensions.width.substr(-1) == "%") {
-			el.style.width = dimensions.width
-		} else {
-			el.style.width = dimensions.width + "px"
-		}
-		if (el.style.display == "inline" || el.style.display == "") {
-			el.style.display = "block";
-		}
-		if (fallback) {
-			el.style.backgroundColor = theme.background;
-		} else {
-			el.holderData = holder;
-			fluid_images.push(el);
-			fluid_update(el);
-		}
-	}
-};
-
-function fluid_update(element) {
-	var images;
-	if (element.nodeType == null) {
-		images = fluid_images;
-	} else {
-		images = [element]
-	}
-	for (i in images) {
-		var el = images[i]
-		if (el.holderData) {
-			var holder = el.holderData;
-			el.setAttribute("src", draw(ctx, {
-				height: el.clientHeight,
-				width: el.clientWidth
-			}, holder.theme, ratio));
-		}
-	}
-}
-
-function parse_flags(flags, options) {
-
-	var ret = {
-		theme: settings.themes.gray
-	}, render = false;
-
-	for (sl = flags.length, j = 0; j < sl; j++) {
-		var flag = flags[j];
-		if (app.flags.dimensions.match(flag)) {
-			render = true;
-			ret.dimensions = app.flags.dimensions.output(flag);
-		} else if (app.flags.fluid.match(flag)) {
-			render = true;
-			ret.dimensions = app.flags.fluid.output(flag);
-			ret.fluid = true;
-		} else if (app.flags.colors.match(flag)) {
-			ret.theme = app.flags.colors.output(flag);
-		} else if (options.themes[flag]) {
-			//If a theme is specified, it will override custom colors
-			ret.theme = options.themes[flag];
-		} else if (app.flags.text.match(flag)) {
-			ret.text = app.flags.text.output(flag);
-		} else if (app.flags.font.match(flag)) {
-			ret.font = app.flags.font.output(flag);
-		} else if (app.flags.auto.match(flag)) {
-			ret.auto = true;
-		}
-	}
-
-	return render ? ret : false;
-
-};
-
-
-
-if (!canvas.getContext) {
-	fallback = true;
-} else {
-	if (canvas.toDataURL("image/png")
-		.indexOf("data:image/png") < 0) {
-		//Android doesn't support data URI
-		fallback = true;
-	} else {
-		var ctx = canvas.getContext("2d");
-	}
-}
-
-var dpr = 1, bsr = 1;
-
-if(!fallback){
-    dpr = window.devicePixelRatio || 1,
-    bsr = ctx.webkitBackingStorePixelRatio || ctx.mozBackingStorePixelRatio || ctx.msBackingStorePixelRatio || ctx.oBackingStorePixelRatio || ctx.backingStorePixelRatio || 1;
-}
-
-var ratio = dpr / bsr;
-
-var fluid_images = [];
-
-var settings = {
-	domain: "holder.js",
-	images: "img",
-	bgnodes: ".holderjs",
-	themes: {
-		"gray": {
-			background: "#eee",
-			foreground: "#aaa",
-			size: 12
-		},
-		"social": {
-			background: "#3a5a97",
-			foreground: "#fff",
-			size: 12
-		},
-		"industrial": {
-			background: "#434A52",
-			foreground: "#C2F200",
-			size: 12
-		}
-	},
-	stylesheet: ""
-};
-
-
-app.flags = {
-	dimensions: {
-		regex: /^(\d+)x(\d+)$/,
-		output: function (val) {
-			var exec = this.regex.exec(val);
-			return {
-				width: +exec[1],
-				height: +exec[2]
-			}
-		}
-	},
-	fluid: {
-		regex: /^([0-9%]+)x([0-9%]+)$/,
-		output: function (val) {
-			var exec = this.regex.exec(val);
-			return {
-				width: exec[1],
-				height: exec[2]
-			}
-		}
-	},
-	colors: {
-		regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i,
-		output: function (val) {
-			var exec = this.regex.exec(val);
-			return {
-				size: settings.themes.gray.size,
-				foreground: "#" + exec[2],
-				background: "#" + exec[1]
-			}
-		}
-	},
-	text: {
-		regex: /text\:(.*)/,
-		output: function (val) {
-			return this.regex.exec(val)[1];
-		}
-	},
-	font: {
-		regex: /font\:(.*)/,
-		output: function (val) {
-			return this.regex.exec(val)[1];
-		}
-	},
-	auto: {
-		regex: /^auto$/
-	}
-}
-
-for (var flag in app.flags) {
-	if (!app.flags.hasOwnProperty(flag)) continue;
-	app.flags[flag].match = function (val) {
-		return val.match(this.regex)
-	}
-}
-
-app.add_theme = function (name, theme) {
-	name != null && theme != null && (settings.themes[name] = theme);
-	return app;
-};
-
-app.add_image = function (src, el) {
-	var node = selector(el);
-	if (node.length) {
-		for (var i = 0, l = node.length; i < l; i++) {
-			var img = document.createElement("img")
-			img.setAttribute("data-src", src);
-			node[i].appendChild(img);
-		}
-	}
-	return app;
-};
-
-app.run = function (o) {
-	var options = extend(settings, o),
-	    images = [], imageNodes = [], bgnodes = [];
-
-	if(typeof(options.images) == "string"){
-	    imageNodes = selector(options.images);
-	}
-	else if (window.NodeList && options.images instanceof window.NodeList) {
-		imageNodes = options.images;
-	} else if (window.Node && options.images instanceof window.Node) {
-		imageNodes = [options.images];
-	}
-
-	if(typeof(options.bgnodes) == "string"){
-	    bgnodes = selector(options.bgnodes);
-	} else if (window.NodeList && options.elements instanceof window.NodeList) {
-		bgnodes = options.bgnodes;
-	} else if (window.Node && options.bgnodes instanceof window.Node) {
-		bgnodes = [options.bgnodes];
-	}
-
-	preempted = true;
-
-	for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]);
-
-	var holdercss = document.getElementById("holderjs-style");
-	if (!holdercss) {
-		holdercss = document.createElement("style");
-		holdercss.setAttribute("id", "holderjs-style");
-		holdercss.type = "text/css";
-		document.getElementsByTagName("head")[0].appendChild(holdercss);
-	}
-
-	if (!options.nocss) {
-	    if (holdercss.styleSheet) {
-		    holdercss.styleSheet.cssText += options.stylesheet;
-	    } else {
-		    holdercss.appendChild(document.createTextNode(options.stylesheet));
-	    }
-	}
-
-	var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)");
-
-	for (var l = bgnodes.length, i = 0; i < l; i++) {
-		var src = window.getComputedStyle(bgnodes[i], null)
-			.getPropertyValue("background-image");
-		var flags = src.match(cssregex);
-		var bgsrc = bgnodes[i].getAttribute("data-background-src");
-
-		if (flags) {
-			var holder = parse_flags(flags[1].split("/"), options);
-			if (holder) {
-				render("background", bgnodes[i], holder, src);
-			}
-		}
-		else if(bgsrc != null){
-		    var holder = parse_flags(bgsrc.substr(bgsrc.lastIndexOf(options.domain) + options.domain.length + 1)
-				.split("/"), options);
-		    if(holder){
-			render("background", bgnodes[i], holder, src);
-		    }
-		}
-	}
-
-	for (l = images.length, i = 0; i < l; i++) {
-
-		var attr_src = attr_data_src = src = null;
-
-		try{
-		    attr_src = images[i].getAttribute("src");
-		    attr_datasrc = images[i].getAttribute("data-src");
-		}catch(e){}
-
-		if (attr_datasrc == null && !! attr_src && attr_src.indexOf(options.domain) >= 0) {
-			src = attr_src;
-		} else if ( !! attr_datasrc && attr_datasrc.indexOf(options.domain) >= 0) {
-			src = attr_datasrc;
-		}
-
-		if (src) {
-			var holder = parse_flags(src.substr(src.lastIndexOf(options.domain) + options.domain.length + 1)
-				.split("/"), options);
-			if (holder) {
-				if (holder.fluid) {
-					render("fluid", images[i], holder, src)
-				} else {
-					render("image", images[i], holder, src);
-				}
-			}
-		}
-	}
-	return app;
-};
-
-contentLoaded(win, function () {
-	if (window.addEventListener) {
-		window.addEventListener("resize", fluid_update, false);
-		window.addEventListener("orientationchange", fluid_update, false);
-	} else {
-		window.attachEvent("onresize", fluid_update)
-	}
-	preempted || app.run();
-});
-
-if (typeof define === "function" && define.amd) {
-	define("Holder", [], function () {
-		return app;
-	});
-}
-
-})(Holder, window);
diff --git a/lib/copy_this/www/templates/nntmux/scripts/html5shiv.js b/lib/copy_this/www/templates/nntmux/scripts/html5shiv.js
deleted file mode 100644
index 784f221ca..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/html5shiv.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
-c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?: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,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
-for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery-1.9.1.js b/lib/copy_this/www/templates/nntmux/scripts/jquery-1.9.1.js
deleted file mode 100644
index e0375b304..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery-1.9.1.js
+++ /dev/null
@@ -1,9597 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.9.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-2-4
- */
-(function( window, undefined ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//"use strict";
-var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<9
-	// For `typeof node.method` instead of `node.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-	location = window.location,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.9.1",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of id
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
-				if ( list && ( !fired || stack ) ) {
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function() {
-
-	var support, all, a,
-		input, select, fragment,
-		opt, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// Support tests won't run in some limited or non-browser environments
-	all = div.getElementsByTagName("*");
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !all || !a || !all.length ) {
-		return {};
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-	support = {
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.5/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-		checkOn: !!input.value,
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Tests for enctype support on a form (#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-		boxModel: document.compatMode === "CSS1Compat",
-
-		// Will be defined later
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		boxSizingReliable: true,
-		pixelPosition: false
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-		support.boxSizing = ( div.offsetWidth === 4 );
-		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
-			}
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})();
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, ret,
-		internalKey = jQuery.expando,
-		getByName = typeof name === "string",
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an id for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique id for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		cache[ id ] = {};
-
-		// Avoids exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		if ( !isNode ) {
-			cache[ id ].toJSON = jQuery.noop;
-		}
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( getByName ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var i, l, thisCache,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			for ( i = 0, l = name.length; i < l; i++ ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( !name.indexOf( "data-" ) ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				// Try to fetch any internally stored data first
-				return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-			}
-
-			this.each(function() {
-				jQuery.data( this, key, value );
-			});
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		hooks.cur = fn;
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var hooks, notxml, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			// In IE9+, Flash objects don't have .getAttribute (#12945)
-			// Support: IE9+
-			if ( typeof elem.getAttribute !== core_strundefined ) {
-				ret =  elem.getAttribute( name );
-			}
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( rboolean.test( name ) ) {
-					// Set corresponding property to false for boolean attributes
-					// Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
-					if ( !getSetAttribute && ruseDefault.test( name ) ) {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					} else {
-						elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		var
-			// Use .prop to determine if this attribute is understood as boolean
-			prop = jQuery.prop( elem, name ),
-
-			// Fetch it accordingly
-			attr = typeof prop === "boolean" && elem.getAttribute( name ),
-			detail = typeof prop === "boolean" ?
-
-				getSetInput && getSetAttribute ?
-					attr != null :
-					// oldIE fabricates an empty string for missing boolean attributes
-					// and conflates checked/selected into attroperties
-					ruseDefault.test( name ) ?
-						elem[ jQuery.camelCase( "default-" + name ) ] :
-						!!attr :
-
-				// fetch an attribute node for properties not recognized as boolean
-				elem.getAttributeNode( name );
-
-		return detail && detail.value !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-
-// fix oldIE value attroperty
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return jQuery.nodeName( elem, "input" ) ?
-
-				// Ignore the value *property* by using defaultValue
-				elem.defaultValue :
-
-				ret && ret.specified ? ret.value : undefined;
-		},
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
-				ret.value :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret == null ? undefined : ret;
-			}
-		});
-	});
-
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique id, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		event.isTrigger = true;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	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( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			}
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== document.activeElement && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === document.activeElement && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
- */
-(function( window, undefined ) {
-
-var i,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	hasDuplicate,
-	outermostContext,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsXML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-	sortOrder,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	support = {},
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Array methods
-	arr = [],
-	pop = arr.pop,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	operators = "([*^$|!~]?=)",
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"id": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rsibling = /[\x20\t\r\n\f]*[+~]/,
-
-	rnative = /^[^{]+\{\s*\[native code/,
-
-	// Easily-parseable/retrievable id or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-	rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
-	funescape = function( _, escaped ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		return high !== high ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Use a stripped-down slice if we can't use a native one
-try {
-	slice.call( preferredDoc.documentElement.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-	slice = function( i ) {
-		var elem,
-			results = [];
-		while ( (elem = this[i++]) ) {
-			results.push( elem );
-		}
-		return results;
-	};
-}
-
-/**
- * For feature detection
- * @param {Function} fn The function to test for native support
- */
-function isNative( fn ) {
-	return rnative.test( fn + "" );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var cache,
-		keys = [];
-
-	return (cache = function( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	});
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// release memory in IE
-		div = null;
-	}
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( !documentIsXML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#id")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of id
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
-				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && !rbuggyQSA.test(selector) ) {
-			old = true;
-			nid = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra id on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results, slice.call( newContext.querySelectorAll(
-						newSelector
-					), 0 ) );
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsXML = isXML( doc );
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.tagNameNoComments = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if attributes should be retrieved by attribute nodes
-	support.attributes = assert(function( div ) {
-		div.innerHTML = "<select></select>";
-		var type = typeof div.lastChild.getAttribute("multiple");
-		// IE8 returns a string for some attributes even when not present
-		return type !== "boolean" && type !== "string";
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getByClassName = assert(function( div ) {
-		// Opera can't find a second classname (in 9.6)
-		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
-		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-			return false;
-		}
-
-		// Safari 3.2 caches class attributes and doesn't catch changes
-		div.lastChild.className = "e";
-		return div.getElementsByClassName("e").length === 2;
-	});
-
-	// Check if getElementById returns elements by name
-	// Check if getElementsByName privileges form controls or returns elements by id
-	support.getByName = assert(function( div ) {
-		// Inject content
-		div.id = expando + 0;
-		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
-		docElem.insertBefore( div, docElem.firstChild );
-
-		// Test
-		var pass = doc.getElementsByName &&
-			// buggy browsers will return fewer than the correct 2
-			doc.getElementsByName( expando ).length === 2 +
-			// buggy browsers will return more than the correct 0
-			doc.getElementsByName( expando + 0 ).length;
-		support.getIdNotName = !doc.getElementById( expando );
-
-		// Cleanup
-		docElem.removeChild( div );
-
-		return pass;
-	});
-
-	// IE6/7 return modified attributes
-	Expr.attrHandle = assert(function( div ) {
-		div.innerHTML = "<a href='#'></a>";
-		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-			div.firstChild.getAttribute("href") === "#";
-	}) ?
-		{} :
-		{
-			"href": function( elem ) {
-				return elem.getAttribute( "href", 2 );
-			},
-			"type": function( elem ) {
-				return elem.getAttribute("type");
-			}
-		};
-
-	// id find and filter
-	if ( support.getIdNotName ) {
-		Expr.find["id"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["id"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		Expr.find["id"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
-				var m = context.getElementById( id );
-
-				return m ?
-					m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-		Expr.filter["id"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.tagNameNoComments ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Name
-	Expr.find["NAME"] = support.getByName && function( tag, context ) {
-		if ( typeof context.getElementsByName !== strundefined ) {
-			return context.getElementsByName( name );
-		}
-	};
-
-	// Class
-	Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21),
-	// no need to also add to buggyMatches since matches checks buggyQSA
-	// A support test would require too much code (would include document ready)
-	rbuggyQSA = [ ":focus" ];
-
-	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
-
-			// IE8 - Some boolean attributes are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Opera 10-12/IE8 - ^= $= *= and empty values
-			// Should not select anything
-			div.innerHTML = "<input type='hidden' i=''/>";
-			if ( div.querySelectorAll("[i^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.webkitMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-		var compare;
-
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
-			if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
-				if ( a === doc || contains( preferredDoc, a ) ) {
-					return -1;
-				}
-				if ( b === doc || contains( preferredDoc, b ) ) {
-					return 1;
-				}
-				return 0;
-			}
-			return compare & 4 ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	// Always assume the presence of duplicates if sort doesn't
-	// pass them to our comparison function (as in Google Chrome).
-	hasDuplicate = false;
-	[0, 0].sort( sortOrder );
-	support.detectDuplicates = hasDuplicate;
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	// rbuggyQSA always contains :focus, so no need for an existence check
-	if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	var val;
-
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	if ( !documentIsXML ) {
-		name = name.toLowerCase();
-	}
-	if ( (val = Expr.attrHandle[ name ]) ) {
-		return val( elem );
-	}
-	if ( documentIsXML || support.attributes ) {
-		return elem.getAttribute( name );
-	}
-	return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
-		name :
-		val && val.specified ? val.value : null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		i = 1,
-		j = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		for ( ; (elem = results[i]); i++ ) {
-			if ( elem === results[ i - 1 ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && ( ~b.sourceIndex || MAX_NEGATIVE ) - ( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[4] ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeName ) {
-			if ( nodeName === "*" ) {
-				return function() { return true; };
-			}
-
-			nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-			};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifider
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsXML ?
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
-						elem.lang) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push( {
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			} );
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push( {
-					value: matched,
-					type: type,
-					matches: match
-				} );
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an id
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "id" &&
-					context.nodeType === 9 && !documentIsXML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = Expr.find["id"]( token.matches[0].replace( runescape, funescape ), context )[0];
-				if ( !context ) {
-					return results;
-				}
-
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, slice.call( seed, 0 ) );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		documentIsXML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Easy API for creating new setFilters
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Initialize with the default document
-setDocument();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i, ret, self,
-			len = this.length;
-
-		if ( typeof selector !== "string" ) {
-			self = this;
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		ret = [];
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, this[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true) );
-	},
-
-	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional/relative selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				rneedsContext.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-				}
-				cur = cur.parentNode;
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( this.length > 1 && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		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>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, false, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( getAll( elem ) );
-				}
-
-				if ( elem.parentNode ) {
-					if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-						setGlobalEval( getAll( elem, "script" ) );
-					}
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function( value ) {
-		var isFunc = jQuery.isFunction( value );
-
-		// Make sure that the elements are removed from the DOM before they are inserted
-		// this can help fix replacing a parent with child elements
-		if ( !isFunc && typeof value !== "string" ) {
-			value = jQuery( value ).not( this ).detach();
-		}
-
-		return this.domManip( [ value ], true, function( elem ) {
-			var next = this.nextSibling,
-				parent = this.parentNode;
-
-			if ( parent ) {
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		});
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, table ? self.html() : undefined );
-				}
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call(
-						table && jQuery.nodeName( this[i], "table" ) ?
-							findOrAppend( this[i], "tbody" ) :
-							this[i],
-						node,
-						i
-					);
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery.ajax({
-									url: node.src,
-									type: "GET",
-									dataType: "script",
-									async: false,
-									global: false,
-									"throws": true
-								});
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-function findOrAppend( elem, tag ) {
-	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	var attr = elem.getAttributeNode("type");
-	elem.type = ( attr && attr.specified ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		var bool = typeof state === "boolean";
-
-		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-// Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
-				}
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
-					}
-				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-jQuery.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( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.hover = function( fnOver, fnOut ) {
-	return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-};
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
-
-	ajax_rquery = /\?/,
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			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"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 ) {
-					isSuccess = true;
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					isSuccess = true;
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					isSuccess = ajaxConvert( s, response );
-					statusText = isSuccess.state;
-					success = isSuccess.data;
-					error = isSuccess.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	}
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields;
-
-	// Fill responseXXX fields
-	for ( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-	var conv2, current, conv, tmp,
-		converters = {},
-		i = 0,
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice(),
-		prev = dataTypes[ 0 ];
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	// Convert to each sequential dataType, tolerating list modification
-	for ( ; (current = dataTypes[++i]); ) {
-
-		// There's only work to do if current dataType is non-auto
-		if ( current !== "*" ) {
-
-			// Convert response if prev dataType is non-auto and differs from current
-			if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split(" ");
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.splice( i--, 0, current );
-								}
-
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s["throws"] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-
-			// Update prev for next iteration
-			prev = current;
-		}
-	}
-
-	return { state: "success", data: response };
-}
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement("script");
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
-				}
-			}
-		};
-	}
-});
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	};
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( err ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var end, unit,
-				tween = this.createTween( prop, value ),
-				parts = rfxnum.exec( value ),
-				target = tween.cur(),
-				start = +target || 0,
-				scale = 1,
-				maxIterations = 20;
-
-			if ( parts ) {
-				end = +parts[2];
-				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-
-				// We need to compute starting value
-				if ( unit !== "px" && start ) {
-					// Iteratively approximate from a nonzero starting point
-					// Prefer the current property, because this process will be trivial if it uses the same units
-					// Fallback to end or a simple constant
-					start = jQuery.css( tween.elem, prop, true ) || end || 1;
-
-					do {
-						// If previous iteration zeroed out, double until we get *something*
-						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-						scale = scale || ".5";
-
-						// Adjust and apply
-						start = start / scale;
-						jQuery.style( tween.elem, prop, start + unit );
-
-					// Update scale, tolerating zero or NaN from tween.cur()
-					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-				}
-
-				tween.unit = unit;
-				tween.start = start;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
-			}
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-function createTweens( animation, props ) {
-	jQuery.each( props, function( prop, value ) {
-		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-			index = 0,
-			length = collection.length;
-		for ( ; index < length; index++ ) {
-			if ( collection[ index ].call( animation, prop, value ) ) {
-
-				// we're done with this property
-				return;
-			}
-		}
-	});
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	createTweens( animation, props );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var value, name, index, easing, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/*jshint validthis:true */
-	var prop, index, length,
-		value, dataShow, toggle,
-		tween, hooks, oldfire,
-		anim = this,
-		style = elem.style,
-		orig = {},
-		handled = [],
-		hidden = elem.nodeType && isHidden( elem );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( index in props ) {
-		value = props[ index ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ index ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			handled.push( index );
-		}
-	}
-
-	length = handled.length;
-	if ( length ) {
-		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
-		if ( "hidden" in dataShow ) {
-			hidden = dataShow.hidden;
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( index = 0 ; index < length ; index++ ) {
-			prop = handled[ index ];
-			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
-			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Remove in 2.0 - this supports IE8's panic based approach
-// to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-				doAnimation.finish = function() {
-					anim.stop( true );
-				};
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.cur && hooks.cur.finish ) {
-				hooks.cur.finish.call( this );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-	};
-};
-
-jQuery.offset = {
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
-
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.documentElement;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || document.documentElement;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-// Limit scope pollution from any deprecated API
-// (function() {
-
-// })();
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
-})( window );
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery-2.1.3.js b/lib/copy_this/www/templates/nntmux/scripts/jquery-2.1.3.js
deleted file mode 100644
index 1e89e17bf..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery-2.1.3.js
+++ /dev/null
@@ -1,9205 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.1.3
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-12-18T15:11Z
- */
-
-(function( global, factory ) {
-
-    if ( typeof module === "object" && typeof module.exports === "object" ) {
-        // For CommonJS and CommonJS-like environments where a proper `window`
-        // is present, execute the factory and get jQuery.
-        // For environments that do not have a `window` with a `document`
-        // (such as Node.js), expose a factory as module.exports.
-        // This accentuates the need for the creation of a real `window`.
-        // e.g. var jQuery = require("jquery")(window);
-        // See ticket #14549 for more info.
-        module.exports = global.document ?
-            factory( global, true ) :
-            function( w ) {
-                if ( !w.document ) {
-                    throw new Error( "jQuery requires a window with a document" );
-                }
-                return factory( w );
-            };
-    } else {
-        factory( global );
-    }
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//
-
-    var arr = [];
-
-    var slice = arr.slice;
-
-    var concat = arr.concat;
-
-    var push = arr.push;
-
-    var indexOf = arr.indexOf;
-
-    var class2type = {};
-
-    var toString = class2type.toString;
-
-    var hasOwn = class2type.hasOwnProperty;
-
-    var support = {};
-
-
-
-    var
-    // Use the correct document accordingly with window argument (sandbox)
-        document = window.document,
-
-        version = "2.1.3",
-
-    // Define a local copy of jQuery
-        jQuery = function( selector, context ) {
-            // The jQuery object is actually just the init constructor 'enhanced'
-            // Need init if jQuery is called (just allow error to be thrown if not included)
-            return new jQuery.fn.init( selector, context );
-        },
-
-    // Support: Android<4.1
-    // Make sure we trim BOM and NBSP
-        rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-    // Matches dashed string for camelizing
-        rmsPrefix = /^-ms-/,
-        rdashAlpha = /-([\da-z])/gi,
-
-    // Used by jQuery.camelCase as callback to replace()
-        fcamelCase = function( all, letter ) {
-            return letter.toUpperCase();
-        };
-
-    jQuery.fn = jQuery.prototype = {
-        // The current version of jQuery being used
-        jquery: version,
-
-        constructor: jQuery,
-
-        // Start with an empty selector
-        selector: "",
-
-        // The default length of a jQuery object is 0
-        length: 0,
-
-        toArray: function() {
-            return slice.call( this );
-        },
-
-        // Get the Nth element in the matched element set OR
-        // Get the whole matched element set as a clean array
-        get: function( num ) {
-            return num != null ?
-
-                // Return just the one element from the set
-                ( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-                // Return all the elements in a clean array
-                slice.call( this );
-        },
-
-        // Take an array of elements and push it onto the stack
-        // (returning the new matched element set)
-        pushStack: function( elems ) {
-
-            // Build a new jQuery matched element set
-            var ret = jQuery.merge( this.constructor(), elems );
-
-            // Add the old object onto the stack (as a reference)
-            ret.prevObject = this;
-            ret.context = this.context;
-
-            // Return the newly-formed element set
-            return ret;
-        },
-
-        // Execute a callback for every element in the matched set.
-        // (You can seed the arguments with an array of args, but this is
-        // only used internally.)
-        each: function( callback, args ) {
-            return jQuery.each( this, callback, args );
-        },
-
-        map: function( callback ) {
-            return this.pushStack( jQuery.map(this, function( elem, i ) {
-                return callback.call( elem, i, elem );
-            }));
-        },
-
-        slice: function() {
-            return this.pushStack( slice.apply( this, arguments ) );
-        },
-
-        first: function() {
-            return this.eq( 0 );
-        },
-
-        last: function() {
-            return this.eq( -1 );
-        },
-
-        eq: function( i ) {
-            var len = this.length,
-                j = +i + ( i < 0 ? len : 0 );
-            return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-        },
-
-        end: function() {
-            return this.prevObject || this.constructor(null);
-        },
-
-        // For internal use only.
-        // Behaves like an Array's method, not like a jQuery method.
-        push: push,
-        sort: arr.sort,
-        splice: arr.splice
-    };
-
-    jQuery.extend = jQuery.fn.extend = function() {
-        var options, name, src, copy, copyIsArray, clone,
-            target = arguments[0] || {},
-            i = 1,
-            length = arguments.length,
-            deep = false;
-
-        // Handle a deep copy situation
-        if ( typeof target === "boolean" ) {
-            deep = target;
-
-            // Skip the boolean and the target
-            target = arguments[ i ] || {};
-            i++;
-        }
-
-        // Handle case when target is a string or something (possible in deep copy)
-        if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-            target = {};
-        }
-
-        // Extend jQuery itself if only one argument is passed
-        if ( i === length ) {
-            target = this;
-            i--;
-        }
-
-        for ( ; i < length; i++ ) {
-            // Only deal with non-null/undefined values
-            if ( (options = arguments[ i ]) != null ) {
-                // Extend the base object
-                for ( name in options ) {
-                    src = target[ name ];
-                    copy = options[ name ];
-
-                    // Prevent never-ending loop
-                    if ( target === copy ) {
-                        continue;
-                    }
-
-                    // Recurse if we're merging plain objects or arrays
-                    if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-                        if ( copyIsArray ) {
-                            copyIsArray = false;
-                            clone = src && jQuery.isArray(src) ? src : [];
-
-                        } else {
-                            clone = src && jQuery.isPlainObject(src) ? src : {};
-                        }
-
-                        // Never move original objects, clone them
-                        target[ name ] = jQuery.extend( deep, clone, copy );
-
-                        // Don't bring in undefined values
-                    } else if ( copy !== undefined ) {
-                        target[ name ] = copy;
-                    }
-                }
-            }
-        }
-
-        // Return the modified object
-        return target;
-    };
-
-    jQuery.extend({
-        // Unique for each copy of jQuery on the page
-        expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-        // Assume jQuery is ready without the ready module
-        isReady: true,
-
-        error: function( msg ) {
-            throw new Error( msg );
-        },
-
-        noop: function() {},
-
-        isFunction: function( obj ) {
-            return jQuery.type(obj) === "function";
-        },
-
-        isArray: Array.isArray,
-
-        isWindow: function( obj ) {
-            return obj != null && obj === obj.window;
-        },
-
-        isNumeric: function( obj ) {
-            // parseFloat NaNs numeric-cast false positives (null|true|false|"")
-            // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-            // subtraction forces infinities to NaN
-            // adding 1 corrects loss of precision from parseFloat (#15100)
-            return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
-        },
-
-        isPlainObject: function( obj ) {
-            // Not plain objects:
-            // - Any object or value whose internal [[Class]] property is not "[object Object]"
-            // - DOM nodes
-            // - window
-            if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-                return false;
-            }
-
-            if ( obj.constructor &&
-                !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-                return false;
-            }
-
-            // If the function hasn't returned already, we're confident that
-            // |obj| is a plain object, created by {} or constructed with new Object
-            return true;
-        },
-
-        isEmptyObject: function( obj ) {
-            var name;
-            for ( name in obj ) {
-                return false;
-            }
-            return true;
-        },
-
-        type: function( obj ) {
-            if ( obj == null ) {
-                return obj + "";
-            }
-            // Support: Android<4.0, iOS<6 (functionish RegExp)
-            return typeof obj === "object" || typeof obj === "function" ?
-            class2type[ toString.call(obj) ] || "object" :
-                typeof obj;
-        },
-
-        // Evaluates a script in a global context
-        globalEval: function( code ) {
-            var script,
-                indirect = eval;
-
-            code = jQuery.trim( code );
-
-            if ( code ) {
-                // If the code includes a valid, prologue position
-                // strict mode pragma, execute code by injecting a
-                // script tag into the document.
-                if ( code.indexOf("use strict") === 1 ) {
-                    script = document.createElement("script");
-                    script.text = code;
-                    document.head.appendChild( script ).parentNode.removeChild( script );
-                } else {
-                    // Otherwise, avoid the DOM node creation, insertion
-                    // and removal by using an indirect global eval
-                    indirect( code );
-                }
-            }
-        },
-
-        // Convert dashed to camelCase; used by the css and data modules
-        // Support: IE9-11+
-        // Microsoft forgot to hump their vendor prefix (#9572)
-        camelCase: function( string ) {
-            return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-        },
-
-        nodeName: function( elem, name ) {
-            return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-        },
-
-        // args is for internal usage only
-        each: function( obj, callback, args ) {
-            var value,
-                i = 0,
-                length = obj.length,
-                isArray = isArraylike( obj );
-
-            if ( args ) {
-                if ( isArray ) {
-                    for ( ; i < length; i++ ) {
-                        value = callback.apply( obj[ i ], args );
-
-                        if ( value === false ) {
-                            break;
-                        }
-                    }
-                } else {
-                    for ( i in obj ) {
-                        value = callback.apply( obj[ i ], args );
-
-                        if ( value === false ) {
-                            break;
-                        }
-                    }
-                }
-
-                // A special, fast, case for the most common use of each
-            } else {
-                if ( isArray ) {
-                    for ( ; i < length; i++ ) {
-                        value = callback.call( obj[ i ], i, obj[ i ] );
-
-                        if ( value === false ) {
-                            break;
-                        }
-                    }
-                } else {
-                    for ( i in obj ) {
-                        value = callback.call( obj[ i ], i, obj[ i ] );
-
-                        if ( value === false ) {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return obj;
-        },
-
-        // Support: Android<4.1
-        trim: function( text ) {
-            return text == null ?
-                "" :
-                ( text + "" ).replace( rtrim, "" );
-        },
-
-        // results is for internal usage only
-        makeArray: function( arr, results ) {
-            var ret = results || [];
-
-            if ( arr != null ) {
-                if ( isArraylike( Object(arr) ) ) {
-                    jQuery.merge( ret,
-                        typeof arr === "string" ?
-                            [ arr ] : arr
-                    );
-                } else {
-                    push.call( ret, arr );
-                }
-            }
-
-            return ret;
-        },
-
-        inArray: function( elem, arr, i ) {
-            return arr == null ? -1 : indexOf.call( arr, elem, i );
-        },
-
-        merge: function( first, second ) {
-            var len = +second.length,
-                j = 0,
-                i = first.length;
-
-            for ( ; j < len; j++ ) {
-                first[ i++ ] = second[ j ];
-            }
-
-            first.length = i;
-
-            return first;
-        },
-
-        grep: function( elems, callback, invert ) {
-            var callbackInverse,
-                matches = [],
-                i = 0,
-                length = elems.length,
-                callbackExpect = !invert;
-
-            // Go through the array, only saving the items
-            // that pass the validator function
-            for ( ; i < length; i++ ) {
-                callbackInverse = !callback( elems[ i ], i );
-                if ( callbackInverse !== callbackExpect ) {
-                    matches.push( elems[ i ] );
-                }
-            }
-
-            return matches;
-        },
-
-        // arg is for internal usage only
-        map: function( elems, callback, arg ) {
-            var value,
-                i = 0,
-                length = elems.length,
-                isArray = isArraylike( elems ),
-                ret = [];
-
-            // Go through the array, translating each of the items to their new values
-            if ( isArray ) {
-                for ( ; i < length; i++ ) {
-                    value = callback( elems[ i ], i, arg );
-
-                    if ( value != null ) {
-                        ret.push( value );
-                    }
-                }
-
-                // Go through every key on the object,
-            } else {
-                for ( i in elems ) {
-                    value = callback( elems[ i ], i, arg );
-
-                    if ( value != null ) {
-                        ret.push( value );
-                    }
-                }
-            }
-
-            // Flatten any nested arrays
-            return concat.apply( [], ret );
-        },
-
-        // A global GUID counter for objects
-        guid: 1,
-
-        // Bind a function to a context, optionally partially applying any
-        // arguments.
-        proxy: function( fn, context ) {
-            var tmp, args, proxy;
-
-            if ( typeof context === "string" ) {
-                tmp = fn[ context ];
-                context = fn;
-                fn = tmp;
-            }
-
-            // Quick check to determine if target is callable, in the spec
-            // this throws a TypeError, but we will just return undefined.
-            if ( !jQuery.isFunction( fn ) ) {
-                return undefined;
-            }
-
-            // Simulated bind
-            args = slice.call( arguments, 2 );
-            proxy = function() {
-                return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-            };
-
-            // Set the guid of unique handler to the same of original handler, so it can be removed
-            proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-            return proxy;
-        },
-
-        now: Date.now,
-
-        // jQuery.support is not used in Core but other projects attach their
-        // properties to it so it needs to exist.
-        support: support
-    });
-
-// Populate the class2type map
-    jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-        class2type[ "[object " + name + "]" ] = name.toLowerCase();
-    });
-
-    function isArraylike( obj ) {
-        var length = obj.length,
-            type = jQuery.type( obj );
-
-        if ( type === "function" || jQuery.isWindow( obj ) ) {
-            return false;
-        }
-
-        if ( obj.nodeType === 1 && length ) {
-            return true;
-        }
-
-        return type === "array" || length === 0 ||
-            typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-    }
-    var Sizzle =
-        /*!
-         * Sizzle CSS Selector Engine v2.2.0-pre
-         * http://sizzlejs.com/
-         *
-         * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
-         * Released under the MIT license
-         * http://jquery.org/license
-         *
-         * Date: 2014-12-16
-         */
-        (function( window ) {
-
-            var i,
-                support,
-                Expr,
-                getText,
-                isXML,
-                tokenize,
-                compile,
-                select,
-                outermostContext,
-                sortInput,
-                hasDuplicate,
-
-            // Local document vars
-                setDocument,
-                document,
-                docElem,
-                documentIsHTML,
-                rbuggyQSA,
-                rbuggyMatches,
-                matches,
-                contains,
-
-            // Instance-specific data
-                expando = "sizzle" + 1 * new Date(),
-                preferredDoc = window.document,
-                dirruns = 0,
-                done = 0,
-                classCache = createCache(),
-                tokenCache = createCache(),
-                compilerCache = createCache(),
-                sortOrder = function( a, b ) {
-                    if ( a === b ) {
-                        hasDuplicate = true;
-                    }
-                    return 0;
-                },
-
-            // General-purpose constants
-                MAX_NEGATIVE = 1 << 31,
-
-            // Instance methods
-                hasOwn = ({}).hasOwnProperty,
-                arr = [],
-                pop = arr.pop,
-                push_native = arr.push,
-                push = arr.push,
-                slice = arr.slice,
-            // Use a stripped-down indexOf as it's faster than native
-            // http://jsperf.com/thor-indexof-vs-for/5
-                indexOf = function( list, elem ) {
-                    var i = 0,
-                        len = list.length;
-                    for ( ; i < len; i++ ) {
-                        if ( list[i] === elem ) {
-                            return i;
-                        }
-                    }
-                    return -1;
-                },
-
-                booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-            // Regular expressions
-
-            // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-                whitespace = "[\\x20\\t\\r\\n\\f]",
-            // http://www.w3.org/TR/css3-syntax/#characters
-                characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-            // Loosely modeled on CSS identifier characters
-            // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-            // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-                identifier = characterEncoding.replace( "w", "w#" ),
-
-            // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-                attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
-                        // Operator (capture 2)
-                    "*([*^$|!~]?=)" + whitespace +
-                        // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-                    "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-                    "*\\]",
-
-                pseudos = ":(" + characterEncoding + ")(?:\\((" +
-                        // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-                        // 1. quoted (capture 3; capture 4 or capture 5)
-                    "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-                        // 2. simple (capture 6)
-                    "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-                        // 3. anything else (capture 2)
-                    ".*" +
-                    ")\\)|)",
-
-            // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-                rwhitespace = new RegExp( whitespace + "+", "g" ),
-                rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-                rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-                rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-                rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-                rpseudo = new RegExp( pseudos ),
-                ridentifier = new RegExp( "^" + identifier + "$" ),
-
-                matchExpr = {
-                    "ID": new RegExp( "^#(" + characterEncoding + ")" ),
-                    "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-                    "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-                    "ATTR": new RegExp( "^" + attributes ),
-                    "PSEUDO": new RegExp( "^" + pseudos ),
-                    "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-                    "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-                    "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-                    "bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-                    // For use in libraries implementing .is()
-                    // We use this for POS matching in `select`
-                    "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-                    whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-                },
-
-                rinputs = /^(?:input|select|textarea|button)$/i,
-                rheader = /^h\d$/i,
-
-                rnative = /^[^{]+\{\s*\[native \w/,
-
-            // Easily-parseable/retrievable ID or TAG or CLASS selectors
-                rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-                rsibling = /[+~]/,
-                rescape = /'|\\/g,
-
-            // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-                runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-                funescape = function( _, escaped, escapedWhitespace ) {
-                    var high = "0x" + escaped - 0x10000;
-                    // NaN means non-codepoint
-                    // Support: Firefox<24
-                    // Workaround erroneous numeric interpretation of +"0x"
-                    return high !== high || escapedWhitespace ?
-                        escaped :
-                        high < 0 ?
-                            // BMP codepoint
-                            String.fromCharCode( high + 0x10000 ) :
-                            // Supplemental Plane codepoint (surrogate pair)
-                            String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-                },
-
-            // Used for iframes
-            // See setDocument()
-            // Removing the function wrapper causes a "Permission Denied"
-            // error in IE
-                unloadHandler = function() {
-                    setDocument();
-                };
-
-// Optimize for push.apply( _, NodeList )
-            try {
-                push.apply(
-                    (arr = slice.call( preferredDoc.childNodes )),
-                    preferredDoc.childNodes
-                );
-                // Support: Android<4.0
-                // Detect silently failing push.apply
-                arr[ preferredDoc.childNodes.length ].nodeType;
-            } catch ( e ) {
-                push = { apply: arr.length ?
-
-                    // Leverage slice if possible
-                    function( target, els ) {
-                        push_native.apply( target, slice.call(els) );
-                    } :
-
-                    // Support: IE<9
-                    // Otherwise append directly
-                    function( target, els ) {
-                        var j = target.length,
-                            i = 0;
-                        // Can't trust NodeList.length
-                        while ( (target[j++] = els[i++]) ) {}
-                        target.length = j - 1;
-                    }
-                };
-            }
-
-            function Sizzle( selector, context, results, seed ) {
-                var match, elem, m, nodeType,
-                // QSA vars
-                    i, groups, old, nid, newContext, newSelector;
-
-                if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-                    setDocument( context );
-                }
-
-                context = context || document;
-                results = results || [];
-                nodeType = context.nodeType;
-
-                if ( typeof selector !== "string" || !selector ||
-                    nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-                    return results;
-                }
-
-                if ( !seed && documentIsHTML ) {
-
-                    // Try to shortcut find operations when possible (e.g., not under DocumentFragment)
-                    if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-                        // Speed-up: Sizzle("#ID")
-                        if ( (m = match[1]) ) {
-                            if ( nodeType === 9 ) {
-                                elem = context.getElementById( m );
-                                // Check parentNode to catch when Blackberry 4.6 returns
-                                // nodes that are no longer in the document (jQuery #6963)
-                                if ( elem && elem.parentNode ) {
-                                    // Handle the case where IE, Opera, and Webkit return items
-                                    // by name instead of ID
-                                    if ( elem.id === m ) {
-                                        results.push( elem );
-                                        return results;
-                                    }
-                                } else {
-                                    return results;
-                                }
-                            } else {
-                                // Context is not a document
-                                if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-                                    contains( context, elem ) && elem.id === m ) {
-                                    results.push( elem );
-                                    return results;
-                                }
-                            }
-
-                            // Speed-up: Sizzle("TAG")
-                        } else if ( match[2] ) {
-                            push.apply( results, context.getElementsByTagName( selector ) );
-                            return results;
-
-                            // Speed-up: Sizzle(".CLASS")
-                        } else if ( (m = match[3]) && support.getElementsByClassName ) {
-                            push.apply( results, context.getElementsByClassName( m ) );
-                            return results;
-                        }
-                    }
-
-                    // QSA path
-                    if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-                        nid = old = expando;
-                        newContext = context;
-                        newSelector = nodeType !== 1 && selector;
-
-                        // qSA works strangely on Element-rooted queries
-                        // We can work around this by specifying an extra ID on the root
-                        // and working up from there (Thanks to Andrew Dupont for the technique)
-                        // IE 8 doesn't work on object elements
-                        if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-                            groups = tokenize( selector );
-
-                            if ( (old = context.getAttribute("id")) ) {
-                                nid = old.replace( rescape, "\\$&" );
-                            } else {
-                                context.setAttribute( "id", nid );
-                            }
-                            nid = "[id='" + nid + "'] ";
-
-                            i = groups.length;
-                            while ( i-- ) {
-                                groups[i] = nid + toSelector( groups[i] );
-                            }
-                            newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-                            newSelector = groups.join(",");
-                        }
-
-                        if ( newSelector ) {
-                            try {
-                                push.apply( results,
-                                    newContext.querySelectorAll( newSelector )
-                                );
-                                return results;
-                            } catch(qsaError) {
-                            } finally {
-                                if ( !old ) {
-                                    context.removeAttribute("id");
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // All others
-                return select( selector.replace( rtrim, "$1" ), context, results, seed );
-            }
-
-            /**
-             * Create key-value caches of limited size
-             * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
-             *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
-             *	deleting the oldest entry
-             */
-            function createCache() {
-                var keys = [];
-
-                function cache( key, value ) {
-                    // Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-                    if ( keys.push( key + " " ) > Expr.cacheLength ) {
-                        // Only keep the most recent entries
-                        delete cache[ keys.shift() ];
-                    }
-                    return (cache[ key + " " ] = value);
-                }
-                return cache;
-            }
-
-            /**
-             * Mark a function for special use by Sizzle
-             * @param {Function} fn The function to mark
-             */
-            function markFunction( fn ) {
-                fn[ expando ] = true;
-                return fn;
-            }
-
-            /**
-             * Support testing using an element
-             * @param {Function} fn Passed the created div and expects a boolean result
-             */
-            function assert( fn ) {
-                var div = document.createElement("div");
-
-                try {
-                    return !!fn( div );
-                } catch (e) {
-                    return false;
-                } finally {
-                    // Remove from its parent by default
-                    if ( div.parentNode ) {
-                        div.parentNode.removeChild( div );
-                    }
-                    // release memory in IE
-                    div = null;
-                }
-            }
-
-            /**
-             * Adds the same handler for all of the specified attrs
-             * @param {String} attrs Pipe-separated list of attributes
-             * @param {Function} handler The method that will be applied
-             */
-            function addHandle( attrs, handler ) {
-                var arr = attrs.split("|"),
-                    i = attrs.length;
-
-                while ( i-- ) {
-                    Expr.attrHandle[ arr[i] ] = handler;
-                }
-            }
-
-            /**
-             * Checks document order of two siblings
-             * @param {Element} a
-             * @param {Element} b
-             * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
-             */
-            function siblingCheck( a, b ) {
-                var cur = b && a,
-                    diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-                        ( ~b.sourceIndex || MAX_NEGATIVE ) -
-                        ( ~a.sourceIndex || MAX_NEGATIVE );
-
-                // Use IE sourceIndex if available on both nodes
-                if ( diff ) {
-                    return diff;
-                }
-
-                // Check if b follows a
-                if ( cur ) {
-                    while ( (cur = cur.nextSibling) ) {
-                        if ( cur === b ) {
-                            return -1;
-                        }
-                    }
-                }
-
-                return a ? 1 : -1;
-            }
-
-            /**
-             * Returns a function to use in pseudos for input types
-             * @param {String} type
-             */
-            function createInputPseudo( type ) {
-                return function( elem ) {
-                    var name = elem.nodeName.toLowerCase();
-                    return name === "input" && elem.type === type;
-                };
-            }
-
-            /**
-             * Returns a function to use in pseudos for buttons
-             * @param {String} type
-             */
-            function createButtonPseudo( type ) {
-                return function( elem ) {
-                    var name = elem.nodeName.toLowerCase();
-                    return (name === "input" || name === "button") && elem.type === type;
-                };
-            }
-
-            /**
-             * Returns a function to use in pseudos for positionals
-             * @param {Function} fn
-             */
-            function createPositionalPseudo( fn ) {
-                return markFunction(function( argument ) {
-                    argument = +argument;
-                    return markFunction(function( seed, matches ) {
-                        var j,
-                            matchIndexes = fn( [], seed.length, argument ),
-                            i = matchIndexes.length;
-
-                        // Match elements found at the specified indexes
-                        while ( i-- ) {
-                            if ( seed[ (j = matchIndexes[i]) ] ) {
-                                seed[j] = !(matches[j] = seed[j]);
-                            }
-                        }
-                    });
-                });
-            }
-
-            /**
-             * Checks a node for validity as a Sizzle context
-             * @param {Element|Object=} context
-             * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
-             */
-            function testContext( context ) {
-                return context && typeof context.getElementsByTagName !== "undefined" && context;
-            }
-
-// Expose support vars for convenience
-            support = Sizzle.support = {};
-
-            /**
-             * Detects XML nodes
-             * @param {Element|Object} elem An element or a document
-             * @returns {Boolean} True iff elem is a non-HTML XML node
-             */
-            isXML = Sizzle.isXML = function( elem ) {
-                // documentElement is verified for cases where it doesn't yet exist
-                // (such as loading iframes in IE - #4833)
-                var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-                return documentElement ? documentElement.nodeName !== "HTML" : false;
-            };
-
-            /**
-             * Sets document-related variables once based on the current document
-             * @param {Element|Object} [doc] An element or document object to use to set the document
-             * @returns {Object} Returns the current document
-             */
-            setDocument = Sizzle.setDocument = function( node ) {
-                var hasCompare, parent,
-                    doc = node ? node.ownerDocument || node : preferredDoc;
-
-                // If no document and documentElement is available, return
-                if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-                    return document;
-                }
-
-                // Set our document
-                document = doc;
-                docElem = doc.documentElement;
-                parent = doc.defaultView;
-
-                // Support: IE>8
-                // If iframe document is assigned to "document" variable and if iframe has been reloaded,
-                // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-                // IE6-8 do not support the defaultView property so parent will be undefined
-                if ( parent && parent !== parent.top ) {
-                    // IE11 does not have attachEvent, so all must suffer
-                    if ( parent.addEventListener ) {
-                        parent.addEventListener( "unload", unloadHandler, false );
-                    } else if ( parent.attachEvent ) {
-                        parent.attachEvent( "onunload", unloadHandler );
-                    }
-                }
-
-                /* Support tests
-                 ---------------------------------------------------------------------- */
-                documentIsHTML = !isXML( doc );
-
-                /* Attributes
-                 ---------------------------------------------------------------------- */
-
-                // Support: IE<8
-                // Verify that getAttribute really returns attributes and not properties
-                // (excepting IE8 booleans)
-                support.attributes = assert(function( div ) {
-                    div.className = "i";
-                    return !div.getAttribute("className");
-                });
-
-                /* getElement(s)By*
-                 ---------------------------------------------------------------------- */
-
-                // Check if getElementsByTagName("*") returns only elements
-                support.getElementsByTagName = assert(function( div ) {
-                    div.appendChild( doc.createComment("") );
-                    return !div.getElementsByTagName("*").length;
-                });
-
-                // Support: IE<9
-                support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
-
-                // Support: IE<10
-                // Check if getElementById returns elements by name
-                // The broken getElementById methods don't pick up programatically-set names,
-                // so use a roundabout getElementsByName test
-                support.getById = assert(function( div ) {
-                    docElem.appendChild( div ).id = expando;
-                    return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-                });
-
-                // ID find and filter
-                if ( support.getById ) {
-                    Expr.find["ID"] = function( id, context ) {
-                        if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-                            var m = context.getElementById( id );
-                            // Check parentNode to catch when Blackberry 4.6 returns
-                            // nodes that are no longer in the document #6963
-                            return m && m.parentNode ? [ m ] : [];
-                        }
-                    };
-                    Expr.filter["ID"] = function( id ) {
-                        var attrId = id.replace( runescape, funescape );
-                        return function( elem ) {
-                            return elem.getAttribute("id") === attrId;
-                        };
-                    };
-                } else {
-                    // Support: IE6/7
-                    // getElementById is not reliable as a find shortcut
-                    delete Expr.find["ID"];
-
-                    Expr.filter["ID"] =  function( id ) {
-                        var attrId = id.replace( runescape, funescape );
-                        return function( elem ) {
-                            var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-                            return node && node.value === attrId;
-                        };
-                    };
-                }
-
-                // Tag
-                Expr.find["TAG"] = support.getElementsByTagName ?
-                    function( tag, context ) {
-                        if ( typeof context.getElementsByTagName !== "undefined" ) {
-                            return context.getElementsByTagName( tag );
-
-                            // DocumentFragment nodes don't have gEBTN
-                        } else if ( support.qsa ) {
-                            return context.querySelectorAll( tag );
-                        }
-                    } :
-
-                    function( tag, context ) {
-                        var elem,
-                            tmp = [],
-                            i = 0,
-                        // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-                            results = context.getElementsByTagName( tag );
-
-                        // Filter out possible comments
-                        if ( tag === "*" ) {
-                            while ( (elem = results[i++]) ) {
-                                if ( elem.nodeType === 1 ) {
-                                    tmp.push( elem );
-                                }
-                            }
-
-                            return tmp;
-                        }
-                        return results;
-                    };
-
-                // Class
-                Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-                    if ( documentIsHTML ) {
-                        return context.getElementsByClassName( className );
-                    }
-                };
-
-                /* QSA/matchesSelector
-                 ---------------------------------------------------------------------- */
-
-                // QSA and matchesSelector support
-
-                // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-                rbuggyMatches = [];
-
-                // qSa(:focus) reports false when true (Chrome 21)
-                // We allow this because of a bug in IE8/9 that throws an error
-                // whenever `document.activeElement` is accessed on an iframe
-                // So, we allow :focus to pass through QSA all the time to avoid the IE error
-                // See http://bugs.jquery.com/ticket/13378
-                rbuggyQSA = [];
-
-                if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-                    // Build QSA regex
-                    // Regex strategy adopted from Diego Perini
-                    assert(function( div ) {
-                        // Select is set to empty string on purpose
-                        // This is to test IE's treatment of not explicitly
-                        // setting a boolean content attribute,
-                        // since its presence should be enough
-                        // http://bugs.jquery.com/ticket/12359
-                        docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
-                        "<select id='" + expando + "-\f]' msallowcapture=''>" +
-                        "<option selected=''></option></select>";
-
-                        // Support: IE8, Opera 11-12.16
-                        // Nothing should be selected when empty strings follow ^= or $= or *=
-                        // The test attribute must be unknown in Opera but "safe" for WinRT
-                        // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-                        if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-                            rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-                        }
-
-                        // Support: IE8
-                        // Boolean attributes and "value" are not treated correctly
-                        if ( !div.querySelectorAll("[selected]").length ) {
-                            rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-                        }
-
-                        // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
-                        if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-                            rbuggyQSA.push("~=");
-                        }
-
-                        // Webkit/Opera - :checked should return selected option elements
-                        // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-                        // IE8 throws error here and will not see later tests
-                        if ( !div.querySelectorAll(":checked").length ) {
-                            rbuggyQSA.push(":checked");
-                        }
-
-                        // Support: Safari 8+, iOS 8+
-                        // https://bugs.webkit.org/show_bug.cgi?id=136851
-                        // In-page `selector#id sibing-combinator selector` fails
-                        if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-                            rbuggyQSA.push(".#.+[+~]");
-                        }
-                    });
-
-                    assert(function( div ) {
-                        // Support: Windows 8 Native Apps
-                        // The type and name attributes are restricted during .innerHTML assignment
-                        var input = doc.createElement("input");
-                        input.setAttribute( "type", "hidden" );
-                        div.appendChild( input ).setAttribute( "name", "D" );
-
-                        // Support: IE8
-                        // Enforce case-sensitivity of name attribute
-                        if ( div.querySelectorAll("[name=d]").length ) {
-                            rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-                        }
-
-                        // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-                        // IE8 throws error here and will not see later tests
-                        if ( !div.querySelectorAll(":enabled").length ) {
-                            rbuggyQSA.push( ":enabled", ":disabled" );
-                        }
-
-                        // Opera 10-11 does not throw on post-comma invalid pseudos
-                        div.querySelectorAll("*,:x");
-                        rbuggyQSA.push(",.*:");
-                    });
-                }
-
-                if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-                    docElem.webkitMatchesSelector ||
-                    docElem.mozMatchesSelector ||
-                    docElem.oMatchesSelector ||
-                    docElem.msMatchesSelector) )) ) {
-
-                    assert(function( div ) {
-                        // Check to see if it's possible to do matchesSelector
-                        // on a disconnected node (IE 9)
-                        support.disconnectedMatch = matches.call( div, "div" );
-
-                        // This should fail with an exception
-                        // Gecko does not error, returns false instead
-                        matches.call( div, "[s!='']:x" );
-                        rbuggyMatches.push( "!=", pseudos );
-                    });
-                }
-
-                rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-                rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-                /* Contains
-                 ---------------------------------------------------------------------- */
-                hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-                // Element contains another
-                // Purposefully does not implement inclusive descendent
-                // As in, an element does not contain itself
-                contains = hasCompare || rnative.test( docElem.contains ) ?
-                    function( a, b ) {
-                        var adown = a.nodeType === 9 ? a.documentElement : a,
-                            bup = b && b.parentNode;
-                        return a === bup || !!( bup && bup.nodeType === 1 && (
-                                adown.contains ?
-                                    adown.contains( bup ) :
-                                a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-                            ));
-                    } :
-                    function( a, b ) {
-                        if ( b ) {
-                            while ( (b = b.parentNode) ) {
-                                if ( b === a ) {
-                                    return true;
-                                }
-                            }
-                        }
-                        return false;
-                    };
-
-                /* Sorting
-                 ---------------------------------------------------------------------- */
-
-                // Document order sorting
-                sortOrder = hasCompare ?
-                    function( a, b ) {
-
-                        // Flag for duplicate removal
-                        if ( a === b ) {
-                            hasDuplicate = true;
-                            return 0;
-                        }
-
-                        // Sort on method existence if only one input has compareDocumentPosition
-                        var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-                        if ( compare ) {
-                            return compare;
-                        }
-
-                        // Calculate position if both inputs belong to the same document
-                        compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-                            a.compareDocumentPosition( b ) :
-
-                            // Otherwise we know they are disconnected
-                            1;
-
-                        // Disconnected nodes
-                        if ( compare & 1 ||
-                            (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-                            // Choose the first element that is related to our preferred document
-                            if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-                                return -1;
-                            }
-                            if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-                                return 1;
-                            }
-
-                            // Maintain original order
-                            return sortInput ?
-                                ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-                                0;
-                        }
-
-                        return compare & 4 ? -1 : 1;
-                    } :
-                    function( a, b ) {
-                        // Exit early if the nodes are identical
-                        if ( a === b ) {
-                            hasDuplicate = true;
-                            return 0;
-                        }
-
-                        var cur,
-                            i = 0,
-                            aup = a.parentNode,
-                            bup = b.parentNode,
-                            ap = [ a ],
-                            bp = [ b ];
-
-                        // Parentless nodes are either documents or disconnected
-                        if ( !aup || !bup ) {
-                            return a === doc ? -1 :
-                                b === doc ? 1 :
-                                    aup ? -1 :
-                                        bup ? 1 :
-                                            sortInput ?
-                                                ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-                                                0;
-
-                            // If the nodes are siblings, we can do a quick check
-                        } else if ( aup === bup ) {
-                            return siblingCheck( a, b );
-                        }
-
-                        // Otherwise we need full lists of their ancestors for comparison
-                        cur = a;
-                        while ( (cur = cur.parentNode) ) {
-                            ap.unshift( cur );
-                        }
-                        cur = b;
-                        while ( (cur = cur.parentNode) ) {
-                            bp.unshift( cur );
-                        }
-
-                        // Walk down the tree looking for a discrepancy
-                        while ( ap[i] === bp[i] ) {
-                            i++;
-                        }
-
-                        return i ?
-                            // Do a sibling check if the nodes have a common ancestor
-                            siblingCheck( ap[i], bp[i] ) :
-
-                            // Otherwise nodes in our document sort first
-                            ap[i] === preferredDoc ? -1 :
-                                bp[i] === preferredDoc ? 1 :
-                                    0;
-                    };
-
-                return doc;
-            };
-
-            Sizzle.matches = function( expr, elements ) {
-                return Sizzle( expr, null, null, elements );
-            };
-
-            Sizzle.matchesSelector = function( elem, expr ) {
-                // Set document vars if needed
-                if ( ( elem.ownerDocument || elem ) !== document ) {
-                    setDocument( elem );
-                }
-
-                // Make sure that attribute selectors are quoted
-                expr = expr.replace( rattributeQuotes, "='$1']" );
-
-                if ( support.matchesSelector && documentIsHTML &&
-                    ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-                    ( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-                    try {
-                        var ret = matches.call( elem, expr );
-
-                        // IE 9's matchesSelector returns false on disconnected nodes
-                        if ( ret || support.disconnectedMatch ||
-                                // As well, disconnected nodes are said to be in a document
-                                // fragment in IE 9
-                            elem.document && elem.document.nodeType !== 11 ) {
-                            return ret;
-                        }
-                    } catch (e) {}
-                }
-
-                return Sizzle( expr, document, null, [ elem ] ).length > 0;
-            };
-
-            Sizzle.contains = function( context, elem ) {
-                // Set document vars if needed
-                if ( ( context.ownerDocument || context ) !== document ) {
-                    setDocument( context );
-                }
-                return contains( context, elem );
-            };
-
-            Sizzle.attr = function( elem, name ) {
-                // Set document vars if needed
-                if ( ( elem.ownerDocument || elem ) !== document ) {
-                    setDocument( elem );
-                }
-
-                var fn = Expr.attrHandle[ name.toLowerCase() ],
-                // Don't get fooled by Object.prototype properties (jQuery #13807)
-                    val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-                        fn( elem, name, !documentIsHTML ) :
-                        undefined;
-
-                return val !== undefined ?
-                    val :
-                    support.attributes || !documentIsHTML ?
-                        elem.getAttribute( name ) :
-                        (val = elem.getAttributeNode(name)) && val.specified ?
-                            val.value :
-                            null;
-            };
-
-            Sizzle.error = function( msg ) {
-                throw new Error( "Syntax error, unrecognized expression: " + msg );
-            };
-
-            /**
-             * Document sorting and removing duplicates
-             * @param {ArrayLike} results
-             */
-            Sizzle.uniqueSort = function( results ) {
-                var elem,
-                    duplicates = [],
-                    j = 0,
-                    i = 0;
-
-                // Unless we *know* we can detect duplicates, assume their presence
-                hasDuplicate = !support.detectDuplicates;
-                sortInput = !support.sortStable && results.slice( 0 );
-                results.sort( sortOrder );
-
-                if ( hasDuplicate ) {
-                    while ( (elem = results[i++]) ) {
-                        if ( elem === results[ i ] ) {
-                            j = duplicates.push( i );
-                        }
-                    }
-                    while ( j-- ) {
-                        results.splice( duplicates[ j ], 1 );
-                    }
-                }
-
-                // Clear input after sorting to release objects
-                // See https://github.com/jquery/sizzle/pull/225
-                sortInput = null;
-
-                return results;
-            };
-
-            /**
-             * Utility function for retrieving the text value of an array of DOM nodes
-             * @param {Array|Element} elem
-             */
-            getText = Sizzle.getText = function( elem ) {
-                var node,
-                    ret = "",
-                    i = 0,
-                    nodeType = elem.nodeType;
-
-                if ( !nodeType ) {
-                    // If no nodeType, this is expected to be an array
-                    while ( (node = elem[i++]) ) {
-                        // Do not traverse comment nodes
-                        ret += getText( node );
-                    }
-                } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-                    // Use textContent for elements
-                    // innerText usage removed for consistency of new lines (jQuery #11153)
-                    if ( typeof elem.textContent === "string" ) {
-                        return elem.textContent;
-                    } else {
-                        // Traverse its children
-                        for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-                            ret += getText( elem );
-                        }
-                    }
-                } else if ( nodeType === 3 || nodeType === 4 ) {
-                    return elem.nodeValue;
-                }
-                // Do not include comment or processing instruction nodes
-
-                return ret;
-            };
-
-            Expr = Sizzle.selectors = {
-
-                // Can be adjusted by the user
-                cacheLength: 50,
-
-                createPseudo: markFunction,
-
-                match: matchExpr,
-
-                attrHandle: {},
-
-                find: {},
-
-                relative: {
-                    ">": { dir: "parentNode", first: true },
-                    " ": { dir: "parentNode" },
-                    "+": { dir: "previousSibling", first: true },
-                    "~": { dir: "previousSibling" }
-                },
-
-                preFilter: {
-                    "ATTR": function( match ) {
-                        match[1] = match[1].replace( runescape, funescape );
-
-                        // Move the given value to match[3] whether quoted or unquoted
-                        match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-                        if ( match[2] === "~=" ) {
-                            match[3] = " " + match[3] + " ";
-                        }
-
-                        return match.slice( 0, 4 );
-                    },
-
-                    "CHILD": function( match ) {
-                        /* matches from matchExpr["CHILD"]
-                         1 type (only|nth|...)
-                         2 what (child|of-type)
-                         3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-                         4 xn-component of xn+y argument ([+-]?\d*n|)
-                         5 sign of xn-component
-                         6 x of xn-component
-                         7 sign of y-component
-                         8 y of y-component
-                         */
-                        match[1] = match[1].toLowerCase();
-
-                        if ( match[1].slice( 0, 3 ) === "nth" ) {
-                            // nth-* requires argument
-                            if ( !match[3] ) {
-                                Sizzle.error( match[0] );
-                            }
-
-                            // numeric x and y parameters for Expr.filter.CHILD
-                            // remember that false/true cast respectively to 0/1
-                            match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-                            match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-                            // other types prohibit arguments
-                        } else if ( match[3] ) {
-                            Sizzle.error( match[0] );
-                        }
-
-                        return match;
-                    },
-
-                    "PSEUDO": function( match ) {
-                        var excess,
-                            unquoted = !match[6] && match[2];
-
-                        if ( matchExpr["CHILD"].test( match[0] ) ) {
-                            return null;
-                        }
-
-                        // Accept quoted arguments as-is
-                        if ( match[3] ) {
-                            match[2] = match[4] || match[5] || "";
-
-                            // Strip excess characters from unquoted arguments
-                        } else if ( unquoted && rpseudo.test( unquoted ) &&
-                                // Get excess from tokenize (recursively)
-                            (excess = tokenize( unquoted, true )) &&
-                                // advance to the next closing parenthesis
-                            (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-                            // excess is a negative index
-                            match[0] = match[0].slice( 0, excess );
-                            match[2] = unquoted.slice( 0, excess );
-                        }
-
-                        // Return only captures needed by the pseudo filter method (type and argument)
-                        return match.slice( 0, 3 );
-                    }
-                },
-
-                filter: {
-
-                    "TAG": function( nodeNameSelector ) {
-                        var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-                        return nodeNameSelector === "*" ?
-                            function() { return true; } :
-                            function( elem ) {
-                                return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-                            };
-                    },
-
-                    "CLASS": function( className ) {
-                        var pattern = classCache[ className + " " ];
-
-                        return pattern ||
-                            (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-                            classCache( className, function( elem ) {
-                                return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-                            });
-                    },
-
-                    "ATTR": function( name, operator, check ) {
-                        return function( elem ) {
-                            var result = Sizzle.attr( elem, name );
-
-                            if ( result == null ) {
-                                return operator === "!=";
-                            }
-                            if ( !operator ) {
-                                return true;
-                            }
-
-                            result += "";
-
-                            return operator === "=" ? result === check :
-                                operator === "!=" ? result !== check :
-                                    operator === "^=" ? check && result.indexOf( check ) === 0 :
-                                        operator === "*=" ? check && result.indexOf( check ) > -1 :
-                                            operator === "$=" ? check && result.slice( -check.length ) === check :
-                                                operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-                                                    operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-                                                        false;
-                        };
-                    },
-
-                    "CHILD": function( type, what, argument, first, last ) {
-                        var simple = type.slice( 0, 3 ) !== "nth",
-                            forward = type.slice( -4 ) !== "last",
-                            ofType = what === "of-type";
-
-                        return first === 1 && last === 0 ?
-
-                            // Shortcut for :nth-*(n)
-                            function( elem ) {
-                                return !!elem.parentNode;
-                            } :
-
-                            function( elem, context, xml ) {
-                                var cache, outerCache, node, diff, nodeIndex, start,
-                                    dir = simple !== forward ? "nextSibling" : "previousSibling",
-                                    parent = elem.parentNode,
-                                    name = ofType && elem.nodeName.toLowerCase(),
-                                    useCache = !xml && !ofType;
-
-                                if ( parent ) {
-
-                                    // :(first|last|only)-(child|of-type)
-                                    if ( simple ) {
-                                        while ( dir ) {
-                                            node = elem;
-                                            while ( (node = node[ dir ]) ) {
-                                                if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-                                                    return false;
-                                                }
-                                            }
-                                            // Reverse direction for :only-* (if we haven't yet done so)
-                                            start = dir = type === "only" && !start && "nextSibling";
-                                        }
-                                        return true;
-                                    }
-
-                                    start = [ forward ? parent.firstChild : parent.lastChild ];
-
-                                    // non-xml :nth-child(...) stores cache data on `parent`
-                                    if ( forward && useCache ) {
-                                        // Seek `elem` from a previously-cached index
-                                        outerCache = parent[ expando ] || (parent[ expando ] = {});
-                                        cache = outerCache[ type ] || [];
-                                        nodeIndex = cache[0] === dirruns && cache[1];
-                                        diff = cache[0] === dirruns && cache[2];
-                                        node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-                                        while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-                                            // Fallback to seeking `elem` from the start
-                                        (diff = nodeIndex = 0) || start.pop()) ) {
-
-                                            // When found, cache indexes on `parent` and break
-                                            if ( node.nodeType === 1 && ++diff && node === elem ) {
-                                                outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-                                                break;
-                                            }
-                                        }
-
-                                        // Use previously-cached element index if available
-                                    } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-                                        diff = cache[1];
-
-                                        // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-                                    } else {
-                                        // Use the same loop as above to seek `elem` from the start
-                                        while ( (node = ++nodeIndex && node && node[ dir ] ||
-                                        (diff = nodeIndex = 0) || start.pop()) ) {
-
-                                            if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-                                                // Cache the index of each encountered element
-                                                if ( useCache ) {
-                                                    (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-                                                }
-
-                                                if ( node === elem ) {
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                    }
-
-                                    // Incorporate the offset, then check against cycle size
-                                    diff -= last;
-                                    return diff === first || ( diff % first === 0 && diff / first >= 0 );
-                                }
-                            };
-                    },
-
-                    "PSEUDO": function( pseudo, argument ) {
-                        // pseudo-class names are case-insensitive
-                        // http://www.w3.org/TR/selectors/#pseudo-classes
-                        // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-                        // Remember that setFilters inherits from pseudos
-                        var args,
-                            fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-                                Sizzle.error( "unsupported pseudo: " + pseudo );
-
-                        // The user may use createPseudo to indicate that
-                        // arguments are needed to create the filter function
-                        // just as Sizzle does
-                        if ( fn[ expando ] ) {
-                            return fn( argument );
-                        }
-
-                        // But maintain support for old signatures
-                        if ( fn.length > 1 ) {
-                            args = [ pseudo, pseudo, "", argument ];
-                            return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-                                markFunction(function( seed, matches ) {
-                                    var idx,
-                                        matched = fn( seed, argument ),
-                                        i = matched.length;
-                                    while ( i-- ) {
-                                        idx = indexOf( seed, matched[i] );
-                                        seed[ idx ] = !( matches[ idx ] = matched[i] );
-                                    }
-                                }) :
-                                function( elem ) {
-                                    return fn( elem, 0, args );
-                                };
-                        }
-
-                        return fn;
-                    }
-                },
-
-                pseudos: {
-                    // Potentially complex pseudos
-                    "not": markFunction(function( selector ) {
-                        // Trim the selector passed to compile
-                        // to avoid treating leading and trailing
-                        // spaces as combinators
-                        var input = [],
-                            results = [],
-                            matcher = compile( selector.replace( rtrim, "$1" ) );
-
-                        return matcher[ expando ] ?
-                            markFunction(function( seed, matches, context, xml ) {
-                                var elem,
-                                    unmatched = matcher( seed, null, xml, [] ),
-                                    i = seed.length;
-
-                                // Match elements unmatched by `matcher`
-                                while ( i-- ) {
-                                    if ( (elem = unmatched[i]) ) {
-                                        seed[i] = !(matches[i] = elem);
-                                    }
-                                }
-                            }) :
-                            function( elem, context, xml ) {
-                                input[0] = elem;
-                                matcher( input, null, xml, results );
-                                // Don't keep the element (issue #299)
-                                input[0] = null;
-                                return !results.pop();
-                            };
-                    }),
-
-                    "has": markFunction(function( selector ) {
-                        return function( elem ) {
-                            return Sizzle( selector, elem ).length > 0;
-                        };
-                    }),
-
-                    "contains": markFunction(function( text ) {
-                        text = text.replace( runescape, funescape );
-                        return function( elem ) {
-                            return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-                        };
-                    }),
-
-                    // "Whether an element is represented by a :lang() selector
-                    // is based solely on the element's language value
-                    // being equal to the identifier C,
-                    // or beginning with the identifier C immediately followed by "-".
-                    // The matching of C against the element's language value is performed case-insensitively.
-                    // The identifier C does not have to be a valid language name."
-                    // http://www.w3.org/TR/selectors/#lang-pseudo
-                    "lang": markFunction( function( lang ) {
-                        // lang value must be a valid identifier
-                        if ( !ridentifier.test(lang || "") ) {
-                            Sizzle.error( "unsupported lang: " + lang );
-                        }
-                        lang = lang.replace( runescape, funescape ).toLowerCase();
-                        return function( elem ) {
-                            var elemLang;
-                            do {
-                                if ( (elemLang = documentIsHTML ?
-                                        elem.lang :
-                                    elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-                                    elemLang = elemLang.toLowerCase();
-                                    return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-                                }
-                            } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-                            return false;
-                        };
-                    }),
-
-                    // Miscellaneous
-                    "target": function( elem ) {
-                        var hash = window.location && window.location.hash;
-                        return hash && hash.slice( 1 ) === elem.id;
-                    },
-
-                    "root": function( elem ) {
-                        return elem === docElem;
-                    },
-
-                    "focus": function( elem ) {
-                        return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-                    },
-
-                    // Boolean properties
-                    "enabled": function( elem ) {
-                        return elem.disabled === false;
-                    },
-
-                    "disabled": function( elem ) {
-                        return elem.disabled === true;
-                    },
-
-                    "checked": function( elem ) {
-                        // In CSS3, :checked should return both checked and selected elements
-                        // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-                        var nodeName = elem.nodeName.toLowerCase();
-                        return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-                    },
-
-                    "selected": function( elem ) {
-                        // Accessing this property makes selected-by-default
-                        // options in Safari work properly
-                        if ( elem.parentNode ) {
-                            elem.parentNode.selectedIndex;
-                        }
-
-                        return elem.selected === true;
-                    },
-
-                    // Contents
-                    "empty": function( elem ) {
-                        // http://www.w3.org/TR/selectors/#empty-pseudo
-                        // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-                        //   but not by others (comment: 8; processing instruction: 7; etc.)
-                        // nodeType < 6 works because attributes (2) do not appear as children
-                        for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-                            if ( elem.nodeType < 6 ) {
-                                return false;
-                            }
-                        }
-                        return true;
-                    },
-
-                    "parent": function( elem ) {
-                        return !Expr.pseudos["empty"]( elem );
-                    },
-
-                    // Element/input types
-                    "header": function( elem ) {
-                        return rheader.test( elem.nodeName );
-                    },
-
-                    "input": function( elem ) {
-                        return rinputs.test( elem.nodeName );
-                    },
-
-                    "button": function( elem ) {
-                        var name = elem.nodeName.toLowerCase();
-                        return name === "input" && elem.type === "button" || name === "button";
-                    },
-
-                    "text": function( elem ) {
-                        var attr;
-                        return elem.nodeName.toLowerCase() === "input" &&
-                            elem.type === "text" &&
-
-                                // Support: IE<8
-                                // New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-                            ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-                    },
-
-                    // Position-in-collection
-                    "first": createPositionalPseudo(function() {
-                        return [ 0 ];
-                    }),
-
-                    "last": createPositionalPseudo(function( matchIndexes, length ) {
-                        return [ length - 1 ];
-                    }),
-
-                    "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-                        return [ argument < 0 ? argument + length : argument ];
-                    }),
-
-                    "even": createPositionalPseudo(function( matchIndexes, length ) {
-                        var i = 0;
-                        for ( ; i < length; i += 2 ) {
-                            matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                    }),
-
-                    "odd": createPositionalPseudo(function( matchIndexes, length ) {
-                        var i = 1;
-                        for ( ; i < length; i += 2 ) {
-                            matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                    }),
-
-                    "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-                        var i = argument < 0 ? argument + length : argument;
-                        for ( ; --i >= 0; ) {
-                            matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                    }),
-
-                    "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-                        var i = argument < 0 ? argument + length : argument;
-                        for ( ; ++i < length; ) {
-                            matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                    })
-                }
-            };
-
-            Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-            for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-                Expr.pseudos[ i ] = createInputPseudo( i );
-            }
-            for ( i in { submit: true, reset: true } ) {
-                Expr.pseudos[ i ] = createButtonPseudo( i );
-            }
-
-// Easy API for creating new setFilters
-            function setFilters() {}
-            setFilters.prototype = Expr.filters = Expr.pseudos;
-            Expr.setFilters = new setFilters();
-
-            tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-                var matched, match, tokens, type,
-                    soFar, groups, preFilters,
-                    cached = tokenCache[ selector + " " ];
-
-                if ( cached ) {
-                    return parseOnly ? 0 : cached.slice( 0 );
-                }
-
-                soFar = selector;
-                groups = [];
-                preFilters = Expr.preFilter;
-
-                while ( soFar ) {
-
-                    // Comma and first run
-                    if ( !matched || (match = rcomma.exec( soFar )) ) {
-                        if ( match ) {
-                            // Don't consume trailing commas as valid
-                            soFar = soFar.slice( match[0].length ) || soFar;
-                        }
-                        groups.push( (tokens = []) );
-                    }
-
-                    matched = false;
-
-                    // Combinators
-                    if ( (match = rcombinators.exec( soFar )) ) {
-                        matched = match.shift();
-                        tokens.push({
-                            value: matched,
-                            // Cast descendant combinators to space
-                            type: match[0].replace( rtrim, " " )
-                        });
-                        soFar = soFar.slice( matched.length );
-                    }
-
-                    // Filters
-                    for ( type in Expr.filter ) {
-                        if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-                            (match = preFilters[ type ]( match ))) ) {
-                            matched = match.shift();
-                            tokens.push({
-                                value: matched,
-                                type: type,
-                                matches: match
-                            });
-                            soFar = soFar.slice( matched.length );
-                        }
-                    }
-
-                    if ( !matched ) {
-                        break;
-                    }
-                }
-
-                // Return the length of the invalid excess
-                // if we're just parsing
-                // Otherwise, throw an error or return tokens
-                return parseOnly ?
-                    soFar.length :
-                    soFar ?
-                        Sizzle.error( selector ) :
-                        // Cache the tokens
-                        tokenCache( selector, groups ).slice( 0 );
-            };
-
-            function toSelector( tokens ) {
-                var i = 0,
-                    len = tokens.length,
-                    selector = "";
-                for ( ; i < len; i++ ) {
-                    selector += tokens[i].value;
-                }
-                return selector;
-            }
-
-            function addCombinator( matcher, combinator, base ) {
-                var dir = combinator.dir,
-                    checkNonElements = base && dir === "parentNode",
-                    doneName = done++;
-
-                return combinator.first ?
-                    // Check against closest ancestor/preceding element
-                    function( elem, context, xml ) {
-                        while ( (elem = elem[ dir ]) ) {
-                            if ( elem.nodeType === 1 || checkNonElements ) {
-                                return matcher( elem, context, xml );
-                            }
-                        }
-                    } :
-
-                    // Check against all ancestor/preceding elements
-                    function( elem, context, xml ) {
-                        var oldCache, outerCache,
-                            newCache = [ dirruns, doneName ];
-
-                        // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-                        if ( xml ) {
-                            while ( (elem = elem[ dir ]) ) {
-                                if ( elem.nodeType === 1 || checkNonElements ) {
-                                    if ( matcher( elem, context, xml ) ) {
-                                        return true;
-                                    }
-                                }
-                            }
-                        } else {
-                            while ( (elem = elem[ dir ]) ) {
-                                if ( elem.nodeType === 1 || checkNonElements ) {
-                                    outerCache = elem[ expando ] || (elem[ expando ] = {});
-                                    if ( (oldCache = outerCache[ dir ]) &&
-                                        oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-                                        // Assign to newCache so results back-propagate to previous elements
-                                        return (newCache[ 2 ] = oldCache[ 2 ]);
-                                    } else {
-                                        // Reuse newcache so results back-propagate to previous elements
-                                        outerCache[ dir ] = newCache;
-
-                                        // A match means we're done; a fail means we have to keep checking
-                                        if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-                                            return true;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    };
-            }
-
-            function elementMatcher( matchers ) {
-                return matchers.length > 1 ?
-                    function( elem, context, xml ) {
-                        var i = matchers.length;
-                        while ( i-- ) {
-                            if ( !matchers[i]( elem, context, xml ) ) {
-                                return false;
-                            }
-                        }
-                        return true;
-                    } :
-                    matchers[0];
-            }
-
-            function multipleContexts( selector, contexts, results ) {
-                var i = 0,
-                    len = contexts.length;
-                for ( ; i < len; i++ ) {
-                    Sizzle( selector, contexts[i], results );
-                }
-                return results;
-            }
-
-            function condense( unmatched, map, filter, context, xml ) {
-                var elem,
-                    newUnmatched = [],
-                    i = 0,
-                    len = unmatched.length,
-                    mapped = map != null;
-
-                for ( ; i < len; i++ ) {
-                    if ( (elem = unmatched[i]) ) {
-                        if ( !filter || filter( elem, context, xml ) ) {
-                            newUnmatched.push( elem );
-                            if ( mapped ) {
-                                map.push( i );
-                            }
-                        }
-                    }
-                }
-
-                return newUnmatched;
-            }
-
-            function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-                if ( postFilter && !postFilter[ expando ] ) {
-                    postFilter = setMatcher( postFilter );
-                }
-                if ( postFinder && !postFinder[ expando ] ) {
-                    postFinder = setMatcher( postFinder, postSelector );
-                }
-                return markFunction(function( seed, results, context, xml ) {
-                    var temp, i, elem,
-                        preMap = [],
-                        postMap = [],
-                        preexisting = results.length,
-
-                    // Get initial elements from seed or context
-                        elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-                    // Prefilter to get matcher input, preserving a map for seed-results synchronization
-                        matcherIn = preFilter && ( seed || !selector ) ?
-                            condense( elems, preMap, preFilter, context, xml ) :
-                            elems,
-
-                        matcherOut = matcher ?
-                            // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-                            postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-                                // ...intermediate processing is necessary
-                                [] :
-
-                                // ...otherwise use results directly
-                                results :
-                            matcherIn;
-
-                    // Find primary matches
-                    if ( matcher ) {
-                        matcher( matcherIn, matcherOut, context, xml );
-                    }
-
-                    // Apply postFilter
-                    if ( postFilter ) {
-                        temp = condense( matcherOut, postMap );
-                        postFilter( temp, [], context, xml );
-
-                        // Un-match failing elements by moving them back to matcherIn
-                        i = temp.length;
-                        while ( i-- ) {
-                            if ( (elem = temp[i]) ) {
-                                matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-                            }
-                        }
-                    }
-
-                    if ( seed ) {
-                        if ( postFinder || preFilter ) {
-                            if ( postFinder ) {
-                                // Get the final matcherOut by condensing this intermediate into postFinder contexts
-                                temp = [];
-                                i = matcherOut.length;
-                                while ( i-- ) {
-                                    if ( (elem = matcherOut[i]) ) {
-                                        // Restore matcherIn since elem is not yet a final match
-                                        temp.push( (matcherIn[i] = elem) );
-                                    }
-                                }
-                                postFinder( null, (matcherOut = []), temp, xml );
-                            }
-
-                            // Move matched elements from seed to results to keep them synchronized
-                            i = matcherOut.length;
-                            while ( i-- ) {
-                                if ( (elem = matcherOut[i]) &&
-                                    (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-                                    seed[temp] = !(results[temp] = elem);
-                                }
-                            }
-                        }
-
-                        // Add elements to results, through postFinder if defined
-                    } else {
-                        matcherOut = condense(
-                            matcherOut === results ?
-                                matcherOut.splice( preexisting, matcherOut.length ) :
-                                matcherOut
-                        );
-                        if ( postFinder ) {
-                            postFinder( null, results, matcherOut, xml );
-                        } else {
-                            push.apply( results, matcherOut );
-                        }
-                    }
-                });
-            }
-
-            function matcherFromTokens( tokens ) {
-                var checkContext, matcher, j,
-                    len = tokens.length,
-                    leadingRelative = Expr.relative[ tokens[0].type ],
-                    implicitRelative = leadingRelative || Expr.relative[" "],
-                    i = leadingRelative ? 1 : 0,
-
-                // The foundational matcher ensures that elements are reachable from top-level context(s)
-                    matchContext = addCombinator( function( elem ) {
-                        return elem === checkContext;
-                    }, implicitRelative, true ),
-                    matchAnyContext = addCombinator( function( elem ) {
-                        return indexOf( checkContext, elem ) > -1;
-                    }, implicitRelative, true ),
-                    matchers = [ function( elem, context, xml ) {
-                        var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-                                (checkContext = context).nodeType ?
-                                    matchContext( elem, context, xml ) :
-                                    matchAnyContext( elem, context, xml ) );
-                        // Avoid hanging onto element (issue #299)
-                        checkContext = null;
-                        return ret;
-                    } ];
-
-                for ( ; i < len; i++ ) {
-                    if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-                        matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-                    } else {
-                        matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-                        // Return special upon seeing a positional matcher
-                        if ( matcher[ expando ] ) {
-                            // Find the next relative operator (if any) for proper handling
-                            j = ++i;
-                            for ( ; j < len; j++ ) {
-                                if ( Expr.relative[ tokens[j].type ] ) {
-                                    break;
-                                }
-                            }
-                            return setMatcher(
-                                i > 1 && elementMatcher( matchers ),
-                                i > 1 && toSelector(
-                                    // If the preceding token was a descendant combinator, insert an implicit any-element `*`
-                                    tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-                                ).replace( rtrim, "$1" ),
-                                matcher,
-                                i < j && matcherFromTokens( tokens.slice( i, j ) ),
-                                j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-                                j < len && toSelector( tokens )
-                            );
-                        }
-                        matchers.push( matcher );
-                    }
-                }
-
-                return elementMatcher( matchers );
-            }
-
-            function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-                var bySet = setMatchers.length > 0,
-                    byElement = elementMatchers.length > 0,
-                    superMatcher = function( seed, context, xml, results, outermost ) {
-                        var elem, j, matcher,
-                            matchedCount = 0,
-                            i = "0",
-                            unmatched = seed && [],
-                            setMatched = [],
-                            contextBackup = outermostContext,
-                        // We must always have either seed elements or outermost context
-                            elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-                        // Use integer dirruns iff this is the outermost matcher
-                            dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-                            len = elems.length;
-
-                        if ( outermost ) {
-                            outermostContext = context !== document && context;
-                        }
-
-                        // Add elements passing elementMatchers directly to results
-                        // Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-                        // Support: IE<9, Safari
-                        // Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-                        for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-                            if ( byElement && elem ) {
-                                j = 0;
-                                while ( (matcher = elementMatchers[j++]) ) {
-                                    if ( matcher( elem, context, xml ) ) {
-                                        results.push( elem );
-                                        break;
-                                    }
-                                }
-                                if ( outermost ) {
-                                    dirruns = dirrunsUnique;
-                                }
-                            }
-
-                            // Track unmatched elements for set filters
-                            if ( bySet ) {
-                                // They will have gone through all possible matchers
-                                if ( (elem = !matcher && elem) ) {
-                                    matchedCount--;
-                                }
-
-                                // Lengthen the array for every element, matched or not
-                                if ( seed ) {
-                                    unmatched.push( elem );
-                                }
-                            }
-                        }
-
-                        // Apply set filters to unmatched elements
-                        matchedCount += i;
-                        if ( bySet && i !== matchedCount ) {
-                            j = 0;
-                            while ( (matcher = setMatchers[j++]) ) {
-                                matcher( unmatched, setMatched, context, xml );
-                            }
-
-                            if ( seed ) {
-                                // Reintegrate element matches to eliminate the need for sorting
-                                if ( matchedCount > 0 ) {
-                                    while ( i-- ) {
-                                        if ( !(unmatched[i] || setMatched[i]) ) {
-                                            setMatched[i] = pop.call( results );
-                                        }
-                                    }
-                                }
-
-                                // Discard index placeholder values to get only actual matches
-                                setMatched = condense( setMatched );
-                            }
-
-                            // Add matches to results
-                            push.apply( results, setMatched );
-
-                            // Seedless set matches succeeding multiple successful matchers stipulate sorting
-                            if ( outermost && !seed && setMatched.length > 0 &&
-                                ( matchedCount + setMatchers.length ) > 1 ) {
-
-                                Sizzle.uniqueSort( results );
-                            }
-                        }
-
-                        // Override manipulation of globals by nested matchers
-                        if ( outermost ) {
-                            dirruns = dirrunsUnique;
-                            outermostContext = contextBackup;
-                        }
-
-                        return unmatched;
-                    };
-
-                return bySet ?
-                    markFunction( superMatcher ) :
-                    superMatcher;
-            }
-
-            compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-                var i,
-                    setMatchers = [],
-                    elementMatchers = [],
-                    cached = compilerCache[ selector + " " ];
-
-                if ( !cached ) {
-                    // Generate a function of recursive functions that can be used to check each element
-                    if ( !match ) {
-                        match = tokenize( selector );
-                    }
-                    i = match.length;
-                    while ( i-- ) {
-                        cached = matcherFromTokens( match[i] );
-                        if ( cached[ expando ] ) {
-                            setMatchers.push( cached );
-                        } else {
-                            elementMatchers.push( cached );
-                        }
-                    }
-
-                    // Cache the compiled function
-                    cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-                    // Save selector and tokenization
-                    cached.selector = selector;
-                }
-                return cached;
-            };
-
-            /**
-             * A low-level selection function that works with Sizzle's compiled
-             *  selector functions
-             * @param {String|Function} selector A selector or a pre-compiled
-             *  selector function built with Sizzle.compile
-             * @param {Element} context
-             * @param {Array} [results]
-             * @param {Array} [seed] A set of elements to match against
-             */
-            select = Sizzle.select = function( selector, context, results, seed ) {
-                var i, tokens, token, type, find,
-                    compiled = typeof selector === "function" && selector,
-                    match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-                results = results || [];
-
-                // Try to minimize operations if there is no seed and only one group
-                if ( match.length === 1 ) {
-
-                    // Take a shortcut and set the context if the root selector is an ID
-                    tokens = match[0] = match[0].slice( 0 );
-                    if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-                        support.getById && context.nodeType === 9 && documentIsHTML &&
-                        Expr.relative[ tokens[1].type ] ) {
-
-                        context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-                        if ( !context ) {
-                            return results;
-
-                            // Precompiled matchers will still verify ancestry, so step up a level
-                        } else if ( compiled ) {
-                            context = context.parentNode;
-                        }
-
-                        selector = selector.slice( tokens.shift().value.length );
-                    }
-
-                    // Fetch a seed set for right-to-left matching
-                    i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-                    while ( i-- ) {
-                        token = tokens[i];
-
-                        // Abort if we hit a combinator
-                        if ( Expr.relative[ (type = token.type) ] ) {
-                            break;
-                        }
-                        if ( (find = Expr.find[ type ]) ) {
-                            // Search, expanding context for leading sibling combinators
-                            if ( (seed = find(
-                                    token.matches[0].replace( runescape, funescape ),
-                                    rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-                                )) ) {
-
-                                // If seed is empty or no tokens remain, we can return early
-                                tokens.splice( i, 1 );
-                                selector = seed.length && toSelector( tokens );
-                                if ( !selector ) {
-                                    push.apply( results, seed );
-                                    return results;
-                                }
-
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // Compile and execute a filtering function if one is not provided
-                // Provide `match` to avoid retokenization if we modified the selector above
-                ( compiled || compile( selector, match ) )(
-                    seed,
-                    context,
-                    !documentIsHTML,
-                    results,
-                    rsibling.test( selector ) && testContext( context.parentNode ) || context
-                );
-                return results;
-            };
-
-// One-time assignments
-
-// Sort stability
-            support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-            support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-            setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-            support.sortDetached = assert(function( div1 ) {
-                // Should return 1, but returns 4 (following)
-                return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-            });
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-            if ( !assert(function( div ) {
-                    div.innerHTML = "<a href='#'></a>";
-                    return div.firstChild.getAttribute("href") === "#" ;
-                }) ) {
-                addHandle( "type|href|height|width", function( elem, name, isXML ) {
-                    if ( !isXML ) {
-                        return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-                    }
-                });
-            }
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-            if ( !support.attributes || !assert(function( div ) {
-                    div.innerHTML = "<input/>";
-                    div.firstChild.setAttribute( "value", "" );
-                    return div.firstChild.getAttribute( "value" ) === "";
-                }) ) {
-                addHandle( "value", function( elem, name, isXML ) {
-                    if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-                        return elem.defaultValue;
-                    }
-                });
-            }
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-            if ( !assert(function( div ) {
-                    return div.getAttribute("disabled") == null;
-                }) ) {
-                addHandle( booleans, function( elem, name, isXML ) {
-                    var val;
-                    if ( !isXML ) {
-                        return elem[ name ] === true ? name.toLowerCase() :
-                            (val = elem.getAttributeNode( name )) && val.specified ?
-                                val.value :
-                                null;
-                    }
-                });
-            }
-
-            return Sizzle;
-
-        })( window );
-
-
-
-    jQuery.find = Sizzle;
-    jQuery.expr = Sizzle.selectors;
-    jQuery.expr[":"] = jQuery.expr.pseudos;
-    jQuery.unique = Sizzle.uniqueSort;
-    jQuery.text = Sizzle.getText;
-    jQuery.isXMLDoc = Sizzle.isXML;
-    jQuery.contains = Sizzle.contains;
-
-
-
-    var rneedsContext = jQuery.expr.match.needsContext;
-
-    var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
-
-
-
-    var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-    function winnow( elements, qualifier, not ) {
-        if ( jQuery.isFunction( qualifier ) ) {
-            return jQuery.grep( elements, function( elem, i ) {
-                /* jshint -W018 */
-                return !!qualifier.call( elem, i, elem ) !== not;
-            });
-
-        }
-
-        if ( qualifier.nodeType ) {
-            return jQuery.grep( elements, function( elem ) {
-                return ( elem === qualifier ) !== not;
-            });
-
-        }
-
-        if ( typeof qualifier === "string" ) {
-            if ( risSimple.test( qualifier ) ) {
-                return jQuery.filter( qualifier, elements, not );
-            }
-
-            qualifier = jQuery.filter( qualifier, elements );
-        }
-
-        return jQuery.grep( elements, function( elem ) {
-            return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
-        });
-    }
-
-    jQuery.filter = function( expr, elems, not ) {
-        var elem = elems[ 0 ];
-
-        if ( not ) {
-            expr = ":not(" + expr + ")";
-        }
-
-        return elems.length === 1 && elem.nodeType === 1 ?
-            jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-            jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-                return elem.nodeType === 1;
-            }));
-    };
-
-    jQuery.fn.extend({
-        find: function( selector ) {
-            var i,
-                len = this.length,
-                ret = [],
-                self = this;
-
-            if ( typeof selector !== "string" ) {
-                return this.pushStack( jQuery( selector ).filter(function() {
-                    for ( i = 0; i < len; i++ ) {
-                        if ( jQuery.contains( self[ i ], this ) ) {
-                            return true;
-                        }
-                    }
-                }) );
-            }
-
-            for ( i = 0; i < len; i++ ) {
-                jQuery.find( selector, self[ i ], ret );
-            }
-
-            // Needed because $( selector, context ) becomes $( context ).find( selector )
-            ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-            ret.selector = this.selector ? this.selector + " " + selector : selector;
-            return ret;
-        },
-        filter: function( selector ) {
-            return this.pushStack( winnow(this, selector || [], false) );
-        },
-        not: function( selector ) {
-            return this.pushStack( winnow(this, selector || [], true) );
-        },
-        is: function( selector ) {
-            return !!winnow(
-                this,
-
-                // If this is a positional/relative selector, check membership in the returned set
-                // so $("p:first").is("p:last") won't return true for a doc with two "p".
-                typeof selector === "string" && rneedsContext.test( selector ) ?
-                    jQuery( selector ) :
-                selector || [],
-                false
-            ).length;
-        }
-    });
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-    var rootjQuery,
-
-    // A simple way to check for HTML strings
-    // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-    // Strict HTML recognition (#11290: must start with <)
-        rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-        init = jQuery.fn.init = function( selector, context ) {
-            var match, elem;
-
-            // HANDLE: $(""), $(null), $(undefined), $(false)
-            if ( !selector ) {
-                return this;
-            }
-
-            // Handle HTML strings
-            if ( typeof selector === "string" ) {
-                if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) {
-                    // Assume that strings that start and end with <> are HTML and skip the regex check
-                    match = [ null, selector, null ];
-
-                } else {
-                    match = rquickExpr.exec( selector );
-                }
-
-                // Match html or make sure no context is specified for #id
-                if ( match && (match[1] || !context) ) {
-
-                    // HANDLE: $(html) -> $(array)
-                    if ( match[1] ) {
-                        context = context instanceof jQuery ? context[0] : context;
-
-                        // Option to run scripts is true for back-compat
-                        // Intentionally let the error be thrown if parseHTML is not present
-                        jQuery.merge( this, jQuery.parseHTML(
-                            match[1],
-                            context && context.nodeType ? context.ownerDocument || context : document,
-                            true
-                        ) );
-
-                        // HANDLE: $(html, props)
-                        if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-                            for ( match in context ) {
-                                // Properties of context are called as methods if possible
-                                if ( jQuery.isFunction( this[ match ] ) ) {
-                                    this[ match ]( context[ match ] );
-
-                                    // ...and otherwise set as attributes
-                                } else {
-                                    this.attr( match, context[ match ] );
-                                }
-                            }
-                        }
-
-                        return this;
-
-                        // HANDLE: $(#id)
-                    } else {
-                        elem = document.getElementById( match[2] );
-
-                        // Support: Blackberry 4.6
-                        // gEBID returns nodes no longer in the document (#6963)
-                        if ( elem && elem.parentNode ) {
-                            // Inject the element directly into the jQuery object
-                            this.length = 1;
-                            this[0] = elem;
-                        }
-
-                        this.context = document;
-                        this.selector = selector;
-                        return this;
-                    }
-
-                    // HANDLE: $(expr, $(...))
-                } else if ( !context || context.jquery ) {
-                    return ( context || rootjQuery ).find( selector );
-
-                    // HANDLE: $(expr, context)
-                    // (which is just equivalent to: $(context).find(expr)
-                } else {
-                    return this.constructor( context ).find( selector );
-                }
-
-                // HANDLE: $(DOMElement)
-            } else if ( selector.nodeType ) {
-                this.context = this[0] = selector;
-                this.length = 1;
-                return this;
-
-                // HANDLE: $(function)
-                // Shortcut for document ready
-            } else if ( jQuery.isFunction( selector ) ) {
-                return typeof rootjQuery.ready !== "undefined" ?
-                    rootjQuery.ready( selector ) :
-                    // Execute immediately if ready is not present
-                    selector( jQuery );
-            }
-
-            if ( selector.selector !== undefined ) {
-                this.selector = selector.selector;
-                this.context = selector.context;
-            }
-
-            return jQuery.makeArray( selector, this );
-        };
-
-// Give the init function the jQuery prototype for later instantiation
-    init.prototype = jQuery.fn;
-
-// Initialize central reference
-    rootjQuery = jQuery( document );
-
-
-    var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-    // Methods guaranteed to produce a unique set when starting from a unique set
-        guaranteedUnique = {
-            children: true,
-            contents: true,
-            next: true,
-            prev: true
-        };
-
-    jQuery.extend({
-        dir: function( elem, dir, until ) {
-            var matched = [],
-                truncate = until !== undefined;
-
-            while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
-                if ( elem.nodeType === 1 ) {
-                    if ( truncate && jQuery( elem ).is( until ) ) {
-                        break;
-                    }
-                    matched.push( elem );
-                }
-            }
-            return matched;
-        },
-
-        sibling: function( n, elem ) {
-            var matched = [];
-
-            for ( ; n; n = n.nextSibling ) {
-                if ( n.nodeType === 1 && n !== elem ) {
-                    matched.push( n );
-                }
-            }
-
-            return matched;
-        }
-    });
-
-    jQuery.fn.extend({
-        has: function( target ) {
-            var targets = jQuery( target, this ),
-                l = targets.length;
-
-            return this.filter(function() {
-                var i = 0;
-                for ( ; i < l; i++ ) {
-                    if ( jQuery.contains( this, targets[i] ) ) {
-                        return true;
-                    }
-                }
-            });
-        },
-
-        closest: function( selectors, context ) {
-            var cur,
-                i = 0,
-                l = this.length,
-                matched = [],
-                pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-                    jQuery( selectors, context || this.context ) :
-                    0;
-
-            for ( ; i < l; i++ ) {
-                for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-                    // Always skip document fragments
-                    if ( cur.nodeType < 11 && (pos ?
-                        pos.index(cur) > -1 :
-
-                            // Don't pass non-elements to Sizzle
-                        cur.nodeType === 1 &&
-                        jQuery.find.matchesSelector(cur, selectors)) ) {
-
-                        matched.push( cur );
-                        break;
-                    }
-                }
-            }
-
-            return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
-        },
-
-        // Determine the position of an element within the set
-        index: function( elem ) {
-
-            // No argument, return index in parent
-            if ( !elem ) {
-                return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-            }
-
-            // Index in selector
-            if ( typeof elem === "string" ) {
-                return indexOf.call( jQuery( elem ), this[ 0 ] );
-            }
-
-            // Locate the position of the desired element
-            return indexOf.call( this,
-
-                // If it receives a jQuery object, the first element is used
-                elem.jquery ? elem[ 0 ] : elem
-            );
-        },
-
-        add: function( selector, context ) {
-            return this.pushStack(
-                jQuery.unique(
-                    jQuery.merge( this.get(), jQuery( selector, context ) )
-                )
-            );
-        },
-
-        addBack: function( selector ) {
-            return this.add( selector == null ?
-                    this.prevObject : this.prevObject.filter(selector)
-            );
-        }
-    });
-
-    function sibling( cur, dir ) {
-        while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
-        return cur;
-    }
-
-    jQuery.each({
-        parent: function( elem ) {
-            var parent = elem.parentNode;
-            return parent && parent.nodeType !== 11 ? parent : null;
-        },
-        parents: function( elem ) {
-            return jQuery.dir( elem, "parentNode" );
-        },
-        parentsUntil: function( elem, i, until ) {
-            return jQuery.dir( elem, "parentNode", until );
-        },
-        next: function( elem ) {
-            return sibling( elem, "nextSibling" );
-        },
-        prev: function( elem ) {
-            return sibling( elem, "previousSibling" );
-        },
-        nextAll: function( elem ) {
-            return jQuery.dir( elem, "nextSibling" );
-        },
-        prevAll: function( elem ) {
-            return jQuery.dir( elem, "previousSibling" );
-        },
-        nextUntil: function( elem, i, until ) {
-            return jQuery.dir( elem, "nextSibling", until );
-        },
-        prevUntil: function( elem, i, until ) {
-            return jQuery.dir( elem, "previousSibling", until );
-        },
-        siblings: function( elem ) {
-            return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-        },
-        children: function( elem ) {
-            return jQuery.sibling( elem.firstChild );
-        },
-        contents: function( elem ) {
-            return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-        }
-    }, function( name, fn ) {
-        jQuery.fn[ name ] = function( until, selector ) {
-            var matched = jQuery.map( this, fn, until );
-
-            if ( name.slice( -5 ) !== "Until" ) {
-                selector = until;
-            }
-
-            if ( selector && typeof selector === "string" ) {
-                matched = jQuery.filter( selector, matched );
-            }
-
-            if ( this.length > 1 ) {
-                // Remove duplicates
-                if ( !guaranteedUnique[ name ] ) {
-                    jQuery.unique( matched );
-                }
-
-                // Reverse order for parents* and prev-derivatives
-                if ( rparentsprev.test( name ) ) {
-                    matched.reverse();
-                }
-            }
-
-            return this.pushStack( matched );
-        };
-    });
-    var rnotwhite = (/\S+/g);
-
-
-
-// String to Object options format cache
-    var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-    function createOptions( options ) {
-        var object = optionsCache[ options ] = {};
-        jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-            object[ flag ] = true;
-        });
-        return object;
-    }
-
-    /*
-     * Create a callback list using the following parameters:
-     *
-     *	options: an optional list of space-separated options that will change how
-     *			the callback list behaves or a more traditional option object
-     *
-     * By default a callback list will act like an event callback list and can be
-     * "fired" multiple times.
-     *
-     * Possible options:
-     *
-     *	once:			will ensure the callback list can only be fired once (like a Deferred)
-     *
-     *	memory:			will keep track of previous values and will call any callback added
-     *					after the list has been fired right away with the latest "memorized"
-     *					values (like a Deferred)
-     *
-     *	unique:			will ensure a callback can only be added once (no duplicate in the list)
-     *
-     *	stopOnFalse:	interrupt callings when a callback returns false
-     *
-     */
-    jQuery.Callbacks = function( options ) {
-
-        // Convert options from String-formatted to Object-formatted if needed
-        // (we check in cache first)
-        options = typeof options === "string" ?
-            ( optionsCache[ options ] || createOptions( options ) ) :
-            jQuery.extend( {}, options );
-
-        var // Last fire value (for non-forgettable lists)
-            memory,
-        // Flag to know if list was already fired
-            fired,
-        // Flag to know if list is currently firing
-            firing,
-        // First callback to fire (used internally by add and fireWith)
-            firingStart,
-        // End of the loop when firing
-            firingLength,
-        // Index of currently firing callback (modified by remove if needed)
-            firingIndex,
-        // Actual callback list
-            list = [],
-        // Stack of fire calls for repeatable lists
-            stack = !options.once && [],
-        // Fire callbacks
-            fire = function( data ) {
-                memory = options.memory && data;
-                fired = true;
-                firingIndex = firingStart || 0;
-                firingStart = 0;
-                firingLength = list.length;
-                firing = true;
-                for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-                    if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-                        memory = false; // To prevent further calls using add
-                        break;
-                    }
-                }
-                firing = false;
-                if ( list ) {
-                    if ( stack ) {
-                        if ( stack.length ) {
-                            fire( stack.shift() );
-                        }
-                    } else if ( memory ) {
-                        list = [];
-                    } else {
-                        self.disable();
-                    }
-                }
-            },
-        // Actual Callbacks object
-            self = {
-                // Add a callback or a collection of callbacks to the list
-                add: function() {
-                    if ( list ) {
-                        // First, we save the current length
-                        var start = list.length;
-                        (function add( args ) {
-                            jQuery.each( args, function( _, arg ) {
-                                var type = jQuery.type( arg );
-                                if ( type === "function" ) {
-                                    if ( !options.unique || !self.has( arg ) ) {
-                                        list.push( arg );
-                                    }
-                                } else if ( arg && arg.length && type !== "string" ) {
-                                    // Inspect recursively
-                                    add( arg );
-                                }
-                            });
-                        })( arguments );
-                        // Do we need to add the callbacks to the
-                        // current firing batch?
-                        if ( firing ) {
-                            firingLength = list.length;
-                            // With memory, if we're not firing then
-                            // we should call right away
-                        } else if ( memory ) {
-                            firingStart = start;
-                            fire( memory );
-                        }
-                    }
-                    return this;
-                },
-                // Remove a callback from the list
-                remove: function() {
-                    if ( list ) {
-                        jQuery.each( arguments, function( _, arg ) {
-                            var index;
-                            while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-                                list.splice( index, 1 );
-                                // Handle firing indexes
-                                if ( firing ) {
-                                    if ( index <= firingLength ) {
-                                        firingLength--;
-                                    }
-                                    if ( index <= firingIndex ) {
-                                        firingIndex--;
-                                    }
-                                }
-                            }
-                        });
-                    }
-                    return this;
-                },
-                // Check if a given callback is in the list.
-                // If no argument is given, return whether or not list has callbacks attached.
-                has: function( fn ) {
-                    return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-                },
-                // Remove all callbacks from the list
-                empty: function() {
-                    list = [];
-                    firingLength = 0;
-                    return this;
-                },
-                // Have the list do nothing anymore
-                disable: function() {
-                    list = stack = memory = undefined;
-                    return this;
-                },
-                // Is it disabled?
-                disabled: function() {
-                    return !list;
-                },
-                // Lock the list in its current state
-                lock: function() {
-                    stack = undefined;
-                    if ( !memory ) {
-                        self.disable();
-                    }
-                    return this;
-                },
-                // Is it locked?
-                locked: function() {
-                    return !stack;
-                },
-                // Call all callbacks with the given context and arguments
-                fireWith: function( context, args ) {
-                    if ( list && ( !fired || stack ) ) {
-                        args = args || [];
-                        args = [ context, args.slice ? args.slice() : args ];
-                        if ( firing ) {
-                            stack.push( args );
-                        } else {
-                            fire( args );
-                        }
-                    }
-                    return this;
-                },
-                // Call all the callbacks with the given arguments
-                fire: function() {
-                    self.fireWith( this, arguments );
-                    return this;
-                },
-                // To know if the callbacks have already been called at least once
-                fired: function() {
-                    return !!fired;
-                }
-            };
-
-        return self;
-    };
-
-
-    jQuery.extend({
-
-        Deferred: function( func ) {
-            var tuples = [
-                    // action, add listener, listener list, final state
-                    [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-                    [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-                    [ "notify", "progress", jQuery.Callbacks("memory") ]
-                ],
-                state = "pending",
-                promise = {
-                    state: function() {
-                        return state;
-                    },
-                    always: function() {
-                        deferred.done( arguments ).fail( arguments );
-                        return this;
-                    },
-                    then: function( /* fnDone, fnFail, fnProgress */ ) {
-                        var fns = arguments;
-                        return jQuery.Deferred(function( newDefer ) {
-                            jQuery.each( tuples, function( i, tuple ) {
-                                var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-                                // deferred[ done | fail | progress ] for forwarding actions to newDefer
-                                deferred[ tuple[1] ](function() {
-                                    var returned = fn && fn.apply( this, arguments );
-                                    if ( returned && jQuery.isFunction( returned.promise ) ) {
-                                        returned.promise()
-                                            .done( newDefer.resolve )
-                                            .fail( newDefer.reject )
-                                            .progress( newDefer.notify );
-                                    } else {
-                                        newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-                                    }
-                                });
-                            });
-                            fns = null;
-                        }).promise();
-                    },
-                    // Get a promise for this deferred
-                    // If obj is provided, the promise aspect is added to the object
-                    promise: function( obj ) {
-                        return obj != null ? jQuery.extend( obj, promise ) : promise;
-                    }
-                },
-                deferred = {};
-
-            // Keep pipe for back-compat
-            promise.pipe = promise.then;
-
-            // Add list-specific methods
-            jQuery.each( tuples, function( i, tuple ) {
-                var list = tuple[ 2 ],
-                    stateString = tuple[ 3 ];
-
-                // promise[ done | fail | progress ] = list.add
-                promise[ tuple[1] ] = list.add;
-
-                // Handle state
-                if ( stateString ) {
-                    list.add(function() {
-                        // state = [ resolved | rejected ]
-                        state = stateString;
-
-                        // [ reject_list | resolve_list ].disable; progress_list.lock
-                    }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-                }
-
-                // deferred[ resolve | reject | notify ]
-                deferred[ tuple[0] ] = function() {
-                    deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-                    return this;
-                };
-                deferred[ tuple[0] + "With" ] = list.fireWith;
-            });
-
-            // Make the deferred a promise
-            promise.promise( deferred );
-
-            // Call given func if any
-            if ( func ) {
-                func.call( deferred, deferred );
-            }
-
-            // All done!
-            return deferred;
-        },
-
-        // Deferred helper
-        when: function( subordinate /* , ..., subordinateN */ ) {
-            var i = 0,
-                resolveValues = slice.call( arguments ),
-                length = resolveValues.length,
-
-            // the count of uncompleted subordinates
-                remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-            // the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-                deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-            // Update function for both resolve and progress values
-                updateFunc = function( i, contexts, values ) {
-                    return function( value ) {
-                        contexts[ i ] = this;
-                        values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-                        if ( values === progressValues ) {
-                            deferred.notifyWith( contexts, values );
-                        } else if ( !( --remaining ) ) {
-                            deferred.resolveWith( contexts, values );
-                        }
-                    };
-                },
-
-                progressValues, progressContexts, resolveContexts;
-
-            // Add listeners to Deferred subordinates; treat others as resolved
-            if ( length > 1 ) {
-                progressValues = new Array( length );
-                progressContexts = new Array( length );
-                resolveContexts = new Array( length );
-                for ( ; i < length; i++ ) {
-                    if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-                        resolveValues[ i ].promise()
-                            .done( updateFunc( i, resolveContexts, resolveValues ) )
-                            .fail( deferred.reject )
-                            .progress( updateFunc( i, progressContexts, progressValues ) );
-                    } else {
-                        --remaining;
-                    }
-                }
-            }
-
-            // If we're not waiting on anything, resolve the master
-            if ( !remaining ) {
-                deferred.resolveWith( resolveContexts, resolveValues );
-            }
-
-            return deferred.promise();
-        }
-    });
-
-
-// The deferred used on DOM ready
-    var readyList;
-
-    jQuery.fn.ready = function( fn ) {
-        // Add the callback
-        jQuery.ready.promise().done( fn );
-
-        return this;
-    };
-
-    jQuery.extend({
-        // Is the DOM ready to be used? Set to true once it occurs.
-        isReady: false,
-
-        // A counter to track how many items to wait for before
-        // the ready event fires. See #6781
-        readyWait: 1,
-
-        // Hold (or release) the ready event
-        holdReady: function( hold ) {
-            if ( hold ) {
-                jQuery.readyWait++;
-            } else {
-                jQuery.ready( true );
-            }
-        },
-
-        // Handle when the DOM is ready
-        ready: function( wait ) {
-
-            // Abort if there are pending holds or we're already ready
-            if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-                return;
-            }
-
-            // Remember that the DOM is ready
-            jQuery.isReady = true;
-
-            // If a normal DOM Ready event fired, decrement, and wait if need be
-            if ( wait !== true && --jQuery.readyWait > 0 ) {
-                return;
-            }
-
-            // If there are functions bound, to execute
-            readyList.resolveWith( document, [ jQuery ] );
-
-            // Trigger any bound ready events
-            if ( jQuery.fn.triggerHandler ) {
-                jQuery( document ).triggerHandler( "ready" );
-                jQuery( document ).off( "ready" );
-            }
-        }
-    });
-
-    /**
-     * The ready event handler and self cleanup method
-     */
-    function completed() {
-        document.removeEventListener( "DOMContentLoaded", completed, false );
-        window.removeEventListener( "load", completed, false );
-        jQuery.ready();
-    }
-
-    jQuery.ready.promise = function( obj ) {
-        if ( !readyList ) {
-
-            readyList = jQuery.Deferred();
-
-            // Catch cases where $(document).ready() is called after the browser event has already occurred.
-            // We once tried to use readyState "interactive" here, but it caused issues like the one
-            // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-            if ( document.readyState === "complete" ) {
-                // Handle it asynchronously to allow scripts the opportunity to delay ready
-                setTimeout( jQuery.ready );
-
-            } else {
-
-                // Use the handy event callback
-                document.addEventListener( "DOMContentLoaded", completed, false );
-
-                // A fallback to window.onload, that will always work
-                window.addEventListener( "load", completed, false );
-            }
-        }
-        return readyList.promise( obj );
-    };
-
-// Kick off the DOM ready check even if the user does not
-    jQuery.ready.promise();
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-    var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-        var i = 0,
-            len = elems.length,
-            bulk = key == null;
-
-        // Sets many values
-        if ( jQuery.type( key ) === "object" ) {
-            chainable = true;
-            for ( i in key ) {
-                jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-            }
-
-            // Sets one value
-        } else if ( value !== undefined ) {
-            chainable = true;
-
-            if ( !jQuery.isFunction( value ) ) {
-                raw = true;
-            }
-
-            if ( bulk ) {
-                // Bulk operations run against the entire set
-                if ( raw ) {
-                    fn.call( elems, value );
-                    fn = null;
-
-                    // ...except when executing function values
-                } else {
-                    bulk = fn;
-                    fn = function( elem, key, value ) {
-                        return bulk.call( jQuery( elem ), value );
-                    };
-                }
-            }
-
-            if ( fn ) {
-                for ( ; i < len; i++ ) {
-                    fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-                }
-            }
-        }
-
-        return chainable ?
-            elems :
-
-            // Gets
-            bulk ?
-                fn.call( elems ) :
-                len ? fn( elems[0], key ) : emptyGet;
-    };
-
-
-    /**
-     * Determines whether an object can have data
-     */
-    jQuery.acceptData = function( owner ) {
-        // Accepts only:
-        //  - Node
-        //    - Node.ELEMENT_NODE
-        //    - Node.DOCUMENT_NODE
-        //  - Object
-        //    - Any
-        /* jshint -W018 */
-        return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-    };
-
-
-    function Data() {
-        // Support: Android<4,
-        // Old WebKit does not have Object.preventExtensions/freeze method,
-        // return new empty object instead with no [[set]] accessor
-        Object.defineProperty( this.cache = {}, 0, {
-            get: function() {
-                return {};
-            }
-        });
-
-        this.expando = jQuery.expando + Data.uid++;
-    }
-
-    Data.uid = 1;
-    Data.accepts = jQuery.acceptData;
-
-    Data.prototype = {
-        key: function( owner ) {
-            // We can accept data for non-element nodes in modern browsers,
-            // but we should not, see #8335.
-            // Always return the key for a frozen object.
-            if ( !Data.accepts( owner ) ) {
-                return 0;
-            }
-
-            var descriptor = {},
-            // Check if the owner object already has a cache key
-                unlock = owner[ this.expando ];
-
-            // If not, create one
-            if ( !unlock ) {
-                unlock = Data.uid++;
-
-                // Secure it in a non-enumerable, non-writable property
-                try {
-                    descriptor[ this.expando ] = { value: unlock };
-                    Object.defineProperties( owner, descriptor );
-
-                    // Support: Android<4
-                    // Fallback to a less secure definition
-                } catch ( e ) {
-                    descriptor[ this.expando ] = unlock;
-                    jQuery.extend( owner, descriptor );
-                }
-            }
-
-            // Ensure the cache object
-            if ( !this.cache[ unlock ] ) {
-                this.cache[ unlock ] = {};
-            }
-
-            return unlock;
-        },
-        set: function( owner, data, value ) {
-            var prop,
-            // There may be an unlock assigned to this node,
-            // if there is no entry for this "owner", create one inline
-            // and set the unlock as though an owner entry had always existed
-                unlock = this.key( owner ),
-                cache = this.cache[ unlock ];
-
-            // Handle: [ owner, key, value ] args
-            if ( typeof data === "string" ) {
-                cache[ data ] = value;
-
-                // Handle: [ owner, { properties } ] args
-            } else {
-                // Fresh assignments by object are shallow copied
-                if ( jQuery.isEmptyObject( cache ) ) {
-                    jQuery.extend( this.cache[ unlock ], data );
-                    // Otherwise, copy the properties one-by-one to the cache object
-                } else {
-                    for ( prop in data ) {
-                        cache[ prop ] = data[ prop ];
-                    }
-                }
-            }
-            return cache;
-        },
-        get: function( owner, key ) {
-            // Either a valid cache is found, or will be created.
-            // New caches will be created and the unlock returned,
-            // allowing direct access to the newly created
-            // empty data object. A valid owner object must be provided.
-            var cache = this.cache[ this.key( owner ) ];
-
-            return key === undefined ?
-                cache : cache[ key ];
-        },
-        access: function( owner, key, value ) {
-            var stored;
-            // In cases where either:
-            //
-            //   1. No key was specified
-            //   2. A string key was specified, but no value provided
-            //
-            // Take the "read" path and allow the get method to determine
-            // which value to return, respectively either:
-            //
-            //   1. The entire cache object
-            //   2. The data stored at the key
-            //
-            if ( key === undefined ||
-                ((key && typeof key === "string") && value === undefined) ) {
-
-                stored = this.get( owner, key );
-
-                return stored !== undefined ?
-                    stored : this.get( owner, jQuery.camelCase(key) );
-            }
-
-            // [*]When the key is not a string, or both a key and value
-            // are specified, set or extend (existing objects) with either:
-            //
-            //   1. An object of properties
-            //   2. A key and value
-            //
-            this.set( owner, key, value );
-
-            // Since the "set" path can have two possible entry points
-            // return the expected data based on which path was taken[*]
-            return value !== undefined ? value : key;
-        },
-        remove: function( owner, key ) {
-            var i, name, camel,
-                unlock = this.key( owner ),
-                cache = this.cache[ unlock ];
-
-            if ( key === undefined ) {
-                this.cache[ unlock ] = {};
-
-            } else {
-                // Support array or space separated string of keys
-                if ( jQuery.isArray( key ) ) {
-                    // If "name" is an array of keys...
-                    // When data is initially created, via ("key", "val") signature,
-                    // keys will be converted to camelCase.
-                    // Since there is no way to tell _how_ a key was added, remove
-                    // both plain key and camelCase key. #12786
-                    // This will only penalize the array argument path.
-                    name = key.concat( key.map( jQuery.camelCase ) );
-                } else {
-                    camel = jQuery.camelCase( key );
-                    // Try the string as a key before any manipulation
-                    if ( key in cache ) {
-                        name = [ key, camel ];
-                    } else {
-                        // If a key with the spaces exists, use it.
-                        // Otherwise, create an array by matching non-whitespace
-                        name = camel;
-                        name = name in cache ?
-                            [ name ] : ( name.match( rnotwhite ) || [] );
-                    }
-                }
-
-                i = name.length;
-                while ( i-- ) {
-                    delete cache[ name[ i ] ];
-                }
-            }
-        },
-        hasData: function( owner ) {
-            return !jQuery.isEmptyObject(
-                this.cache[ owner[ this.expando ] ] || {}
-            );
-        },
-        discard: function( owner ) {
-            if ( owner[ this.expando ] ) {
-                delete this.cache[ owner[ this.expando ] ];
-            }
-        }
-    };
-    var data_priv = new Data();
-
-    var data_user = new Data();
-
-
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-    var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-        rmultiDash = /([A-Z])/g;
-
-    function dataAttr( elem, key, data ) {
-        var name;
-
-        // If nothing was found internally, try to fetch any
-        // data from the HTML5 data-* attribute
-        if ( data === undefined && elem.nodeType === 1 ) {
-            name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-            data = elem.getAttribute( name );
-
-            if ( typeof data === "string" ) {
-                try {
-                    data = data === "true" ? true :
-                        data === "false" ? false :
-                            data === "null" ? null :
-                                // Only convert to a number if it doesn't change the string
-                                +data + "" === data ? +data :
-                                    rbrace.test( data ) ? jQuery.parseJSON( data ) :
-                                        data;
-                } catch( e ) {}
-
-                // Make sure we set the data so it isn't changed later
-                data_user.set( elem, key, data );
-            } else {
-                data = undefined;
-            }
-        }
-        return data;
-    }
-
-    jQuery.extend({
-        hasData: function( elem ) {
-            return data_user.hasData( elem ) || data_priv.hasData( elem );
-        },
-
-        data: function( elem, name, data ) {
-            return data_user.access( elem, name, data );
-        },
-
-        removeData: function( elem, name ) {
-            data_user.remove( elem, name );
-        },
-
-        // TODO: Now that all calls to _data and _removeData have been replaced
-        // with direct calls to data_priv methods, these can be deprecated.
-        _data: function( elem, name, data ) {
-            return data_priv.access( elem, name, data );
-        },
-
-        _removeData: function( elem, name ) {
-            data_priv.remove( elem, name );
-        }
-    });
-
-    jQuery.fn.extend({
-        data: function( key, value ) {
-            var i, name, data,
-                elem = this[ 0 ],
-                attrs = elem && elem.attributes;
-
-            // Gets all values
-            if ( key === undefined ) {
-                if ( this.length ) {
-                    data = data_user.get( elem );
-
-                    if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
-                        i = attrs.length;
-                        while ( i-- ) {
-
-                            // Support: IE11+
-                            // The attrs elements can be null (#14894)
-                            if ( attrs[ i ] ) {
-                                name = attrs[ i ].name;
-                                if ( name.indexOf( "data-" ) === 0 ) {
-                                    name = jQuery.camelCase( name.slice(5) );
-                                    dataAttr( elem, name, data[ name ] );
-                                }
-                            }
-                        }
-                        data_priv.set( elem, "hasDataAttrs", true );
-                    }
-                }
-
-                return data;
-            }
-
-            // Sets multiple values
-            if ( typeof key === "object" ) {
-                return this.each(function() {
-                    data_user.set( this, key );
-                });
-            }
-
-            return access( this, function( value ) {
-                var data,
-                    camelKey = jQuery.camelCase( key );
-
-                // The calling jQuery object (element matches) is not empty
-                // (and therefore has an element appears at this[ 0 ]) and the
-                // `value` parameter was not undefined. An empty jQuery object
-                // will result in `undefined` for elem = this[ 0 ] which will
-                // throw an exception if an attempt to read a data cache is made.
-                if ( elem && value === undefined ) {
-                    // Attempt to get data from the cache
-                    // with the key as-is
-                    data = data_user.get( elem, key );
-                    if ( data !== undefined ) {
-                        return data;
-                    }
-
-                    // Attempt to get data from the cache
-                    // with the key camelized
-                    data = data_user.get( elem, camelKey );
-                    if ( data !== undefined ) {
-                        return data;
-                    }
-
-                    // Attempt to "discover" the data in
-                    // HTML5 custom data-* attrs
-                    data = dataAttr( elem, camelKey, undefined );
-                    if ( data !== undefined ) {
-                        return data;
-                    }
-
-                    // We tried really hard, but the data doesn't exist.
-                    return;
-                }
-
-                // Set the data...
-                this.each(function() {
-                    // First, attempt to store a copy or reference of any
-                    // data that might've been store with a camelCased key.
-                    var data = data_user.get( this, camelKey );
-
-                    // For HTML5 data-* attribute interop, we have to
-                    // store property names with dashes in a camelCase form.
-                    // This might not apply to all properties...*
-                    data_user.set( this, camelKey, value );
-
-                    // *... In the case of properties that might _actually_
-                    // have dashes, we need to also store a copy of that
-                    // unchanged property.
-                    if ( key.indexOf("-") !== -1 && data !== undefined ) {
-                        data_user.set( this, key, value );
-                    }
-                });
-            }, null, value, arguments.length > 1, null, true );
-        },
-
-        removeData: function( key ) {
-            return this.each(function() {
-                data_user.remove( this, key );
-            });
-        }
-    });
-
-
-    jQuery.extend({
-        queue: function( elem, type, data ) {
-            var queue;
-
-            if ( elem ) {
-                type = ( type || "fx" ) + "queue";
-                queue = data_priv.get( elem, type );
-
-                // Speed up dequeue by getting out quickly if this is just a lookup
-                if ( data ) {
-                    if ( !queue || jQuery.isArray( data ) ) {
-                        queue = data_priv.access( elem, type, jQuery.makeArray(data) );
-                    } else {
-                        queue.push( data );
-                    }
-                }
-                return queue || [];
-            }
-        },
-
-        dequeue: function( elem, type ) {
-            type = type || "fx";
-
-            var queue = jQuery.queue( elem, type ),
-                startLength = queue.length,
-                fn = queue.shift(),
-                hooks = jQuery._queueHooks( elem, type ),
-                next = function() {
-                    jQuery.dequeue( elem, type );
-                };
-
-            // If the fx queue is dequeued, always remove the progress sentinel
-            if ( fn === "inprogress" ) {
-                fn = queue.shift();
-                startLength--;
-            }
-
-            if ( fn ) {
-
-                // Add a progress sentinel to prevent the fx queue from being
-                // automatically dequeued
-                if ( type === "fx" ) {
-                    queue.unshift( "inprogress" );
-                }
-
-                // Clear up the last queue stop function
-                delete hooks.stop;
-                fn.call( elem, next, hooks );
-            }
-
-            if ( !startLength && hooks ) {
-                hooks.empty.fire();
-            }
-        },
-
-        // Not public - generate a queueHooks object, or return the current one
-        _queueHooks: function( elem, type ) {
-            var key = type + "queueHooks";
-            return data_priv.get( elem, key ) || data_priv.access( elem, key, {
-                    empty: jQuery.Callbacks("once memory").add(function() {
-                        data_priv.remove( elem, [ type + "queue", key ] );
-                    })
-                });
-        }
-    });
-
-    jQuery.fn.extend({
-        queue: function( type, data ) {
-            var setter = 2;
-
-            if ( typeof type !== "string" ) {
-                data = type;
-                type = "fx";
-                setter--;
-            }
-
-            if ( arguments.length < setter ) {
-                return jQuery.queue( this[0], type );
-            }
-
-            return data === undefined ?
-                this :
-                this.each(function() {
-                    var queue = jQuery.queue( this, type, data );
-
-                    // Ensure a hooks for this queue
-                    jQuery._queueHooks( this, type );
-
-                    if ( type === "fx" && queue[0] !== "inprogress" ) {
-                        jQuery.dequeue( this, type );
-                    }
-                });
-        },
-        dequeue: function( type ) {
-            return this.each(function() {
-                jQuery.dequeue( this, type );
-            });
-        },
-        clearQueue: function( type ) {
-            return this.queue( type || "fx", [] );
-        },
-        // Get a promise resolved when queues of a certain type
-        // are emptied (fx is the type by default)
-        promise: function( type, obj ) {
-            var tmp,
-                count = 1,
-                defer = jQuery.Deferred(),
-                elements = this,
-                i = this.length,
-                resolve = function() {
-                    if ( !( --count ) ) {
-                        defer.resolveWith( elements, [ elements ] );
-                    }
-                };
-
-            if ( typeof type !== "string" ) {
-                obj = type;
-                type = undefined;
-            }
-            type = type || "fx";
-
-            while ( i-- ) {
-                tmp = data_priv.get( elements[ i ], type + "queueHooks" );
-                if ( tmp && tmp.empty ) {
-                    count++;
-                    tmp.empty.add( resolve );
-                }
-            }
-            resolve();
-            return defer.promise( obj );
-        }
-    });
-    var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
-
-    var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-    var isHidden = function( elem, el ) {
-        // isHidden might be called from jQuery#filter function;
-        // in that case, element will be second argument
-        elem = el || elem;
-        return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-    };
-
-    var rcheckableType = (/^(?:checkbox|radio)$/i);
-
-
-
-    (function() {
-        var fragment = document.createDocumentFragment(),
-            div = fragment.appendChild( document.createElement( "div" ) ),
-            input = document.createElement( "input" );
-
-        // Support: Safari<=5.1
-        // Check state lost if the name is set (#11217)
-        // Support: Windows Web Apps (WWA)
-        // `name` and `type` must use .setAttribute for WWA (#14901)
-        input.setAttribute( "type", "radio" );
-        input.setAttribute( "checked", "checked" );
-        input.setAttribute( "name", "t" );
-
-        div.appendChild( input );
-
-        // Support: Safari<=5.1, Android<4.2
-        // Older WebKit doesn't clone checked state correctly in fragments
-        support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-        // Support: IE<=11+
-        // Make sure textarea (and checkbox) defaultValue is properly cloned
-        div.innerHTML = "<textarea>x</textarea>";
-        support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-    })();
-    var strundefined = typeof undefined;
-
-
-
-    support.focusinBubbles = "onfocusin" in window;
-
-
-    var
-        rkeyEvent = /^key/,
-        rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-        rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-        rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-    function returnTrue() {
-        return true;
-    }
-
-    function returnFalse() {
-        return false;
-    }
-
-    function safeActiveElement() {
-        try {
-            return document.activeElement;
-        } catch ( err ) { }
-    }
-
-    /*
-     * Helper functions for managing events -- not part of the public interface.
-     * Props to Dean Edwards' addEvent library for many of the ideas.
-     */
-    jQuery.event = {
-
-        global: {},
-
-        add: function( elem, types, handler, data, selector ) {
-
-            var handleObjIn, eventHandle, tmp,
-                events, t, handleObj,
-                special, handlers, type, namespaces, origType,
-                elemData = data_priv.get( elem );
-
-            // Don't attach events to noData or text/comment nodes (but allow plain objects)
-            if ( !elemData ) {
-                return;
-            }
-
-            // Caller can pass in an object of custom data in lieu of the handler
-            if ( handler.handler ) {
-                handleObjIn = handler;
-                handler = handleObjIn.handler;
-                selector = handleObjIn.selector;
-            }
-
-            // Make sure that the handler has a unique ID, used to find/remove it later
-            if ( !handler.guid ) {
-                handler.guid = jQuery.guid++;
-            }
-
-            // Init the element's event structure and main handler, if this is the first
-            if ( !(events = elemData.events) ) {
-                events = elemData.events = {};
-            }
-            if ( !(eventHandle = elemData.handle) ) {
-                eventHandle = elemData.handle = function( e ) {
-                    // Discard the second event of a jQuery.event.trigger() and
-                    // when an event is called after a page has unloaded
-                    return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
-                        jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-                };
-            }
-
-            // Handle multiple events separated by a space
-            types = ( types || "" ).match( rnotwhite ) || [ "" ];
-            t = types.length;
-            while ( t-- ) {
-                tmp = rtypenamespace.exec( types[t] ) || [];
-                type = origType = tmp[1];
-                namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-                // There *must* be a type, no attaching namespace-only handlers
-                if ( !type ) {
-                    continue;
-                }
-
-                // If event changes its type, use the special event handlers for the changed type
-                special = jQuery.event.special[ type ] || {};
-
-                // If selector defined, determine special event api type, otherwise given type
-                type = ( selector ? special.delegateType : special.bindType ) || type;
-
-                // Update special based on newly reset type
-                special = jQuery.event.special[ type ] || {};
-
-                // handleObj is passed to all event handlers
-                handleObj = jQuery.extend({
-                    type: type,
-                    origType: origType,
-                    data: data,
-                    handler: handler,
-                    guid: handler.guid,
-                    selector: selector,
-                    needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-                    namespace: namespaces.join(".")
-                }, handleObjIn );
-
-                // Init the event handler queue if we're the first
-                if ( !(handlers = events[ type ]) ) {
-                    handlers = events[ type ] = [];
-                    handlers.delegateCount = 0;
-
-                    // Only use addEventListener if the special events handler returns false
-                    if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-                        if ( elem.addEventListener ) {
-                            elem.addEventListener( type, eventHandle, false );
-                        }
-                    }
-                }
-
-                if ( special.add ) {
-                    special.add.call( elem, handleObj );
-
-                    if ( !handleObj.handler.guid ) {
-                        handleObj.handler.guid = handler.guid;
-                    }
-                }
-
-                // Add to the element's handler list, delegates in front
-                if ( selector ) {
-                    handlers.splice( handlers.delegateCount++, 0, handleObj );
-                } else {
-                    handlers.push( handleObj );
-                }
-
-                // Keep track of which events have ever been used, for event optimization
-                jQuery.event.global[ type ] = true;
-            }
-
-        },
-
-        // Detach an event or set of events from an element
-        remove: function( elem, types, handler, selector, mappedTypes ) {
-
-            var j, origCount, tmp,
-                events, t, handleObj,
-                special, handlers, type, namespaces, origType,
-                elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-
-            if ( !elemData || !(events = elemData.events) ) {
-                return;
-            }
-
-            // Once for each type.namespace in types; type may be omitted
-            types = ( types || "" ).match( rnotwhite ) || [ "" ];
-            t = types.length;
-            while ( t-- ) {
-                tmp = rtypenamespace.exec( types[t] ) || [];
-                type = origType = tmp[1];
-                namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-                // Unbind all events (on this namespace, if provided) for the element
-                if ( !type ) {
-                    for ( type in events ) {
-                        jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-                    }
-                    continue;
-                }
-
-                special = jQuery.event.special[ type ] || {};
-                type = ( selector ? special.delegateType : special.bindType ) || type;
-                handlers = events[ type ] || [];
-                tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-                // Remove matching events
-                origCount = j = handlers.length;
-                while ( j-- ) {
-                    handleObj = handlers[ j ];
-
-                    if ( ( mappedTypes || origType === handleObj.origType ) &&
-                        ( !handler || handler.guid === handleObj.guid ) &&
-                        ( !tmp || tmp.test( handleObj.namespace ) ) &&
-                        ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-                        handlers.splice( j, 1 );
-
-                        if ( handleObj.selector ) {
-                            handlers.delegateCount--;
-                        }
-                        if ( special.remove ) {
-                            special.remove.call( elem, handleObj );
-                        }
-                    }
-                }
-
-                // Remove generic event handler if we removed something and no more handlers exist
-                // (avoids potential for endless recursion during removal of special event handlers)
-                if ( origCount && !handlers.length ) {
-                    if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-                        jQuery.removeEvent( elem, type, elemData.handle );
-                    }
-
-                    delete events[ type ];
-                }
-            }
-
-            // Remove the expando if it's no longer used
-            if ( jQuery.isEmptyObject( events ) ) {
-                delete elemData.handle;
-                data_priv.remove( elem, "events" );
-            }
-        },
-
-        trigger: function( event, data, elem, onlyHandlers ) {
-
-            var i, cur, tmp, bubbleType, ontype, handle, special,
-                eventPath = [ elem || document ],
-                type = hasOwn.call( event, "type" ) ? event.type : event,
-                namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-            cur = tmp = elem = elem || document;
-
-            // Don't do events on text and comment nodes
-            if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-                return;
-            }
-
-            // focus/blur morphs to focusin/out; ensure we're not firing them right now
-            if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-                return;
-            }
-
-            if ( type.indexOf(".") >= 0 ) {
-                // Namespaced trigger; create a regexp to match event type in handle()
-                namespaces = type.split(".");
-                type = namespaces.shift();
-                namespaces.sort();
-            }
-            ontype = type.indexOf(":") < 0 && "on" + type;
-
-            // Caller can pass in a jQuery.Event object, Object, or just an event type string
-            event = event[ jQuery.expando ] ?
-                event :
-                new jQuery.Event( type, typeof event === "object" && event );
-
-            // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-            event.isTrigger = onlyHandlers ? 2 : 3;
-            event.namespace = namespaces.join(".");
-            event.namespace_re = event.namespace ?
-                new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-                null;
-
-            // Clean up the event in case it is being reused
-            event.result = undefined;
-            if ( !event.target ) {
-                event.target = elem;
-            }
-
-            // Clone any incoming data and prepend the event, creating the handler arg list
-            data = data == null ?
-                [ event ] :
-                jQuery.makeArray( data, [ event ] );
-
-            // Allow special events to draw outside the lines
-            special = jQuery.event.special[ type ] || {};
-            if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-                return;
-            }
-
-            // Determine event propagation path in advance, per W3C events spec (#9951)
-            // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-            if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-                bubbleType = special.delegateType || type;
-                if ( !rfocusMorph.test( bubbleType + type ) ) {
-                    cur = cur.parentNode;
-                }
-                for ( ; cur; cur = cur.parentNode ) {
-                    eventPath.push( cur );
-                    tmp = cur;
-                }
-
-                // Only add window if we got to document (e.g., not plain obj or detached DOM)
-                if ( tmp === (elem.ownerDocument || document) ) {
-                    eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-                }
-            }
-
-            // Fire handlers on the event path
-            i = 0;
-            while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-                event.type = i > 1 ?
-                    bubbleType :
-                special.bindType || type;
-
-                // jQuery handler
-                handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
-                if ( handle ) {
-                    handle.apply( cur, data );
-                }
-
-                // Native handler
-                handle = ontype && cur[ ontype ];
-                if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
-                    event.result = handle.apply( cur, data );
-                    if ( event.result === false ) {
-                        event.preventDefault();
-                    }
-                }
-            }
-            event.type = type;
-
-            // If nobody prevented the default action, do it now
-            if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-                if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-                    jQuery.acceptData( elem ) ) {
-
-                    // Call a native DOM method on the target with the same name name as the event.
-                    // Don't do default actions on window, that's where global variables be (#6170)
-                    if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-                        // Don't re-trigger an onFOO event when we call its FOO() method
-                        tmp = elem[ ontype ];
-
-                        if ( tmp ) {
-                            elem[ ontype ] = null;
-                        }
-
-                        // Prevent re-triggering of the same event, since we already bubbled it above
-                        jQuery.event.triggered = type;
-                        elem[ type ]();
-                        jQuery.event.triggered = undefined;
-
-                        if ( tmp ) {
-                            elem[ ontype ] = tmp;
-                        }
-                    }
-                }
-            }
-
-            return event.result;
-        },
-
-        dispatch: function( event ) {
-
-            // Make a writable jQuery.Event from the native event object
-            event = jQuery.event.fix( event );
-
-            var i, j, ret, matched, handleObj,
-                handlerQueue = [],
-                args = slice.call( arguments ),
-                handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
-                special = jQuery.event.special[ event.type ] || {};
-
-            // Use the fix-ed jQuery.Event rather than the (read-only) native event
-            args[0] = event;
-            event.delegateTarget = this;
-
-            // Call the preDispatch hook for the mapped type, and let it bail if desired
-            if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-                return;
-            }
-
-            // Determine handlers
-            handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-            // Run delegates first; they may want to stop propagation beneath us
-            i = 0;
-            while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-                event.currentTarget = matched.elem;
-
-                j = 0;
-                while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-                    // Triggered event must either 1) have no namespace, or 2) have namespace(s)
-                    // a subset or equal to those in the bound event (both can have no namespace).
-                    if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-                        event.handleObj = handleObj;
-                        event.data = handleObj.data;
-
-                        ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-                            .apply( matched.elem, args );
-
-                        if ( ret !== undefined ) {
-                            if ( (event.result = ret) === false ) {
-                                event.preventDefault();
-                                event.stopPropagation();
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Call the postDispatch hook for the mapped type
-            if ( special.postDispatch ) {
-                special.postDispatch.call( this, event );
-            }
-
-            return event.result;
-        },
-
-        handlers: function( event, handlers ) {
-            var i, matches, sel, handleObj,
-                handlerQueue = [],
-                delegateCount = handlers.delegateCount,
-                cur = event.target;
-
-            // Find delegate handlers
-            // Black-hole SVG <use> instance trees (#13180)
-            // Avoid non-left-click bubbling in Firefox (#3861)
-            if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-                for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-                    // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-                    if ( cur.disabled !== true || event.type !== "click" ) {
-                        matches = [];
-                        for ( i = 0; i < delegateCount; i++ ) {
-                            handleObj = handlers[ i ];
-
-                            // Don't conflict with Object.prototype properties (#13203)
-                            sel = handleObj.selector + " ";
-
-                            if ( matches[ sel ] === undefined ) {
-                                matches[ sel ] = handleObj.needsContext ?
-                                jQuery( sel, this ).index( cur ) >= 0 :
-                                    jQuery.find( sel, this, null, [ cur ] ).length;
-                            }
-                            if ( matches[ sel ] ) {
-                                matches.push( handleObj );
-                            }
-                        }
-                        if ( matches.length ) {
-                            handlerQueue.push({ elem: cur, handlers: matches });
-                        }
-                    }
-                }
-            }
-
-            // Add the remaining (directly-bound) handlers
-            if ( delegateCount < handlers.length ) {
-                handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-            }
-
-            return handlerQueue;
-        },
-
-        // Includes some event props shared by KeyEvent and MouseEvent
-        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( event, original ) {
-
-                // Add which for key events
-                if ( event.which == null ) {
-                    event.which = original.charCode != null ? original.charCode : original.keyCode;
-                }
-
-                return event;
-            }
-        },
-
-        mouseHooks: {
-            props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-            filter: function( event, original ) {
-                var eventDoc, doc, body,
-                    button = original.button;
-
-                // Calculate pageX/Y if missing and clientX/Y available
-                if ( event.pageX == null && original.clientX != null ) {
-                    eventDoc = event.target.ownerDocument || document;
-                    doc = eventDoc.documentElement;
-                    body = eventDoc.body;
-
-                    event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-                    event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-                }
-
-                // Add which for click: 1 === left; 2 === middle; 3 === right
-                // Note: button is not normalized, so don't use it
-                if ( !event.which && button !== undefined ) {
-                    event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-                }
-
-                return event;
-            }
-        },
-
-        fix: function( event ) {
-            if ( event[ jQuery.expando ] ) {
-                return event;
-            }
-
-            // Create a writable copy of the event object and normalize some properties
-            var i, prop, copy,
-                type = event.type,
-                originalEvent = event,
-                fixHook = this.fixHooks[ type ];
-
-            if ( !fixHook ) {
-                this.fixHooks[ type ] = fixHook =
-                    rmouseEvent.test( type ) ? this.mouseHooks :
-                        rkeyEvent.test( type ) ? this.keyHooks :
-                        {};
-            }
-            copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-            event = new jQuery.Event( originalEvent );
-
-            i = copy.length;
-            while ( i-- ) {
-                prop = copy[ i ];
-                event[ prop ] = originalEvent[ prop ];
-            }
-
-            // Support: Cordova 2.5 (WebKit) (#13255)
-            // All events should have a target; Cordova deviceready doesn't
-            if ( !event.target ) {
-                event.target = document;
-            }
-
-            // Support: Safari 6.0+, Chrome<28
-            // Target should not be a text node (#504, #13143)
-            if ( event.target.nodeType === 3 ) {
-                event.target = event.target.parentNode;
-            }
-
-            return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-        },
-
-        special: {
-            load: {
-                // Prevent triggered image.load events from bubbling to window.load
-                noBubble: true
-            },
-            focus: {
-                // Fire native event if possible so blur/focus sequence is correct
-                trigger: function() {
-                    if ( this !== safeActiveElement() && this.focus ) {
-                        this.focus();
-                        return false;
-                    }
-                },
-                delegateType: "focusin"
-            },
-            blur: {
-                trigger: function() {
-                    if ( this === safeActiveElement() && this.blur ) {
-                        this.blur();
-                        return false;
-                    }
-                },
-                delegateType: "focusout"
-            },
-            click: {
-                // For checkbox, fire native event so checked state will be right
-                trigger: function() {
-                    if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-                        this.click();
-                        return false;
-                    }
-                },
-
-                // For cross-browser consistency, don't fire native .click() on links
-                _default: function( event ) {
-                    return jQuery.nodeName( event.target, "a" );
-                }
-            },
-
-            beforeunload: {
-                postDispatch: function( event ) {
-
-                    // Support: Firefox 20+
-                    // Firefox doesn't alert if the returnValue field is not set.
-                    if ( event.result !== undefined && event.originalEvent ) {
-                        event.originalEvent.returnValue = event.result;
-                    }
-                }
-            }
-        },
-
-        simulate: function( type, elem, event, bubble ) {
-            // Piggyback on a donor event to simulate a different one.
-            // Fake originalEvent to avoid donor's stopPropagation, but if the
-            // simulated event prevents default then we do the same on the donor.
-            var e = jQuery.extend(
-                new jQuery.Event(),
-                event,
-                {
-                    type: type,
-                    isSimulated: true,
-                    originalEvent: {}
-                }
-            );
-            if ( bubble ) {
-                jQuery.event.trigger( e, null, elem );
-            } else {
-                jQuery.event.dispatch.call( elem, e );
-            }
-            if ( e.isDefaultPrevented() ) {
-                event.preventDefault();
-            }
-        }
-    };
-
-    jQuery.removeEvent = function( elem, type, handle ) {
-        if ( elem.removeEventListener ) {
-            elem.removeEventListener( type, handle, false );
-        }
-    };
-
-    jQuery.Event = function( src, props ) {
-        // Allow instantiation without the 'new' keyword
-        if ( !(this instanceof jQuery.Event) ) {
-            return new jQuery.Event( src, props );
-        }
-
-        // Event object
-        if ( src && src.type ) {
-            this.originalEvent = src;
-            this.type = src.type;
-
-            // Events bubbling up the document may have been marked as prevented
-            // by a handler lower down the tree; reflect the correct value.
-            this.isDefaultPrevented = src.defaultPrevented ||
-            src.defaultPrevented === undefined &&
-                // Support: Android<4.0
-            src.returnValue === false ?
-                returnTrue :
-                returnFalse;
-
-            // Event type
-        } else {
-            this.type = src;
-        }
-
-        // Put explicitly provided properties onto the event object
-        if ( props ) {
-            jQuery.extend( this, props );
-        }
-
-        // Create a timestamp if incoming event doesn't have one
-        this.timeStamp = src && src.timeStamp || jQuery.now();
-
-        // Mark it as fixed
-        this[ jQuery.expando ] = true;
-    };
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-    jQuery.Event.prototype = {
-        isDefaultPrevented: returnFalse,
-        isPropagationStopped: returnFalse,
-        isImmediatePropagationStopped: returnFalse,
-
-        preventDefault: function() {
-            var e = this.originalEvent;
-
-            this.isDefaultPrevented = returnTrue;
-
-            if ( e && e.preventDefault ) {
-                e.preventDefault();
-            }
-        },
-        stopPropagation: function() {
-            var e = this.originalEvent;
-
-            this.isPropagationStopped = returnTrue;
-
-            if ( e && e.stopPropagation ) {
-                e.stopPropagation();
-            }
-        },
-        stopImmediatePropagation: function() {
-            var e = this.originalEvent;
-
-            this.isImmediatePropagationStopped = returnTrue;
-
-            if ( e && e.stopImmediatePropagation ) {
-                e.stopImmediatePropagation();
-            }
-
-            this.stopPropagation();
-        }
-    };
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// Support: Chrome 15+
-    jQuery.each({
-        mouseenter: "mouseover",
-        mouseleave: "mouseout",
-        pointerenter: "pointerover",
-        pointerleave: "pointerout"
-    }, function( orig, fix ) {
-        jQuery.event.special[ orig ] = {
-            delegateType: fix,
-            bindType: fix,
-
-            handle: function( event ) {
-                var ret,
-                    target = this,
-                    related = event.relatedTarget,
-                    handleObj = event.handleObj;
-
-                // For mousenter/leave call the handler if related is outside the target.
-                // NB: No relatedTarget if the mouse left/entered the browser window
-                if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-                    event.type = handleObj.origType;
-                    ret = handleObj.handler.apply( this, arguments );
-                    event.type = fix;
-                }
-                return ret;
-            }
-        };
-    });
-
-// Support: Firefox, Chrome, Safari
-// Create "bubbling" focus and blur events
-    if ( !support.focusinBubbles ) {
-        jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-            // Attach a single capturing handler on the document while someone wants focusin/focusout
-            var handler = function( event ) {
-                jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-            };
-
-            jQuery.event.special[ fix ] = {
-                setup: function() {
-                    var doc = this.ownerDocument || this,
-                        attaches = data_priv.access( doc, fix );
-
-                    if ( !attaches ) {
-                        doc.addEventListener( orig, handler, true );
-                    }
-                    data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
-                },
-                teardown: function() {
-                    var doc = this.ownerDocument || this,
-                        attaches = data_priv.access( doc, fix ) - 1;
-
-                    if ( !attaches ) {
-                        doc.removeEventListener( orig, handler, true );
-                        data_priv.remove( doc, fix );
-
-                    } else {
-                        data_priv.access( doc, fix, attaches );
-                    }
-                }
-            };
-        });
-    }
-
-    jQuery.fn.extend({
-
-        on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-            var origFn, type;
-
-            // Types can be a map of types/handlers
-            if ( typeof types === "object" ) {
-                // ( types-Object, selector, data )
-                if ( typeof selector !== "string" ) {
-                    // ( types-Object, data )
-                    data = data || selector;
-                    selector = undefined;
-                }
-                for ( type in types ) {
-                    this.on( type, selector, data, types[ type ], one );
-                }
-                return this;
-            }
-
-            if ( data == null && fn == null ) {
-                // ( types, fn )
-                fn = selector;
-                data = selector = undefined;
-            } else if ( fn == null ) {
-                if ( typeof selector === "string" ) {
-                    // ( types, selector, fn )
-                    fn = data;
-                    data = undefined;
-                } else {
-                    // ( types, data, fn )
-                    fn = data;
-                    data = selector;
-                    selector = undefined;
-                }
-            }
-            if ( fn === false ) {
-                fn = returnFalse;
-            } else if ( !fn ) {
-                return this;
-            }
-
-            if ( one === 1 ) {
-                origFn = fn;
-                fn = function( event ) {
-                    // Can use an empty set, since event contains the info
-                    jQuery().off( event );
-                    return origFn.apply( this, arguments );
-                };
-                // Use same guid so caller can remove using origFn
-                fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-            }
-            return this.each( function() {
-                jQuery.event.add( this, types, fn, data, selector );
-            });
-        },
-        one: function( types, selector, data, fn ) {
-            return this.on( types, selector, data, fn, 1 );
-        },
-        off: function( types, selector, fn ) {
-            var handleObj, type;
-            if ( types && types.preventDefault && types.handleObj ) {
-                // ( event )  dispatched jQuery.Event
-                handleObj = types.handleObj;
-                jQuery( types.delegateTarget ).off(
-                    handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-                    handleObj.selector,
-                    handleObj.handler
-                );
-                return this;
-            }
-            if ( typeof types === "object" ) {
-                // ( types-object [, selector] )
-                for ( type in types ) {
-                    this.off( type, selector, types[ type ] );
-                }
-                return this;
-            }
-            if ( selector === false || typeof selector === "function" ) {
-                // ( types [, fn] )
-                fn = selector;
-                selector = undefined;
-            }
-            if ( fn === false ) {
-                fn = returnFalse;
-            }
-            return this.each(function() {
-                jQuery.event.remove( this, types, fn, selector );
-            });
-        },
-
-        trigger: function( type, data ) {
-            return this.each(function() {
-                jQuery.event.trigger( type, data, this );
-            });
-        },
-        triggerHandler: function( type, data ) {
-            var elem = this[0];
-            if ( elem ) {
-                return jQuery.event.trigger( type, data, elem, true );
-            }
-        }
-    });
-
-
-    var
-        rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-        rtagName = /<([\w:]+)/,
-        rhtml = /<|&#?\w+;/,
-        rnoInnerhtml = /<(?:script|style|link)/i,
-    // checked="checked" or checked
-        rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-        rscriptType = /^$|\/(?:java|ecma)script/i,
-        rscriptTypeMasked = /^true\/(.*)/,
-        rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-    // We have to close these tags to support XHTML (#13200)
-        wrapMap = {
-
-            // Support: IE9
-            option: [ 1, "<select multiple='multiple'>", "</select>" ],
-
-            thead: [ 1, "<table>", "</table>" ],
-            col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-            tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-            td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-            _default: [ 0, "", "" ]
-        };
-
-// Support: IE9
-    wrapMap.optgroup = wrapMap.option;
-
-    wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-    wrapMap.th = wrapMap.td;
-
-// Support: 1.x compatibility
-// Manipulating tables requires a tbody
-    function manipulationTarget( elem, content ) {
-        return jQuery.nodeName( elem, "table" ) &&
-        jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-        elem.getElementsByTagName("tbody")[0] ||
-        elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-            elem;
-    }
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-    function disableScript( elem ) {
-        elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
-        return elem;
-    }
-    function restoreScript( elem ) {
-        var match = rscriptTypeMasked.exec( elem.type );
-
-        if ( match ) {
-            elem.type = match[ 1 ];
-        } else {
-            elem.removeAttribute("type");
-        }
-
-        return elem;
-    }
-
-// Mark scripts as having already been evaluated
-    function setGlobalEval( elems, refElements ) {
-        var i = 0,
-            l = elems.length;
-
-        for ( ; i < l; i++ ) {
-            data_priv.set(
-                elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
-            );
-        }
-    }
-
-    function cloneCopyEvent( src, dest ) {
-        var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-        if ( dest.nodeType !== 1 ) {
-            return;
-        }
-
-        // 1. Copy private data: events, handlers, etc.
-        if ( data_priv.hasData( src ) ) {
-            pdataOld = data_priv.access( src );
-            pdataCur = data_priv.set( dest, pdataOld );
-            events = pdataOld.events;
-
-            if ( events ) {
-                delete pdataCur.handle;
-                pdataCur.events = {};
-
-                for ( type in events ) {
-                    for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-                        jQuery.event.add( dest, type, events[ type ][ i ] );
-                    }
-                }
-            }
-        }
-
-        // 2. Copy user data
-        if ( data_user.hasData( src ) ) {
-            udataOld = data_user.access( src );
-            udataCur = jQuery.extend( {}, udataOld );
-
-            data_user.set( dest, udataCur );
-        }
-    }
-
-    function getAll( context, tag ) {
-        var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
-            context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
-                [];
-
-        return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-            jQuery.merge( [ context ], ret ) :
-            ret;
-    }
-
-// Fix IE bugs, see support tests
-    function fixInput( src, dest ) {
-        var nodeName = dest.nodeName.toLowerCase();
-
-        // Fails to persist the checked state of a cloned checkbox or radio button.
-        if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-            dest.checked = src.checked;
-
-            // Fails to return the selected option to the default selected state when cloning options
-        } else if ( nodeName === "input" || nodeName === "textarea" ) {
-            dest.defaultValue = src.defaultValue;
-        }
-    }
-
-    jQuery.extend({
-        clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-            var i, l, srcElements, destElements,
-                clone = elem.cloneNode( true ),
-                inPage = jQuery.contains( elem.ownerDocument, elem );
-
-            // Fix IE cloning issues
-            if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-                !jQuery.isXMLDoc( elem ) ) {
-
-                // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-                destElements = getAll( clone );
-                srcElements = getAll( elem );
-
-                for ( i = 0, l = srcElements.length; i < l; i++ ) {
-                    fixInput( srcElements[ i ], destElements[ i ] );
-                }
-            }
-
-            // Copy the events from the original to the clone
-            if ( dataAndEvents ) {
-                if ( deepDataAndEvents ) {
-                    srcElements = srcElements || getAll( elem );
-                    destElements = destElements || getAll( clone );
-
-                    for ( i = 0, l = srcElements.length; i < l; i++ ) {
-                        cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-                    }
-                } else {
-                    cloneCopyEvent( elem, clone );
-                }
-            }
-
-            // Preserve script evaluation history
-            destElements = getAll( clone, "script" );
-            if ( destElements.length > 0 ) {
-                setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-            }
-
-            // Return the cloned set
-            return clone;
-        },
-
-        buildFragment: function( elems, context, scripts, selection ) {
-            var elem, tmp, tag, wrap, contains, j,
-                fragment = context.createDocumentFragment(),
-                nodes = [],
-                i = 0,
-                l = elems.length;
-
-            for ( ; i < l; i++ ) {
-                elem = elems[ i ];
-
-                if ( elem || elem === 0 ) {
-
-                    // Add nodes directly
-                    if ( jQuery.type( elem ) === "object" ) {
-                        // Support: QtWebKit, PhantomJS
-                        // push.apply(_, arraylike) throws on ancient WebKit
-                        jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-                        // Convert non-html into a text node
-                    } else if ( !rhtml.test( elem ) ) {
-                        nodes.push( context.createTextNode( elem ) );
-
-                        // Convert html into DOM nodes
-                    } else {
-                        tmp = tmp || fragment.appendChild( context.createElement("div") );
-
-                        // Deserialize a standard representation
-                        tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-                        wrap = wrapMap[ tag ] || wrapMap._default;
-                        tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[ 2 ];
-
-                        // Descend through wrappers to the right content
-                        j = wrap[ 0 ];
-                        while ( j-- ) {
-                            tmp = tmp.lastChild;
-                        }
-
-                        // Support: QtWebKit, PhantomJS
-                        // push.apply(_, arraylike) throws on ancient WebKit
-                        jQuery.merge( nodes, tmp.childNodes );
-
-                        // Remember the top-level container
-                        tmp = fragment.firstChild;
-
-                        // Ensure the created nodes are orphaned (#12392)
-                        tmp.textContent = "";
-                    }
-                }
-            }
-
-            // Remove wrapper from fragment
-            fragment.textContent = "";
-
-            i = 0;
-            while ( (elem = nodes[ i++ ]) ) {
-
-                // #4087 - If origin and destination elements are the same, and this is
-                // that element, do not do anything
-                if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-                    continue;
-                }
-
-                contains = jQuery.contains( elem.ownerDocument, elem );
-
-                // Append to fragment
-                tmp = getAll( fragment.appendChild( elem ), "script" );
-
-                // Preserve script evaluation history
-                if ( contains ) {
-                    setGlobalEval( tmp );
-                }
-
-                // Capture executables
-                if ( scripts ) {
-                    j = 0;
-                    while ( (elem = tmp[ j++ ]) ) {
-                        if ( rscriptType.test( elem.type || "" ) ) {
-                            scripts.push( elem );
-                        }
-                    }
-                }
-            }
-
-            return fragment;
-        },
-
-        cleanData: function( elems ) {
-            var data, elem, type, key,
-                special = jQuery.event.special,
-                i = 0;
-
-            for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-                if ( jQuery.acceptData( elem ) ) {
-                    key = elem[ data_priv.expando ];
-
-                    if ( key && (data = data_priv.cache[ key ]) ) {
-                        if ( data.events ) {
-                            for ( type in data.events ) {
-                                if ( special[ type ] ) {
-                                    jQuery.event.remove( elem, type );
-
-                                    // This is a shortcut to avoid jQuery.event.remove's overhead
-                                } else {
-                                    jQuery.removeEvent( elem, type, data.handle );
-                                }
-                            }
-                        }
-                        if ( data_priv.cache[ key ] ) {
-                            // Discard any remaining `private` data
-                            delete data_priv.cache[ key ];
-                        }
-                    }
-                }
-                // Discard any remaining `user` data
-                delete data_user.cache[ elem[ data_user.expando ] ];
-            }
-        }
-    });
-
-    jQuery.fn.extend({
-        text: function( value ) {
-            return access( this, function( value ) {
-                return value === undefined ?
-                    jQuery.text( this ) :
-                    this.empty().each(function() {
-                        if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-                            this.textContent = value;
-                        }
-                    });
-            }, null, value, arguments.length );
-        },
-
-        append: function() {
-            return this.domManip( arguments, function( elem ) {
-                if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-                    var target = manipulationTarget( this, elem );
-                    target.appendChild( elem );
-                }
-            });
-        },
-
-        prepend: function() {
-            return this.domManip( arguments, function( elem ) {
-                if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-                    var target = manipulationTarget( this, elem );
-                    target.insertBefore( elem, target.firstChild );
-                }
-            });
-        },
-
-        before: function() {
-            return this.domManip( arguments, function( elem ) {
-                if ( this.parentNode ) {
-                    this.parentNode.insertBefore( elem, this );
-                }
-            });
-        },
-
-        after: function() {
-            return this.domManip( arguments, function( elem ) {
-                if ( this.parentNode ) {
-                    this.parentNode.insertBefore( elem, this.nextSibling );
-                }
-            });
-        },
-
-        remove: function( selector, keepData /* Internal Use Only */ ) {
-            var elem,
-                elems = selector ? jQuery.filter( selector, this ) : this,
-                i = 0;
-
-            for ( ; (elem = elems[i]) != null; i++ ) {
-                if ( !keepData && elem.nodeType === 1 ) {
-                    jQuery.cleanData( getAll( elem ) );
-                }
-
-                if ( elem.parentNode ) {
-                    if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-                        setGlobalEval( getAll( elem, "script" ) );
-                    }
-                    elem.parentNode.removeChild( elem );
-                }
-            }
-
-            return this;
-        },
-
-        empty: function() {
-            var elem,
-                i = 0;
-
-            for ( ; (elem = this[i]) != null; i++ ) {
-                if ( elem.nodeType === 1 ) {
-
-                    // Prevent memory leaks
-                    jQuery.cleanData( getAll( elem, false ) );
-
-                    // Remove any remaining nodes
-                    elem.textContent = "";
-                }
-            }
-
-            return this;
-        },
-
-        clone: function( dataAndEvents, deepDataAndEvents ) {
-            dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-            deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-            return this.map(function() {
-                return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-            });
-        },
-
-        html: function( value ) {
-            return access( this, function( value ) {
-                var elem = this[ 0 ] || {},
-                    i = 0,
-                    l = this.length;
-
-                if ( value === undefined && elem.nodeType === 1 ) {
-                    return elem.innerHTML;
-                }
-
-                // See if we can take a shortcut and just use innerHTML
-                if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-                    !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-                    value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-                    try {
-                        for ( ; i < l; i++ ) {
-                            elem = this[ i ] || {};
-
-                            // Remove element nodes and prevent memory leaks
-                            if ( elem.nodeType === 1 ) {
-                                jQuery.cleanData( getAll( elem, false ) );
-                                elem.innerHTML = value;
-                            }
-                        }
-
-                        elem = 0;
-
-                        // If using innerHTML throws an exception, use the fallback method
-                    } catch( e ) {}
-                }
-
-                if ( elem ) {
-                    this.empty().append( value );
-                }
-            }, null, value, arguments.length );
-        },
-
-        replaceWith: function() {
-            var arg = arguments[ 0 ];
-
-            // Make the changes, replacing each context element with the new content
-            this.domManip( arguments, function( elem ) {
-                arg = this.parentNode;
-
-                jQuery.cleanData( getAll( this ) );
-
-                if ( arg ) {
-                    arg.replaceChild( elem, this );
-                }
-            });
-
-            // Force removal if there was no new content (e.g., from empty arguments)
-            return arg && (arg.length || arg.nodeType) ? this : this.remove();
-        },
-
-        detach: function( selector ) {
-            return this.remove( selector, true );
-        },
-
-        domManip: function( args, callback ) {
-
-            // Flatten any nested arrays
-            args = concat.apply( [], args );
-
-            var fragment, first, scripts, hasScripts, node, doc,
-                i = 0,
-                l = this.length,
-                set = this,
-                iNoClone = l - 1,
-                value = args[ 0 ],
-                isFunction = jQuery.isFunction( value );
-
-            // We can't cloneNode fragments that contain checked, in WebKit
-            if ( isFunction ||
-                ( l > 1 && typeof value === "string" &&
-                !support.checkClone && rchecked.test( value ) ) ) {
-                return this.each(function( index ) {
-                    var self = set.eq( index );
-                    if ( isFunction ) {
-                        args[ 0 ] = value.call( this, index, self.html() );
-                    }
-                    self.domManip( args, callback );
-                });
-            }
-
-            if ( l ) {
-                fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
-                first = fragment.firstChild;
-
-                if ( fragment.childNodes.length === 1 ) {
-                    fragment = first;
-                }
-
-                if ( first ) {
-                    scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-                    hasScripts = scripts.length;
-
-                    // Use the original fragment for the last item instead of the first because it can end up
-                    // being emptied incorrectly in certain situations (#8070).
-                    for ( ; i < l; i++ ) {
-                        node = fragment;
-
-                        if ( i !== iNoClone ) {
-                            node = jQuery.clone( node, true, true );
-
-                            // Keep references to cloned scripts for later restoration
-                            if ( hasScripts ) {
-                                // Support: QtWebKit
-                                // jQuery.merge because push.apply(_, arraylike) throws
-                                jQuery.merge( scripts, getAll( node, "script" ) );
-                            }
-                        }
-
-                        callback.call( this[ i ], node, i );
-                    }
-
-                    if ( hasScripts ) {
-                        doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-                        // Reenable scripts
-                        jQuery.map( scripts, restoreScript );
-
-                        // Evaluate executable scripts on first document insertion
-                        for ( i = 0; i < hasScripts; i++ ) {
-                            node = scripts[ i ];
-                            if ( rscriptType.test( node.type || "" ) &&
-                                !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-                                if ( node.src ) {
-                                    // Optional AJAX dependency, but won't run scripts if not present
-                                    if ( jQuery._evalUrl ) {
-                                        jQuery._evalUrl( node.src );
-                                    }
-                                } else {
-                                    jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return this;
-        }
-    });
-
-    jQuery.each({
-        appendTo: "append",
-        prependTo: "prepend",
-        insertBefore: "before",
-        insertAfter: "after",
-        replaceAll: "replaceWith"
-    }, function( name, original ) {
-        jQuery.fn[ name ] = function( selector ) {
-            var elems,
-                ret = [],
-                insert = jQuery( selector ),
-                last = insert.length - 1,
-                i = 0;
-
-            for ( ; i <= last; i++ ) {
-                elems = i === last ? this : this.clone( true );
-                jQuery( insert[ i ] )[ original ]( elems );
-
-                // Support: QtWebKit
-                // .get() because push.apply(_, arraylike) throws
-                push.apply( ret, elems.get() );
-            }
-
-            return this.pushStack( ret );
-        };
-    });
-
-
-    var iframe,
-        elemdisplay = {};
-
-    /**
-     * Retrieve the actual display of a element
-     * @param {String} name nodeName of the element
-     * @param {Object} doc Document object
-     */
-// Called only from within defaultDisplay
-    function actualDisplay( name, doc ) {
-        var style,
-            elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-        // getDefaultComputedStyle might be reliably used only on attached element
-            display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
-
-                // Use of this method is a temporary fix (more like optimization) until something better comes along,
-                // since it was removed from specification and supported only in FF
-                style.display : jQuery.css( elem[ 0 ], "display" );
-
-        // We don't have any data stored on the element,
-        // so use "detach" method as fast way to get rid of the element
-        elem.detach();
-
-        return display;
-    }
-
-    /**
-     * Try to determine the default display value of an element
-     * @param {String} nodeName
-     */
-    function defaultDisplay( nodeName ) {
-        var doc = document,
-            display = elemdisplay[ nodeName ];
-
-        if ( !display ) {
-            display = actualDisplay( nodeName, doc );
-
-            // If the simple way fails, read from inside an iframe
-            if ( display === "none" || !display ) {
-
-                // Use the already-created iframe if possible
-                iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
-
-                // Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-                doc = iframe[ 0 ].contentDocument;
-
-                // Support: IE
-                doc.write();
-                doc.close();
-
-                display = actualDisplay( nodeName, doc );
-                iframe.detach();
-            }
-
-            // Store the correct default display
-            elemdisplay[ nodeName ] = display;
-        }
-
-        return display;
-    }
-    var rmargin = (/^margin/);
-
-    var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-    var getStyles = function( elem ) {
-        // Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-        // IE throws on elements created in popups
-        // FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-        if ( elem.ownerDocument.defaultView.opener ) {
-            return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
-        }
-
-        return window.getComputedStyle( elem, null );
-    };
-
-
-
-    function curCSS( elem, name, computed ) {
-        var width, minWidth, maxWidth, ret,
-            style = elem.style;
-
-        computed = computed || getStyles( elem );
-
-        // Support: IE9
-        // getPropertyValue is only needed for .css('filter') (#12537)
-        if ( computed ) {
-            ret = computed.getPropertyValue( name ) || computed[ name ];
-        }
-
-        if ( computed ) {
-
-            if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-                ret = jQuery.style( elem, name );
-            }
-
-            // Support: iOS < 6
-            // A tribute to the "awesome hack by Dean Edwards"
-            // iOS < 6 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-            // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-            if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-                // Remember the original values
-                width = style.width;
-                minWidth = style.minWidth;
-                maxWidth = style.maxWidth;
-
-                // Put in the new values to get a computed value out
-                style.minWidth = style.maxWidth = style.width = ret;
-                ret = computed.width;
-
-                // Revert the changed values
-                style.width = width;
-                style.minWidth = minWidth;
-                style.maxWidth = maxWidth;
-            }
-        }
-
-        return ret !== undefined ?
-            // Support: IE
-            // IE returns zIndex value as an integer.
-        ret + "" :
-            ret;
-    }
-
-
-    function addGetHookIf( conditionFn, hookFn ) {
-        // Define the hook, we'll check on the first run if it's really needed.
-        return {
-            get: function() {
-                if ( conditionFn() ) {
-                    // Hook not needed (or it's not possible to use it due
-                    // to missing dependency), remove it.
-                    delete this.get;
-                    return;
-                }
-
-                // Hook needed; redefine it so that the support test is not executed again.
-                return (this.get = hookFn).apply( this, arguments );
-            }
-        };
-    }
-
-
-    (function() {
-        var pixelPositionVal, boxSizingReliableVal,
-            docElem = document.documentElement,
-            container = document.createElement( "div" ),
-            div = document.createElement( "div" );
-
-        if ( !div.style ) {
-            return;
-        }
-
-        // Support: IE9-11+
-        // Style of cloned element affects source element cloned (#8908)
-        div.style.backgroundClip = "content-box";
-        div.cloneNode( true ).style.backgroundClip = "";
-        support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-        container.style.cssText = "border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;" +
-        "position:absolute";
-        container.appendChild( div );
-
-        // Executing both pixelPosition & boxSizingReliable tests require only one layout
-        // so they're executed at the same time to save the second computation.
-        function computePixelPositionAndBoxSizingReliable() {
-            div.style.cssText =
-                // Support: Firefox<29, Android 2.3
-                // Vendor-prefix box-sizing
-                "-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
-                "box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
-                "border:1px;padding:1px;width:4px;position:absolute";
-            div.innerHTML = "";
-            docElem.appendChild( container );
-
-            var divStyle = window.getComputedStyle( div, null );
-            pixelPositionVal = divStyle.top !== "1%";
-            boxSizingReliableVal = divStyle.width === "4px";
-
-            docElem.removeChild( container );
-        }
-
-        // Support: node.js jsdom
-        // Don't assume that getComputedStyle is a property of the global object
-        if ( window.getComputedStyle ) {
-            jQuery.extend( support, {
-                pixelPosition: function() {
-
-                    // This test is executed only once but we still do memoizing
-                    // since we can use the boxSizingReliable pre-computing.
-                    // No need to check if the test was already performed, though.
-                    computePixelPositionAndBoxSizingReliable();
-                    return pixelPositionVal;
-                },
-                boxSizingReliable: function() {
-                    if ( boxSizingReliableVal == null ) {
-                        computePixelPositionAndBoxSizingReliable();
-                    }
-                    return boxSizingReliableVal;
-                },
-                reliableMarginRight: function() {
-
-                    // Support: Android 2.3
-                    // Check if div with explicit width and no margin-right incorrectly
-                    // gets computed margin-right based on width of container. (#3333)
-                    // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-                    // This support function is only executed once so no memoizing is needed.
-                    var ret,
-                        marginDiv = div.appendChild( document.createElement( "div" ) );
-
-                    // Reset CSS: box-sizing; display; margin; border; padding
-                    marginDiv.style.cssText = div.style.cssText =
-                        // Support: Firefox<29, Android 2.3
-                        // Vendor-prefix box-sizing
-                        "-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-                        "box-sizing:content-box;display:block;margin:0;border:0;padding:0";
-                    marginDiv.style.marginRight = marginDiv.style.width = "0";
-                    div.style.width = "1px";
-                    docElem.appendChild( container );
-
-                    ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight );
-
-                    docElem.removeChild( container );
-                    div.removeChild( marginDiv );
-
-                    return ret;
-                }
-            });
-        }
-    })();
-
-
-// A method for quickly swapping in/out CSS properties to get correct calculations.
-    jQuery.swap = function( elem, options, callback, args ) {
-        var ret, name,
-            old = {};
-
-        // Remember the old values, and insert the new ones
-        for ( name in options ) {
-            old[ name ] = elem.style[ name ];
-            elem.style[ name ] = options[ name ];
-        }
-
-        ret = callback.apply( elem, args || [] );
-
-        // Revert the old values
-        for ( name in options ) {
-            elem.style[ name ] = old[ name ];
-        }
-
-        return ret;
-    };
-
-
-    var
-    // Swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-    // See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-        rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-        rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
-        rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
-
-        cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-        cssNormalTransform = {
-            letterSpacing: "0",
-            fontWeight: "400"
-        },
-
-        cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// Return a css property mapped to a potentially vendor prefixed property
-    function vendorPropName( style, name ) {
-
-        // Shortcut for names that are not vendor prefixed
-        if ( name in style ) {
-            return name;
-        }
-
-        // Check for vendor prefixed names
-        var capName = name[0].toUpperCase() + name.slice(1),
-            origName = name,
-            i = cssPrefixes.length;
-
-        while ( i-- ) {
-            name = cssPrefixes[ i ] + capName;
-            if ( name in style ) {
-                return name;
-            }
-        }
-
-        return origName;
-    }
-
-    function setPositiveNumber( elem, value, subtract ) {
-        var matches = rnumsplit.exec( value );
-        return matches ?
-            // Guard against undefined "subtract", e.g., when used as in cssHooks
-        Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-            value;
-    }
-
-    function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-        var i = extra === ( isBorderBox ? "border" : "content" ) ?
-                // If we already have the right measurement, avoid augmentation
-                4 :
-                // Otherwise initialize for horizontal or vertical properties
-                name === "width" ? 1 : 0,
-
-            val = 0;
-
-        for ( ; i < 4; i += 2 ) {
-            // Both box models exclude margin, so add it if we want it
-            if ( extra === "margin" ) {
-                val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-            }
-
-            if ( isBorderBox ) {
-                // border-box includes padding, so remove it if we want content
-                if ( extra === "content" ) {
-                    val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-                }
-
-                // At this point, extra isn't border nor margin, so remove border
-                if ( extra !== "margin" ) {
-                    val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-                }
-            } else {
-                // At this point, extra isn't content, so add padding
-                val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-                // At this point, extra isn't content nor padding, so add border
-                if ( extra !== "padding" ) {
-                    val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-                }
-            }
-        }
-
-        return val;
-    }
-
-    function getWidthOrHeight( elem, name, extra ) {
-
-        // Start with offset property, which is equivalent to the border-box value
-        var valueIsBorderBox = true,
-            val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-            styles = getStyles( elem ),
-            isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-        // Some non-html elements return undefined for offsetWidth, so check for null/undefined
-        // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-        // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-        if ( val <= 0 || val == null ) {
-            // Fall back to computed then uncomputed css if necessary
-            val = curCSS( elem, name, styles );
-            if ( val < 0 || val == null ) {
-                val = elem.style[ name ];
-            }
-
-            // Computed unit is not pixels. Stop here and return.
-            if ( rnumnonpx.test(val) ) {
-                return val;
-            }
-
-            // Check for style in case a browser which returns unreliable values
-            // for getComputedStyle silently falls back to the reliable elem.style
-            valueIsBorderBox = isBorderBox &&
-            ( support.boxSizingReliable() || val === elem.style[ name ] );
-
-            // Normalize "", auto, and prepare for extra
-            val = parseFloat( val ) || 0;
-        }
-
-        // Use the active box-sizing model to add/subtract irrelevant styles
-        return ( val +
-            augmentWidthOrHeight(
-                elem,
-                name,
-                extra || ( isBorderBox ? "border" : "content" ),
-                valueIsBorderBox,
-                styles
-            )
-            ) + "px";
-    }
-
-    function showHide( elements, show ) {
-        var display, elem, hidden,
-            values = [],
-            index = 0,
-            length = elements.length;
-
-        for ( ; index < length; index++ ) {
-            elem = elements[ index ];
-            if ( !elem.style ) {
-                continue;
-            }
-
-            values[ index ] = data_priv.get( elem, "olddisplay" );
-            display = elem.style.display;
-            if ( show ) {
-                // Reset the inline display of this element to learn if it is
-                // being hidden by cascaded rules or not
-                if ( !values[ index ] && display === "none" ) {
-                    elem.style.display = "";
-                }
-
-                // Set elements which have been overridden with display: none
-                // in a stylesheet to whatever the default browser style is
-                // for such an element
-                if ( elem.style.display === "" && isHidden( elem ) ) {
-                    values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
-                }
-            } else {
-                hidden = isHidden( elem );
-
-                if ( display !== "none" || !hidden ) {
-                    data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-                }
-            }
-        }
-
-        // Set the display of most of the elements in a second loop
-        // to avoid the constant reflow
-        for ( index = 0; index < length; index++ ) {
-            elem = elements[ index ];
-            if ( !elem.style ) {
-                continue;
-            }
-            if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-                elem.style.display = show ? values[ index ] || "" : "none";
-            }
-        }
-
-        return elements;
-    }
-
-    jQuery.extend({
-
-        // Add in style property hooks for overriding the default
-        // behavior of getting and setting a style property
-        cssHooks: {
-            opacity: {
-                get: function( elem, computed ) {
-                    if ( computed ) {
-
-                        // We should always get a number back from opacity
-                        var ret = curCSS( elem, "opacity" );
-                        return ret === "" ? "1" : ret;
-                    }
-                }
-            }
-        },
-
-        // Don't automatically add "px" to these possibly-unitless properties
-        cssNumber: {
-            "columnCount": true,
-            "fillOpacity": true,
-            "flexGrow": true,
-            "flexShrink": true,
-            "fontWeight": true,
-            "lineHeight": true,
-            "opacity": true,
-            "order": true,
-            "orphans": true,
-            "widows": true,
-            "zIndex": true,
-            "zoom": true
-        },
-
-        // Add in properties whose names you wish to fix before
-        // setting or getting the value
-        cssProps: {
-            "float": "cssFloat"
-        },
-
-        // Get and set the style property on a DOM Node
-        style: function( elem, name, value, extra ) {
-
-            // Don't set styles on text and comment nodes
-            if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-                return;
-            }
-
-            // Make sure that we're working with the right name
-            var ret, type, hooks,
-                origName = jQuery.camelCase( name ),
-                style = elem.style;
-
-            name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-            // Gets hook for the prefixed version, then unprefixed version
-            hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-            // Check if we're setting a value
-            if ( value !== undefined ) {
-                type = typeof value;
-
-                // Convert "+=" or "-=" to relative numbers (#7345)
-                if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-                    value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-                    // Fixes bug #9237
-                    type = "number";
-                }
-
-                // Make sure that null and NaN values aren't set (#7116)
-                if ( value == null || value !== value ) {
-                    return;
-                }
-
-                // If a number, add 'px' to the (except for certain CSS properties)
-                if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-                    value += "px";
-                }
-
-                // Support: IE9-11+
-                // background-* props affect original clone's values
-                if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-                    style[ name ] = "inherit";
-                }
-
-                // If a hook was provided, use that value, otherwise just set the specified value
-                if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-                    style[ name ] = value;
-                }
-
-            } else {
-                // If a hook was provided get the non-computed value from there
-                if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-                    return ret;
-                }
-
-                // Otherwise just get the value from the style object
-                return style[ name ];
-            }
-        },
-
-        css: function( elem, name, extra, styles ) {
-            var val, num, hooks,
-                origName = jQuery.camelCase( name );
-
-            // Make sure that we're working with the right name
-            name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-            // Try prefixed name followed by the unprefixed name
-            hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-            // If a hook was provided get the computed value from there
-            if ( hooks && "get" in hooks ) {
-                val = hooks.get( elem, true, extra );
-            }
-
-            // Otherwise, if a way to get the computed value exists, use that
-            if ( val === undefined ) {
-                val = curCSS( elem, name, styles );
-            }
-
-            // Convert "normal" to computed value
-            if ( val === "normal" && name in cssNormalTransform ) {
-                val = cssNormalTransform[ name ];
-            }
-
-            // Make numeric if forced or a qualifier was provided and val looks numeric
-            if ( extra === "" || extra ) {
-                num = parseFloat( val );
-                return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-            }
-            return val;
-        }
-    });
-
-    jQuery.each([ "height", "width" ], function( i, name ) {
-        jQuery.cssHooks[ name ] = {
-            get: function( elem, computed, extra ) {
-                if ( computed ) {
-
-                    // Certain elements can have dimension info if we invisibly show them
-                    // but it must have a current display style that would benefit
-                    return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
-                        jQuery.swap( elem, cssShow, function() {
-                            return getWidthOrHeight( elem, name, extra );
-                        }) :
-                        getWidthOrHeight( elem, name, extra );
-                }
-            },
-
-            set: function( elem, value, extra ) {
-                var styles = extra && getStyles( elem );
-                return setPositiveNumber( elem, value, extra ?
-                        augmentWidthOrHeight(
-                            elem,
-                            name,
-                            extra,
-                            jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-                            styles
-                        ) : 0
-                );
-            }
-        };
-    });
-
-// Support: Android 2.3
-    jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-        function( elem, computed ) {
-            if ( computed ) {
-                return jQuery.swap( elem, { "display": "inline-block" },
-                    curCSS, [ elem, "marginRight" ] );
-            }
-        }
-    );
-
-// These hooks are used by animate to expand properties
-    jQuery.each({
-        margin: "",
-        padding: "",
-        border: "Width"
-    }, function( prefix, suffix ) {
-        jQuery.cssHooks[ prefix + suffix ] = {
-            expand: function( value ) {
-                var i = 0,
-                    expanded = {},
-
-                // Assumes a single number if not a string
-                    parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-                for ( ; i < 4; i++ ) {
-                    expanded[ prefix + cssExpand[ i ] + suffix ] =
-                        parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-                }
-
-                return expanded;
-            }
-        };
-
-        if ( !rmargin.test( prefix ) ) {
-            jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-        }
-    });
-
-    jQuery.fn.extend({
-        css: function( name, value ) {
-            return access( this, function( elem, name, value ) {
-                var styles, len,
-                    map = {},
-                    i = 0;
-
-                if ( jQuery.isArray( name ) ) {
-                    styles = getStyles( elem );
-                    len = name.length;
-
-                    for ( ; i < len; i++ ) {
-                        map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-                    }
-
-                    return map;
-                }
-
-                return value !== undefined ?
-                    jQuery.style( elem, name, value ) :
-                    jQuery.css( elem, name );
-            }, name, value, arguments.length > 1 );
-        },
-        show: function() {
-            return showHide( this, true );
-        },
-        hide: function() {
-            return showHide( this );
-        },
-        toggle: function( state ) {
-            if ( typeof state === "boolean" ) {
-                return state ? this.show() : this.hide();
-            }
-
-            return this.each(function() {
-                if ( isHidden( this ) ) {
-                    jQuery( this ).show();
-                } else {
-                    jQuery( this ).hide();
-                }
-            });
-        }
-    });
-
-
-    function Tween( elem, options, prop, end, easing ) {
-        return new Tween.prototype.init( elem, options, prop, end, easing );
-    }
-    jQuery.Tween = Tween;
-
-    Tween.prototype = {
-        constructor: Tween,
-        init: function( elem, options, prop, end, easing, unit ) {
-            this.elem = elem;
-            this.prop = prop;
-            this.easing = easing || "swing";
-            this.options = options;
-            this.start = this.now = this.cur();
-            this.end = end;
-            this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-        },
-        cur: function() {
-            var hooks = Tween.propHooks[ this.prop ];
-
-            return hooks && hooks.get ?
-                hooks.get( this ) :
-                Tween.propHooks._default.get( this );
-        },
-        run: function( percent ) {
-            var eased,
-                hooks = Tween.propHooks[ this.prop ];
-
-            if ( this.options.duration ) {
-                this.pos = eased = jQuery.easing[ this.easing ](
-                    percent, this.options.duration * percent, 0, 1, this.options.duration
-                );
-            } else {
-                this.pos = eased = percent;
-            }
-            this.now = ( this.end - this.start ) * eased + this.start;
-
-            if ( this.options.step ) {
-                this.options.step.call( this.elem, this.now, this );
-            }
-
-            if ( hooks && hooks.set ) {
-                hooks.set( this );
-            } else {
-                Tween.propHooks._default.set( this );
-            }
-            return this;
-        }
-    };
-
-    Tween.prototype.init.prototype = Tween.prototype;
-
-    Tween.propHooks = {
-        _default: {
-            get: function( tween ) {
-                var result;
-
-                if ( tween.elem[ tween.prop ] != null &&
-                    (!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-                    return tween.elem[ tween.prop ];
-                }
-
-                // Passing an empty string as a 3rd parameter to .css will automatically
-                // attempt a parseFloat and fallback to a string if the parse fails.
-                // Simple values such as "10px" are parsed to Float;
-                // complex values such as "rotate(1rad)" are returned as-is.
-                result = jQuery.css( tween.elem, tween.prop, "" );
-                // Empty strings, null, undefined and "auto" are converted to 0.
-                return !result || result === "auto" ? 0 : result;
-            },
-            set: function( tween ) {
-                // Use step hook for back compat.
-                // Use cssHook if its there.
-                // Use .style if available and use plain properties where available.
-                if ( jQuery.fx.step[ tween.prop ] ) {
-                    jQuery.fx.step[ tween.prop ]( tween );
-                } else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-                    jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-                } else {
-                    tween.elem[ tween.prop ] = tween.now;
-                }
-            }
-        }
-    };
-
-// Support: IE9
-// Panic based approach to setting things on disconnected nodes
-    Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-        set: function( tween ) {
-            if ( tween.elem.nodeType && tween.elem.parentNode ) {
-                tween.elem[ tween.prop ] = tween.now;
-            }
-        }
-    };
-
-    jQuery.easing = {
-        linear: function( p ) {
-            return p;
-        },
-        swing: function( p ) {
-            return 0.5 - Math.cos( p * Math.PI ) / 2;
-        }
-    };
-
-    jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-    jQuery.fx.step = {};
-
-
-
-
-    var
-        fxNow, timerId,
-        rfxtypes = /^(?:toggle|show|hide)$/,
-        rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
-        rrun = /queueHooks$/,
-        animationPrefilters = [ defaultPrefilter ],
-        tweeners = {
-            "*": [ function( prop, value ) {
-                var tween = this.createTween( prop, value ),
-                    target = tween.cur(),
-                    parts = rfxnum.exec( value ),
-                    unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-                // Starting value computation is required for potential unit mismatches
-                    start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-                        rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-                    scale = 1,
-                    maxIterations = 20;
-
-                if ( start && start[ 3 ] !== unit ) {
-                    // Trust units reported by jQuery.css
-                    unit = unit || start[ 3 ];
-
-                    // Make sure we update the tween properties later on
-                    parts = parts || [];
-
-                    // Iteratively approximate from a nonzero starting point
-                    start = +target || 1;
-
-                    do {
-                        // If previous iteration zeroed out, double until we get *something*.
-                        // Use string for doubling so we don't accidentally see scale as unchanged below
-                        scale = scale || ".5";
-
-                        // Adjust and apply
-                        start = start / scale;
-                        jQuery.style( tween.elem, prop, start + unit );
-
-                        // Update scale, tolerating zero or NaN from tween.cur(),
-                        // break the loop if scale is unchanged or perfect, or if we've just had enough
-                    } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-                }
-
-                // Update tween properties
-                if ( parts ) {
-                    start = tween.start = +start || +target || 0;
-                    tween.unit = unit;
-                    // If a +=/-= token was provided, we're doing a relative animation
-                    tween.end = parts[ 1 ] ?
-                    start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-                        +parts[ 2 ];
-                }
-
-                return tween;
-            } ]
-        };
-
-// Animations created synchronously will run synchronously
-    function createFxNow() {
-        setTimeout(function() {
-            fxNow = undefined;
-        });
-        return ( fxNow = jQuery.now() );
-    }
-
-// Generate parameters to create a standard animation
-    function genFx( type, includeWidth ) {
-        var which,
-            i = 0,
-            attrs = { height: type };
-
-        // If we include width, step value is 1 to do all cssExpand values,
-        // otherwise step value is 2 to skip over Left and Right
-        includeWidth = includeWidth ? 1 : 0;
-        for ( ; i < 4 ; i += 2 - includeWidth ) {
-            which = cssExpand[ i ];
-            attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-        }
-
-        if ( includeWidth ) {
-            attrs.opacity = attrs.width = type;
-        }
-
-        return attrs;
-    }
-
-    function createTween( value, prop, animation ) {
-        var tween,
-            collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-            index = 0,
-            length = collection.length;
-        for ( ; index < length; index++ ) {
-            if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-                // We're done with this property
-                return tween;
-            }
-        }
-    }
-
-    function defaultPrefilter( elem, props, opts ) {
-        /* jshint validthis: true */
-        var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-            anim = this,
-            orig = {},
-            style = elem.style,
-            hidden = elem.nodeType && isHidden( elem ),
-            dataShow = data_priv.get( elem, "fxshow" );
-
-        // Handle queue: false promises
-        if ( !opts.queue ) {
-            hooks = jQuery._queueHooks( elem, "fx" );
-            if ( hooks.unqueued == null ) {
-                hooks.unqueued = 0;
-                oldfire = hooks.empty.fire;
-                hooks.empty.fire = function() {
-                    if ( !hooks.unqueued ) {
-                        oldfire();
-                    }
-                };
-            }
-            hooks.unqueued++;
-
-            anim.always(function() {
-                // Ensure the complete handler is called before this completes
-                anim.always(function() {
-                    hooks.unqueued--;
-                    if ( !jQuery.queue( elem, "fx" ).length ) {
-                        hooks.empty.fire();
-                    }
-                });
-            });
-        }
-
-        // Height/width overflow pass
-        if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-            // Make sure that nothing sneaks out
-            // Record all 3 overflow attributes because IE9-10 do not
-            // change the overflow attribute when overflowX and
-            // overflowY are set to the same value
-            opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-            // Set display property to inline-block for height/width
-            // animations on inline elements that are having width/height animated
-            display = jQuery.css( elem, "display" );
-
-            // Test default display if display is currently "none"
-            checkDisplay = display === "none" ?
-            data_priv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-            if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-                style.display = "inline-block";
-            }
-        }
-
-        if ( opts.overflow ) {
-            style.overflow = "hidden";
-            anim.always(function() {
-                style.overflow = opts.overflow[ 0 ];
-                style.overflowX = opts.overflow[ 1 ];
-                style.overflowY = opts.overflow[ 2 ];
-            });
-        }
-
-        // show/hide pass
-        for ( prop in props ) {
-            value = props[ prop ];
-            if ( rfxtypes.exec( value ) ) {
-                delete props[ prop ];
-                toggle = toggle || value === "toggle";
-                if ( value === ( hidden ? "hide" : "show" ) ) {
-
-                    // If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
-                    if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-                        hidden = true;
-                    } else {
-                        continue;
-                    }
-                }
-                orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-                // Any non-fx value stops us from restoring the original display value
-            } else {
-                display = undefined;
-            }
-        }
-
-        if ( !jQuery.isEmptyObject( orig ) ) {
-            if ( dataShow ) {
-                if ( "hidden" in dataShow ) {
-                    hidden = dataShow.hidden;
-                }
-            } else {
-                dataShow = data_priv.access( elem, "fxshow", {} );
-            }
-
-            // Store state if its toggle - enables .stop().toggle() to "reverse"
-            if ( toggle ) {
-                dataShow.hidden = !hidden;
-            }
-            if ( hidden ) {
-                jQuery( elem ).show();
-            } else {
-                anim.done(function() {
-                    jQuery( elem ).hide();
-                });
-            }
-            anim.done(function() {
-                var prop;
-
-                data_priv.remove( elem, "fxshow" );
-                for ( prop in orig ) {
-                    jQuery.style( elem, prop, orig[ prop ] );
-                }
-            });
-            for ( prop in orig ) {
-                tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-                if ( !( prop in dataShow ) ) {
-                    dataShow[ prop ] = tween.start;
-                    if ( hidden ) {
-                        tween.end = tween.start;
-                        tween.start = prop === "width" || prop === "height" ? 1 : 0;
-                    }
-                }
-            }
-
-            // If this is a noop like .hide().hide(), restore an overwritten display value
-        } else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
-            style.display = display;
-        }
-    }
-
-    function propFilter( props, specialEasing ) {
-        var index, name, easing, value, hooks;
-
-        // camelCase, specialEasing and expand cssHook pass
-        for ( index in props ) {
-            name = jQuery.camelCase( index );
-            easing = specialEasing[ name ];
-            value = props[ index ];
-            if ( jQuery.isArray( value ) ) {
-                easing = value[ 1 ];
-                value = props[ index ] = value[ 0 ];
-            }
-
-            if ( index !== name ) {
-                props[ name ] = value;
-                delete props[ index ];
-            }
-
-            hooks = jQuery.cssHooks[ name ];
-            if ( hooks && "expand" in hooks ) {
-                value = hooks.expand( value );
-                delete props[ name ];
-
-                // Not quite $.extend, this won't overwrite existing keys.
-                // Reusing 'index' because we have the correct "name"
-                for ( index in value ) {
-                    if ( !( index in props ) ) {
-                        props[ index ] = value[ index ];
-                        specialEasing[ index ] = easing;
-                    }
-                }
-            } else {
-                specialEasing[ name ] = easing;
-            }
-        }
-    }
-
-    function Animation( elem, properties, options ) {
-        var result,
-            stopped,
-            index = 0,
-            length = animationPrefilters.length,
-            deferred = jQuery.Deferred().always( function() {
-                // Don't match elem in the :animated selector
-                delete tick.elem;
-            }),
-            tick = function() {
-                if ( stopped ) {
-                    return false;
-                }
-                var currentTime = fxNow || createFxNow(),
-                    remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-                // Support: Android 2.3
-                // Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-                    temp = remaining / animation.duration || 0,
-                    percent = 1 - temp,
-                    index = 0,
-                    length = animation.tweens.length;
-
-                for ( ; index < length ; index++ ) {
-                    animation.tweens[ index ].run( percent );
-                }
-
-                deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-                if ( percent < 1 && length ) {
-                    return remaining;
-                } else {
-                    deferred.resolveWith( elem, [ animation ] );
-                    return false;
-                }
-            },
-            animation = deferred.promise({
-                elem: elem,
-                props: jQuery.extend( {}, properties ),
-                opts: jQuery.extend( true, { specialEasing: {} }, options ),
-                originalProperties: properties,
-                originalOptions: options,
-                startTime: fxNow || createFxNow(),
-                duration: options.duration,
-                tweens: [],
-                createTween: function( prop, end ) {
-                    var tween = jQuery.Tween( elem, animation.opts, prop, end,
-                        animation.opts.specialEasing[ prop ] || animation.opts.easing );
-                    animation.tweens.push( tween );
-                    return tween;
-                },
-                stop: function( gotoEnd ) {
-                    var index = 0,
-                    // If we are going to the end, we want to run all the tweens
-                    // otherwise we skip this part
-                        length = gotoEnd ? animation.tweens.length : 0;
-                    if ( stopped ) {
-                        return this;
-                    }
-                    stopped = true;
-                    for ( ; index < length ; index++ ) {
-                        animation.tweens[ index ].run( 1 );
-                    }
-
-                    // Resolve when we played the last frame; otherwise, reject
-                    if ( gotoEnd ) {
-                        deferred.resolveWith( elem, [ animation, gotoEnd ] );
-                    } else {
-                        deferred.rejectWith( elem, [ animation, gotoEnd ] );
-                    }
-                    return this;
-                }
-            }),
-            props = animation.props;
-
-        propFilter( props, animation.opts.specialEasing );
-
-        for ( ; index < length ; index++ ) {
-            result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-            if ( result ) {
-                return result;
-            }
-        }
-
-        jQuery.map( props, createTween, animation );
-
-        if ( jQuery.isFunction( animation.opts.start ) ) {
-            animation.opts.start.call( elem, animation );
-        }
-
-        jQuery.fx.timer(
-            jQuery.extend( tick, {
-                elem: elem,
-                anim: animation,
-                queue: animation.opts.queue
-            })
-        );
-
-        // attach callbacks from options
-        return animation.progress( animation.opts.progress )
-            .done( animation.opts.done, animation.opts.complete )
-            .fail( animation.opts.fail )
-            .always( animation.opts.always );
-    }
-
-    jQuery.Animation = jQuery.extend( Animation, {
-
-        tweener: function( props, callback ) {
-            if ( jQuery.isFunction( props ) ) {
-                callback = props;
-                props = [ "*" ];
-            } else {
-                props = props.split(" ");
-            }
-
-            var prop,
-                index = 0,
-                length = props.length;
-
-            for ( ; index < length ; index++ ) {
-                prop = props[ index ];
-                tweeners[ prop ] = tweeners[ prop ] || [];
-                tweeners[ prop ].unshift( callback );
-            }
-        },
-
-        prefilter: function( callback, prepend ) {
-            if ( prepend ) {
-                animationPrefilters.unshift( callback );
-            } else {
-                animationPrefilters.push( callback );
-            }
-        }
-    });
-
-    jQuery.speed = function( speed, easing, fn ) {
-        var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-            complete: fn || !fn && easing ||
-            jQuery.isFunction( speed ) && speed,
-            duration: speed,
-            easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-        };
-
-        opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-            opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-        // Normalize opt.queue - true/undefined/null -> "fx"
-        if ( opt.queue == null || opt.queue === true ) {
-            opt.queue = "fx";
-        }
-
-        // Queueing
-        opt.old = opt.complete;
-
-        opt.complete = function() {
-            if ( jQuery.isFunction( opt.old ) ) {
-                opt.old.call( this );
-            }
-
-            if ( opt.queue ) {
-                jQuery.dequeue( this, opt.queue );
-            }
-        };
-
-        return opt;
-    };
-
-    jQuery.fn.extend({
-        fadeTo: function( speed, to, easing, callback ) {
-
-            // Show any hidden elements after setting opacity to 0
-            return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-                // Animate to the value specified
-                .end().animate({ opacity: to }, speed, easing, callback );
-        },
-        animate: function( prop, speed, easing, callback ) {
-            var empty = jQuery.isEmptyObject( prop ),
-                optall = jQuery.speed( speed, easing, callback ),
-                doAnimation = function() {
-                    // Operate on a copy of prop so per-property easing won't be lost
-                    var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-                    // Empty animations, or finishing resolves immediately
-                    if ( empty || data_priv.get( this, "finish" ) ) {
-                        anim.stop( true );
-                    }
-                };
-            doAnimation.finish = doAnimation;
-
-            return empty || optall.queue === false ?
-                this.each( doAnimation ) :
-                this.queue( optall.queue, doAnimation );
-        },
-        stop: function( type, clearQueue, gotoEnd ) {
-            var stopQueue = function( hooks ) {
-                var stop = hooks.stop;
-                delete hooks.stop;
-                stop( gotoEnd );
-            };
-
-            if ( typeof type !== "string" ) {
-                gotoEnd = clearQueue;
-                clearQueue = type;
-                type = undefined;
-            }
-            if ( clearQueue && type !== false ) {
-                this.queue( type || "fx", [] );
-            }
-
-            return this.each(function() {
-                var dequeue = true,
-                    index = type != null && type + "queueHooks",
-                    timers = jQuery.timers,
-                    data = data_priv.get( this );
-
-                if ( index ) {
-                    if ( data[ index ] && data[ index ].stop ) {
-                        stopQueue( data[ index ] );
-                    }
-                } else {
-                    for ( index in data ) {
-                        if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-                            stopQueue( data[ index ] );
-                        }
-                    }
-                }
-
-                for ( index = timers.length; index--; ) {
-                    if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-                        timers[ index ].anim.stop( gotoEnd );
-                        dequeue = false;
-                        timers.splice( index, 1 );
-                    }
-                }
-
-                // Start the next in the queue if the last step wasn't forced.
-                // Timers currently will call their complete callbacks, which
-                // will dequeue but only if they were gotoEnd.
-                if ( dequeue || !gotoEnd ) {
-                    jQuery.dequeue( this, type );
-                }
-            });
-        },
-        finish: function( type ) {
-            if ( type !== false ) {
-                type = type || "fx";
-            }
-            return this.each(function() {
-                var index,
-                    data = data_priv.get( this ),
-                    queue = data[ type + "queue" ],
-                    hooks = data[ type + "queueHooks" ],
-                    timers = jQuery.timers,
-                    length = queue ? queue.length : 0;
-
-                // Enable finishing flag on private data
-                data.finish = true;
-
-                // Empty the queue first
-                jQuery.queue( this, type, [] );
-
-                if ( hooks && hooks.stop ) {
-                    hooks.stop.call( this, true );
-                }
-
-                // Look for any active animations, and finish them
-                for ( index = timers.length; index--; ) {
-                    if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-                        timers[ index ].anim.stop( true );
-                        timers.splice( index, 1 );
-                    }
-                }
-
-                // Look for any animations in the old queue and finish them
-                for ( index = 0; index < length; index++ ) {
-                    if ( queue[ index ] && queue[ index ].finish ) {
-                        queue[ index ].finish.call( this );
-                    }
-                }
-
-                // Turn off finishing flag
-                delete data.finish;
-            });
-        }
-    });
-
-    jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-        var cssFn = jQuery.fn[ name ];
-        jQuery.fn[ name ] = function( speed, easing, callback ) {
-            return speed == null || typeof speed === "boolean" ?
-                cssFn.apply( this, arguments ) :
-                this.animate( genFx( name, true ), speed, easing, callback );
-        };
-    });
-
-// Generate shortcuts for custom animations
-    jQuery.each({
-        slideDown: genFx("show"),
-        slideUp: genFx("hide"),
-        slideToggle: genFx("toggle"),
-        fadeIn: { opacity: "show" },
-        fadeOut: { opacity: "hide" },
-        fadeToggle: { opacity: "toggle" }
-    }, function( name, props ) {
-        jQuery.fn[ name ] = function( speed, easing, callback ) {
-            return this.animate( props, speed, easing, callback );
-        };
-    });
-
-    jQuery.timers = [];
-    jQuery.fx.tick = function() {
-        var timer,
-            i = 0,
-            timers = jQuery.timers;
-
-        fxNow = jQuery.now();
-
-        for ( ; i < timers.length; i++ ) {
-            timer = timers[ i ];
-            // Checks the timer has not already been removed
-            if ( !timer() && timers[ i ] === timer ) {
-                timers.splice( i--, 1 );
-            }
-        }
-
-        if ( !timers.length ) {
-            jQuery.fx.stop();
-        }
-        fxNow = undefined;
-    };
-
-    jQuery.fx.timer = function( timer ) {
-        jQuery.timers.push( timer );
-        if ( timer() ) {
-            jQuery.fx.start();
-        } else {
-            jQuery.timers.pop();
-        }
-    };
-
-    jQuery.fx.interval = 13;
-
-    jQuery.fx.start = function() {
-        if ( !timerId ) {
-            timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-        }
-    };
-
-    jQuery.fx.stop = function() {
-        clearInterval( timerId );
-        timerId = null;
-    };
-
-    jQuery.fx.speeds = {
-        slow: 600,
-        fast: 200,
-        // Default speed
-        _default: 400
-    };
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://blindsignals.com/index.php/2009/07/jquery-delay/
-    jQuery.fn.delay = function( time, type ) {
-        time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-        type = type || "fx";
-
-        return this.queue( type, function( next, hooks ) {
-            var timeout = setTimeout( next, time );
-            hooks.stop = function() {
-                clearTimeout( timeout );
-            };
-        });
-    };
-
-
-    (function() {
-        var input = document.createElement( "input" ),
-            select = document.createElement( "select" ),
-            opt = select.appendChild( document.createElement( "option" ) );
-
-        input.type = "checkbox";
-
-        // Support: iOS<=5.1, Android<=4.2+
-        // Default value for a checkbox should be "on"
-        support.checkOn = input.value !== "";
-
-        // Support: IE<=11+
-        // Must access selectedIndex to make default options select
-        support.optSelected = opt.selected;
-
-        // Support: Android<=2.3
-        // Options inside disabled selects are incorrectly marked as disabled
-        select.disabled = true;
-        support.optDisabled = !opt.disabled;
-
-        // Support: IE<=11+
-        // An input loses its value after becoming a radio
-        input = document.createElement( "input" );
-        input.value = "t";
-        input.type = "radio";
-        support.radioValue = input.value === "t";
-    })();
-
-
-    var nodeHook, boolHook,
-        attrHandle = jQuery.expr.attrHandle;
-
-    jQuery.fn.extend({
-        attr: function( name, value ) {
-            return access( this, jQuery.attr, name, value, arguments.length > 1 );
-        },
-
-        removeAttr: function( name ) {
-            return this.each(function() {
-                jQuery.removeAttr( this, name );
-            });
-        }
-    });
-
-    jQuery.extend({
-        attr: function( elem, name, value ) {
-            var hooks, ret,
-                nType = elem.nodeType;
-
-            // don't get/set attributes on text, comment and attribute nodes
-            if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-                return;
-            }
-
-            // Fallback to prop when attributes are not supported
-            if ( typeof elem.getAttribute === strundefined ) {
-                return jQuery.prop( elem, name, value );
-            }
-
-            // All attributes are lowercase
-            // Grab necessary hook if one is defined
-            if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-                name = name.toLowerCase();
-                hooks = jQuery.attrHooks[ name ] ||
-                ( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-            }
-
-            if ( value !== undefined ) {
-
-                if ( value === null ) {
-                    jQuery.removeAttr( elem, name );
-
-                } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-                    return ret;
-
-                } else {
-                    elem.setAttribute( name, value + "" );
-                    return value;
-                }
-
-            } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-                return ret;
-
-            } else {
-                ret = jQuery.find.attr( elem, name );
-
-                // Non-existent attributes return null, we normalize to undefined
-                return ret == null ?
-                    undefined :
-                    ret;
-            }
-        },
-
-        removeAttr: function( elem, value ) {
-            var name, propName,
-                i = 0,
-                attrNames = value && value.match( rnotwhite );
-
-            if ( attrNames && elem.nodeType === 1 ) {
-                while ( (name = attrNames[i++]) ) {
-                    propName = jQuery.propFix[ name ] || name;
-
-                    // Boolean attributes get special treatment (#10870)
-                    if ( jQuery.expr.match.bool.test( name ) ) {
-                        // Set corresponding property to false
-                        elem[ propName ] = false;
-                    }
-
-                    elem.removeAttribute( name );
-                }
-            }
-        },
-
-        attrHooks: {
-            type: {
-                set: function( elem, value ) {
-                    if ( !support.radioValue && value === "radio" &&
-                        jQuery.nodeName( elem, "input" ) ) {
-                        var val = elem.value;
-                        elem.setAttribute( "type", value );
-                        if ( val ) {
-                            elem.value = val;
-                        }
-                        return value;
-                    }
-                }
-            }
-        }
-    });
-
-// Hooks for boolean attributes
-    boolHook = {
-        set: function( elem, value, name ) {
-            if ( value === false ) {
-                // Remove boolean attributes when set to false
-                jQuery.removeAttr( elem, name );
-            } else {
-                elem.setAttribute( name, name );
-            }
-            return name;
-        }
-    };
-    jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-        var getter = attrHandle[ name ] || jQuery.find.attr;
-
-        attrHandle[ name ] = function( elem, name, isXML ) {
-            var ret, handle;
-            if ( !isXML ) {
-                // Avoid an infinite loop by temporarily removing this function from the getter
-                handle = attrHandle[ name ];
-                attrHandle[ name ] = ret;
-                ret = getter( elem, name, isXML ) != null ?
-                    name.toLowerCase() :
-                    null;
-                attrHandle[ name ] = handle;
-            }
-            return ret;
-        };
-    });
-
-
-
-
-    var rfocusable = /^(?:input|select|textarea|button)$/i;
-
-    jQuery.fn.extend({
-        prop: function( name, value ) {
-            return access( this, jQuery.prop, name, value, arguments.length > 1 );
-        },
-
-        removeProp: function( name ) {
-            return this.each(function() {
-                delete this[ jQuery.propFix[ name ] || name ];
-            });
-        }
-    });
-
-    jQuery.extend({
-        propFix: {
-            "for": "htmlFor",
-            "class": "className"
-        },
-
-        prop: function( elem, name, value ) {
-            var ret, hooks, notxml,
-                nType = elem.nodeType;
-
-            // Don't get/set properties on text, comment and attribute nodes
-            if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-                return;
-            }
-
-            notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-            if ( notxml ) {
-                // Fix name and attach hooks
-                name = jQuery.propFix[ name ] || name;
-                hooks = jQuery.propHooks[ name ];
-            }
-
-            if ( value !== undefined ) {
-                return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-                    ret :
-                    ( elem[ name ] = value );
-
-            } else {
-                return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-                    ret :
-                    elem[ name ];
-            }
-        },
-
-        propHooks: {
-            tabIndex: {
-                get: function( elem ) {
-                    return elem.hasAttribute( "tabindex" ) || rfocusable.test( elem.nodeName ) || elem.href ?
-                        elem.tabIndex :
-                        -1;
-                }
-            }
-        }
-    });
-
-    if ( !support.optSelected ) {
-        jQuery.propHooks.selected = {
-            get: function( elem ) {
-                var parent = elem.parentNode;
-                if ( parent && parent.parentNode ) {
-                    parent.parentNode.selectedIndex;
-                }
-                return null;
-            }
-        };
-    }
-
-    jQuery.each([
-        "tabIndex",
-        "readOnly",
-        "maxLength",
-        "cellSpacing",
-        "cellPadding",
-        "rowSpan",
-        "colSpan",
-        "useMap",
-        "frameBorder",
-        "contentEditable"
-    ], function() {
-        jQuery.propFix[ this.toLowerCase() ] = this;
-    });
-
-
-
-
-    var rclass = /[\t\r\n\f]/g;
-
-    jQuery.fn.extend({
-        addClass: function( value ) {
-            var classes, elem, cur, clazz, j, finalValue,
-                proceed = typeof value === "string" && value,
-                i = 0,
-                len = this.length;
-
-            if ( jQuery.isFunction( value ) ) {
-                return this.each(function( j ) {
-                    jQuery( this ).addClass( value.call( this, j, this.className ) );
-                });
-            }
-
-            if ( proceed ) {
-                // The disjunction here is for better compressibility (see removeClass)
-                classes = ( value || "" ).match( rnotwhite ) || [];
-
-                for ( ; i < len; i++ ) {
-                    elem = this[ i ];
-                    cur = elem.nodeType === 1 && ( elem.className ?
-                        ( " " + elem.className + " " ).replace( rclass, " " ) :
-                        " "
-                    );
-
-                    if ( cur ) {
-                        j = 0;
-                        while ( (clazz = classes[j++]) ) {
-                            if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-                                cur += clazz + " ";
-                            }
-                        }
-
-                        // only assign if different to avoid unneeded rendering.
-                        finalValue = jQuery.trim( cur );
-                        if ( elem.className !== finalValue ) {
-                            elem.className = finalValue;
-                        }
-                    }
-                }
-            }
-
-            return this;
-        },
-
-        removeClass: function( value ) {
-            var classes, elem, cur, clazz, j, finalValue,
-                proceed = arguments.length === 0 || typeof value === "string" && value,
-                i = 0,
-                len = this.length;
-
-            if ( jQuery.isFunction( value ) ) {
-                return this.each(function( j ) {
-                    jQuery( this ).removeClass( value.call( this, j, this.className ) );
-                });
-            }
-            if ( proceed ) {
-                classes = ( value || "" ).match( rnotwhite ) || [];
-
-                for ( ; i < len; i++ ) {
-                    elem = this[ i ];
-                    // This expression is here for better compressibility (see addClass)
-                    cur = elem.nodeType === 1 && ( elem.className ?
-                        ( " " + elem.className + " " ).replace( rclass, " " ) :
-                        ""
-                    );
-
-                    if ( cur ) {
-                        j = 0;
-                        while ( (clazz = classes[j++]) ) {
-                            // Remove *all* instances
-                            while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-                                cur = cur.replace( " " + clazz + " ", " " );
-                            }
-                        }
-
-                        // Only assign if different to avoid unneeded rendering.
-                        finalValue = value ? jQuery.trim( cur ) : "";
-                        if ( elem.className !== finalValue ) {
-                            elem.className = finalValue;
-                        }
-                    }
-                }
-            }
-
-            return this;
-        },
-
-        toggleClass: function( value, stateVal ) {
-            var type = typeof value;
-
-            if ( typeof stateVal === "boolean" && type === "string" ) {
-                return stateVal ? this.addClass( value ) : this.removeClass( value );
-            }
-
-            if ( jQuery.isFunction( value ) ) {
-                return this.each(function( i ) {
-                    jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-                });
-            }
-
-            return this.each(function() {
-                if ( type === "string" ) {
-                    // Toggle individual class names
-                    var className,
-                        i = 0,
-                        self = jQuery( this ),
-                        classNames = value.match( rnotwhite ) || [];
-
-                    while ( (className = classNames[ i++ ]) ) {
-                        // Check each className given, space separated list
-                        if ( self.hasClass( className ) ) {
-                            self.removeClass( className );
-                        } else {
-                            self.addClass( className );
-                        }
-                    }
-
-                    // Toggle whole class name
-                } else if ( type === strundefined || type === "boolean" ) {
-                    if ( this.className ) {
-                        // store className if set
-                        data_priv.set( this, "__className__", this.className );
-                    }
-
-                    // If the element has a class name or if we're passed `false`,
-                    // then remove the whole classname (if there was one, the above saved it).
-                    // Otherwise bring back whatever was previously saved (if anything),
-                    // falling back to the empty string if nothing was stored.
-                    this.className = this.className || value === false ? "" : data_priv.get( this, "__className__" ) || "";
-                }
-            });
-        },
-
-        hasClass: function( selector ) {
-            var className = " " + selector + " ",
-                i = 0,
-                l = this.length;
-            for ( ; i < l; i++ ) {
-                if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    });
-
-
-
-
-    var rreturn = /\r/g;
-
-    jQuery.fn.extend({
-        val: function( value ) {
-            var hooks, ret, isFunction,
-                elem = this[0];
-
-            if ( !arguments.length ) {
-                if ( elem ) {
-                    hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-                    if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-                        return ret;
-                    }
-
-                    ret = elem.value;
-
-                    return typeof ret === "string" ?
-                        // Handle most common string cases
-                        ret.replace(rreturn, "") :
-                        // Handle cases where value is null/undef or number
-                        ret == null ? "" : ret;
-                }
-
-                return;
-            }
-
-            isFunction = jQuery.isFunction( value );
-
-            return this.each(function( i ) {
-                var val;
-
-                if ( this.nodeType !== 1 ) {
-                    return;
-                }
-
-                if ( isFunction ) {
-                    val = value.call( this, i, jQuery( this ).val() );
-                } else {
-                    val = value;
-                }
-
-                // Treat null/undefined as ""; convert numbers to string
-                if ( val == null ) {
-                    val = "";
-
-                } else if ( typeof val === "number" ) {
-                    val += "";
-
-                } else if ( jQuery.isArray( val ) ) {
-                    val = jQuery.map( val, function( value ) {
-                        return value == null ? "" : value + "";
-                    });
-                }
-
-                hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-                // If set returns undefined, fall back to normal setting
-                if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-                    this.value = val;
-                }
-            });
-        }
-    });
-
-    jQuery.extend({
-        valHooks: {
-            option: {
-                get: function( elem ) {
-                    var val = jQuery.find.attr( elem, "value" );
-                    return val != null ?
-                        val :
-                        // Support: IE10-11+
-                        // option.text throws exceptions (#14686, #14858)
-                        jQuery.trim( jQuery.text( elem ) );
-                }
-            },
-            select: {
-                get: function( elem ) {
-                    var value, option,
-                        options = elem.options,
-                        index = elem.selectedIndex,
-                        one = elem.type === "select-one" || index < 0,
-                        values = one ? null : [],
-                        max = one ? index + 1 : options.length,
-                        i = index < 0 ?
-                            max :
-                            one ? index : 0;
-
-                    // Loop through all the selected options
-                    for ( ; i < max; i++ ) {
-                        option = options[ i ];
-
-                        // IE6-9 doesn't update selected after form reset (#2551)
-                        if ( ( option.selected || i === index ) &&
-                                // Don't return options that are disabled or in a disabled optgroup
-                            ( support.optDisabled ? !option.disabled : option.getAttribute( "disabled" ) === null ) &&
-                            ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-                            // Get the specific value for the option
-                            value = jQuery( option ).val();
-
-                            // We don't need an array for one selects
-                            if ( one ) {
-                                return value;
-                            }
-
-                            // Multi-Selects return an array
-                            values.push( value );
-                        }
-                    }
-
-                    return values;
-                },
-
-                set: function( elem, value ) {
-                    var optionSet, option,
-                        options = elem.options,
-                        values = jQuery.makeArray( value ),
-                        i = options.length;
-
-                    while ( i-- ) {
-                        option = options[ i ];
-                        if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
-                            optionSet = true;
-                        }
-                    }
-
-                    // Force browsers to behave consistently when non-matching value is set
-                    if ( !optionSet ) {
-                        elem.selectedIndex = -1;
-                    }
-                    return values;
-                }
-            }
-        }
-    });
-
-// Radios and checkboxes getter/setter
-    jQuery.each([ "radio", "checkbox" ], function() {
-        jQuery.valHooks[ this ] = {
-            set: function( elem, value ) {
-                if ( jQuery.isArray( value ) ) {
-                    return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-                }
-            }
-        };
-        if ( !support.checkOn ) {
-            jQuery.valHooks[ this ].get = function( elem ) {
-                return elem.getAttribute("value") === null ? "on" : elem.value;
-            };
-        }
-    });
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-    jQuery.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( i, name ) {
-
-        // Handle event binding
-        jQuery.fn[ name ] = function( data, fn ) {
-            return arguments.length > 0 ?
-                this.on( name, null, data, fn ) :
-                this.trigger( name );
-        };
-    });
-
-    jQuery.fn.extend({
-        hover: function( fnOver, fnOut ) {
-            return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-        },
-
-        bind: function( types, data, fn ) {
-            return this.on( types, null, data, fn );
-        },
-        unbind: function( types, fn ) {
-            return this.off( types, null, fn );
-        },
-
-        delegate: function( selector, types, data, fn ) {
-            return this.on( types, selector, data, fn );
-        },
-        undelegate: function( selector, types, fn ) {
-            // ( namespace ) or ( selector, types [, fn] )
-            return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-        }
-    });
-
-
-    var nonce = jQuery.now();
-
-    var rquery = (/\?/);
-
-
-
-// Support: Android 2.3
-// Workaround failure to string-cast null input
-    jQuery.parseJSON = function( data ) {
-        return JSON.parse( data + "" );
-    };
-
-
-// Cross-browser xml parsing
-    jQuery.parseXML = function( data ) {
-        var xml, tmp;
-        if ( !data || typeof data !== "string" ) {
-            return null;
-        }
-
-        // Support: IE9
-        try {
-            tmp = new DOMParser();
-            xml = tmp.parseFromString( data, "text/xml" );
-        } catch ( e ) {
-            xml = undefined;
-        }
-
-        if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-            jQuery.error( "Invalid XML: " + data );
-        }
-        return xml;
-    };
-
-
-    var
-        rhash = /#.*$/,
-        rts = /([?&])_=[^&]*/,
-        rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-    // #7653, #8125, #8152: local protocol detection
-        rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-        rnoContent = /^(?:GET|HEAD)$/,
-        rprotocol = /^\/\//,
-        rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
-
-    /* Prefilters
-     * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-     * 2) These are called:
-     *    - BEFORE asking for a transport
-     *    - AFTER param serialization (s.data is a string if s.processData is true)
-     * 3) key is the dataType
-     * 4) the catchall symbol "*" can be used
-     * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-     */
-        prefilters = {},
-
-    /* Transports bindings
-     * 1) key is the dataType
-     * 2) the catchall symbol "*" can be used
-     * 3) selection will start with transport dataType and THEN go to "*" if needed
-     */
-        transports = {},
-
-    // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-        allTypes = "*/".concat( "*" ),
-
-    // Document location
-        ajaxLocation = window.location.href,
-
-    // Segment location into parts
-        ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-    function addToPrefiltersOrTransports( structure ) {
-
-        // dataTypeExpression is optional and defaults to "*"
-        return function( dataTypeExpression, func ) {
-
-            if ( typeof dataTypeExpression !== "string" ) {
-                func = dataTypeExpression;
-                dataTypeExpression = "*";
-            }
-
-            var dataType,
-                i = 0,
-                dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-            if ( jQuery.isFunction( func ) ) {
-                // For each dataType in the dataTypeExpression
-                while ( (dataType = dataTypes[i++]) ) {
-                    // Prepend if requested
-                    if ( dataType[0] === "+" ) {
-                        dataType = dataType.slice( 1 ) || "*";
-                        (structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-                        // Otherwise append
-                    } else {
-                        (structure[ dataType ] = structure[ dataType ] || []).push( func );
-                    }
-                }
-            }
-        };
-    }
-
-// Base inspection function for prefilters and transports
-    function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-        var inspected = {},
-            seekingTransport = ( structure === transports );
-
-        function inspect( dataType ) {
-            var selected;
-            inspected[ dataType ] = true;
-            jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-                var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-                if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-                    options.dataTypes.unshift( dataTypeOrTransport );
-                    inspect( dataTypeOrTransport );
-                    return false;
-                } else if ( seekingTransport ) {
-                    return !( selected = dataTypeOrTransport );
-                }
-            });
-            return selected;
-        }
-
-        return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-    }
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-    function ajaxExtend( target, src ) {
-        var key, deep,
-            flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-        for ( key in src ) {
-            if ( src[ key ] !== undefined ) {
-                ( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-            }
-        }
-        if ( deep ) {
-            jQuery.extend( true, target, deep );
-        }
-
-        return target;
-    }
-
-    /* Handles responses to an ajax request:
-     * - finds the right dataType (mediates between content-type and expected dataType)
-     * - returns the corresponding response
-     */
-    function ajaxHandleResponses( s, jqXHR, responses ) {
-
-        var ct, type, finalDataType, firstDataType,
-            contents = s.contents,
-            dataTypes = s.dataTypes;
-
-        // Remove auto dataType and get content-type in the process
-        while ( dataTypes[ 0 ] === "*" ) {
-            dataTypes.shift();
-            if ( ct === undefined ) {
-                ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-            }
-        }
-
-        // Check if we're dealing with a known content-type
-        if ( ct ) {
-            for ( type in contents ) {
-                if ( contents[ type ] && contents[ type ].test( ct ) ) {
-                    dataTypes.unshift( type );
-                    break;
-                }
-            }
-        }
-
-        // Check to see if we have a response for the expected dataType
-        if ( dataTypes[ 0 ] in responses ) {
-            finalDataType = dataTypes[ 0 ];
-        } else {
-            // Try convertible dataTypes
-            for ( type in responses ) {
-                if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-                    finalDataType = type;
-                    break;
-                }
-                if ( !firstDataType ) {
-                    firstDataType = type;
-                }
-            }
-            // Or just use first one
-            finalDataType = finalDataType || firstDataType;
-        }
-
-        // If we found a dataType
-        // We add the dataType to the list if needed
-        // and return the corresponding response
-        if ( finalDataType ) {
-            if ( finalDataType !== dataTypes[ 0 ] ) {
-                dataTypes.unshift( finalDataType );
-            }
-            return responses[ finalDataType ];
-        }
-    }
-
-    /* Chain conversions given the request and the original response
-     * Also sets the responseXXX fields on the jqXHR instance
-     */
-    function ajaxConvert( s, response, jqXHR, isSuccess ) {
-        var conv2, current, conv, tmp, prev,
-            converters = {},
-        // Work with a copy of dataTypes in case we need to modify it for conversion
-            dataTypes = s.dataTypes.slice();
-
-        // Create converters map with lowercased keys
-        if ( dataTypes[ 1 ] ) {
-            for ( conv in s.converters ) {
-                converters[ conv.toLowerCase() ] = s.converters[ conv ];
-            }
-        }
-
-        current = dataTypes.shift();
-
-        // Convert to each sequential dataType
-        while ( current ) {
-
-            if ( s.responseFields[ current ] ) {
-                jqXHR[ s.responseFields[ current ] ] = response;
-            }
-
-            // Apply the dataFilter if provided
-            if ( !prev && isSuccess && s.dataFilter ) {
-                response = s.dataFilter( response, s.dataType );
-            }
-
-            prev = current;
-            current = dataTypes.shift();
-
-            if ( current ) {
-
-                // There's only work to do if current dataType is non-auto
-                if ( current === "*" ) {
-
-                    current = prev;
-
-                    // Convert response if prev dataType is non-auto and differs from current
-                } else if ( prev !== "*" && prev !== current ) {
-
-                    // Seek a direct converter
-                    conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-                    // If none found, seek a pair
-                    if ( !conv ) {
-                        for ( conv2 in converters ) {
-
-                            // If conv2 outputs current
-                            tmp = conv2.split( " " );
-                            if ( tmp[ 1 ] === current ) {
-
-                                // If prev can be converted to accepted input
-                                conv = converters[ prev + " " + tmp[ 0 ] ] ||
-                                converters[ "* " + tmp[ 0 ] ];
-                                if ( conv ) {
-                                    // Condense equivalence converters
-                                    if ( conv === true ) {
-                                        conv = converters[ conv2 ];
-
-                                        // Otherwise, insert the intermediate dataType
-                                    } else if ( converters[ conv2 ] !== true ) {
-                                        current = tmp[ 0 ];
-                                        dataTypes.unshift( tmp[ 1 ] );
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    // Apply converter (if not an equivalence)
-                    if ( conv !== true ) {
-
-                        // Unless errors are allowed to bubble, catch and return them
-                        if ( conv && s[ "throws" ] ) {
-                            response = conv( response );
-                        } else {
-                            try {
-                                response = conv( response );
-                            } catch ( e ) {
-                                return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return { state: "success", data: response };
-    }
-
-    jQuery.extend({
-
-        // Counter for holding the number of active queries
-        active: 0,
-
-        // Last-Modified header cache for next request
-        lastModified: {},
-        etag: {},
-
-        ajaxSettings: {
-            url: ajaxLocation,
-            type: "GET",
-            isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-            global: true,
-            processData: true,
-            async: true,
-            contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-            /*
-             timeout: 0,
-             data: null,
-             dataType: null,
-             username: null,
-             password: null,
-             cache: null,
-             throws: false,
-             traditional: false,
-             headers: {},
-             */
-
-            accepts: {
-                "*": allTypes,
-                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"
-            },
-
-            // Data converters
-            // Keys separate source (or catchall "*") and destination types with a single space
-            converters: {
-
-                // Convert anything to text
-                "* text": String,
-
-                // Text to html (true = no transformation)
-                "text html": true,
-
-                // Evaluate text as a json expression
-                "text json": jQuery.parseJSON,
-
-                // Parse text as xml
-                "text xml": jQuery.parseXML
-            },
-
-            // For options that shouldn't be deep extended:
-            // you can add your own custom options here if
-            // and when you create one that shouldn't be
-            // deep extended (see ajaxExtend)
-            flatOptions: {
-                url: true,
-                context: true
-            }
-        },
-
-        // Creates a full fledged settings object into target
-        // with both ajaxSettings and settings fields.
-        // If target is omitted, writes into ajaxSettings.
-        ajaxSetup: function( target, settings ) {
-            return settings ?
-
-                // Building a settings object
-                ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-                // Extending ajaxSettings
-                ajaxExtend( jQuery.ajaxSettings, target );
-        },
-
-        ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-        ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-        // Main method
-        ajax: function( url, options ) {
-
-            // If url is an object, simulate pre-1.5 signature
-            if ( typeof url === "object" ) {
-                options = url;
-                url = undefined;
-            }
-
-            // Force options to be an object
-            options = options || {};
-
-            var transport,
-            // URL without anti-cache param
-                cacheURL,
-            // Response headers
-                responseHeadersString,
-                responseHeaders,
-            // timeout handle
-                timeoutTimer,
-            // Cross-domain detection vars
-                parts,
-            // To know if global events are to be dispatched
-                fireGlobals,
-            // Loop variable
-                i,
-            // Create the final options object
-                s = jQuery.ajaxSetup( {}, options ),
-            // Callbacks context
-                callbackContext = s.context || s,
-            // Context for global events is callbackContext if it is a DOM node or jQuery collection
-                globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-                    jQuery( callbackContext ) :
-                    jQuery.event,
-            // Deferreds
-                deferred = jQuery.Deferred(),
-                completeDeferred = jQuery.Callbacks("once memory"),
-            // Status-dependent callbacks
-                statusCode = s.statusCode || {},
-            // Headers (they are sent all at once)
-                requestHeaders = {},
-                requestHeadersNames = {},
-            // The jqXHR state
-                state = 0,
-            // Default abort message
-                strAbort = "canceled",
-            // Fake xhr
-                jqXHR = {
-                    readyState: 0,
-
-                    // Builds headers hashtable if needed
-                    getResponseHeader: function( key ) {
-                        var match;
-                        if ( state === 2 ) {
-                            if ( !responseHeaders ) {
-                                responseHeaders = {};
-                                while ( (match = rheaders.exec( responseHeadersString )) ) {
-                                    responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-                                }
-                            }
-                            match = responseHeaders[ key.toLowerCase() ];
-                        }
-                        return match == null ? null : match;
-                    },
-
-                    // Raw string
-                    getAllResponseHeaders: function() {
-                        return state === 2 ? responseHeadersString : null;
-                    },
-
-                    // Caches the header
-                    setRequestHeader: function( name, value ) {
-                        var lname = name.toLowerCase();
-                        if ( !state ) {
-                            name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-                            requestHeaders[ name ] = value;
-                        }
-                        return this;
-                    },
-
-                    // Overrides response content-type header
-                    overrideMimeType: function( type ) {
-                        if ( !state ) {
-                            s.mimeType = type;
-                        }
-                        return this;
-                    },
-
-                    // Status-dependent callbacks
-                    statusCode: function( map ) {
-                        var code;
-                        if ( map ) {
-                            if ( state < 2 ) {
-                                for ( code in map ) {
-                                    // Lazy-add the new callback in a way that preserves old ones
-                                    statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-                                }
-                            } else {
-                                // Execute the appropriate callbacks
-                                jqXHR.always( map[ jqXHR.status ] );
-                            }
-                        }
-                        return this;
-                    },
-
-                    // Cancel the request
-                    abort: function( statusText ) {
-                        var finalText = statusText || strAbort;
-                        if ( transport ) {
-                            transport.abort( finalText );
-                        }
-                        done( 0, finalText );
-                        return this;
-                    }
-                };
-
-            // Attach deferreds
-            deferred.promise( jqXHR ).complete = completeDeferred.add;
-            jqXHR.success = jqXHR.done;
-            jqXHR.error = jqXHR.fail;
-
-            // Remove hash character (#7531: and string promotion)
-            // Add protocol if not provided (prefilters might expect it)
-            // Handle falsy url in the settings object (#10093: consistency with old signature)
-            // We also use the url parameter if available
-            s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
-                .replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-            // Alias method option to type as per ticket #12004
-            s.type = options.method || options.type || s.method || s.type;
-
-            // Extract dataTypes list
-            s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-            // A cross-domain request is in order when we have a protocol:host:port mismatch
-            if ( s.crossDomain == null ) {
-                parts = rurl.exec( s.url.toLowerCase() );
-                s.crossDomain = !!( parts &&
-                ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-                ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-                ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-                );
-            }
-
-            // Convert data if not already a string
-            if ( s.data && s.processData && typeof s.data !== "string" ) {
-                s.data = jQuery.param( s.data, s.traditional );
-            }
-
-            // Apply prefilters
-            inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-            // If request was aborted inside a prefilter, stop there
-            if ( state === 2 ) {
-                return jqXHR;
-            }
-
-            // We can fire global events as of now if asked to
-            // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-            fireGlobals = jQuery.event && s.global;
-
-            // Watch for a new set of requests
-            if ( fireGlobals && jQuery.active++ === 0 ) {
-                jQuery.event.trigger("ajaxStart");
-            }
-
-            // Uppercase the type
-            s.type = s.type.toUpperCase();
-
-            // Determine if request has content
-            s.hasContent = !rnoContent.test( s.type );
-
-            // Save the URL in case we're toying with the If-Modified-Since
-            // and/or If-None-Match header later on
-            cacheURL = s.url;
-
-            // More options handling for requests with no content
-            if ( !s.hasContent ) {
-
-                // If data is available, append data to url
-                if ( s.data ) {
-                    cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-                    // #9682: remove data so that it's not used in an eventual retry
-                    delete s.data;
-                }
-
-                // Add anti-cache in url if needed
-                if ( s.cache === false ) {
-                    s.url = rts.test( cacheURL ) ?
-
-                        // If there is already a '_' parameter, set its value
-                        cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-                        // Otherwise add one to the end
-                    cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-                }
-            }
-
-            // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-            if ( s.ifModified ) {
-                if ( jQuery.lastModified[ cacheURL ] ) {
-                    jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-                }
-                if ( jQuery.etag[ cacheURL ] ) {
-                    jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-                }
-            }
-
-            // Set the correct header, if data is being sent
-            if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-                jqXHR.setRequestHeader( "Content-Type", s.contentType );
-            }
-
-            // Set the Accepts header for the server, depending on the dataType
-            jqXHR.setRequestHeader(
-                "Accept",
-                s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-                s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-                    s.accepts[ "*" ]
-            );
-
-            // Check for headers option
-            for ( i in s.headers ) {
-                jqXHR.setRequestHeader( i, s.headers[ i ] );
-            }
-
-            // Allow custom headers/mimetypes and early abort
-            if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-                // Abort if not done already and return
-                return jqXHR.abort();
-            }
-
-            // Aborting is no longer a cancellation
-            strAbort = "abort";
-
-            // Install callbacks on deferreds
-            for ( i in { success: 1, error: 1, complete: 1 } ) {
-                jqXHR[ i ]( s[ i ] );
-            }
-
-            // Get transport
-            transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-            // If no transport, we auto-abort
-            if ( !transport ) {
-                done( -1, "No Transport" );
-            } else {
-                jqXHR.readyState = 1;
-
-                // Send global event
-                if ( fireGlobals ) {
-                    globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-                }
-                // Timeout
-                if ( s.async && s.timeout > 0 ) {
-                    timeoutTimer = setTimeout(function() {
-                        jqXHR.abort("timeout");
-                    }, s.timeout );
-                }
-
-                try {
-                    state = 1;
-                    transport.send( requestHeaders, done );
-                } catch ( e ) {
-                    // Propagate exception as error if not done
-                    if ( state < 2 ) {
-                        done( -1, e );
-                        // Simply rethrow otherwise
-                    } else {
-                        throw e;
-                    }
-                }
-            }
-
-            // Callback for when everything is done
-            function done( status, nativeStatusText, responses, headers ) {
-                var isSuccess, success, error, response, modified,
-                    statusText = nativeStatusText;
-
-                // Called once
-                if ( state === 2 ) {
-                    return;
-                }
-
-                // State is "done" now
-                state = 2;
-
-                // Clear timeout if it exists
-                if ( timeoutTimer ) {
-                    clearTimeout( timeoutTimer );
-                }
-
-                // Dereference transport for early garbage collection
-                // (no matter how long the jqXHR object will be used)
-                transport = undefined;
-
-                // Cache response headers
-                responseHeadersString = headers || "";
-
-                // Set readyState
-                jqXHR.readyState = status > 0 ? 4 : 0;
-
-                // Determine if successful
-                isSuccess = status >= 200 && status < 300 || status === 304;
-
-                // Get response data
-                if ( responses ) {
-                    response = ajaxHandleResponses( s, jqXHR, responses );
-                }
-
-                // Convert no matter what (that way responseXXX fields are always set)
-                response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-                // If successful, handle type chaining
-                if ( isSuccess ) {
-
-                    // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-                    if ( s.ifModified ) {
-                        modified = jqXHR.getResponseHeader("Last-Modified");
-                        if ( modified ) {
-                            jQuery.lastModified[ cacheURL ] = modified;
-                        }
-                        modified = jqXHR.getResponseHeader("etag");
-                        if ( modified ) {
-                            jQuery.etag[ cacheURL ] = modified;
-                        }
-                    }
-
-                    // if no content
-                    if ( status === 204 || s.type === "HEAD" ) {
-                        statusText = "nocontent";
-
-                        // if not modified
-                    } else if ( status === 304 ) {
-                        statusText = "notmodified";
-
-                        // If we have data, let's convert it
-                    } else {
-                        statusText = response.state;
-                        success = response.data;
-                        error = response.error;
-                        isSuccess = !error;
-                    }
-                } else {
-                    // Extract error from statusText and normalize for non-aborts
-                    error = statusText;
-                    if ( status || !statusText ) {
-                        statusText = "error";
-                        if ( status < 0 ) {
-                            status = 0;
-                        }
-                    }
-                }
-
-                // Set data for the fake xhr object
-                jqXHR.status = status;
-                jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-                // Success/Error
-                if ( isSuccess ) {
-                    deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-                } else {
-                    deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-                }
-
-                // Status-dependent callbacks
-                jqXHR.statusCode( statusCode );
-                statusCode = undefined;
-
-                if ( fireGlobals ) {
-                    globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-                        [ jqXHR, s, isSuccess ? success : error ] );
-                }
-
-                // Complete
-                completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-                if ( fireGlobals ) {
-                    globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-                    // Handle the global AJAX counter
-                    if ( !( --jQuery.active ) ) {
-                        jQuery.event.trigger("ajaxStop");
-                    }
-                }
-            }
-
-            return jqXHR;
-        },
-
-        getJSON: function( url, data, callback ) {
-            return jQuery.get( url, data, callback, "json" );
-        },
-
-        getScript: function( url, callback ) {
-            return jQuery.get( url, undefined, callback, "script" );
-        }
-    });
-
-    jQuery.each( [ "get", "post" ], function( i, method ) {
-        jQuery[ method ] = function( url, data, callback, type ) {
-            // Shift arguments if data argument was omitted
-            if ( jQuery.isFunction( data ) ) {
-                type = type || callback;
-                callback = data;
-                data = undefined;
-            }
-
-            return jQuery.ajax({
-                url: url,
-                type: method,
-                dataType: type,
-                data: data,
-                success: callback
-            });
-        };
-    });
-
-
-    jQuery._evalUrl = function( url ) {
-        return jQuery.ajax({
-            url: url,
-            type: "GET",
-            dataType: "script",
-            async: false,
-            global: false,
-            "throws": true
-        });
-    };
-
-
-    jQuery.fn.extend({
-        wrapAll: function( html ) {
-            var wrap;
-
-            if ( jQuery.isFunction( html ) ) {
-                return this.each(function( i ) {
-                    jQuery( this ).wrapAll( html.call(this, i) );
-                });
-            }
-
-            if ( this[ 0 ] ) {
-
-                // The elements to wrap the target around
-                wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-                if ( this[ 0 ].parentNode ) {
-                    wrap.insertBefore( this[ 0 ] );
-                }
-
-                wrap.map(function() {
-                    var elem = this;
-
-                    while ( elem.firstElementChild ) {
-                        elem = elem.firstElementChild;
-                    }
-
-                    return elem;
-                }).append( this );
-            }
-
-            return this;
-        },
-
-        wrapInner: function( html ) {
-            if ( jQuery.isFunction( html ) ) {
-                return this.each(function( i ) {
-                    jQuery( this ).wrapInner( html.call(this, i) );
-                });
-            }
-
-            return this.each(function() {
-                var self = jQuery( this ),
-                    contents = self.contents();
-
-                if ( contents.length ) {
-                    contents.wrapAll( html );
-
-                } else {
-                    self.append( html );
-                }
-            });
-        },
-
-        wrap: function( html ) {
-            var isFunction = jQuery.isFunction( html );
-
-            return this.each(function( i ) {
-                jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-            });
-        },
-
-        unwrap: function() {
-            return this.parent().each(function() {
-                if ( !jQuery.nodeName( this, "body" ) ) {
-                    jQuery( this ).replaceWith( this.childNodes );
-                }
-            }).end();
-        }
-    });
-
-
-    jQuery.expr.filters.hidden = function( elem ) {
-        // Support: Opera <= 12.12
-        // Opera reports offsetWidths and offsetHeights less than zero on some elements
-        return elem.offsetWidth <= 0 && elem.offsetHeight <= 0;
-    };
-    jQuery.expr.filters.visible = function( elem ) {
-        return !jQuery.expr.filters.hidden( elem );
-    };
-
-
-
-
-    var r20 = /%20/g,
-        rbracket = /\[\]$/,
-        rCRLF = /\r?\n/g,
-        rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-        rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-    function buildParams( prefix, obj, traditional, add ) {
-        var name;
-
-        if ( jQuery.isArray( obj ) ) {
-            // Serialize array item.
-            jQuery.each( obj, function( i, v ) {
-                if ( traditional || rbracket.test( prefix ) ) {
-                    // Treat each array item as a scalar.
-                    add( prefix, v );
-
-                } else {
-                    // Item is non-scalar (array or object), encode its numeric index.
-                    buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-                }
-            });
-
-        } else if ( !traditional && jQuery.type( obj ) === "object" ) {
-            // Serialize object item.
-            for ( name in obj ) {
-                buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-            }
-
-        } else {
-            // Serialize scalar item.
-            add( prefix, obj );
-        }
-    }
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-    jQuery.param = function( a, traditional ) {
-        var prefix,
-            s = [],
-            add = function( key, value ) {
-                // If value is a function, invoke it and return its value
-                value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-                s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-            };
-
-        // Set traditional to true for jQuery <= 1.3.2 behavior.
-        if ( traditional === undefined ) {
-            traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-        }
-
-        // If an array was passed in, assume that it is an array of form elements.
-        if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-            // Serialize the form elements
-            jQuery.each( a, function() {
-                add( this.name, this.value );
-            });
-
-        } else {
-            // If traditional, encode the "old" way (the way 1.3.2 or older
-            // did it), otherwise encode params recursively.
-            for ( prefix in a ) {
-                buildParams( prefix, a[ prefix ], traditional, add );
-            }
-        }
-
-        // Return the resulting serialization
-        return s.join( "&" ).replace( r20, "+" );
-    };
-
-    jQuery.fn.extend({
-        serialize: function() {
-            return jQuery.param( this.serializeArray() );
-        },
-        serializeArray: function() {
-            return this.map(function() {
-                // Can add propHook for "elements" to filter or add form elements
-                var elements = jQuery.prop( this, "elements" );
-                return elements ? jQuery.makeArray( elements ) : this;
-            })
-                .filter(function() {
-                    var type = this.type;
-
-                    // Use .is( ":disabled" ) so that fieldset[disabled] works
-                    return this.name && !jQuery( this ).is( ":disabled" ) &&
-                        rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-                        ( this.checked || !rcheckableType.test( type ) );
-                })
-                .map(function( i, elem ) {
-                    var val = jQuery( this ).val();
-
-                    return val == null ?
-                        null :
-                        jQuery.isArray( val ) ?
-                            jQuery.map( val, function( val ) {
-                                return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-                            }) :
-                        { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-                }).get();
-        }
-    });
-
-
-    jQuery.ajaxSettings.xhr = function() {
-        try {
-            return new XMLHttpRequest();
-        } catch( e ) {}
-    };
-
-    var xhrId = 0,
-        xhrCallbacks = {},
-        xhrSuccessStatus = {
-            // file protocol always yields status code 0, assume 200
-            0: 200,
-            // Support: IE9
-            // #1450: sometimes IE returns 1223 when it should be 204
-            1223: 204
-        },
-        xhrSupported = jQuery.ajaxSettings.xhr();
-
-// Support: IE9
-// Open requests must be manually aborted on unload (#5280)
-// See https://support.microsoft.com/kb/2856746 for more info
-    if ( window.attachEvent ) {
-        window.attachEvent( "onunload", function() {
-            for ( var key in xhrCallbacks ) {
-                xhrCallbacks[ key ]();
-            }
-        });
-    }
-
-    support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-    support.ajax = xhrSupported = !!xhrSupported;
-
-    jQuery.ajaxTransport(function( options ) {
-        var callback;
-
-        // Cross domain only allowed if supported through XMLHttpRequest
-        if ( support.cors || xhrSupported && !options.crossDomain ) {
-            return {
-                send: function( headers, complete ) {
-                    var i,
-                        xhr = options.xhr(),
-                        id = ++xhrId;
-
-                    xhr.open( options.type, options.url, options.async, options.username, options.password );
-
-                    // Apply custom fields if provided
-                    if ( options.xhrFields ) {
-                        for ( i in options.xhrFields ) {
-                            xhr[ i ] = options.xhrFields[ i ];
-                        }
-                    }
-
-                    // Override mime type if needed
-                    if ( options.mimeType && xhr.overrideMimeType ) {
-                        xhr.overrideMimeType( options.mimeType );
-                    }
-
-                    // X-Requested-With header
-                    // For cross-domain requests, seeing as conditions for a preflight are
-                    // akin to a jigsaw puzzle, we simply never set it to be sure.
-                    // (it can always be set on a per-request basis or even using ajaxSetup)
-                    // For same-domain requests, won't change header if already provided.
-                    if ( !options.crossDomain && !headers["X-Requested-With"] ) {
-                        headers["X-Requested-With"] = "XMLHttpRequest";
-                    }
-
-                    // Set headers
-                    for ( i in headers ) {
-                        xhr.setRequestHeader( i, headers[ i ] );
-                    }
-
-                    // Callback
-                    callback = function( type ) {
-                        return function() {
-                            if ( callback ) {
-                                delete xhrCallbacks[ id ];
-                                callback = xhr.onload = xhr.onerror = null;
-
-                                if ( type === "abort" ) {
-                                    xhr.abort();
-                                } else if ( type === "error" ) {
-                                    complete(
-                                        // file: protocol always yields status 0; see #8605, #14207
-                                        xhr.status,
-                                        xhr.statusText
-                                    );
-                                } else {
-                                    complete(
-                                        xhrSuccessStatus[ xhr.status ] || xhr.status,
-                                        xhr.statusText,
-                                        // Support: IE9
-                                        // Accessing binary-data responseText throws an exception
-                                        // (#11426)
-                                        typeof xhr.responseText === "string" ? {
-                                            text: xhr.responseText
-                                        } : undefined,
-                                        xhr.getAllResponseHeaders()
-                                    );
-                                }
-                            }
-                        };
-                    };
-
-                    // Listen to events
-                    xhr.onload = callback();
-                    xhr.onerror = callback("error");
-
-                    // Create the abort callback
-                    callback = xhrCallbacks[ id ] = callback("abort");
-
-                    try {
-                        // Do send the request (this may raise an exception)
-                        xhr.send( options.hasContent && options.data || null );
-                    } catch ( e ) {
-                        // #14683: Only rethrow if this hasn't been notified as an error yet
-                        if ( callback ) {
-                            throw e;
-                        }
-                    }
-                },
-
-                abort: function() {
-                    if ( callback ) {
-                        callback();
-                    }
-                }
-            };
-        }
-    });
-
-
-
-
-// Install script dataType
-    jQuery.ajaxSetup({
-        accepts: {
-            script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-        },
-        contents: {
-            script: /(?:java|ecma)script/
-        },
-        converters: {
-            "text script": function( text ) {
-                jQuery.globalEval( text );
-                return text;
-            }
-        }
-    });
-
-// Handle cache's special case and crossDomain
-    jQuery.ajaxPrefilter( "script", function( s ) {
-        if ( s.cache === undefined ) {
-            s.cache = false;
-        }
-        if ( s.crossDomain ) {
-            s.type = "GET";
-        }
-    });
-
-// Bind script tag hack transport
-    jQuery.ajaxTransport( "script", function( s ) {
-        // This transport only deals with cross domain requests
-        if ( s.crossDomain ) {
-            var script, callback;
-            return {
-                send: function( _, complete ) {
-                    script = jQuery("<script>").prop({
-                        async: true,
-                        charset: s.scriptCharset,
-                        src: s.url
-                    }).on(
-                        "load error",
-                        callback = function( evt ) {
-                            script.remove();
-                            callback = null;
-                            if ( evt ) {
-                                complete( evt.type === "error" ? 404 : 200, evt.type );
-                            }
-                        }
-                    );
-                    document.head.appendChild( script[ 0 ] );
-                },
-                abort: function() {
-                    if ( callback ) {
-                        callback();
-                    }
-                }
-            };
-        }
-    });
-
-
-
-
-    var oldCallbacks = [],
-        rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-    jQuery.ajaxSetup({
-        jsonp: "callback",
-        jsonpCallback: function() {
-            var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-            this[ callback ] = true;
-            return callback;
-        }
-    });
-
-// Detect, normalize options and install callbacks for jsonp requests
-    jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-        var callbackName, overwritten, responseContainer,
-            jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-                    "url" :
-                typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-                );
-
-        // Handle iff the expected data type is "jsonp" or we have a parameter to set
-        if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-            // Get callback name, remembering preexisting value associated with it
-            callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-                s.jsonpCallback() :
-                s.jsonpCallback;
-
-            // Insert callback into url or form data
-            if ( jsonProp ) {
-                s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-            } else if ( s.jsonp !== false ) {
-                s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-            }
-
-            // Use data converter to retrieve json after script execution
-            s.converters["script json"] = function() {
-                if ( !responseContainer ) {
-                    jQuery.error( callbackName + " was not called" );
-                }
-                return responseContainer[ 0 ];
-            };
-
-            // force json dataType
-            s.dataTypes[ 0 ] = "json";
-
-            // Install callback
-            overwritten = window[ callbackName ];
-            window[ callbackName ] = function() {
-                responseContainer = arguments;
-            };
-
-            // Clean-up function (fires after converters)
-            jqXHR.always(function() {
-                // Restore preexisting value
-                window[ callbackName ] = overwritten;
-
-                // Save back as free
-                if ( s[ callbackName ] ) {
-                    // make sure that re-using the options doesn't screw things around
-                    s.jsonpCallback = originalSettings.jsonpCallback;
-
-                    // save the callback name for future use
-                    oldCallbacks.push( callbackName );
-                }
-
-                // Call if it was a function and we have a response
-                if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-                    overwritten( responseContainer[ 0 ] );
-                }
-
-                responseContainer = overwritten = undefined;
-            });
-
-            // Delegate to script
-            return "script";
-        }
-    });
-
-
-
-
-// data: string of html
-// context (optional): If specified, the fragment will be created in this context, defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-    jQuery.parseHTML = function( data, context, keepScripts ) {
-        if ( !data || typeof data !== "string" ) {
-            return null;
-        }
-        if ( typeof context === "boolean" ) {
-            keepScripts = context;
-            context = false;
-        }
-        context = context || document;
-
-        var parsed = rsingleTag.exec( data ),
-            scripts = !keepScripts && [];
-
-        // Single tag
-        if ( parsed ) {
-            return [ context.createElement( parsed[1] ) ];
-        }
-
-        parsed = jQuery.buildFragment( [ data ], context, scripts );
-
-        if ( scripts && scripts.length ) {
-            jQuery( scripts ).remove();
-        }
-
-        return jQuery.merge( [], parsed.childNodes );
-    };
-
-
-// Keep a copy of the old load method
-    var _load = jQuery.fn.load;
-
-    /**
-     * Load a url into a page
-     */
-    jQuery.fn.load = function( url, params, callback ) {
-        if ( typeof url !== "string" && _load ) {
-            return _load.apply( this, arguments );
-        }
-
-        var selector, type, response,
-            self = this,
-            off = url.indexOf(" ");
-
-        if ( off >= 0 ) {
-            selector = jQuery.trim( url.slice( off ) );
-            url = url.slice( 0, off );
-        }
-
-        // If it's a function
-        if ( jQuery.isFunction( params ) ) {
-
-            // We assume that it's the callback
-            callback = params;
-            params = undefined;
-
-            // Otherwise, build a param string
-        } else if ( params && typeof params === "object" ) {
-            type = "POST";
-        }
-
-        // If we have elements to modify, make the request
-        if ( self.length > 0 ) {
-            jQuery.ajax({
-                url: url,
-
-                // if "type" variable is undefined, then "GET" method will be used
-                type: type,
-                dataType: "html",
-                data: params
-            }).done(function( responseText ) {
-
-                // Save response for use in complete callback
-                response = arguments;
-
-                self.html( selector ?
-
-                    // If a selector was specified, locate the right elements in a dummy div
-                    // Exclude scripts to avoid IE 'Permission Denied' errors
-                    jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-                    // Otherwise use the full result
-                    responseText );
-
-            }).complete( callback && function( jqXHR, status ) {
-                self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-            });
-        }
-
-        return this;
-    };
-
-
-
-
-// Attach a bunch of functions for handling common AJAX events
-    jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
-        jQuery.fn[ type ] = function( fn ) {
-            return this.on( type, fn );
-        };
-    });
-
-
-
-
-    jQuery.expr.filters.animated = function( elem ) {
-        return jQuery.grep(jQuery.timers, function( fn ) {
-            return elem === fn.elem;
-        }).length;
-    };
-
-
-
-
-    var docElem = window.document.documentElement;
-
-    /**
-     * Gets a window from an element
-     */
-    function getWindow( elem ) {
-        return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-    }
-
-    jQuery.offset = {
-        setOffset: function( elem, options, i ) {
-            var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-                position = jQuery.css( elem, "position" ),
-                curElem = jQuery( elem ),
-                props = {};
-
-            // Set position first, in-case top/left are set even on static elem
-            if ( position === "static" ) {
-                elem.style.position = "relative";
-            }
-
-            curOffset = curElem.offset();
-            curCSSTop = jQuery.css( elem, "top" );
-            curCSSLeft = jQuery.css( elem, "left" );
-            calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-            ( curCSSTop + curCSSLeft ).indexOf("auto") > -1;
-
-            // Need to be able to calculate position if either
-            // top or left is auto and position is either absolute or fixed
-            if ( calculatePosition ) {
-                curPosition = curElem.position();
-                curTop = curPosition.top;
-                curLeft = curPosition.left;
-
-            } else {
-                curTop = parseFloat( curCSSTop ) || 0;
-                curLeft = parseFloat( curCSSLeft ) || 0;
-            }
-
-            if ( jQuery.isFunction( options ) ) {
-                options = options.call( elem, i, curOffset );
-            }
-
-            if ( options.top != null ) {
-                props.top = ( options.top - curOffset.top ) + curTop;
-            }
-            if ( options.left != null ) {
-                props.left = ( options.left - curOffset.left ) + curLeft;
-            }
-
-            if ( "using" in options ) {
-                options.using.call( elem, props );
-
-            } else {
-                curElem.css( props );
-            }
-        }
-    };
-
-    jQuery.fn.extend({
-        offset: function( options ) {
-            if ( arguments.length ) {
-                return options === undefined ?
-                    this :
-                    this.each(function( i ) {
-                        jQuery.offset.setOffset( this, options, i );
-                    });
-            }
-
-            var docElem, win,
-                elem = this[ 0 ],
-                box = { top: 0, left: 0 },
-                doc = elem && elem.ownerDocument;
-
-            if ( !doc ) {
-                return;
-            }
-
-            docElem = doc.documentElement;
-
-            // Make sure it's not a disconnected DOM node
-            if ( !jQuery.contains( docElem, elem ) ) {
-                return box;
-            }
-
-            // Support: BlackBerry 5, iOS 3 (original iPhone)
-            // If we don't have gBCR, just use 0,0 rather than error
-            if ( typeof elem.getBoundingClientRect !== strundefined ) {
-                box = elem.getBoundingClientRect();
-            }
-            win = getWindow( doc );
-            return {
-                top: box.top + win.pageYOffset - docElem.clientTop,
-                left: box.left + win.pageXOffset - docElem.clientLeft
-            };
-        },
-
-        position: function() {
-            if ( !this[ 0 ] ) {
-                return;
-            }
-
-            var offsetParent, offset,
-                elem = this[ 0 ],
-                parentOffset = { top: 0, left: 0 };
-
-            // Fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
-            if ( jQuery.css( elem, "position" ) === "fixed" ) {
-                // Assume getBoundingClientRect is there when computed position is fixed
-                offset = elem.getBoundingClientRect();
-
-            } else {
-                // Get *real* offsetParent
-                offsetParent = this.offsetParent();
-
-                // Get correct offsets
-                offset = this.offset();
-                if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-                    parentOffset = offsetParent.offset();
-                }
-
-                // Add offsetParent borders
-                parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-                parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-            }
-
-            // Subtract parent offsets and element margins
-            return {
-                top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-                left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-            };
-        },
-
-        offsetParent: function() {
-            return this.map(function() {
-                var offsetParent = this.offsetParent || docElem;
-
-                while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
-                    offsetParent = offsetParent.offsetParent;
-                }
-
-                return offsetParent || docElem;
-            });
-        }
-    });
-
-// Create scrollLeft and scrollTop methods
-    jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-        var top = "pageYOffset" === prop;
-
-        jQuery.fn[ method ] = function( val ) {
-            return access( this, function( elem, method, val ) {
-                var win = getWindow( elem );
-
-                if ( val === undefined ) {
-                    return win ? win[ prop ] : elem[ method ];
-                }
-
-                if ( win ) {
-                    win.scrollTo(
-                        !top ? val : window.pageXOffset,
-                        top ? val : window.pageYOffset
-                    );
-
-                } else {
-                    elem[ method ] = val;
-                }
-            }, method, val, arguments.length, null );
-        };
-    });
-
-// Support: Safari<7+, Chrome<37+
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-    jQuery.each( [ "top", "left" ], function( i, prop ) {
-        jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-            function( elem, computed ) {
-                if ( computed ) {
-                    computed = curCSS( elem, prop );
-                    // If curCSS returns percentage, fallback to offset
-                    return rnumnonpx.test( computed ) ?
-                    jQuery( elem ).position()[ prop ] + "px" :
-                        computed;
-                }
-            }
-        );
-    });
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-    jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-        jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-            // Margin is only for outerHeight, outerWidth
-            jQuery.fn[ funcName ] = function( margin, value ) {
-                var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-                    extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-                return access( this, function( elem, type, value ) {
-                    var doc;
-
-                    if ( jQuery.isWindow( elem ) ) {
-                        // As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-                        // isn't a whole lot we can do. See pull request at this URL for discussion:
-                        // https://github.com/jquery/jquery/pull/764
-                        return elem.document.documentElement[ "client" + name ];
-                    }
-
-                    // Get document width or height
-                    if ( elem.nodeType === 9 ) {
-                        doc = elem.documentElement;
-
-                        // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-                        // whichever is greatest
-                        return Math.max(
-                            elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-                            elem.body[ "offset" + name ], doc[ "offset" + name ],
-                            doc[ "client" + name ]
-                        );
-                    }
-
-                    return value === undefined ?
-                        // Get width or height on the element, requesting but not forcing parseFloat
-                        jQuery.css( elem, type, extra ) :
-
-                        // Set width or height on the element
-                        jQuery.style( elem, type, value, extra );
-                }, type, chainable ? margin : undefined, chainable, null );
-            };
-        });
-    });
-
-
-// The number of elements contained in the matched element set
-    jQuery.fn.size = function() {
-        return this.length;
-    };
-
-    jQuery.fn.andSelf = jQuery.fn.addBack;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-    if ( typeof define === "function" && define.amd ) {
-        define( "jquery", [], function() {
-            return jQuery;
-        });
-    }
-
-
-
-
-    var
-    // Map over jQuery in case of overwrite
-        _jQuery = window.jQuery,
-
-    // Map over the $ in case of overwrite
-        _$ = window.$;
-
-    jQuery.noConflict = function( deep ) {
-        if ( window.$ === jQuery ) {
-            window.$ = _$;
-        }
-
-        if ( deep && window.jQuery === jQuery ) {
-            window.jQuery = _jQuery;
-        }
-
-        return jQuery;
-    };
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-    if ( typeof noGlobal === strundefined ) {
-        window.jQuery = window.$ = jQuery;
-    }
-
-
-
-
-    return jQuery;
-
-}));
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.autosize-min.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.autosize-min.js
deleted file mode 100644
index 41601a19e..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.autosize-min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-	Autosize v1.17.1 - 2013-06-23
-	Automatically adjust textarea height based on user input.
-	(c) 2013 Jack Moore - http://www.jacklmoore.com/autosize
-	license: http://www.opensource.org/licenses/mit-license.php
-*/
-(function(e){var t,o={className:"autosizejs",append:"",callback:!1,resizeDelay:10},i='<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',n=["fontFamily","fontSize","fontWeight","fontStyle","letterSpacing","textTransform","wordSpacing","textIndent"],s=e(i).data("autosize",!0)[0];s.style.lineHeight="99px","99px"===e(s).css("lineHeight")&&n.push("lineHeight"),s.style.lineHeight="",e.fn.autosize=function(i){return i=e.extend({},o,i||{}),s.parentNode!==document.body&&e(document.body).append(s),this.each(function(){function o(){var o,a={};if(t=u,s.className=i.className,l=parseInt(h.css("maxHeight"),10),e.each(n,function(e,t){a[t]=h.css(t)}),e(s).css(a),"oninput"in u){var r=u.style.width;u.style.width="0px",o=u.offsetWidth,u.style.width=r}}function a(){var n,a,r,c;t!==u&&o(),s.value=u.value+i.append,s.style.overflowY=u.style.overflowY,a=parseInt(u.style.height,10),"getComputedStyle"in window?(c=window.getComputedStyle(u),r=u.getBoundingClientRect().width,e.each(["paddingLeft","paddingRight","borderLeftWidth","borderRightWidth"],function(e,t){r-=parseInt(c[t],10)}),s.style.width=r+"px"):s.style.width=Math.max(h.width(),0)+"px",s.scrollTop=0,s.scrollTop=9e4,n=s.scrollTop,l&&n>l?(u.style.overflowY="scroll",n=l):(u.style.overflowY="hidden",d>n&&(n=d)),n+=p,a!==n&&(u.style.height=n+"px",w&&i.callback.call(u,u))}function r(){clearTimeout(c),c=setTimeout(function(){h.width()!==z&&a()},parseInt(i.resizeDelay,10))}var l,d,c,u=this,h=e(u),p=0,w=e.isFunction(i.callback),f={height:u.style.height,overflow:u.style.overflow,overflowY:u.style.overflowY,wordWrap:u.style.wordWrap,resize:u.style.resize},z=h.width();h.data("autosize")||(h.data("autosize",!0),("border-box"===h.css("box-sizing")||"border-box"===h.css("-moz-box-sizing")||"border-box"===h.css("-webkit-box-sizing"))&&(p=h.outerHeight()-h.height()),d=Math.max(parseInt(h.css("minHeight"),10)-p||0,h.height()),h.css({overflow:"hidden",overflowY:"hidden",wordWrap:"break-word",resize:"none"===h.css("resize")||"vertical"===h.css("resize")?"none":"horizontal"}),"onpropertychange"in u?"oninput"in u?h.on("input.autosize keyup.autosize",a):h.on("propertychange.autosize",function(){"value"===event.propertyName&&a()}):h.on("input.autosize",a),i.resizeDelay!==!1&&e(window).on("resize.autosize",r),h.on("autosize.resize",a),h.on("autosize.resizeIncludeStyle",function(){t=null,a()}),h.on("autosize.destroy",function(){t=null,clearTimeout(c),e(window).off("resize",r),h.off("autosize").off(".autosize").css(f).removeData("autosize")}),a())})}})(window.jQuery||window.Zepto);
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.colorbox-min.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.colorbox-min.js
deleted file mode 100644
index 0ecc66277..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.colorbox-min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-	Colorbox v1.4.33 - 2013-10-31
-	jQuery lightbox and modal window plugin
-	(c) 2013 Jack Moore - http://www.jacklmoore.com/colorbox
-	license: http://www.opensource.org/licenses/mit-license.php
-*/
-(function(e,t,i){function o(i,o,n){var r=t.createElement(i);return o&&(r.id=Z+o),n&&(r.style.cssText=n),e(r)}function n(){return i.innerHeight?i.innerHeight:e(i).height()}function r(e){var t=k.length,i=(z+e)%t;return 0>i?t+i:i}function h(e,t){return Math.round((/%/.test(e)?("x"===t?E.width():n())/100:1)*parseInt(e,10))}function l(e,t){return e.photo||e.photoRegex.test(t)}function s(e,t){return e.retinaUrl&&i.devicePixelRatio>1?t.replace(e.photoRegex,e.retinaSuffix):t}function a(e){"contains"in g[0]&&!g[0].contains(e.target)&&(e.stopPropagation(),g.focus())}function d(){var t,i=e.data(N,Y);null==i?(B=e.extend({},X),console&&console.log&&console.log("Error: cboxElement missing settings object")):B=e.extend({},i);for(t in B)e.isFunction(B[t])&&"on"!==t.slice(0,2)&&(B[t]=B[t].call(N));B.rel=B.rel||N.rel||e(N).data("rel")||"nofollow",B.href=B.href||e(N).attr("href"),B.title=B.title||N.title,"string"==typeof B.href&&(B.href=e.trim(B.href))}function c(i,o){e(t).trigger(i),lt.triggerHandler(i),e.isFunction(o)&&o.call(N)}function u(i){q||(N=i,d(),k=e(N),z=0,"nofollow"!==B.rel&&(k=e("."+et).filter(function(){var t,i=e.data(this,Y);return i&&(t=e(this).data("rel")||i.rel||this.rel),t===B.rel}),z=k.index(N),-1===z&&(k=k.add(N),z=k.length-1)),w.css({opacity:parseFloat(B.opacity),cursor:B.overlayClose?"pointer":"auto",visibility:"visible"}).show(),J&&g.add(w).removeClass(J),B.className&&g.add(w).addClass(B.className),J=B.className,B.closeButton?K.html(B.close).appendTo(y):K.appendTo("<div/>"),U||(U=$=!0,g.css({visibility:"hidden",display:"block"}),H=o(st,"LoadedContent","width:0; height:0; overflow:hidden"),y.css({width:"",height:""}).append(H),O=x.height()+C.height()+y.outerHeight(!0)-y.height(),_=b.width()+T.width()+y.outerWidth(!0)-y.width(),D=H.outerHeight(!0),A=H.outerWidth(!0),B.w=h(B.initialWidth,"x"),B.h=h(B.initialHeight,"y"),H.css({width:"",height:B.h}),Q.position(),c(tt,B.onOpen),P.add(L).hide(),g.focus(),B.trapFocus&&t.addEventListener&&(t.addEventListener("focus",a,!0),lt.one(rt,function(){t.removeEventListener("focus",a,!0)})),B.returnFocus&&lt.one(rt,function(){e(N).focus()})),m())}function f(){!g&&t.body&&(V=!1,E=e(i),g=o(st).attr({id:Y,"class":e.support.opacity===!1?Z+"IE":"",role:"dialog",tabindex:"-1"}).hide(),w=o(st,"Overlay").hide(),F=e([o(st,"LoadingOverlay")[0],o(st,"LoadingGraphic")[0]]),v=o(st,"Wrapper"),y=o(st,"Content").append(L=o(st,"Title"),S=o(st,"Current"),I=e('<button type="button"/>').attr({id:Z+"Previous"}),R=e('<button type="button"/>').attr({id:Z+"Next"}),M=o("button","Slideshow"),F),K=e('<button type="button"/>').attr({id:Z+"Close"}),v.append(o(st).append(o(st,"TopLeft"),x=o(st,"TopCenter"),o(st,"TopRight")),o(st,!1,"clear:left").append(b=o(st,"MiddleLeft"),y,T=o(st,"MiddleRight")),o(st,!1,"clear:left").append(o(st,"BottomLeft"),C=o(st,"BottomCenter"),o(st,"BottomRight"))).find("div div").css({"float":"left"}),W=o(st,!1,"position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;"),P=R.add(I).add(S).add(M),e(t.body).append(w,g.append(v,W)))}function p(){function i(e){e.which>1||e.shiftKey||e.altKey||e.metaKey||e.ctrlKey||(e.preventDefault(),u(this))}return g?(V||(V=!0,R.click(function(){Q.next()}),I.click(function(){Q.prev()}),K.click(function(){Q.close()}),w.click(function(){B.overlayClose&&Q.close()}),e(t).bind("keydown."+Z,function(e){var t=e.keyCode;U&&B.escKey&&27===t&&(e.preventDefault(),Q.close()),U&&B.arrowKey&&k[1]&&!e.altKey&&(37===t?(e.preventDefault(),I.click()):39===t&&(e.preventDefault(),R.click()))}),e.isFunction(e.fn.on)?e(t).on("click."+Z,"."+et,i):e("."+et).live("click."+Z,i)),!0):!1}function m(){var n,r,a,u=Q.prep,f=++at;$=!0,j=!1,N=k[z],d(),c(ht),c(it,B.onLoad),B.h=B.height?h(B.height,"y")-D-O:B.innerHeight&&h(B.innerHeight,"y"),B.w=B.width?h(B.width,"x")-A-_:B.innerWidth&&h(B.innerWidth,"x"),B.mw=B.w,B.mh=B.h,B.maxWidth&&(B.mw=h(B.maxWidth,"x")-A-_,B.mw=B.w&&B.w<B.mw?B.w:B.mw),B.maxHeight&&(B.mh=h(B.maxHeight,"y")-D-O,B.mh=B.h&&B.h<B.mh?B.h:B.mh),n=B.href,G=setTimeout(function(){F.show()},100),B.inline?(a=o(st).hide().insertBefore(e(n)[0]),lt.one(ht,function(){a.replaceWith(H.children())}),u(e(n))):B.iframe?u(" "):B.html?u(B.html):l(B,n)?(n=s(B,n),j=t.createElement("img"),e(j).addClass(Z+"Photo").bind("error",function(){B.title=!1,u(o(st,"Error").html(B.imgError))}).one("load",function(){var t;f===at&&(e.each(["alt","longdesc","aria-describedby"],function(t,i){var o=e(N).attr(i)||e(N).attr("data-"+i);o&&j.setAttribute(i,o)}),B.retinaImage&&i.devicePixelRatio>1&&(j.height=j.height/i.devicePixelRatio,j.width=j.width/i.devicePixelRatio),B.scalePhotos&&(r=function(){j.height-=j.height*t,j.width-=j.width*t},B.mw&&j.width>B.mw&&(t=(j.width-B.mw)/j.width,r()),B.mh&&j.height>B.mh&&(t=(j.height-B.mh)/j.height,r())),B.h&&(j.style.marginTop=Math.max(B.mh-j.height,0)/2+"px"),k[1]&&(B.loop||k[z+1])&&(j.style.cursor="pointer",j.onclick=function(){Q.next()}),j.style.width=j.width+"px",j.style.height=j.height+"px",setTimeout(function(){u(j)},1))}),setTimeout(function(){j.src=n},1)):n&&W.load(n,B.data,function(t,i){f===at&&u("error"===i?o(st,"Error").html(B.xhrError):e(this).contents())})}var w,g,v,y,x,b,T,C,k,E,H,W,F,L,S,M,R,I,K,P,B,O,_,D,A,N,z,j,U,$,q,G,Q,J,V,X={html:!1,photo:!1,iframe:!1,inline:!1,transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,className:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0,fastIframe:!0,open:!1,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",returnFocus:!0,trapFocus:!0,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1},Y="colorbox",Z="cbox",et=Z+"Element",tt=Z+"_open",it=Z+"_load",ot=Z+"_complete",nt=Z+"_cleanup",rt=Z+"_closed",ht=Z+"_purge",lt=e("<a/>"),st="div",at=0,dt={},ct=function(){function e(){clearTimeout(h)}function t(){(B.loop||k[z+1])&&(e(),h=setTimeout(Q.next,B.slideshowSpeed))}function i(){M.html(B.slideshowStop).unbind(s).one(s,o),lt.bind(ot,t).bind(it,e),g.removeClass(l+"off").addClass(l+"on")}function o(){e(),lt.unbind(ot,t).unbind(it,e),M.html(B.slideshowStart).unbind(s).one(s,function(){Q.next(),i()}),g.removeClass(l+"on").addClass(l+"off")}function n(){r=!1,M.hide(),e(),lt.unbind(ot,t).unbind(it,e),g.removeClass(l+"off "+l+"on")}var r,h,l=Z+"Slideshow_",s="click."+Z;return function(){r?B.slideshow||(lt.unbind(nt,n),n()):B.slideshow&&k[1]&&(r=!0,lt.one(nt,n),B.slideshowAuto?i():o(),M.show())}}();e.colorbox||(e(f),Q=e.fn[Y]=e[Y]=function(t,i){var o=this;if(t=t||{},f(),p()){if(e.isFunction(o))o=e("<a/>"),t.open=!0;else if(!o[0])return o;i&&(t.onComplete=i),o.each(function(){e.data(this,Y,e.extend({},e.data(this,Y)||X,t))}).addClass(et),(e.isFunction(t.open)&&t.open.call(o)||t.open)&&u(o[0])}return o},Q.position=function(t,i){function o(){x[0].style.width=C[0].style.width=y[0].style.width=parseInt(g[0].style.width,10)-_+"px",y[0].style.height=b[0].style.height=T[0].style.height=parseInt(g[0].style.height,10)-O+"px"}var r,l,s,a=0,d=0,c=g.offset();if(E.unbind("resize."+Z),g.css({top:-9e4,left:-9e4}),l=E.scrollTop(),s=E.scrollLeft(),B.fixed?(c.top-=l,c.left-=s,g.css({position:"fixed"})):(a=l,d=s,g.css({position:"absolute"})),d+=B.right!==!1?Math.max(E.width()-B.w-A-_-h(B.right,"x"),0):B.left!==!1?h(B.left,"x"):Math.round(Math.max(E.width()-B.w-A-_,0)/2),a+=B.bottom!==!1?Math.max(n()-B.h-D-O-h(B.bottom,"y"),0):B.top!==!1?h(B.top,"y"):Math.round(Math.max(n()-B.h-D-O,0)/2),g.css({top:c.top,left:c.left,visibility:"visible"}),v[0].style.width=v[0].style.height="9999px",r={width:B.w+A+_,height:B.h+D+O,top:a,left:d},t){var u=0;e.each(r,function(e){return r[e]!==dt[e]?(u=t,void 0):void 0}),t=u}dt=r,t||g.css(r),g.dequeue().animate(r,{duration:t||0,complete:function(){o(),$=!1,v[0].style.width=B.w+A+_+"px",v[0].style.height=B.h+D+O+"px",B.reposition&&setTimeout(function(){E.bind("resize."+Z,Q.position)},1),i&&i()},step:o})},Q.resize=function(e){var t;U&&(e=e||{},e.width&&(B.w=h(e.width,"x")-A-_),e.innerWidth&&(B.w=h(e.innerWidth,"x")),H.css({width:B.w}),e.height&&(B.h=h(e.height,"y")-D-O),e.innerHeight&&(B.h=h(e.innerHeight,"y")),e.innerHeight||e.height||(t=H.scrollTop(),H.css({height:"auto"}),B.h=H.height()),H.css({height:B.h}),t&&H.scrollTop(t),Q.position("none"===B.transition?0:B.speed))},Q.prep=function(i){function n(){return B.w=B.w||H.width(),B.w=B.mw&&B.mw<B.w?B.mw:B.w,B.w}function h(){return B.h=B.h||H.height(),B.h=B.mh&&B.mh<B.h?B.mh:B.h,B.h}if(U){var a,d="none"===B.transition?0:B.speed;H.empty().remove(),H=o(st,"LoadedContent").append(i),H.hide().appendTo(W.show()).css({width:n(),overflow:B.scrolling?"auto":"hidden"}).css({height:h()}).prependTo(y),W.hide(),e(j).css({"float":"none"}),a=function(){function i(){e.support.opacity===!1&&g[0].style.removeAttribute("filter")}var n,h,a=k.length,u="frameBorder",f="allowTransparency";U&&(h=function(){clearTimeout(G),F.hide(),c(ot,B.onComplete)},L.html(B.title).add(H).show(),a>1?("string"==typeof B.current&&S.html(B.current.replace("{current}",z+1).replace("{total}",a)).show(),R[B.loop||a-1>z?"show":"hide"]().html(B.next),I[B.loop||z?"show":"hide"]().html(B.previous),ct(),B.preloading&&e.each([r(-1),r(1)],function(){var i,o,n=k[this],r=e.data(n,Y);r&&r.href?(i=r.href,e.isFunction(i)&&(i=i.call(n))):i=e(n).attr("href"),i&&l(r,i)&&(i=s(r,i),o=t.createElement("img"),o.src=i)})):P.hide(),B.iframe?(n=o("iframe")[0],u in n&&(n[u]=0),f in n&&(n[f]="true"),B.scrolling||(n.scrolling="no"),e(n).attr({src:B.href,name:(new Date).getTime(),"class":Z+"Iframe",allowFullScreen:!0,webkitAllowFullScreen:!0,mozallowfullscreen:!0}).one("load",h).appendTo(H),lt.one(ht,function(){n.src="//about:blank"}),B.fastIframe&&e(n).trigger("load")):h(),"fade"===B.transition?g.fadeTo(d,1,i):i())},"fade"===B.transition?g.fadeTo(d,0,function(){Q.position(0,a)}):Q.position(d,a)}},Q.next=function(){!$&&k[1]&&(B.loop||k[z+1])&&(z=r(1),u(k[z]))},Q.prev=function(){!$&&k[1]&&(B.loop||z)&&(z=r(-1),u(k[z]))},Q.close=function(){U&&!q&&(q=!0,U=!1,c(nt,B.onCleanup),E.unbind("."+Z),w.fadeTo(B.fadeOut||0,0),g.stop().fadeTo(B.fadeOut||0,0,function(){g.add(w).css({opacity:1,cursor:"auto"}).hide(),c(ht),H.empty().remove(),setTimeout(function(){q=!1,c(rt,B.onClosed)},1)}))},Q.remove=function(){g&&(g.stop(),e.colorbox.close(),g.stop().remove(),w.remove(),q=!1,g=null,e("."+et).removeData(Y).removeClass(et),e(t).unbind("click."+Z))},Q.element=function(){return e(N)},Q.settings=X)})(jQuery,document,window);
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.multifile.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.multifile.js
deleted file mode 100644
index 3827ec088..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.multifile.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- ### jQuery Multiple File Upload Plugin v1.47 - 2010-03-26 ###
- * Home: http://www.fyneworks.com/jquery/multiple-file-upload/
- * Code: http://code.google.com/p/jquery-multifile-plugin/
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- ###
-*/
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';3(X.1M)(6($){$.7.2=6(h){3(5.Q==0)8 5;3(R U[0]==\'1f\'){3(5.Q>1){l i=U;8 5.N(6(){$.7.2.14($(5),i)})};$.7.2[U[0]].14(5,$.27(U).26(1)||[]);8 5};l h=$.L({},$.7.2.D,h||{});$(\'21\').1D(\'2-S\').V(\'2-S\').1i($.7.2.15);3($.7.2.D.12){$.7.2.1s($.7.2.D.12);$.7.2.D.12=11};5.1D(\'.2-1a\').V(\'2-1a\').N(6(){X.2=(X.2||0)+1;l e=X.2;l g={e:5,E:$(5),P:$(5).P()};3(R h==\'1W\')h={m:h};l o=$.L({},$.7.2.D,h||{},($.1p?g.E.1p():($.2t?g.E.Z():11))||{},{});3(!(o.m>0)){o.m=g.E.K(\'2e\');3(!(o.m>0)){o.m=(u(g.e.1o.B(/\\b(m|2a)\\-([0-9]+)\\b/q)||[\'\']).B(/[0-9]+/q)||[\'\'])[0];3(!(o.m>0))o.m=-1;1Z o.m=u(o.m).B(/[0-9]+/q)[0]}};o.m=18 1X(o.m);o.j=o.j||g.E.K(\'j\')||\'\';3(!o.j){o.j=(g.e.1o.B(/\\b(j\\-[\\w\\|]+)\\b/q))||\'\';o.j=18 u(o.j).t(/^(j|1e)\\-/i,\'\')};$.L(g,o||{});g.A=$.L({},$.7.2.D.A,g.A);$.L(g,{n:0,J:[],2c:[],19:g.e.I||\'2\'+u(e),1k:6(z){8 g.19+(z>0?\'1U\'+u(z):\'\')},G:6(a,b){l c=g[a],k=$(b).K(\'k\');3(c){l d=c(b,k,g);3(d!=11)8 d}8 1h}});3(u(g.j).Q>1){g.j=g.j.t(/\\W+/g,\'|\').t(/^\\W|\\W$/g,\'\');g.1w=18 2h(\'\\\\.(\'+(g.j?g.j:\'\')+\')$\',\'q\')};g.M=g.19+\'25\';g.E.1j(\'<O T="2-1j" I="\'+g.M+\'"></O>\');g.1l=$(\'#\'+g.M+\'\');g.e.H=g.e.H||\'p\'+e+\'[]\';3(!g.C){g.1l.1d(\'<O T="2-C" I="\'+g.M+\'1m"></O>\');g.C=$(\'#\'+g.M+\'1m\')};g.C=$(g.C);g.10=6(c,d){g.n++;c.2=g;3(d>0)c.I=c.H=\'\';3(d>0)c.I=g.1k(d);c.H=u(g.1n.t(/\\$H/q,$(g.P).K(\'H\')).t(/\\$I/q,$(g.P).K(\'I\')).t(/\\$g/q,e).t(/\\$i/q,d));3((g.m>0)&&((g.n-1)>(g.m)))c.16=1h;g.17=g.J[d]=c;c=$(c);c.1g(\'\').K(\'k\',\'\')[0].k=\'\';c.V(\'2-1a\');c.2z(6(){$(5).1O();3(!g.G(\'1R\',5,g))8 y;l a=\'\',v=u(5.k||\'\');3(g.j&&v&&!v.B(g.1w))a=g.A.1q.t(\'$1e\',u(v.B(/\\.\\w{1,4}$/q)));1r(l f 29 g.J)3(g.J[f]&&g.J[f]!=5)3(g.J[f].k==v)a=g.A.1t.t(\'$p\',v.B(/[^\\/\\\\]+$/q));l b=$(g.P).P();b.V(\'2\');3(a!=\'\'){g.1u(a);g.n--;g.10(b[0],d);c.1v().2d(b);c.F();8 y};$(5).1x({1y:\'1N\',1z:\'-1P\'});c.1Q(b);g.1A(5,d);g.10(b[0],d+1);3(!g.G(\'1S\',5,g))8 y});$(c).Z(\'2\',g)};g.1A=6(c,d){3(!g.G(\'1T\',c,g))8 y;l r=$(\'<O T="2-1V"></O>\'),v=u(c.k||\'\'),a=$(\'<1B T="2-1C" 1C="\'+g.A.Y.t(\'$p\',v)+\'">\'+g.A.p.t(\'$p\',v.B(/[^\\/\\\\]+$/q)[0])+\'</1B>\'),b=$(\'<a T="2-F" 1Y="#\'+g.M+\'">\'+g.A.F+\'</a>\');g.C.1d(r.1d(b,\' \',a));b.1E(6(){3(!g.G(\'20\',c,g))8 y;g.n--;g.17.16=y;g.J[d]=11;$(c).F();$(5).1v().F();$(g.17).1x({1y:\'\',1z:\'\'});$(g.17).13().1g(\'\').K(\'k\',\'\')[0].k=\'\';3(!g.G(\'22\',c,g))8 y;8 y});3(!g.G(\'23\',c,g))8 y};3(!g.2)g.10(g.e,0);g.n++;g.E.Z(\'2\',g)})};$.L($.7.2,{13:6(){l a=$(5).Z(\'2\');3(a)a.C.24(\'a.2-F\').1E();8 $(5)},15:6(a){a=(R(a)==\'1f\'?a:\'\')||\'1F\';l o=[];$(\'1b:p.2\').N(6(){3($(5).1g()==\'\')o[o.Q]=5});8 $(o).N(6(){5.16=1h}).V(a)},1c:6(a){a=(R(a)==\'1f\'?a:\'\')||\'1F\';8 $(\'1b:p.\'+a).28(a).N(6(){5.16=y})},S:{},1s:6(b,c,d){l e,k;d=d||[];3(d.1G.1H().1I("1J")<0)d=[d];3(R(b)==\'6\'){$.7.2.15();k=b.14(c||X,d);1K(6(){$.7.2.1c()},1L);8 k};3(b.1G.1H().1I("1J")<0)b=[b];1r(l i=0;i<b.Q;i++){e=b[i]+\'\';3(e)(6(a){$.7.2.S[a]=$.7[a]||6(){};$.7[a]=6(){$.7.2.15();k=$.7.2.S[a].14(5,U);1K(6(){$.7.2.1c()},1L);8 k}})(e)}}});$.7.2.D={j:\'\',m:-1,1n:\'$H\',A:{F:\'x\',1q:\'2f 2g 2b a $1e p.\\2i 2j...\',p:\'$p\',Y:\'2k Y: $p\',1t:\'2l p 2m 2n 2o Y:\\n$p\'},12:[\'1i\',\'2p\',\'2q\',\'2r\',\'2s\'],1u:6(s){2u(s)}};$.7.13=6(){8 5.N(6(){2v{5.13()}2w(e){}})};$(6(){$("1b[2x=p].2y").2()})})(1M);',62,160,'||MultiFile|if||this|function|fn|return|||||||||||accept|value|var|max|||file|gi|||replace|String||||false||STRING|match|list|options||remove|trigger|name|id|slaves|attr|extend|wrapID|each|div|clone|length|typeof|intercepted|class|arguments|addClass||window|selected|data|addSlave|null|autoIntercept|reset|apply|disableEmpty|disabled|current|new|instanceKey|applied|input|reEnableEmpty|append|ext|string|val|true|submit|wrap|generateID|wrapper|_list|namePattern|className|metadata|denied|for|intercept|duplicate|error|parent|rxAccept|css|position|top|addToList|span|title|not|click|mfD|constructor|toString|indexOf|Array|setTimeout|1000|jQuery|absolute|blur|3000px|after|onFileSelect|afterFileSelect|onFileAppend|_F|label|number|Number|href|else|onFileRemove|form|afterFileRemove|afterFileAppend|find|_wrap|slice|makeArray|removeClass|in|limit|select|files|prepend|maxlength|You|cannot|RegExp|nTry|again|File|This|has|already|been|ajaxSubmit|ajaxForm|validate|valid|meta|alert|try|catch|type|multi|change'.split('|'),0,{}))
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.multiselect.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.multiselect.js
deleted file mode 100644
index 8fe8248ef..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.multiselect.js
+++ /dev/null
@@ -1,532 +0,0 @@
-/*
-* MultiSelect v0.9.11
-* Copyright (c) 2012 Louis Cuny
-*
-* This program is free software. It comes without any warranty, to
-* the extent permitted by applicable law. You can redistribute it
-* and/or modify it under the terms of the Do What The Fuck You Want
-* To Public License, Version 2, as published by Sam Hocevar. See
-* http://sam.zoy.org/wtfpl/COPYING for more details.
-*/
-
-!function ($) {
-
-  "use strict";
-
-
- /* MULTISELECT CLASS DEFINITION
-  * ====================== */
-
-  var MultiSelect = function (element, options) {
-    this.options = options;
-    this.$element = $(element);
-    this.$container = $('<div/>', { 'class': "ms-container" });
-    this.$selectableContainer = $('<div/>', { 'class': 'ms-selectable' });
-    this.$selectionContainer = $('<div/>', { 'class': 'ms-selection' });
-    this.$selectableUl = $('<ul/>', { 'class': "ms-list", 'tabindex' : '-1' });
-    this.$selectionUl = $('<ul/>', { 'class': "ms-list", 'tabindex' : '-1' });
-    this.scrollTo = 0;
-    this.elemsSelector = 'li:visible:not(.ms-optgroup-label,.ms-optgroup-container,.'+options.disabledClass+')';
-  };
-
-  MultiSelect.prototype = {
-    constructor: MultiSelect,
-
-    init: function(){
-      var that = this,
-          ms = this.$element;
-
-      if (ms.next('.ms-container').length === 0){
-        ms.css({ position: 'absolute', left: '-9999px' });
-        ms.attr('id', ms.attr('id') ? ms.attr('id') : Math.ceil(Math.random()*1000)+'multiselect');
-        this.$container.attr('id', 'ms-'+ms.attr('id'));
-        this.$container.addClass(that.options.cssClass);
-        ms.find('option').each(function(){
-          that.generateLisFromOption(this);
-        });
-
-        this.$selectionUl.find('.ms-optgroup-label').hide();
-
-        if (that.options.selectableHeader){
-          that.$selectableContainer.append(that.options.selectableHeader);
-        }
-        that.$selectableContainer.append(that.$selectableUl);
-        if (that.options.selectableFooter){
-          that.$selectableContainer.append(that.options.selectableFooter);
-        }
-
-        if (that.options.selectionHeader){
-          that.$selectionContainer.append(that.options.selectionHeader);
-        }
-        that.$selectionContainer.append(that.$selectionUl);
-        if (that.options.selectionFooter){
-          that.$selectionContainer.append(that.options.selectionFooter);
-        }
-
-        that.$container.append(that.$selectableContainer);
-        that.$container.append(that.$selectionContainer);
-        ms.after(that.$container);
-
-        that.activeMouse(that.$selectableUl);
-        that.activeKeyboard(that.$selectableUl);
-
-        var action = that.options.dblClick ? 'dblclick' : 'click';
-
-        that.$selectableUl.on(action, '.ms-elem-selectable', function(){
-          that.select($(this).data('ms-value'));
-        });
-        that.$selectionUl.on(action, '.ms-elem-selection', function(){
-          that.deselect($(this).data('ms-value'));
-        });
-
-        that.activeMouse(that.$selectionUl);
-        that.activeKeyboard(that.$selectionUl);
-
-        ms.on('focus', function(){
-          that.$selectableUl.focus();
-        })
-      }
-
-      var selectedValues = ms.find('option:selected').map(function(){ return $(this).val(); }).get();
-      that.select(selectedValues, 'init');
-
-      if (typeof that.options.afterInit === 'function') {
-        that.options.afterInit.call(this, this.$container);
-      }
-    },
-
-    'generateLisFromOption' : function(option, index, $container){
-      var that = this,
-          ms = that.$element,
-          attributes = "",
-          $option = $(option);
-
-      for (var cpt = 0; cpt < option.attributes.length; cpt++){
-        var attr = option.attributes[cpt];
-
-        if(attr.name !== 'value' && attr.name !== 'disabled'){
-          attributes += attr.name+'="'+attr.value+'" ';
-        }
-      }
-      var selectableLi = $('<li '+attributes+'><span>'+that.escapeHTML($option.text())+'</span></li>'),
-          selectedLi = selectableLi.clone(),
-          value = $option.val(),
-          elementId = that.sanitize(value);
-
-      selectableLi
-        .data('ms-value', value)
-        .addClass('ms-elem-selectable')
-        .attr('id', elementId+'-selectable');
-
-      selectedLi
-        .data('ms-value', value)
-        .addClass('ms-elem-selection')
-        .attr('id', elementId+'-selection')
-        .hide();
-
-      if ($option.prop('disabled') || ms.prop('disabled')){
-        selectedLi.addClass(that.options.disabledClass);
-        selectableLi.addClass(that.options.disabledClass);
-      }
-
-      var $optgroup = $option.parent('optgroup');
-
-      if ($optgroup.length > 0){
-        var optgroupLabel = $optgroup.attr('label'),
-            optgroupId = that.sanitize(optgroupLabel),
-            $selectableOptgroup = that.$selectableUl.find('#optgroup-selectable-'+optgroupId),
-            $selectionOptgroup = that.$selectionUl.find('#optgroup-selection-'+optgroupId);
-
-        if ($selectableOptgroup.length === 0){
-          var optgroupContainerTpl = '<li class="ms-optgroup-container"></li>',
-              optgroupTpl = '<ul class="ms-optgroup"><li class="ms-optgroup-label"><span>'+optgroupLabel+'</span></li></ul>';
-
-          $selectableOptgroup = $(optgroupContainerTpl);
-          $selectionOptgroup = $(optgroupContainerTpl);
-          $selectableOptgroup.attr('id', 'optgroup-selectable-'+optgroupId);
-          $selectionOptgroup.attr('id', 'optgroup-selection-'+optgroupId);
-          $selectableOptgroup.append($(optgroupTpl));
-          $selectionOptgroup.append($(optgroupTpl));
-          if (that.options.selectableOptgroup){
-            $selectableOptgroup.find('.ms-optgroup-label').on('click', function(){
-              var values = $optgroup.children(':not(:selected, :disabled)').map(function(){ return $(this).val() }).get();
-              that.select(values);
-            });
-            $selectionOptgroup.find('.ms-optgroup-label').on('click', function(){
-              var values = $optgroup.children(':selected:not(:disabled)').map(function(){ return $(this).val() }).get();
-              that.deselect(values);
-            });
-          }
-          that.$selectableUl.append($selectableOptgroup);
-          that.$selectionUl.append($selectionOptgroup);
-        }
-        index = index == undefined ? $selectableOptgroup.find('ul').children().length : index + 1;
-        selectableLi.insertAt(index, $selectableOptgroup.children());
-        selectedLi.insertAt(index, $selectionOptgroup.children());
-      } else {
-        index = index == undefined ? that.$selectableUl.children().length : index;
-
-        selectableLi.insertAt(index, that.$selectableUl);
-        selectedLi.insertAt(index, that.$selectionUl);
-      }
-    },
-
-    'addOption' : function(options){
-      var that = this;
-
-      if (options.value) options = [options];
-      $.each(options, function(index, option){
-        if (option.value && that.$element.find("option[value='"+option.value+"']").length === 0){
-          var $option = $('<option value="'+option.value+'">'+option.text+'</option>'),
-              index = parseInt((typeof option.index === 'undefined' ? that.$element.children().length : option.index)),
-              $container = option.nested == undefined ? that.$element : $("optgroup[label='"+option.nested+"']")
-
-          $option.insertAt(index, $container);
-          that.generateLisFromOption($option.get(0), index, option.nested);
-        }
-      })
-    },
-
-    'escapeHTML' : function(text){
-      return $("<div>").text(text).html();
-    },
-
-    'activeKeyboard' : function($list){
-      var that = this;
-
-      $list.on('focus', function(){
-        $(this).addClass('ms-focus');
-      })
-      .on('blur', function(){
-        $(this).removeClass('ms-focus');
-      })
-      .on('keydown', function(e){
-        switch (e.which) {
-          case 40:
-          case 38:
-            e.preventDefault();
-            e.stopPropagation();
-            that.moveHighlight($(this), (e.which === 38) ? -1 : 1);
-            return;
-          case 37:
-          case 39:
-            e.preventDefault();
-            e.stopPropagation();
-            that.switchList($list);
-            return;
-          case 9:
-            if(that.$element.is('[tabindex]')){
-              e.preventDefault();
-              var tabindex = parseInt(that.$element.attr('tabindex'), 10);
-              tabindex = (e.shiftKey) ? tabindex-1 : tabindex+1;
-              $('[tabindex="'+(tabindex)+'"]').focus();
-              return;
-            }else{
-              if(e.shiftKey){
-                that.$element.trigger('focus');
-              }
-            }
-        }
-        if($.inArray(e.which, that.options.keySelect) > -1){
-          e.preventDefault();
-          e.stopPropagation();
-          that.selectHighlighted($list);
-          return;
-        }
-      });
-    },
-
-    'moveHighlight': function($list, direction){
-      var $elems = $list.find(this.elemsSelector),
-          $currElem = $elems.filter('.ms-hover'),
-          $nextElem = null,
-          elemHeight = $elems.first().outerHeight(),
-          containerHeight = $list.height(),
-          containerSelector = '#'+this.$container.prop('id');
-
-      $elems.removeClass('ms-hover');
-      if (direction === 1){ // DOWN
-
-        $nextElem = $currElem.nextAll(this.elemsSelector).first();
-        if ($nextElem.length === 0){
-          var $optgroupUl = $currElem.parent();
-
-          if ($optgroupUl.hasClass('ms-optgroup')){
-            var $optgroupLi = $optgroupUl.parent(),
-                $nextOptgroupLi = $optgroupLi.next(':visible');
-
-            if ($nextOptgroupLi.length > 0){
-              $nextElem = $nextOptgroupLi.find(this.elemsSelector).first();
-            } else {
-              $nextElem = $elems.first();
-            }
-          } else {
-            $nextElem = $elems.first();
-          }
-        }
-      } else if (direction === -1){ // UP
-
-        $nextElem = $currElem.prevAll(this.elemsSelector).first();
-        if ($nextElem.length === 0){
-          var $optgroupUl = $currElem.parent();
-
-          if ($optgroupUl.hasClass('ms-optgroup')){
-            var $optgroupLi = $optgroupUl.parent(),
-                $prevOptgroupLi = $optgroupLi.prev(':visible');
-
-            if ($prevOptgroupLi.length > 0){
-              $nextElem = $prevOptgroupLi.find(this.elemsSelector).last();
-            } else {
-              $nextElem = $elems.last();
-            }
-          } else {
-            $nextElem = $elems.last();
-          }
-        }
-      }
-      if ($nextElem.length > 0){
-        $nextElem.addClass('ms-hover');
-        var scrollTo = $list.scrollTop() + $nextElem.position().top -
-                       containerHeight / 2 + elemHeight / 2;
-
-        $list.scrollTop(scrollTo);
-      }
-    },
-
-    'selectHighlighted' : function($list){
-      var $elems = $list.find(this.elemsSelector),
-          $highlightedElem = $elems.filter('.ms-hover').first();
-
-      if ($highlightedElem.length > 0){
-        if ($list.parent().hasClass('ms-selectable')){
-          this.select($highlightedElem.data('ms-value'));
-        } else {
-          this.deselect($highlightedElem.data('ms-value'));
-        }
-        $elems.removeClass('ms-hover');
-      }
-    },
-
-    'switchList' : function($list){
-      $list.blur();
-      this.$container.find(this.elemsSelector).removeClass('ms-hover');
-      if ($list.parent().hasClass('ms-selectable')){
-        this.$selectionUl.focus();
-      } else {
-        this.$selectableUl.focus();
-      }
-    },
-
-    'activeMouse' : function($list){
-      var that = this;
-
-      $('body').on('mouseenter', that.elemsSelector, function(){
-        $(this).parents('.ms-container').find(that.elemsSelector).removeClass('ms-hover');
-        $(this).addClass('ms-hover');
-      });
-
-      $('body').on('mouseleave', that.elemsSelector, function () {
-          $(this).parents('.ms-container').find(that.elemsSelector).removeClass('ms-hover');;
-      });
-    },
-
-    'refresh' : function() {
-      this.destroy();
-      this.$element.multiSelect(this.options);
-    },
-
-    'destroy' : function(){
-      $("#ms-"+this.$element.attr("id")).remove();
-      this.$element.css('position', '').css('left', '')
-      this.$element.removeData('multiselect');
-    },
-
-    'select' : function(value, method){
-      if (typeof value === 'string'){ value = [value]; }
-
-      var that = this,
-          ms = this.$element,
-          msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
-          selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable').filter(':not(.'+that.options.disabledClass+')'),
-          selections = this.$selectionUl.find('#' + msIds.join('-selection, #') + '-selection').filter(':not(.'+that.options.disabledClass+')'),
-          options = ms.find('option:not(:disabled)').filter(function(){ return($.inArray(this.value, value) > -1); });
-
-      if (method === 'init'){
-        selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
-        selections = this.$selectionUl.find('#' + msIds.join('-selection, #') + '-selection');
-      }
-
-      if (selectables.length > 0){
-        selectables.addClass('ms-selected').hide();
-        selections.addClass('ms-selected').show();
-
-        options.prop('selected', true);
-
-        that.$container.find(that.elemsSelector).removeClass('ms-hover');
-
-        var selectableOptgroups = that.$selectableUl.children('.ms-optgroup-container');
-        if (selectableOptgroups.length > 0){
-          selectableOptgroups.each(function(){
-            var selectablesLi = $(this).find('.ms-elem-selectable');
-            if (selectablesLi.length === selectablesLi.filter('.ms-selected').length){
-              $(this).find('.ms-optgroup-label').hide();
-            }
-          });
-
-          var selectionOptgroups = that.$selectionUl.children('.ms-optgroup-container');
-          selectionOptgroups.each(function(){
-            var selectionsLi = $(this).find('.ms-elem-selection');
-            if (selectionsLi.filter('.ms-selected').length > 0){
-              $(this).find('.ms-optgroup-label').show();
-            }
-          });
-        } else {
-          if (that.options.keepOrder && method !== 'init'){
-            var selectionLiLast = that.$selectionUl.find('.ms-selected');
-            if((selectionLiLast.length > 1) && (selectionLiLast.last().get(0) != selections.get(0))) {
-              selections.insertAfter(selectionLiLast.last());
-            }
-          }
-        }
-        if (method !== 'init'){
-          ms.trigger('change');
-          if (typeof that.options.afterSelect === 'function') {
-            that.options.afterSelect.call(this, value);
-          }
-        }
-      }
-    },
-
-    'deselect' : function(value){
-      if (typeof value === 'string'){ value = [value]; }
-
-      var that = this,
-          ms = this.$element,
-          msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
-          selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
-          selections = this.$selectionUl.find('#' + msIds.join('-selection, #')+'-selection').filter('.ms-selected').filter(':not(.'+that.options.disabledClass+')'),
-          options = ms.find('option').filter(function(){ return($.inArray(this.value, value) > -1); });
-
-      if (selections.length > 0){
-        selectables.removeClass('ms-selected').show();
-        selections.removeClass('ms-selected').hide();
-        options.prop('selected', false);
-
-        that.$container.find(that.elemsSelector).removeClass('ms-hover');
-
-        var selectableOptgroups = that.$selectableUl.children('.ms-optgroup-container');
-        if (selectableOptgroups.length > 0){
-          selectableOptgroups.each(function(){
-            var selectablesLi = $(this).find('.ms-elem-selectable');
-            if (selectablesLi.filter(':not(.ms-selected)').length > 0){
-              $(this).find('.ms-optgroup-label').show();
-            }
-          });
-
-          var selectionOptgroups = that.$selectionUl.children('.ms-optgroup-container');
-          selectionOptgroups.each(function(){
-            var selectionsLi = $(this).find('.ms-elem-selection');
-            if (selectionsLi.filter('.ms-selected').length === 0){
-              $(this).find('.ms-optgroup-label').hide();
-            }
-          });
-        }
-        ms.trigger('change');
-        if (typeof that.options.afterDeselect === 'function') {
-          that.options.afterDeselect.call(this, value);
-        }
-      }
-    },
-
-    'select_all' : function(){
-      var ms = this.$element,
-          values = ms.val();
-
-      ms.find('option:not(":disabled")').prop('selected', true);
-      this.$selectableUl.find('.ms-elem-selectable').filter(':not(.'+this.options.disabledClass+')').addClass('ms-selected').hide();
-      this.$selectionUl.find('.ms-optgroup-label').show();
-      this.$selectableUl.find('.ms-optgroup-label').hide();
-      this.$selectionUl.find('.ms-elem-selection').filter(':not(.'+this.options.disabledClass+')').addClass('ms-selected').show();
-      this.$selectionUl.focus();
-      ms.trigger('change');
-      if (typeof this.options.afterSelect === 'function') {
-        var selectedValues = $.grep(ms.val(), function(item){
-          return $.inArray(item, values) < 0;
-        });
-        this.options.afterSelect.call(this, selectedValues);
-      }
-    },
-
-    'deselect_all' : function(){
-      var ms = this.$element,
-          values = ms.val();
-
-      ms.find('option').prop('selected', false);
-      this.$selectableUl.find('.ms-elem-selectable').removeClass('ms-selected').show();
-      this.$selectionUl.find('.ms-optgroup-label').hide();
-      this.$selectableUl.find('.ms-optgroup-label').show();
-      this.$selectionUl.find('.ms-elem-selection').removeClass('ms-selected').hide();
-      this.$selectableUl.focus();
-      ms.trigger('change');
-      if (typeof this.options.afterDeselect === 'function') {
-        this.options.afterDeselect.call(this, values);
-      }
-    },
-
-    sanitize: function(value){
-      var hash = 0, i, character;
-      if (value.length == 0) return hash;
-      var ls = 0;
-      for (i = 0, ls = value.length; i < ls; i++) {
-        character  = value.charCodeAt(i);
-        hash  = ((hash<<5)-hash)+character;
-        hash |= 0; // Convert to 32bit integer
-      }
-      return hash;
-    }
-  };
-
-  /* MULTISELECT PLUGIN DEFINITION
-   * ======================= */
-
-  $.fn.multiSelect = function () {
-    var option = arguments[0],
-        args = arguments;
-
-    return this.each(function () {
-      var $this = $(this),
-          data = $this.data('multiselect'),
-          options = $.extend({}, $.fn.multiSelect.defaults, $this.data(), typeof option === 'object' && option);
-
-      if (!data){ $this.data('multiselect', (data = new MultiSelect(this, options))); }
-
-      if (typeof option === 'string'){
-        data[option](args[1]);
-      } else {
-        data.init();
-      }
-    });
-  };
-
-  $.fn.multiSelect.defaults = {
-    keySelect: [32],
-    selectableOptgroup: false,
-    disabledClass : 'disabled',
-    dblClick : false,
-    keepOrder: false,
-    cssClass: ''
-  };
-
-  $.fn.multiSelect.Constructor = MultiSelect;
-
-  $.fn.insertAt = function(index, $parent) {
-    return this.each(function() {
-      if (index === 0) {
-        $parent.prepend(this);
-      } else {
-        $parent.children().eq(index - 1).after(this);
-      }
-    });
-}
-
-}(window.jQuery);
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.pnotify.min.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.pnotify.min.js
deleted file mode 100644
index 801793916..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.pnotify.min.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * jQuery Pines Notify (pnotify) Plugin 1.2.0
- *
- * http://pinesframework.org/pnotify/
- * Copyright (c) 2009-2012 Hunter Perrin
- *
- * Triple license under the GPL, LGPL, and MPL:
- *	  http://www.gnu.org/licenses/gpl.html
- *	  http://www.gnu.org/licenses/lgpl.html
- *	  http://www.mozilla.org/MPL/MPL-1.1.html
- */
-(function(d){var q,j,r,i=d(window),u={jqueryui:{container:"ui-widget ui-widget-content ui-corner-all",notice:"ui-state-highlight",notice_icon:"ui-icon ui-icon-info",info:"",info_icon:"ui-icon ui-icon-info",success:"ui-state-default",success_icon:"ui-icon ui-icon-circle-check",error:"ui-state-error",error_icon:"ui-icon ui-icon-alert",closer:"ui-icon ui-icon-close",pin_up:"ui-icon ui-icon-pin-w",pin_down:"ui-icon ui-icon-pin-s",hi_menu:"ui-state-default ui-corner-bottom",hi_btn:"ui-state-default ui-corner-all",
-hi_btnhov:"ui-state-hover",hi_hnd:"ui-icon ui-icon-grip-dotted-horizontal"},bootstrap:{container:"alert",notice:"",notice_icon:"icon-exclamation-sign",info:"alert-info",info_icon:"icon-info-sign",success:"alert-success",success_icon:"icon-ok-sign",error:"alert-error",error_icon:"icon-warning-sign",closer:"icon-remove",pin_up:"icon-pause",pin_down:"icon-play",hi_menu:"well",hi_btn:"btn",hi_btnhov:"",hi_hnd:"icon-chevron-down"}},s=function(){r=d("body");i=d(window);i.bind("resize",function(){j&&clearTimeout(j);
-j=setTimeout(d.pnotify_position_all,10)})};document.body?s():d(s);d.extend({pnotify_remove_all:function(){var e=i.data("pnotify");e&&e.length&&d.each(e,function(){this.pnotify_remove&&this.pnotify_remove()})},pnotify_position_all:function(){j&&clearTimeout(j);j=null;var e=i.data("pnotify");e&&e.length&&(d.each(e,function(){var d=this.opts.stack;if(d)d.nextpos1=d.firstpos1,d.nextpos2=d.firstpos2,d.addpos2=0,d.animation=true}),d.each(e,function(){this.pnotify_position()}))},pnotify:function(e){var g,
-a;typeof e!="object"?(a=d.extend({},d.pnotify.defaults),a.text=e):a=d.extend({},d.pnotify.defaults,e);for(var p in a)typeof p=="string"&&p.match(/^pnotify_/)&&(a[p.replace(/^pnotify_/,"")]=a[p]);if(a.before_init&&a.before_init(a)===false)return null;var k,o=function(a,c){b.css("display","none");var f=document.elementFromPoint(a.clientX,a.clientY);b.css("display","block");var e=d(f),g=e.css("cursor");b.css("cursor",g!="auto"?g:"default");if(!k||k.get(0)!=f)k&&(n.call(k.get(0),"mouseleave",a.originalEvent),
-n.call(k.get(0),"mouseout",a.originalEvent)),n.call(f,"mouseenter",a.originalEvent),n.call(f,"mouseover",a.originalEvent);n.call(f,c,a.originalEvent);k=e},f=u[a.styling],b=d("<div />",{"class":"ui-pnotify "+a.addclass,css:{display:"none"},mouseenter:function(l){a.nonblock&&l.stopPropagation();a.mouse_reset&&g=="out"&&(b.stop(true),g="in",b.css("height","auto").animate({width:a.width,opacity:a.nonblock?a.nonblock_opacity:a.opacity},"fast"));a.nonblock&&b.animate({opacity:a.nonblock_opacity},"fast");
-a.hide&&a.mouse_reset&&b.pnotify_cancel_remove();a.sticker&&!a.nonblock&&b.sticker.trigger("pnotify_icon").css("visibility","visible");a.closer&&!a.nonblock&&b.closer.css("visibility","visible")},mouseleave:function(l){a.nonblock&&l.stopPropagation();k=null;b.css("cursor","auto");a.nonblock&&g!="out"&&b.animate({opacity:a.opacity},"fast");a.hide&&a.mouse_reset&&b.pnotify_queue_remove();a.sticker_hover&&b.sticker.css("visibility","hidden");a.closer_hover&&b.closer.css("visibility","hidden");d.pnotify_position_all()},
-mouseover:function(b){a.nonblock&&b.stopPropagation()},mouseout:function(b){a.nonblock&&b.stopPropagation()},mousemove:function(b){a.nonblock&&(b.stopPropagation(),o(b,"onmousemove"))},mousedown:function(b){a.nonblock&&(b.stopPropagation(),b.preventDefault(),o(b,"onmousedown"))},mouseup:function(b){a.nonblock&&(b.stopPropagation(),b.preventDefault(),o(b,"onmouseup"))},click:function(b){a.nonblock&&(b.stopPropagation(),o(b,"onclick"))},dblclick:function(b){a.nonblock&&(b.stopPropagation(),o(b,"ondblclick"))}});
-b.opts=a;b.container=d("<div />",{"class":f.container+" ui-pnotify-container "+(a.type=="error"?f.error:a.type=="info"?f.info:a.type=="success"?f.success:f.notice)}).appendTo(b);a.cornerclass!=""&&b.container.removeClass("ui-corner-all").addClass(a.cornerclass);a.shadow&&b.container.addClass("ui-pnotify-shadow");b.pnotify_version="1.2.0";b.pnotify=function(l){var c=a;typeof l=="string"?a.text=l:a=d.extend({},a,l);for(var e in a)typeof e=="string"&&e.match(/^pnotify_/)&&(a[e.replace(/^pnotify_/,"")]=
-a[e]);b.opts=a;a.cornerclass!=c.cornerclass&&b.container.removeClass("ui-corner-all").addClass(a.cornerclass);a.shadow!=c.shadow&&(a.shadow?b.container.addClass("ui-pnotify-shadow"):b.container.removeClass("ui-pnotify-shadow"));a.addclass===false?b.removeClass(c.addclass):a.addclass!==c.addclass&&b.removeClass(c.addclass).addClass(a.addclass);a.title===false?b.title_container.slideUp("fast"):a.title!==c.title&&(a.title_escape?b.title_container.text(a.title).slideDown(200):b.title_container.html(a.title).slideDown(200));
-a.text===false?b.text_container.slideUp("fast"):a.text!==c.text&&(a.text_escape?b.text_container.text(a.text).slideDown(200):b.text_container.html(a.insert_brs?String(a.text).replace(/\n/g,"<br />"):a.text).slideDown(200));b.pnotify_history=a.history;b.pnotify_hide=a.hide;a.type!=c.type&&b.container.removeClass(f.error+" "+f.notice+" "+f.success+" "+f.info).addClass(a.type=="error"?f.error:a.type=="info"?f.info:a.type=="success"?f.success:f.notice);if(a.icon!==c.icon||a.icon===true&&a.type!=c.type)b.container.find("div.ui-pnotify-icon").remove(),
-a.icon!==false&&d("<div />",{"class":"ui-pnotify-icon"}).append(d("<span />",{"class":a.icon===true?a.type=="error"?f.error_icon:a.type=="info"?f.info_icon:a.type=="success"?f.success_icon:f.notice_icon:a.icon})).prependTo(b.container);a.width!==c.width&&b.animate({width:a.width});a.min_height!==c.min_height&&b.container.animate({minHeight:a.min_height});a.opacity!==c.opacity&&b.fadeTo(a.animate_speed,a.opacity);!a.closer||a.nonblock?b.closer.css("display","none"):b.closer.css("display","block");
-!a.sticker||a.nonblock?b.sticker.css("display","none"):b.sticker.css("display","block");b.sticker.trigger("pnotify_icon");a.sticker_hover?b.sticker.css("visibility","hidden"):a.nonblock||b.sticker.css("visibility","visible");a.closer_hover?b.closer.css("visibility","hidden"):a.nonblock||b.closer.css("visibility","visible");a.hide?c.hide||b.pnotify_queue_remove():b.pnotify_cancel_remove();b.pnotify_queue_position();return b};b.pnotify_position=function(a){var c=b.opts.stack;if(c){if(!c.nextpos1)c.nextpos1=
-c.firstpos1;if(!c.nextpos2)c.nextpos2=c.firstpos2;if(!c.addpos2)c.addpos2=0;var d=b.css("display")=="none";if(!d||a){var f,e={},g;switch(c.dir1){case "down":g="top";break;case "up":g="bottom";break;case "left":g="right";break;case "right":g="left"}a=parseInt(b.css(g));isNaN(a)&&(a=0);if(typeof c.firstpos1=="undefined"&&!d)c.firstpos1=a,c.nextpos1=c.firstpos1;var h;switch(c.dir2){case "down":h="top";break;case "up":h="bottom";break;case "left":h="right";break;case "right":h="left"}f=parseInt(b.css(h));
-isNaN(f)&&(f=0);if(typeof c.firstpos2=="undefined"&&!d)c.firstpos2=f,c.nextpos2=c.firstpos2;if(c.dir1=="down"&&c.nextpos1+b.height()>i.height()||c.dir1=="up"&&c.nextpos1+b.height()>i.height()||c.dir1=="left"&&c.nextpos1+b.width()>i.width()||c.dir1=="right"&&c.nextpos1+b.width()>i.width())c.nextpos1=c.firstpos1,c.nextpos2+=c.addpos2+(typeof c.spacing2=="undefined"?25:c.spacing2),c.addpos2=0;if(c.animation&&c.nextpos2<f)switch(c.dir2){case "down":e.top=c.nextpos2+"px";break;case "up":e.bottom=c.nextpos2+
-"px";break;case "left":e.right=c.nextpos2+"px";break;case "right":e.left=c.nextpos2+"px"}else b.css(h,c.nextpos2+"px");switch(c.dir2){case "down":case "up":if(b.outerHeight(true)>c.addpos2)c.addpos2=b.height();break;case "left":case "right":if(b.outerWidth(true)>c.addpos2)c.addpos2=b.width()}if(c.nextpos1)if(c.animation&&(a>c.nextpos1||e.top||e.bottom||e.right||e.left))switch(c.dir1){case "down":e.top=c.nextpos1+"px";break;case "up":e.bottom=c.nextpos1+"px";break;case "left":e.right=c.nextpos1+"px";
-break;case "right":e.left=c.nextpos1+"px"}else b.css(g,c.nextpos1+"px");(e.top||e.bottom||e.right||e.left)&&b.animate(e,{duration:500,queue:false});switch(c.dir1){case "down":case "up":c.nextpos1+=b.height()+(typeof c.spacing1=="undefined"?25:c.spacing1);break;case "left":case "right":c.nextpos1+=b.width()+(typeof c.spacing1=="undefined"?25:c.spacing1)}}}};b.pnotify_queue_position=function(a){j&&clearTimeout(j);a||(a=10);j=setTimeout(d.pnotify_position_all,a)};b.pnotify_display=function(){b.parent().length||
-b.appendTo(r);a.before_open&&a.before_open(b)===false||(a.stack.push!="top"&&b.pnotify_position(true),a.animation=="fade"||a.animation.effect_in=="fade"?b.show().fadeTo(0,0).hide():a.opacity!=1&&b.show().fadeTo(0,a.opacity).hide(),b.animate_in(function(){a.after_open&&a.after_open(b);b.pnotify_queue_position();a.hide&&b.pnotify_queue_remove()}))};b.pnotify_remove=function(){if(b.timer)window.clearTimeout(b.timer),b.timer=null;a.before_close&&a.before_close(b)===false||b.animate_out(function(){a.after_close&&
-a.after_close(b)===false||(b.pnotify_queue_position(),a.remove&&b.detach())})};b.animate_in=function(d){g="in";var c;c=typeof a.animation.effect_in!="undefined"?a.animation.effect_in:a.animation;c=="none"?(b.show(),d()):c=="show"?b.show(a.animate_speed,d):c=="fade"?b.show().fadeTo(a.animate_speed,a.opacity,d):c=="slide"?b.slideDown(a.animate_speed,d):typeof c=="function"?c("in",d,b):b.show(c,typeof a.animation.options_in=="object"?a.animation.options_in:{},a.animate_speed,d)};b.animate_out=function(d){g=
-"out";var c;c=typeof a.animation.effect_out!="undefined"?a.animation.effect_out:a.animation;c=="none"?(b.hide(),d()):c=="show"?b.hide(a.animate_speed,d):c=="fade"?b.fadeOut(a.animate_speed,d):c=="slide"?b.slideUp(a.animate_speed,d):typeof c=="function"?c("out",d,b):b.hide(c,typeof a.animation.options_out=="object"?a.animation.options_out:{},a.animate_speed,d)};b.pnotify_cancel_remove=function(){b.timer&&window.clearTimeout(b.timer)};b.pnotify_queue_remove=function(){b.pnotify_cancel_remove();b.timer=
-window.setTimeout(function(){b.pnotify_remove()},isNaN(a.delay)?0:a.delay)};b.closer=d("<div />",{"class":"ui-pnotify-closer",css:{cursor:"pointer",visibility:a.closer_hover?"hidden":"visible"},click:function(){b.pnotify_remove();b.sticker.css("visibility","hidden");b.closer.css("visibility","hidden")}}).append(d("<span />",{"class":f.closer})).appendTo(b.container);(!a.closer||a.nonblock)&&b.closer.css("display","none");b.sticker=d("<div />",{"class":"ui-pnotify-sticker",css:{cursor:"pointer",visibility:a.sticker_hover?
-"hidden":"visible"},click:function(){a.hide=!a.hide;a.hide?b.pnotify_queue_remove():b.pnotify_cancel_remove();d(this).trigger("pnotify_icon")}}).bind("pnotify_icon",function(){d(this).children().removeClass(f.pin_up+" "+f.pin_down).addClass(a.hide?f.pin_up:f.pin_down)}).append(d("<span />",{"class":f.pin_up})).appendTo(b.container);(!a.sticker||a.nonblock)&&b.sticker.css("display","none");a.icon!==false&&d("<div />",{"class":"ui-pnotify-icon"}).append(d("<span />",{"class":a.icon===true?a.type=="error"?
-f.error_icon:a.type=="info"?f.info_icon:a.type=="success"?f.success_icon:f.notice_icon:a.icon})).prependTo(b.container);b.title_container=d("<h4 />",{"class":"ui-pnotify-title"}).appendTo(b.container);a.title===false?b.title_container.hide():a.title_escape?b.title_container.text(a.title):b.title_container.html(a.title);b.text_container=d("<div />",{"class":"ui-pnotify-text"}).appendTo(b.container);a.text===false?b.text_container.hide():a.text_escape?b.text_container.text(a.text):b.text_container.html(a.insert_brs?
-String(a.text).replace(/\n/g,"<br />"):a.text);typeof a.width=="string"&&b.css("width",a.width);typeof a.min_height=="string"&&b.container.css("min-height",a.min_height);b.pnotify_history=a.history;b.pnotify_hide=a.hide;var h=i.data("pnotify");if(h==null||typeof h!="object")h=[];h=a.stack.push=="top"?d.merge([b],h):d.merge(h,[b]);i.data("pnotify",h);a.stack.push=="top"&&b.pnotify_queue_position(1);a.after_init&&a.after_init(b);if(a.history){var m=i.data("pnotify_history");typeof m=="undefined"&&(m=
-d("<div />",{"class":"ui-pnotify-history-container "+f.hi_menu,mouseleave:function(){m.animate({top:"-"+q+"px"},{duration:100,queue:false})}}).append(d("<div />",{"class":"ui-pnotify-history-header",text:"Redisplay"})).append(d("<button />",{"class":"ui-pnotify-history-all "+f.hi_btn,text:"All",mouseenter:function(){d(this).addClass(f.hi_btnhov)},mouseleave:function(){d(this).removeClass(f.hi_btnhov)},click:function(){d.each(h,function(){this.pnotify_history&&(this.is(":visible")?this.pnotify_hide&&
-this.pnotify_queue_remove():this.pnotify_display&&this.pnotify_display())});return false}})).append(d("<button />",{"class":"ui-pnotify-history-last "+f.hi_btn,text:"Last",mouseenter:function(){d(this).addClass(f.hi_btnhov)},mouseleave:function(){d(this).removeClass(f.hi_btnhov)},click:function(){var a=-1,b;do{b=a==-1?h.slice(a):h.slice(a,a+1);if(!b[0])break;a--}while(!b[0].pnotify_history||b[0].is(":visible"));if(!b[0])return false;b[0].pnotify_display&&b[0].pnotify_display();return false}})).appendTo(r),
-q=d("<span />",{"class":"ui-pnotify-history-pulldown "+f.hi_hnd,mouseenter:function(){m.animate({top:"0"},{duration:100,queue:false})}}).appendTo(m).offset().top+2,m.css({top:"-"+q+"px"}),i.data("pnotify_history",m))}a.stack.animation=false;b.pnotify_display();return b}});var t=/^on/,v=/^(dbl)?click$|^mouse(move|down|up|over|out|enter|leave)$|^contextmenu$/,w=/^(focus|blur|select|change|reset)$|^key(press|down|up)$/,x=/^(scroll|resize|(un)?load|abort|error)$/,n=function(e,g){var a,e=e.toLowerCase();
-document.createEvent&&this.dispatchEvent?(e=e.replace(t,""),e.match(v)?(d(this).offset(),a=document.createEvent("MouseEvents"),a.initMouseEvent(e,g.bubbles,g.cancelable,g.view,g.detail,g.screenX,g.screenY,g.clientX,g.clientY,g.ctrlKey,g.altKey,g.shiftKey,g.metaKey,g.button,g.relatedTarget)):e.match(w)?(a=document.createEvent("UIEvents"),a.initUIEvent(e,g.bubbles,g.cancelable,g.view,g.detail)):e.match(x)&&(a=document.createEvent("HTMLEvents"),a.initEvent(e,g.bubbles,g.cancelable)),a&&this.dispatchEvent(a)):
-(e.match(t)||(e="on"+e),a=document.createEventObject(g),this.fireEvent(e,a))};d.pnotify.defaults={title:false,title_escape:false,text:false,text_escape:false,styling:"bootstrap",addclass:"",cornerclass:"",nonblock:false,nonblock_opacity:0.2,history:true,width:"300px",min_height:"16px",type:"notice",icon:true,animation:"fade",animate_speed:"slow",opacity:1,shadow:true,closer:true,closer_hover:true,sticker:true,sticker_hover:true,hide:true,delay:8E3,mouse_reset:true,remove:true,insert_brs:true,stack:{dir1:"down",
-dir2:"left",push:"bottom",spacing1:25,spacing2:25}}})(jQuery);
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.qtip.min.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.qtip.min.js
deleted file mode 100644
index 28a2fd31e..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.qtip.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* qTip2 v2.2.0 tips viewport imagemap svg modal ie6 | qtip2.com | Licensed MIT, GPL | Sun Dec 15 2013 12:33:31 */
-
-!function(a,b,c){!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):jQuery&&!jQuery.fn.qtip&&a(jQuery)}(function(d){"use strict";function e(a,b,c,e){this.id=c,this.target=a,this.tooltip=G,this.elements={target:a},this._id=T+"-"+c,this.timers={img:{}},this.options=b,this.plugins={},this.cache={event:{},target:d(),disabled:F,attr:e,onTooltip:F,lastClass:""},this.rendered=this.destroyed=this.disabled=this.waiting=this.hiddenDuringWait=this.positioning=this.triggering=F}function f(a){return a===G||"object"!==d.type(a)}function g(a){return!(d.isFunction(a)||a&&a.attr||a.length||"object"===d.type(a)&&(a.jquery||a.then))}function h(a){var b,c,e,h;return f(a)?F:(f(a.metadata)&&(a.metadata={type:a.metadata}),"content"in a&&(b=a.content,f(b)||b.jquery||b.done?b=a.content={text:c=g(b)?F:b}:c=b.text,"ajax"in b&&(e=b.ajax,h=e&&e.once!==F,delete b.ajax,b.text=function(a,b){var f=c||d(this).attr(b.options.content.attr)||"Loading...",g=d.ajax(d.extend({},e,{context:b})).then(e.success,G,e.error).then(function(a){return a&&h&&b.set("content.text",a),a},function(a,c,d){b.destroyed||0===a.status||b.set("content.text",c+": "+d)});return h?f:(b.set("content.text",f),g)}),"title"in b&&(f(b.title)||(b.button=b.title.button,b.title=b.title.text),g(b.title||F)&&(b.title=F))),"position"in a&&f(a.position)&&(a.position={my:a.position,at:a.position}),"show"in a&&f(a.show)&&(a.show=a.show.jquery?{target:a.show}:a.show===E?{ready:E}:{event:a.show}),"hide"in a&&f(a.hide)&&(a.hide=a.hide.jquery?{target:a.hide}:{event:a.hide}),"style"in a&&f(a.style)&&(a.style={classes:a.style}),d.each(S,function(){this.sanitize&&this.sanitize(a)}),a)}function i(a,b){for(var c,d=0,e=a,f=b.split(".");e=e[f[d++]];)d<f.length&&(c=e);return[c||a,f.pop()]}function j(a,b){var c,d,e;for(c in this.checks)for(d in this.checks[c])(e=new RegExp(d,"i").exec(a))&&(b.push(e),("builtin"===c||this.plugins[c])&&this.checks[c][d].apply(this.plugins[c]||this,b))}function k(a){return W.concat("").join(a?"-"+a+" ":" ")}function l(c){return c&&{type:c.type,pageX:c.pageX,pageY:c.pageY,target:c.target,relatedTarget:c.relatedTarget,scrollX:c.scrollX||a.pageXOffset||b.body.scrollLeft||b.documentElement.scrollLeft,scrollY:c.scrollY||a.pageYOffset||b.body.scrollTop||b.documentElement.scrollTop}||{}}function m(a,b){return b>0?setTimeout(d.proxy(a,this),b):(a.call(this),void 0)}function n(a){return this.tooltip.hasClass(bb)?F:(clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this.timers.show=m.call(this,function(){this.toggle(E,a)},this.options.show.delay),void 0)}function o(a){if(this.tooltip.hasClass(bb))return F;var b=d(a.relatedTarget),c=b.closest(X)[0]===this.tooltip[0],e=b[0]===this.options.show.target[0];if(clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this!==b[0]&&"mouse"===this.options.position.target&&c||this.options.hide.fixed&&/mouse(out|leave|move)/.test(a.type)&&(c||e))try{a.preventDefault(),a.stopImmediatePropagation()}catch(f){}else this.timers.hide=m.call(this,function(){this.toggle(F,a)},this.options.hide.delay,this)}function p(a){return this.tooltip.hasClass(bb)||!this.options.hide.inactive?F:(clearTimeout(this.timers.inactive),this.timers.inactive=m.call(this,function(){this.hide(a)},this.options.hide.inactive),void 0)}function q(a){this.rendered&&this.tooltip[0].offsetWidth>0&&this.reposition(a)}function r(a,c,e){d(b.body).delegate(a,(c.split?c:c.join(ib+" "))+ib,function(){var a=z.api[d.attr(this,V)];a&&!a.disabled&&e.apply(a,arguments)})}function s(a,c,f){var g,i,j,k,l,m=d(b.body),n=a[0]===b?m:a,o=a.metadata?a.metadata(f.metadata):G,p="html5"===f.metadata.type&&o?o[f.metadata.name]:G,q=a.data(f.metadata.name||"qtipopts");try{q="string"==typeof q?d.parseJSON(q):q}catch(r){}if(k=d.extend(E,{},z.defaults,f,"object"==typeof q?h(q):G,h(p||o)),i=k.position,k.id=c,"boolean"==typeof k.content.text){if(j=a.attr(k.content.attr),k.content.attr===F||!j)return F;k.content.text=j}if(i.container.length||(i.container=m),i.target===F&&(i.target=n),k.show.target===F&&(k.show.target=n),k.show.solo===E&&(k.show.solo=i.container.closest("body")),k.hide.target===F&&(k.hide.target=n),k.position.viewport===E&&(k.position.viewport=i.container),i.container=i.container.eq(0),i.at=new B(i.at,E),i.my=new B(i.my),a.data(T))if(k.overwrite)a.qtip("destroy",!0);else if(k.overwrite===F)return F;return a.attr(U,c),k.suppress&&(l=a.attr("title"))&&a.removeAttr("title").attr(db,l).attr("title",""),g=new e(a,k,c,!!j),a.data(T,g),a.one("remove.qtip-"+c+" removeqtip.qtip-"+c,function(){var a;(a=d(this).data(T))&&a.destroy(!0)}),g}function t(a){return a.charAt(0).toUpperCase()+a.slice(1)}function u(a,b){var d,e,f=b.charAt(0).toUpperCase()+b.slice(1),g=(b+" "+tb.join(f+" ")+f).split(" "),h=0;if(sb[b])return a.css(sb[b]);for(;d=g[h++];)if((e=a.css(d))!==c)return sb[b]=d,e}function v(a,b){return Math.ceil(parseFloat(u(a,b)))}function w(a,b){this._ns="tip",this.options=b,this.offset=b.offset,this.size=[b.width,b.height],this.init(this.qtip=a)}function x(a,b){this.options=b,this._ns="-modal",this.init(this.qtip=a)}function y(a){this._ns="ie6",this.init(this.qtip=a)}var z,A,B,C,D,E=!0,F=!1,G=null,H="x",I="y",J="width",K="height",L="top",M="left",N="bottom",O="right",P="center",Q="flipinvert",R="shift",S={},T="qtip",U="data-hasqtip",V="data-qtip-id",W=["ui-widget","ui-tooltip"],X="."+T,Y="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),Z=T+"-fixed",$=T+"-default",_=T+"-focus",ab=T+"-hover",bb=T+"-disabled",cb="_replacedByqTip",db="oldtitle",eb={ie:function(){for(var a=3,c=b.createElement("div");(c.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]-->")&&c.getElementsByTagName("i")[0];);return a>4?a:0/0}(),iOS:parseFloat((""+(/CPU.*OS ([0-9_]{1,5})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_",".").replace("_",""))||F};A=e.prototype,A._when=function(a){return d.when.apply(d,a)},A.render=function(a){if(this.rendered||this.destroyed)return this;var b,c=this,e=this.options,f=this.cache,g=this.elements,h=e.content.text,i=e.content.title,j=e.content.button,k=e.position,l=("."+this._id+" ",[]);return d.attr(this.target[0],"aria-describedby",this._id),this.tooltip=g.tooltip=b=d("<div/>",{id:this._id,"class":[T,$,e.style.classes,T+"-pos-"+e.position.my.abbrev()].join(" "),width:e.style.width||"",height:e.style.height||"",tracking:"mouse"===k.target&&k.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":F,"aria-describedby":this._id+"-content","aria-hidden":E}).toggleClass(bb,this.disabled).attr(V,this.id).data(T,this).appendTo(k.container).append(g.content=d("<div />",{"class":T+"-content",id:this._id+"-content","aria-atomic":E})),this.rendered=-1,this.positioning=E,i&&(this._createTitle(),d.isFunction(i)||l.push(this._updateTitle(i,F))),j&&this._createButton(),d.isFunction(h)||l.push(this._updateContent(h,F)),this.rendered=E,this._setWidget(),d.each(S,function(a){var b;"render"===this.initialize&&(b=this(c))&&(c.plugins[a]=b)}),this._unassignEvents(),this._assignEvents(),this._when(l).then(function(){c._trigger("render"),c.positioning=F,c.hiddenDuringWait||!e.show.ready&&!a||c.toggle(E,f.event,F),c.hiddenDuringWait=F}),z.api[this.id]=this,this},A.destroy=function(a){function b(){if(!this.destroyed){this.destroyed=E;var a=this.target,b=a.attr(db);this.rendered&&this.tooltip.stop(1,0).find("*").remove().end().remove(),d.each(this.plugins,function(){this.destroy&&this.destroy()}),clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this._unassignEvents(),a.removeData(T).removeAttr(V).removeAttr(U).removeAttr("aria-describedby"),this.options.suppress&&b&&a.attr("title",b).removeAttr(db),this._unbind(a),this.options=this.elements=this.cache=this.timers=this.plugins=this.mouse=G,delete z.api[this.id]}}return this.destroyed?this.target:(a===E&&"hide"!==this.triggering||!this.rendered?b.call(this):(this.tooltip.one("tooltiphidden",d.proxy(b,this)),!this.triggering&&this.hide()),this.target)},C=A.checks={builtin:{"^id$":function(a,b,c,e){var f=c===E?z.nextid:c,g=T+"-"+f;f!==F&&f.length>0&&!d("#"+g).length?(this._id=g,this.rendered&&(this.tooltip[0].id=this._id,this.elements.content[0].id=this._id+"-content",this.elements.title[0].id=this._id+"-title")):a[b]=e},"^prerender":function(a,b,c){c&&!this.rendered&&this.render(this.options.show.ready)},"^content.text$":function(a,b,c){this._updateContent(c)},"^content.attr$":function(a,b,c,d){this.options.content.text===this.target.attr(d)&&this._updateContent(this.target.attr(c))},"^content.title$":function(a,b,c){return c?(c&&!this.elements.title&&this._createTitle(),this._updateTitle(c),void 0):this._removeTitle()},"^content.button$":function(a,b,c){this._updateButton(c)},"^content.title.(text|button)$":function(a,b,c){this.set("content."+b,c)},"^position.(my|at)$":function(a,b,c){"string"==typeof c&&(a[b]=new B(c,"at"===b))},"^position.container$":function(a,b,c){this.rendered&&this.tooltip.appendTo(c)},"^show.ready$":function(a,b,c){c&&(!this.rendered&&this.render(E)||this.toggle(E))},"^style.classes$":function(a,b,c,d){this.rendered&&this.tooltip.removeClass(d).addClass(c)},"^style.(width|height)":function(a,b,c){this.rendered&&this.tooltip.css(b,c)},"^style.widget|content.title":function(){this.rendered&&this._setWidget()},"^style.def":function(a,b,c){this.rendered&&this.tooltip.toggleClass($,!!c)},"^events.(render|show|move|hide|focus|blur)$":function(a,b,c){this.rendered&&this.tooltip[(d.isFunction(c)?"":"un")+"bind"]("tooltip"+b,c)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){if(this.rendered){var a=this.options.position;this.tooltip.attr("tracking","mouse"===a.target&&a.adjust.mouse),this._unassignEvents(),this._assignEvents()}}}},A.get=function(a){if(this.destroyed)return this;var b=i(this.options,a.toLowerCase()),c=b[0][b[1]];return c.precedance?c.string():c};var fb=/^position\.(my|at|adjust|target|container|viewport)|style|content|show\.ready/i,gb=/^prerender|show\.ready/i;A.set=function(a,b){if(this.destroyed)return this;{var c,e=this.rendered,f=F,g=this.options;this.checks}return"string"==typeof a?(c=a,a={},a[c]=b):a=d.extend({},a),d.each(a,function(b,c){if(e&&gb.test(b))return delete a[b],void 0;var h,j=i(g,b.toLowerCase());h=j[0][j[1]],j[0][j[1]]=c&&c.nodeType?d(c):c,f=fb.test(b)||f,a[b]=[j[0],j[1],c,h]}),h(g),this.positioning=E,d.each(a,d.proxy(j,this)),this.positioning=F,this.rendered&&this.tooltip[0].offsetWidth>0&&f&&this.reposition("mouse"===g.position.target?G:this.cache.event),this},A._update=function(a,b){var c=this,e=this.cache;return this.rendered&&a?(d.isFunction(a)&&(a=a.call(this.elements.target,e.event,this)||""),d.isFunction(a.then)?(e.waiting=E,a.then(function(a){return e.waiting=F,c._update(a,b)},G,function(a){return c._update(a,b)})):a===F||!a&&""!==a?F:(a.jquery&&a.length>0?b.empty().append(a.css({display:"block",visibility:"visible"})):b.html(a),this._waitForContent(b).then(function(a){a.images&&a.images.length&&c.rendered&&c.tooltip[0].offsetWidth>0&&c.reposition(e.event,!a.length)}))):F},A._waitForContent=function(a){var b=this.cache;return b.waiting=E,(d.fn.imagesLoaded?a.imagesLoaded():d.Deferred().resolve([])).done(function(){b.waiting=F}).promise()},A._updateContent=function(a,b){this._update(a,this.elements.content,b)},A._updateTitle=function(a,b){this._update(a,this.elements.title,b)===F&&this._removeTitle(F)},A._createTitle=function(){var a=this.elements,b=this._id+"-title";a.titlebar&&this._removeTitle(),a.titlebar=d("<div />",{"class":T+"-titlebar "+(this.options.style.widget?k("header"):"")}).append(a.title=d("<div />",{id:b,"class":T+"-title","aria-atomic":E})).insertBefore(a.content).delegate(".qtip-close","mousedown keydown mouseup keyup mouseout",function(a){d(this).toggleClass("ui-state-active ui-state-focus","down"===a.type.substr(-4))}).delegate(".qtip-close","mouseover mouseout",function(a){d(this).toggleClass("ui-state-hover","mouseover"===a.type)}),this.options.content.button&&this._createButton()},A._removeTitle=function(a){var b=this.elements;b.title&&(b.titlebar.remove(),b.titlebar=b.title=b.button=G,a!==F&&this.reposition())},A.reposition=function(c,e){if(!this.rendered||this.positioning||this.destroyed)return this;this.positioning=E;var f,g,h=this.cache,i=this.tooltip,j=this.options.position,k=j.target,l=j.my,m=j.at,n=j.viewport,o=j.container,p=j.adjust,q=p.method.split(" "),r=i.outerWidth(F),s=i.outerHeight(F),t=0,u=0,v=i.css("position"),w={left:0,top:0},x=i[0].offsetWidth>0,y=c&&"scroll"===c.type,z=d(a),A=o[0].ownerDocument,B=this.mouse;if(d.isArray(k)&&2===k.length)m={x:M,y:L},w={left:k[0],top:k[1]};else if("mouse"===k)m={x:M,y:L},!B||!B.pageX||!p.mouse&&c&&c.pageX?c&&c.pageX||((!p.mouse||this.options.show.distance)&&h.origin&&h.origin.pageX?c=h.origin:(!c||c&&("resize"===c.type||"scroll"===c.type))&&(c=h.event)):c=B,"static"!==v&&(w=o.offset()),A.body.offsetWidth!==(a.innerWidth||A.documentElement.clientWidth)&&(g=d(b.body).offset()),w={left:c.pageX-w.left+(g&&g.left||0),top:c.pageY-w.top+(g&&g.top||0)},p.mouse&&y&&B&&(w.left-=(B.scrollX||0)-z.scrollLeft(),w.top-=(B.scrollY||0)-z.scrollTop());else{if("event"===k?c&&c.target&&"scroll"!==c.type&&"resize"!==c.type?h.target=d(c.target):c.target||(h.target=this.elements.target):"event"!==k&&(h.target=d(k.jquery?k:this.elements.target)),k=h.target,k=d(k).eq(0),0===k.length)return this;k[0]===b||k[0]===a?(t=eb.iOS?a.innerWidth:k.width(),u=eb.iOS?a.innerHeight:k.height(),k[0]===a&&(w={top:(n||k).scrollTop(),left:(n||k).scrollLeft()})):S.imagemap&&k.is("area")?f=S.imagemap(this,k,m,S.viewport?q:F):S.svg&&k&&k[0].ownerSVGElement?f=S.svg(this,k,m,S.viewport?q:F):(t=k.outerWidth(F),u=k.outerHeight(F),w=k.offset()),f&&(t=f.width,u=f.height,g=f.offset,w=f.position),w=this.reposition.offset(k,w,o),(eb.iOS>3.1&&eb.iOS<4.1||eb.iOS>=4.3&&eb.iOS<4.33||!eb.iOS&&"fixed"===v)&&(w.left-=z.scrollLeft(),w.top-=z.scrollTop()),(!f||f&&f.adjustable!==F)&&(w.left+=m.x===O?t:m.x===P?t/2:0,w.top+=m.y===N?u:m.y===P?u/2:0)}return w.left+=p.x+(l.x===O?-r:l.x===P?-r/2:0),w.top+=p.y+(l.y===N?-s:l.y===P?-s/2:0),S.viewport?(w.adjusted=S.viewport(this,w,j,t,u,r,s),g&&w.adjusted.left&&(w.left+=g.left),g&&w.adjusted.top&&(w.top+=g.top)):w.adjusted={left:0,top:0},this._trigger("move",[w,n.elem||n],c)?(delete w.adjusted,e===F||!x||isNaN(w.left)||isNaN(w.top)||"mouse"===k||!d.isFunction(j.effect)?i.css(w):d.isFunction(j.effect)&&(j.effect.call(i,this,d.extend({},w)),i.queue(function(a){d(this).css({opacity:"",height:""}),eb.ie&&this.style.removeAttribute("filter"),a()})),this.positioning=F,this):this},A.reposition.offset=function(a,c,e){function f(a,b){c.left+=b*a.scrollLeft(),c.top+=b*a.scrollTop()}if(!e[0])return c;var g,h,i,j,k=d(a[0].ownerDocument),l=!!eb.ie&&"CSS1Compat"!==b.compatMode,m=e[0];do"static"!==(h=d.css(m,"position"))&&("fixed"===h?(i=m.getBoundingClientRect(),f(k,-1)):(i=d(m).position(),i.left+=parseFloat(d.css(m,"borderLeftWidth"))||0,i.top+=parseFloat(d.css(m,"borderTopWidth"))||0),c.left-=i.left+(parseFloat(d.css(m,"marginLeft"))||0),c.top-=i.top+(parseFloat(d.css(m,"marginTop"))||0),g||"hidden"===(j=d.css(m,"overflow"))||"visible"===j||(g=d(m)));while(m=m.offsetParent);return g&&(g[0]!==k[0]||l)&&f(g,1),c};var hb=(B=A.reposition.Corner=function(a,b){a=(""+a).replace(/([A-Z])/," $1").replace(/middle/gi,P).toLowerCase(),this.x=(a.match(/left|right/i)||a.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(a.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase(),this.forceY=!!b;var c=a.charAt(0);this.precedance="t"===c||"b"===c?I:H}).prototype;hb.invert=function(a,b){this[a]=this[a]===M?O:this[a]===O?M:b||this[a]},hb.string=function(){var a=this.x,b=this.y;return a===b?a:this.precedance===I||this.forceY&&"center"!==b?b+" "+a:a+" "+b},hb.abbrev=function(){var a=this.string().split(" ");return a[0].charAt(0)+(a[1]&&a[1].charAt(0)||"")},hb.clone=function(){return new B(this.string(),this.forceY)},A.toggle=function(a,c){var e=this.cache,f=this.options,g=this.tooltip;if(c){if(/over|enter/.test(c.type)&&/out|leave/.test(e.event.type)&&f.show.target.add(c.target).length===f.show.target.length&&g.has(c.relatedTarget).length)return this;e.event=l(c)}if(this.waiting&&!a&&(this.hiddenDuringWait=E),!this.rendered)return a?this.render(1):this;if(this.destroyed||this.disabled)return this;var h,i,j,k=a?"show":"hide",m=this.options[k],n=(this.options[a?"hide":"show"],this.options.position),o=this.options.content,p=this.tooltip.css("width"),q=this.tooltip.is(":visible"),r=a||1===m.target.length,s=!c||m.target.length<2||e.target[0]===c.target;return(typeof a).search("boolean|number")&&(a=!q),h=!g.is(":animated")&&q===a&&s,i=h?G:!!this._trigger(k,[90]),this.destroyed?this:(i!==F&&a&&this.focus(c),!i||h?this:(d.attr(g[0],"aria-hidden",!a),a?(e.origin=l(this.mouse),d.isFunction(o.text)&&this._updateContent(o.text,F),d.isFunction(o.title)&&this._updateTitle(o.title,F),!D&&"mouse"===n.target&&n.adjust.mouse&&(d(b).bind("mousemove."+T,this._storeMouse),D=E),p||g.css("width",g.outerWidth(F)),this.reposition(c,arguments[2]),p||g.css("width",""),m.solo&&("string"==typeof m.solo?d(m.solo):d(X,m.solo)).not(g).not(m.target).qtip("hide",d.Event("tooltipsolo"))):(clearTimeout(this.timers.show),delete e.origin,D&&!d(X+'[tracking="true"]:visible',m.solo).not(g).length&&(d(b).unbind("mousemove."+T),D=F),this.blur(c)),j=d.proxy(function(){a?(eb.ie&&g[0].style.removeAttribute("filter"),g.css("overflow",""),"string"==typeof m.autofocus&&d(this.options.show.autofocus,g).focus(),this.options.show.target.trigger("qtip-"+this.id+"-inactive")):g.css({display:"",visibility:"",opacity:"",left:"",top:""}),this._trigger(a?"visible":"hidden")},this),m.effect===F||r===F?(g[k](),j()):d.isFunction(m.effect)?(g.stop(1,1),m.effect.call(g,this),g.queue("fx",function(a){j(),a()})):g.fadeTo(90,a?1:0,j),a&&m.target.trigger("qtip-"+this.id+"-inactive"),this))},A.show=function(a){return this.toggle(E,a)},A.hide=function(a){return this.toggle(F,a)},A.focus=function(a){if(!this.rendered||this.destroyed)return this;var b=d(X),c=this.tooltip,e=parseInt(c[0].style.zIndex,10),f=z.zindex+b.length;return c.hasClass(_)||this._trigger("focus",[f],a)&&(e!==f&&(b.each(function(){this.style.zIndex>e&&(this.style.zIndex=this.style.zIndex-1)}),b.filter("."+_).qtip("blur",a)),c.addClass(_)[0].style.zIndex=f),this},A.blur=function(a){return!this.rendered||this.destroyed?this:(this.tooltip.removeClass(_),this._trigger("blur",[this.tooltip.css("zIndex")],a),this)},A.disable=function(a){return this.destroyed?this:("toggle"===a?a=!(this.rendered?this.tooltip.hasClass(bb):this.disabled):"boolean"!=typeof a&&(a=E),this.rendered&&this.tooltip.toggleClass(bb,a).attr("aria-disabled",a),this.disabled=!!a,this)},A.enable=function(){return this.disable(F)},A._createButton=function(){var a=this,b=this.elements,c=b.tooltip,e=this.options.content.button,f="string"==typeof e,g=f?e:"Close tooltip";b.button&&b.button.remove(),b.button=e.jquery?e:d("<a />",{"class":"qtip-close "+(this.options.style.widget?"":T+"-icon"),title:g,"aria-label":g}).prepend(d("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),b.button.appendTo(b.titlebar||c).attr("role","button").click(function(b){return c.hasClass(bb)||a.hide(b),F})},A._updateButton=function(a){if(!this.rendered)return F;var b=this.elements.button;a?this._createButton():b.remove()},A._setWidget=function(){var a=this.options.style.widget,b=this.elements,c=b.tooltip,d=c.hasClass(bb);c.removeClass(bb),bb=a?"ui-state-disabled":"qtip-disabled",c.toggleClass(bb,d),c.toggleClass("ui-helper-reset "+k(),a).toggleClass($,this.options.style.def&&!a),b.content&&b.content.toggleClass(k("content"),a),b.titlebar&&b.titlebar.toggleClass(k("header"),a),b.button&&b.button.toggleClass(T+"-icon",!a)},A._storeMouse=function(a){(this.mouse=l(a)).type="mousemove"},A._bind=function(a,b,c,e,f){var g="."+this._id+(e?"-"+e:"");b.length&&d(a).bind((b.split?b:b.join(g+" "))+g,d.proxy(c,f||this))},A._unbind=function(a,b){d(a).unbind("."+this._id+(b?"-"+b:""))};var ib="."+T;d(function(){r(X,["mouseenter","mouseleave"],function(a){var b="mouseenter"===a.type,c=d(a.currentTarget),e=d(a.relatedTarget||a.target),f=this.options;b?(this.focus(a),c.hasClass(Z)&&!c.hasClass(bb)&&clearTimeout(this.timers.hide)):"mouse"===f.position.target&&f.hide.event&&f.show.target&&!e.closest(f.show.target[0]).length&&this.hide(a),c.toggleClass(ab,b)}),r("["+V+"]",Y,p)}),A._trigger=function(a,b,c){var e=d.Event("tooltip"+a);return e.originalEvent=c&&d.extend({},c)||this.cache.event||G,this.triggering=a,this.tooltip.trigger(e,[this].concat(b||[])),this.triggering=F,!e.isDefaultPrevented()},A._bindEvents=function(a,b,c,e,f,g){if(e.add(c).length===e.length){var h=[];b=d.map(b,function(b){var c=d.inArray(b,a);return c>-1?(h.push(a.splice(c,1)[0]),void 0):b}),h.length&&this._bind(c,h,function(a){var b=this.rendered?this.tooltip[0].offsetWidth>0:!1;(b?g:f).call(this,a)})}this._bind(c,a,f),this._bind(e,b,g)},A._assignInitialEvents=function(a){function b(a){return this.disabled||this.destroyed?F:(this.cache.event=l(a),this.cache.target=a?d(a.target):[c],clearTimeout(this.timers.show),this.timers.show=m.call(this,function(){this.render("object"==typeof a||e.show.ready)},e.show.delay),void 0)}var e=this.options,f=e.show.target,g=e.hide.target,h=e.show.event?d.trim(""+e.show.event).split(" "):[],i=e.hide.event?d.trim(""+e.hide.event).split(" "):[];/mouse(over|enter)/i.test(e.show.event)&&!/mouse(out|leave)/i.test(e.hide.event)&&i.push("mouseleave"),this._bind(f,"mousemove",function(a){this._storeMouse(a),this.cache.onTarget=E}),this._bindEvents(h,i,f,g,b,function(){clearTimeout(this.timers.show)}),(e.show.ready||e.prerender)&&b.call(this,a)},A._assignEvents=function(){var c=this,e=this.options,f=e.position,g=this.tooltip,h=e.show.target,i=e.hide.target,j=f.container,k=f.viewport,l=d(b),m=(d(b.body),d(a)),r=e.show.event?d.trim(""+e.show.event).split(" "):[],s=e.hide.event?d.trim(""+e.hide.event).split(" "):[];d.each(e.events,function(a,b){c._bind(g,"toggle"===a?["tooltipshow","tooltiphide"]:["tooltip"+a],b,null,g)}),/mouse(out|leave)/i.test(e.hide.event)&&"window"===e.hide.leave&&this._bind(l,["mouseout","blur"],function(a){/select|option/.test(a.target.nodeName)||a.relatedTarget||this.hide(a)}),e.hide.fixed?i=i.add(g.addClass(Z)):/mouse(over|enter)/i.test(e.show.event)&&this._bind(i,"mouseleave",function(){clearTimeout(this.timers.show)}),(""+e.hide.event).indexOf("unfocus")>-1&&this._bind(j.closest("html"),["mousedown","touchstart"],function(a){var b=d(a.target),c=this.rendered&&!this.tooltip.hasClass(bb)&&this.tooltip[0].offsetWidth>0,e=b.parents(X).filter(this.tooltip[0]).length>0;b[0]===this.target[0]||b[0]===this.tooltip[0]||e||this.target.has(b[0]).length||!c||this.hide(a)}),"number"==typeof e.hide.inactive&&(this._bind(h,"qtip-"+this.id+"-inactive",p),this._bind(i.add(g),z.inactiveEvents,p,"-inactive")),this._bindEvents(r,s,h,i,n,o),this._bind(h.add(g),"mousemove",function(a){if("number"==typeof e.hide.distance){var b=this.cache.origin||{},c=this.options.hide.distance,d=Math.abs;(d(a.pageX-b.pageX)>=c||d(a.pageY-b.pageY)>=c)&&this.hide(a)}this._storeMouse(a)}),"mouse"===f.target&&f.adjust.mouse&&(e.hide.event&&this._bind(h,["mouseenter","mouseleave"],function(a){this.cache.onTarget="mouseenter"===a.type}),this._bind(l,"mousemove",function(a){this.rendered&&this.cache.onTarget&&!this.tooltip.hasClass(bb)&&this.tooltip[0].offsetWidth>0&&this.reposition(a)})),(f.adjust.resize||k.length)&&this._bind(d.event.special.resize?k:m,"resize",q),f.adjust.scroll&&this._bind(m.add(f.container),"scroll",q)},A._unassignEvents=function(){var c=[this.options.show.target[0],this.options.hide.target[0],this.rendered&&this.tooltip[0],this.options.position.container[0],this.options.position.viewport[0],this.options.position.container.closest("html")[0],a,b];this._unbind(d([]).pushStack(d.grep(c,function(a){return"object"==typeof a})))},z=d.fn.qtip=function(a,b,e){var f=(""+a).toLowerCase(),g=G,i=d.makeArray(arguments).slice(1),j=i[i.length-1],k=this[0]?d.data(this[0],T):G;return!arguments.length&&k||"api"===f?k:"string"==typeof a?(this.each(function(){var a=d.data(this,T);if(!a)return E;if(j&&j.timeStamp&&(a.cache.event=j),!b||"option"!==f&&"options"!==f)a[f]&&a[f].apply(a,i);else{if(e===c&&!d.isPlainObject(b))return g=a.get(b),F;a.set(b,e)}}),g!==G?g:this):"object"!=typeof a&&arguments.length?void 0:(k=h(d.extend(E,{},a)),this.each(function(a){var b,c;return c=d.isArray(k.id)?k.id[a]:k.id,c=!c||c===F||c.length<1||z.api[c]?z.nextid++:c,b=s(d(this),c,k),b===F?E:(z.api[c]=b,d.each(S,function(){"initialize"===this.initialize&&this(b)}),b._assignInitialEvents(j),void 0)}))},d.qtip=e,z.api={},d.each({attr:function(a,b){if(this.length){var c=this[0],e="title",f=d.data(c,"qtip");if(a===e&&f&&"object"==typeof f&&f.options.suppress)return arguments.length<2?d.attr(c,db):(f&&f.options.content.attr===e&&f.cache.attr&&f.set("content.text",b),this.attr(db,b))}return d.fn["attr"+cb].apply(this,arguments)},clone:function(a){var b=(d([]),d.fn["clone"+cb].apply(this,arguments));return a||b.filter("["+db+"]").attr("title",function(){return d.attr(this,db)}).removeAttr(db),b}},function(a,b){if(!b||d.fn[a+cb])return E;var c=d.fn[a+cb]=d.fn[a];d.fn[a]=function(){return b.apply(this,arguments)||c.apply(this,arguments)}}),d.ui||(d["cleanData"+cb]=d.cleanData,d.cleanData=function(a){for(var b,c=0;(b=d(a[c])).length;c++)if(b.attr(U))try{b.triggerHandler("removeqtip")}catch(e){}d["cleanData"+cb].apply(this,arguments)}),z.version="2.2.0",z.nextid=0,z.inactiveEvents=Y,z.zindex=15e3,z.defaults={prerender:F,id:F,overwrite:E,suppress:E,content:{text:E,attr:"title",title:F,button:F},position:{my:"top left",at:"bottom right",target:F,container:F,viewport:F,adjust:{x:0,y:0,mouse:E,scroll:E,resize:E,method:"flipinvert flipinvert"},effect:function(a,b){d(this).animate(b,{duration:200,queue:F})}},show:{target:F,event:"mouseenter",effect:E,delay:90,solo:F,ready:F,autofocus:F},hide:{target:F,event:"mouseleave",effect:E,delay:0,fixed:F,inactive:F,leave:"window",distance:F},style:{classes:"",widget:F,width:F,height:F,def:E},events:{render:G,move:G,show:G,hide:G,toggle:G,visible:G,hidden:G,focus:G,blur:G}};var jb,kb="margin",lb="border",mb="color",nb="background-color",ob="transparent",pb=" !important",qb=!!b.createElement("canvas").getContext,rb=/rgba?\(0, 0, 0(, 0)?\)|transparent|#123456/i,sb={},tb=["Webkit","O","Moz","ms"];if(qb)var ub=a.devicePixelRatio||1,vb=function(){var a=b.createElement("canvas").getContext("2d");return a.backingStorePixelRatio||a.webkitBackingStorePixelRatio||a.mozBackingStorePixelRatio||a.msBackingStorePixelRatio||a.oBackingStorePixelRatio||1}(),wb=ub/vb;else var xb=function(a,b,c){return"<qtipvml:"+a+' xmlns="urn:schemas-microsoft.com:vml" class="qtip-vml" '+(b||"")+' style="behavior: url(#default#VML); '+(c||"")+'" />'};d.extend(w.prototype,{init:function(a){var b,c;c=this.element=a.elements.tip=d("<div />",{"class":T+"-tip"}).prependTo(a.tooltip),qb?(b=d("<canvas />").appendTo(this.element)[0].getContext("2d"),b.lineJoin="miter",b.miterLimit=1e5,b.save()):(b=xb("shape",'coordorigin="0,0"',"position:absolute;"),this.element.html(b+b),a._bind(d("*",c).add(c),["click","mousedown"],function(a){a.stopPropagation()},this._ns)),a._bind(a.tooltip,"tooltipmove",this.reposition,this._ns,this),this.create()},_swapDimensions:function(){this.size[0]=this.options.height,this.size[1]=this.options.width},_resetDimensions:function(){this.size[0]=this.options.width,this.size[1]=this.options.height},_useTitle:function(a){var b=this.qtip.elements.titlebar;return b&&(a.y===L||a.y===P&&this.element.position().top+this.size[1]/2+this.options.offset<b.outerHeight(E))},_parseCorner:function(a){var b=this.qtip.options.position.my;return a===F||b===F?a=F:a===E?a=new B(b.string()):a.string||(a=new B(a),a.fixed=E),a},_parseWidth:function(a,b,c){var d=this.qtip.elements,e=lb+t(b)+"Width";return(c?v(c,e):v(d.content,e)||v(this._useTitle(a)&&d.titlebar||d.content,e)||v(d.tooltip,e))||0},_parseRadius:function(a){var b=this.qtip.elements,c=lb+t(a.y)+t(a.x)+"Radius";return eb.ie<9?0:v(this._useTitle(a)&&b.titlebar||b.content,c)||v(b.tooltip,c)||0},_invalidColour:function(a,b,c){var d=a.css(b);return!d||c&&d===a.css(c)||rb.test(d)?F:d},_parseColours:function(a){var b=this.qtip.elements,c=this.element.css("cssText",""),e=lb+t(a[a.precedance])+t(mb),f=this._useTitle(a)&&b.titlebar||b.content,g=this._invalidColour,h=[];return h[0]=g(c,nb)||g(f,nb)||g(b.content,nb)||g(b.tooltip,nb)||c.css(nb),h[1]=g(c,e,mb)||g(f,e,mb)||g(b.content,e,mb)||g(b.tooltip,e,mb)||b.tooltip.css(e),d("*",c).add(c).css("cssText",nb+":"+ob+pb+";"+lb+":0"+pb+";"),h},_calculateSize:function(a){var b,c,d,e=a.precedance===I,f=this.options.width,g=this.options.height,h="c"===a.abbrev(),i=(e?f:g)*(h?.5:1),j=Math.pow,k=Math.round,l=Math.sqrt(j(i,2)+j(g,2)),m=[this.border/i*l,this.border/g*l];return m[2]=Math.sqrt(j(m[0],2)-j(this.border,2)),m[3]=Math.sqrt(j(m[1],2)-j(this.border,2)),b=l+m[2]+m[3]+(h?0:m[0]),c=b/l,d=[k(c*f),k(c*g)],e?d:d.reverse()},_calculateTip:function(a,b,c){c=c||1,b=b||this.size;var d=b[0]*c,e=b[1]*c,f=Math.ceil(d/2),g=Math.ceil(e/2),h={br:[0,0,d,e,d,0],bl:[0,0,d,0,0,e],tr:[0,e,d,0,d,e],tl:[0,0,0,e,d,e],tc:[0,e,f,0,d,e],bc:[0,0,d,0,f,e],rc:[0,0,d,g,0,e],lc:[d,0,d,e,0,g]};return h.lt=h.br,h.rt=h.bl,h.lb=h.tr,h.rb=h.tl,h[a.abbrev()]},_drawCoords:function(a,b){a.beginPath(),a.moveTo(b[0],b[1]),a.lineTo(b[2],b[3]),a.lineTo(b[4],b[5]),a.closePath()},create:function(){var a=this.corner=(qb||eb.ie)&&this._parseCorner(this.options.corner);return(this.enabled=!!this.corner&&"c"!==this.corner.abbrev())&&(this.qtip.cache.corner=a.clone(),this.update()),this.element.toggle(this.enabled),this.corner},update:function(b,c){if(!this.enabled)return this;var e,f,g,h,i,j,k,l,m=this.qtip.elements,n=this.element,o=n.children(),p=this.options,q=this.size,r=p.mimic,s=Math.round;b||(b=this.qtip.cache.corner||this.corner),r===F?r=b:(r=new B(r),r.precedance=b.precedance,"inherit"===r.x?r.x=b.x:"inherit"===r.y?r.y=b.y:r.x===r.y&&(r[b.precedance]=b[b.precedance])),f=r.precedance,b.precedance===H?this._swapDimensions():this._resetDimensions(),e=this.color=this._parseColours(b),e[1]!==ob?(l=this.border=this._parseWidth(b,b[b.precedance]),p.border&&1>l&&!rb.test(e[1])&&(e[0]=e[1]),this.border=l=p.border!==E?p.border:l):this.border=l=0,k=this.size=this._calculateSize(b),n.css({width:k[0],height:k[1],lineHeight:k[1]+"px"}),j=b.precedance===I?[s(r.x===M?l:r.x===O?k[0]-q[0]-l:(k[0]-q[0])/2),s(r.y===L?k[1]-q[1]:0)]:[s(r.x===M?k[0]-q[0]:0),s(r.y===L?l:r.y===N?k[1]-q[1]-l:(k[1]-q[1])/2)],qb?(g=o[0].getContext("2d"),g.restore(),g.save(),g.clearRect(0,0,6e3,6e3),h=this._calculateTip(r,q,wb),i=this._calculateTip(r,this.size,wb),o.attr(J,k[0]*wb).attr(K,k[1]*wb),o.css(J,k[0]).css(K,k[1]),this._drawCoords(g,i),g.fillStyle=e[1],g.fill(),g.translate(j[0]*wb,j[1]*wb),this._drawCoords(g,h),g.fillStyle=e[0],g.fill()):(h=this._calculateTip(r),h="m"+h[0]+","+h[1]+" l"+h[2]+","+h[3]+" "+h[4]+","+h[5]+" xe",j[2]=l&&/^(r|b)/i.test(b.string())?8===eb.ie?2:1:0,o.css({coordsize:k[0]+l+" "+(k[1]+l),antialias:""+(r.string().indexOf(P)>-1),left:j[0]-j[2]*Number(f===H),top:j[1]-j[2]*Number(f===I),width:k[0]+l,height:k[1]+l}).each(function(a){var b=d(this);b[b.prop?"prop":"attr"]({coordsize:k[0]+l+" "+(k[1]+l),path:h,fillcolor:e[0],filled:!!a,stroked:!a}).toggle(!(!l&&!a)),!a&&b.html(xb("stroke",'weight="'+2*l+'px" color="'+e[1]+'" miterlimit="1000" joinstyle="miter"'))})),a.opera&&setTimeout(function(){m.tip.css({display:"inline-block",visibility:"visible"})},1),c!==F&&this.calculate(b,k)},calculate:function(a,b){if(!this.enabled)return F;var c,e,f=this,g=this.qtip.elements,h=this.element,i=this.options.offset,j=(g.tooltip.hasClass("ui-widget"),{});return a=a||this.corner,c=a.precedance,b=b||this._calculateSize(a),e=[a.x,a.y],c===H&&e.reverse(),d.each(e,function(d,e){var h,k,l;e===P?(h=c===I?M:L,j[h]="50%",j[kb+"-"+h]=-Math.round(b[c===I?0:1]/2)+i):(h=f._parseWidth(a,e,g.tooltip),k=f._parseWidth(a,e,g.content),l=f._parseRadius(a),j[e]=Math.max(-f.border,d?k:i+(l>h?l:-h)))
-}),j[a[c]]-=b[c===H?0:1],h.css({margin:"",top:"",bottom:"",left:"",right:""}).css(j),j},reposition:function(a,b,d){function e(a,b,c,d,e){a===R&&j.precedance===b&&k[d]&&j[c]!==P?j.precedance=j.precedance===H?I:H:a!==R&&k[d]&&(j[b]=j[b]===P?k[d]>0?d:e:j[b]===d?e:d)}function f(a,b,e){j[a]===P?p[kb+"-"+b]=o[a]=g[kb+"-"+b]-k[b]:(h=g[e]!==c?[k[b],-g[b]]:[-k[b],g[b]],(o[a]=Math.max(h[0],h[1]))>h[0]&&(d[b]-=k[b],o[b]=F),p[g[e]!==c?e:b]=o[a])}if(this.enabled){var g,h,i=b.cache,j=this.corner.clone(),k=d.adjusted,l=b.options.position.adjust.method.split(" "),m=l[0],n=l[1]||l[0],o={left:F,top:F,x:0,y:0},p={};this.corner.fixed!==E&&(e(m,H,I,M,O),e(n,I,H,L,N),j.string()===i.corner.string()||i.cornerTop===k.top&&i.cornerLeft===k.left||this.update(j,F)),g=this.calculate(j),g.right!==c&&(g.left=-g.right),g.bottom!==c&&(g.top=-g.bottom),g.user=this.offset,(o.left=m===R&&!!k.left)&&f(H,M,O),(o.top=n===R&&!!k.top)&&f(I,L,N),this.element.css(p).toggle(!(o.x&&o.y||j.x===P&&o.y||j.y===P&&o.x)),d.left-=g.left.charAt?g.user:m!==R||o.top||!o.left&&!o.top?g.left+this.border:0,d.top-=g.top.charAt?g.user:n!==R||o.left||!o.left&&!o.top?g.top+this.border:0,i.cornerLeft=k.left,i.cornerTop=k.top,i.corner=j.clone()}},destroy:function(){this.qtip._unbind(this.qtip.tooltip,this._ns),this.qtip.elements.tip&&this.qtip.elements.tip.find("*").remove().end().remove()}}),jb=S.tip=function(a){return new w(a,a.options.style.tip)},jb.initialize="render",jb.sanitize=function(a){if(a.style&&"tip"in a.style){var b=a.style.tip;"object"!=typeof b&&(b=a.style.tip={corner:b}),/string|boolean/i.test(typeof b.corner)||(b.corner=E)}},C.tip={"^position.my|style.tip.(corner|mimic|border)$":function(){this.create(),this.qtip.reposition()},"^style.tip.(height|width)$":function(a){this.size=[a.width,a.height],this.update(),this.qtip.reposition()},"^content.title|style.(classes|widget)$":function(){this.update()}},d.extend(E,z.defaults,{style:{tip:{corner:E,mimic:F,width:6,height:6,border:E,offset:0}}}),S.viewport=function(c,d,e,f,g,h,i){function j(a,b,c,e,f,g,h,i,j){var k=d[f],m=v[a],t=w[a],u=c===R,x=m===f?j:m===g?-j:-j/2,y=t===f?i:t===g?-i:-i/2,z=r[f]+s[f]-(o?0:n[f]),A=z-k,B=k+j-(h===J?p:q)-z,C=x-(v.precedance===a||m===v[b]?y:0)-(t===P?i/2:0);return u?(C=(m===f?1:-1)*x,d[f]+=A>0?A:B>0?-B:0,d[f]=Math.max(-n[f]+s[f],k-C,Math.min(Math.max(-n[f]+s[f]+(h===J?p:q),k+C),d[f],"center"===m?k-x:1e9))):(e*=c===Q?2:0,A>0&&(m!==f||B>0)?(d[f]-=C+e,l.invert(a,f)):B>0&&(m!==g||A>0)&&(d[f]-=(m===P?-C:C)+e,l.invert(a,g)),d[f]<r&&-d[f]>B&&(d[f]=k,l=v.clone())),d[f]-k}var k,l,m,n,o,p,q,r,s,t=e.target,u=c.elements.tooltip,v=e.my,w=e.at,x=e.adjust,y=x.method.split(" "),z=y[0],A=y[1]||y[0],B=e.viewport,C=e.container,D=c.cache,E={left:0,top:0};return B.jquery&&t[0]!==a&&t[0]!==b.body&&"none"!==x.method?(n=C.offset()||E,o="static"===C.css("position"),k="fixed"===u.css("position"),p=B[0]===a?B.width():B.outerWidth(F),q=B[0]===a?B.height():B.outerHeight(F),r={left:k?0:B.scrollLeft(),top:k?0:B.scrollTop()},s=B.offset()||E,("shift"!==z||"shift"!==A)&&(l=v.clone()),E={left:"none"!==z?j(H,I,z,x.x,M,O,J,f,h):0,top:"none"!==A?j(I,H,A,x.y,L,N,K,g,i):0},l&&D.lastClass!==(m=T+"-pos-"+l.abbrev())&&u.removeClass(c.cache.lastClass).addClass(c.cache.lastClass=m),E):E},S.polys={polygon:function(a,b){var c,d,e,f={width:0,height:0,position:{top:1e10,right:0,bottom:0,left:1e10},adjustable:F},g=0,h=[],i=1,j=1,k=0,l=0;for(g=a.length;g--;)c=[parseInt(a[--g],10),parseInt(a[g+1],10)],c[0]>f.position.right&&(f.position.right=c[0]),c[0]<f.position.left&&(f.position.left=c[0]),c[1]>f.position.bottom&&(f.position.bottom=c[1]),c[1]<f.position.top&&(f.position.top=c[1]),h.push(c);if(d=f.width=Math.abs(f.position.right-f.position.left),e=f.height=Math.abs(f.position.bottom-f.position.top),"c"===b.abbrev())f.position={left:f.position.left+f.width/2,top:f.position.top+f.height/2};else{for(;d>0&&e>0&&i>0&&j>0;)for(d=Math.floor(d/2),e=Math.floor(e/2),b.x===M?i=d:b.x===O?i=f.width-d:i+=Math.floor(d/2),b.y===L?j=e:b.y===N?j=f.height-e:j+=Math.floor(e/2),g=h.length;g--&&!(h.length<2);)k=h[g][0]-f.position.left,l=h[g][1]-f.position.top,(b.x===M&&k>=i||b.x===O&&i>=k||b.x===P&&(i>k||k>f.width-i)||b.y===L&&l>=j||b.y===N&&j>=l||b.y===P&&(j>l||l>f.height-j))&&h.splice(g,1);f.position={left:h[0][0],top:h[0][1]}}return f},rect:function(a,b,c,d){return{width:Math.abs(c-a),height:Math.abs(d-b),position:{left:Math.min(a,c),top:Math.min(b,d)}}},_angles:{tc:1.5,tr:7/4,tl:5/4,bc:.5,br:.25,bl:.75,rc:2,lc:1,c:0},ellipse:function(a,b,c,d,e){var f=S.polys._angles[e.abbrev()],g=0===f?0:c*Math.cos(f*Math.PI),h=d*Math.sin(f*Math.PI);return{width:2*c-Math.abs(g),height:2*d-Math.abs(h),position:{left:a+g,top:b+h},adjustable:F}},circle:function(a,b,c,d){return S.polys.ellipse(a,b,c,c,d)}},S.imagemap=function(a,b,c){b.jquery||(b=d(b));var e,f,g,h,i,j=b.attr("shape").toLowerCase().replace("poly","polygon"),k=d('img[usemap="#'+b.parent("map").attr("name")+'"]'),l=d.trim(b.attr("coords")),m=l.replace(/,$/,"").split(",");if(!k.length)return F;if("polygon"===j)h=S.polys.polygon(m,c);else{if(!S.polys[j])return F;for(g=-1,i=m.length,f=[];++g<i;)f.push(parseInt(m[g],10));h=S.polys[j].apply(this,f.concat(c))}return e=k.offset(),e.left+=Math.ceil((k.outerWidth(F)-k.width())/2),e.top+=Math.ceil((k.outerHeight(F)-k.height())/2),h.position.left+=e.left,h.position.top+=e.top,h},S.svg=function(a,c,e){for(var f,g,h,i,j,k,l,m,n,o,p,q=d(b),r=c[0],s=d(r.ownerSVGElement),t=1,u=1,v=!0;!r.getBBox;)r=r.parentNode;if(!r.getBBox||!r.parentNode)return F;f=s.attr("width")||s.width()||parseInt(s.css("width"),10),g=s.attr("height")||s.height()||parseInt(s.css("height"),10);var w=(parseInt(c.css("stroke-width"),10)||0)/2;switch(w&&(t+=w/f,u+=w/g),r.nodeName){case"ellipse":case"circle":o=S.polys.ellipse(r.cx.baseVal.value,r.cy.baseVal.value,(r.rx||r.r).baseVal.value+w,(r.ry||r.r).baseVal.value+w,e);break;case"line":case"polygon":case"polyline":for(n=r.points||[{x:r.x1.baseVal.value,y:r.y1.baseVal.value},{x:r.x2.baseVal.value,y:r.y2.baseVal.value}],o=[],m=-1,k=n.numberOfItems||n.length;++m<k;)l=n.getItem?n.getItem(m):n[m],o.push.apply(o,[l.x,l.y]);o=S.polys.polygon(o,e);break;default:o=r.getBoundingClientRect(),o={width:o.width,height:o.height,position:{left:o.left,top:o.top}},v=!1}return p=o.position,s=s[0],v&&(s.createSVGPoint&&(h=r.getScreenCTM(),n=s.createSVGPoint(),n.x=p.left,n.y=p.top,i=n.matrixTransform(h),p.left=i.x,p.top=i.y),s.viewBox&&(j=s.viewBox.baseVal)&&j.width&&j.height&&(t*=f/j.width,u*=g/j.height)),p.left+=q.scrollLeft(),p.top+=q.scrollTop(),o};var yb,zb,Ab="qtip-modal",Bb="."+Ab;zb=function(){function a(a){if(d.expr[":"].focusable)return d.expr[":"].focusable;var b,c,e,f=!isNaN(d.attr(a,"tabindex")),g=a.nodeName&&a.nodeName.toLowerCase();return"area"===g?(b=a.parentNode,c=b.name,a.href&&c&&"map"===b.nodeName.toLowerCase()?(e=d("img[usemap=#"+c+"]")[0],!!e&&e.is(":visible")):!1):/input|select|textarea|button|object/.test(g)?!a.disabled:"a"===g?a.href||f:f}function c(a){k.length<1&&a.length?a.not("body").blur():k.first().focus()}function e(a){if(i.is(":visible")){var b,e=d(a.target),h=f.tooltip,j=e.closest(X);b=j.length<1?F:parseInt(j[0].style.zIndex,10)>parseInt(h[0].style.zIndex,10),b||e.closest(X)[0]===h[0]||c(e),g=a.target===k[k.length-1]}}var f,g,h,i,j=this,k={};d.extend(j,{init:function(){return i=j.elem=d("<div />",{id:"qtip-overlay",html:"<div></div>",mousedown:function(){return F}}).hide(),d(b.body).bind("focusin"+Bb,e),d(b).bind("keydown"+Bb,function(a){f&&f.options.show.modal.escape&&27===a.keyCode&&f.hide(a)}),i.bind("click"+Bb,function(a){f&&f.options.show.modal.blur&&f.hide(a)}),j},update:function(b){f=b,k=b.options.show.modal.stealfocus!==F?b.tooltip.find("*").filter(function(){return a(this)}):[]},toggle:function(a,e,g){var k=(d(b.body),a.tooltip),l=a.options.show.modal,m=l.effect,n=e?"show":"hide",o=i.is(":visible"),p=d(Bb).filter(":visible:not(:animated)").not(k);return j.update(a),e&&l.stealfocus!==F&&c(d(":focus")),i.toggleClass("blurs",l.blur),e&&i.appendTo(b.body),i.is(":animated")&&o===e&&h!==F||!e&&p.length?j:(i.stop(E,F),d.isFunction(m)?m.call(i,e):m===F?i[n]():i.fadeTo(parseInt(g,10)||90,e?1:0,function(){e||i.hide()}),e||i.queue(function(a){i.css({left:"",top:""}),d(Bb).length||i.detach(),a()}),h=e,f.destroyed&&(f=G),j)}}),j.init()},zb=new zb,d.extend(x.prototype,{init:function(a){var b=a.tooltip;return this.options.on?(a.elements.overlay=zb.elem,b.addClass(Ab).css("z-index",z.modal_zindex+d(Bb).length),a._bind(b,["tooltipshow","tooltiphide"],function(a,c,e){var f=a.originalEvent;if(a.target===b[0])if(f&&"tooltiphide"===a.type&&/mouse(leave|enter)/.test(f.type)&&d(f.relatedTarget).closest(zb.elem[0]).length)try{a.preventDefault()}catch(g){}else(!f||f&&"tooltipsolo"!==f.type)&&this.toggle(a,"tooltipshow"===a.type,e)},this._ns,this),a._bind(b,"tooltipfocus",function(a,c){if(!a.isDefaultPrevented()&&a.target===b[0]){var e=d(Bb),f=z.modal_zindex+e.length,g=parseInt(b[0].style.zIndex,10);zb.elem[0].style.zIndex=f-1,e.each(function(){this.style.zIndex>g&&(this.style.zIndex-=1)}),e.filter("."+_).qtip("blur",a.originalEvent),b.addClass(_)[0].style.zIndex=f,zb.update(c);try{a.preventDefault()}catch(h){}}},this._ns,this),a._bind(b,"tooltiphide",function(a){a.target===b[0]&&d(Bb).filter(":visible").not(b).last().qtip("focus",a)},this._ns,this),void 0):this},toggle:function(a,b,c){return a&&a.isDefaultPrevented()?this:(zb.toggle(this.qtip,!!b,c),void 0)},destroy:function(){this.qtip.tooltip.removeClass(Ab),this.qtip._unbind(this.qtip.tooltip,this._ns),zb.toggle(this.qtip,F),delete this.qtip.elements.overlay}}),yb=S.modal=function(a){return new x(a,a.options.show.modal)},yb.sanitize=function(a){a.show&&("object"!=typeof a.show.modal?a.show.modal={on:!!a.show.modal}:"undefined"==typeof a.show.modal.on&&(a.show.modal.on=E))},z.modal_zindex=z.zindex-200,yb.initialize="render",C.modal={"^show.modal.(on|blur)$":function(){this.destroy(),this.init(),this.qtip.elems.overlay.toggle(this.qtip.tooltip[0].offsetWidth>0)}},d.extend(E,z.defaults,{show:{modal:{on:F,effect:E,blur:E,stealfocus:E,escape:E}}});var Cb,Db='<iframe class="qtip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';"  style="display:block; position:absolute; z-index:-1; filter:alpha(opacity=0); -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";"></iframe>';d.extend(y.prototype,{_scroll:function(){var b=this.qtip.elements.overlay;b&&(b[0].style.top=d(a).scrollTop()+"px")},init:function(c){var e=c.tooltip;d("select, object").length<1&&(this.bgiframe=c.elements.bgiframe=d(Db).appendTo(e),c._bind(e,"tooltipmove",this.adjustBGIFrame,this._ns,this)),this.redrawContainer=d("<div/>",{id:T+"-rcontainer"}).appendTo(b.body),c.elements.overlay&&c.elements.overlay.addClass("qtipmodal-ie6fix")&&(c._bind(a,["scroll","resize"],this._scroll,this._ns,this),c._bind(e,["tooltipshow"],this._scroll,this._ns,this)),this.redraw()},adjustBGIFrame:function(){var a,b,c=this.qtip.tooltip,d={height:c.outerHeight(F),width:c.outerWidth(F)},e=this.qtip.plugins.tip,f=this.qtip.elements.tip;b=parseInt(c.css("borderLeftWidth"),10)||0,b={left:-b,top:-b},e&&f&&(a="x"===e.corner.precedance?[J,M]:[K,L],b[a[1]]-=f[a[0]]()),this.bgiframe.css(b).css(d)},redraw:function(){if(this.qtip.rendered<1||this.drawing)return this;var a,b,c,d,e=this.qtip.tooltip,f=this.qtip.options.style,g=this.qtip.options.position.container;return this.qtip.drawing=1,f.height&&e.css(K,f.height),f.width?e.css(J,f.width):(e.css(J,"").appendTo(this.redrawContainer),b=e.width(),1>b%2&&(b+=1),c=e.css("maxWidth")||"",d=e.css("minWidth")||"",a=(c+d).indexOf("%")>-1?g.width()/100:0,c=(c.indexOf("%")>-1?a:1)*parseInt(c,10)||b,d=(d.indexOf("%")>-1?a:1)*parseInt(d,10)||0,b=c+d?Math.min(Math.max(b,d),c):b,e.css(J,Math.round(b)).appendTo(g)),this.drawing=0,this},destroy:function(){this.bgiframe&&this.bgiframe.remove(),this.qtip._unbind([a,this.qtip.tooltip],this._ns)}}),Cb=S.ie6=function(a){return 6===eb.ie?new y(a):F},Cb.initialize="render",C.ie6={"^content|style$":function(){this.redraw()}}})}(window,document);
-//# sourceMappingURL=http://cdn.jsdelivr.net/qtip2/2.2.0/jquery.qtip.min.js
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/jquery.qtip2.js b/lib/copy_this/www/templates/nntmux/scripts/jquery.qtip2.js
deleted file mode 100644
index 257ce216c..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/jquery.qtip2.js
+++ /dev/null
@@ -1 +0,0 @@
-/*
* qTip2 - Pretty powerful tooltips
* http://craigsworks.com/projects/qtip2/
*
* Version: nightly
* Copyright 2009-2010 Craig Michael Thompson - http://craigsworks.com
*
* Dual licensed under MIT or GPLv2 licenses
*   http://en.wikipedia.org/wiki/MIT_License
*   http://en.wikipedia.org/wiki/GNU_General_Public_License
*
* Date: Wed Mar  9 02:39:53 PST 2011
*/"use strict",function(a,b,c){function z(b){var c=this,d=b.elements,e=d.tooltip,f=".bgiframe-"+b.id,g="tooltipmove"+f+" tooltipshow"+f;a.extend(c,{init:function(){d.bgiframe=a('<iframe class="ui-tooltip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';"  style="display:block; position:absolute; z-index:-1; filter:alpha(opacity=0);"></iframe>'),d.bgiframe.appendTo(e),e.bind(g,c.adjust)},adjust:function(){var a=b.get("dimensions"),c=b.plugins.tip,f=b.elements.tip,g,h;h=parseInt(e.css("border-left-width"),10)||0,h={left:-h,top:-h},c&&f&&(g=c.corner.precedance==="x"?["width","left"]:["height","top"],h[g[1]]-=f[g[0]]()),d.bgiframe.css(h).css(a)},destroy:function(){c.iframe.remove(),e.unbind(g)}}),c.init()}function y(c){var f=this,h=c.options.show.modal,i=c.elements,j=i.tooltip,k="#qtip-overlay",l=".qtipmodal",m="tooltipshow"+l+" tooltiphide"+l;c.checks.modal={"^show.modal.(on|blur)$":function(){f.init(),i.overlay.toggle(j.is(":visible"))}},a.extend(f,{init:function(){h.on&&(j.unbind(l).bind(m,function(b,c,d){var e=b.type.replace("tooltip","");a.isFunction(h[e])?h[e].call(i.overlay,d,c):f[e](d)}),f.create(),h.blur===d&&i.overlay.unbind(l+c.id).bind("click"+l+c.id,function(){c.hide.call(c)}),i.overlay.css("cursor",h.blur?"pointer":""))},create:function(){var c=a(k),d;if(c.length){i.overlay=c;return c}d=i.overlay=a("<div />",{id:k.substr(1),css:{position:"absolute",top:0,left:0,display:"none"},mousedown:function(){return e}}).appendTo(document.body),a(b).bind("resize"+l,function(){d.css({height:Math.max(a(b).height(),a(document).height()),width:Math.max(a(b).width(),a(document).width())})}).trigger("resize");return d},toggle:function(b){var h=i.overlay,k=c.options.show.modal.effect,l=b?"show":"hide",m;h||(h=f.create());if(!h.is(":animated")||b)h.stop(d,e),b&&(m=parseInt(a.css(j[0],"z-index"),10),h.css("z-index",(m||g.zindex)-1)),a.isFunction(k)?k.call(h,b):k===e?h[l]():h.fadeTo(90,b?.7:0,function(){b||a(this).hide()})},show:function(){f.toggle(d)},hide:function(){f.toggle(e)},destroy:function(){var d=i.overlay;d&&(a(k).each(function(){var b=a(this).data("qtip");if(b&&b.id!==b.id&&b.options.show.modal)return d=e}),d?(i.overlay.remove(),a(b).unbind(l)):i.overlay.unbind(l+c.id)),j.unbind(m)}}),f.init()}function x(b,g){function v(a){var b=a.precedance==="y",c=n[b?"width":"height"],d=n[b?"height":"width"],e=a.string().indexOf("center")>-1,f=c*(e?.5:1),g=Math.pow,h=Math.round,i,j,k,l=Math.sqrt(g(f,2)+g(d,2)),m=[p/f*l,p/d*l];m[2]=Math.sqrt(g(m[0],2)-g(p,2)),m[3]=Math.sqrt(g(m[1],2)-g(p,2)),i=l+m[2]+m[3]+(e?0:m[0]),j=i/l,k=[h(j*d),h(j*c)];return{height:k[b?0:1],width:k[b?1:0]}}function u(b){var c=k.titlebar&&b.y==="top",d=c?k.titlebar:k.content,e=a.browser.mozilla,f=e?"-moz-":a.browser.webkit?"-webkit-":"",g=b.y+(e?"":"-")+b.x,h=f+(e?"border-radius-"+g:"border-"+g+"-radius");return parseInt(d.css(h),10)||parseInt(l.css(h),10)||0}function t(a,b,c){b=b?b:a[a.precedance];var d=k.titlebar&&a.y==="top",e=d?k.titlebar:k.content,f="border-"+b+"-width",g=parseInt(e.css(f),10);return(c?g||parseInt(l.css(f),10):g)||0}function s(b,e,f,g){if(k.tip){var h=a.extend({},i.corner),l=f.adjusted,n;i.corner.fixed!==d&&(l.left&&(h.x=h.x==="center"?l.left>0?"left":"right":h.x==="left"?"right":"left"),l.top&&(h.y=h.y==="center"?l.top>0?"top":"bottom":h.y==="top"?"bottom":"top"),h.string()!==m.corner&&(m.top!==l.top||m.left!==l.left)&&(n=i.update(h))),n||(n=i.position(h,0)),n.right!==c&&(n.left=n.right),n.bottom!==c&&(n.top=n.bottom),n.option=Math.max(0,j.offset),f.left-=n.left.charAt?n.option:(n.right?-1:1)*n.left,f.top-=n.top.charAt?n.option:(n.bottom?-1:1)*n.top,m.left=l.left,m.top=l.top,m.corner=h.string()}}var i=this,j=b.options.style.tip,k=b.elements,l=k.tooltip,m={top:0,left:0,corner:""},n={width:j.width,height:j.height},o={},p=j.border||0,q=".qtip-tip",r=a("<canvas />")[0].getContext;i.corner=f,i.mimic=f,b.checks.tip={"^position.my|style.tip.(corner|mimic|border)$":function(){i.init()||i.destroy(),b.reposition()},"^style.tip.(height|width)$":function(){n={width:j.width,height:j.height},i.create(),i.update(),b.reposition()},"^content.title.text|style.(classes|widget)$":function(){k.tip&&i.update()}},a.extend(i,{init:function(){var b=i.detectCorner()&&(r||a.browser.msie);b&&(i.create(),i.update(),l.unbind(q).bind("tooltipmove"+q,s));return b},detectCorner:function(){var a=j.corner,c=b.options.position,f=c.at,g=c.my.string?c.my.string():c.my;if(a===e||g===e&&f===e)return e;a===d?i.corner=new h.Corner(g):a.string||(i.corner=new h.Corner(a),i.corner.fixed=d);return i.corner.string()!=="centercenter"},detectColours:function(){var c,d=k.tip.css({backgroundColor:"",border:""}),e=i.corner,f=e[e.precedance],g="border-"+f+"-color",h="border"+f.charAt(0)+f.substr(1)+"Color",m=/rgba?\(0, 0, 0(, 0)?\)|transparent/i,p="background-color",q="transparent",r=a(document.body).css("color"),s=b.elements.content.css("color"),t=k.titlebar&&(e.y==="top"||e.y==="center"&&d.position().top+n.height/2+j.offset<k.titlebar.outerHeight(1)),u=t?k.titlebar:k.content,v=d.css(p)||q,w=d[0].style[h];if(!v||m.test(v))o.fill=u.css(p),m.test(o.fill)&&(o.fill=l.css(p)||v);if(!w||m.test(w)){o.border=l.css(g);if(m.test(o.border)||o.border===r)o.border=u.css(g),o.border===s&&(o.border=w)}a("*",d).add(d).css(p,q).css("border","0px dashed transparent")},create:function(){var b=n.width,c=n.height,d;k.tip&&k.tip.remove(),k.tip=a("<div />",{"class":"ui-tooltip-tip"}).css({width:b,height:c}).prependTo(l),r?a("<canvas />").appendTo(k.tip)[0].getContext("2d").save():(d='<vml:shape coordorigin="0,0" style="display:block; position:absolute; behavior:url(#default#VML);"></vml:shape>',k.tip.html(p?d+=d:d))},update:function(b){var c=k.tip,g=c.children(),l=n.width,m=n.height,q="px solid ",s="px dashed transparent",u=j.mimic,x=Math.round,y,z,A,B,C;b||(b=i.corner),u===e?u=b:(u=new h.Corner(u),u.precedance=b.precedance,u.x==="inherit"?u.x=b.x:u.y==="inherit"?u.y=b.y:u.x===u.y&&(u[b.precedance]=b[b.precedance])),y=u.precedance,i.detectColours(),p=o.border==="transparent"||o.border==="#123456"?0:j.border===d?t(b,f,d):j.border,A=w(u,l,m),C=v(b),c.css(C),b.precedance==="y"?B=[x(u.x==="left"?p:u.x==="right"?C.width-l-p:(C.width-l)/2),x(u.y==="top"?C.height-m:0)]:B=[x(u.x==="left"?C.width-l:0),x(u.y==="top"?p:u.y==="bottom"?C.height-m-p:(C.height-m)/2)],r?(g.attr(C),z=g[0].getContext("2d"),z.restore(),z.save(),z.clearRect(0,0,3e3,3e3),z.translate(B[0],B[1]),z.beginPath(),z.moveTo(A[0][0],A[0][1]),z.lineTo(A[1][0],A[1][1]),z.lineTo(A[2][0],A[2][1]),z.closePath(),z.fillStyle=o.fill,z.strokeStyle=o.border,z.lineWidth=p*2,z.lineJoin="miter",z.miterLimit=100,z.stroke(),z.fill()):(A="m"+A[0][0]+","+A[0][1]+" l"+A[1][0]+","+A[1][1]+" "+A[2][0]+","+A[2][1]+" xe",B[2]=p&&/^(r|b)/i.test(b.string())?1:0,g.css({antialias:""+(u.string().indexOf("center")>-1),left:B[0]-B[2]*Number(y==="x"),top:B[1]-B[2]*Number(y==="y"),width:l+p,height:m+p}).each(function(b){var c=a(this);c.attr({coordsize:l+p+" "+(m+p),path:A,fillcolor:o.fill,filled:!!b,stroked:!b}).css({display:p||b?"block":"none"}),!b&&p>0&&c.html()===""&&c.html('<vml:stroke weight="'+p*2+'px" color="'+o.border+'" miterlimit="1000" joinstyle="miter"  style="behavior:url(#default#VML); display:block;" />')}));return i.position(b,1)},position:function(b,c){var f=k.tip,g={},h=Math.max(0,j.offset),l,m,n;if(j.corner===e||!f)return e;b=b||i.corner,l=b.precedance,m=v(b),n=a.browser.msie&&p&&/^(b|r)/i.test(b.string())?1:0,a.each(l==="y"?[b.x,b.y]:[b.y,b.x],function(a,c){var e,f;c==="center"?(e=l==="y"?"left":"top",g[e]="50%",g["margin-"+e]=-Math.round(m[l==="y"?"width":"height"]/2)+h):(e=t(b,c,d),f=u(b),g[c]=a||!p?t(b,c)+(a?0:f):h+(f>e?f:0))}),g[b[l]]-=m[l==="x"?"width":"height"]+n,c&&f.css({top:"",bottom:"",left:"",right:"",margin:""}).css(g);return g},destroy:function(){k.tip&&k.tip.remove(),l.unbind(q)}}),i.init()}function w(a,b,c){var d=Math.ceil(b/2),e=Math.ceil(c/2),f={bottomright:[[0,0],[b,c],[b,0]],bottomleft:[[0,0],[b,0],[0,c]],topright:[[0,c],[b,0],[b,c]],topleft:[[0,0],[0,c],[b,c]],topcenter:[[0,c],[d,0],[b,c]],bottomcenter:[[0,0],[b,0],[d,c]],rightcenter:[[0,0],[b,e],[0,c]],leftcenter:[[b,0],[b,c],[0,e]]};f.lefttop=f.bottomright,f.righttop=f.bottomleft,f.leftbottom=f.topright,f.rightbottom=f.topleft;return f[a.string()]}function v(b){var c=this,d=b.elements.tooltip,e=b.options.content.ajax,f=".qtip-ajax",g=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi;b.checks.ajax={"^content.ajax":function(a,b,d){b==="ajax"&&(e=d),b==="once"?c.once(e.once):e&&e.url?c.load():c.once(0)}},a.extend(c,{init:function(){e&&e.url&&(c.load(),d.one("tooltipshow",function(){c.once(e.once)}))},once:function(a){d[(a?"un":"")+"bind"]("tooltipshow"+f,c.load)},load:function(){function j(a,c,d){b.set("content.text",c+": "+d)}function i(c){h&&(c=a("<div/>").append(c.replace(g,"")).find(h)),b.set("content.text",c)}var d=e.url.indexOf(" "),f=e.url,h;d>-1&&(h=f.substr(d),f=f.substr(0,d)),a.ajax(a.extend({success:i,error:j,context:b},e,{url:f}));return c}}),c.init()}function u(b,c){var i,j,k,l,m=a(this),n=a(document.body),o=this===document?n:m,p=m.metadata?m.metadata(c.metadata):f,u=c.metadata.type==="html5"&&p?p[c.metadata.name]:f,v=m.data(c.metadata.name||"qtipopts");try{v=typeof v==="string"?(new Function("return "+v))():v}catch(w){r("Unable to parse HTML5 attribute data: "+v)}l=a.extend(d,{},g.defaults,c,typeof v==="object"?s(v):f,s(u||p)),p&&a.removeData(this,"metadata"),j=l.position,l.id=b;if("boolean"===typeof l.content.text){k=m.attr(l.content.attr);if(l.content.attr!==e&&k)l.content.text=k;else return e}j.container===e&&(j.container=n),j.target===e&&(j.target=o),l.show.target===e&&(l.show.target=o),l.show.solo===d&&(l.show.solo=n),l.hide.target===e&&(l.hide.target=o),l.position.viewport===d&&(l.position.viewport=j.container),j.at=new h.Corner(j.at),j.my=new h.Corner(j.my);if(a.data(this,"qtip"))if(l.overwrite)m.qtip("destroy");else if(l.overwrite===e)return e;a.attr(this,"title")&&(a.data(this,q,a.attr(this,"title")),m.removeAttr("title")),i=new t(m,l,b,!!k),a.data(this,"qtip",i),m.bind("remove.qtip",function(){i.destroy()});return i}function t(p,r,t,u){function M(c,d,e,f){f=parseInt(f,10)!==0;var g=".qtip-"+t,h={show:c&&r.show.target[0],hide:d&&r.hide.target[0],tooltip:e&&v.rendered&&A.tooltip[0],content:e&&v.rendered&&A.content[0],container:f&&r.position.container[0]===w?document:r.position.container[0],window:f&&b};v.rendered?a([]).pushStack(a.grep([h.show,h.hide,h.tooltip,h.container,h.content,h.window],function(a){return typeof a==="object"})).unbind(g):c&&r.show.target.unbind(g+"-create")}function L(c,d,f,h){function y(a){D()&&v.reposition(a)}function x(a){if(z.hasClass(l))return e;clearTimeout(v.timers.inactive),v.timers.inactive=setTimeout(function(){v.hide(a)},r.hide.inactive)}function u(b){if(z.hasClass(l))return e;var c=a(b.relatedTarget||b.target),d=c.closest(m)[0]===z[0],f=c[0]===n.show[0];clearTimeout(v.timers.show),clearTimeout(v.timers.hide);if(k.target==="mouse"&&d||r.hide.fixed&&(/mouse(out|leave|move)/.test(b.type)&&(d||f))){b.stopPropagation(),b.preventDefault();return e}z.stop(1,1),r.hide.delay>0?v.timers.hide=setTimeout(function(){v.hide(b)},r.hide.delay):v.hide(b)}function s(a){if(z.hasClass(l))return e;n.show.trigger("qtip-"+t+"-inactive"),clearTimeout(v.timers.show),clearTimeout(v.timers.hide);var b=function(){v.show(a)};r.show.delay>0?v.timers.show=setTimeout(b,r.show.delay):b()}var j=".qtip-"+t,k=r.position,n={show:r.show.target,hide:r.hide.target,container:k.container[0]===w?a(document):k.container,doc:a(document)},o={show:a.trim(""+r.show.event).split(" "),hide:a.trim(""+r.hide.event).split(" ")},q=a.browser.msie&&parseInt(a.browser.version,10)===6;f&&(r.hide.fixed&&(n.hide=n.hide.add(z),z.bind("mouseover"+j,function(){z.hasClass(l)||clearTimeout(v.timers.hide)})),k.target==="mouse"&&k.adjust.mouse&&r.hide.event&&z.bind("mouseleave"+j,function(a){(a.relatedTarget||a.target)!==n.show[0]&&v.hide(a)}),z.bind("mouseenter"+j+" mouseleave"+j,function(a){v[a.type==="mouseenter"?"focus":"blur"](a)})),d&&("number"===typeof r.hide.inactive&&(n.show.bind("qtip-"+t+"-inactive",x),a.each(g.inactiveEvents,function(a,b){n.hide.add(A.tooltip).bind(b+j+"-inactive",x)})),a.each(o.hide,function(b,c){var d=a.inArray(c,o.show),e=a(n.hide);d>-1&&e.add(n.show).length===e.length||c==="unfocus"?(n.show.bind(c+j,function(a){D()?u(a):s(a)}),delete o.show[d]):n.hide.bind(c+j,u)})),c&&a.each(o.show,function(a,b){n.show.bind(b+j,s)}),h&&((k.adjust.resize||k.viewport)&&a(a.event.special.resize?k.viewport:b).bind("resize"+j,y),(k.viewport||q&&z.css("position")==="fixed")&&a(k.viewport).bind("scroll"+j,y),/unfocus/i.test(r.hide.event)&&n.doc.bind("mousedown"+j,function(b){var c=a(b.target);c.parents(m).length===0&&c.add(p).length>1&&D()&&!z.hasClass(l)&&v.hide(b)}),k.target==="mouse"&&n.doc.bind("mousemove"+j,function(a){k.adjust.mouse&&!z.hasClass(l)&&D()&&v.reposition(a||i)}))}function K(b,c){var f=A.content;if(!v.rendered||!b)return e;a.isFunction(b)&&(b=b.call(p,v)||""),b.jquery&&b.length>0?f.empty().append(b.css({display:"block"})):f.html(b),z.queue("fx",function(b){function e(a){c=c.not(a),c.length===0&&(v.redraw(),v.rendered&&D()&&v.reposition(B.event),b())}var c=f.find("img:not([height]):not([width])");c.each(function(b,c){var f=["abort","error","load","unload",""].join(".qtip-image ");a(this).bind(f,function(){clearTimeout(v.timers.img[b]),e(this)}),function g(){if(c.height&&c.width)return e(c);v.timers.img[b]=setTimeout(g,20)}();return d}),c.length===0&&e(c)});return v}function J(b){var c=A.title;if(!v.rendered||!b)return e;a.isFunction(b)&&(b=b.call(p,v)||""),b.jquery&&b.length>0?c.empty().append(b.css({display:"block"})):c.html(b),v.redraw(),v.rendered&&D()&&v.reposition(B.event)}function I(a){var b=A.button,c=A.title;if(!v.rendered)return e;a?(c||H(),G()):b.remove()}function H(){var b=x+"-title";A.titlebar&&F(),A.titlebar=a("<div />",{"class":j+"-titlebar "+(r.style.widget?"ui-widget-header":"")}).append(A.title=a("<div />",{id:b,"class":j+"-title","aria-atomic":d})).insertBefore(A.content),r.content.title.button?G():v.rendered&&v.redraw()}function G(){var b=r.content.title.button;A.button&&A.button.remove(),b.jquery?A.button=b:A.button=a("<a />",{"class":"ui-state-default "+(r.style.widget?"":j+"-icon"),title:"Close tooltip","aria-label":"Close tooltip"}).prepend(a("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),A.button.appendTo(A.titlebar).attr("role","button").hover(function(b){a(this).toggleClass("ui-state-hover",b.type==="mouseenter")}).click(function(a){z.hasClass(l)||v.hide(a);return e}).bind("mousedown keydown mouseup keyup mouseout",function(b){a(this).toggleClass("ui-state-active ui-state-focus",b.type.substr(-4)==="down")}),v.redraw()}function F(){A.title&&(A.titlebar.remove(),A.titlebar=A.title=A.button=f,v.reposition())}function E(){var a=r.style.widget;z.toggleClass(k,a),A.content.toggleClass(k+"-content",a),A.titlebar&&A.titlebar.toggleClass(k+"-header",a),A.button&&A.button.toggleClass(j+"-icon",!a)}function D(){return z&&z.css("left")!==o&&z.css("visibility")!=="hidden"}function C(a){var b=0,c,d=r,e=a.split(".");while(d=d[e[b++]])b<e.length&&(c=d);return[c||r,e.pop()]}var v=this,w=document.body,x=j+"-"+t,y=0,z,A,B;v.id=t,v.rendered=e,v.elements=A={target:p},v.timers={img:[]},v.options=r,v.checks={},v.plugins={},v.cache=B={event:{},target:f,disabled:e,attr:u},v.checks.builtin={"^id$":function(b,c,f){var h=f===d?g.nextid:f,i=j+"-"+h;h!==e&&h.length>0&&!a("#"+i).length&&(z[0].id=i,A.content[0].id=i+"-content",A.title[0].id=i+"-title")},"^content.text$":function(a,b,c){K(c)},"^content.title.text$":function(a,b,c){if(!c)return F();!A.title&&c&&H(),J(c)},"^content.title.button$":function(a,b,c){I(c)},"^position.(my|at)$":function(a,b,c){"string"===typeof c&&(a[b]=new h.Corner(c))},"^position.container$":function(a,b,c){v.rendered&&z.appendTo(c)},"^(show|hide).(event|target|fixed|delay|inactive)$":function(a,b,c,d,e){var f=[1,0,0];f[e[0]==="show"?"push":"unshift"](0),M.apply(v,f),L.apply(v,[1,1,0,0])},"^show.ready$":function(){v.rendered||v.show()},"^style.classes$":function(b,c,d){a.attr(z[0],"class",j+" qtip ui-helper-reset "+d)},"^style.widget|content.title":E,"^events.(render|show|move|hide|focus|blur)$":function(b,c,d){z[(a.isFunction(d)?"":"un")+"bind"]("tooltip"+c,d)}},a.extend(v,{render:function(b){if(v.rendered)return e;var c=r.content.text,f=r.content.title.text,g=a.Event("tooltiprender");a.attr(p[0],"aria-describedby",x),z=A.tooltip=a("<div/>").attr({id:x,"class":j+" qtip ui-helper-reset "+r.style.classes,role:"alert","aria-live":"polite","aria-atomic":e,"aria-describedby":x+"-content","aria-hidden":d}).toggleClass(l,B.disabled).data("qtip",v).appendTo(r.position.container).append(A.content=a("<div />",{"class":j+"-content",id:x+"-content","aria-atomic":d})),v.rendered=-1,f&&(H(),J(f)),v.rendered=d,K(c),E(),a.each(h,function(){this.initialize==="render"&&this(v)}),L(1,1,1,1),a.each(r.events,function(a,b){if(b){var c=a==="toggle"?"tooltipshow tooltiphide":"tooltip"+a;z.bind(c,b)}}),z.css("visibility","hidden").queue("fx",function(a){g.originalEvent=B.event,z.trigger(g,[v]),(r.show.ready||b)&&v.show(B.event),a()});return v},get:function(a){var b,c;switch(a.toLowerCase()){case"dimensions":b={height:z.outerHeight(),width:z.outerWidth()};break;case"offset":b=h.offset(z,r.position.container);break;default:c=C(a.toLowerCase()),b=c[0][c[1]],b=b.precedance?b.string():b}return b},set:function(b,c){function j(a,b){var c,e,f;if(v.rendered){for(c in h)for(e in h[c])if(f=(new RegExp(e,"i")).exec(a))b.push(f),h[c][e].apply(v,b)}else a==="show.ready"&&b[2]&&(y=0,v.render(d))}var f=/^position.(my|at|adjust|target|container)|style|content/i,g=e,h=v.checks,i;"string"===typeof b?(i=b,b={},b[i]=c):b=a.extend(d,{},b),a.each(b,function(c,d){var e=C(c.toLowerCase()),h;h=e[0][e[1]],e[0][e[1]]="object"===typeof d&&d.nodeType?a(d):d,b[c]=[e[0],e[1],d,h],g=f.test(c)||g}),s(r),y=1,a.each(b,j),y=0,g&&D()&&v.rendered&&v.reposition();return v},toggle:function(b,c){function j(){b?a.browser.msie&&z[0].style.removeAttribute("filter"):z.css({display:"",visibility:"hidden",width:"",opacity:"",left:"",top:""})}if(!v.rendered)if(b)v.render(1);else return e;var d=b?"show":"hide",g=r[d],h=D(),i;(typeof b).search("boolean|number")&&(b=!h);if(h===b)return v;if(c){if(/over|enter/.test(c.type)&&/out|leave/.test(B.event.type)&&c.target===r.show.target[0]&&z.has(c.relatedTarget).length)return v;B.event=a.extend({},c)}i=a.Event("tooltip"+d),i.originalEvent=c?B.event:f,z.trigger(i,[v,90]);if(i.isDefaultPrevented())return v;a.attr(z[0],"aria-hidden",!b),b?(z.hide().css({visibility:""}),v.focus(c),v.reposition(c,0),g.solo&&a(m,g.solo).not(z).qtip("hide",i)):(clearTimeout(v.timers.show),v.blur(c)),z.stop(1,1),a.isFunction(g.effect)?(g.effect.call(z,v),z.queue("fx",function(a){j.call(this,a),a()})):g.effect===e?(z[d](),j.call(z)):z.fadeTo(90,b?1:0,j),b&&g.target.trigger("qtip-"+t+"-inactive");return v},show:function(a){return v.toggle(d,a)},hide:function(a){return v.toggle(e,a)},focus:function(b){if(!v.rendered)return e;var c=a(m),d=parseInt(z[0].style.zIndex,10),f=g.zindex+c.length,h=a.extend({},b),i,j;z.hasClass(n)||(d!==f&&(c.each(function(){this.style.zIndex>d&&(this.style.zIndex=this.style.zIndex-1)}),c.filter("."+n).qtip("blur",h)),j=a.Event("tooltipfocus"),j.originalEvent=h,z.trigger(j,[v,f]),j.isDefaultPrevented()||(z.addClass(n)[0].style.zIndex=f));return v},blur:function(b){var c=a.extend({},b),d;z.removeClass(n),d=a.Event("tooltipblur"),d.originalEvent=c,z.trigger(d,[v]);return v},reposition:function(f,k){if(!v.rendered||y)return e;y=d;var l=r.position.target,m=r.position,n=m.my,o=m.at,p=m.adjust,q=z.outerWidth(),s=z.outerHeight(),t=0,u=0,x=a.Event("tooltipmove"),A=z.css("position")==="fixed",C=m.viewport.jquery?m.viewport:a(b),E={left:0,top:0},F=(v.plugins.tip||{}).corner,G={left:function(a){var b=C.scrollLeft,c=n.x==="left"?q:n.x==="right"?-q:-q/2,d=o.x==="left"?t:o.x==="right"?-t:-t/2,e=F&&F.precedance==="x"?g.defaults.style.tip.width:0,f=b-a-e,h=a+q-C.width-b+e,i=c-(n.precedance==="x"||n.x===n.y?d:0),j=n.x==="center";f>0&&(n.x!=="left"||h>0)?E.left-=i+(j?0:2*p.x):h>0&&(n.x!=="right"||f>0)&&(E.left-=j?-i:i+2*p.x),E.left!==a&&j&&(E.left-=p.x),E.left<0&&-E.left>h&&(E.left=a);return E.left-a},top:function(a){var b=C.scrollTop,c=n.y==="top"?s:n.y==="bottom"?-s:-s/2,d=o.y==="top"?u:o.y==="bottom"?-u:-u/2,e=F&&F.precedance==="y"?g.defaults.style.tip.height:0,f=b-a-e,h=a+s-C.height-b+e,i=c-(n.precedance==="y"||n.x===n.y?d:0),j=n.y==="center";f>0&&(n.y!=="top"||h>0)?E.top-=i+(j?0:2*p.y):h>0&&(n.y!=="bottom"||f>0)&&(E.top-=j?-i:i+2*p.y),E.top!==a&&j&&(E.top-=p.y),E.top<0&&-E.top>h&&(E.top=a);return E.top-a}};k=k===c||!!k||e,C=C?{elem:C,height:C[(C[0]===b?"h":"outerH")+"eight"](),width:C[(C[0]===b?"w":"outerW")+"idth"](),scrollLeft:C.scrollLeft(),scrollTop:C.scrollTop()}:e;if(l==="mouse")o={x:"left",y:"top"},f=f&&(f.type==="resize"||f.type==="scroll")?B.event:p.mouse||!f||!f.pageX?a.extend({},i):f,E={top:f.pageY,left:f.pageX};else{l==="event"&&(f&&f.target&&f.type!=="scroll"&&f.type!=="resize"?l=B.target=a(f.target):l=B.target),l=a(l).eq(0);if(l.length===0)return v;l[0]===document||l[0]===b?(t=l.width(),u=l.height(),l[0]===b&&(E={top:A?0:C.scrollTop,left:A?0:C.scrollLeft})):l.is("area")&&h.imagemap?E=h.imagemap(l,o):l[0].namespaceURI=="http://www.w3.org/2000/svg"&&h.svg?E=h.svg(l,o):(t=l.outerWidth(),u=l.outerHeight(),E=h.offset(l,m.container)),E.offset&&(t=E.width,u=E.height,E=E.offset),E.left+=o.x==="right"?t:o.x==="center"?t/2:0,E.top+=o.y==="bottom"?u:o.y==="center"?u/2:0}E.left+=p.x+(n.x==="right"?-q:n.x==="center"?-q/2:0),E.top+=p.y+(n.y==="bottom"?-s:n.y==="center"?-s/2:0),m.viewport.jquery&&l[0]!==b&&l[0]!==w?E.adjusted={left:G.left(E.left),top:G.top(E.top)}:E.adjusted={left:0,top:0},z.attr("class",function(b,c){return a.attr(this,"class").replace(/ui-tooltip-pos-\w+/i,"")}).addClass(j+"-pos-"+n.abbreviation()),x.originalEvent=a.extend({},f),z.trigger(x,[v,E,C.elem]);if(x.isDefaultPrevented())return v;delete E.adjusted,k&&isNaN(E.left,E.top)?D()&&a.isFunction(m.effect)&&(m.effect.call(z,v,E),z.queue(function(b){var c=a(this);c.css({opacity:"",height:""}),a.browser.msie&&this.style&&this.style.removeAttribute("filter"),b()})):z.css(E),y=e;return v},redraw:function(){var b=j+"-fluid",c="auto",d;if(v.rendered<1)return e;z.css({width:c,height:c}).addClass(b),d={height:z.outerHeight(),width:z.outerWidth()},a.each(["width","height"],function(a,b){var c=parseInt(z.css("max-"+b),10)||0,e=parseInt(z.css("min-"+b),10)||0;d[b]=c+e?Math.min(Math.max(d[b],e),c):d[b]}),z.css(d).removeClass(b);return v},disable:function(b){var c=l;"boolean"!==typeof b&&(b=!z.hasClass(c)&&!B.disabled),v.rendered?(z.toggleClass(c,b),a.attr(z[0],"aria-disabled",b)):B.disabled=!!b;return v},enable:function(){v.disable(e)},destroy:function(){var b=p[0],c=a.data(b,q);v.rendered&&(z.remove(),a.each(v.plugins,function(){this.destroy&&this.destroy()})),clearTimeout(v.timers.show),clearTimeout(v.timers.hide),M(1,1,1,1),a.removeData(b,"qtip"),c&&a.attr(b,"title",c),p.removeAttr("aria-describedby").unbind(".qtip");return p}})}function s(b){var c;if(!b||"object"!==typeof b)return e;"object"!==typeof b.metadata&&(b.metadata={type:b.metadata});if("content"in b){if("object"!==typeof b.content||b.content.jquery)b.content={text:b.content};c=b.content.text||e,!a.isFunction(c)&&(!c&&!c.attr||c.length<1||"object"===typeof c&&!c.jquery)&&(b.content.text=e),"title"in b.content&&("object"!==typeof b.content.title&&(b.content.title={text:b.content.title}),c=b.content.title.text||e,!a.isFunction(c)&&(!c&&!c.attr||c.length<1||"object"===typeof c&&!c.jquery)&&(b.content.title.text=e))}"position"in b&&("object"!==typeof b.position&&(b.position={my:b.position,at:b.position})),"show"in b&&("object"!==typeof b.show&&(b.show.jquery?b.show={target:b.show}:b.show={event:b.show})),"hide"in b&&("object"!==typeof b.hide&&(b.hide.jquery?b.hide={target:b.hide}:b.hide={event:b.hide})),"style"in b&&("object"!==typeof b.style&&(b.style={classes:b.style})),a.each(h,function(){this.sanitize&&this.sanitize(b)});return b}function r(){var c=b.console;return c&&(c.error||c.log||a.noop).apply(c,arguments)}var d=!0,e=!1,f=null,g,h,i,j="ui-tooltip",k="ui-widget",l="ui-state-disabled",m="div.qtip."+j,n=j+"-focus",o="-31000px",p="_replacedByqTip",q="oldtitle";g=a.fn.qtip=function(b,h,i){var j=(""+b).toLowerCase(),k=f,l=j==="disable"?[d]:a.makeArray(arguments).slice(1,10),m=l[l.length-1],n=this[0]?a.data(this[0],"qtip"):f;if(!arguments.length&&n||j==="api")return n;if("string"===typeof b){this.each(function(){var b=a.data(this,"qtip");if(!b)return d;m&&m.timeStamp&&(b.cache.event=m);if(j==="option"&&h)if(a.isPlainObject(h)||i!==c)b.set(h,i);else{k=b.get(h);return e}else b[j]&&b[j].apply(b[j],l)});return k!==f?k:this}if("object"===typeof b||!arguments.length){n=s(a.extend(d,{},b));return g.bind.call(this,n,m)}},g.bind=function(b,c){return this.each(function(f){function p(b){function c(){o.render(typeof b==="object"||i.show.ready),k.show.unbind(l.show),k.hide.unbind(l.hide)}if(o.cache.disabled)return e;o.cache.event=a.extend({},b),i.show.delay>0?(clearTimeout(o.timers.show),o.timers.show=setTimeout(c,i.show.delay),l.show!==l.hide&&k.hide.bind(l.hide,function(){clearTimeout(o.timers.show)})):c()}var i,k,l,m=!b.id||b.id===e||b.id.length<1||a("#"+j+"-"+b.id).length?g.nextid++:b.id,n=".qtip-"+m+"-create",o=u.call(this,m,b);if(o===e)return d;i=o.options,a.each(h,function(){this.initialize==="initialize"&&this(o)}),k={show:i.show.target,hide:i.hide.target},l={show:a.trim(""+i.show.event).replace(/ /g,n+" ")+n,hide:a.trim(""+i.hide.event).replace(/ /g,n+" ")+n},k.show.bind(l.show,p),(i.show.ready||i.prerender)&&p(c)})},h=g.plugins={Corner:function(a){a=(""+a).replace(/([A-Z])/," $1").replace(/middle/gi,"center").toLowerCase(),this.x=(a.match(/left|right/i)||a.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(a.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase(),this.precedance=a.charAt(0).search(/^(t|b)/)>-1?"y":"x",this.string=function(){return this.precedance==="y"?this.y+this.x:this.x+this.y},this.abbreviation=function(){var a=this.x.substr(0,1),b=this.y.substr(0,1);return a===b?a:a==="c"||a!=="c"&&b!=="c"?b+a:a+b}},offset:function(c,d){function k(a,b){e.left+=b*a.scrollLeft(),e.top+=b*a.scrollTop()}var e=c.offset(),f=d,g=0,i=document.body,j;if(f){do{if(f[0]===i)break;f.css("position")!=="static"&&(j=f.position(),e.left-=j.left+(parseInt(f.css("borderLeftWidth"),10)||0),e.top-=j.top+(parseInt(f.css("borderTopWidth"),10)||0),g++)}while(f=f.offsetParent());(d[0]!==i||g>1)&&k(d,1),h.iOS&&k(a(b),-1)}return e},iOS:parseFloat((""+(/CPU.*OS ([0-9_]{3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,"4_2"])[1]).replace("undefined","3_2").replace("_","."))<4.1,fn:{attr:function(b,c){if(this.length){var d=this[0],e="title",f=a.data(d,"qtip");if(b===e){if(arguments.length<2)return a.data(d,q);if(typeof f==="object"){f&&f.rendered&&f.options.content.attr===e&&f.cache.attr&&f.set("content.text",c),a.fn["attr"+p].apply(this,arguments),a.data(d,q,a.attr(d,e));return this.removeAttr("title")}}}},clone:function(b){var c=a([]),d;a("*",this).add(this).each(function(){var b=a.data(this,q);b&&(a.attr(this,"title",b),c=c.add(this))}),d=a.fn["clone"+p].apply(this,arguments),c.removeAttr("title");return d},remove:a.ui?f:function(b,c){a(this).each(function(){c||(!b||a.filter(b,[this]).length)&&a("*",this).add(this).each(function(){a(this).triggerHandler("remove")})})}}},a.each(h.fn,function(b,c){if(!c)return d;var e=a.fn[b+p]=a.fn[b];a.fn[b]=function(){return c.apply(this,arguments)||e.apply(this,arguments)}}),a(b).bind("load.qtip",function(){var b="mousemove";a(document).bind(b+".qtip",function(a){i={pageX:a.pageX,pageY:a.pageY,type:b}})}),g.version="nightly",g.nextid=0,g.inactiveEvents="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),g.zindex=15e3,g.defaults={prerender:e,id:e,overwrite:d,content:{text:d,attr:"title",title:{text:e,button:e}},position:{my:"top left",at:"bottom right",target:e,container:e,viewport:e,adjust:{x:0,y:0,mouse:d,resize:d},effect:d},show:{target:e,event:"mouseenter",effect:d,delay:90,solo:e,ready:e},hide:{target:e,event:"mouseleave",effect:d,delay:0,fixed:e,inactive:e},style:{classes:"",widget:e},events:{render:f,move:f,show:f,hide:f,toggle:f,focus:f,blur:f}},h.ajax=function(a){var b=a.plugins.ajax;return"object"===typeof b?b:a.plugins.ajax=new v(a)},h.ajax.initialize="render",h.ajax.sanitize=function(a){var b=a.content,c;b&&"ajax"in b&&(c=b.ajax,typeof c!=="object"&&(c=a.content.ajax={url:c}),"boolean"!==typeof c.once&&c.once&&(c.once=!!c.once))},a.extend(d,g.defaults,{content:{ajax:{once:d}}}),h.imagemap=function(b,c){function l(a,b){var d=0,e=1,f=1,g=0,h=0,i=a.width,j=a.height;while(i>0&&j>0&&e>0&&f>0){i=Math.floor(i/2),j=Math.floor(j/2),c.x==="left"?e=i:c.x==="right"?e=a.width-i:e+=Math.floor(i/2),c.y==="top"?f=j:c.y==="bottom"?f=a.height-j:f+=Math.floor(j/2),d=b.length;while(d--){if(b.length<2)break;g=b[d][0]-a.offset.left,h=b[d][1]-a.offset.top,(c.x==="left"&&g>=e||c.x==="right"&&g<=e||c.x==="center"&&(g<e||g>a.width-e)||c.y==="top"&&h>=f||c.y==="bottom"&&h<=f||c.y==="center"&&(h<f||h>a.height-f))&&b.splice(d,1)}}return{left:b[0][0],top:b[0][1]}}var d=b.attr("shape").toLowerCase(),e=b.attr("coords").split(","),f=[],g=a('img[usemap="#'+b.parent("map").attr("name")+'"]'),h=g.offset(),i={width:0,height:0,offset:{top:1e10,right:0,bottom:0,left:1e10}},j=0,k=0;h.left+=Math.ceil((g.outerWidth()-g.width())/2),h.top+=Math.ceil((g.outerHeight()-g.height())/2);if(d==="poly"){j=e.length;while(j--)k=[parseInt(e[--j],10),parseInt(e[j+1],10)],k[0]>i.offset.right&&(i.offset.right=k[0]),k[0]<i.offset.left&&(i.offset.left=k[0]),k[1]>i.offset.bottom&&(i.offset.bottom=k[1]),k[1]<i.offset.top&&(i.offset.top=k[1]),f.push(k)}else f=a.map(e,function(a){return parseInt(a,10)});switch(d){case"rect":i={width:Math.abs(f[2]-f[0]),height:Math.abs(f[3]-f[1]),offset:{left:f[0],top:f[1]}};break;case"circle":i={width:f[2]+2,height:f[2]+2,offset:{left:f[0],top:f[1]}};break;case"poly":a.extend(i,{width:Math.abs(i.offset.right-i.offset.left),height:Math.abs(i.offset.bottom-i.offset.top)}),c.string()==="centercenter"?i.offset={left:i.offset.left+i.width/2,top:i.offset.top+i.height/2}:i.offset=l(i,f.slice()),i.width=i.height=0}i.offset.left+=h.left,i.offset.top+=h.top;return i},h.tip=function(a){var b=a.plugins.tip;return"object"===typeof b?b:a.plugins.tip=new x(a)},h.tip.initialize="render",h.tip.sanitize=function(a){var b=a.style,c;b&&"tip"in b&&(c=a.style.tip,typeof c!=="object"&&(a.style.tip={corner:c}),/string|boolean/i.test(typeof c.corner)||(c.corner=d),typeof c.width!=="number"&&delete c.width,typeof c.height!=="number"&&delete c.height,typeof c.border!=="number"&&c.border!==d&&delete c.border,typeof c.offset!=="number"&&delete c.offset)},a.extend(d,g.defaults,{style:{tip:{corner:d,mimic:e,width:6,height:6,border:d,offset:0}}}),h.svg=function(b,c){var d=a(document),e=b[0],f={width:0,height:0,offset:{top:1e10,left:1e10}},g,h,i,j,k;if(e.getBBox&&e.parentNode){g=e.getBBox(),h=e.getScreenCTM(),i=e.farthestViewportElement||e;if(!i.createSVGPoint)return f;j=i.createSVGPoint(),j.x=g.x,j.y=g.y,k=j.matrixTransform(h),f.offset.left=k.x,f.offset.top=k.y,j.x+=g.width,j.y+=g.height,k=j.matrixTransform(h),f.width=k.x-f.offset.left,f.height=k.y-f.offset.top,f.offset.left+=d.scrollLeft(),f.offset.top+=d.scrollTop()}return f},h.modal=function(a){var b=a.plugins.modal;return"object"===typeof b?b:a.plugins.modal=new y(a)},h.modal.initialize="render",h.modal.sanitize=function(a){a.show&&(typeof a.show.modal!=="object"?a.show.modal={on:!!a.show.modal}:typeof a.show.modal.on==="undefined"&&(a.show.modal.on=d))},a.extend(d,g.defaults,{show:{modal:{on:e,effect:d,blur:d}}}),h.bgiframe=function(b){var c=a.browser,d=b.plugins.bgiframe;if(!h.bgiframe.needBGI||(!c.msie||c.version.charAt(0)!=="6"))return e;return"object"===typeof d?d:b.plugins.bgiframe=new z(b)},h.bgiframe.initialize="render",h.bgiframe.needBGI=a("select, object").length>0}(jQuery,window)

\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/respond.min.js b/lib/copy_this/www/templates/nntmux/scripts/respond.min.js
deleted file mode 100644
index 56418a245..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/respond.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
-/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
-window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.documentElement,e=d.firstElementChild||d.firstChild,f=a.createElement("body"),g=a.createElement("div");return g.id="mq-test-1",g.style.cssText="position:absolute;top:-100em",f.style.background="none",f.appendChild(g),function(a){return g.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',d.insertBefore(f,e),c=42===g.offsetWidth,d.removeChild(f),{matches:c,media:a}}}(document);
-
-/*! Respond.js v1.1.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
-(function(a){"use strict";function x(){u(!0)}var b={};a.respond=b,b.update=function(){},b.mediaQueriesSupported=a.matchMedia&&a.matchMedia("only all").matches,b.mediaQueriesSupported;var q,r,t,c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=c.getElementsByTagName("base")[0],l=j.getElementsByTagName("link"),m=[],n=function(){for(var b=0;l.length>b;b++){var c=l[b],d=c.href,e=c.media,f=c.rel&&"stylesheet"===c.rel.toLowerCase();d&&f&&!h[d]&&(c.styleSheet&&c.styleSheet.rawCssText?(p(c.styleSheet.rawCssText,d,e),h[d]=!0):(!/^([a-zA-Z:]*\/\/)/.test(d)&&!k||d.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&m.push({href:d,media:e}))}o()},o=function(){if(m.length){var a=m.shift();v(a.href,function(b){p(b,a.href,a.media),h[a.href]=!0,setTimeout(function(){o()},0)})}},p=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),g=d&&d.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c;b.length&&(b+="/"),i&&(g=1);for(var j=0;g>j;j++){var k,l,m,n;i?(k=c,f.push(h(a))):(k=d[j].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),m=k.split(","),n=m.length;for(var o=0;n>o;o++)l=m[o],e.push({media:l.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:f.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},s=function(){var a,b=c.createElement("div"),e=c.body,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",e||(e=f=c.createElement("body"),e.style.background="none"),e.appendChild(b),d.insertBefore(e,d.firstChild),a=b.offsetWidth,f?d.removeChild(e):e.removeChild(b),a=t=parseFloat(a)},u=function(a){var b="clientWidth",h=d[b],k="CSS1Compat"===c.compatMode&&h||c.body[b]||h,m={},n=l[l.length-1],o=(new Date).getTime();if(a&&q&&i>o-q)return clearTimeout(r),r=setTimeout(u,i),void 0;q=o;for(var p in e)if(e.hasOwnProperty(p)){var v=e[p],w=v.minw,x=v.maxw,y=null===w,z=null===x,A="em";w&&(w=parseFloat(w)*(w.indexOf(A)>-1?t||s():1)),x&&(x=parseFloat(x)*(x.indexOf(A)>-1?t||s():1)),v.hasquery&&(y&&z||!(y||k>=w)||!(z||x>=k))||(m[v.media]||(m[v.media]=[]),m[v.media].push(f[v.rules]))}for(var B in g)g.hasOwnProperty(B)&&g[B]&&g[B].parentNode===j&&j.removeChild(g[B]);for(var C in m)if(m.hasOwnProperty(C)){var D=c.createElement("style"),E=m[C].join("\n");D.type="text/css",D.media=C,j.insertBefore(D,n.nextSibling),D.styleSheet?D.styleSheet.cssText=E:D.appendChild(c.createTextNode(E)),g.push(D)}},v=function(a,b){var c=w();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},w=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}();n(),b.update=n,a.addEventListener?a.addEventListener("resize",x,!1):a.attachEvent&&a.attachEvent("onresize",x)})(this);
diff --git a/lib/copy_this/www/templates/nntmux/scripts/sorttable.js b/lib/copy_this/www/templates/nntmux/scripts/sorttable.js
deleted file mode 100644
index 94921045a..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/sorttable.js
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-// Javascript clientside sorting of table data
-//
-
-addEvent(window, "load", sortables_init);
-
-var SORT_COLUMN_INDEX;
-
-function sortables_init()
-{
-    // Find all tables with class sortable and make them sortable
-    if (!document.getElementsByTagName) { alert ( "cannot" ); return; }
-    tbls = document.getElementsByTagName("table");
-    for (ti=0;ti<tbls.length;ti++) {
-        thisTbl = tbls[ti];
-        if ((' '+thisTbl.className+' ').indexOf("Sortable") != -1) {
-            ts_makeSortable(thisTbl);
-        }
-    }
-}
-
-function ts_makeSortable(table) {
-    if (table.rows && table.rows.length > 0) {
-        var firstRow = table.rows[0];
-    }
-    if (!firstRow) return;
-
-    // We have a first row: assume it's the header, and make its contents clickable links
-    for (var i=0;i<firstRow.cells.length;i++) {
-        var cell = firstRow.cells[i];
-        var txt = ts_getInnerText(cell);
-		var str_HTML = '<a href="#" onclick="ts_resortTable(this, ' + i + ');return false;" ' +
-			'title="Sort by ' + txt + ' &gt;&gt;" >' + txt + '<span class="SortArrow"';
-
-		// adjust the first column so it displays as selected
-		if ( i==0 ) {
-			cell.className = "Selected";
-			str_HTML += ' sortdir="down"><img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_down.gif" alt="" />';
-		}
-		else str_HTML += '>';
-
-		str_HTML += '</span></a>';
-
-		// insert new html into cell
-		cell.innerHTML = str_HTML;
-    }
-}
-
-function ts_getInnerText(el) {
-	if ( typeof el == "string") return el;
-	if ( typeof el == "undefined") { return el };
-	if ( el.innerText ) return el.innerText;	//Not needed but it is faster
-	var str = "";
-
-	var cs = el.childNodes;
-	var l = cs.length;
-	for (var i = 0; i < l; i++)
-	{
-		switch (cs[i].nodeType)
-		{
-			case 1: //ELEMENT_NODE
-				str += ts_getInnerText(cs[i]);
-				break;
-			case 3:	//TEXT_NODE
-				str += cs[i].nodeValue;
-				break;
-		}
-	}
-	return str;
-}
-
-function ts_resortTable(lnk,clid) {
-    // get the span
-    var span;
-    for (var ci=0;ci<lnk.childNodes.length;ci++)
-    {
-        if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
-    }
-    var spantext = ts_getInnerText(span);
-    var td = lnk.parentNode;
-    var column = clid || td.cellIndex;
-    var table = getParent(td,'TABLE');
-
-    // Work out a type for the column
-    if (table.rows.length <= 1) return;
-    var itm = ts_getInnerText(table.rows[1].cells[column]);
-    sortfn = ts_sort_caseinsensitive;
-    if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
-    if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
-    if (itm.match(/^[£$]/)) sortfn = ts_sort_currency;
-    if (itm.match(/^[\d\.]+$/)) sortfn = ts_sort_numeric;
-    SORT_COLUMN_INDEX = column;
-    var firstRow = new Array();
-    var newRows = new Array();
-    for (i=0;i<table.rows[0].length;i++) { firstRow[i] = table.rows[0][i]; }
-    for (j=1;j<table.rows.length;j++) { newRows[j-1] = table.rows[j]; }
-
-    newRows.sort(sortfn);
-
-	// set the class of the header to "selected", but first remove any class from all columns
-	for (r=0; r<table.rows[0].cells.length; r++ ) table.rows[0].cells[r].className = "";
-	table.rows[0].cells[column].className = table.rows[0].cells[column].className = "Selected";
-
-	// configures the up/down arrow
-    if (span.getAttribute("sortdir") == 'down')
-    {
-        // ARROW = '&nbsp;&nbsp;&uarr;';
-		ARROW = '<img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_up.gif" />';
-        newRows.reverse();
-        span.setAttribute('sortdir','up');
-    }
-    else
-    {
-        //ARROW = '&nbsp;&nbsp;&darr;';
-		ARROW = '<img src="' + WWW_TOP + '/templates/nntmux/images/sorting/arrow_down.gif" alt="" />';
-        span.setAttribute('sortdir','down');
-    }
-
-    // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
-    // don't do sortbottom rows
-    for (i=0;i<newRows.length;i++) { if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) table.tBodies[0].appendChild(newRows[i]);}
-    // do sortbottom rows only
-    for (i=0;i<newRows.length;i++) { if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1)) table.tBodies[0].appendChild(newRows[i]);}
-
-    // Delete any other arrows there may be showing
-    var allspans = document.getElementsByTagName("span");
-    for (var ci=0;ci<allspans.length;ci++)
-    {
-        if (allspans[ci].className == 'SortArrow')
-        {
-            if (getParent(allspans[ci],"table") == getParent(lnk,"table"))
-            { // in the same table as us?
-                allspans[ci].innerHTML = '';
-            }
-        }
-    }
-
-    span.innerHTML = ARROW;
-
-	F_ColourRows(table);
-}
-
-function getParent(el, pTagName) {
-	if (el == null) return null;
-	else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase())	// Gecko bug, supposed to be uppercase
-		return el;
-	else
-		return getParent(el.parentNode, pTagName);
-}
-function ts_sort_date(a,b) {
-    // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
-    aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
-    bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
-    if (aa.length == 10) {
-        dt1 = aa.substr(6,4)+aa.substr(3,2)+aa.substr(0,2);
-    } else {
-        yr = aa.substr(6,2);
-        if (parseInt(yr) < 50) { yr = '20'+yr; } else { yr = '19'+yr; }
-        dt1 = yr+aa.substr(3,2)+aa.substr(0,2);
-    }
-    if (bb.length == 10) {
-        dt2 = bb.substr(6,4)+bb.substr(3,2)+bb.substr(0,2);
-    } else {
-        yr = bb.substr(6,2);
-        if (parseInt(yr) < 50) { yr = '20'+yr; } else { yr = '19'+yr; }
-        dt2 = yr+bb.substr(3,2)+bb.substr(0,2);
-    }
-    if (dt1==dt2) return 0;
-    if (dt1<dt2) return -1;
-    return 1;
-}
-
-function ts_sort_currency(a,b) {
-    aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).replace(/[^0-9.]/g,'');
-    bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).replace(/[^0-9.]/g,'');
-    return parseFloat(aa) - parseFloat(bb);
-}
-
-function ts_sort_numeric(a,b) {
-    aa = parseFloat(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
-    if (isNaN(aa)) aa = 0;
-    bb = parseFloat(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
-    if (isNaN(bb)) bb = 0;
-    return aa-bb;
-}
-
-function ts_sort_caseinsensitive(a,b) {
-    aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
-    bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
-    if (aa==bb) return 0;
-    if (aa<bb) return -1;
-    return 1;
-}
-
-function ts_sort_default(a,b) {
-    aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
-    bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
-    if (aa==bb) return 0;
-    if (aa<bb) return -1;
-    return 1;
-}
-
-
-function addEvent(elm, evType, fn, useCapture)
-{
-  if (elm.addEventListener){
-    elm.addEventListener(evType, fn, useCapture);
-    return true;
-  } else if (elm.attachEvent){
-    var r = elm.attachEvent("on"+evType, fn);
-    return r;
-  } else {
-    alert("Handler could not be removed");
-  }
-}
-
-
-
-//------------------------------------------------------------------------------------
-
-function F_ColourRows ( objTable )
-{
-	var n_AltCount = 0;
-	for ( var i=1; i<objTable.rows.length; i++ )
-	{
-		objTable.rows[i].className = "";
-		if ( n_AltCount == 1 )
-		{
-			objTable.rows[i].className = "Darker";
-			n_AltCount = -1;
-		}
-		n_AltCount ++;
-	}
-}
diff --git a/lib/copy_this/www/templates/nntmux/scripts/subnav.js b/lib/copy_this/www/templates/nntmux/scripts/subnav.js
deleted file mode 100644
index 8daeebf63..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/subnav.js
+++ /dev/null
@@ -1,35 +0,0 @@
-(function ($) {
-
-	$(function(){
-
-		// fix sub nav on scroll
-		var $win = $(window),
-				$body = $('body'),
-				$nav = $('.subnav'),
-				navHeight = $('.navbar').first().height(),
-				subnavHeight = $('.subnav').first().height(),
-				subnavTop = $('.subnav').length && $('.subnav').offset().top - navHeight,
-				marginTop = parseInt($body.css('margin-top'), 10);
-				isFixed = 0;
-
-		processScroll();
-
-		$win.on('scroll', processScroll);
-
-		function processScroll() {
-			var i, scrollTop = $win.scrollTop();
-
-			if (scrollTop >= subnavTop && !isFixed) {
-				isFixed = 1;
-				$nav.addClass('subnav-fixed');
-				$body.css('margin-top', marginTop + subnavHeight + 'px');
-			} else if (scrollTop <= subnavTop && isFixed) {
-				isFixed = 0;
-				$nav.removeClass('subnav-fixed');
-				$body.css('margin-top', marginTop + 'px');
-			}
-		}
-
-	});
-
-})(window.jQuery);
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/utils-admin.js b/lib/copy_this/www/templates/nntmux/scripts/utils-admin.js
deleted file mode 100644
index 091a18f58..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/utils-admin.js
+++ /dev/null
@@ -1,670 +0,0 @@
-/**
- * ajax_group_status()
- *
- * @param id        group id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_group_status(id, what)
-{
-    // no caching of results
-    if (what != undefined)
-    {
-        $.ajax({
-          url       : WWW_TOP + '/admin/ajax_group-edit.php?rand=' + $.now(),
-          data      : { group_id: id, group_status: what },
-          dataType  : "html",
-          success   : function(data)
-          {
-              $('div#message').html(data);
-              $('div#message').show('fast', function() {});
-
-              // switch some links around
-              if (what == 0) {
-                  $('td#group-' + id).html('<a href="javascript:ajax_group_status('+ id +', 1)" class="group_deactive">Activate</a>');
-              }
-              else {
-                  $('td#group-' + id).html('<a href="javascript:ajax_group_status('+ id +', 0)" class="group_active">Deactivate</a>');
-              }
-
-              // fade.. mm
-              $('#message').fadeOut(5000);
-          },
-          error: function(xhr,err,e) { alert( "Error in ajax_group_status: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what group id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_site_status()
- *
- * @param id        site id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_site_status(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { site_id: id, site_status: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                    $('td#site-' + id).html('<a href="javascript:ajax_sharing_site_status('+ id +', 1)" class="sharing_site_deactive">Enable</a>');
-                }
-                else {
-                    $('td#site-' + id).html('<a href="javascript:ajax_sharing_site_status('+ id +', 0)" class="sharing_site_active">Disable</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_site_status: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what site id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_enabled()
- *
- * @param id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_enabled(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { enabled_status: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                     $('strong#enabled-' + id).html('<a title="Click this to enable sharing." href="javascript:ajax_sharing_enabled('+ id +', 1)" class="sharing_enabled_deactive">[ENABLE]</a>');
-                }
-                else {
-                    $('strong#enabled-' + id).html('<a title="Click this to disable sharing." href="javascript:ajax_sharing_enabled('+ id +', 0)" class="sharing_enabled_active">[DISABLE]</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_enabled: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what enabled id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_startposition()
- *
- * @param id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_startposition(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { start_position: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                    $('strong#startposition-' + id).html('<a title="Click this to enable backfill." href="javascript:ajax_sharing_startposition('+ id +', 1)" class="sharing_enabled_deactive">[ENABLE]</a>');
-                }
-                else {
-                    $('strong#startposition-' + id).html('<a title="Click this to disable backfill." href="javascript:ajax_sharing_startposition('+ id +', 0)" class="sharing_enabled_active">[DISABLE]</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_startposition: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what enabled id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_reset()
- *
- * @param id
- */
-function ajax_sharing_reset(id)
-{
-    var rand_no = Math.random();
-    $.ajax({
-        url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-        data      : { reset_settings: id },
-        dataType  : "html",
-        success   : function(data)
-        {
-            $('div#message').html(data);
-            $('div#message').show('fast', function() {});
-
-            // fade.. mm
-            $('#message').fadeOut(5000);
-            setTimeout('history.go(0);',1500);
-        },
-        error: function(xhr,err,e) { alert( "Error in ajax_sharing_reset: " + err ); }
-    });
-}
-
-/**
- * ajax_sharing_site_purge()
- *
- * @param id
- */
-function ajax_sharing_site_purge(id)
-{
-    var rand_no = Math.random();
-    $.ajax({
-        url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-        data      : { purge_site: id },
-        dataType  : "html",
-        success   : function(data)
-        {
-            $('div#message').html(data);
-            $('div#message').show('fast', function() {});
-
-            // fade.. mm
-            $('#message').fadeOut(5000);
-            setTimeout('history.go(0);',1500);
-        },
-        error: function(xhr,err,e) { alert( "Error in ajax_sharing_site_purge: " + err ); }
-    });
-}
-
-/**
- * ajax_sharing_posting()
- *
- * @param id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_posting(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { posting_status: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                   $('strong#posting-' + id).html('<a title="Click this to enable posting." href="javascript:ajax_sharing_posting('+ id +', 1)" class="sharing_posting_deactive">[ENABLE]</a>');
-                }
-                else {
-                    $('strong#posting-' + id).html('<a title="Click this to disable posting." href="javascript:ajax_sharing_posting('+ id +', 0)" class="sharing_posting_active">[DISABLE]</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_posting: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what posting id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_fetching()
- *
- * @param id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_fetching(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { fetching_status: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                   $('strong#fetching-' + id).html('<a title="Click this to enable posting." href="javascript:ajax_fetching_posting('+ id +', 1)" class="sharing_fetching_deactive">[ENABLE]</a>');
-                }
-                else {
-                    $('strong#fetching-' + id).html('<a title="Click this to disable sharing." href="javascript:ajax_fetching_posting('+ id +', 0)" class="sharing_fetching_active">[DISABLE]</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_fetching: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what fetching id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_auto()
- *
- * @param id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_auto(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { auto_status: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                   $('strong#auto-' + id).html('<a title="Click this to enable auto-enable." href="javascript:ajax_auto_posting('+ id +', 1)" class="sharing_auto_deactive">[ENABLE]</a>');
-                }
-                else {
-                    $('strong#auto-' + id).html('<a title="Click this to disable auto-enable." href="javascript:ajax_auto_posting('+ id +', 0)" class="sharing_auto_active">[DISABLE]</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_auto: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what auto id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_hide()
- *
- * @param id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_sharing_hide(id, status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { hide_status: status },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (status == 0) {
-                    $('strong#hide-' + id).html('<a title="Click this to enable hiding users." href="javascript:ajax_hide_posting('+ id +', 1)" class="sharing_hide_deactive">[ENABLE]</a>');
-                }
-                else {
-                    $('strong#hide-' + id).html('<a title="Click this to disable hiding users." href="javascript:ajax_hide_posting('+ id +', 0)" class="sharing_hide_active">[DISABLE]</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_sharing_hide: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what hide id are looking for?');
-    }
-}
-
-/**
- * ajax_sharing_toggle_all()
- *
- *  @param status
- */
-function ajax_sharing_toggle_all(status)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (status != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_sharing_settings.php?rand=' + rand_no,
-            data      : { toggle_all: status },
-            dataType  : "html"
-        });
-    }
-    else
-    {
-        alert('Weird.. what toggle status are you looking for?');
-    }
-}
-/**
- * ajax_backfill_status()
- *
- * @param id        group id
- * @param status    0 = deactive, 1 = activate
- */
-function ajax_backfill_status(id, what)
-{
-    // no caching of results
-    var rand_no = Math.random();
-    if (what != undefined)
-    {
-        $.ajax({
-            url       : WWW_TOP + '/admin/ajax_group-edit.php?rand=' + rand_no,
-            data      : { group_id: id, backfill_status: what },
-            dataType  : "html",
-            success   : function(data)
-            {
-                $('div#message').html(data);
-                $('div#message').show('fast', function() {});
-
-                // switch some links around
-                if (what == 0) {
-                    $('td#backfill-' + id).html('<a href="javascript:ajax_backfill_status('+ id +', 1)" class="backfill_deactive">Activate</a>');
-                }
-                else {
-                    $('td#backfill-' + id).html('<a href="javascript:ajax_backfill_status('+ id +', 0)" class="backfill_active">Deactivate</a>');
-                }
-
-                // fade.. mm
-                $('#message').fadeOut(5000);
-            },
-            error: function(xhr,err,e) { alert( "Error in ajax_backfill_status: " + err ); }
-        });
-    }
-    else
-    {
-        alert('Weird.. what group id are looking for?');
-    }
-}
-
-/**
- * ajax_group_delete()
- *
- * @param id        group id
- */
-function ajax_group_delete(id)
-{
-    // no caching of results
-	$.ajax({
-	  url       : WWW_TOP + '/admin/ajax_group-edit.php?action=2&rand=' + $.now(),
-	  data      : { group_id: id},
-	  dataType  : "html",
-	  success   : function(data)
-	  {
-		  $('div#message').html(data);
-		  $('div#message').show('fast', function() {});
-		  $('#grouprow-'+id).fadeOut(2000);
-		  $('#message').fadeOut(5000);
-	  },
-	  error: function(xhr,err,e) { alert( "Error in ajax_group_delete: " + err ); }
-	});
-}
-
-/**
- * ajax_group_reset()
- *
- * @param id        group id
- */
-function ajax_group_reset(id)
-{
-    // no caching of results
-	$.ajax({
-	  url       : WWW_TOP + '/admin/ajax_group-edit.php?action=3&rand=' + $.now(),
-	  data      : { group_id: id},
-	  dataType  : "html",
-	  success   : function(data)
-	  {
-		  $('div#message').html(data);
-		  $('div#message').show('fast', function() {});
-		  $('#grouprow-'+id).fadeTo(2000, 0.5);
-		  $('#message').fadeOut(5000);
-	  },
-	  error: function(xhr,err,e) { alert( "Error in ajax_group_reset: " + err ); }
-	});
-}
-
-/**
- * ajax_group_purge()
- *
- * @param id        group id
- */
-function ajax_group_purge(id)
-{
-    // no caching of results
-	$.ajax({
-	  url       : WWW_TOP + '/admin/ajax_group-edit.php?action=4&rand=' + $.now(),
-	  data      : { group_id: id},
-	  dataType  : "html",
-	  success   : function(data)
-	  {
-		  $('div#message').html(data);
-		  $('div#message').show('fast', function() {});
-		  $('#grouprow-'+id).fadeTo(2000, 0.5);
-		  $('#message').fadeOut(5000);
-	  },
-	  error: function(xhr,err,e) { alert( "Error in ajax_group_reset: " + err ); }
-	});
-}
-
-/**
- * ajax_all_reset()
- *
- *
- */
-function ajax_all_reset()
-{
-    // no caching of results
-    var rand_no = Math.random();
-    $.ajax({
-        url       : WWW_TOP + '/admin/ajax_group-edit.php?action=5&rand=' + rand_no,
-        data      :  "All groups reset.",
-        dataType  : "html",
-        success   : function(data)
-        {
-            $('div#message').html(data);
-            $('div#message').show('fast', function() {});
-            $('#grouprow-'+id).fadeTo(2000, 0.5);
-            $('#message').fadeOut(5000);
-        },
-        error: function(xhr,err,e) { alert( "Error in ajax_all_reset: " + err ); }
-    });
-}
-
-/**
- * ajax_all_purge()
- */
-function ajax_all_purge()
-{
-    // no caching of results
-    var rand_no = Math.random();
-    $.ajax({
-        url       : WWW_TOP + '/admin/ajax_group-edit.php?action=6&rand=' + rand_no,
-        data      : "All groups purged",
-        dataType  : "html",
-        success   : function(data)
-        {
-            $('div#message').html(data);
-            $('div#message').show('fast', function() {});
-            $('#grouprow-'+id).fadeTo(2000, 0.5);
-            $('#message').fadeOut(5000);
-        },
-        error: function(xhr,err,e) { alert( "Error in ajax_all_purge: " + err ); }
-    });
-}
-
-/**
- * ajax_releaseregex_delete()
- *
- * @param id        regex id
- */
-function ajax_releaseregex_delete(id)
-{
-    // no caching of results
-	$.ajax({
-	  url       : WWW_TOP + '/admin/ajax_regex-list.php?action=2&rand=' + $.now(),
-	  data      : { regex_id: id},
-	  dataType  : "html",
-	  success   : function(data)
-	  {
-		  $('div#message').html(data);
-		  $('div#message').show('fast', function() {});
-		  $('#row-'+id).fadeOut(2000);
-		  $('#message').fadeOut(5000);
-	  },
-	  error: function(xhr,err,e) { alert( "Error in ajax_releaseregex_delete: " + err ); }
-	});
-}
-
-
-/**
- * ajax_binaryblacklist_delete()
- *
- * @param id        binary id
- */
-function ajax_binaryblacklist_delete(id)
-{
-    // no caching of results
-	$.ajax({
-	  url       : WWW_TOP + '/admin/ajax_binaryblacklist-list.php?action=2&rand=' + $.now(),
-	  data      : { bin_id: id},
-	  dataType  : "html",
-	  success   : function(data)
-	  {
-		  $('div#message').html(data);
-		  $('div#message').show('fast', function() {});
-		  $('#row-'+id).fadeOut(2000);
-		  $('#message').fadeOut(5000);
-	  },
-	  error: function(xhr,err,e) { alert( "Error in ajax_binaryblacklist_delete: " + err ); }
-	});
-}
-
-
-/**
- * ajax_welcome_msg()
- *
- * @param bln        flag
- */
-function ajax_welcome_msg(bln)
-{
-    // no caching of results
-	var _action = (bln ? 1 : 0);
-	$.ajax({
-	  url       : WWW_TOP + '/admin/ajax_welcome_msg.php?rand=' + $.now(),
-	  data      : { action: _action},
-	  dataType  : "html",
-	  success   : function(data)
-	  {
-		if (bln)
-		{
-		  $('div#adminhome').hide();
-		  $('div#adminwelcome').show('fast', function() {});
-		}
-		else
-		{
-		  $('div#adminwelcome').hide();
-		  $('div#adminhome').show('fast', function() {});
-		}
-	  },
-	  error: function(xhr,err,e) { alert( "Error in ajax_welcome_msg: " + err ); }
-	});
-}
-
-jQuery(function($){
-
-    $('#regexGroupSelect').change(function() {
-      document.location="?group=" + $("#regexGroupSelect option:selected").attr('value');
-    });
-
-    $('#previewcat').change(function() {
-        document.location="?previewcat=" + $("#previewcat option:selected").attr('value');
-    });
-
-    // misc
-    $('.confirm_action').click(function(){ return confirm('Are you sure?'); });
-
-
-    //fix for autosizing plugin
-    $('.autosize').autosize({append: "\n"});
-
-});
-
-//enable Custom checkboxes for fix crap releases
-function enableFixCrapCustom(){
-    var inputs = document.getElementsByName('fix_crap_opt');
-    if (inputs[2].checked == true) {
-        var checks = document.getElementsByName('fix_crap[]')
-        for (var t = 0; t < checks.length; t ++) {
-            checks[t].disabled = false;
-            checks[t].readonly = false;
-        }
-    }
-    else {
-        var checks = document.getElementsByName('fix_crap[]')
-        for (var t = 0; t < checks.length; t ++) {
-            checks[t].disabled = true;
-            checks[t].readonly = true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/scripts/utils.js b/lib/copy_this/www/templates/nntmux/scripts/utils.js
deleted file mode 100644
index 540927fc3..000000000
--- a/lib/copy_this/www/templates/nntmux/scripts/utils.js
+++ /dev/null
@@ -1,763 +0,0 @@
-// event bindings
-jQuery(function ($) {
-
-    // browse.tpl, search.tpl -- show icons on hover
-    var orig_opac = $('table.data tr').children('td.icons').children('div.icon').css('opacity');
-    $('table.data tr').hover(
-        function () {
-            $(this).children('td.icons').children('div.icon').css('opacity', 1);
-        },
-        function () {
-            $(this).children('td.icons').children('div.icon').css('opacity', orig_opac);
-        }
-    );
-
-    $(".forumpostsubmit").click(function (e) {
-        if ($.trim($("#addMessage").val()) == "" || $.trim($("#addSubject").val()) == "") {
-            alert("Please enter a subject and message.");
-            return false;
-        }
-    });
-
-    $(".forumreplysubmit").click(function (e) {
-        if ($.trim($("#addReply").val()) == "") {
-            alert("Please enter a message.");
-            return false;
-        }
-    });
-
-    $(".check").click(function (e) {
-        if (!$(e.target).is('input'))
-            $(this).children(".nzb_check").prop('checked', !$(this).children(".nzb_check").prop('checked'));
-    });
-
-    $(".descmore").click(function (e) {
-        $(".descinitial").hide();
-        $(".descfull").show();
-        return false;
-    });
-
-    $('.nzb_check_all').change(function () {
-        $('table.data tr td input:checkbox').prop('checked', $(this).prop('checked'));
-    });
-
-    $('.nzb_check_all_season').change(function () {
-        var season = $(this).attr('name');
-        $('table.data tr td input:checkbox').each(function (i, row) {
-            if ($(row).attr('name') == season) {
-                $(row).prop('checked', !$(row).prop('checked'));
-            }
-        });
-    });
-
-    // browse.tpl, search.tpl
-    $('.icon_cart').click(function (e) {
-        if ($(this).hasClass('icon_cart_clicked')) return false;
-        var guid = $(this).parent().parent().attr('id').substring(4);
-        $.post(SERVERROOT + "cart?add=" + guid, function (resp) {
-            $(e.target).addClass('icon_cart_clicked').attr('title', 'Added to Cart');
-            createGrowl('Added to Cart');
-        });
-        return false;
-    });
-    $('.icon_sab').click(function (e) { // replace with cookies?
-        if ($(this).hasClass('icon_sab_clicked')) {
-            return false;
-        }
-
-        var guid = $(this).parent().parent().attr('id').substring(4);
-        var nzburl = SERVERROOT + "sendtoqueue/" + guid;
-
-        $.post(nzburl, function (resp) {
-            $(e.target).addClass('icon_sab_clicked').attr('title', 'Added to Queue');
-            createGrowl('Added to Queue');
-        });
-        return false;
-    });
-    $('.sendtocouch').click(function (e) {
-        e.preventDefault();
-        $.get($(this).attr('rel'));
-
-        $.pnotify({
-            title: 'ADDED TO COUCHPOTATO!',
-            text: 'Its now on your wanted list! ^_^',
-            type: 'info',
-            animate_speed: 'fast',
-            icon: 'icon-info-sign'
-        });
-    });
-    $("table.data a.modal_nfo").colorbox({	 // NFO modal
-        href: function () {
-            return $(this).attr('href') + '&modal';
-        },
-        title: function () {
-            return $(this).parent().parent().children('a.title').text();
-        },
-        innerWidth: "800px", innerHeight: "90%", initialWidth: "800px", initialHeight: "90%", speed: 0, opacity: 0.7
-    });
-    // Screenshot modal
-    $("table.data a.modal_prev").colorbox({maxWidth: "1920px", maxHeight: "1080px"});
-
-    $("table.data a.modal_imdb").colorbox({	 // IMDB modal
-        href: function () {
-            return SERVERROOT + "movie/" + $(this).attr('name').substring(4) + '&modal';
-        },
-        title: function () {
-            return $(this).parent().parent().children('a.title').text();
-        },
-        innerWidth: "800px", innerHeight: "450px", initialWidth: "800px", initialHeight: "450px", speed: 0, opacity: 0.7
-    }).click(function () {
-        $('#colorbox').removeClass().addClass('cboxMovie');
-    });
-
-    $("a.modal_imdbtrailer").colorbox({	 // IMDB trailer modal
-        href: function(){ return SERVERROOT + "movietrailer/"+$(this).attr('name').substring(4)+'&modal'; },
-        title: function(){ return $(this).parent().parent().children('a.title').text(); },
-        innerWidth:"800px", innerHeight:"450px", initialWidth:"800px", initialHeight:"450px", speed:0, opacity:0.7
-    }).click(function(){
-        $('#colorbox').removeClass().addClass('cboxMovie');
-    });
-
-    $("table.data a.modal_music").colorbox({	 // Music modal
-        href: function () {
-            return SERVERROOT + "musicmodal/" + $(this).attr('name').substring(4) + '&modal';
-        },
-        title: function () {
-            return $(this).parent().parent().children('a.title').text();
-        },
-        innerWidth: "800px", innerHeight: "450px", initialWidth: "800px", initialHeight: "450px", speed: 0, opacity: 0.7
-    }).click(function () {
-        $('#colorbox').removeClass().addClass('cboxMusic');
-    });
-    $("table.data a.modal_console").colorbox({	 // Console modal
-        href: function () {
-            return SERVERROOT + "consolemodal/" + $(this).attr('name').substring(4) + '&modal';
-        },
-        title: function () {
-            return $(this).parent().parent().children('a.title').text();
-        },
-        innerWidth: "800px", innerHeight: "450px", initialWidth: "800px", initialHeight: "450px", speed: 0, opacity: 0.7
-    }).click(function () {
-        $('#colorbox').removeClass().addClass('cboxConsole');
-    });
-    $("table.data a.modal_book").colorbox({	 // Book modal
-        href: function () {
-            return SERVERROOT + "bookmodal/" + $(this).attr('name').substring(4) + '&modal';
-        },
-        title: function () {
-            return $(this).parent().parent().children('a.title').text();
-        },
-        innerWidth: "800px", innerHeight: "450px", initialWidth: "800px", initialHeight: "450px", speed: 0, opacity: 0.7
-    }).click(function () {
-        $('#colorbox').removeClass().addClass('cboxBook');
-    });
-
-
-    $('#nzb_multi_operations_form').submit(function () {
-        return false;
-    });
-    $('input.nzb_multi_operations_download').click(function () {
-        var ids = "";
-        $("table.data INPUT[type='checkbox']:checked").each(function (i, row) {
-            if ($(row).val() != "on")
-                ids += $(row).val() + ',';
-        });
-        ids = ids.substring(0, ids.length - 1);
-        if (ids)
-            window.location = SERVERROOT + "getnzb?zip=1&id=" + ids;
-    });
-    $('input.nzb_multi_operations_cart').click(function () {
-        var guids = new Array();
-        $("table.data INPUT[type='checkbox']:checked").each(function (i, row) {
-            var guid = $(row).val();
-            var $cartIcon = $(row).parent().parent().children('td.icons').children('.icon_cart');
-            if (guid && !$cartIcon.hasClass('icon_cart_clicked')) {
-                $cartIcon.addClass('icon_cart_clicked').attr('title', 'Added to Cart');	// consider doing this only upon success
-                guids.push(guid);
-                createGrowl('Added to Cart');
-            }
-            $(this).prop('checked', false);
-        });
-        $.post(SERVERROOT + "cart?add=" + guids);
-    });
-    $('input.nzb_multi_operations_sab').click(function () {
-        $("table.data INPUT[type='checkbox']:checked").each(function (i, row) {
-            var $sabIcon = $(row).parent().parent().children('td.icons').children('.icon_sab');
-            var guid = $(row).val();
-            if (guid && !$sabIcon.hasClass('icon_sab_clicked')) {
-                var nzburl = SERVERROOT + "sendtoqueue/" + guid;
-                $.post(nzburl, function (resp) {
-                    $sabIcon.addClass('icon_sab_clicked').attr('title', 'Added to Queue');
-                    createGrowl('Added to Queue');
-                });
-            }
-            $(this).prop('checked', false);
-        });
-    });
-    //front end admin functions
-    $('input.nzb_multi_operations_edit').click(function () {
-        var ids = "";
-        $("table.data INPUT[type='checkbox']:checked").each(function (i, row) {
-            if ($(row).val() != "on")
-                ids += '&id[]=' + $(row).val();
-        });
-        if (ids)
-            $('input.nzb_multi_operations_edit').colorbox({
-                href: function () {
-                    return SERVERROOT + "ajax_release-admin?action=edit" + ids + "&from=" + encodeURIComponent(window.location);
-                },
-                title: 'Edit Release',
-                innerWidth: "400px", innerHeight: "250px", initialWidth: "400px", initialHeight: "250px", speed: 0, opacity: 0.7
-            });
-    });
-    $('input.nzb_multi_operations_delete').click(function () {
-        var ids = "";
-        $("table.data INPUT[type='checkbox']:checked").each(function (i, row) {
-            if ($(row).val() != "on")
-                ids += '&id[]=' + $(row).val();
-        });
-        if (ids)
-            if (confirm('Are you sure you want to delete the selected releases?')) {
-                $.post(SERVERROOT + "ajax_release-admin?action=dodelete" + ids, function (resp) {
-                    window.location = window.location;
-                });
-            }
-    });
-    //cart functions
-    $('input.nzb_multi_operations_cartdelete').click(function () {
-        var ids = new Array();
-        $("table.data INPUT[type='checkbox']:checked").each(function (i, row) {
-            if ($(row).val() != "on")
-                ids.push($(row).val());
-        });
-        if (ids) {
-            if (confirm('Are you sure you want to delete the selected releases from your cart?')) {
-                $.post(SERVERROOT + "cart?delete", { 'delete': ids }, function (resp) {
-                    window.location = window.location;
-                });
-            }
-        }
-    });
-
-    // headermenu.tpl
-    $('#headsearch')
-        .focus(function () {
-            if (this.value == 'Enter keywords') this.value = '';
-        })
-        .blur(function () {
-        if (this.value == '') this.value = 'Enter keywords';
-    });
-    $('#headsearch_form').submit(function () {
-        $('headsearch_go').trigger('click');
-        return false;
-    });
-    $('#headsearch_go').click(function () {
-        if ($('#headsearch').val() && $('#headsearch').val() != 'Enter keywords') {
-            document.location = WWW_TOP + "/search/" + $('#headsearch').val() + ($("#headcat").val() != -1 ? "?t=" + $("#headcat").val() : "");
-        }
-    });
-
-    // search.tpl
-    $('#search_search_button').click(function () {
-        if ($('#search').val())
-            document.location = WWW_TOP + "/search/" + $('#search').val() + ($("#search_cat").val() != -1 ? "?t=" + $("#search_cat").val() : "");
-        return false;
-    });
-
-    // login.tpl, register.tpl, search.tpl, searchraw.tpl
-    if ($('#username').length)
-        $('#username').focus();
-    if ($('#search').length)
-        $('#search').focus();
-
-    // viewfilelist.tpl
-    $('#viewfilelist_download_selected').click(function () {
-        if ($('#fileform input:checked').length)
-            $('#fileform').trigger('submit');
-        return false;
-    });
-
-    // misc
-    $('.confirm_action').click(function () {
-        return confirm('Are you sure?');
-    });
-
-    // mmenu
-    $('.mmenu').click(function () {
-        document.location = $(this).children('a').attr('href');
-        return false;
-    });
-
-    // mmenu_new
-    $('.mmenu_new').click(function () {
-        window.open($(this).children('a').attr('href'));
-        return false;
-    });
-
-    // searchraw.tpl, viewfilelist.tpl -- checkbox operations
-    // selections
-    var last1, last2;
-    $(".checkbox_operations .select_all").click(function () {
-        $("table.data INPUT[type='checkbox']").prop('checked', true).trigger('change');
-        return false;
-    });
-    $(".checkbox_operations .select_none").click(function () {
-        $("table.data INPUT[type='checkbox']").prop('checked', false).trigger('change');
-        return false;
-    });
-    $(".checkbox_operations .select_invert").click(function () {
-        $("table.data INPUT[type='checkbox']").each(function () {
-            $(this).prop('checked', !$(this).prop('checked')).trigger('change');
-        });
-        return false;
-    });
-    $(".checkbox_operations .select_range").click(function () {
-        if (last1 && last2 && last1 < last2)
-            $("table.data INPUT[type='checkbox']").slice(last1, last2).prop('checked', true).trigger('change');
-        else if (last1 && last2)
-            $("table.data INPUT[type='checkbox']").slice(last2, last1).prop('checked', true).trigger('change');
-        return false;
-    });
-    $('table.data td.check INPUT[type="checkbox"]').click(function (e) {
-        // range event interaction -- see further above
-        var rowNum = $(e.target).parent().parent()[0].rowIndex;
-        if (last1) last2 = last1;
-        last1 = rowNum;
-
-        // perform range selection
-        if (e.shiftKey && last1 && last2) {
-            if (last1 < last2)
-                $("table.data INPUT[type='checkbox']").slice(last1, last2).prop('checked', true).trigger('change');
-            else
-                $("table.data INPUT[type='checkbox']").slice(last2, last1).prop('checked', true).trigger('change');
-        }
-    });
-    $('table.data a.data_filename').click(function (e) { // click filenames to select
-        // range event interaction -- see further above
-        var rowNum = $(e.target).parent().parent()[0].rowIndex;
-        if (last1) last2 = last1;
-        last1 = rowNum;
-
-        var $checkbox = $('table.data tr:nth-child(' + (rowNum + 1) + ') td.selection INPUT[type="checkbox"]');
-        $checkbox.prop('checked', !$checkbox.prop('checked'));
-
-        return false;
-    });
-
-
-    // show/hide invite form
-    $('#lnkSendInvite').click(function () {
-        $('#divInvite').slideToggle('fast');
-    });
-
-    // send an invite
-    $('#frmSendInvite').submit(function () {
-        var inputEmailto = $("#txtInvite").val();
-        if (isValidEmailAddress(inputEmailto)) {
-
-            // no caching of results
-            var rand_no = Math.random();
-            $.ajax({
-                url: WWW_TOP + '/ajax_profile?action=1&rand=' + rand_no,
-                data: { emailto: inputEmailto},
-                dataType: "html",
-                success: function (data) {
-                    $("#txtInvite").val("");
-                    $('#divInvite').slideToggle('fast');
-                    $("#divInviteSuccess").text(data).show();
-                    $("#divInviteError").hide();
-                },
-                error: function (xhr, err, e) {
-                    alert("Error in ajax_profile: " + err);
-                }
-            });
-        }
-        else {
-            $("#divInviteSuccess").hide();
-            $("#divInviteError").text("Invalid email").show();
-        }
-        return false;
-    });
-
-    // movie.tpl
-    $('.mlmore').click(function () {	// show more movies
-        $(this).parent().parent().hide();
-        $(this).parent().parent().parent().children(".mlextra").show();
-        return false;
-    });
-
-    // lookup tmdb for a movie
-    $('#frmMyMovieLookup').submit(function () {
-        var movSearchText = $("#txtsearch").val();
-        // no caching of results
-        var rand_no = Math.random();
-        $.ajax({
-            url: WWW_TOP + '/ajax_mymovies?rand=' + rand_no,
-            data: { id: movSearchText},
-            dataType: "html",
-            success: function (data) {
-                $("#divMovResults").html(data);
-            },
-            error: function (xhr, err, e) {
-                alert("Error in ajax_mymovies: " + err);
-            }
-        });
-
-        return false;
-    });
-
-
-    // file list tooltip
-    $(".rarfilelist").each(function () {
-        var guid = $(this).children('img').attr('alt');
-        $(this).qtip({
-            content: {
-                title: {
-                    text: 'rar archive contains...'
-                },
-                text: 'loading...', // The text to use whilst the AJAX request is loading
-                ajax: {
-                    url: SERVERROOT + 'ajax_rarfilelist', // URL to the local file
-                    type: 'GET', // POST or GET
-                    data: { id: guid }, // Data to pass along with your request
-                    success: function (data, status) {
-                        this.set('content.text', data);
-                    }
-                }
-            },
-            position: {
-                my: 'top right',
-                at: 'bottom left',
-            },
-            style: {
-                classes: 'qtip-dark qtip-shadow qtip-rounded',
-                width: { max: 500 },
-                tip: { // Now an object instead of a string
-                    corner: 'topRight', // We declare our corner within the object using the corner sub-option
-                    size: {
-                        x: 8, // Be careful that the x and y values refer to coordinates on screen, not height or width.
-                        y: 8 // Depending on which corner your tooltip is at, x and y could mean either height or width!
-                    }
-                }
-            }
-        });
-    });
-
-    // seriesinfo tooltip
-    $(".seriesinfo").each(function () {
-        var guid = $(this).attr('title');
-        $(this).qtip({
-            content: {
-                title: {
-                    text: 'episode info...'
-                },
-                text: 'loading...', // The text to use whilst the AJAX request is loading
-                ajax: {
-                    url: SERVERROOT + 'ajax_tvinfo', // URL to the local file
-                    type: 'GET', // POST or GET
-                    data: { id: guid }, // Data to pass along with your request
-                    success: function (data, status) {
-                        this.set('content.text', data);
-                    }
-                }
-            },
-            style: {
-                classes: 'qtip-dark qtip-shadow qtip-rounded'
-            }
-        });
-    });
-
-    // mediainfo tooltip
-    $(".mediainfo").each(function () {
-        var guid = $(this).attr('title');
-        $(this).qtip({
-            content: {
-                title: {
-                    text: 'extended media info...'
-                },
-                text: 'loading...', // The text to use whilst the AJAX request is loading
-                ajax: {
-                    url: SERVERROOT + 'ajax_mediainfo', // URL to the local file
-                    type: 'GET', // POST or GET
-                    data: { id: guid }, // Data to pass along with your request
-                    success: function (data, status) {
-                        this.set('content.text', data);
-                    }
-                }
-            },
-            style: {
-                classes: 'qtip-dark qtip-shadow qtip-rounded',
-                width: { max: 500 },
-                tip: { // Now an object instead of a string
-                    corner: 'topLeft', // We declare our corner within the object using the corner sub-option
-                    size: {
-                        x: 8, // Be careful that the x and y values refer to coordinates on screen, not height or width.
-                        y: 8 // Depending on which corner your tooltip is at, x and y could mean either height or width!
-                    }
-                }
-            }
-        });
-    });
-
-    // preinfo tooltip
-    $(".preinfo").each(function() {
-        var searchname = $(this).attr('title');
-        $(this).qtip({
-            content: {
-                title: {
-                    text: 'Pre Info'
-                },
-                text: 'loading...',
-                ajax: {
-                    url: SERVERROOT + 'ajax_preinfo',
-                    type: 'GET',
-                    data: { searchname: searchname },
-                    success: function(data, status) {
-                        this.set('content.text', data);
-                    }
-                }
-            },
-            style: {
-                classes: 'ui-tooltip-tmux'
-            }
-        });
-    });
-
-    // prehashinfo tooltip
-    $(".prehashinfo").each(function () {
-        var prehashid = $(this).attr('title');
-        $(this).qtip({
-            content: {
-                title: {
-                    text: 'PreHash info...'
-                },
-                text: 'loading...', // The text to use whilst the AJAX request is loading
-                ajax: {
-                    url: SERVERROOT + 'ajax_prehashinfo', // URL to the local file
-                    type: 'GET', // POST or GET
-                    data: { id: prehashid }, // Data to pass along with your request
-                    success: function (data, status) {
-                        this.set('content.text', data);
-                    }
-                }
-            },
-            style: {
-                classes: 'qtip-dark qtip-shadow qtip-rounded',
-                width: { max: 500 },
-                tip: { // Now an object instead of a string
-                    corner: 'topLeft', // We declare our corner within the object using the corner sub-option
-                    size: {
-                        x: 8, // Be careful that the x and y values refer to coordinates on screen, not height or width.
-                        y: 8 // Depending on which corner your tooltip is at, x and y could mean either height or width!
-                    }
-                }
-            }
-        });
-    });
-
-    // titleinfo tooltip
-    $(".titleinfo").each(function () {
-        var guid = $(this).attr('title');
-        $(this).qtip({
-            content: {
-                title: {
-                    text: 'Release info...'
-                },
-                text: 'loading...', // The text to use whilst the AJAX request is loading
-                ajax: {
-                    url: SERVERROOT + 'ajax_titleinfo', // URL to the local file
-                    type: 'GET', // POST or GET
-                    data: { id: guid }, // Data to pass along with your request
-                    success: function (data, status) {
-                        this.set('content.text', data);
-                    }
-                }
-            },
-            style: {
-                classes: 'qtip-dark qtip-shadow qtip-rounded',
-                width: { max: 500 },
-                tip: { // Now an object instead of a string
-                    corner: 'topLeft', // We declare our corner within the object using the corner sub-option
-                    size: {
-                        x: 8, // Be careful that the x and y values refer to coordinates on screen, not height or width.
-                        y: 8 // Depending on which corner your tooltip is at, x and y could mean either height or width!
-                    }
-                }
-            }
-        });
-    });
-});
-
-
-$.extend({ // http://plugins.jquery.com/project/URLEncode
-    URLEncode: function (c) {
-        var o = '';
-        var x = 0;
-        c = c.toString();
-        var r = /(^[a-zA-Z0-9_.]*)/;
-        while (x < c.length) {
-            var m = r.exec(c.substr(x));
-            if (m != null && m.length > 1 && m[1] != '') {
-                o += m[1];
-                x += m[1].length;
-            } else {
-                if (c[x] == ' ')o += '+'; else {
-                    var d = c.charCodeAt(x);
-                    var h = d.toString(16);
-                    o += '%' + (h.length < 2 ? '0' : '') + h.toUpperCase();
-                }
-                x++;
-            }
-        }
-        return o;
-    },
-    URLDecode: function (s) {
-        var o = s;
-        var binVal, t;
-        var r = /(%[^%]{2})/;
-        while ((m = r.exec(o)) != null && m.length > 1 && m[1] != '') {
-            b = parseInt(m[1].substr(1), 16);
-            t = String.fromCharCode(b);
-            o = o.replace(m[1], t);
-        }
-        return o;
-    }
-});
-
-
-function isValidEmailAddress(emailAddress) {
-    var pattern = new RegExp(/^(("[\w-\s]+")|([\w-]+(?:\.[\w-]+)*)|("[\w-\s]+")([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\]?$)/i);
-    return pattern.test(emailAddress);
-}
-
-function mymovie_del(imdbid, btn) {
-    var rand_no = Math.random();
-    $.ajax({
-        url: WWW_TOP + '/ajax_mymovies?rand=' + rand_no,
-        data: { del: imdbid},
-        dataType: "html",
-        success: function (data) {
-            $(btn).hide();
-            $(btn).prev("a").show();
-        },
-        error: function (xhr, err, e) {
-        }
-    });
-
-    return false;
-}
-
-function mymovie_add(imdbid, btn) {
-    $(btn).hide();
-    $(btn).next("a").show();
-
-    var rand_no = Math.random();
-    $.ajax({
-        url: WWW_TOP + '/ajax_mymovies?rand=' + rand_no,
-        data: { add: imdbid},
-        dataType: "html",
-        success: function (data) {
-        },
-        error: function (xhr, err, e) {
-        }
-    });
-
-    return false;
-}
-
-
-// qtip growl
-$(document).ready(function () {
-
-    window.createGrowl = function (tipText /*, tipTitle, persistent*/) {
-        // Use the last visible jGrowl qtip as our positioning target
-        var target = $('.qtip.jgrowl:visible:last');
-        var tipTitle = 'Attention!';
-        var persistent = false;
-
-        // Create your jGrowl qTip...
-        $(document.body).qtip({
-            // Any content config you want here really.... go wild!
-            content: {
-                text: tipText,
-                title: {
-                    text: tipTitle,
-                    button: true
-                }
-            },
-            position: {
-                my: 'top right', // Not really important...
-                at: (target.length ? 'bottom' : 'top') + ' right', // If target is window use 'top right' instead of 'bottom right'
-                target: target.length ? target : $(document.body), // Use our target declared above
-                adjust: { y: 5 } // Add some vertical spacing
-            },
-            show: {
-                event: false, // Don't show it on a regular event
-                ready: true, // Show it when ready (rendered)
-                effect: function () {
-                    $(this).stop(0, 1).fadeIn(400);
-                }, // Matches the hide effect
-
-                // Custom option for use with the .get()/.set() API, awesome!
-                persistent: persistent
-            },
-            hide: {
-                event: false, // Don't hide it on a regular event
-                effect: function (api) {
-                    // Do a regular fadeOut, but add some spice!
-                    $(this).stop(0, 1).fadeOut(400).queue(function () {
-                        // Destroy this tooltip after fading out
-                        api.destroy();
-
-                        // Update positions
-                        updateGrowls();
-                    })
-                }
-            },
-            style: {
-                classes: 'jgrowl qtip-dark qtip-shadow qtip-rounded', // Some nice visual classes
-                tip: false // No tips for this one (optional ofcourse)
-            },
-            events: {
-                render: function (event, api) {
-                    // Trigger the timer (below) on render
-                    timer.call(api.elements.tooltip, event);
-                }
-            }
-        })
-            .removeData('qtip');
-    };
-
-    // Make it a window property see we can call it outside via updateGrowls() at any point
-    window.updateGrowls = function () {
-        // Loop over each jGrowl qTip
-        var each = $('.qtip.jgrowl:not(:animated)');
-        each.each(function (i) {
-            var api = $(this).data('qtip');
-
-            // Set the target option directly to prevent reposition() from being called twice.
-            api.options.position.target = !i ? $(document.body) : each.eq(i - 1);
-            api.set('position.at', (!i ? 'top' : 'bottom') + ' right');
-        });
-    };
-
-    // Setup our timer function
-    function timer(event) {
-        var api = $(this).data('qtip'),
-            lifespan = 5000; // 5 second lifespan
-
-        // If persistent is set to true, don't do anything.
-        if (api.get('show.persistent') === true) {
-            return;
-        }
-
-        // Otherwise, start/clear the timer depending on event type
-        clearTimeout(api.timer);
-        if (event.type !== 'mouseover') {
-            api.timer = setTimeout(api.hide, lifespan);
-        }
-    }
-
-    // Utilise delegate so we don't have to rebind for every qTip!
-    $(document).delegate('.qtip.jgrowl', 'mouseover mouseout', timer);
-});
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/admin.css b/lib/copy_this/www/templates/nntmux/styles/admin.css
deleted file mode 100644
index 66c60ee56..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/admin.css
+++ /dev/null
@@ -1,59 +0,0 @@
-body  { background: #FFFFFF ; }
-textarea { height:100px; width:400px; }
-fieldset { margin-bottom:20px; border:1px solid #999;}
-legend { padding: 0.4em 0.6em; border:1px solid #999; font-weight:bold; text-align:right; }
-
-
-#content { width: 77%; }
-#sidebar { width: 200px; }
-#sidebar li li:hover { cursor:auto; }
-#logo { width: 0; height: 0; margin: 0 auto; padding-left:0; margin-top:0; }
-.footer { width: 100%; height: 100px; margin: 0 auto; background: #FFF; border-top: 0; }
-#menu { height:0px; border:0px;}
-
-
-table.input td { vertical-align:top;}
-
-/* group editing */
-div#group_list {
-}
-
-div#message {
-        display: none;
-        margin: 0 0 10px 0;
-        color: #fff;
-        background: #008C00;
-        border: 1px solid #ddd;
-        padding: 5px;
-    }
-
-/* deactivate link */
-div#group_list a.group_active,
-div#group_list a.group_active:visited,
-div#group_list a.group_active:active
-a.backfill_active,
-a.backfill_active:visited,
-a.backfill_active:active {
-    color: #CC0000;
-}
-
-/* activate link */
-div#group_list a.group_deactive
-div#group_list a.group_deactive:visited,
-div#group_list a.group_deactive:active
-a.backfill_deactive,
-a.backfill_deactive:visited,
-a.backfill_deactive:active {
-    color: #008C00;
-}
-
-#donate {
-	float: right;
-	display: block;
-	width: 150px;
-	border: 1px solid #ddd;
-	text-align: center;
-	padding: 8px 0px 8px 0px;
-}
-#donate form { margin: 0px; padding: 0px; }
-#donate h3 { margin: 0px 0px 6px 0px; padding: 0px; }
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/bootstrap.min.css b/lib/copy_this/www/templates/nntmux/styles/bootstrap.min.css
deleted file mode 100644
index cd1c616ad..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/bootstrap.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.4 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px)and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px)and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px)and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px)and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px)and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/install.css b/lib/copy_this/www/templates/nntmux/styles/install.css
deleted file mode 100644
index 199f4dda7..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/install.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-site wide html styles
-*/
-body { 	margin: 0;	padding: 0;	background: #FFFFFF url(../images/menu.gif) repeat-x;	font-family: Calibri, Arial, Helvetica, sans-serif;	font-size: 14px;	color: #515151; }
-input, select, textarea { font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 14px;}
-a { 	text-decoration: none; 	color: blue; }
-h1, h2, h3 {	margin: 0;	font-weight: normal;	color: #485459; }
-li { 	padding-top:10px; }
-textarea { font-family: Arial, Helvetica, sans-serif; height:100px; width:300px;}
-h1 { 	font-size: 3.0em; padding-bottom:10px;}
-h2 { 	font-size: 2.0em; padding-bottom:10px;}
-input[type=text], input[type=password], textarea, select { background: #fff; background: -webkit-gradient(linear, left top, left 25, from(#fff), color-stop(4%, #f0f0f0), to(#fff)); border: 1px solid #ccc; border-bottom-color: #999; border-right-color: #999; margin: 0; padding: 4px; color: #444; font-size: 100%; outline: none; }
-
-
-
-/*
-page layout
-*/
-#logo {	margin-left: 200px;	margin-top: 30px;	margin-bottom: 30px; }
-.content {	border: 1px solid #515151;	width: 600px;	padding: 30px; margin-left: auto;	margin-right: auto; background: #FFF; border:1px solid #EEE; -moz-box-shadow: 3px 6px 8px -4px #777; -webkit-box-shadow: 3px 6px 8px -4px #777; box-shadow: 3px 6px 8px -4px #777; }
-.footer {	font-size: 10px;	text-align: center; }
-
-/*
-install warning message
-*/
-div.error {	color: red;	padding: 20px; }
-span.error {	color: red; }
-span.warn {	color: orange; }
-span.success {	color: green; }
-
-/*
-lists
-*/
-table.data { border-collapse:collapse; }
-table.data th { text-align:left; vertical-align:top; background-color:#DDD; border-color: #AAA; border-width: 1px; border-style: solid; padding:3px; font-style:bolder; text-transform:capitalize;}
-table.data td { white-space:normal; vertical-align:top; padding:5px; border-color: #AAA; border-width: 1px; border-style: solid; }
-table.data td.less { color: #888; font-size: 0.8em; white-space:nowrap; }
-table.data td.icons { white-space:nowrap; padding-left:0px; padding-right:0px; width:60px; }
-table.highlight tr:hover td { background-color: #E1F0D9; }
-table tr.alt { background-color: #EEE; }
-table.data em {font-weight:bolder; color:red;}
-div.hint, div.hint a {font-size:0.9em; font-style:italic; color:#999;}
-div.hint { margin-bottom:10px;}
-input.long {width:400px; }
-input.short { width:40px; }
-input.date { width:70px; }
diff --git a/lib/copy_this/www/templates/nntmux/styles/jquery.multiselect.css b/lib/copy_this/www/templates/nntmux/styles/jquery.multiselect.css
deleted file mode 100644
index f04797105..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/jquery.multiselect.css
+++ /dev/null
@@ -1,93 +0,0 @@
-.ms-container{
-  background: transparent url('../images/icons/switch.png') no-repeat 50% 50%;
-  width: 500px;
-}
-
-.ms-container:after{
-  content: ".";
-  display: block;
-  height: 0;
-  line-height: 0;
-  font-size: 0;
-  clear: both;
-  min-height: 0;
-  visibility: hidden;
-}
-
-.ms-container .ms-selectable, .ms-container .ms-selection{
-  background: #fff;
-  color: #555555;
-  float: left;
-  width: 45%;
-}
-.ms-container .ms-selection{
-  float: right;
-}
-
-.ms-container .ms-list{
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-  transition: border linear 0.2s, box-shadow linear 0.2s;
-  border: 1px solid #ccc;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  position: relative;
-  height: 200px;
-  padding: 0;
-  overflow-y: auto;
-}
-
-.ms-container .ms-list.ms-focus{
-  border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  outline: 0;
-  outline: thin dotted \9;
-}
-
-.ms-container ul{
-  margin: 0;
-  list-style-type: none;
-  padding: 0;
-}
-
-.ms-container .ms-optgroup-container{
-  width: 100%;
-}
-
-.ms-container .ms-optgroup-label{
-  margin: 0;
-  padding: 5px 0px 0px 5px;
-  cursor: pointer;
-  color: #999;
-}
-
-.ms-container .ms-selectable li.ms-elem-selectable,
-.ms-container .ms-selection li.ms-elem-selection{
-  border-bottom: 1px #eee solid;
-  padding: 2px 10px;
-  color: #555;
-  font-size: 14px;
-}
-
-.ms-container .ms-selectable li.ms-hover,
-.ms-container .ms-selection li.ms-hover{
-  cursor: pointer;
-  color: #fff;
-  text-decoration: none;
-  background-color: #08c;
-}
-
-.ms-container .ms-selectable li.disabled,
-.ms-container .ms-selection li.disabled{
-  background-color: #eee;
-  color: #aaa;
-  cursor: text;
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/jquery.pnotify.default.css b/lib/copy_this/www/templates/nntmux/styles/jquery.pnotify.default.css
deleted file mode 100644
index de1068aab..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/jquery.pnotify.default.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Document   : jquery.pnotify.default.css
-Created on : Nov 23, 2009, 3:14:10 PM
-Author     : Hunter Perrin
-Version    : 1.2.0
-Link       : http://pinesframework.org/pnotify/
-Description:
-	Default styling for Pines Notify jQuery plugin.
-*/
-/* -- Notice */
-.ui-pnotify {
-top: 25px;
-right: 25px;
-position: absolute;
-height: auto;
-/* Ensures notices are above everything */
-z-index: 9999;
-}
-/* Hides position: fixed from IE6 */
-html > body .ui-pnotify {
-position: fixed;
-}
-.ui-pnotify .ui-pnotify-shadow {
--webkit-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5);
--moz-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5);
-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5);
-}
-.ui-pnotify-container {
-background-position: 0 0;
-padding: .8em;
-height: 100%;
-margin: 0;
-}
-.ui-pnotify-sharp {
--webkit-border-radius: 0;
--moz-border-radius: 0;
-border-radius: 0;
-}
-.ui-pnotify-closer, .ui-pnotify-sticker {
-float: right;
-margin-left: .2em;
-}
-.ui-pnotify-title {
-display: block;
-margin-bottom: .4em;
-}
-.ui-pnotify-text {
-display: block;
-}
-.ui-pnotify-icon, .ui-pnotify-icon span {
-display: block;
-float: left;
-margin-right: .2em;
-}
-/* -- History Pulldown */
-.ui-pnotify-history-container {
-position: absolute;
-top: 0;
-right: 18px;
-width: 70px;
-border-top: none;
-padding: 0;
--webkit-border-top-left-radius: 0;
--moz-border-top-left-radius: 0;
-border-top-left-radius: 0;
--webkit-border-top-right-radius: 0;
--moz-border-top-right-radius: 0;
-border-top-right-radius: 0;
-/* Ensures history container is above notices. */
-z-index: 10000;
-}
-.ui-pnotify-history-container .ui-pnotify-history-header {
-padding: 2px;
-}
-.ui-pnotify-history-container button {
-cursor: pointer;
-display: block;
-width: 100%;
-}
-.ui-pnotify-history-container .ui-pnotify-history-pulldown {
-display: block;
-margin: 0 auto;
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/jquery.qtip.css b/lib/copy_this/www/templates/nntmux/styles/jquery.qtip.css
deleted file mode 100644
index e466f4c14..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/jquery.qtip.css
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * qTip2 - Pretty powerful tooltips - v2.2.0
- * http://qtip2.com
- *
- * Copyright (c) 2013 Craig Michael Thompson
- * Released under the MIT, GPL licenses
- * http://jquery.org/license
- *
- * Date: Sun Dec 15 2013 12:33 EST-0500
- * Plugins: tips viewport imagemap svg modal ie6
- * Styles: basic css3
- */
-.qtip{
-	position: absolute;
-	left: -28000px;
-	top: -28000px;
-	display: none;
-
-	max-width: 280px;
-	min-width: 50px;
-
-	font-size: 10.5px;
-	line-height: 12px;
-
-	direction: ltr;
-
-	box-shadow: none;
-	padding: 0;
-}
-
-	.qtip-content{
-		position: relative;
-		padding: 5px 9px;
-		overflow: hidden;
-
-		text-align: left;
-		word-wrap: break-word;
-	}
-
-	.qtip-titlebar{
-		position: relative;
-		padding: 5px 35px 5px 10px;
-		overflow: hidden;
-
-		border-width: 0 0 1px;
-		font-weight: bold;
-	}
-
-	.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }
-
-	/* Default close button class */
-	.qtip-close{
-		position: absolute;
-		right: -9px; top: -9px;
-
-		cursor: pointer;
-		outline: medium none;
-
-		border-width: 1px;
-		border-style: solid;
-		border-color: transparent;
-	}
-
-		.qtip-titlebar .qtip-close{
-			right: 4px; top: 50%;
-			margin-top: -9px;
-		}
-
-		* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */
-
-		.qtip-titlebar .ui-icon,
-		.qtip-icon .ui-icon{
-			display: block;
-			text-indent: -1000em;
-			direction: ltr;
-		}
-
-		.qtip-icon, .qtip-icon .ui-icon{
-			-moz-border-radius: 3px;
-			-webkit-border-radius: 3px;
-			border-radius: 3px;
-			text-decoration: none;
-		}
-
-			.qtip-icon .ui-icon{
-				width: 18px;
-				height: 14px;
-
-				line-height: 14px;
-				text-align: center;
-				text-indent: 0;
-				font: normal bold 10px/13px Tahoma,sans-serif;
-
-				color: inherit;
-				background: transparent none no-repeat -100em -100em;
-			}
-
-/* Applied to 'focused' tooltips e.g. most recently displayed/interacted with */
-.qtip-focus{}
-
-/* Applied on hover of tooltips i.e. added/removed on mouseenter/mouseleave respectively */
-.qtip-hover{}
-
-/* Default tooltip style */
-.qtip-default{
-	border-width: 1px;
-	border-style: solid;
-	border-color: #F1D031;
-
-	background-color: #FFFFA3;
-	color: #555;
-}
-
-	.qtip-default .qtip-titlebar{
-		background-color: #FFEF93;
-	}
-
-	.qtip-default .qtip-icon{
-		border-color: #CCC;
-		background: #F1F1F1;
-		color: #777;
-	}
-
-	.qtip-default .qtip-titlebar .qtip-close{
-		border-color: #AAA;
-		color: #111;
-	}
-
-
-
-/*! Light tooltip style */
-.qtip-light{
-	background-color: white;
-	border-color: #E2E2E2;
-	color: #454545;
-}
-
-	.qtip-light .qtip-titlebar{
-		background-color: #f1f1f1;
-	}
-
-
-/*! Dark tooltip style */
-.qtip-dark{
-	background-color: #505050;
-	border-color: #303030;
-	color: #f3f3f3;
-}
-
-	.qtip-dark .qtip-titlebar{
-		background-color: #404040;
-	}
-
-	.qtip-dark .qtip-icon{
-		border-color: #444;
-	}
-
-	.qtip-dark .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/*! Cream tooltip style */
-.qtip-cream{
-	background-color: #FBF7AA;
-	border-color: #F9E98E;
-	color: #A27D35;
-}
-
-	.qtip-cream .qtip-titlebar{
-		background-color: #F0DE7D;
-	}
-
-	.qtip-cream .qtip-close .qtip-icon{
-		background-position: -82px 0;
-	}
-
-
-/*! Red tooltip style */
-.qtip-red{
-	background-color: #F78B83;
-	border-color: #D95252;
-	color: #912323;
-}
-
-	.qtip-red .qtip-titlebar{
-		background-color: #F06D65;
-	}
-
-	.qtip-red .qtip-close .qtip-icon{
-		background-position: -102px 0;
-	}
-
-	.qtip-red .qtip-icon{
-		border-color: #D95252;
-	}
-
-	.qtip-red .qtip-titlebar .ui-state-hover{
-		border-color: #D95252;
-	}
-
-
-/*! Green tooltip style */
-.qtip-green{
-	background-color: #CAED9E;
-	border-color: #90D93F;
-	color: #3F6219;
-}
-
-	.qtip-green .qtip-titlebar{
-		background-color: #B0DE78;
-	}
-
-	.qtip-green .qtip-close .qtip-icon{
-		background-position: -42px 0;
-	}
-
-
-/*! Blue tooltip style */
-.qtip-blue{
-	background-color: #E5F6FE;
-	border-color: #ADD9ED;
-	color: #5E99BD;
-}
-
-	.qtip-blue .qtip-titlebar{
-		background-color: #D0E9F5;
-	}
-
-	.qtip-blue .qtip-close .qtip-icon{
-		background-position: -2px 0;
-	}
-
-
-
-.qtip-shadow{
-	-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-	-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-	box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-}
-
-/* Add rounded corners to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE9+, Safari 2+ */
-.qtip-rounded,
-.qtip-tipsy,
-.qtip-bootstrap{
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.qtip-rounded .qtip-titlebar{
-	-moz-border-radius: 4px 4px 0 0;
-	-webkit-border-radius: 4px 4px 0 0;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Youtube tooltip style */
-.qtip-youtube{
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-
-	-webkit-box-shadow: 0 0 3px #333;
-	-moz-box-shadow: 0 0 3px #333;
-	box-shadow: 0 0 3px #333;
-
-	color: white;
-	border-width: 0;
-
-	background: #4A4A4A;
-	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,black));
-	background-image: -webkit-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -moz-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -ms-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -o-linear-gradient(top,#4A4A4A 0,black 100%);
-}
-
-	.qtip-youtube .qtip-titlebar{
-		background-color: #4A4A4A;
-		background-color: rgba(0,0,0,0);
-	}
-
-	.qtip-youtube .qtip-content{
-		padding: .75em;
-		font: 12px arial,sans-serif;
-
-		filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);
-		-ms-filter: "progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);";
-	}
-
-	.qtip-youtube .qtip-icon{
-		border-color: #222;
-	}
-
-	.qtip-youtube .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/* jQuery TOOLS Tooltip style */
-.qtip-jtools{
-	background: #232323;
-	background: rgba(0, 0, 0, 0.7);
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#717171), to(#232323));
-	background-image: -moz-linear-gradient(top, #717171, #232323);
-	background-image: -webkit-linear-gradient(top, #717171, #232323);
-	background-image: -ms-linear-gradient(top, #717171, #232323);
-	background-image: -o-linear-gradient(top, #717171, #232323);
-
-	border: 2px solid #ddd;
-	border: 2px solid rgba(241,241,241,1);
-
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-
-	-webkit-box-shadow: 0 0 12px #333;
-	-moz-box-shadow: 0 0 12px #333;
-	box-shadow: 0 0 12px #333;
-}
-
-	/* IE Specific */
-	.qtip-jtools .qtip-titlebar{
-		background-color: transparent;
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)";
-	}
-	.qtip-jtools .qtip-content{
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)";
-	}
-
-	.qtip-jtools .qtip-titlebar,
-	.qtip-jtools .qtip-content{
-		background: transparent;
-		color: white;
-		border: 0 dashed transparent;
-	}
-
-	.qtip-jtools .qtip-icon{
-		border-color: #555;
-	}
-
-	.qtip-jtools .qtip-titlebar .ui-state-hover{
-		border-color: #333;
-	}
-
-
-/* Cluetip style */
-.qtip-cluetip{
-	-webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-	-moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-	box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-
-	background-color: #D9D9C2;
-	color: #111;
-	border: 0 dashed transparent;
-}
-
-	.qtip-cluetip .qtip-titlebar{
-		background-color: #87876A;
-		color: white;
-		border: 0 dashed transparent;
-	}
-
-	.qtip-cluetip .qtip-icon{
-		border-color: #808064;
-	}
-
-	.qtip-cluetip .qtip-titlebar .ui-state-hover{
-		border-color: #696952;
-		color: #696952;
-	}
-
-
-/* Tipsy style */
-.qtip-tipsy{
-	background: black;
-	background: rgba(0, 0, 0, .87);
-
-	color: white;
-	border: 0 solid transparent;
-
-	font-size: 11px;
-	font-family: 'Lucida Grande', sans-serif;
-	font-weight: bold;
-	line-height: 16px;
-	text-shadow: 0 1px black;
-}
-
-	.qtip-tipsy .qtip-titlebar{
-		padding: 6px 35px 0 10px;
-		background-color: transparent;
-	}
-
-	.qtip-tipsy .qtip-content{
-		padding: 6px 10px;
-	}
-
-	.qtip-tipsy .qtip-icon{
-		border-color: #222;
-		text-shadow: none;
-	}
-
-	.qtip-tipsy .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/* Tipped style */
-.qtip-tipped{
-	border: 3px solid #959FA9;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-
-	background-color: #F9F9F9;
-	color: #454545;
-
-	font-weight: normal;
-	font-family: serif;
-}
-
-	.qtip-tipped .qtip-titlebar{
-		border-bottom-width: 0;
-
-		color: white;
-		background: #3A79B8;
-		background-image: -webkit-gradient(linear, left top, left bottom, from(#3A79B8), to(#2E629D));
-		background-image: -webkit-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -moz-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -ms-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -o-linear-gradient(top, #3A79B8, #2E629D);
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)";
-	}
-
-	.qtip-tipped .qtip-icon{
-		border: 2px solid #285589;
-		background: #285589;
-	}
-
-		.qtip-tipped .qtip-icon .ui-icon{
-			background-color: #FBFBFB;
-			color: #555;
-		}
-
-
-/**
- * Twitter Bootstrap style.
- *
- * Tested with IE 8, IE 9, Chrome 18, Firefox 9, Opera 11.
- * Does not work with IE 7.
- */
-.qtip-bootstrap{
-	/** Taken from Bootstrap body */
-	font-size: 14px;
-	line-height: 20px;
-	color: #333333;
-
-	/** Taken from Bootstrap .popover */
-	padding: 1px;
-	background-color: #ffffff;
-	border: 1px solid #ccc;
-	border: 1px solid rgba(0, 0, 0, 0.2);
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	border-radius: 6px;
-	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	-webkit-background-clip: padding-box;
-	-moz-background-clip: padding;
-	background-clip: padding-box;
-}
-
-	.qtip-bootstrap .qtip-titlebar{
-		/** Taken from Bootstrap .popover-title */
-		padding: 8px 14px;
-		margin: 0;
-		font-size: 14px;
-		font-weight: normal;
-		line-height: 18px;
-		background-color: #f7f7f7;
-		border-bottom: 1px solid #ebebeb;
-		-webkit-border-radius: 5px 5px 0 0;
-		-moz-border-radius: 5px 5px 0 0;
-		border-radius: 5px 5px 0 0;
-	}
-
-		.qtip-bootstrap .qtip-titlebar .qtip-close{
-			/**
-			 * Overrides qTip2:
-			 * .qtip-titlebar .qtip-close{
-			 *   [...]
-			 *   right: 4px;
-			 *   top: 50%;
-			 *   [...]
-			 *   border-style: solid;
-			 * }
-			 */
-			right: 11px;
-			top: 45%;
-			border-style: none;
-		}
-
-	.qtip-bootstrap .qtip-content{
-		/** Taken from Bootstrap .popover-content */
-		padding: 9px 14px;
-	}
-
-	.qtip-bootstrap .qtip-icon{
-		/**
-		 * Overrides qTip2:
-		 * .qtip-default .qtip-icon {
-		 *   border-color: #CCC;
-		 *   background: #F1F1F1;
-		 *   color: #777;
-		 * }
-		 */
-		background: transparent;
-	}
-
-		.qtip-bootstrap .qtip-icon .ui-icon{
-			/**
-			 * Overrides qTip2:
-			 * .qtip-icon .ui-icon{
-			 *   width: 18px;
-			 *   height: 14px;
-			 * }
-			 */
-			width: auto;
-			height: auto;
-
-			/* Taken from Bootstrap .close */
-			float: right;
-			font-size: 20px;
-			font-weight: bold;
-			line-height: 18px;
-			color: #000000;
-			text-shadow: 0 1px 0 #ffffff;
-			opacity: 0.2;
-			filter: alpha(opacity=20);
-		}
-
-		.qtip-bootstrap .qtip-icon .ui-icon:hover{
-			/* Taken from Bootstrap .close:hover */
-			color: #000000;
-			text-decoration: none;
-			cursor: pointer;
-			opacity: 0.4;
-			filter: alpha(opacity=40);
-		}
-
-
-/* IE9 fix - removes all filters */
-.qtip:not(.ie9haxors) div.qtip-content,
-.qtip:not(.ie9haxors) div.qtip-titlebar{
-	filter: none;
-	-ms-filter: none;
-}
-
-
-
-.qtip .qtip-tip{
-	margin: 0 auto;
-	overflow: hidden;
-	z-index: 10;
-
-}
-
-	/* Opera bug #357 - Incorrect tip position
-	https://github.com/Craga89/qTip2/issues/367 */
-	x:-o-prefocus, .qtip .qtip-tip{
-		visibility: hidden;
-	}
-
-	.qtip .qtip-tip,
-	.qtip .qtip-tip .qtip-vml,
-	.qtip .qtip-tip canvas{
-		position: absolute;
-
-		color: #123456;
-		background: transparent;
-		border: 0 dashed transparent;
-	}
-
-	.qtip .qtip-tip canvas{ top: 0; left: 0; }
-
-	.qtip .qtip-tip .qtip-vml{
-		behavior: url(#default#VML);
-		display: inline-block;
-		visibility: visible;
-	}
-
-#qtip-overlay{
-	position: fixed;
-	left: 0; top: 0;
-	width: 100%; height: 100%;
-}
-
-	/* Applied to modals with show.modal.blur set to true */
-	#qtip-overlay.blurs{ cursor: pointer; }
-
-	/* Change opacity of overlay here */
-	#qtip-overlay div{
-		position: absolute;
-		left: 0; top: 0;
-		width: 100%; height: 100%;
-
-		background-color: black;
-
-		opacity: 0.7;
-		filter:alpha(opacity=70);
-		-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	}
-
-
-
-.qtipmodal-ie6fix{
-	position: absolute !important;
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/posterwall.css b/lib/copy_this/www/templates/nntmux/styles/posterwall.css
deleted file mode 100644
index 89f72a9e3..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/posterwall.css
+++ /dev/null
@@ -1,859 +0,0 @@
-body,h1,h2,h3,h4,h5,h6,img,input,form,fieldset{
-    margin:0;
-    padding:0;
-    outline:0;
-    border:0;
-}
-
-
-*{
-    outline:0;
-}
-
-
-body{
-    font-family:"Droid Sans",Arial,serif;
-    font-size:13px;
-    color:#000;
-    background-color:#d5d3be;
-}
-
-
-div.poster a img{
-    margin:0;
-    padding:0;
-    border:0;
-}
-
-
-div.poster a{
-    text-decoration:none;
-    color:#008fbb;
-}
-
-
-div.icons {
-    white-space:nowrap;
-    padding-left:0px;
-    padding-right:0px;
-    width:65px;
-    margin: 0 auto;
-}
-
-.icon_allmusic       { background-image:url('../images/icons/allmusic.png'); }
-.icon_allmusic2      { content:url('../images/icons/allmusic.png'); }
-.icon_amazon         { background-image:url('../images/icons/amazon.png'); }
-.icon_amazon2        { content:url('../images/icons/amazon.png'); }
-.icon_giantbomb      { background-image:url('../images/icons/giantbomb.png');}
-.icon_cart           { background-image:url('../images/icons/cartup.png'); }
-.icon_cart_clicked   { background-image:url('../images/icons/cartdown.png'); }
-.icon_couch          { background-image:url('../images/icons/couch.png'); }
-.icon_couch2         { content:url('../images/icons/couch.png'); }
-.icon_discogs        { background-image:url('../images/icons/discogs.png'); }
-.icon_gamespot       { background-image:url('../images/icons/gamespot.png'); }
-.icon_ign            { background-image:url('../images/icons/ign.png'); }
-.icon_lastfm         { background-image:url('../images/icons/lastfm.png'); }
-.icon_nzb            { background-image:url('../images/icons/nzbup.png'); }
-.icon_nzb_clicked    { background-image:url('../images/icons/nzbdown.png'); }
-.icon_nzb a          { text-decoration:none; padding-bottom:2px; padding-right:12px; }
-.icon_predbme        { background-image:url('../images/icons/predbme.png'); }
-.icon_imdb           { background-image:url('../images/icons/imdb.png'); }
-.icon_imdb2          { content:url('../images/icons/imdb.png'); }
-.icon_imdb a         { text-decoration:none; padding-bottom:2px; padding-right:12px; }
-.icon_sab            { background-image:url('../images/icons/sabup.png'); }
-.icon_sab_clicked    { background-image:url('../images/icons/sabdown.png'); }
-.icon_trakt          { background-image:url('../images/icons/trakt.png'); }
-.icon_trakt2         { content:url('../images/icons/trakt.png'); }
-.icon_tvrage         { background-image:url('../images/icons/tvrage.png'); }
-.icon_check          { background-image:url('../images/icons/check.png'); }
-.icon_cp             { background-image:url('../images/icons/couch.png'); }
-.icon_goodreads      { background-image:url('../images/icons/goodreads.png'); }
-.icon_shelfari       { background-image:url('../images/icons/shelfari.png'); }
-
-a.divlink {
-    display:block;
-    width:16px;
-    height:16px;
-    float:left;
-}
-
-h1{
-}
-
-
-h2{
-}
-
-
-h3{
-    margin:13px 0;
-    font-size:18px;
-    font-weight:normal;
-}
-
-
-h3 a{
-    color:#000;
-}
-
-
-h3 a.see-more{
-    display:block;
-    border-radius:8px;
-    color:#000;
-    padding:5px 7px;
-    display:block;
-    float:right;
-    font-size:12px;
-    font-weight:normal;
-    background-color:#d5d3be;
-}
-
-
-h3 a.see-more:hover{
-    color:#07637a;
-;
-}
-
-
-h3 a:hover{
-    text-decoration:underline;
-}
-
-
-input.placeholder{
-    color:#aaa!important;
-}
-
-
-::-moz-selection{
-    background:#4DBCE9;
-    color:#fff;
-    text-shadow:none;
-}
-
-
-::selection{
-    background:#4DBCE9;
-    color:#fff;
-    text-shadow:none;
-}
-
-
-br.clear{
-    clear:both;
-}
-
-
-.content{
-    margin:0 auto;
-}
-
-/*
-#main,.main{
-    overflow:hidden;
-}
-
-
-#main-wrapper,.main-wrapper{
-    background-color:#e8e8dc;
-    padding-bottom:20px;
-}
-
-
-#main-wrapper.alt,.main-wrapper.alt{
-    background-color:#d5d3be;
-}
-
-
-#main-wrapper.no-bottom,.main-wrapper.no-bottom{
-    padding-bottom:0;
-}
-
-
-#main-wrapper.less-top,.main-wrapper.less-top{
-    margin-top:-40px;
-}
-
-
-#main-wrapper.more-top,.main-wrapper.more-top{
-    padding-top:20px;
-}
-
-
-#main-wrapper.no-top,.main-wrapper.no-top{
-    margin-top:0;
-}
-
-
-#main-wrapper.less-bottom,.main-wrapper.less-bottom{
-    padding-bottom:10px;
-}
-
-
-#main-wrapper.top-border,.main-wrapper.top-border{
-    border-top:solid 2px #D5D3BE;
-}
-
-
-.main-wrapper.alt .recent-wrapper .recent-row,.main-wrapper.alt .recent-wrapper .recent-row.alt{
-    background-color:transparent;
-    border-bottom-color:#bbb9a6;
-}
-
-
-.main-wrapper.alt .recent-wrapper .recent-row:first-child{
-    border-top:solid 1px #bbb9a6;
-}
-
-
-.main-wrapper.alt .recent-wrapper .recent-row:hover{
-    background-color:#ebe9d4;
-}
-
-
-#main-wrapper.alt .title-overflow,.main-wrapper.alt .title-overflow{
-    background-image:url(https://trakt.us/images/title-overflow-alt.png);
-}
-*/
-
-.title-overflow{
-    background:url("../images/title-overflow.png") repeat-y 100% 0;
-    width:30px;
-    height:40px;
-    position:absolute;
-    top:0;
-    right:0;
-}
-
-.main-content {
-    background: none repeat scroll 0% 0% rgb(242, 242, 242);
-    box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-    text-align: center;
-}
-
-.one-column.no-padding{
-    padding:0;
-}
-
-.library-wrapper{
-    overflow:hidden;
-    max-width:100%;
-    padding:10px;
-    margin: 0px;
-}
-
-.library-console {
-    display:inline-block;
-    width: 130px;
-    height: 180px;
-}
-
-.library-games {
-    display:inline-block;
-    width: 130px;
-    height: 130px;
-}
-
-.library-music {
-    display:inline-block;
-    width: 250px;
-    height: 250px;
-}
-
-.library-wrapper .library-show{
-    display:inline-block;
-    margin:10px 10px 0 10px;
-}
-
-
-/*.library-wrapper .library-show .rank-wrapper{
-    position:absolute;
-    z-index:3;
-    text-align:center;
-    width:100%;
-    top:-10px;
-}*/
-
-
-.library-wrapper .library-show .rank-wrapper .rank{
-    background:rgba(0,0,0,0.8);
-    color:#fff;
-    padding:4px 8px;
-    border-radius:15px;
-    font-size:14px;
-    font-weight:bold;
-}
-
-
-.library-wrapper .library-show .remove-watched,.library-wrapper .library-show .remove-library,.library-wrapper .library-show .remove-watchlist,.library-wrapper .library-show .remove-seen,.library-wrapper .library-show .remove-checkin{
-    margin-left:126px;
-    display:none;
-}
-
-
-.library-wrapper .library-show.screen .remove-watched,.library-wrapper .library-show.screen .remove-library,.library-wrapper .library-show.screen .remove-watchlist,.library-wrapper .library-show.screen .remove-seen,.library-wrapper .library-show.screen .remove-checkin{
-    margin-left:155px;
-    display:none;
-}
-
-
-.episodes-listing-episode .remove-watchlist{
-    margin-left:204px;
-    display:none;
-}
-
-
-.library-wrapper .library-show:hover .remove-watched,.library-wrapper .library-show:hover .remove-library,.library-wrapper .library-show:hover .remove-watchlist,.episodes-listing-episode:hover .remove-watchlist,.library-wrapper .library-show:hover .remove-seen,.library-wrapper .library-show:hover .remove-checkin{
-    display:block;
-}
-
-
-.library-wrapper .library-show .poster{
-    position:relative;
-    border:solid 1px #d0d0c5;
-    transition:border-color .5s;
-    -moz-transition:border-color .5s;
-    -webkit-transition:border-color .5s;
-    -o-transition:border-color .5s;
-}
-
-
-.library-wrapper .library-show.with-rating-bar .poster{
-    padding-bottom:22px;
-}
-
-
-.library-wrapper .library-show.with-rating-bar .quick-icons.rating-pod{
-    top:228px;
-}
-
-
-.library-wrapper .library-show.screen.with-rating-bar .poster{
-    padding-bottom:23px;
-}
-
-
-.library-wrapper .library-show.screen.with-rating-bar .quick-icons.rating-pod{
-    top:121px;
-}
-
-
-.library-wrapper .library-show .poster:hover{
-    border-color:#000;
-}
-
-
-.library-wrapper .library-show .poster.screen-overlay{
-}
-
-
-.library-wrapper .library-show .poster.screen-overlay .poster-art{
-    opacity:0.5;
-    filter:url(filters.svg#grayscale);
-    filter:gray;
-    -webkit-filter:grayscale(1);
-}
-
-
-.library-wrapper .library-show .poster.screen-overlay .screen{
-    position:absolute;
-    z-index:2;
-    height:78px;
-    width:138px;
-    top:62px;
-    overflow:hidden;
-    -moz-box-shadow:0 0 10px 1px #666;
-    -webkit-box-shadow:0 0 10px 1px #666;
-    box-shadow:0 0 10px 1px #666;
-    -webkit-transform:rotate(-5deg);
-    -moz-transform:rotate(-5deg);
-    -o-transform:rotate(-5deg);
-    -ms-transform:rotate(-5deg);
-}
-
-
-.library-wrapper .library-show .poster.screen-overlay .screen img{
-    width:138px;
-    height:auto;
-}
-
-
-.library-wrapper .library-show img{
-    display: inline-block;
-    width:138px;
-    height:203px;
-}
-
-
-.library-wrapper .library-show.screen{
-    position:relative;
-}
-
-
-.library-wrapper .library-show.screen .poster{
-    height:95px;
-    overflow:hidden;
-}
-
-
-.library-wrapper .library-show.screen img{
-    display:block;
-    width:170px;
-    height:auto;
-}
-
-
-.library-wrapper .library-show .on{
-    font-size:11px;
-    padding:2px 5px;
-    line-height:13px;
-}
-
-
-.library-wrapper .library-show h4{
-    width:140px;
-    overflow:hidden;
-    position:relative;
-    white-space:nowrap;
-    font-size:12px;
-    margin-top:3px;
-}
-
-
-.library-wrapper .library-show.screen h4,.library-wrapper .library-show.screen h5,.library-wrapper .library-show.screen h6{
-    width:170px;
-}
-
-
-.library-wrapper .library-show h4 a{
-    color:#000;
-}
-
-
-.library-wrapper .library-show h4 a:hover{
-    color:#000;
-    text-decoration:none;
-}
-
-.library-wrapper .library-show h5{
-    width:140px;
-    overflow:hidden;
-    position:relative;
-    white-space:nowrap;
-    margin-top:1px;
-}
-
-
-.library-wrapper .library-show h5,.library-wrapper .library-show h5 a{
-    font-weight:normal;
-    font-size:12px;
-    color:#333;
-}
-
-
-.library-wrapper .library-show h5 strong{
-    color:#008FBB;
-}
-
-
-.library-wrapper .library-show .title{
-    display:block;
-    font-weight:bold;
-    color:#000;
-}
-
-
-.library-wrapper .library-show .plays-truncate{
-    width:140px;
-    overflow:hidden;
-    position:relative;
-    white-space:nowrap;
-}
-
-
-.library-wrapper .library-show .plays{
-    display:block;
-    color:#666;
-    font-size:12px;
-    font-weight:normal;
-    width:140px;
-    overflow:hidden;
-    position:relative;
-    white-space:nowrap;
-}
-
-
-.library-wrapper .library-show .plays a{
-    color:#666;
-}
-
-
-.library-wrapper .library-show .plays a strong{
-    color:#008FBB;
-}
-
-
-.library-wrapper .library-show h6{
-    color:#999;
-    font-size:11px;
-    font-style:italic;
-    padding-top:5px;
-    font-weight:normal;
-    width:140px;
-    overflow:hidden;
-    position:relative;
-    white-space:nowrap;
-}
-
-
-.library-wrapper .library-show h6 a{
-    font-weight:bold;
-    color:#999;
-}
-
-
-.library-wrapper .library-show .watched-added{
-    display:block;
-    color:#999;
-    font-size:10px;
-}
-
-
-.library-wrapper .library-show.actor .poster{
-    overflow:hidden;
-    height:203px;
-}
-
-
-.library-wrapper .library-show.actor img{
-    height:auto;
-}
-
-.library-wrapper .library-show:hover .library-info-icons,.episodes-listing-episode:hover .library-info-icons,.shout-list-item .poster:hover .library-info-icons,.screen-wrapper:hover .library-info-icons,.poster-wrapper:hover .library-info-icons{
-    opacity:1;
-}
-
-
-.library-wrapper .library-show:hover .quick-icons,.episodes-listing-episode:hover .quick-icons,.shout-list-item .poster:hover .quick-icons,.screen-wrapper:hover .quick-icons,.poster-wrapper:hover .quick-icons{
-    opacity:1!important;
-}
-
-.quick-icons{
-    position:absolute;
-    z-index:1;
-    opacity:0;
-    transition:opacity .5s;
-    -moz-transition:opacity .5s;
-    -webkit-transition:opacity .5s;
-    -o-transition:opacity .5s;
-}
-
-
-.quick-icons.general{
-    top:169px;
-    left:6px;
-    background-color:rgba(0,0,0,0.7);
-    width:128px;
-    height:30px;
-    -moz-border-radius:6px;
-    border-radius:6px;
-    text-align:center;
-}
-
-
-.episodes-listing-episode .quick-icons.general,.episode-row .screen-wrapper .quick-icons.general{
-    top:88px;
-    left:45px;
-}
-
-
-.library-show.screen .quick-icons.general{
-    top:60px;
-    left:21px;
-}
-
-
-.shout-list-item .screen .quick-icons.general{
-    top:44px;
-}
-
-
-.quick-icons span{
-    margin:5px 2px 0 2px;
-    cursor:pointer;
-    vertical-align:middle;
-    width:18px;
-    height:18px;
-    background-size:contain;
-    background-position:center center;
-    background-repeat:no-repeat;
-    display:inline-block;
-}
-
-
-.quick-icons.general span:first-child{
-    margin-left:0;
-}
-
-
-.quick-icons span.seen{
-    background-image:url(https://trakt.us/images/quick-icons/seen.png);
-    width:21px;
-}
-
-
-.quick-icons span.seen:hover,.quick-icons span.seen.current{
-    background-image:url(https://trakt.us/images/quick-icons/seen-on.png);
-}
-
-
-.quick-icons span.watchlist{
-    background-image:url(https://trakt.us/images/quick-icons/watchlist.png);
-    width:12px;
-}
-
-
-.quick-icons span.watchlist:hover,.quick-icons span.watchlist.current{
-    background-image:url(https://trakt.us/images/quick-icons/watchlist-on.png);
-}
-
-
-.quick-icons span.list{
-    background-image:url(https://trakt.us/images/quick-icons/list.png);
-}
-
-
-.quick-icons span.list:hover,.quick-icons span.list.current{
-    background-image:url(https://trakt.us/images/quick-icons/list-on.png);
-}
-
-
-.quick-icons span.collection{
-    background-image:url(https://trakt.us/images/quick-icons/collection.png);
-    width:12px;
-}
-
-
-.quick-icons span.collection:hover,.quick-icons span.collection.current{
-    background-image:url(https://trakt.us/images/quick-icons/collection-on.png);
-}
-
-
-.quick-icons span.add-to-list{
-    padding-left:0!important;
-    background-position:center center!important;
-}
-
-
-.quick-icons.rating-pod{
-    top:206px;
-    left:0;
-    width:155px;
-    height:30px;
-    text-align:center;
-    padding:0;
-}
-
-
-.episodes-listing-episode .quick-icons.rating-pod,.episode-row .screen-wrapper .quick-icons.rating-pod{
-    top:125px;
-    width:218px!important;
-}
-
-
-.library-show.screen .quick-icons.rating-pod{
-    top:98px;
-    width:170px;
-}
-
-
-.shout-list-item .screen .quick-icons.rating-pod{
-    top:80px;
-}
-
-
-.quick-icons.rating-pod span{
-    opacity:0.5;
-}
-
-
-.quick-icons.rating-pod span.unhover{
-    opacity:0.5!important;
-}
-
-
-.quick-icons.rating-pod span:hover,.quick-icons.rating-pod span.current,.quick-icons.rating-pod span.hover{
-    opacity:1;
-}
-
-
-.quick-icons.rating-pod span.simple.rate-love{
-    background-image:url(https://trakt.us/images/quick-icons/heart-love.png);
-}
-
-
-.quick-icons.rating-pod span.simple.rate-hate{
-    background-image:url(https://trakt.us/images/quick-icons/heart-hate.png);
-}
-
-
-.quick-icons.rating-pod span.advanced{
-    width:13px;
-    height:30px;
-    margin:0!important;
-    background-color:#333!important;
-    background-image:url(https://trakt.us/images/quick-icons/heart-love.png);
-    background-size:12px 12px;
-    float:left;
-}
-
-
-.episodes-listing-episode .quick-icons.rating-pod span.advanced,.episode-row .screen-wrapper .quick-icons.rating-pod span.advanced{
-    width:21px;
-    background-size:18px 18px;
-}
-
-
-.library-show.screen .quick-icons.rating-pod span.advanced{
-    width:16px;
-    background-size:14px 14px;
-}
-
-
-.quick-icons.rating-pod span.advanced:first-child{
-    margin-left:4px!important;
-}
-
-
-.rating-pod{
-    background-color:#333;
-    padding:5px 10px 5px 7px;
-    border-radius:0 0 6px 6px;
-    overflow:hidden;
-    margin:1px;
-    color:#ccc;
-    position:relative;
-}
-
-
-.rating-pod .percent{
-    float:left;
-    font-size:18px;
-    font-weight:bold;
-    background-position:100% 50%;
-    background-repeat:no-repeat;
-    padding-right:20px;
-    color:#fff;
-}
-
-
-.rating-pod .percent-sign{
-    font-weight:normal;
-    font-size:12px;
-    vertical-align:top;
-    padding-left:2px;
-    line-height:21px;
-}
-
-
-.rating-pod .votes{
-    float:right;
-    line-height:21px;
-    font-size:11px;
-    font-style:italic;
-}
-
-
-.instructions-wrapper{
-    color: rgb(255, 255, 255);
-    text-shadow: 0px -1px 1px rgb(17, 17, 17);
-    padding: 10px 10px 11px;
-    font-size: 16px;
-    border-radius: 4px 4px 0px 0px;
-    border-top: 1px solid rgb(119, 119, 119);
-    border-bottom: 1px solid rgb(51, 51, 51);
-    background-color: rgb(95, 95, 95);
-    position:relative;
-}
-
-.main-title {
-    color: rgb(255, 255, 255);
-    text-shadow: 0px -1px 1px rgb(17, 17, 17);
-    padding: 10px 10px 11px;
-    font-size: 16px;
-    border-radius: 4px 4px 0px 0px;
-    border-top: 1px solid rgb(119, 119, 119);
-    border-bottom: 1px solid rgb(51, 51, 51);
-    background-color: rgb(95, 95, 95);
-    background-image: -moz-linear-gradient(center top , rgb(102, 102, 102), rgb(85, 85, 85));
-}
-
-.main-wrapper {
-    background: none repeat scroll 0% 0% rgb(208, 208, 208);
-    color: rgb(153, 153, 153);
-    padding: 9px;
-}
-
-
-
-h2{
-    font-weight:normal;
-    line-height:22px;
-    font-size:22px;
-    position:relative;
-}
-
-
-h2{
-    font-weight:normal;
-    line-height:21px;
-    font-size:17px;
-    color:#000;
-}
-
-
-h2 span{
-    font-weight:bold;
-}
-
-
-h2 a:hover{
-    text-decoration:underline;
-}
-
-
-h2 a.show{
-    font-weight:bold;
-}
-
-
-h2 a.see-more{
-    float:right;
-    font-size:16px;
-    line-height:22px;
-    margin-left:20px;
-    color:#ddd;
-}
-
-
-h2 .help-text{
-    float:right;
-    font-weight:normal;
-    color:#aaa;
-    font-style:italic;
-    font-size:14px;
-    line-height:22px;
-}
-
-
-h2 .hide-watched{
-    font-size:13px;
-    padding-top:1px;
-    padding-bottom:1px;
-}
-
-
-h2 .hide-watched:hover{
-    text-decoration:none;
-}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/styles/style.css b/lib/copy_this/www/templates/nntmux/styles/style.css
deleted file mode 100644
index 24d83f3ef..000000000
--- a/lib/copy_this/www/templates/nntmux/styles/style.css
+++ /dev/null
@@ -1,422 +0,0 @@
-/* Site-wide html styles */
-body { margin: 0 auto; padding: 0; background: #FFF url(../images/menu.gif) repeat-x left top; font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12px; color: #515151; }
-h1, h2, h3 { margin: 0; font-weight: normal; color: #485459; }
-input, select, textarea { font-family: Calibri, Arial, Helvetica, sans-serif; }
-textarea { height:100px; width:300px; }
-h1 { font-size: 44px; padding-bottom:10px; }
-h2 { padding-bottom:5px; font-size: 1.6em; }
-h3 { padding:10px 0 5px 0; }
-p, ul, ol { margin-top: 0; line-height: 240%; text-align: justify; }
-ul, ol { }
-blockquote { }
-a { color: #108120; text-decoration: none; }
-a:hover { text-decoration: underline; }
-a img { border: none; }
-img.left { float: left; margin: 7px 30px 0 0; }
-img.right { float: right; margin: 7px 0 0 30px; }
-hr { display: none; }
-input[type=text], input[type=password], textarea, select { background: #fff; background: -webkit-gradient(linear, left top, left 25, from(#fff), color-stop(4%, #f0f0f0), to(#fff)); border: 1px solid #ccc; border-bottom-color: #999; border-right-color: #999; margin: 0; padding: 4px; color: #444; font-size: 100%; outline: none; }
-
-
-
-
-
-
-/*
-page structure
-*/
-#header { width: 85%; 	margin: 0 auto; }
-#page { width: 85%; margin: 0 auto; padding: 50px 0px 0px 0px;}
-
-#logo { width: 85%; margin: 0 auto; height: 65px; padding-left:5px; margin-top:4px; background:url("../images/banner.jpg") no-repeat bottom left; }
-#logo h1, #logo p { display:none; margin: 0px; line-height: normal; text-transform: lowercase; font-weight: normal; color: #485459; }
-#logo p { margin-top: 2px; font-size: 13px; color: #A8A8A8; }
-#logo h1 { padding-top: 10px; font-size: 48px; }
-#logo a { color: #A8A8A8; }
-#logo .logolink { float:left; }
-#logo img { margin-top:15px; }
-#logo h1 a { color: #485459; }
-
-#statusbar { width: 85%; margin: 0 auto; text-align:right; padding:5px 10px 0 0;}
-#statusbar a { color: #515151;}
-
-#content { float: right; width: 85%;}
-#content h1 { font-size: 2.3em;}
-#content p { margin-bottom:20px;}
-
-#sidebar { float: left; width: 160px;}
-#sidebar ul {margin: 0; padding: 0; line-height: normal; list-style-type: none; text-align: left; }
-#sidebar li { margin-bottom: 30px; padding: 0 0 0 0;}
-#sidebar li ul { list-style-type: none;  list-style-position:inside; margin: 0px 10px; padding: 0; margin-left: 1em;}
-#sidebar li li { background-image: url('../images/bullet.jpg'); background-repeat: no-repeat; background-position: 0.7em 1.1em; margin: 0;	padding-left: .5em; padding-top: .8em;padding-bottom:10px; border-bottom: 1px solid #E9E8DD;}
-#sidebar li li a {padding: 0 0 0 20px; font-weight: normal; color: #808080;}
-#sidebar li li a:hover {color: #108120;}
-#sidebar li li:hover { cursor:pointer; background-color:#EEE; background-image: url('../images/bullet_hov.jpg');}
-
-#sidebar p { margin: 0; padding: 0px 14px;}
-#sidebar h2 { height: 30px; margin: 0 0 5px 0px; padding: 6px 0 2px 14px; font-size: 18px; font-weight: normal; color: #485459;}
-#sidebar p { line-height: 200%;}
-#sidebar a { text-align: left; text-decoration: none; font-weight: bold;}
-
-.w3validator img {margin:10px 0 10px 0;}
-.footer { width: 100%; height: 102px; margin: 0 auto; background: #E1E1E1; border-top: 5px solid #656565;}
-.footer p { margin: 0; padding: 20px 0px 0px 0px; text-align: center; line-height: normal; font-size: 0.9em; }
-.footer a {}
-
-
-
-
-
-
-/*
-browse by category top menu
-*/
-#menu { height:33px; float: left; width: 100%; background-color:#e5e5e5; }
-#menu { padding:0 4px 0 4px; margin-right:1px; border:1px #CCC solid; background-color:#e5e5e5; -moz-border-radius: 4px;  -webkit-border-radius: 4px;}
-
-.menupic {padding-left:15px;}
-
-#menulink { float: left; }
-#menulink ul { list-style-type: none; padding: 0; margin: 0; }
-#menulink li { float: left; position: relative; z-index: 100; }
-#menulink a, #menulink :visited {height:32px; display: block; font-size: 0.9em; width: 70px; padding: 1px 0px 0px 5px; color: #000; background-color: #e5e5e5; text-decoration: none; text-align: left; vertical-align: middle; }
-#menulink :hover, #menulink a.selected {color:#fff; background-color: #777; }
-#menulink ul ul { visibility: hidden; position: absolute; width: 60px; height: 0; }
-#menulink ul li:hover ul, #menulink ul a:hover ul { visibility: visible; }
-#menusearchlink { padding-top:5px; float:right; }
-#menusearchlink input, #menusearchlink select { font-size: 0.9em; color:#555; }
-#menucontainer { width:85%; height:10px; }
-
-select#headcat {width:120px; float:right; margin-left:5px; height:25px;}
-select#headcat option { padding-left: 10px; }
-select#headcat option.grouping { padding-left: 5px; font-weight: bold; }
-#headsearch{float:right;height:15px;}
-
-.gobutton {display:inline;float:right;margin-left:5px;}
-.gobutton input { background:url('../images/icons/go.png') no-repeat; cursor:pointer; border: none;	 width:30px; height:25px; }
-
-/* menu styling for when menu is displayed in top position  */
-#logo ul { list-style-type: none; float:right; margin: 0 0 10px 0; padding:0; line-height: normal; text-align: right; }
-#logo ul li h2 {display:none;}
-#logo ul li ul li {float: left; margin-left: 1em; padding-right:5px;  }
-#logo ul li a {color:#333;}
-#logo ul ul {list-style-type: square;}
-
-
-
-
-
-
-
-
-/*
-data tables, most lists.
-*/
-#browsetable, #coverstable, #forumtable { margin-top: 10px; clear: both; }
-table.data { border-collapse:collapse; }
-table.data th { text-align:left; vertical-align:top; background-color:#DDD; border-color: #AAA; border-width: 1px; border-style: solid; padding:3px; font-style:bolder; text-transform:capitalize;}
-table.data td { white-space:normal; vertical-align:top; padding:5px; border-color: #AAA; border-width: 1px; border-style: solid; }
-table.data td.less { color: #888; font-size: 0.9em; white-space:nowrap; }
-table.data td.icons { white-space:nowrap; padding-left:0px; padding-right:0px; width:60px; }
-table.data td.check {cursor:pointer;}
-table.highlight tr:hover td { background-color: #e8fbe6; }
-table tr.alt { background-color: #F6F6F6; }
-table tr.new { background-color: #f6f8ff; }
-table.data em {font-weight:bolder; color:red;}
-table td.item { padding:5px 5px 2px 5px; }
-table td.static { background-color: #FFF; }
-.left { text-align:left !important;}
-.right { text-align:right !important;}
-.mid { text-align:center !important;}
-.nowrap {white-space:nowrap;}
-#detailstable { width: 70%; }
-#detailstable th { width: 70px; }
-
-table.innerdata { border-collapse:collapse;}
-table.innerdata td { padding:2px; border-left-width:0; border-bottom-width:0; border-color: #EEE; }
-table.innerdata th { padding:2px; border-style: none; background-color:#EEE;}
-
-table.input th, table.input td { text-align: left; vertical-align:top; }
-
-/*
-form inputs and helpers
-*/
-div.hint, div.hint a {font-size:0.9em; font-style:italic; color:#999;}
-div.hint { margin-bottom:10px;}
-input.long {width:400px; }
-input.short { width:40px; }
-input.tiny { width: 25px; }
-input.date { width:70px; }
-fieldset { margin-bottom:20px; border:1px solid #999;}
-legend { padding: 0.4em 0.6em; border:1px solid #999; font-weight:bold; text-align:left; }
-
-
-
-
-
-
-
-/*
-pager
-*/
-div.pager {display:inline;}
-div.pager a {font-weight:bold; background-color:#DDD; padding:0 3px 0px 4px; border:1px #CCC solid;}
-div.pager .current {color:#fff; font-weight:bold; background-color:#777; padding:0 4px 0px 4px; border:1px #CCC solid;}
-
-
-
-
-
-
-
-/*
-round buttoning
-*/
-.rndbtn { padding:0 4px 0 4px; margin-right:1px; border:1px #CCC solid; background-color:#EEE; -moz-border-radius: 4px;  -webkit-border-radius: 4px; border-radius: 4px; }
-table.highlight tr:hover .rndbtn, table tr.alt .rndbtn { background-color: #fff; }
-table.highlight tr:hover .rndbtn:hover { background-color: #DDD; }
-table.highlight tr:hover td.static { background-color: #FFF; }
-
-
-
-
-
-
-
-/*
-site wide covers and images with dropshadows
-*/
-img.shadow {padding: 5px 5px 5px 5px; background: #FFF; border:1px solid #EEE; -moz-box-shadow: 3px 6px 8px -4px #777; -webkit-box-shadow: 3px 6px 8px -4px #777; box-shadow: 3px 6px 8px -4px #777; border-collapse:separate; }
-
-
-
-
-
-
-
-/*
-mainly one-off styles used on individual pages
-*/
-#forumtable a.title { font-size: 1.4em; }
-
-pre#nfo { font-family: "Courier New", "DejaVu Sans Mono", monospace; font-size: 12px; line-height: 13px; }
-
-div.resextra { padding-top:7px; color: #555; font-size: 0.9em; height:16px; }
-div.resextra a { color: #555; text-decoration:none; }
-div.resextra div.admin { float:right; }
-div.resextra div.btns {float:left; }
-
-div.movextra { padding-top:5px; color: #888; font-size: 0.9em; }
-div.movextra td {border:0; padding:0 0 10px 0}
-div.movextra tr.mlextra {display:none;}
-
-div.movcover { width:140px; }
-div.movcover img { margin-bottom:5px;}
-div.movcover .rndbtn {display:inline-block; margin-top:2px;}
-.mediainfo, .seriesinfo, .preinfo, .prehashinfo {cursor:pointer;}
-
-a.external { background: url('../images/newwindow.png') center right no-repeat !important; padding-right:13px !important;}
-
-ol.tracklist li { line-height: 140%; }
-
-div.tvseriesheading img {float:right; margin:10px 0 10px 10px; max-width:300px;}
-div.tvseriesheading p {text-align:left;}
-
-span.descfull {display:none;}
-a.descmore { display: inline; margin: 0px; margin-left:5px;}
-
-
-div.error { padding:20px; padding-left:50px; border:1px solid #BBB; background: #FED0D0 url(../images/icons/warning.png) no-repeat top; background-position: 5px 50%; font-size:1.2em; font-weight:bold; margin-bottom:10px;}
-div.comments { padding-top:20px; }
-
-.invitesuccess {display:none; font-weight:bold; padding-left:10px; color:green;}
-.invitefailed {display:none; font-weight:bold; padding-left:10px; color:red;}
-
-div.nosearchresults {margin-left:25px; padding-top:50px;}
-div.nosearchresults ul { line-height: 150%;}
-
-span.warning { color: red; }
-
-
-/*! Newznab tooltip style */
-.ui-tooltip-tmux .ui-tooltip-titlebar,
-.ui-tooltip-tmux .ui-tooltip-content{
-	border-color: #90D93F;
-	color: #3F6219;
-}
-
-	.ui-tooltip-tmux .ui-tooltip-content{
-		background-color: #CAED9E;
-	}
-
-	.ui-tooltip-tmux .ui-tooltip-titlebar{
-		background-color: #B0DE78;
-		color:white;
-		font-size:1.2em;
-	}
-
-	.ui-tooltip-tmuxb .ui-state-default .ui-tooltip-icon{
-		background-position: -42px 0;
-	}
-
-table.ui-tooltip-tmux th {vertical-align:top;text-align:right;}
-ul.ui-tooltip-tmux li {text-align:left;}
-
-.rarfilelist {cursor:pointer;}
-/*.tooltiphead {background-color:#A9DB66; padding:5px;color:white; font-weight:bold; margin:-5px -10px 5px -10px;}*/
-.ui-tooltip ul {padding:0; margin:0;line-height: 160%;}
-.ui-tooltip li {list-style-type:none;}
-
-.tabs {	padding: 0;	list-style: none; }
-.tabs li { float: left;	border: 1px solid #AAA;	margin-bottom: -1px; margin-right: 5px;	overflow: hidden;	background: #F4F4F4; }
-.tabs li a { padding: 0 10px 0 10px; }
-.tabs li.active {	background: #DDD;	border-bottom: 1px solid #EEE; }
-
-
-/*
-movie, console and music modals with backdrop images.
-*/
-#movieinfo { background-position: center center; background-repeat: no-repeat; position: absolute; z-index: 2;}
-#movieinfo h1 { font-size: 32px; padding: 10px 10px 0px 20px; color: #fff; text-shadow: 0px 0px 4px #000; }
-#movieinfo h2, #movieinfo h3 { padding: 10px 20px 0px 20px; color: #fff; text-shadow: 0px 0px 4px #000; }
-#movieinfo a { color: #fff; }
-#movieinfo img.cover { margin-right: 20px; -webkit-box-shadow: 0px 0px 4px #000; -moz-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; border-collapse:separate;}
-#backdrop { position: absolute; width: 810px; height: 455px; left: -1px; top: 5px; background-color: #000; overflow: hidden;}
-#backdrop img { opacity:0.5; width: 100%; height: 100%;}
-
-#musicinfo { color:#FFF; min-height:435px; background-color:#7F7F7F; background-image:url('../../covers/music/backdrop.jpg'); background-repeat: repeat-x;}
-#musicinfo h1 { font-size: 32px; padding: 10px 10px 0px 20px; color: #fff; }
-#musicinfo h2, #musicinfo h3, #musicinfo p { padding: 10px 20px 0px 20px; color: #fff;}
-#musicinfo a { color: #fff; }
-#musicinfo img.cover { float:right;  margin:20px 20px 0 20px; padding: 5px 5px 5px 5px; background: #FFF; border:1px solid #EEE; -moz-box-shadow: 3px 6px 8px -4px #333; -webkit-box-shadow: 3px 6px 8px -4px #333; box-shadow: 3px 6px 8px -4px #333; border-collapse:separate; }
-#musicinfo p {text-align: left; line-height: 180%;}
-
-#moviefull .pic { margin-left: 20px; float: right; }
-#moviefull {padding-bottom:20px;}
-#moviepreviews {text-align: center;}
-#moviepreviews img {max-width:600px;}
-#moviepreviews .previewtitle {margin-bottom: 20px;}
-
-/*
-icons and multioperation buttons
-*/
-input.nzb_check_all { margin-left:5px; }
-#nzb_multi_operations_form { clear: both; }
-div.nzb_multi_operations { color:#888; display:inline; float:right; text-align: right; clear: both; }
-div.nzb_multi_operations input { color:#888; background-color:#fff; border:1px solid #ddd; }
-div.nzb_multi_operations input:hover { color:#000; border:1px solid #000; cursor:pointer; }
-
-div.icon { width:16px; height:16px; background-repeat:no-repeat; cursor:pointer; position:relative; float:left; margin:2px; }
-table.data td.icons div.icon { opacity:.20; }
-div.icon_cart			{ background-image:url('../images/icons/cartup.png'); }
-div.icon_cart_clicked	{ background-image:url('../images/icons/cartdown.png'); }
-div.icon_nzb			{ background-image:url('../images/icons/nzbup.png'); }
-div.icon_nzb_clicked	{ background-image:url('../images/icons/nzbdown.png'); }
-div.icon_nzb a			{ text-decoration:none; padding-bottom:2px; padding-right:12px; }
-
-div.icon_sab {
-    background-image: url('../images/icons/queueup.png');
-}
-
-div.icon_sab_clicked {
-    background-image: url('../images/icons/queuedown.png');
-}
-
-div.icon_tvrage			{ background-image:url('../images/icons/tvrage.png'); }
-div.icon_check			{ background-image:url('../images/icons/check.png'); }
-div.icon_nzbvortex		{ background-image: url('../images/icons/vortex/bigsmile.png'); }
-div.icon_nzbvortex_clicked		{ background-image: url('../images/icons/vortex/bigsmiledown.png'); }
-
-
-
-
-
-
-/*
-    ColorBox Core Style
-    The following rules are the styles that are consistant between themes.
-    Avoid changing this area to maintain compatability with future versions of ColorBox.
-*/
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
-#cboxOverlay{position:fixed; width:100%; height:100%;}
-#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative; overflow:visible;}
-#cboxLoadedContent{overflow:auto;}
-#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;}
-#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-
-#cboxOverlay{background:#fff;}
-
-#colorbox{}
-    #cboxTopLeft{width:25px; height:25px; background:url(../images/colorbox/border1.png) 0 0 no-repeat;}
-    #cboxTopCenter{height:25px; background:url(../images/colorbox/border1.png) 0 -50px repeat-x;}
-    #cboxTopRight{width:25px; height:25px; background:url(../images/colorbox/border1.png) -25px 0 no-repeat;}
-    #cboxBottomLeft{width:25px; height:25px; background:url(../images/colorbox/border1.png) 0 -25px no-repeat;}
-    #cboxBottomCenter{height:25px; background:url(../images/colorbox/border1.png) 0 -75px repeat-x;}
-    #cboxBottomRight{width:25px; height:25px; background:url(../images/colorbox/border1.png) -25px -25px no-repeat;}
-    #cboxMiddleLeft{width:25px; background:url(../images/colorbox/border2.png) 0 0 repeat-y;}
-    #cboxMiddleRight{width:25px; background:url(../images/colorbox/border2.png) -25px 0 repeat-y;}
-    #cboxContent{background:#fff;}
-        #cboxLoadedContent{background:#fff; margin-top:32px; padding:1px; }
-        #cboxLoadingOverlay{background:#fff;}
-        #cboxTitle{position:absolute; font-size:125%; top:-2px; left:0; color:#000; }
-        #cboxCurrent{position:absolute; top:-1px; right:205px; text-indent:-9999px;}
-        #cboxSlideshow, #cboxPrevious, #cboxNext, #cboxClose{text-indent:-9999px; width:20px; height:20px; position:absolute; top:-1px; background:url(../images/colorbox/controls.png) 0 0 no-repeat;}
-        #cboxPrevious{background-position:0px 0px; right:44px;}
-        #cboxPrevious.hover{background-position:0px -25px;}
-        #cboxNext{background-position:-25px 0px; right:22px;}
-        #cboxNext.hover{background-position:-25px -25px;}
-        #cboxClose{background-position:-50px 0px; right:0;}
-        #cboxClose.hover{background-position:-50px -25px;}
-        .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}
-        .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
-        .cboxSlideshow_on #cboxSlideshow.hover{background-position:-100px -25px;}
-        .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
-        .cboxSlideshow_off #cboxSlideshow.hover{background-position:-75px -25px;}
-
-/*
-    The following fixes png-transparency for IE6.
-*/
-.cboxIE #cboxTopLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderTopLeft.png, sizingMethod='scale');}
-.cboxIE #cboxTopCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderTopCenter.png, sizingMethod='scale');}
-.cboxIE #cboxTopRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderTopRight.png, sizingMethod='scale');}
-.cboxIE #cboxBottomLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderBottomLeft.png, sizingMethod='scale');}
-.cboxIE #cboxBottomCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderBottomCenter.png, sizingMethod='scale');}
-.cboxIE #cboxBottomRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderBottomRight.png, sizingMethod='scale');}
-.cboxIE #cboxMiddleLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderMiddleLeft.png, sizingMethod='scale');}
-.cboxIE #cboxMiddleRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/colorbox/internet_explorer/borderMiddleRight.png, sizingMethod='scale');}
-
-/*
-	Use colorbox example 2 css for movieinfo popups
-*/
-.cboxMovie{}
-    .cboxMovie #cboxContent{margin-top:32px; background: transparent;}
-    .cboxMovie #cboxTopLeft{display:none;}
-    .cboxMovie #cboxTopCenter{display:none;}
-    .cboxMovie #cboxTopRight{display:none;}
-    .cboxMovie #cboxBottomLeft{display:none;}
-    .cboxMovie #cboxBottomCenter{display:none;}
-    .cboxMovie #cboxBottomRight{display:none;}
-    .cboxMovie #cboxMiddleLeft{display:none;}
-    .cboxMovie #cboxMiddleRight{display:none;}
-        .cboxMovie #cboxLoadedContent{margin-top: 5px; background:#888; padding:1px;}
-        .cboxMovie #cboxLoadingGraphic{background:url(../images/loading.gif) center center no-repeat;}
-        .cboxMovie #cboxLoadingOverlay{background:#000;}
-        .cboxMovie #cboxTitle{position:absolute; top:-22px; left:0; color:#000;}
-        .cboxMovie #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;}
-        .cboxMovie #cboxSlideshow, .cboxMovie #cboxPrevious, .cboxMovie #cboxNext, .cboxMovie #cboxClose{text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(../images/colorbox/controls2.png) 0 0 no-repeat;}
-        .cboxMovie #cboxPrevious{background-position:0px 0px; right:44px;}
-        .cboxMovie #cboxPrevious.hover{background-position:0px -25px;}
-        .cboxMovie #cboxNext{background-position:-25px 0px; right:22px;}
-        .cboxMovie #cboxNext.hover{background-position:-25px -25px;}
-        .cboxMovie #cboxClose{background-position:-50px 0px; right:0;}
-        .cboxMovie #cboxClose.hover{background-position:-50px -25px;}
-        .cboxMovie .cboxSlideshow_on #cboxPrevious, .cboxMovie .cboxSlideshow_off #cboxPrevious{right:66px;}
-        .cboxMovie .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
-        .cboxMovie .cboxSlideshow_on #cboxSlideshow.hover{background-position:-100px -25px;}
-        .cboxMovie .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
-        .cboxMovie .cboxSlideshow_off #cboxSlideshow.hover{background-position:-75px -25px;}
-
-
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/adminmenu.tpl b/lib/copy_this/www/templates/nntmux/views/admin/adminmenu.tpl
deleted file mode 100644
index dfbfa1109..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/adminmenu.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
- 		<h2>Admin Functions</h2>
-		<ul>
-            <li><a title="Home" href="{$smarty.const.WWW_TOP}/..{$site->home_link}">Home</a></li>
-            <li><a title="Admin Home" href="{$smarty.const.WWW_TOP}/">Admin Home</a></li>
-            <li><a title="Edit Site" href="{$smarty.const.WWW_TOP}/site-edit.php">Edit Site</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/content-add.php?action=add">Add</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/content-list.php">Edit</a> Content Page</li>
-            <li><a href="{$smarty.const.WWW_TOP}/menu-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/menu-edit.php?action=add">Add</a> Menu Items</li>
-            <li><a href="{$smarty.const.WWW_TOP}/category-list.php?action=add">Edit</a> Categories</li>
-            <li><a href="{$smarty.const.WWW_TOP}/group-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/group-edit.php">Add</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/group-bulk.php">BulkAdd</a> Groups</li>
-            <li><a href="{$smarty.const.WWW_TOP}/regex-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/regex-edit.php?action=add">Add</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/regex-test.php">Test</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/regex-submit.php">Send</a> Regex</li>
-            <li><a href="{$smarty.const.WWW_TOP}/binaryblacklist-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/binaryblacklist-edit.php?action=add">Add</a> Blacklist</li>
-            <li><a href="{$smarty.const.WWW_TOP}/release-list.php">View Releases</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/preview-list.php">View Previews</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/rage-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/rage-edit.php?action=add">Add</a> TVRage List</li>
-            <li><a href="{$smarty.const.WWW_TOP}/thetvdb-list.php">View TheTVDB List</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/movie-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/movie-add.php">Add</a> Movie List</li>
-            <li><a href="{$smarty.const.WWW_TOP}/anidb-list.php">View AniDB List</a></li>
-			<li><a href="{$smarty.const.WWW_TOP}/game-list.php">View Games</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/music-list.php">View Music List</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/console-list.php">View Console List</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/book-list.php">View Book List</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/nzb-import.php">Import</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/nzb-export.php">Export</a> Nzb's</li>
-			<li><a href="{$smarty.const.WWW_TOP}/opcachestats.php">Opcache Statistics</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/db-optimise.php">Optimise</a> Tables</li>
-            <li><a href="{$smarty.const.WWW_TOP}/comments-list.php">View Comments</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/spotnab-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/spotnab-edit.php?action=add">Add</a> Spotnab Sources</li>
-            <li><a href="{$smarty.const.WWW_TOP}/sharing.php">Comment Sharing Settings</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/user-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/user-edit.php?action=add">Add</a> Users</li>
-            <li><a href="{$smarty.const.WWW_TOP}/role-list.php">View</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/role-edit.php?action=add">Add</a> Roles</li>
-            <li><a href="{$smarty.const.WWW_TOP}/site-stats.php">Site Stats</a> <a style="padding:0;" href="{$smarty.const.WWW_TOP}/site-debug.php">Debug</a></li>
-            <li><a href="{$smarty.const.WWW_TOP}/tmux-edit.php">Tmux Settings</a></li>
-			<li><a href="{$smarty.const.WWW_TOP}/view-logs.php">View Logs</a></li>
-		</ul>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/ajax_release-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/ajax_release-edit.tpl
deleted file mode 100644
index 8711069a6..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/ajax_release-edit.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-
-<div id="updatePanel">
-
-{if $success}
-
-<h4>Successfully updated!</h4>
-{if $from != ''}
-<script type="text/javascript">
-	window.location = "{$from}";
-</script>
-{/if}
-
-{else}
-
-{literal}
-<script type="text/javascript">
-	$('#release').submit(function(){return false;});
-
-	$('#save').click(function() {
-		var formData = $('#release').serialize();
-		$.post($('#release').attr('action') + '&' + formData, function(resp){
-			$('#updatePanel').html(resp);
-		});
-
-	});
-</script>
-{/literal}
-
-<form id="release" action="{$smarty.const.WWW_TOP}/ajax_release-admin/?action=doedit" method="get">
-
-{foreach from=$idArr item=id}
-<input type="hidden" name="id[]" value="{$id}" />
-{/foreach}
-<input type="hidden" name="from" value="{$from}" />
-<table class="input">
-
-<tr>
-	<td><label for="category">Category</label>:</td>
-	<td>
-		{html_options id="category" name=category options=$catlist selected=$release.categoryid}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="grabs">Grabs</label>:</td>
-	<td>
-		<input id="grabs" class="short" name="grabs" type="text" value="{$release.grabs}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="rageid">Tv Rage Id</label>:</td>
-	<td>
-		<input id="rageid" class="short" name="rageid" type="text" value="{$release.rageid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tvdbid">TheTVDB id</label>:</td>
-	<td>
-		<input id="tvdbid" class="short" name="tvdbid" type="text" value="{$release.tvdbid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="anidbid">AniDB Id</label>:</td>
-	<td>
-		<input id="anidbid" class="short" name="anidbid" type="text" value="{$release.anidbid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="season">Season</label>:</td>
-	<td>
-		<input id="season" class="short" name="season" type="text" value="{$release.season}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="episode">Episode</label>:</td>
-	<td>
-		<input id="episode" class="short" name="episode" type="text" value="{$release.episode}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="episode">IMDB Id</label>:</td>
-	<td>
-		<input id="imdbid" class="short" name="imdbid" type="text" value="{$release.imdbid}" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" id="save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
-
-{/if}
-
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/anidb-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/anidb-edit.tpl
deleted file mode 100644
index b3f1626cd..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/anidb-edit.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<input type="hidden" name="from" value="{$smarty.get.from}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="anidbid">AniDB Id</label>:</td>
-	<td>
-		<input id="anidbid" class="long" name="anidbid" type="text" value="{$anime.anidbid|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="title">Anime Name</label>:</td>
-	<td>
-		<input id="title" class="long" name="title" type="text" value="{$anime.title|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="type">Type</label>:</td>
-	<td>
-		<input id="type" class="long" name="type" type="text" value="{$anime.type|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="startdate">Start date</label>:</td>
-	<td>
-		<input id="startdate" class="long" name="startdate" type="text" value="{$anime.startdate|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="enddate">End date</label>:</td>
-	<td>
-		<input id="enddate" class="long" name="enddate" type="text" value="{$anime.enddate|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="related">Related</label>:</td>
-	<td>
-		<input id="related" class="long" name="related" type="text" value="{$anime.related|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="creators">Creators</label>:</td>
-	<td>
-		<input id="creators" class="long" name="creators" type="text" value="{$anime.creators|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="description">Description</label>:</td>
-	<td>
-		<textarea class="autosize" id="description" name="description">{$anime.description|escape:'htmlall'}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="rating">Rating</label>:</td>
-	<td>
-		<input id="rating" class="long" name="rating" type="text" value="{$anime.rating|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="categories">Categories</label>:</td>
-	<td>
-		<input id="categories" class="long" name="categories" type="text" value="{$anime.categories|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="characters">Characters</label>:</td>
-	<td>
-		<input id="characters" class="long" name="characters" type="text" value="{$anime.characters|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="epnos">Episode numbers</label>:</td>
-	<td>
-		<input id="epnos" class="long" name="epnos" type="text" value="{$anime.epnos|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="airdates">Episode air dates</label>:</td>
-	<td>
-		<input id="airdates" class="long" name="airdates" type="text" value="{$anime.airdates|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="episodetitles">Episode titles</label>:</td>
-	<td>
-		<input id="episodetitles" class="long" name="episodetitles" type="text" value="{$anime.episodetitles|escape:'htmlall'}" />
-	</td>
-</tr>
-
-
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/anidb-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/anidb-list.tpl
deleted file mode 100644
index 409d82f0c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/anidb-list.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $anidblist}
-
-<div style="float:right;">
-
-	<form name="anidbsearch" action="">
-		<label for="animetitle">Title</label>
-		<input id="animetitle" type="text" name="animetitle" value="{$animetitle}" size="15" />
-		&nbsp;&nbsp;
-		<input type="submit" value="Go" />
-	</form>
-</div>
-
-{$pager}
-
-<br/><br/>
-
-<table style="width:100%;margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th style="width:60px;">AniDB Id</th>
-		<th>Title</th>
-		<th style="width:100px;" class="mid">Options</th>
-	</tr>
-
-	{foreach from=$anidblist item=anidb}
-	<tr class="{cycle values=",alt"}">
-		<td class="less"><a href="http://anidb.net/perl-bin/animedb.pl?show=anime&amp;aid={$anidb.anidbid}" title="View in AniDB">{$anidb.anidbid}</a></td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/anidb-edit.php?id={$anidb.anidbid}">{$anidb.title|escape:"htmlall"}</a></td>
-		<td class="mid"><a title="Delete this AniDB entry" href="{$smarty.const.WWW_TOP}/anidb-delete.php?id={$anidb.anidbid}">delete</a> | <a title="Remove this anidbid from all releases" href="{$smarty.const.WWW_TOP}/anidb-remove.php?id={$anidb.anidbid}">remove</a></td>
-	</tr>
-	{/foreach}
-
-</table>
-
-    <br/>
-    {$pager}
-{else}
-<p>No AniDB episodes available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/anidb-remove.tpl b/lib/copy_this/www/templates/nntmux/views/admin/anidb-remove.tpl
deleted file mode 100644
index 97d0bf29f..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/anidb-remove.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-Removed anidbid from {$numtv} releases.
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/baseadminpage.tpl b/lib/copy_this/www/templates/nntmux/views/admin/baseadminpage.tpl
deleted file mode 100644
index 15053ddca..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/baseadminpage.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=9" />
-	<meta name="keywords" content="" />
-	<meta name="description" content="" />	
-	<title>{$site->title|default:'newznab'} - {$page->meta_title|default:$page->title}</title>
-	<link href="{$smarty.const.WWW_TOP}/../templates/nntmux/styles/style.css" rel="stylesheet" type="text/css" media="screen" />
-	<link href="{$smarty.const.WWW_TOP}/../templates/nntmux/styles/admin.css" rel="stylesheet" type="text/css" media="screen" />
-	<link rel="shortcut icon" type="image/ico" href="{$smarty.const.WWW_TOP}/../templates/nntmux/images/favicon.ico"/>
-	<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/../templates/nntmux/scripts/sorttable.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/../templates/nntmux/scripts/utils-admin.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/../templates/nntmux/scripts/jquery.multifile.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/../templates/nntmux/scripts/jquery.autosize-min.js"></script>
-	<script type="text/javascript">var WWW_TOP = "{$smarty.const.WWW_TOP}/..";</script>
-	
-	{$page->head}
-</head>
-<body>
-	<div id="logo" style="cursor: pointer;">
-		<h1><a href="/"></a></h1>
-		<p><em></em></p>
-	</div>
-	<hr />
-	
-	<div id="header">
-		<div id="menu"> 
-		</div> 
-		<!-- end #menu --> 
-	</div>
-	
-	<div id="page">
-
-		<div id="adpanel">
-
-		</div>
-
-		<div id="content">
-			{$page->content}
-		</div>
-		<!-- end #content -->
-
-		<div id="sidebar">
-		<ul>		
-		<li>
-		{$admin_menu}
-		</li>
-
-		</ul>
-		</div>
-		<!-- end #sidebar -->
-	
-		<div style="clear: both;">&nbsp;</div>
-			
-	</div>
-	<!-- end #page -->
-	
-	<div id="searchfooter">
-		<center>
-		</center>
-	</div>
-	
-	<div class="footer">
-	<p>
-		{$site->footer}
-		<br /><br /><br />Copyright &copy; {$smarty.now|date_format:"%Y"} {$site->title}. All rights reserved.
-	</p>
-	</div>
-	<!-- end #footer -->
-	
-	{if $site->google_analytics_acc != ''}
-	{literal}
-
-	<script type="text/javascript">
-	/* <![CDATA[ */	
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', '{/literal}{$site->google_analytics_acc}{literal}']);
-	  _gaq.push(['_trackPageview']);
-	  _gaq.push(['_trackPageLoadTime']);
-
-	  (function() {
-		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-	/* ]]> */	
-	</script>
-
-	{/literal}
-	{/if}
-	
-</body>
-</html>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/binaryblacklist-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/binaryblacklist-edit.tpl
deleted file mode 100644
index 2407eeaab..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/binaryblacklist-edit.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-
-<tr>
-	<td>Group:</td>
-	<td>
-		<input type="hidden" name="id" value="{$regex.id}" />
-		<input type="text" id="groupname" name="groupname" value="{$regex.groupname|escape:html}" />
-		<div class="hint">The full name of a valid newsgroup. (Wildcard in the format 'alt.binaries.*')</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Regex:</td>
-	<td>
-		<textarea class="autosize" id="regex" name="regex" >{$regex.regex|escape:html}</textarea>
-		<div class="hint">The regex to be applied. (Note: Beginning and Ending / are already included)</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Description:</td>
-	<td>
-		<textarea class="autosize" id="description" name="description" >{$regex.description|escape:html}</textarea>
-		<div class="hint">A description for this regex</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="msgcol">Message Field</label>:</td>
-	<td>
-		{html_radios id="msgcol" name='msgcol' values=$msgcol_ids output=$msgcol_names selected=$regex.msgcol separator='<br />'}
-		<div class="hint">Which field in the message to apply the black/white list to.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="status">Active</label>:</td>
-	<td>
-		{html_radios id="status" name='status' values=$status_ids output=$status_names selected=$regex.status separator='<br />'}
-		<div class="hint">Only active regexes are applied during the release process.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="optype">Type</label>:</td>
-	<td>
-		{html_radios id="optype" name='optype' values=$optype_ids output=$optype_names selected=$regex.optype separator='<br />'}
-		<div class="hint">Black will exclude all messages for a group which match this regex. White will include only those which match.</div>
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/binaryblacklist-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/binaryblacklist-list.tpl
deleted file mode 100644
index 93a408784..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/binaryblacklist-list.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<p>
-	Binaries can be prevented from being added to the index at all if they match a regex provided in the blacklist. They can also be included only if they match a regex (whitelist).
-</p>
-
-<div id="message"></div>
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th style="width:20px;">id</th>
-		<th>group</th>
-		<th>regex</th>
-		<th class="mid">type</th>
-		<th class="mid">field</th>
-		<th class="mid">status</th>
-		<th class="mid">Options</th>
-	</tr>
-
-	{foreach from=$binlist item=bin}
-	<tr id="row-{$bin.id}" class="{cycle values=",alt"}">
-		<td>{$bin.id}</td>
-		<td title="{$bin.description}">{$bin.groupname|replace:"alt.binaries":"a.b"}</td>
-		<td>
-			{$bin.regex|escape:html}<br>
-			<i>{$bin.description}</i>
-		</td>
-		<td>{if $bin.optype==1}black{else}white{/if}</td>
-		<td>{if $bin.msgcol==1}subject{elseif $bin.msgcol==2}poster{else}messageid{/if}</td>
-		<td>{if $bin.status==1}active{else}disabled{/if}</td>
-		<td width="80" class="mid"><a href="{$smarty.const.WWW_TOP}/binaryblacklist-edit.php?id={$bin.id}">edit</a> | <a href="javascript:ajax_binaryblacklist_delete({$bin.id})">delete</a></td>
-	</tr>
-	{/foreach}
-
-</table>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/book-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/book-edit.tpl
deleted file mode 100644
index 417958379..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/book-edit.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="post">
-
-<input type="hidden" name="id" value="{$book.id}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input id="title" class="long" name="title" type="text" value="{$book.title|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="asin">ASIN</label>:</td>
-	<td>
-		<input id="asin" name="asin" type="text" value="{$book.asin|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="url">URL</label>:</td>
-	<td>
-		<input id="url" class="long" name="url" type="text" value="{$book.url|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="author">Author</label>:</td>
-	<td>
-		<input id="author" class="long" name="author" type="text" value="{$book.author|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="publisher">Publisher</label>:</td>
-	<td>
-		<input id="publisher" class="long" name="publisher" type="text" value="{$book.publisher|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="publishdate">Published Date</label>:</td>
-	<td>
-		<input id="publishdate" name="publishdate" type="text" value="{$book.publishdate|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="cover">Cover Image</label>:</td>
-	<td>
-		<input type="file" id="cover" name="cover" />
-		{if $book.cover == 1}
-			<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/../covers/book/{$book.id}.jpg" alt="" />
-		{/if}
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/book-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/book-list.tpl
deleted file mode 100644
index a83c0d369..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/book-list.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $booklist}
-{$pager}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>id</th>
-		<th>Title</th>
-		<th>Author</th>
-		<th width="80" class="mid">Created</th>
-	</tr>
-
-	{foreach from=$booklist item=book}
-	<tr class="{cycle values=",alt"}">
-		<td class="less">{$book.id}</td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/book-edit.php?id={$book.id}">{$book.title}</a></td>
-		<td>{$book.author}</td>
-		<td class="mid">{$book.createddate|date_format}</td>
-	</tr>
-	{/foreach}
-
-</table>
-    <br/>
-    {$pager}
-{else}
-    <p>No books available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/category-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/category-edit.tpl
deleted file mode 100644
index 34dc4407d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/category-edit.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-<tr>
-	<td>Title:</td>
-	<td>
-		<input type="hidden" name="id" value="{$category.id}" />
-		{$category.title}
-	</td>
-</tr>
-
-<tr>
-	<td>Parent:</td>
-	<td>
-		{$category.parentid}
-	</td>
-</tr>
-
-<tr>
-	<td>Description:</td>
-	<td>
-		<input type="text" class="long" name="description" value="{$category.description}" />
-	</td>
-</tr>
-	<td>Minimum Size (Bytes):</td>
-	<td>
-		<input type="text" class="short" name="minsizetoformrelease" value="{$category.minsizetoformrelease}" />
-	</td>
-</tr>
-</tr>
-	<td>Maximum Size (Bytes):</td>
-	<td>
-		<input type="text" class="short" name="maxsizetoformrelease" value="{$category.maxsizetoformrelease}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="status">Active</label>:</td>
-	<td>
-		{html_radios id="status" name='status' values=$status_ids output=$status_names selected=$category.status separator='<br />'}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="disablepreview">Disable Preview</label>:</td>
-	<td>
-		{html_radios id="disablepreview" name='disablepreview' values=$status_ids output=$status_names selected=$category.disablepreview separator='<br />'}
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/category-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/category-list.tpl
deleted file mode 100644
index 613e3debf..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/category-list.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<p>
-	Make a category inactive to remove it from the menu. This does not prevent binaries being matched into an appropriate category. Disable preview prevents ffmpeg being used for releases in the category.
-</p>
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>id</th>
-		<th>title</th>
-		<th>parent</th>
-		<th>min size</th>
-		<th>max size</th>
-		<th>active</th>
-		<th>disable preview</th>
-	</tr>
-
-	{foreach from=$categorylist item=category}
-	<tr class="{cycle values=",alt"}">
-		<td>{$category.id}</td>
-		<td><a href="{$smarty.const.WWW_TOP}/category-edit.php?id={$category.id}">{$category.title}</a></td>
-		<td>
-			{if $category.parentid != null}
-				{$category.parentName}
-			{else}
-				n/a
-			{/if}
-		</td>
-		<td class="mid">
-            {if $category.minsizetoformrelease != 0 }{$category.minsizetoformrelease|fsize_format:"MB"}{/if}
-		</td>
-		<td class="mid">
-            {if $category.maxsizetoformrelease != 0 }{$category.maxsizetoformrelease|fsize_format:"MB"}{/if}
-		</td>
-		<td>{if $category.status == "1"}Yes{else}No{/if}</td>
-		<td class="mid">{if $category.disablepreview == "1"}Yes{else}No{/if}</td>
-	</tr>
-	{/foreach}
-
-
-</table>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/comments-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/comments-list.tpl
deleted file mode 100644
index dd11d9f1d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/comments-list.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $commentslist}
-{$pager}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>user</th>
-		<th>date</th>
-		<th>comment</th>
-		<th>host</th>
-		<th class="mid">options</th>
-	</tr>
-
-
-	{foreach from=$commentslist item=comment}
-	<tr class="{cycle values=",alt"}">
-		<td>
-			{if $comment.sourceid == 0}<a title="View {$comment.username}'s profile" href="{$smarty.const.WWW_TOP}/user-edit.php?id={$comment.userid}">{$comment.username}</a>{else}{$comment.username}<br/><span style="color: #ce0000;">(syndicated)</span>{/if}
-		</td>
-		<td width="70" title="{$comment.createddate}">{$comment.createddate|date_format} ({$comment.createddate|timeago}
-			ago)
-		</td>
-		<td>{$comment.text|escape:"htmlall"|nl2br}</td>
-		<td>{$comment.host}</td>
-		<td class="mid" width="70">
-			{if $comment.guid != ""}<a href="{$smarty.const.WWW_TOP}/../details/{$comment.guid}#comments">view</a> | {/if}
-			<a class="confirm_action" href="{$smarty.const.WWW_TOP}/comments-delete.php?id={$comment.id}">delete</a>
-		</td>
-	</tr>
-	{/foreach}
-
-
-</table>
-{else}
-<p>No comments available</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/console-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/console-edit.tpl
deleted file mode 100644
index ba6827608..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/console-edit.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="post">
-
-<input type="hidden" name="id" value="{$console.id}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input id="title" class="long" name="title" type="text" value="{$console.title|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="asin">ASIN</label>:</td>
-	<td>
-		<input id="asin" name="asin" type="text" value="{$console.asin|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="url">URL</label>:</td>
-	<td>
-		<input id="url" class="long" name="url" type="text" value="{$console.url|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="salesrank">Sales Rank</label>:</td>
-	<td>
-		<input id="salesrank" class="short" type="text" name="salesrank" value="{$console.salesrank|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="platform">Platform</label>:</td>
-	<td>
-		<input id="platform" class="long" name="platform" type="text" value="{$console.platform|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="publisher">Publisher</label>:</td>
-	<td>
-		<input id="publisher" class="long" name="publisher" type="text" value="{$console.publisher|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="releasedate">Release Date</label>:</td>
-	<td>
-		<input id="releasedate" name="releasedate" type="text" value="{$console.releasedate|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="esrb">Rating</label>:</td>
-	<td>
-		<input id="esrb" class="short" name="esrb" type="text" value="{$console.esrb|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="genre">Genre</label>:</td>
-	<td>
-		<select id="genre" name="genre">
-		{foreach from=$genres item=gen}
-			<option {if $gen.id == $console.genreID}selected="selected"{/if} value="{$gen.id}">{$gen.title|escape:'htmlall'}</option>
-		{/foreach}
-		</select>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="cover">Cover Image</label>:</td>
-	<td>
-		<input type="file" id="cover" name="cover" />
-		{if $console.cover == 1}
-			<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/../covers/console/{$console.id}.jpg" alt="" />
-		{/if}
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/console-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/console-list.tpl
deleted file mode 100644
index 255f79139..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/console-list.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $consolelist}
-{$pager}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>id</th>
-		<th>Title</th>
-		<th>Platform</th>
-		<th>Created</th>
-	</tr>
-
-	{foreach from=$consolelist item=console}
-	<tr class="{cycle values=",alt"}">
-		<td class="less">{$console.id}</td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/console-edit.php?id={$console.id}">{$console.title}</a></td>
-		<td>{$console.platform}</td>
-		<td>{$console.createddate|date_format}</td>
-	</tr>
-	{/foreach}
-
-</table>
-
-<br/>
-{$pager}
-{else}
-<p>No games available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/content-add.tpl b/lib/copy_this/www/templates/nntmux/views/admin/content-add.tpl
deleted file mode 100644
index 411de1c59..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/content-add.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input type="hidden" name="id" value="{$content.id}" />
-		<input id="title" class="long" name="title" type="text" value="{$content.title}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="url">Url</label>:</td>
-	<td>
-		<input id="url" class="long" name="url" type="text" value="{$content.url}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="body">Body</label>:</td>
-	<td>
-		<textarea class="autosize" id="body" name="body">{$content.body}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="metadescription">Meta Description</label>:</td>
-	<td>
-		<textarea class="autosize" id="metadescription" name="metadescription">{$content.metadescription}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="metakeywords">Meta Keywords</label>:</td>
-	<td>
-		<textarea class="autosize" id="metakeywords" name="metakeywords">{$content.metakeywords}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="contenttype">Content Type</label>:</td>
-	<td>
-		{html_options id="contenttype" name='contenttype' options=$contenttypelist selected=$content.contenttype}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="role">Visible To</label>:</td>
-	<td>
-		{html_options id="role" name='role' options=$rolelist selected=$content.role}
-		<div class="hint">Only appropriate for articles and useful links</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="showinmenu">Show In Menu</label>:</td>
-	<td>
-		{html_radios id="showinmenu" name='showinmenu' values=$yesno_ids output=$yesno_names selected=$content.showinmenu separator='<br />'}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="status">Status</label>:</td>
-	<td>
-		{html_radios id="status" name='status' values=$status_ids output=$status_names selected=$content.status separator='<br />'}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="ordinal">Ordinal</label>:</td>
-	<td>
-		<input id="ordinal" name="ordinal" type="text" value="{$content.ordinal}" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/content-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/content-list.tpl
deleted file mode 100644
index 285f56886..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/content-list.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-<table class="data Sortable highlight">
-
-	<tr>
-		<th width="60">ordinal</th>
-		<th width="30">id</th>
-		<th>title</th>
-		<th>url</th>
-		<th>type</th>
-		<th>status</th>
-		<th>role</th>
-		<th>in menu</th>
-		<th>body</th>
-		<th>options</th>
-	</tr>
-
-	
-	{foreach from=$contentlist item=content}
-	<tr class="{cycle values=",alt"}">
-		<td>{$content.ordinal}</td>
-		<td>{$content.id}</td>
-		<td><a href="{$smarty.const.WWW_TOP}/content-add.php?id={$content.id}" title="Edit {$content.title}">{$content.title}</a></td>
-		<td><a title="Preview in new window" href="{$smarty.const.WWW_TOP}/../content/{$content.id}{$content.url}" target="null">/content/{$content.id}{$content.url}</a></td>
-		<td>
-			{if $content.contenttype == "1"}
-				Useful Link
-			{elseif $content.contenttype == "2"}
-				Article
-			{elseif $content.contenttype == "3"}
-				Homepage
-			{/if}
-		</td>
-		<td>
-			{if $content.status == "1"}
-				Enabled
-			{else}
-				Disabled
-			{/if}
-		</td>
-		<td>
-			{if $content.role == "0"}
-				Everyone
-			{elseif $content.role == "1"}
-				Users
-			{elseif $content.role == "2"}
-				Admins
-			{/if}
-		</td>		
-		<td style="width:50px;">
-			{if $content.showinmenu == "1"}
-				Yes
-			{else}
-				No
-			{/if}
-		</td>
-		<td title="{$content.body|escape:'htmlall'}">{$content.body|truncate:100|escape:'htmlall'}</td>
-		<td>{if $content.contenttype != "3"}<a class="confirm_action" href="{$smarty.const.WWW_TOP}/content-delete.php?id={$content.id}">delete</a>{/if}</td>
-	</tr>
-	{/foreach}
-
-
-</table>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/db-optimise.tpl b/lib/copy_this/www/templates/nntmux/views/admin/db-optimise.tpl
deleted file mode 100644
index 61c81e2e6..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/db-optimise.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-<table style="margin-top:10px;" class="data Sortable">
-
-	<tr>
-		<th>message</th>
-	</tr>
-	
-	{foreach from=$tablelist item=table}
-	<tr>
-		<td>{$table} optimised/repaired</td>
-	</tr>
-	{/foreach}
-
-</table>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/game-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/game-edit.tpl
deleted file mode 100644
index b69bbb798..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/game-edit.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-<h1>{$page->title}</h1>
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="post">
-	<input type="hidden" name="id" value="{$game.id}" />
-	<table class="input">
-		<tr>
-			<td><label for="title">Title:</label></td>
-			<td>
-				<input id="title" class="long" name="title" type="text" value="{$game.title|escape:'htmlall'}" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="asin">Game ID:</label></td>
-			<td>
-				<input id="asin" name="asin" type="text" value="{$game.asin|escape:'htmlall'}" />
-				<br />
-				(Game ID of the url posted below, if unknown put 0)
-			</td>
-		</tr>
-		<tr>
-			<td><label for="url">URL:</label></td>
-			<td>
-				<input id="url" class="long" name="url" type="text" value="{$game.url|escape:'htmlall'}" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="trailerurl">Trailer URL:</label></td>
-			<td>
-				<input id="trailerurl" class="long" name="trailerurl" type="text" value="{$game.trailer|escape:'htmlall'}" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="publisher">Publisher:</label></td>
-			<td>
-				<input id="publisher" class="long" name="publisher" type="text" value="{$game.publisher|escape:'htmlall'}" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="releasedate">Release Date:</label></td>
-			<td>
-				<input id="releasedate" name="releasedate" type="text" value="{$game.releasedate|escape:'htmlall'}" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="esrb">Rating:</label></td>
-			<td>
-				<input id="esrb" class="short" name="esrb" type="text" value="{$game.esrb|escape:'htmlall'}" />
-			</td>
-		</tr>
-		<tr>
-			<td><label for="genre_list">Genre:</label></td>
-			<td>
-				<select id="genre_list" name="genre" />
-				{foreach from=$genres item=gen}
-					<option {if $gen.id == $game.genre_id}selected="selected"{/if} value="{$gen.id}">{$gen.title|escape:'htmlall'}</option>
-				{/foreach}
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="cover">Cover Image:</label></td>
-			<td>
-				<input type="file" id="cover" name="cover" />
-				{if $game.cover == 1}
-					<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/../covers/games/{$game.id}.jpg" alt="" />
-				{/if}
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" value="Save" />
-			</td>
-		</tr>
-	</table>
-</form>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/game-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/game-list.tpl
deleted file mode 100644
index a337f7803..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/game-list.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>{$page->title}</h1>
-{if $gamelist}
-	{$pager}
-	<table style="margin-top:10px;" class="data Sortable highlight">
-		<tr>
-			<th>ID</th>
-			<th>Title</th>
-			<th>Genre</th>
-			<th>Created</th>
-		</tr>
-		{foreach from=$gamelist item=game}
-			<tr class="{cycle values=",alt"}">
-				<td class="less">{$game.id}</td>
-				<td><a title="Edit" href="{$smarty.const.WWW_TOP}/game-edit.php?id={$game.id}">{$game.title}</a></td>
-				<td>{$game.genretitle}</td>
-				<td>{$game.createddate|date_format}</td>
-			</tr>
-		{/foreach}
-	</table>
-{else}
-	<p>No games available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/group-bulk.tpl b/lib/copy_this/www/templates/nntmux/views/admin/group-bulk.tpl
deleted file mode 100644
index 5ca655361..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/group-bulk.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $groupmsglist}
-<table class="data Sortable">
-
-	<tr>
-		<th>group</th>
-		<th>msg</th>
-	</tr>
-
-	{foreach from=$groupmsglist item=group}
-	<tr>
-		<td>{$group.group}</td>
-		<td>{$group.msg}</td>
-	</tr>
-	{/foreach}
-
-</table>
-
-<p>View <a href="group-list.php">all groups</a>.</p>
-
-{else}
-<p>Regex of groups to add to the site.</p>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-<table class="input">
-
-<tr>
-	<td width="90">Group List:</td>
-	<td>
-		<textarea  class="autosize" id="groupfilter" name="groupfilter"></textarea>
-		<div class="hint">A regular expression to match against group names e.g. alt.binaries.cd.image.linux|alt.binaries.warez.linux</div>
-	</td>
-</tr>
-<tr>
-	<td><label for="active">Active</label>:</td>
-	<td>
-		{html_radios id="active" name='active' values=$yesno_ids output=$yesno_names selected=1 separator='<br />'}
-		<div class="hint">Inactive groups will not have headers downloaded for them.</div>
-	</td>
-</tr>
-	<tr>
-		<td><label for="backfill">Backfill:</label></td>
-		<td>
-			{html_radios id="backfill" name='backfill' values=$yesno_ids output=$yesno_names selected=0 separator='<br />'}
-			<div class="hint">Inactive groups will not have backfill headers downloaded for them.</div>
-		</td>
-	</tr>
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Add Groups" />
-	</td>
-</tr>
-
-</table>
-
-</form>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/group-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/group-edit.tpl
deleted file mode 100644
index 6bee68efa..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/group-edit.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<h1>{$page->title}</h1>
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-	<table class="input">
-		<tr>
-			<td>Name:</td>
-			<td>
-				<input type="hidden" name="id" value="{$group.id}" />
-				<input id="name" class="long" name="name" type="text" value="{$group.name}" />
-				<div class="hint">Changing the name to an invalid group will break things.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="description">Description:</label></td>
-			<td>
-				<textarea id="description" name="description">{$group.description}</textarea>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="backfill_target">Backfill Days</label></td>
-			<td>
-				<input class="small" id="backfill_target" name="backfill_target" type="text" value="{$group.backfill_target}" />
-				<div class="hint">Number of days to attempt to backfill this group.  Adjust as necessary.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="minfilestoformrelease">Minimum Files <br/>To Form Release</label></td>
-			<td>
-				<input class="small" id="minfilestoformrelease" name="minfilestoformrelease" type="text" value="{$group.minfilestoformrelease}" />
-				<div class="hint">The minimum number of files to make a release. i.e. if set to two, then releases which only contain one file will not be created. If left blank, will use the site wide setting.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="minsizetoformrelease">Minimum File Size to Make a Release:</label></td>
-			<td>
-				<input class="small" id="minsizetoformrelease" name="minsizetoformrelease" type="text" value="{$group.minsizetoformrelease}" />
-				<div class="hint">The minimum total size in bytes to make a release. If left blank, will use the site wide setting.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="regexmatchonly">Pre Filter Binaries</label>:</td>
-			<td>
-				{html_radios id="regexmatchonly" name='regexmatchonly' values=$yesno_ids output=$yesno_names selected=$group.regexmatchonly separator='<br />'}
-				<div class="hint">Enabling pre-filter will only store binaries and parts in the database when they match release regex. Disabling will store all incoming binaries and parts until header retention met.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="first_record">First Record id:</label></td>
-			<td>
-				<input class="small" id="first_record" name="first_record" type="text" value="{$group.first_record}" />
-				<div class="hint">The oldest record number for the group.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="last_record">Last Record id:</label></td>
-			<td>
-				<input class="small" id="last_record" name="last_record" type="text" value="{$group.last_record}" />
-				<div class="hint">The newest record number for the group.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="active">Active:</label></td>
-			<td>
-				{html_radios id="active" name='active' values=$yesno_ids output=$yesno_names selected=$group.active separator='<br />'}
-				<div class="hint">Inactive groups will not have headers downloaded for them.</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="backfill">Backfill:</label></td>
-			<td>
-				{html_radios id="backfill" name='backfill' values=$yesno_ids output=$yesno_names selected=$group.backfill separator='<br />'}
-				<div class="hint">If set to false, backfill.php will ignore this group. This works even if the above setting is no.</div>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" value="Save" />
-			</td>
-		</tr>
-	</table>
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/group-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/group-list.tpl
deleted file mode 100644
index 741885e15..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/group-list.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="group_list">
-	<h1>{$page->title}</h1>
-	<p>
-		Below is a list of all usenet groups available to be indexed. Click 'Activate' to start indexing a group. Backfill works independently of active.
-	</p>
-	{if $grouplist}
-		<div style="position:relative;margin-bottom:5px;">
-			<form name="groupsearch" action="" style="margin-bottom:5px;">
-				<label for="groupname">Group</label>
-				<input id="groupname" type="text" name="groupname" value="{$groupname}" size="15" />
-				&nbsp;&nbsp;
-				<input type="submit" value="Go" />
-			</form>
-			<div style="position:absolute;">
-				{$pager}
-			</div>
-			<div style="text-align:center;">
-				<a title="Reset all groups" href="javascript:ajax_all_reset()" class="all_reset" onclick="return confirm('Are you sure? This will reset all groups, deleting all collections/binaries/parts (does not delete releases).');" >Reset all</a> |
-				<a title="Delete all releases, collections/binaries/parts from all groups" href="javascript:ajax_all_purge()" class="all_purge" onclick="return confirm('Are you sure? This will delete all releases, collections/binaries/parts.');">Purge all</a><br />
-				<a title="List all groups Activated for Update_Binaries" href="{$smarty.const.WWW_TOP}/group-list-active.php">Active Groups</a> |
-				<a title="List all groups NOT Activated for Update_Binaries" href="{$smarty.const.WWW_TOP}/group-list-inactive.php">Inactive Groups</a> |
-				<a title="List all groups" href="{$smarty.const.WWW_TOP}/group-list.php">All Groups</a>
-			</div>
-		</div>
-		<div id="message">msg</div>
-		<table style="width:100%;" class="data highlight Sortable">
-			<tr>
-				<th>group</th>
-				<th>First Post</th>
-				<th>Last Post</th>
-				<th>last updated</th>
-				<th>active</th>
-				<th>Pre Filter</th>
-				<th>backfill</th>
-				<th>releases</th>
-				<th>Min Files</th>
-				<th>Min Size</th>
-				<th>Backfill Days</th>
-				<th>options</th>
-			</tr>
-			{foreach from=$grouplist item=group}
-				<tr id="grouprow-{$group.id}" class="{cycle values=",alt"}">
-					<td>
-						<a href="{$smarty.const.WWW_TOP}/group-edit.php?id={$group.id}">{$group.name|replace:"alt.binaries":"a.b"}</a>
-						<div class="hint">{$group.description}</div>
-					</td>
-					<td class="less">{$group.first_record_postdate}<br />{$group.first_record_postdate|timeago}</td>
-					<td class="less">{$group.last_record_postdate}<br />{$group.last_record_postdate|timeago}</td>
-					<td class="less">{$group.last_updated|timeago} ago</td>
-					<td class="less" id="group-{$group.id}">{if $group.active=="1"}<a href="javascript:ajax_group_status({$group.id}, 0)" class="group_active">Deactivate</a>{else}<a href="javascript:ajax_group_status({$group.id}, 1)" class="group_deactive">Activate</a>{/if}</td>
-					<td class="less">{if $group.regexmatchonly == "1"}Yes{else}No{/if}</td>
-					<td class="less" id="backfill-{$group.id}">{if $group.backfill=="1"}<a href="javascript:ajax_backfill_status({$group.id}, 0)" class="backfill_active">Deactivate</a>{else}<a href="javascript:ajax_backfill_status({$group.id}, 1)" class="backfill_deactive">Activate</a>{/if}</td>
-					<td class="less">{$group.num_releases}</td>
-					<td class="less">{if $group.minfilestoformrelease==""}n/a{else}{$group.minfilestoformrelease}{/if}</td>
-					<td class="less">{if $group.minsizetoformrelease==""}n/a{else}{$group.minsizetoformrelease|fsize_format:"MB"}{/if}</td>
-					<td class="less">{$group.backfill_target}</td>
-					<td class="less" id="groupdel-{$group.id}">
-						<a title="Reset this group" href="javascript:ajax_group_reset({$group.id})" class="group_reset">Reset</a> |
-						<a title="Delete this group and all of its releases" href="javascript:ajax_group_delete({$group.id})" class="group_delete" onclick="return confirm('Are you sure? This will delete the group from this list.');" >Delete</a> |
-						<a title="Remove all releases from this group" href="javascript:ajax_group_purge({$group.id})" class="group_purge" onclick="return confirm('Are you sure? This will delete all releases, binaries/parts in the selected group');" >Purge</a>
-					</td>
-				</tr>
-			{/foreach}
-		</table>
-		<div style="position:relative;margin-top:5px;">
-			<div style="position:absolute;">
-				{$pager}
-			</div>
-			<div style="text-align:center;">
-				<form name="groupsearch" action="" style="margin-bottom:5px;">
-					<label for="groupname">Group</label>
-					<input id="groupname" type="text" name="groupname" value="{$groupname}" size="15" />
-					&nbsp;&nbsp;
-					<input type="submit" value="Go" />
-				</form>
-				<a title="Reset all groups" href="javascript:ajax_all_reset()" class="all_reset" onclick="return confirm('Are you sure? This will reset all groups, deleting all collections/binaries/parts (does not delete releases).');" >Reset all</a> |
-				<a title="Delete all releases, binaries/parts from all groups" href="javascript:ajax_all_purge()" class="all_purge" onclick="return confirm('Are you sure? This will delete all releases, collections/binaries/parts.');">Purge all</a><br />
-				<a title="List all groups Activated for Update_Binaries" href="{$smarty.const.WWW_TOP}/group-list-active.php">Active Groups</a> |
-				<a title="List all groups NOT Activated for Update_Binaries" href="{$smarty.const.WWW_TOP}/group-list-inactive.php">Inactive Groups</a> |
-				<a title="List all groups" href="{$smarty.const.WWW_TOP}/group-list.php">All Groups</a>
-			</div>
-		</div>
-	{else}
-		<p>No groups available (eg. none have been added).</p>
-	{/if}
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/index.tpl b/lib/copy_this/www/templates/nntmux/views/admin/index.tpl
deleted file mode 100644
index 7ecb75819..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/index.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-<div style="{if $site->showadminwelcome != "1"}display:none;{/if}" id="adminwelcome">
-	<p>
-		Welcome to newznab. In this area you will be able to configure many aspects of your site.<br>
-		If this is your first time here, you need to start the scripts that will fill newznab.
-	</p>
-
-	<ol style="list-style-type:decimal; line-height: 180%;">
-	<li style="margin-bottom: 15px;">Configure your <a href="{$smarty.const.WWW_TOP}/site-edit.php">site options</a>. The defaults will work fine.</li>
-	<li style="margin-bottom: 15px;">There is a default list of usenet groups provided. To get started, you will need to <a href="{$smarty.const.WWW_TOP}/group-list.php">activate some groups</a>. <u>Do not</u> activate every group if its your first time setting this up. Try one or two first.
-	You can also <a href="{$smarty.const.WWW_TOP}/group-edit.php">add your own groups</a> manually.</li>
-	<li style="margin-bottom: 15px;">Next you will want to get the latest headers. <b>This should be done from the command line</b>, using the linux or windows shell scripts found in /misc/update_scripts/nix_scripts (or win_scripts for windows users), as it can take some time. If this is your first time dont bother with the init scripts just open a command prompt...
-	<div style="padding-left:20px; font-family:courier;">cd /var/www/newznab/misc/update_scripts<br/>php update_binaries.php</div>
-	</li>
-	<li style="margin-bottom: 15px;">After obtaining headers, the next step is to create releases. <b>This is best done from the command line</b> using the linux or windows shell scripts found in /misc/update_scripts/nix_scripts (or win_scripts for windows users). If this is your first time dont bother with the init scripts just open a command prompt...
-	<div style="padding-left:20px; font-family:courier;">cd /var/www/newznab/misc/update_scripts<br/>php update_releases.php</div>
-	</li>
-	<li style="margin-bottom: 15px;">If you intend to keep using newznab, it is best to sign up for your own api keys from <a href="http://www.themoviedb.org/account/signup">tmdb</a>, <a href="http://developer.rottentomatoes.com/">rotten tomatoes</a> and <a href="http://aws.amazon.com/">amazon</a>.</li>
-	<li>If you like newznab and intend to continue using it, please consider <a href="http://www.newznab.com/">sending a donation</a> to the team who write and maintain it.</li>
-	</ol>
-
-	<a onclick="ajax_welcome_msg(false); return false;" href="#">hide this welcome message</a>
-</div>
-
-<div style="{if $site->showadminwelcome != "0"}display:none;{/if}" id="adminhome">
-
-	<h2>Status Alerts</h2>
-	
-	{if $statusmsgs|@count > 0}
-	
-		<table class="data" style="width:75%;">
-			<tr>
-				<th style="width:20px" class="left">#</th>
-				<th class="left">Item</th>
-				<th style="width:20px"></th>
-			</tr>
-			{foreach from=$statusmsgs item=result name=result}
-				<tr class="{cycle values=",alt"}">
-					<td>{$smarty.foreach.result.iteration}</td>
-					<td>{$result.msg}</td>
-					<td>{if $result.url != ""}<a href="{$result.url}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/icons/{$result.icon}.png"/></a>{/if}</td>
-				</tr>
-			{/foreach}
-		</table>
-	{else}
-		<p>There are currently no status alerts.</p>
-	{/if}
-	
-	<br/>
-	<a onclick="ajax_welcome_msg(true); return false;" href="#">show welcome message</a>
-</div>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/menu-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/menu-edit.tpl
deleted file mode 100644
index 8c1a4faa4..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/menu-edit.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input type="hidden" name="id" value="{$menu.id}" />
-		<input id="title" class="long" name="title" type="text" value="{$menu.title|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="href">Href</label>:</td>
-	<td>
-		<input id="href" class="long" name="href" type="text" value="{$menu.href|escape:'htmlall'}" />
-		<div class="hint">Use full http:// path for external URLs, otherwise use no prefix.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tooltip">Tooltip</label>:</td>
-	<td>
-		<input id="tooltip" class="long" name="tooltip" type="text" value="{$menu.tooltip|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="menueval">Evaluate</label>:</td>
-	<td>
-		<input id="menueval" class="long" name="menueval" type="text" value="{$menu.menueval|escape:'htmlall'}" />
-		<div class="hint">Smarty expression returning -1 if the menu item should be disabled.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="role">Role</label>:</td>
-	<td>
-		{html_radios id="role" name='role' values=$role_ids output=$role_names selected=$menu.role separator='<br />'}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="ordinal">Ordinal</label>:</td>
-	<td>
-		<input id="ordinal" class="short" name="ordinal" type="text" value="{$menu.ordinal}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="newwindow">New Window</label>:</td>
-	<td>
-		{html_radios id="newwindow" name='newwindow' values=$yesno_ids output=$yesno_names selected=$menu.newwindow separator='<br />'}
-		<div class="hint">Whether the menu item should open in a new window.</div>
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/menu-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/menu-list.tpl
deleted file mode 100644
index 004bfc932..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/menu-list.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $menulist}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>name</th>
-		<th>href</th>
-		<th>tooltip</th>
-		<th>role</th>
-		<th>ordinal</th>
-		<th>new window</th>
-		<th>options</th>
-	</tr>
-
-	{foreach from=$menulist item=menu}
-	<tr class="{cycle values=",alt"}">
-		<td title="Edit {$menu.title}"><a href="{$smarty.const.WWW_TOP}/menu-edit.php?id={$menu.id}">{$menu.title|escape:"htmlall"}</a></td>
-		<td>{$menu.href}</td>
-		<td>{$menu.tooltip}</td>
-		<td>{if $menu.role == 0}Guests{elseif $menu.role == 1}Users{elseif $menu.role == 2}Admin{else}Other{/if}</td>
-		<td class="mid">{$menu.ordinal}</td>
-		<td class="mid">{if $menu.newwindow == 1}Yes{else}No{/if}</td>
-		<td><a href="{$smarty.const.WWW_TOP}/menu-delete.php?id={$menu.id}">delete</a></td>
-	</tr>
-	{/foreach}
-
-</table>
-{else}
-<p>No menus available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/movie-add.tpl b/lib/copy_this/www/templates/nntmux/views/admin/movie-add.tpl
deleted file mode 100644
index f7e0b9537..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/movie-add.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}" method="post">
-
-
-<table class="input">
-
-<tr>
-	<td></td>
-	<td>Enter the full 7 digit IMDB id into the box below and click Add.</td>
-</tr>
-
-<tr>
-	<td><label for="title">IMDB id</label>:</td>
-	<td>
-		<input id="id" class="long" name="id" type="text" value="" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Add" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/movie-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/movie-edit.tpl
deleted file mode 100644
index 526f9b5a5..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/movie-edit.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="post">
-
-<input type="hidden" name="id" value="{$movie.imdbid}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="title">IMDB id</label>:</td>
-	<td>{$movie.imdbid}</td>
-</tr>
-
-<tr>
-	<td><label for="title">TMDb id</label>:</td>
-	<td>{$movie.tmdbID}</td>
-</tr>
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input id="title" class="long" name="title" type="text" value="{$movie.title|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tagline">Tagline</label>:</td>
-	<td>
-		<input id="tagline" class="long" name="tagline" type="text" value="{$movie.tagline|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="plot">Plot</label>:</td>
-	<td>
-		<textarea class="autosize" id="plot" name="plot">{$movie.plot|escape:'htmlall'}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="year">Year</label>:</td>
-	<td>
-		<input id="year" class="short" name="year" type="text" value="{$movie.year|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="rating">Rating</label>:</td>
-	<td>
-		<input id="rating" class="short" name="rating" type="text" value="{$movie.rating|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="genre">Genre</label>:</td>
-	<td>
-		<input id="genre" class="long" name="genre" type="text" value="{$movie.genre|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="director">Director</label>:</td>
-	<td>
-		<input id="director" class="long" name="director" type="text" value="{$movie.director|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="actors">Actors</label>:</td>
-	<td>
-		<textarea class="autosize" id="actors" name="actors">{$movie.actors|escape:'htmlall'}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="language">Language</label>:</td>
-	<td>
-		<input id="language" class="long" name="language" type="text" value="{$movie.language|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="cover">Cover Image</label>:</td>
-	<td>
-		<input type="file" id="cover" name="cover" />
-		{if $movie.cover == 1}
-			<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/covers/movies/{$movie.imdbid}-cover.jpg" alt="" />
-		{/if}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="backdrop">Backdrop Image</label>:</td>
-	<td>
-		<input type="file" name="backdrop" />
-		{if $movie.backdrop == 1}
-			<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/covers/movies/{$movie.imdbid}-backdrop.jpg" alt="" />
-		{/if}
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/movie-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/movie-list.tpl
deleted file mode 100644
index dd02a1528..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/movie-list.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $movielist}
-
-<div style="float:right;">
-
-	<form name="moviesearch" action="">
-		<label for="moviename">Title</label>
-		<input id="moviename" type="text" name="moviename" value="{$moviename}" size="15" />
-		&nbsp;&nbsp;
-		<input type="submit" value="Go" />
-	</form>
-</div>
-
-{$pager}
-
-<br/><br/>
-
-<table style="width:100%;margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>IMDB id</th>
-		<th>TMDb id</th>
-		<th>Title</th>
-		<th class="mid">Cover</th>
-		<th class="mid">Backdrop</th>
-		<th class="mid" style="width:80px;">Created</th>
-		<th style="width:100px;" class="mid">options</th>
-	</tr>
-
-	{foreach from=$movielist item=movie}
-	<tr class="{cycle values=",alt"}">
-		<td class="less"><a href="http://www.imdb.com/title/tt{$movie.imdbid}" title="View in IMDB">{$movie.imdbid}</a></td>
-		<td class="less"><a href="http://www.themoviedb.org/movie/{$movie.tmdbID}" title="View in TMDb">{$movie.tmdbID}</a></td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/movie-edit.php?id={$movie.imdbid}">{$movie.title} ({$movie.year})</a></td>
-		<td class="less mid">{if $movie.cover == "1"}Yes{else}No{/if}</td>
-		<td class="less mid">{if $movie.backdrop == "1"}Yes{else}No{/if}</td>
-		<td class="less mid">{$movie.createddate|date_format}</td>
-		<td class="mid">
-			<a title="update" href="{$smarty.const.WWW_TOP}/movie-add.php?id={$movie.imdbid}&amp;update=1">update</a> |
-			<a title="delete" href="{$smarty.const.WWW_TOP}/movie-delete.php?id={$movie.imdbid}">delete</a>
-		</td>
-	</tr>
-	{/foreach}
-
-</table>
-    <br/>
-    {$pager}
-{else}
-<p>No Movies available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/music-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/music-edit.tpl
deleted file mode 100644
index 985c0fc8b..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/music-edit.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="post">
-
-<input type="hidden" name="id" value="{$music.id}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input id="title" class="long" name="title" type="text" value="{$music.title|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="asin">ASIN</label>:</td>
-	<td>
-		<input id="asin" name="asin" type="text" value="{$music.asin|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="url">URL</label>:</td>
-	<td>
-		<input id="url" class="long" name="url" type="text" value="{$music.url|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="salesrank">Sales Rank</label>:</td>
-	<td>
-		<input id="salesrank" class="short" type="text" name="salesrank" value="{$music.salesrank|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="artist">Artist</label>:</td>
-	<td>
-		<input id="artist" class="long" name="artist" type="text" value="{$music.artist|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="publisher">Publisher</label>:</td>
-	<td>
-		<input id="publisher" class="long" name="publisher" type="text" value="{$music.publisher|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="releasedate">Release Date</label>:</td>
-	<td>
-		<input id="releasedate" name="releasedate" type="text" value="{$music.releasedate|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="year">Year</label>:</td>
-	<td>
-		<input id="year" class="short" name="year" type="text" value="{$music.year|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="genre">Genre</label>:</td>
-	<td>
-		<select id="genre" name="genre">
-		{foreach from=$genres item=gen}
-			<option {if $gen.id == $music.genreID}selected="selected"{/if} value="{$gen.id}">{$gen.title|escape:'htmlall'}</option>
-		{/foreach}
-		</select>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tracks">Tracks</label>:</td>
-	<td>
-		<textarea class="autosize" id="tracks" name="tracks">{$music.tracks|escape:'htmlall'}</textarea>
-		<div class="hint">Tracks separated by | (pipe) delimeter</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="cover">Cover Image</label>:</td>
-	<td>
-		<input type="file" id="cover" name="cover" />
-		{if $music.cover == 1}
-			<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/../covers/music/{$music.id}.jpg" alt="" />
-		{/if}
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/music-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/music-list.tpl
deleted file mode 100644
index 1d80c484a..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/music-list.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $musiclist}
-{$pager}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>id</th>
-		<th>Title</th>
-		<th>Artist</th>
-		<th class="mid">Created</th>
-	</tr>
-
-	{foreach from=$musiclist item=music}
-	<tr class="{cycle values=",alt"}">
-		<td class="less">{$music.id}</td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/music-edit.php?id={$music.id}">{$music.title} ({$music.year})</a></td>
-		<td>{$music.artist}</td>
-		<td width="80" class="mid">{$music.createddate|date_format}</td>
-	</tr>
-	{/foreach}
-
-</table>
-
-<br/>
-{$pager}
-{else}
-<p>No Music available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/nzb-export.tpl b/lib/copy_this/www/templates/nntmux/views/admin/nzb-export.tpl
deleted file mode 100644
index 97e2a90aa..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/nzb-export.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<p>
-Export nzbs from the system into a folder. Specify the full file path to a folder.
-<br/>
-If you are exporting a large number of nzb files, run this script from the command line and pass in the folder path as the first argument. e.g. php scriptname outputpath from(optional) to(optional) groupid(optional use -1) categoryid(optional)<br/>
-<span style="font-family:courier;display:block;padding:5px 0 15px 0;">
-	php admin/nzb-export.php /path/to/export/into 01/01/2008 01/01/2010 -1 1050
-</span>
-
-</p>
-
-
-<form action="{$SCRIPT_NAME}" method="POST">
-
-<table class="input">
-
-<tr>
-	<td><label for="folder">Folder</label>:</td>
-	<td>
-		<input id="folder" class="long" name="folder" type="text" value="{$folder}" />
-		<div class="hint">Windows file paths should be specified with forward slashes e.g. c:/temp/</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="postfrom">Posted Between</label>:</td>
-	<td>
-		<input id="postfrom" class="date" name="postfrom" type="text" value="{$fromdate}" />
-		<label for="postto"> and </label>
-		<input id="postto" class="date" name="postto" type="text" value="{$todate}" />
-		<div class="hint">Posted to usenet inbetween a date range specified in the format dd/mm/yyyy</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="group">Group</label>:</td>
-	<td>
-		{html_options id="group" name='group' options=$grouplist selected=$group}
-		<div class="hint">Posted to this newsgroup</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="categoryid">Category</label>:</td>
-	<td>
-		{html_options id="categoryid" name='categoryid' options=$catlist selected=$cat}
-		<div class="hint">Posted to this category</div>
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Export" />
-	</td>
-</tr>
-
-</table>
-
-</form>
-
-<div>
-{$output}
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/nzb-import.tpl b/lib/copy_this/www/templates/nntmux/views/admin/nzb-import.tpl
deleted file mode 100644
index e15c29352..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/nzb-import.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-<h1>{$page->title}</h1>
-<p>
-	Import NZB's from a folder or via the browser into the system. Specify the full file path to a folder containing NZB's.
-	<br />
-	Importing will add the release to your database, compress the NZB and store it in the nzbfiles/ folder.
-</p>
-<ul>
-	<li>If you are importing a large number of NZB files, run the nzb-import.php script in misc/testing/ from the command line and pass in the folder path as the first argument.</li>
-	<li>If you are running the script in misc/testing/ from the command line you can pass "true" (no quotes) as the second argument to use the NZB filename as the release name.</li>
-	<li>Groups contained in the NZB's should be added to the site before the import is run.</li>
-	<li>If you re-import the same NZB it will not be added a second time.</li>
-	<li>If imported sucessfully the NZB will be deleted.</li>
-</ul>
-<fieldset>
-	<legend>Import From Directory</legend>
-	<form action="{$SCRIPT_NAME}#results" method="POST">
-		<table class="input">
-			<tr>
-				<td style="width:100px;"><label for="folder">Folder:</label></td>
-				<td>
-					<input id="folder" class="long" name="folder" type="text" value="" />
-					<div class="hint">Windows file paths should be specified with forward slashes e.g. c:/temp/</div>
-				</td>
-			</tr>
-			<tr>
-				<td><label for="usefilename">Use Filename:</label></td>
-				<td>
-					<input type="checkbox" name="usefilename" />
-					<div class="hint">Use the NZB's filename as the release name. Else the name inside the NZB will be used.</div>
-				</td>
-			</tr>
-			<tr>
-				<td><label for="deleteNZB">Delete NZBs:</label></td>
-				<td>
-					<input type="checkbox" name="deleteNZB" />
-					<div class="hint">Delete the NZB when we have successfully imported it?</div>
-				</td>
-			</tr>
-			<tr>
-				<td></td>
-				<td>
-					<input type="submit" value="Import" />
-				</td>
-			</tr>
-		</table>
-	</form>
-</fieldset>
-<fieldset>
-	<legend>Import From Browser</legend>
-	<form action="{$SCRIPT_NAME}#results" method="POST" enctype="multipart/form-data">
-		<table class="input">
-			<tr>
-				<td style="width:100px;"><label for="uploadedfiles[]">File:</label></td>
-				<td>
-					<input name="uploadedfiles[]" type="file" class="multi accept-nzb"/>
-					<div class="hint">Select one or more .nzb files.</div>
-				</td>
-			</tr>
-			<tr>
-				<td></td>
-				<td>
-					<b>These NZBs will not be deleted once imported.</b><br />
-					<input type="submit" value="Import" />
-				</td>
-			</tr>
-		</table>
-</fieldset>
-{if $output != ""}
-	<div>
-		<a id="results"></a>
-		<h1>Import Results</h1>
-		{$output}
-	</div>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/preview-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/preview-list.tpl
deleted file mode 100644
index bf1233800..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/preview-list.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-<h1>{$page->title}</h1>
-
-<label for="previewcat"> Select Category :
-<select id="previewcat" name="previewcat">
-    <option class="grouping" value="-1">All</option>
-    {foreach from=$catlist item=parentcat}
-        <option {if $previewcat==$parentcat.id}selected="selected"{/if} class="grouping" value="{$parentcat.id}">{$parentcat.title}</option>
-        {foreach from=$parentcat.subcatlist item=subcat}
-            <option {if $previewcat==$subcat.id}selected="selected"{/if} value="{$subcat.id}">&nbsp;&nbsp;{$subcat.title}</option>
-        {/foreach}
-    {/foreach}
-</select>
-</label>
-
-<br/><br/>
-
-{if $releaselist}
-{$pager}
-
-<table style="margin-top:10px;" class="data highlight">
-
-	<tr>
-		<th>preview</th>
-		<th>options</th>
-	</tr>
-
-	{foreach from=$releaselist item=release}
-	<tr class="{cycle values=",alt"}">
-		<td title="{$release.name}">
-            <img src="{$smarty.const.WWW_TOP}/../covers/preview/{$release.guid}_thumb.jpg" />
-            <br/>
-            <a href="{$smarty.const.WWW_TOP}/release-edit.php?id={$release.id}">{$release.searchname|escape:"htmlall"|wordwrap:75:"\n":true}</a>
-        </td>
-		<td><!--<a href="{$smarty.const.WWW_TOP}/preview-delete.php?id={$release.id}">delete</a>--></td>
-	</tr>
-	{/foreach}
-
-</table>
-    <br/>
-    {$pager}
-{else}
-<p>No results.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/rage-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/rage-edit.tpl
deleted file mode 100644
index bfc1a009e..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/rage-edit.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<a href="?action=update&id={$rage.id}">Update from TV Rage</a>
-
-<br/><br/>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<input type="hidden" name="from" value="{$smarty.get.from}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="rageid">Rage Id</label>:</td>
-	<td>
-		<input type="hidden" name="id" value="{$rage.id}" />
-		<input id="rageid" class="short" name="rageid" type="text" value="{$rage.rageid}" />
-		<div class="hint">The numeric TVRage Id.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="releasetitle">Show Name</label>:</td>
-	<td>
-		<input id="releasetitle" class="long" name="releasetitle" type="text" value="{$rage.releasetitle|escape:'htmlall'}" />
-		<div class="hint">The title of the TV show.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="description">Description</label>:</td>
-	<td>
-		<textarea class="autosize" id="description" name="description">{$rage.description|escape:'htmlall'}</textarea>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="genre">Show Genres</label>:</td>
-	<td>
-		<input id="genre" class="long" name="genre" type="text" value="{$rage.genre|escape:'htmlall'}" />
-		<div class="hint">The genres for the TV show. Separated by pipes ( | )</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="country">Show Country</label>:</td>
-	<td>
-		<input id="country" name="country" type="text" value="{$rage.country|escape:'htmlall'}" maxlength="2" />
-		<div class="hint">The country for the TV show.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="imagedata">Series Image</label>:</td>
-	<td>
-		{if $rage.imgdata != ""}
-			<img style="max-width:200px; display:block;" src="{$smarty.const.WWW_TOP}/../getimage?type=tvrage&id={$rage.id}">
-		{/if}
-		<input type="file" id="imagedata" name="imagedata">
-		<div class="hint">Shown in the TV series view page.</div>
-	</td>
-</tr>
-
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-		&nbsp;
-		<input onclick="doDelete(); return false;" type="button" value="Delete" />
-	</td>
-</tr>
-
-</table>
-
-</form>
-
-<script>
-function doDelete()
-{
-	if (confirm('Are you sure?'))
-	{
-		window.location = "rage-delete.php?id={$rage.id}&from={$smarty.get.from}";
-	}
-}
-</script>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/rage-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/rage-list.tpl
deleted file mode 100644
index 1fd3031bc..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/rage-list.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $tvragelist}
-
-<div style="float:right;">
-
-	<form name="ragesearch" action="">
-		<label for="ragename">Title</label>
-		<input id="ragename" type="text" name="ragename" value="{$ragename}" size="15" />
-		&nbsp;&nbsp;
-		<input type="submit" value="Go" />
-	</form>
-</div>
-
-{$pager}
-
-<br/><br/>
-
-<table style="width:100%;margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th style="width:50px;">rageid</th>
-		<th>title</th>
-		<th class="mid" style="width:80px;">date</th>
-		<th class="mid">options</th>
-	</tr>
-
-	{foreach from=$tvragelist item=tvrage}
-	<tr class="{cycle values=",alt"}">
-		<td class="less"><a href="http://www.tvrage.com/shows/id-{$tvrage.rageid}" title="View in TvRage">{$tvrage.rageid}</a></td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/rage-edit.php?id={$tvrage.id}">{$tvrage.releasetitle|escape:"htmlall"}</a></td>
-		<td class="mid less">{$tvrage.createddate|date_format}</td>
-		<td class="mid"><a title="delete this rage entry" href="{$smarty.const.WWW_TOP}/rage-delete.php?id={$tvrage.id}">delete</a> | <a title="remove this rageid from all releases" href="{$smarty.const.WWW_TOP}/rage-remove.php?id={$tvrage.rageid}">remove</a></td>
-	</tr>
-	{/foreach}
-
-</table>
-
-    <br/>
-    {$pager}
-
-{else}
-<p>No TVRage episodes available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/rage-remove.tpl b/lib/copy_this/www/templates/nntmux/views/admin/rage-remove.tpl
deleted file mode 100644
index 9f31ea123..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/rage-remove.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-Removed rageid from {$numtv} releases.
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/regex-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/regex-edit.tpl
deleted file mode 100644
index b7f16e775..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/regex-edit.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $regex.id > 0 && $regex.id < 100000 && $site->reqidurl != ""}
-	<div class="error">Warning: Editing system regex, these changes will be overwritten next update releases.</div>
-{/if}
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-
-<tr>
-	<td>Group:</td>
-	<td>
-		<input type="hidden" name="id" value="{$regex.id}" />
-		<input id="groupname" name="groupname" value="{$regex.groupname|escape:html}" />
-		<div class="hint">The full name of a valid newsgroup. This value can be a regular expression. Use .* to apply regex to all newsgroups.</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Regex:</td>
-	<td>
-		<textarea class="autosize" id="regex" name="regex" >{$regex.regex|escape:html}</textarea>
-		<div class="hint">The regex to be applied.<br />
-		Regex requires at least 1 named capturing group in the form of (?P&lt;name&gt;) to work.<br />
-		If the subjects contains the number of parts (ie [1/10]) then it is wise to also use (?P&lt;parts&gt;) to match the parts.
-		</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Description:</td>
-	<td>
-		<textarea class="autosize" id="description" name="description" >{$regex.description|escape:html}</textarea>
-		<div class="hint">A description for this regex</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="category">Category</label>:</td>
-	<td>
-		{html_options id="category" name=category options=$catlist selected=$regex.categoryid}
-		<div class="hint">If this regex indicates the release category then supply it here. If left blank the standard method of determining the category will apply.</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Ordinal:</td>
-	<td>
-		<input id="ordinal" class="short" name="ordinal" value="{$regex.ordinal|escape:html}" />
-		<div class="hint">The zero-based order in which the regex should be applied.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="status">Active</label>:</td>
-	<td>
-		{html_radios id="status" name='status' values=$status_ids output=$status_names selected=$regex.status separator='<br />'}
-		<div class="hint">Only active regexes are applied during the release process.</div>
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/regex-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/regex-list.tpl
deleted file mode 100644
index 63a2f3e6c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/regex-list.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<p>
-	Regexs are applied to group message subjects into releases. The capture groups are named to hold the release name and number of parts.
-	They are applied to messages from that group in order, then any general regexs are applied in order afterwards.
-</p>
-<p>
-	The group name is a regular expression, so if you want to apply a regex to a number of groups then append an asterix a.b.blah.* to the end,
-    <br/> or use a.b.group1|a.b.group2
-</p>
-
-<div id="message">msg</div>
-
-{html_options id="regexGroupSelect" name=category options=$reggrouplist selected=$selectedgroup}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th style="width:20px;">id</th>
-		<th>group</th>
-		<th>regex</th>
-		<th>poster</th>
-		<th>category</th>
-		<th>status</th>
-		<th>releases</th>
-		<th>last match</th>
-		<th>ordinal</th>
-		<th style="display:none;width:60px;">Order</th>
-		<th style="width:75px;">Options</th>
-	</tr>
-
-	{foreach from=$regexlist item=regex}
-	<tr id="row-{$regex.id}" class="{cycle values=",alt"}">
-		<td><a id="{$regex.id}"></a>{$regex.id}</td>
-		<td title="{$regex.description}">{if $regex.groupname==""}all{else}{$regex.groupname|replace:"alt.binaries":"a.b"}{/if}</td>
-		<td title="Edit regex"><a href="{$smarty.const.WWW_TOP}/regex-edit.php?id={$regex.id}">{$regex.regex|escape:html}</a><br>
-			{$regex.description}</td>
-		<td>{$regex.poster}</td>
-		<td title="{$regex.categoryid}">{if $regex.categoryid!=""}{$regex.categoryTitle}{/if}</td>
-		<td>{if $regex.status==1}active{else}disabled{/if}</td>
-		<td class="right">{$regex.num_releases}</td>
-		<td class="mid">{$regex.max_releasedate}</td>
-		<td style="text-align:center;">{$regex.ordinal}</td>
-		<td style="display:none;"><a title="Move up" href="#">up</a> | <a title="Move down" href="#">down</a></td>
-		<td><a href="javascript:ajax_releaseregex_delete({$regex.id})">delete</a>{if $regex.groupname != ""} | <a href="{$smarty.const.WWW_TOP}/regex-test.php?action=test&groupname={$regex.groupname}&regex={$regex.regex|urlencode}">test</a>{/if}</td>
-	</tr>
-	{/foreach}
-
-
-</table>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/regex-submit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/regex-submit.tpl
deleted file mode 100644
index 76e6b8c53..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/regex-submit.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<p>Use this feature to submit any regex you have added locally to newznab. We'll have a look at integrating them into the master list. No data other than regex's with an id greater than 10000 will be sent.</p>
-
-{if $upload_status eq 'OK'}
-<div style="background-color: #CDEB8B; color: #fff; padding: 20px">
-  <strong>Your regexes were uploaded. Thank you for contributing.</strong>
-</div>
-<br />
-{/if}
-
-{if $upload_status eq 'BAD'}
-<div style="background-color: #CC0000; color: #fff; padding: 20px">
-  <strong>Failed to upload your regexes :-( - please try again.</strong>
-</div>
-<br />
-{/if}
-
-{if $regex_error}
-<p><strong>No avalible user regex's. Please add some and visit this page again.</strong></p>
-{else}
-<form action="{$SCRIPT_NAME}" method="post" name="submit_regex">
-  <input type="hidden" name="regex_submit_please" value="1" />
-  <input type="submit" name="submit" value="Submit regular expressions" />
-</form>
-
-<br />
-
-<p>
-  <strong>Regexes to be submitted:</strong>
-  <br />
-  <pre>
-  {$regex_contents|print_r}
-  </pre>
-</p>
-{/if}
-
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/regex-test.tpl b/lib/copy_this/www/templates/nntmux/views/admin/regex-test.tpl
deleted file mode 100644
index 4e1e40fac..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/regex-test.tpl
+++ /dev/null
@@ -1,146 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<form action="{$SCRIPT_NAME}" method="GET">
-<input type="hidden" name="action" value="test" />
-<table class="input">
-
-<tr>
-	<td><label for="groupname">Group</label>:</td>
-	<td>
-		<input type="text" id="groupname" name="groupname" value="{$groupname|escape:html}" />
-		or
-		<select name="groupid">
-		{html_options values=$gid output=$gnames selected=$groupID}
-		</select>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="regex">Regex</label>:</td>
-	<td>
-		<input type="text" id="regex" name="regex" class="long" value="{$regex|escape:html}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="regex">Poster</label>:</td>
-	<td>
-		<input type="text" id="poster" name="poster" class="long" value="{$poster|escape:html}" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="checkbox" id="unreleased" name="unreleased" {if $unreleased == 'on'}checked="checked"{/if} /> <label for="unreleased">Ignore binaries that are blacklisted or already matched by an existing regex</label>
-	</td>
-</tr>
-
-<tr>
-    <td></td>
-    <td>
-        <input type="checkbox" id="matchagainstbins" name="matchagainstbins" {if $matchagainstbins == 'on'}checked="checked"{/if} /> <label for="matchagainstbins">Run regex against binaries table instead of regextesting table</label>
-    </td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Test Regex" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="{$smarty.const.WWW_TOP}/regex-edit.php?action=addtest&regex={$regex|urlencode}&groupname={$group}&poster={$poster|urlencode}">Add Regex</a>
-	</td>
-</tr>
-</table>
-
-</form>
-
-{if $matches}
-{$pager}
-    <table style="width:100%;margin-top:10px;" class="data Sortable highlight">
-        {foreach from=$matches item=match}
-
-            {if $match@iteration mod 10 == 1}
-                <tr>
-                    <th width="15%">name</th>
-                    <th width="21%">poster</th>
-                    <th width="8%">Bin Count</th>
-                    <th width="8%">Bin Size</th>
-                    <th width="10%">Regex id</th>
-                    <th width="10%">Req id</th>
-                    <th width="20%">Group</th>
-                    <th width="8%">Age</th>
-                </tr>
-            {/if}
-
-            <tr {if $match.bininfo[0].blacklistid == 1}style="background-color:#ff9;"{elseif $match.bininfo[0].regexid != ''}style="background-color:#9f6;"{else}class="{cycle values=",alt"}{/if}">
-                <td colspan="8">
-                    <table width="100%" class="innerdata">
-                        <tr>
-                            <td colspan="8"><b>{$match.name|escape:html}</b><br /><small>{$match.bininfo[0].name|escape:html}</small></td>
-                        </tr>
-                        <tr>
-                            <td width="15%"><small>{$match.catname|escape:"htmlall"}</small></td>
-                            <td width="21%"><small>{$match.bininfo[0].fromname|escape:"htmlall"}</small></td>
-                            <td width="8%"><small>{$match.bincount}{if $match.reltotalparts != ''}/{$match.reltotalparts}{/if}</small></td>
-                            <td width="8%"><small>{$match.totalsize|fsize_format:"MB"}</small></td>
-                            <td width="10%"><small><a href="regex-list.php#{$match.bininfo[0].regexid}">{$match.bininfo[0].regexid}</a></small></td>
-                            <td width="10%"><small>{$match.reqid}</small></td>
-                            <td width="20%"><small>{$match.bininfo[0].groupname|replace:"alt.binaries":"a.b"}</small></td>
-                            <td width="8%"><small>{$match.bininfo[0].date|timeago}</small></td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        {/foreach}
-
-    </table>
-<br />{$pager}
-{/if}
-
-<p>&nbsp;</p>
-
-<h2>Fetch Binaries for Testing</h2>
-
-<form action="{$SCRIPT_NAME}" method="get">
-<input type="hidden" name="action" value="fetch" />
-<table class="input">
-
-<tr>
-	<td><label for="groupname">Group</label>:</td>
-	<td>
-		<input type="text" id="groupname" name="groupname" value="{$groupname|escape:html}" />
-		or
-		<select name="groupid">
-		{html_options values=$gid output=$gnames selected=$groupID}
-		</select>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="numarticles">Articles:</td>
-	<td>
-		<input type="text" class="short" id="numarticles" name="numarticles" value="{$numarticles}" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="checkbox" id="clearexistingbins" name="clearexistingbins" /><label for="clearexistingbins">Clear existing</label>
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Fetch Binaries" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/release-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/release-edit.tpl
deleted file mode 100644
index 6f4f32260..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/release-edit.tpl
+++ /dev/null
@@ -1,162 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<input type="hidden" name="from" value="{$smarty.get.from}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="name">Original Name</label>:</td>
-	<td>
-		<input type="hidden" name="id" value="{$release.id}" />
-		<input id="name" class="long" name="name" type="text" value="{$release.name|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="searchname">Search Name</label>:</td>
-	<td>
-		<input id="searchname" class="long" name="searchname" type="text" value="{$release.searchname|escape:'htmlall'}" />
-	</td>
-</tr>
-
-{if $updatename != ""}
-<tr>
-	<td></td>
-	<td>
-		<input onclick="document.getElementById('searchname').value='{$updatename|escape:javascript}'; document.getElementById('name').value='{$updatename|escape:javascript}';return false;" type="button" value="Update Name to {$updatename|escape:'htmlall'}"/>
-	</td>
-</tr>
-{/if}
-
-<tr>
-	<td><label for="fromname">From Name</label>:</td>
-	<td>
-		<input id="fromname" class="long" name="fromname" type="text" value="{$release.fromname|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="category">Category</label>:</td>
-	<td>
-		{html_options id="category" name=category options=$catlist selected=$release.categoryid}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="totalpart">Parts</label>:</td>
-	<td>
-		<input id="totalpart" class="short" name="totalpart" type="text" value="{$release.totalpart}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="grabs">Grabs</label>:</td>
-	<td>
-		<input id="grabs" class="short" name="grabs" type="text" value="{$release.grabs}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="rageid">Tv Rage Id</label>:</td>
-	<td>
-		<input id="rageid" class="short" name="rageid" type="text" value="{$release.rageid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tvdbid">TheTVDB Id</label>:</td>
-	<td>
-		<input id="tvdbid" class="short" name="tvdbid" type="text" value="{$release.tvdbid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="anidbid">AniDB Id</label>:</td>
-	<td>
-		<input id="anidbid" class="short" name="anidbid" type="text" value="{$release.anidbid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="seriesfull">Series Full</label>:</td>
-	<td>
-		<input id="seriesfull" class="long" name="seriesfull" type="text" value="{$release.seriesfull}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="season">Season</label>:</td>
-	<td>
-		<input id="season" class="short" name="season" type="text" value="{$release.season}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="episode">Episode</label>:</td>
-	<td>
-		<input id="episode" class="short" name="episode" type="text" value="{$release.episode}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="imdbid">IMDB Id</label>:</td>
-	<td>
-		<input id="imdbid" class="long" name="imdbid" type="text" value="{$release.imdbid}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="consoleinfoid">Console Id</label>:</td>
-	<td>
-		<input id="consoleinfoid" class="short" name="consoleinfoid" type="text" value="{$release.consoleinfoid}" />
-	</td>
-</tr>
-
-<tr>
-	<td>Group:</td>
-	<td>
-		{$release.group_name}
-	</td>
-</tr>
-
-<tr>
-	<td>Regex id:</td>
-	<td>
-		{$release.regexid}
-	</td>
-</tr>
-
-<tr>
-	<td><label for="size">Size</label>:</td>
-	<td>
-		<input id="size" class="long" name="size" type="text" value="{$release.size}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="postdate">Posted Date</label>:</td>
-	<td>
-		<input id="postdate" class="long" name="postdate" type="text" value="{$release.postdate}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="adddate">Added Date</label>:</td>
-	<td>
-		<input id="adddate" class="long" name="adddate" type="text" value="{$release.adddate}" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/release-files.tpl b/lib/copy_this/www/templates/nntmux/views/admin/release-files.tpl
deleted file mode 100644
index 28a332b42..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/release-files.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-<h2>For {$rel.searchname|escape:'htmlall'}</h2>
-
-<table style="width:100%;" class="data Sortable">
-
-	<tr>
-		<th>#</th>
-		<th>filename</th>
-		<th>size</th>
-		<th>date</th>
-	</tr>
-
-	{foreach from=$binaries item=binary}
-	<tr>
-		<td width="20" title="{$binary.relpart}/{$binary.reltotalpart}">{$binary.relpart}</td>
-		<td title="{$binary.name|escape:'htmlall'}">{$binary.filename}</td>
-		<td class="less">{$binary.size|fsize_format:"MB"}</td>
-		<td class="less" title="{$binary.date}">{$binary.date|date_format}</td>
-	</tr>
-	{/foreach}
-
-</table>	
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/release-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/release-list.tpl
deleted file mode 100644
index 326cf67c5..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/release-list.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $releaselist}
-{$pager}
-
-<table style="margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>name</th>
-		<th>category</th>
-		<th>size</th>
-		<th>files</th>
-		<th>postdate</th>
-		<th>adddate</th>
-		<th>grabs</th>
-		<th>options</th>
-	</tr>
-
-	{foreach from=$releaselist item=release}
-	<tr class="{cycle values=",alt"}">
-		<td title="{$release.name}"><a href="{$smarty.const.WWW_TOP}/release-edit.php?id={$release.id}">{$release.searchname|escape:"htmlall"|wordwrap:75:"\n":true}</a></td>
-		<td class="less">{$release.category_name}</td>
-		<td class="less right">{$release.size|fsize_format:"MB"}</td>
-		<td class="less mid"><a href="release-files.php?id={$release.guid}">{$release.totalpart}</a></td>
-		<td class="less">{$release.postdate|date_format}</td>
-		<td class="less">{$release.adddate|date_format}</td>
-		<td class="less mid">{$release.grabs}</td>
-		<td><a href="{$smarty.const.WWW_TOP}/release-delete.php?id={$release.id}">delete</a></td>
-	</tr>
-	{/foreach}
-
-</table>
-    <br/>
-    {$pager}
-{else}
-<p>No releases available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/role-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/role-edit.tpl
deleted file mode 100644
index c0ed1e6cb..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/role-edit.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-<tr>
-	<td>Name:</td>
-	<td>
-		<input type="hidden" name="id" value="{$role.id}" />
-		{if $role.id != '' && $role.id < 4}{$role.name}<input type="hidden" name="name" value="{$role.name}" />{else}<input name="name" type="text" value="{$role.name}" /><div class="hint">The name of the role</div>{/if}
-	</td>
-</tr>
-
-<tr>
-	<td>Api Requests:</td>
-	<td>
-		<input name="apirequests" type="text" value="{$role.apirequests}" />
-		<div class="hint">Number of api requests allowed per 24 hour period</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Download Requests:</td>
-	<td>
-		<input name="downloadrequests" type="text" value="{$role.downloadrequests}" />
-		<div class="hint">Number of downloads allowed per 24 hour period</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Invites:</td>
-	<td>
-		<input name="defaultinvites" type="text" value="{$role.defaultinvites}" />
-		<div class="hint">Default number of invites to give users on account creation</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Can Preview:</td>
-	<td>
-		{html_radios id="canpreview" name='canpreview' values=$yesno_ids output=$yesno_names selected=$role.canpreview separator='<br />'}
-		<div class="hint">Whether the role can preview screenshots</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Can Pre:</td>
-	<td>
-		{html_radios id="canpre" name='canpre' values=$yesno_ids output=$yesno_names selected=$role.canpre separator='<br />'}
-		<div class="hint">Whether the role can view pre data</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Hide Ads:</td>
-	<td>
-		{html_radios id="hidetads" name='hidetads' values=$yesno_ids output=$yesno_names selected=$role.hideads separator='<br />'}
-		<div class="hint">Whether ad's are hidden</div>
-	</td>
-</tr>
-
-{if $role.id != ''}
-<tr>
-	<td>Is Default Role:</td>
-	<td>
-		{html_radios id="role" name='isdefault' values=$yesno_ids output=$yesno_names selected=$role.isdefault separator='<br />'}
-		<div class="hint">Make this the default role for new users</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Excluded Categories</td>
-	<td>
-		{html_options style="height:105px;" multiple=multiple name="exccat[]" options=$catlist selected=$roleexccat}
-		<div class="hint">Use Ctrl and click to exclude multiple categories. This will prevent users with this role from <br/>seeing these categories in the menu or search results.</div>
-	</td>
-</tr>
-
-{/if}
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/role-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/role-list.tpl
deleted file mode 100644
index bff3a392d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/role-list.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<table style="margin-top:10px;" class="data highlight">
-
-	<tr>
-		<th>name</th>
-		<th>request limit</th>
-		<th>download limit</th>
-		<th>invites</th>
-		<th>can preview</th>
-		<th>can pre</th>
-		<th>hide ads</th>
-		<th>default roles</th>
-		<th>options</th>
-	</tr>
-
-
-	{foreach from=$userroles item=role}
-	<tr class="{cycle values=",alt"}">
-		<td><a href="{$smarty.const.WWW_TOP}/role-edit.php?id={$role.id}">{$role.name}</a></td>
-		<td>{$role.apirequests}</td>
-		<td>{$role.downloadrequests}</td>
-		<td>{$role.defaultinvites}</td>
-		<td>{if $role.canpreview == 1}Yes{else}No{/if}</td>
-		<td>{if $role.canpre == 1}Yes{else}No{/if}</td>
-		<td>{if $role.hideads == 1}Yes{else}No{/if}</td>
-		<td>{if $role.isdefault=="1"}Yes{else}No{/if}</td>
-		<td><a href="{$smarty.const.WWW_TOP}/role-edit.php?id={$role.id}">edit</a>&nbsp;{if $role.id>"3"}<a class="confirm_action" href="{$smarty.const.WWW_TOP}/role-delete.php?id={$role.id}">delete</a>{/if}</td>
-	</tr>
-	{/foreach}
-
-
-</table>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/sharing.tpl b/lib/copy_this/www/templates/nntmux/views/admin/sharing.tpl
deleted file mode 100644
index 20b30931d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/sharing.tpl
+++ /dev/null
@@ -1,197 +0,0 @@
-<h1>{$page->title}</h1>
-<div style="width:700px">
-	<strong>
-		<strong>
-			Note: If you are running nntpproxy you will not be able to upload comments, turn off the post option if you are using it.<br />
-			If you turn on or off the Alternate NNTP provider you will need to click the reset button to reset sharing settings.
-		</strong>
-	</strong>
-	<br />
-	<div id="message" style="width:717px;">msg</div>
-	{if $local}
-		<form action="{$SCRIPT_NAME}" method="post">
-			<fieldset style="width:717px;">
-				<legend>Local sharing settings.</legend>
-				<table class="input">
-					<tr>
-						<td style="width: 100px;"><label for="sharing_name">Site Name:</label></td>
-						<td>
-							<input id="sharing_name" class="long" name="sharing_name" type="text" value="{$local.site_name}" />
-							<div>This is your site name, changing this will update other sites running sharing also, it must not contain spaces (use underscores _).</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width: 100px;"><label for="sharing_maxpush">Max Uploads:</label></td>
-						<td>
-							<input id="sharing_maxpush" class="short" name="sharing_maxpush" type="text" value="{$local.max_push}" />
-							<div>This is how many comments to upload per run (the more you increase this, the longer it takes).</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width: 100px;"><label for="sharing_maxdownload">Max Downloads:</label></td>
-						<td>
-							<input id="sharing_maxdownload" class="short" name="sharing_maxdownload" type="text" value="{$local.max_download}" />
-							<div>This is how many comments to download per run.</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width: 100px;"><label for="sharing_maxpull">Max Headers:</label></td>
-						<td>
-							<input id="sharing_maxpull" class="short" name="sharing_maxpull" type="text" value="{$local.max_pull}" />
-							<div>This is how many headers to download and look through for comments per run.</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_enabled">Enabled:</label></td>
-						<td>
-							<div>
-								<strong id="enabled-1">
-									{if $local.enabled == "1"}
-										<a title="Click this to disable sharing." href="javascript:ajax_sharing_enabled(1, 0)" class="sharing_enabled_active">[DISABLE]</a>
-									{else}
-										<a title="Click this to enable sharing." href="javascript:ajax_sharing_enabled(1, 1)" class="sharing_enabled_deactive">[ENABLE]</a>
-									{/if}
-								</strong>
-								Is the sharing/retrieving enabled? This overrides posting/fetching.
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_posting">Posting:</label></td>
-						<td>
-							<div>
-								<strong id="posting-1">
-									{if $local.posting == "1"}
-										<a title="Click this to disable posting." href="javascript:ajax_sharing_posting(1, 0)" class="sharing_posting_active">[DISABLE]</a>
-									{else}
-										<a title="Click this to enable posting." href="javascript:ajax_sharing_posting(1, 1)" class="sharing_posting_deactive">[ENABLE]</a>
-									{/if}
-								</strong>
-								If you turn this on, this will post your comments to usenet. <br />
-								<strong>This requires posting rights to usenet!</strong>
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_fetching">Fetching:</label></td>
-						<td>
-							<div>
-								<strong id="fetching-1">
-									{if $local.fetching == "1"}
-									   	<a title="Click this to disable fetching." href="javascript:ajax_sharing_fetching(1, 0)" class="sharing_fetching_active">[DISABLE]</a>
-									{else}
-										<a title="Click this to enable fetching." href="javascript:ajax_sharing_fetching(1, 1)" class="sharing_fetching_deactive">[ENABLE]</a>
-									{/if}
-								</strong>
-								If you turn this on, this will download comments from usenet.
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_auto">Auto-Enable:</label></td>
-						<td>
-							<div>
-								<strong id="auto-1">
-									{if $local.auto_enable == "1"}
-										<a title="Click this to disable auto-enable." href="javascript:ajax_sharing_auto(1, 0)" class="sharing_auto_active">[DISABLE]</a>
-									{else}
-										<a title="Click this to enable auto-enable." href="javascript:ajax_sharing_auto(1, 1)" class="sharing_auto_deactive">[ENABLE]</a>
-									{/if}
-								</strong>
-								This will auto-enable new sites as we see them.
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_hide">Hide Users:</label></td>
-						<td>
-							<div>
-								<strong id="hide-1">
-									{if $local.hide_users == "1"}
-										<a title="Click this to disable hiding users." href="javascript:ajax_sharing_hide(1, 0)" class="sharing_hide_active">[DISABLE]</a>
-									{else}
-										<a title="Click this to enable hiding users." href="javascript:ajax_sharing_hide(1, 1)" class="sharing_hide_deactive">[ENABLE]</a>
-									{/if}
-								</strong>
-								This will hide user names from being visible on remote sites.
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_startposition">Backfill:</label></td>
-						<td>
-							<div>
-								<strong id="startposition-1">
-									{if $local.start_position == "1"}
-										<a title="Click this to disable backfill." href="javascript:ajax_sharing_startposition(1, 0)" class="sharing_startposition_active">[DISABLE]</a>
-									{else}
-										<a title="Click this to enable backfill." href="javascript:ajax_sharing_startposition(1, 1)" class="sharing_startposition_deactive">[ENABLE]</a>
-									{/if}
-								</strong>
-							   		When pulling the first time, or after resetting, start from the beginning of the group (takes more time).<br />
-								<strong>With the backfill setting it will take a few runs before you find anything the first time because the group has articles other than comments in it.</strong>
-							</div>
-						</td>
-					</tr>
-					<tr>
-						<td style="width:100px;"><label for="sharing_reset">Reset settings:</label></td>
-						<td>
-							<div>
-								<strong id="reset-1">
-									<a href="javascript:ajax_sharing_reset(1)" class="sharing_reset" onclick="return confirm('Are you sure? You will lose all your settings!');">[RESET]</a>
-								</strong>
-								<strong>This will reset your sharing settings (if you need to change Usenet Provider for example).</strong>
-							</div>
-						</td>
-					</tr>
-				</table>
-			</fieldset>
-			<input type="submit" value="Save Settings" />
-		</form>
-		<br />
-	{else}
-		<p>You have not run Sharing yet, until you run it this page will contain no settings.</p>
-	{/if}
-
-	{if $sites}
-		<div style="margin-bottom:5px;">These are the remote websites we have seen so far:</div>
-		{$pager}
-		<div style="float:right;">
-			<a href="javascript:ajax_sharing_toggle_all(1);" onclick="setTimeout('history.go(0);',700);" class="sharing_toggle_all">[Enable All]</a>
-			<a href="javascript:ajax_sharing_toggle_all(0);" onclick="setTimeout('history.go(0);',700);" class="sharing_toggle_all">[Disable All]</a>
-		</div>
-		<table style="margin-top:5px;margin-bottom:5px;width:733px" class="data Sortable highlight">
-			<tr>
-				<th style="width:22px;text-align:center;">id</th>
-				<th style="width:300px;text-align:center;">Name</th>
-				<th style="width:100px;text-align:center;">First seen</th>
-				<th style="width:100px;text-align:center;">Last seen</th>
-				<th style="width:50px;text-align:center;">Status</th>
-				<th style="width:70px;text-align:center;">Comments</th>
-				<th style="width:40px;text-align:center;"></th>
-			</tr>
-			{foreach from=$sites item=site}
-				<tr id="row-{$site.id}" class="{cycle values=",alt"}">
-					<td style="text-align:center;">{$site.id}</td>
-					<td style="text-align:center;">{$site.site_name}</td>
-					<td style="text-align:center;">{$site.first_time|timeago}</td>
-					<td style="text-align:center;">{$site.last_time|timeago}</td>
-					<td style="text-align:center;" id="site-{$site.id}">
-						{if $site.enabled=="1"}
-							<a href="javascript:ajax_sharing_site_status({$site.id}, 0)" class="sharing_site_active">Disable</a>
-						{else}
-							<a href="javascript:ajax_sharing_site_status({$site.id}, 1)" class="sharing_site_deactive">Enable</a>
-						{/if}
-					</td>
-					<td style="text-align:center;">{$site.comments}</td>
-					<td style="text-align:center;">
-						<a href="javascript:ajax_sharing_site_purge({$site.id})" class="sharing_site_purge" onclick="return confirm('Are you sure? This will delete all comments from this site!');">Purge</a>
-					</td>
-				</tr>
-			{/foreach}
-		</table>
-		{$pager}
-	{else}
-		<p>No remote sites found in your database.</p>
-	{/if}
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/site-debug.tpl b/lib/copy_this/www/templates/nntmux/views/admin/site-debug.tpl
deleted file mode 100644
index a1cd54fa7..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/site-debug.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h1>{$page->title}</h1>
-
-<p>Below is a dump of system settings and mysql table status to assist others in debuging problems. 
-Items like private 3rd party keys have been removed, however <b>*note*</b> full paths to binaries and web files 
-are included - so exercise caution when <a target="null" href="https://newznab.privatepaste.com/">pasting online</a>.</p>
-
-<textarea rows="50" cols="50" style="width:100%;height:500px;">
-
-{$site|print_r}
-
-{foreach from=$mysql item=data}
-{$data.name} Index Size ({$data.indexsize|fsize_format:"MB"}) Data Size ({$data.datasize|fsize_format:"MB"})
-{/foreach}
-
-Totalsize ({$mysqltotalsize|fsize_format:"MB"})
-
-</textarea>
-
-<br/> 
-
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl
deleted file mode 100644
index c7a0f1040..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl
+++ /dev/null
@@ -1,1570 +0,0 @@
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="post">
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<fieldset>
-<legend>Main Site Settings, HTML Layout, Tags</legend>
-<table class="input">
-
-<tr>
-	<td><label for="title">Title</label>:</td>
-	<td>
-		<input id="title" class="long" name="title" type="text" value="{$fsite->title}" />
-		<div class="hint">Displayed around the site and contact form as the name for the site.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="strapline">Strapline</label>:</td>
-	<td>
-		<input id="strapline" class="long" name="strapline" type="text" value="{$fsite->strapline}" />
-		<div class="hint">Displayed in the header on every public page.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="metatitle">Meta Title</label>:</td>
-	<td>
-		<input id="metatitle" class="long" name="metatitle" type="text" value="{$fsite->metatitle}" />
-		<div class="hint">Stem meta-tag appended to all page title tags.</div>
-	</td>
-</tr>
-
-
-<tr>
-	<td><label for="metadescription">Meta Description</label>:</td>
-	<td>
-		<textarea class="autosize" id="metadescription" name="metadescription">{$fsite->metadescription}</textarea>
-		<div class="hint">Stem meta-description appended to all page meta description tags.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="metakeywords">Meta Keywords</label>:</td>
-	<td>
-		<textarea class="autosize"  id="metakeywords" name="metakeywords">{$fsite->metakeywords}</textarea>
-		<div class="hint">Stem meta-keywords appended to all page meta keyword tags.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="footer">Footer</label>:</td>
-	<td>
-		<textarea class="autosize"  id="footer" name="footer">{$fsite->footer}</textarea>
-		<div class="hint">Displayed in the footer section of every public page.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="style">Default Home Page</label>:</td>
-	<td>
-		<input id="home_link" class="long" name="home_link" type="text" value="{$fsite->home_link}" />
-		<div class="hint">The relative path to a the landing page shown when a user logs in, or clicks the home link.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="codename">Code Name</label>:</td>
-	<td>
-		<input id="codename" name="code" type="text" value="{$fsite->code}" />
-		<input type="hidden" name="id" value="{$fsite->id}" />
-		<div class="hint">A just for fun value shown in debug and not on public pages.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="style">Theme</label>:</td>
-	<td>
-		{html_options class="siteeditstyle" id="style" name='style' values=$themelist output=$themelist selected=$fsite->style}
-		<div class="hint">The theme folder which will be loaded for css and images and overriden templates.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="style">Dereferrer Link</label>:</td>
-	<td>
-		<input id="dereferrer_link" class="long" name="dereferrer_link" type="text" value="{$fsite->dereferrer_link}" />
-		<div class="hint">Optional URL to prepend to external links</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="apienabled">Api Enabled</label>:</td>
-	<td>
-		{html_radios id="apienabled" name='apienabled' values=$yesno_ids output=$yesno_names selected=$fsite->apienabled separator='<br />'}
-		<div class="hint">Whether access to the site via the API is enabled.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="showrecentforumposts">Recent Forum Posts</label>:</td>
-	<td>
-		<input id="showrecentforumposts" name="showrecentforumposts" type="text" value="{$fsite->showrecentforumposts}" />
-		<div class="hint">The number of recent forum posts to show in the 'recent forum posts' widget. Set to 0 to disable.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="email">Email</label>:</td>
-	<td>
-		<input id="email" class="long" name="email" type="text" value="{$fsite->email}" />
-		<div class="hint">Shown in the contact us page, and where the contact html form is sent to.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tandc">Terms and Conditions</label>:</td>
-	<td>
-		<textarea class="autosize"  id="tandc" name="tandc">{$fsite->tandc}</textarea>
-		<div class="hint">Text displayed in the terms and conditions page.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="newznabID">newznab id</label>:</td>
-	<td>
-		<input id="newznabID" class="long" name="newznabID" type="text" value="{$fsite->newznabID}" />
-		<div class="hint">Your registered newznab id. Used for access to additional features.</div>
-	</td>
-</tr>
-
-</table>
-</fieldset>
-
-<fieldset>
-<legend>Google Adsense, Analytics and 3rd Party Banners</legend>
-<table class="input">
-<tr>
-	<td style="width:160px;"><label for="google_analytics_acc">Google Analytics</label>:</td>
-	<td>
-		<input id="google_analytics_acc" name="google_analytics_acc" type="text" value="{$fsite->google_analytics_acc}" />
-		<div class="hint">e.g. UA-xxxxxx-x</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="google_adsense_acc">Google Adsense</label>:</td>
-	<td>
-		<input id="google_adsense_acc" name="google_adsense_acc" type="text" value="{$fsite->google_adsense_acc}" />
-		<div class="hint">e.g. pub-123123123123123</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="google_adsense_search">Google Adsense Search</label>:</td>
-	<td>
-		<input id="google_adsense_search" name="google_adsense_search" type="text" value="{$fsite->google_adsense_search}" />
-		<div class="hint">The id of the google search ad panel displayed at the bottom of the left menu.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="adheader">Advert Space in Banner</label>:</td>
-	<td>
-		<textarea class="autosize"  id="adheader" name="adheader">{$fsite->adheader}</textarea>
-		<div class="hint">The banner slot in the header.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="adbrowse">Advert Space in Browse List</label>:</td>
-	<td>
-		<textarea class="autosize"  id="adbrowse" name="adbrowse">{$fsite->adbrowse}</textarea>
-		<div class="hint">The banner slot in the header.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="addetail">Advert Space in Detail View</label>:</td>
-	<td>
-		<textarea class="autosize"  id="addetail" name="addetail">{$fsite->addetail}</textarea>
-		<div class="hint">The banner slot in the release details view.</div>
-	</td>
-</tr>
-
-</table>
-</fieldset>
-
-
-<fieldset>
-<legend>3<sup>rd</sup> Party API Keys</legend>
-<table class="input">
-<tr>
-	<td style="width:160px;"><label for="tmdbkey">TMDB Key</label>:</td>
-	<td>
-		<input id="tmdbkey" class="long" name="tmdbkey" type="text" value="{$fsite->tmdbkey}" />
-		<div class="hint">The api key used for access to tmdb</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="rottentomatokey">Rotten Tomatoes Key</label>:</td>
-	<td>
-		<input id="rottentomatokey" class="long" name="rottentomatokey" type="text" value="{$fsite->rottentomatokey}" />
-		{html_options style="width:180px;" id="rottentomatoquality" name='rottentomatoquality' values=$rottentomatoquality_ids output=$rottentomatoquality_names selected=$fsite->rottentomatoquality}
-		<div class="hint">The api key used for access to rotten tomatoes</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="amazonpubkey">Amazon Public Key</label>:</td>
-	<td>
-		<input id="amazonpubkey" class="long" name="amazonpubkey" type="text" value="{$fsite->amazonpubkey}" />
-		<div class="hint">The amazon public api key. Used for cover lookups.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="amazonprivkey">Amazon Private Key</label>:</td>
-	<td>
-		<input id="amazonprivkey" class="long" name="amazonprivkey" type="text" value="{$fsite->amazonprivkey}" />
-		<div class="hint">The amazon private api key. Used for cover lookups.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="amazonassociatetag">Amazon Associate Tag</label>:</td>
-	<td>
-		<input id="amazonassociatetag" class="long" name="amazonassociatetag" type="text" value="{$fsite->amazonassociatetag}" />
-		<div class="hint">The amazon associate tag. Used for cover lookups.</div>
-	</td>
-</tr>
-	<tr>
-		<td style="width:180px;"><label for="trakttvkey">Trakt.tv API key:</label></td>
-		<td>
-			<input id="trakttvkey" class="long" name="trakttvkey" type="text" value="{$fsite->trakttvkey}"/>
-			<div class="hint">The trakt.tv api key. Used for movie and tv lookups.</div>
-		</td>
-	</tr>
-	<tr>
-		<td style="width:180px;"><label for="fanarttvkey">Fanart.tv API key:</label></td>
-		<td>
-			<input id="fanarttvkey" class="long" name="fanarttvkey" type="text" value="{$fsite->fanarttvkey}"/>
-
-			<div class="hint">The Fanart.tv api key. Used for Fanart.tv lookups. Fanart.tv would appreciate it if
-				you use this service to help them out by adding high quality images not already available on TMDB.
-			</div>
-		</td>
-	</tr>
-
-<tr>
-	<td style="width:180px;"><label for="giantbombkey">Giant Bomb API Key:</label></td>
-	<td>
-		<input id="giantbombkey" class="long" name="giantbombkey" type="text" value="{$fsite->giantbombkey}"/>
-
-		<div class="hint">The giantbomb key. Used for game lookups.</div>
-	</td>
-</tr>
-	<tr>
-		<td style="width:180px;"><label for="anidbkey">Anidb API key:</label></td>
-		<td>
-			<input id="anidbkey" class="long" name="anidbkey" type="text" value="{$fsite->anidbkey}"/>
-
-			<div class="hint">The Anidb api key. Used for Anime lookups.</div>
-		</td>
-	</tr>
-
-</table>
-</fieldset>
-
-<fieldset>
-<legend>3<sup>rd</sup> Party Application Paths</legend>
-<table class="input">
-<tr>
-	<td style="width:160px;"><label for="unrarpath">Unrar Path</label>:</td>
-	<td>
-		<input id="unrarpath" class="long" name="unrarpath" type="text" value="{$fsite->unrarpath}" />
-		<div class="hint">The path to an unrar binary, used in deep password detection and media info grabbing.
-		<br/>Use forward slashes in windows <span style="font-family:courier;">c:/path/to/unrar.exe</span></div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="tmpunrarpath">Temp Unrar File Path</label>:</td>
-	<td>
-		<input id="tmpunrarpath" class="long" name="tmpunrarpath" type="text" value="{$fsite->tmpunrarpath}" />
-		<div class="hint">The path to where unrar puts files. WARNING: This directory will have its contents deleted.
-		<br/>Use forward slashes in windows <span style="font-family:courier;">c:/temp/path/stuff/will/be/unpacked/to</span></div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="mediainfopath">Mediainfo Path</label>:</td>
-	<td>
-		<input id="mediainfopath" class="long" name="mediainfopath" type="text" value="{$fsite->mediainfopath}" />
-		<div class="hint">The path to the <a href="http://mediainfo.sourceforge.net">mediainfo</a> binary. Used for deep file media analysis. Use empty path to disable mediainfo checks
-		<br/>Use forward slashes in windows <span style="font-family:courier;">c:/path/to/mediainfo.exe</span></div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="ffmpegpath">Ffmpeg Path</label>:</td>
-	<td>
-		<input id="ffmpegpath" class="long" name="ffmpegpath" type="text" value="{$fsite->ffmpegpath}" />
-		<div class="hint">The path to the <a href="http://www.ffmpeg.org/">ffmpeg</a> binary. Used for thumbnailing. Use empty path to disable thumbnailing.
-		<br/>Use forward slashes in windows <span style="font-family:courier;">c:/path/to/ffmpeg.exe</span></div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="lamepath">Lame Path</label>:</td>
-	<td>
-		<input id="lamepath" class="long" name="lamepath" type="text" value="{$fsite->lamepath}" />
-		<div class="hint">The path to the <a href="http://lame.sourceforge.net/download.php">lame</a> binary. Used for audio manipulation.
-		<br/>Use forward slashes in windows <span style="font-family:courier;">c:/path/to/lame.exe</span></div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="zippath">7za Path:</label></td>
-		<td>
-			<input id="zippath" class="long" name="zippath" type="text" value="{$fsite->zippath}"/>
-
-			<div class="hint">The path to the 7za/p7zip in Ubuntu 13.10 (7zip command line in windows) binary, used
-				for grabbing nfos from compressed zip files.
-				<br/>Use forward slashes in windows <span style="font-family:courier;">c:/path/to/7z.exe</span>
-			</div>
-		</td>
-	</tr>
-	<tr>
-		<td style="width:180px;"><label for="timeoutpath">GNU Timeout Path:</label></td>
-		<td>
-			<input id="timeoutpath" class="long" name="timeoutpath" type="text" value="{$fsite->timeoutpath}"/>
-			<div class="hint">The path to the <a href="http://linux.die.net/man/1/timeout">timeout</a> binary.
-				This is used to limit the amount of time unrar/7zip/mediainfo/ffmpeg/avconv can run.
-				You can the time limit in the process additional section.
-				You can leave this empty to disable this.
-				<br/>Use forward slashes in windows <span style="font-family:courier;">c:/path/to/timeout.exe</span>
-			</div>
-		</td>
-	</tr>
-	<tr>
-		<td style="width:180px;"><label for="magic_file_path">Magic Numbers file:</label></td>
-		<td>
-			<input id="magic_file_path"
-				   class="long"
-				   name="magic_file_path"
-				   type="text"
-				   value="{$fsite->magic_file_path}" />
-			<div class="hint">Path to magic number database. Windows&apos; users should set this if they have installed GNUWin file. *nix users can optionally set this to a file of their choice.</div>
-		</td>
-	</tr>
-
-</table>
-</fieldset>
-
-
-<fieldset>
-	<legend>SABnzbd Integration Settings</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="sabintegrationtype">Integration Type:</label></td>
-			<td>
-				{html_radios id="sabintegrationtype" name='sabintegrationtype' values=$sabintegrationtype_ids output=$sabintegrationtype_names selected=$fsite->sabintegrationtype separator='<br />'}
-				<div class="hint">
-					Whether to allow integration with a SAB install and if so what type of integration.<br/>
-					<strong>Setting this to integrated also disables NZBGet from being selectable to the user.</strong><br />
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="saburl">SABnzbd Url:</label></td>
-			<td>
-				<input id="saburl" class="long" name="saburl" type="text" value="{$fsite->saburl}" />
-				<div class="hint">The url of the SAB installation, for example: http://localhost:8080/sabnzbd/</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="sabapikey">SABnzbd Api Key:</label></td>
-			<td>
-				<input id="sabapikey" class="long" name="sabapikey" type="text" value="{$fsite->sabapikey}" />
-				<div class="hint">The Api key of the SAB installation. Can be the full api key or the nzb api key (as of SAB 0.6)</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="sabapikeytype">Api Key Type:</label></td>
-			<td>
-				{html_radios id="sabapikeytype" name='sabapikeytype' values=$sabapikeytype_ids output=$sabapikeytype_names selected=$fsite->sabapikeytype separator='<br />'}
-				<div class="hint">Select the type of api key you entered in the above setting</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="sabpriority">Priority Level:</label></td>
-			<td>
-				{html_options style="width:180px;" id="sabpriority" name='sabpriority' values=$sabpriority_ids output=$sabpriority_names selected=$fsite->sabpriority}
-				<div class="hint">Set the priority level for NZBs that are added to your queue</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="sabcompletedir">SABnzbd Complete Path</label>:</td>
-			<td>
-				<input id="sabcompletedir" class="long" name="sabcompletedir" type="text" value="{$fsite->sabcompletedir}" />
-				<div class="hint">The downloads/complete folder for a local sab install, for example: /var/www/sab/downloads/complete</div>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="sabvdir">SABnzbd Complete Vdir URL</label>:</td>
-			<td>
-				<input id="sabvdir" class="long" name="sabvdir" type="text" value="{$fsite->sabvdir}" />
-				<div class="hint">A url to a hosted virtual directory pointing to the sab downloads/complete folder, e.g. http://server/complete</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-
-<fieldset>
-<legend>Usenet Settings</legend>
-<table class="input">
-
-<tr>
-	<td><label for="nzbpath">Nzb File Path</label>:</td>
-	<td>
-		<input id="nzbpath" class="long" name="nzbpath" type="text" value="{$fsite->nzbpath}" />
-		<div class="hint">The directory where nzb files will be stored.</div>
-	</td>
-</tr>
-	<tr>
-		<td style="width:180px;"><label for="nzbsplitlevel">Nzb File Path Level Deep:</label></td>
-		<td>
-			<input id="nzbsplitlevel" class="short" name="nzbsplitlevel" type="text" value="{$fsite->nzbsplitlevel}"/>
-			<div class="hint">Levels deep to store the nzb Files.
-				<br /><strong>If you change this you must run the misc/testing/DB/nzb-reorg.php script!</strong>
-			</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="rawretentiondays">Header Retention</label>:</td>
-	<td>
-		<input class="tiny" id="rawretentiondays" name="rawretentiondays" type="text" value="{$fsite->rawretentiondays}" />
-		<div class="hint">The number of days binary and part data will be retained for use in raw search and release formation.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="releaseretentiondays">Release Retention</label>:</td>
-	<td>
-		<input class="tiny" id="releasedays" name="releaseretentiondays" type="text" value="{$fsite->releaseretentiondays}" />
-		<div class="hint">The number of days releases will be retained for use throughout site. Set to 0 to disable.</div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="miscotherretentionhours">Other->Misc Retention Hours:</label></td>
-		<td>
-			<input class="short" id="miscotherretentionhours" name="miscotherretentionhours" type="text" value="{$fsite->miscotherretentionhours}"/>
-			<div class="hint">The number of hours releases categorized as Misc->Other will be retained. Set to 0 to disable.</div>
-		</td>
-	</tr>
-	<tr>
-		<td style="width:180px;"><label for="mischashedretentionhours">Other->Hashed Retention Hours:</label></td>
-		<td>
-			<input class="short" id="mischashedretentionhours" name="mischashedretentionhours" type="text" value="{$fsite->mischashedretentionhours}"/>
-			<div class="hint">The number of hours releases categorized as Misc->Hashed will be retained. Set to 0 to disable.</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="partsdeletechunks">Parts Delete In Chunks</label>:</td>
-	<td>
-		<input class="small" id="partsdeletechunks" name="partsdeletechunks" type="text" value="{$fsite->partsdeletechunks}" />
-		<div class="hint">Default is 0 (off), which will remove parts in one go. If backfilling or importing and parts table is large, using chunks of 5000+ will speed up removal. Normal indexing is fastest with this setting at 0.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="minfilestoformrelease">Minimum Files to Make a Release</label>:</td>
-	<td>
-		<input class="tiny" id="minfilestoformrelease" name="minfilestoformrelease" type="text" value="{$fsite->minfilestoformrelease}" />
-		<div class="hint">The minimum number of files to make a release. i.e. if set to two, then releases which only contain one file will not be created.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="minsizetoformrelease">Minimum File Size to Make a Release</label>:</td>
-	<td>
-		<input class="small" id="minsizetoformrelease" name="minsizetoformrelease" type="text" value="{$fsite->minsizetoformrelease}" />
-		<div class="hint">The minimum total size in bytes to make a release. If set to 0, then ignored.</div>
-	</td>
-</tr>
-	<tr>
-		<td style="width:180px;"><label for="maxsizetoformrelease">Maximum File Size to Make a Release:</label></td>
-		<td>
-			<input class="small" id="maxsizetoformrelease" name="maxsizetoformrelease" type="text" value="{$fsite->maxsizetoformrelease}"/>
-			<div class="hint">The maximum total size in bytes to make a release. If set to 0, then ignored. Only deletes
-				during release creation.
-			</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="completionpercent">Minimum Completion Percent to Make a Release</label>:</td>
-	<td>
-		<input class="tiny" id="completionpercent" name="completionpercent" type="text" value="{$fsite->completionpercent}" />
-		<div class="hint">The minimum completion percent to make a release. i.e. if set to 97, then releases under 97% completion will not be created. If set to 0, then ignored.</div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="grabstatus">Update grabs:</label></td>
-		<td>
-			{html_radios id="grabstatus" name='grabstatus' values=$yesno_ids output=$yesno_names selected=$fsite->grabstatus separator='<br />'}
-			<div class="hint">Whether to update download counts when someone downloads a release.</div>
-		</td>
-	</tr>
-	<tr>
-		<td style="width:180px;"><label for="crossposttime">Crossposted Time Check:</label></td>
-		<td>
-			<input class="short" id="crossposttime" name="crossposttime" type="text" value="{$fsite->crossposttime}"/>
-			<div class="hint">The time in hours to check for crossposted releases - this will delete 1 of the releases if the 2 are posted by the same person in the same time period.</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="removespam">Remove Spam</label>:</td>
-	<td>
-		{html_radios id="removespam" name='removespam' values=$yesno_ids output=$yesno_names selected=$fsite->removespam separator='<br />'}
-		<div class="hint">Find and remove spam after each update. An inexact science which uses a few methods to identify virus/spam posts.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="exepermittedcategories">Spam - Accepted Exe Categories</label>:</td>
-	<td>
-		<input id="exepermittedcategories" class="long" name="exepermittedcategories" type="text" value="{$fsite->exepermittedcategories}" />
-		<div class="hint">Which categories to permit .exe files. Requires unrar inner file checking to be enabled.</div>
-	</td>
-</tr>
-
-<tr>
-    <td><label for="updateparsing">Perform Integrated Update Parsing</label>:</td>
-    <td>
-        {html_radios id="updateparsing" name='updateparsing' values=$yesno_ids output=$yesno_names selected=$fsite->updateparsing separator='<br />'}
-        <div class="hint">Update Parsing is a mechanism to decode names using various techniques.</div>
-    </td>
-</tr>
-
-<tr>
-    <td><label for="updatecleanup">Perform Integrated Update Cleanup</label>:</td>
-    <td>
-        {html_radios id="updatecleanup" name='updatecleanup' values=$yesno_ids output=$yesno_names selected=$fsite->updatecleanup separator='<br />'}
-        <div class="hint">Update Cleanup is a general mechanism for deleting and moving unwanted items into misc>other.</div>
-    </td>
-</tr>
-
-<tr>
-    <td><label for="removespecial">Perform Integrated Remove Special Chars</label>:</td>
-    <td>
-        {html_radios id="removespecial" name='removespecial' values=$yesno_ids output=$yesno_names selected=$fsite->removespecial separator='<br />'}
-        <div class="hint">Remove Special is a general mechanism for removing erroneous characters from release names.</div>
-    </td>
-</tr>
-
-<tr>
-	<td><label for="compressedheaders">Use Compressed Headers</label>:</td>
-	<td>
-		{html_radios id="compressedheaders" name='compressedheaders' values=$yesno_ids output=$yesno_names selected=$fsite->compressedheaders separator='<br />'}
-		<div class="hint">Some servers allow headers to be sent over in a compressed format.  If enabled this will use much less bandwidth, but processing times may increase.</div>
-	</td>
-</tr>
-
-
-<tr>
-	<td><label for="maxmssgs">Max Messages</label>:</td>
-	<td>
-		<input class="small" id="maxmssgs" name="maxmssgs" type="text" value="{$fsite->maxmssgs}" />
-		<div class="hint">The maximum number of messages to fetch at a time from the server.</div>
-	</td>
-</tr>
-
-<tr>
-    <td><label for="maxmsgsperrun">Max Messages Per Run</label>:</td>
-    <td>
-        <input class="small" id="maxmsgsperrun" name="maxmsgsperrun" type="text" value="{$fsite->maxmsgsperrun}" />
-        <div class="hint">The maximum number of messages to process for a group in one run of update_binaries.</div>
-    </td>
-</tr>
-
-<tr>
-	<td><label for="newgroupscanmethod">Where to start new groups</label>:</td>
-	<td>
-		{html_radios id="newgroupscanmethod" name='newgroupscanmethod' values=$yesno_ids output=$newgroupscan_names selected=$fsite->newgroupscanmethod separator='<br />'}
-		<input class="tiny" id="newgroupdaystoscan" name="newgroupdaystoscan" type="text" value="{$fsite->newgroupdaystoscan}" /> Days  or
-		<input class="small" id="newgroupmsgstoscan" name="newgroupmsgstoscan" type="text" value="{$fsite->newgroupmsgstoscan}" /> Posts<br />
-		<div class="hint">Scan back X (posts/days) for each new group?  Can backfill to scan further.</div>
-	</td>
-</tr>
-	<tr>
-		<td style="width:180px;"><label for="safebackfilldate">Safe Backfill Date:</label></td>
-		<td>
-			<input class="small" id="safebackfilldate" name="safebackfilldate" type="text"
-				   value="{$fsite->safebackfilldate}"/>
-
-			<div class="hint">The target date for safe backfill. Format: YYYY-MM-DD</div>
-		</td>
-	</tr>
-
-</table>
-</fieldset>
-
-<fieldset>
-<legend>Lookup Settings</legend>
-<table class="input">
-<tr>
-	<td><label for="reqidurl">Allfilled Request Id Lookup URL</label>:</td>
-	<td>
-		<input class="long" id="reqidurl" name="reqidurl" type="text" value="{$fsite->reqidurl}" />
-		<div class="hint">The url to use to translate allfilled style reqid usenet posts into real release titles. Leave blank to not perform lookup.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="reqidurl">Latest Regex Lookup URL</label>:</td>
-	<td>
-		<input class="long" id="latestregexurl" name="latestregexurl" type="text" value="{$fsite->latestregexurl}" />
-		<div class="hint">The url to use to get the latest regexs. Leave blank to not perform lookup. This will retrieve all user contributed regexes.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="lookupnfo">Lookup Nfo</label>:</td>
-	<td>
-		{html_radios id="lookupnfo" name='lookupnfo' values=$yesno_ids output=$yesno_names selected=$fsite->lookupnfo separator='<br />'}
-		<div class="hint">Whether to attempt to retrieve the an nfo file from usenet when processing binaries.<br/><strong>NOTE: disabling nfo lookups will disable movie lookups.</strong></div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="lookuptvrage">Lookup TV:</label></td>
-		<td>
-			{html_options style="width:180px;" id="lookuptvrage" name='lookuptvrage' values=$lookuptv_ids output=$lookuptv_names selected=$site->lookuptvrage}
-			<div class="hint">Whether to attempt to lookup TvRage ids on the web.</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="lookupthetvdb">Lookup TheTVDB</label>:</td>
-	<td>
-		{html_radios id="lookupthetvdb" name='lookupthetvdb' values=$yesno_ids output=$yesno_names selected=$fsite->lookupthetvdb separator='<br />'}
-		<div class="hint">Whether to attempt to lookup addidional series information from TheTVDB when processing binaries.</div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="book_reqids">Type of books to look up:</label></td>
-		<td>
-			{html_options_multiple id="book_reqids" name='book_reqids' values=$book_reqids_ids output=$book_reqids_names selected=$book_reqids_selected}
-			<div class="hint">Categories of Books to lookup information for (only work if Lookup Books is set to yes).</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="lookupimdb">Lookup Movies:</label></td>
-		<td>
-			{html_options style="width:180px;" id="lookupimdb" name='lookupimdb' values=$lookupmovies_ids output=$lookupmovies_names selected=$fsite->lookupimdb}
-			<div class="hint">Whether to attempt to lookup film information from IMDB or TheMovieDB.</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="lookupanidb">Lookup AniDB</label>:</td>
-	<td>
-		{html_radios id="lookupanidb" name='lookupanidb' values=$yesno_ids output=$yesno_names selected=$fsite->lookupanidb separator='<br />'}
-		<div class="hint">Whether to attempt to lookup anime information from AniDB when processing binaries.</div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="lookupmusic">Lookup Music:</label></td>
-		<td>
-			{html_options style="width:180px;" id="lookupmusic" name='lookupmusic' values=$lookupmusic_ids output=$lookupmusic_names selected=$fsite->lookupmusic}
-			<div class="hint">Whether to attempt to lookup music information from Amazon.</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="lookupgames">Lookup Games:</label></td>
-		<td>
-			{html_options style="width:180px;" id="lookupgames" name='lookupgames' values=$lookupgames_ids output=$lookupgames_names selected=$fsite->lookupgames}
-			<div class="hint">Whether to attempt to lookup game information from Amazon.</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td><label for="lookupxxx">Lookup XXX</label>:</td>
-		<td>
-			{html_radios id="lookupxxx" name='lookupxxx' values=$yesno_ids output=$yesno_names selected=$fsite->lookupxxx separator='<br />'}
-			<div class="hint">Whether to attempt to lookup XXX information when processing binaries.</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="maxxxxprocessed">Maximum xxx per run:</label></td>
-		<td>
-			<input class="short" id="maxxxxprocessed" name="maxxxxprocessed" type="text"
-				   value="{$fsite->maxxxxprocessed}"/>
-
-			<div class="hint">The maximum amount of XXX to process per run. This does not use an NNTP
-				connection or query Amazon.
-			</div>
-	</td>
-</tr>
-
-	<tr>
-		<td style="width:180px;"><label for="lookupbooks">Lookup Books:</label></td>
-		<td>
-			{html_options style="width:180px;" id="lookupbooks" name='lookupbooks' values=$lookupbooks_ids output=$lookupbooks_names selected=$fsite->lookupbooks}
-			<div class="hint">Whether to attempt to lookup book information from Amazon.</div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="lookuplanguage">Movie Lookup Language</label>:</td>
-	<td>
-		{html_options id="lookuplanguage" name='lookuplanguage' values=$lookuplanguage_iso output=$lookuplanguage_names selected=$fsite->lookuplanguage}
-		<div class="hint">Preferred language for scraping external sources.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="saveaudiopreview">Save Audio Preview</label>:</td>
-	<td>
-		{html_radios id="saveaudiopreview" name='saveaudiopreview' values=$yesno_ids output=$yesno_names selected=$fsite->saveaudiopreview separator='<br />'}
-		<div class="hint">Whether to save a preview of an audio release (requires deep rar inspection enabled).<br/>It is advisable to specify a path to the lame binary to reduce the size of audio previews.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:130px;"><label for="audiopreviewprune">Prune Audio Preview</label>:</td>
-	<td>
-		<input id="audiopreviewprune" class="short" name="audiopreviewprune" type="text" value="{$fsite->audiopreviewprune}" />
-		<div class="hint">Delete any audio previews older than this number of days.</div>
-	</td>
-</tr>
-
-</table>
-</fieldset>
-<fieldset>
-	<legend>Language/Categorization options</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="categorizeforeign">Categorize Foreign:</label></td>
-			<td>
-				{html_radios id="categorizeforeign" name='categorizeforeign' values=$yesno_ids output=$yesno_names selected=$fsite->categorizeforeign separator='<br />'}
-				<div class="hint">Whether to send foreign movies/tv to
-					foreign sections or not. If set to true they will go in foreign categories.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="catwebdl">Categorize WEB-DL:</label></td>
-			<td>
-				{html_radios id="catwebdl" name='catwebdl' values=$yesno_ids output=$yesno_names selected=$fsite->catwebdl separator='<br />'}
-				<div class="hint">Whether to send WEB-DL to the WEB-DL section or not. If set to true they will go in
-					WEB-DL category, false will send them in HD TV.<br/>This will also make them inaccessible to
-					Sickbeard and possibly Couchpotato.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-<legend>Password Settings</legend>
-<table class="input">
-<tr>
-	<td><label for="checkpasswordedrar">Check For Passworded Releases</label>:</td>
-	<td>
-		{html_radios id="checkpasswordedrar" name='checkpasswordedrar' values=$passwd_ids output=$passwd_names selected=$fsite->checkpasswordedrar separator='<br />'}
-		<div class="hint">Whether to attempt to peek into every release, to see if rar files are password protected.<br/></div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="deletepasswordedrelease">Delete Passworded Releases</label>:</td>
-	<td>
-		{html_radios id="deletepasswordedrelease" name='deletepasswordedrelease' values=$yesno_ids output=$yesno_names selected=$fsite->deletepasswordedrelease separator='<br />'}
-		<div class="hint">Whether to delete releases which are passworded or potentially passworded.<br/></div>
-	</td>
-</tr>
-	<tr>
-		<td style="width:180px;"><label for="deletepossiblerelease">Delete Possibly Passworded Releases:</label></td>
-		<td>
-			{html_radios id="deletepossiblerelease" name='deletepossiblerelease' values=$yesno_ids output=$yesno_names selected=$fsite->deletepossiblerelease separator='<br />'}
-			<div class="hint">Whether to delete releases which are potentially passworded. This applies to your post process additional inner file blacklist.<br/></div>
-		</td>
-	</tr>
-
-<tr>
-	<td><label for="showpasswordedrelease">Show Passworded Releases</label>:</td>
-	<td>
-		{html_options id="showpasswordedrelease" name='showpasswordedrelease' values=$passworded_ids output=$passworded_names selected=$fsite->showpasswordedrelease}
-		<div class="hint">Whether to show passworded or potentially passworded releases in browse, search, api and rss feeds. Potentially passworded means releases which contain .cab or .ace files which are typically password protected.</div>
-	</td>
-</tr>
-</table>
-</fieldset>
-
-<fieldset>
-<legend>nzpre Settings</legend>
-<table class="input">
-
-<tr>
-	<td style="width:130px;"><label for="nzpregroup">Group</label>:</td>
-	<td>
-		<input id="nzpregroup" class="medium" name="nzpregroup" type="text" value="{$fsite->nzpregroup}" />
-		<div class="hint">Group to search when looking up nzpre posts.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:130px;"><label for="nzpresubject">Subject</label>:</td>
-	<td>
-		<input id="nzpresubject" class="long" name="nzpresubject" type="text" value="{$fsite->nzpresubject}" />
-		<div class="hint">Subject line. eg. This is an nzpre post!</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:130px;"><label for="nzpreposter">Poster</label>:</td>
-	<td>
-		<input id="nzpreposter" class="medium" name="nzpreposter" type="text" value="{$fsite->nzpreposter}" />
-		<div class="hint">Full poster field. eg. tester test@test.com</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:130px;"><label for="nzprefield">Field</label>:</td>
-	<td>
-		<input id="nzprefield" class="medium" name="nzprefield" type="text" value="{$fsite->nzprefield}" />
-		<div class="hint">Which header field to parse.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:130px;"><label for="nzprearticles">Articles</label>:</td>
-	<td>
-		<input id="nzprearticles" class="short" name="nzprearticles" type="text" value="{$fsite->nzprearticles}" />
-		<div class="hint">Number of articles to parse when updating.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:130px;"><label for="nzprekey">Key</label>:</td>
-	<td>
-		<input id="nzprekey" class="long" name="nzprekey" type="text" value="{$fsite->nzprekey}" />
-		<div class="hint">Key to decode.</div>
-	</td>
-</tr>
-
-</table>
-</fieldset>
-
-<fieldset>
-<legend>Spotnab Settings</legend>
-<table class="input">
-
-<tr>
-	<td><label for="spotnabpost">Enable Posting</label>:</td>
-	<td>
-		{html_radios id="spotnabpost" name='spotnabpost' values=$yesno_ids output=$yesno_names selected=$fsite->spotnabpost separator='<br />'}
-		<div class="hint">If enabled, encrypted comments from this site will be uploaded using the spotnab protocol. These will be shared with others participating Newznab sites. Set up Spotnab sources <a href="spotnab-list.php">here</a> or use Auto Discovery.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="spotnabbroadcast">Broadcast Source</label>:</td>
-	<td>
-		{html_radios id="spotnabbroadcast" name='spotnabbroadcast' values=$yesno_ids output=$yesno_names selected=$fsite->spotnabbroadcast separator='<br />'}
-		<div class="hint">If enabled, a broadcast packet will be uploaded every month, so that other participating Newznab sites can automatically subscribe to your comments.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="spotnabdiscover">Auto Discovery</label>:</td>
-	<td>
-		{html_radios id="spotnabdiscover" name='spotnabdiscover' values=$yesno_ids output=$yesno_names selected=$fsite->spotnabdiscover separator='<br />'}
-		<div class="hint">If enabled, other participating Newznab sites will be added automatically (as inactive) to your <a href="spotnab-list.php">sources list</a>.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="spotnabprivacy">Enable Privacy</label>:</td>
-	<td>
-		{html_radios id="spotnabprivacy" name='spotnabprivacy' values=$yesno_ids output=$yesno_names selected=$fsite->spotnabprivacy separator='<br />'}
-		<div class="hint">If enabled, uploaded comments use a unique (made up) username.</div>
-	</td>
-</tr>
-
-<tr>
-	<td style="width:160px;"><label for="spotnabautoenable">Source Auto Enable</label>:</td>
-	<td>
-		{html_radios id="spotnabautoenable" name='spotnabautoenable' values=$yesno_ids output=$yesno_names selected=$fsite->spotnabautoenable separator='<br />'}
-		<div class="hint">If enabled, newly discovered Spotnab sources will be enabled by default.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="spotnabuser">Username</label>:</td>
-	<td>
-		<input name="spotnabuser" type="text" value="{$fsite->spotnabuser}" />
-		<div class="hint">The username part used for posting. eg nntp</div>
-	</td>
-</tr>
-<tr>
-	<td><label for="spotnabemail">E-mail</label>:</td>
-	<td>
-		<input name="spotnabemail" type="text" value="{$fsite->spotnabemail}" />
-		<div class="hint">The email part used for posting. eg spot@nntp.com</div>
-	</td>
-</tr>
-<tr>
-	<td><label for="spotnabgroup">Usenet Group</label>:</td>
-	<td>
-		<input name="spotnabgroup" type="text" value="{$fsite->spotnabgroup}" />
-		<div class="hint">The group where posts are uploaded. eg alt.binaries.backup</div>
-	</td>
-</tr>
-
-<tr>
-  <td style="width:130px;"><label for="spotnabsitepubkey">Public Key</label>:</td>
-  <td>
-	<textarea class="autosize"  name="spotnabsitepubkey">{$fsite->spotnabsitepubkey|escape:html}</textarea>
-	<div class="hint">Public key other sites will use to decrypt comments.</div>
-  </td>
-</tr>
-
-<tr>
-  <td style="width:130px;"><label for="spotnabsiteprvkey">Private Key:<br><u>Do Not Share This</u></label></td>
-  <td>
-	<textarea class="autosize"  name="spotnabsiteprvkey">{$fsite->spotnabsiteprvkey|escape:html}</textarea>
-	<div class="hint">Private key used to encrypt comments before uploading.</div>
-  </td>
-</tr>
-
-</table>
-</fieldset>
-
-<fieldset>
-	<legend>IMDB.com URL</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="imdburl">IMDB.com:</label></td>
-			<td>
-				{html_options style="width:180px;" class="imdburl" id="imdburl" name='imdburl' values=$imdb_urls output=$imdburl_names selected=$fsite->imdburl}
-				<div class="hint">Akas.imdb.com returns titles in their original title, imdb.com returns titles based on
-					your IP address (if you are in france, you will get french titles).
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Usenet Settings</legend>
-	<table class="input">
-
-		<tr>
-			<td style="width:180px;"><label for="maxsizetopostprocess">Maximum Release Size to Post Process:</label></td>
-			<td>
-				<input class="short" id="maxsizetopostprocess" name="maxsizetopostprocess" type="text"
-					   value="{$fsite->maxsizetopostprocess}"/>
-
-				<div class="hint">The maximum size in gigabytes to postprocess a release. If set to 0, then ignored.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="minsizetopostprocess">Minimum Release Size to Post Process:</label></td>
-			<td>
-				<input class="short" id="minsizetopostprocess" name="minsizetopostprocess" type="text" value="{$fsite->minsizetopostprocess}"/>
-				<div class="hint">The minimum size in megabytes to post process (additional) a release. If set to 0, then ignored.</div>
-			</td>
-		</tr>
-		<tr>
-
-		<tr>
-			<td style="width:180px;"><label for="lookuppar2">Lookup PAR2:</label></td>
-			<td>
-				{html_radios id="lookuppar2" name='lookuppar2' values=$yesno_ids output=$yesno_names selected=$fsite->lookuppar2 separator='<br />'}
-				<div class="hint">Whether to attempt to find a better name for releases in misc->other using the PAR2
-					file.<br/><strong>NOTE: this can be slow depending on the group!</strong></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="addpar2">Add PAR2 contents to file contents:</label></td>
-			<td>
-				{html_radios id="addpar2" name='addpar2' values=$yesno_ids output=$yesno_names selected=$fsite->addpar2 separator='<br />'}
-				<div class="hint">When going through PAR2 files, add them to the RAR file content list of the NZB.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Advanced Settings - For advanced users</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="tablepergroup">Table Per Group:</label></td>
-			<td>
-				{html_radios id="tablepergroup" name='tablepergroup' values=$yesno_ids output=$yesno_names selected=$fsite->tablepergroup separator='<br />'}
-				<div class="hint">This uses separate tables for binaries and parts for each group.<br/>This
-					requires you to run convert_to_tpg.php or reset_truncate.php.<br/>This requires that you also run
-					.../misc/update/nix/multiprocessing/releases.php (tmux does this automatically).
-					<br/>Run: show variables like '%open%files%'; results should be higher than 10k, twice that if you
-					are using TokuDB.;
-					<br/><b>You may need to increase table_open_cache, open_files_limit and max_allowed_packet in
-						my.cnf. Also, you may need to add the following to /etc/security/limits.conf<br/>mysql soft
-						nofile 24000<br/>mysql hard nofile 32000</b>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="maxnzbsprocessed">Maximum NZBs processed:</label></td>
-			<td>
-				<input class="short" id="maxnzbsprocessed" name="maxnzbsprocessed" type="text"
-					   value="{$fsite->maxnzbsprocessed}"/>
-
-				<div class="hint">The maximum amount of NZB files to create in update_releases.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="partrepair">Part Repair:</label></td>
-			<td>
-				{html_radios id="partrepair" name='partrepair' values=$yesno_ids output=$yesno_names selected=$fsite->partrepair separator='<br />'}
-				<div class="hint">Whether to attempt to repair parts or not, increases backfill/binaries updating
-					time.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="safepartrepair">Part Repair for Backfill Scripts:</label></td>
-			<td>
-				{html_radios id="safepartrepair" name='safepartrepair' values=$yesno_ids output=$yesno_names selected=$fsite->safepartrepair separator='<br />'}
-				<div class="hint">Whether to put unreceived parts into partrepair table when running binaries(safe) or backfill scripts.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="maxpartrepair">Maximum repair per run:</label></td>
-			<td>
-				<input class="short" id="maxpartrepair" name="maxpartrepair" type="text" value="{$fsite->maxpartrepair}"/>
-				<div class="hint">The maximum amount of articles to attempt to repair at a time. If you notice that you
-					are getting a lot of parts into the partrepair table, it is possible that you USP is not keeping up
-					with the requests. Try to reduce the threads to safe scripts, stop using safe scripts or stop using
-					nntpproxy until improves. Ar least until the cause can be determined.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="partrepairmaxtries">Maximum repair tries:</label></td>
-			<td>
-				<input class="short" id="partrepairmaxtries" name="partrepairmaxtries" type="text" value="{$fsite->partrepairmaxtries}"/>
-				<div class="hint">Maximum amount of times to try part repair.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="yydecoderpath">yEnc Type:</label></td>
-			<td>
-				<input id="yydecoderpath" class="long" name="yydecoderpath" type="text"
-					   value="{$fsite->yydecoderpath}"/>
-
-				<div class="hint">
-					Leaving this empty will use PHP to decode yEnc, which is slow.
-					<br/>Putting the path to yydecode will use yydecode, which is faster than PHP. <a
-							style="color:#0082E1"
-							href="http://sourceforge.net/projects/yydecode/files/yydecode/0.2.10/">Download yydecode
-						on sourceforce.</a>
-					<br/>Putting in <strong style="color:#ac2925">simple_php_yenc_decode</strong> will use that
-					extension which is even faster <strong>(you must have the extension)</strong>. <a
-							style="color:#0082E1" href="https://github.com/kevinlekiller/simple_php_yenc_decode">View
-						simple_php_yenc_decode on github.</a>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="processjpg">Process JPG:</label></td>
-			<td>
-				{html_radios id="processjpg" name='processjpg' values=$yesno_ids output=$yesno_names selected=$fsite->processjpg separator='<br />'}
-				<div class="hint">Whether to attempt to retrieve a JPG file while additional post processing, these are
-					usually on XXX releases.<br/></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="processvideos">Process Video Samples:</label></td>
-			<td>
-				{html_radios id="processvideos" name='processvideos' values=$yesno_ids output=$yesno_names selected=$fsite->processvideos separator='<br />'}
-				<div class="hint">Whether to attempt to process a video sample, these videos are very short 1-3 seconds,
-					100KB on average, in ogg video format. You must have ffmpeg for this.<br/></div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="segmentstodownload">Number of Segments to download for video/jpg
-					samples:</label></td>
-			<td>
-				<input class="short" id="segmentstodownload" name="segmentstodownload" type="text"
-					   value="{$fsite->segmentstodownload}"/>
-
-				<div class="hint">The maximum number of segments to download to generate the sample video file or jpg
-					sample image. (Default 2)
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="ffmpeg_duration">Video sample file duration for ffmpeg:</label></td>
-			<td>
-				<input class="short" id="ffmpeg_duration" name="ffmpeg_duration" type="text"
-					   value="{$fsite->ffmpeg_duration}"/>
-
-				<div class="hint">The maximum duration (In Seconds) for ffmpeg to generate the sample for. (Default 5)
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="extractusingrarinfo">Extract RAR/ZIP using rarinfo:</label></td>
-			<td>
-				{html_radios id="extractusingrarinfo" name='extractusingrarinfo' values=$yesno_ids output=$yesno_names selected=$fsite->extractusingrarinfo separator='<br />'}
-				<div class="hint">Whether to use rarinfo or 7zip/unrar directly to decompress zip/rar files.
-					<br /><strong>Using rarinfo is faster, but the extracted files are not as large which leads to smaller video samples/ potentially black preview screenshots.</strong>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxnestedlevels">How many levels deep to go into nested rar/zip files:</label></td>
-			<td>
-				<input class="short" id="maxnestedlevels" name="maxnestedlevels" type="text" value="{$fsite->maxnestedlevels}"/>
-				<div class="hint">If a rar/zip has rar/zip inside of it, how many times should we go in those inner rar/zip files.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="innerfileblacklist">Inner file black list Regex:</label></td>
-			<td>
-				<textarea rows="3" placeholder="Example: /setup\.exe|password\.url/i" id="innerfileblacklist" name="innerfileblacklist">{$fsite->innerfileblacklist}</textarea>
-				<div class="hint">You can add a regex here to set releases to potentially passworded when a file name inside a rar/zip matches this regex.
-					<br /><strong>You must ensure this regex is valid, a non valid regex will cause errors during processing!</strong>
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset id="site_requidset">
-	<legend>RequestID Settings</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="lookup_reqids">Lookup Request IDs:</label></td>
-			<td>
-				{html_options style="width:180px;" id="lookup_reqids" name='lookup_reqids' values=$lookup_reqids_ids output=$lookup_reqids_names selected=$fsite->lookup_reqids}
-				<div class="hint">Whether to attempt to lookup Request IDs using the Request id link below. This will rename your releases to proper PreDB names.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="request_url">Request id Link:</label></td>
-			<td>
-				<input id="request_url" class="long" name="request_url" type="text" value="{$fsite->request_url}"/>
-				<div class="hint">Optional URL to lookup Request IDs. [REQUEST_ID] gets replaced with the request id from the
-					post. [GROUP_NM] Gets replaced with the group name.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="request_hours">Max hours to recheck Request IDs:</label></td>
-			<td>
-				<input id="request_hours" class="short" name="request_hours" type="text" value="{$fsite->request_hours}"/>
-				<div class="hint">The maximum hours after a release is added to recheck for a Request id match.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Advanced - Postprocessing Settings</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="timeoutseconds">Time in seconds to kill unrar/7zip/mediainfo/ffmpeg/avconv:</label></td>
-			<td>
-				<input class="short" id="timeoutseconds" name="timeoutseconds" type="text" value="{$fsite->timeoutseconds}"/>
-				<div class="hint">How much time to wait for unrar/7zip/mediainfo/ffmpeg/avconv before killing it, set to 0 to disable.
-					60 is a good value. Requires the GNU Timeout path to be set.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="maxaddprocessed">Maximum add PP per run:</label></td>
-			<td>
-				<input class="short" id="maxaddprocessed" name="maxaddprocessed" type="text"
-					   value="{$fsite->maxaddprocessed}"/>
-
-				<div class="hint">The maximum amount of releases to process for passwords/previews/mediainfo per run.
-					Every release gets processed here. This uses NNTP an connection, 1 per thread. This does not query
-					Amazon.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxpartsprocessed">Maximum add PP parts downloaded:</label></td>
-			<td>
-				<input class="short" id="maxpartsprocessed" name="maxpartsprocessed" type="text"
-					   value="{$fsite->maxpartsprocessed}"/>
-
-				<div class="hint">If a part fails to download while post processing, this will retry up to the amount
-					you set, then give up.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="passchkattempts">Maximum add PP parts checked:</label></td>
-			<td>
-				<input class="short" id="passchkattempts" name="passchkattempts" type="text"
-					   value="{$fsite->passchkattempts}"/>
-
-				<div class="hint">This overrides the above setting if set above 1. How many parts to check for a
-					password before giving up. This slows down post processing massively, better to leave it 1.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxnfoprocessed">Maximum NFO files per run:</label></td>
-			<td>
-				<input class="short" id="maxnfoprocessed" name="maxnfoprocessed" type="text"
-					   value="{$fsite->maxnfoprocessed}"/>
-
-				<div class="hint">The maximum amount of NFO files to process per run. This uses NNTP an connection, 1
-					per thread. This does not query Amazon.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxrageprocessed">Maximum TVRage per run:</label></td>
-			<td>
-				<input class="short" id="maxrageprocessed" name="maxrageprocessed" type="text"
-					   value="{$fsite->maxrageprocessed}"/>
-
-				<div class="hint">The maximum amount of TV shows to process with TVRage per run. This does not use an
-					NNTP connection or query Amazon.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maximdbprocessed">Maximum movies per run:</label></td>
-			<td>
-				<input class="short" id="maximdbprocessed" name="maximdbprocessed" type="text"
-					   value="{$fsite->maximdbprocessed}"/>
-
-				<div class="hint">The maximum amount of movies to process with IMDB per run. This does not use an NNTP
-					connection or query Amazon.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxanidbprocessed">Maximum anidb per run:</label></td>
-			<td>
-				<input class="short" id="maxanidbprocessed" name="maxanidbprocessed" type="text"
-					   value="{$fsite->maxanidbprocessed}"/>
-
-				<div class="hint">The maximum amount of anime to process with anidb per run. This does not use an NNTP
-					connection or query Amazon.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxmusicprocessed">Maximum music per run:</label></td>
-			<td>
-				<input class="short" id="maxmusicprocessed" name="maxmusicprocessed" type="text"
-					   value="{$fsite->maxmusicprocessed}"/>
-
-				<div class="hint">The maximum amount of music to process with amazon per run. This does not use an NNTP
-					connection.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxgamesprocessed">Maximum games per run:</label></td>
-			<td>
-				<input class="short" id="maxgamesprocessed" name="maxgamesprocessed" type="text"
-					   value="{$fsite->maxgamesprocessed}"/>
-
-				<div class="hint">The maximum amount of games to process with amazon per run. This does not use an NNTP
-					connection.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="maxbooksprocessed">Maximum books per run:</label></td>
-			<td>
-				<input class="short" id="maxbooksprocessed" name="maxbooksprocessed" type="text"
-					   value="{$fsite->maxbooksprocessed}"/>
-
-				<div class="hint">The maximum amount of books to process with amazon per run. This does not use an NNTP
-					connection
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="fixnamesperrun">fixReleaseNames per Run:</label></td>
-			<td>
-				<input class="short" id="fixnamesperrun" name="fixnamesperrun" type="text"
-					   value="{$fsite->fixnamesperrun}"/>
-
-				<div class="hint">The maximum number of releases to check per run(threaded script only).</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="amazonsleep">Amazon sleep time:</label></td>
-			<td>
-				<input class="short" id="amazonsleep" name="amazonsleep" type="text" value="{$fsite->amazonsleep}"/>
-
-				<div class="hint">Sleep time in milliseconds to wait in between amazon requests. If you thread
-					post-proc, multiply by the number of threads. ie Postprocessing Threads = 12, Amazon sleep time =
-					12000<br/><a href="https://affiliate-program.amazon.com/gp/advertising/api/detail/faq.html">https://affiliate-program.amazon.com/gp/advertising/api/detail/faq.html</a>
-				</div>
-			</td>
-		</tr>
-
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Connection Settings</legend>
-	<table class="input">
-
-		<tr>
-			<td style="width:180px;"><label for="nntpretries">NNTP Retry Attempts:</label></td>
-			<td>
-				<input class="short" id="nntpretries" name="nntpretries" type="text" value="{$fsite->nntpretries}"/>
-
-				<div class="hint">The maximum number of retry attmpts to connect to nntp provider. On error, each retry
-					takes approximately 5 seconds nntp returns reply. (Default 10)
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="nntpproxy">Use NNTP Proxy:</label></td>
-			<td>
-				{html_radios id="nntpproxy" name='nntpproxy' values=$yesno_ids output=$yesno_names selected=$fsite->nntpproxy separator='<br />'}
-				<div class="hint">
-					<strong>nntpproxy does not support the POST usenet command which is required for uploading usenet comments when using sharing.</strong>
-					Using the NNTP Proxy for newznab can improve performance of newznab. It uses
-					connection pooling which not only give more control over the number of connections to use but also
-					reduces time for connection setup/teardown. The proxy also takes care of compressed headers for you.
-					To use this featrure you will need to install socketpool (sudo pip install socketpool or sudo easy_install socketpool)
-					(ensure python2 is default) and edit the configuration file (nntpproxy.conf and nntpproxy_a.conf) in the
-					update_scripts/nix_scripts/tmux/python/lib (copy sample) directory and finally edit your www/config.php file
-					to use the proxy (username and password are ignored by the proxy - make then anything you like - the
-					proxy doesn't use ssl either). Make sure you turn off the use compressed headers option here in site
-					preferences (the proxy uses compressed headers by default and passes on decompressed data).
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="alternate_nntp">Alternate NNTP Provider:</label></td>
-			<td>
-				{html_radios id="alternate_nntp" name='alternate_nntp' values=$yesno_ids output=$yesno_names selected=$fsite->alternate_nntp separator='<br />'}
-				<div class="hint">This sets Postproccessing Additional/Nfo to use the alternate NNTP provider as set in
-					config.php.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Advanced - Threaded Settings</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="binarythreads">Update Binaries Threads:</label></td>
-			<td>
-				<input class="short" id="binarythreads" name="binarythreads" type="text"
-					   value="{$fsite->binarythreads}"/>
-
-				<div class="hint">The number of threads for update_binaries. If you notice that you are getting a lot of
-					parts into the partrepair table, it is possible that you USP is not keeping up with the requests.
-					Try to reduce the threads. At least until the cause can be determined.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="backfillthreads">Backfill Threads:</label></td>
-			<td>
-				<input class="short" id="backfillthreads" name="backfillthreads" type="text"
-					   value="{$fsite->backfillthreads}"/>
-
-				<div class="hint">The number of threads for backfill.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="releasesthreads">Update Releases Threads:</label></td>
-			<td>
-				<input class="short" id="releasethreads" name="releasethreads" type="text"
-					   value="{$fsite->releasethreads}"/>
-
-				<div class="hint">The number of threads for releases update scripts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="nzbthreads">Import-nzb Threads:</label></td>
-			<td>
-				<input class="short" id="nzbthreads" name="nzbthreads" type="text" value="{$fsite->nzbthreads}"/>
-
-				<div class="hint">The number of threads for import-nzb(bulk). This will thread each subfolder.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="postthreads">Postprocessing Additional Threads:</label></td>
-			<td>
-				<input class="short" id="postthreads" name="postthreads" type="text" value="{$fsite->postthreads}"/>
-
-				<div class="hint">The number of threads for additional postprocessing. This includes deep rar
-					inspection, preview and sample creation and nfo processing.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="nfothreads">NFO Threads:</label></td>
-			<td>
-				<input class="short" id="nfothreads" name="nfothreads" type="text" value="{$fsite->nfothreads}"/>
-				<div class="hint">The number of threads for nfo postprocessing.
-					The max is 16, if you set anything higher it will use 16.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="reqidthreads">Request id Threads:</label></td>
-			<td>
-				<input class="short" id="reqidthreads" name="reqidthreads" type="text" value="{$fsite->reqidthreads}"/>
-				<div class="hint">The number of threads for local Request id processing.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="postthreadsnon">Postprocessing Non-Amazon Threads:</label></td>
-			<td>
-				<input class="short" id="postthreadsnon" name="postthreadsnon" type="text"
-					   value="{$fsite->postthreadsnon}"/>
-
-				<div class="hint">The number of threads for non-amazon postprocessing. This includes movies, anime and
-					tv lookups.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="fixnamethreads">fixReleaseNames Threads:</label></td>
-			<td>
-				<input class="short" id="fixnamethreads" name="fixnamethreads" type="text"
-					   value="{$fsite->fixnamethreads}"/>
-
-				<div class="hint">The number of threads for fixReleasesNames. This includes md5, nfos, par2 and
-					filenames.
-				</div>
-			</td>
-		</tr>
-
-	</table>
-</fieldset>
-
-<fieldset>
-<legend>User Settings</legend>
-<table class="input">
-
-<tr>
-	<td style="width:160px;"><label for="registerstatus">Registration Status</label>:</td>
-	<td>
-		{html_radios id="registerstatus" name='registerstatus' values=$registerstatus_ids output=$registerstatus_names selected=$fsite->registerstatus separator='<br />'}
-		<div class="hint">The status of registrations to the site.</div>
-	</td>
-</tr>
-
-<tr>
-	<td><label for="storeuserips">Store User Ip</label>:</td>
-	<td>
-		{html_radios id="storeuserips" name='storeuserips' values=$yesno_ids output=$yesno_names selected=$fsite->storeuserips separator='<br />'}
-		<div class="hint">Whether to store the users ip address when they signup or login.</div>
-	</td>
-</tr>
-
-<tr>
-  <td style="width:130px;"><label for="userdownloadpurgedays">User Downloads Purge Days</label>:</td>
-  <td>
-    <input id="userdownloadpurgedays" class="short" name="userdownloadpurgedays" type="text" value="{$fsite->userdownloadpurgedays}" />
-    <div class="hint">The number of days to preserve user download history, for use when checking limits being hit. Set to zero will remove all records of what users download, but retain history of when, so that role based limits can still be applied.</div>
-  </td>
-</tr>
-
-<tr>
-  <td style="width:130px;"><label for="userhostexclusion">IP Whitelist</label>:</td>
-  <td>
-    <input id="userhostexclusion" class="medium" name="userhostexclusion" type="text" value="{$fsite->userhostexclusion}" />
-    <div class="hint">A comma separated list of IP addresses which will be excluded from user limits on number of requests and downloads per IP address. Include values for google reader and other shared services which may be being used.</div>
-  </td>
-</tr>
-</table>
-</fieldset>
-
-<fieldset>
-<legend>Recaptcha</legend>
-<table class="input">
-
-<tr>
-  <td style="width:130px;"><label for="recaptchapublickey">ReCaptcha Public Key</label>:</td>
-  <td>
-    <input id="recaptchapublickey" class="medium" name="recaptchapublickey" type="text" value="{$fsite->recaptchapublickey}" />
-    <div class="hint">The public key supplied by recaptcha.net. Sign up for recaptcha at <a href="https://www.google.com/recaptcha/admin/create">https://www.google.com/recaptcha/admin/create</a></div>
-  </td>
-</tr>
-
-<tr>
-  <td style="width:130px;"><label for="recaptchaprivatekey">ReCaptcha Private Key</label>:</td>
-  <td>
-    <input id="recaptchaprivatekey" class="medium" name="recaptchaprivatekey" type="text" value="{$fsite->recaptchaprivatekey}" />
-    <div class="hint">The private key supplied by recaptcha.net</div>
-  </td>
-</tr>
-
-
-
-<tr>
-	<td><label for="registerrecaptcha">Register Recaptcha</label>:</td>
-	<td>
-		{html_radios id="registerrecaptcha" name='registerrecaptcha' values=$yesno_ids output=$yesno_names selected=$fsite->registerrecaptcha separator='<br />'}
-		<div class="hint">Whether to display a ReCaptcha captcha for registering.</div>
-	</td>
-</tr>
-
-</table>
-</fieldset>
-
-<input type="submit" value="Save Site Settings" />
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/site-stats.tpl b/lib/copy_this/www/templates/nntmux/views/admin/site-stats.tpl
deleted file mode 100644
index a66ea97df..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/site-stats.tpl
+++ /dev/null
@@ -1,186 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $topgrabs|count > 0}
-	<h2>Top Grabbers</h2>
-
-	<table style="width:100%;margin-top:10px;" class="data highlight">
-		<tr>
-			<th>User</th>
-			<th>Grabs</th>
-		</tr>
-
-		{foreach from=$topgrabs item=result}
-			<tr class="{cycle values=",alt"}">
-				<td width="75%"><a href="{$smarty.const.WWW_TOP}/user-edit.php?id={$result.id}">{$result.username}</a></td>
-				<td>{$result.grabs}</td>
-			</tr>
-		{/foreach}
-
-	</table>
-
-	<br/><br/>
-{/if}
-
-<h2>Signups</h2>
-
-<table style="width:100%;margin-top:10px;" class="data highlight Sortable">
-	<tr>
-		<th>Month</th>
-		<th>Signups</th>
-	</tr>
-
-	{foreach from=$usersbymonth item=result}
-		{assign var="totusers" value=$totusers+$result.num}
-		<tr class="{cycle values=",alt"}">
-			<td width="75%">{$result.mth}</td>
-			<td>{$result.num}</td>
-		</tr>
-	{/foreach}
-	<tr><td><strong>Total</strong></td><td><strong>{$totusers}</strong></td></tr>
-</table>
-
-<br/><br/>
-
-<h2>Users by Role</h2>
-
-<table style="width:100%;margin-top:10px;" class="data highlight Sortable">
-	<tr>
-		<th>Role</th>
-		<th>Users</th>
-	</tr>
-
-	{foreach from=$usersbyrole item=result}
-		{assign var="totrusers" value=$totrusers+$result.num}
-		<tr class="{cycle values=",alt"}">
-			<td width="75%">{$result.name}</td>
-			<td>{$result.num}</td>
-		</tr>
-	{/foreach}
-	<tr><td><strong>Total</strong></td><td><strong>{$totrusers}</strong></td></tr>
-</table>
-
-<br/><br/>
-
-<h2>Users by Hosthash</h2>
-
-<table style="width:100%;margin-top:10px;" class="data highlight Sortable">
-	<tr>
-		<th>Hosthash</th>
-		<th>User IDs (Edit)</th>
-		<th>User Names (Profiles)</th>
-	</tr>
-
-	{foreach from=$usersbyhosthash item=result}
-		<tr class="{cycle values=",alt"}">
-
-			<td width="25%">{$result.hosthash}</td>
-			<td>
-			{assign var="usersplits" value=","|explode:$result.user_string}
-			{foreach from=$usersplits item=usersplit}
-				<a href="{$smarty.const.WWW_TOP}/user-edit.php?id={$usersplit}">{$usersplit}</a>
-			{/foreach}
-			</td>
-			<td>
-			{assign var="usernsplits" value=","|explode:$result.user_names}
-			{foreach from=$usernsplits item=usernsplit}
-				<a href="{$smarty.const.WWW_TOP}/../profile?name={$usernsplit}">{$usernsplit}</a>
-			{/foreach}
-			</td>
-		</tr>
-	{/foreach}
-</table>
-
-<br/><br/>
-
-<h2>Access by Date</h2>
-
-<table style="width:100%;margin-top:10px;" class="data highlight Sortable">
-	<tr>
-		<th>Type</th>
-		<th>Last Day</th>
-		<th>2-7 Days</th>
-		<th>8-30 Days</th>
-		<th>1-3 Months</th>
-		<th>3-6 Months</th>
-		<th>+6 Months</th>
-	</tr>
-
-	{foreach from=$loginsbymonth item=result}
-		<tr class="{cycle values=",alt"}">
-			<td width="75%">{$result.type}</td>
-			<td>{$result.1day}</td>
-			<td>{$result.7day}</td>
-			<td>{$result.1month}</td>
-			<td>{$result.3month}</td>
-			<td>{$result.6month}</td>
-			<td>{$result.12month}</td>
-		</tr>
-	{/foreach}
-</table>
-
-<br/><br/>
-
-{if $topdownloads|count > 0}
-	<h2>Top Downloads</h2>
-
-	<table style="width:100%;margin-top:10px;" class="data highlight">
-		<tr>
-			<th>Release</th>
-			<th>Grabs</th>
-			<th>Days Ago</th>
-		</tr>
-
-		{foreach from=$topdownloads item=result}
-			<tr class="{cycle values=",alt"}">
-				<td width="75%"><a href="{$smarty.const.WWW_TOP}/../details/{$result.guid}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
-				{if $isadmin}<a href="{$smarty.const.WWW_TOP}/release-edit.php?id={$result.id}">[Edit]</a>{/if}</td>
-				<td>{$result.grabs}</td>
-				<td>{$result.adddate|timeago}</td>
-			</tr>
-		{/foreach}
-
-	</table>
-
-	<br/><br/>
-{/if}
-
-<h2>Releases Added In Last 7 Days</h2>
-
-<table style="width:100%;margin-top:10px;" class="data highlight">
-	<tr>
-		<th>Category</th>
-		<th>Releases</th>
-	</tr>
-
-	{foreach from=$recent item=result}
-		<tr class="{cycle values=",alt"}">
-			<td width="75%">{$result.title}</td>
-			<td>{$result.count}</td>
-		</tr>
-	{/foreach}
-
-</table>
-
-<br/><br/>
-
-{if $topcomments|count > 0}
-	<h2>Top Comments</h2>
-
-	<table style="width:100%;margin-top:10px;" class="data highlight">
-		<tr>
-			<th>Release</th>
-			<th>Comments</th>
-			<th>Days Ago</th>
-		</tr>
-
-		{foreach from=$topcomments item=result}
-			<tr class="{cycle values=",alt"}">
-				<td width="75%"><a href="{$smarty.const.WWW_TOP}/../details/{$result.guid}/#comments">{$result.searchname|escape:"htmlall"|replace:".":" "}</a></td>
-				<td>{$result.comments}</td>
-				<td>{$result.adddate|timeago}</td>
-			</tr>
-		{/foreach}
-
-	</table>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/spotnab-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/spotnab-edit.tpl
deleted file mode 100644
index 7d74aa219..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/spotnab-edit.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<table class="input">
-
-<tr>
-	<td>Name:</td>
-	<td>
-		<input type="hidden" name="id" value="{$source.id}" />
-		<input name="description" type="text" value="{$source.description}" />
-		<div class="hint">A name or description for the source.</div>
-	</td>
-</tr>
-
-<tr>
-	<td>Poster Username:</td>
-	<td>
-		<input name="username" type="text" value="{$source.username}" />
-		<div class="hint">The username part of the poster. eg nntp</div>
-	</td>
-</tr>
-<tr>
-	<td>Poster E-mail:</td>
-	<td>
-		<input name="useremail" type="text" value="{$source.useremail}" />
-		<div class="hint">The email part of the poster. eg spot@nntp.com</div>
-	</td>
-</tr>
-<tr>
-	<td>Usenet Group:</td>
-	<td>
-		<input name="usenetgroup" type="text" value="{$source.usenetgroup}" />
-		<div class="hint">Group to search when looking up posts for this source.</div>
-	</td>
-</tr>
-<tr>
-	<td>Public Key:</td>
-	<td>
-		<textarea class="autosize" name="publickey">{$source.publickey|escape:html}</textarea>
-		<div class="hint">Public Key needed to decode the posts specific for this source.</div>
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/spotnab-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/spotnab-list.tpl
deleted file mode 100644
index 0bfd8824d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/spotnab-list.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-{if $spotnab|@count == 0}
-No available sources. <a href="spotnab-edit.php?action=add">Add one?</a>
-{else}
-
-<table style="margin-top:10px;" class="data highlight">
-
-	<tr>
-		<th>source description</th>
-		<th>current status</th>
-		<th>comments</th>
-		<th>last broadcast</th>
-		<th>last update</th>
-		<th>options</th>
-	</tr>
-
-	{foreach from=$spotnab item=source}
-	<tr class="{cycle values=",alt"}">
-		<td><a href="{$smarty.const.WWW_TOP}/spotnab-edit.php?id={$source.id}">{$source.description}</a></td>
-		<td><a href="{$smarty.const.WWW_TOP}/spotnab-list.php?id={$source.id}&toggle={if $source.active=="1"}0{else}1{/if}" {if $source.active=="0"}style="color: #ce0000;"{/if}>{if $source.active=="1"}active{else}inactive{/if}</a></td>
-		<td>{$source.comments}</td>
-		<td>
-			{if $source.lastbroadcast != null}
-				{$source.lastbroadcast}
-			{else}
-				n/a
-			{/if}
-		</td>
-		<td>
-			{if $source.lastupdate != null}
-				{$source.lastupdate}
-			{else}
-				n/a
-			{/if}
-		</td>
-		<td><a href="{$smarty.const.WWW_TOP}/spotnab-edit.php?id={$source.id}">edit</a>&nbsp;<a class="confirm_action" href="{$smarty.const.WWW_TOP}/spotnab-delete.php?id={$source.id}">delete</a></td>
-	</tr>
-	{/foreach}
-
-
-</table>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-edit.tpl
deleted file mode 100644
index c1b55a8a0..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-edit.tpl
+++ /dev/null
@@ -1,124 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<form enctype="multipart/form-data" action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-<input type="hidden" name="from" value="{$smarty.get.from}" />
-
-<table class="input">
-
-<tr>
-	<td><label for="tvdbid">tvdbid</label>:</td>
-	<td>
-		<input id="tvdbid" class="long" name="tvdbid" type="text" value="{$series.tvdbid|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="actors">actors</label>:</td>
-	<td>
-		<input id="actors" class="long" name="actors" type="text" value="{$series.actors|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="airsday">airsday</label>:</td>
-	<td>
-		<input id="airsday" class="long" name="airsday" type="text" value="{$series.airsday|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="airstime">airstime</label>:</td>
-	<td>
-		<input id="airstime" class="long" name="airstime" type="text" value="{$series.airstime|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="contentrating">contentrating</label>:</td>
-	<td>
-		<input id="contentrating" class="long" name="contentrating" type="text" value="{$series.contentrating|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="firstaired">firstaired</label>:</td>
-	<td>
-		<input id="firstaired" class="long" name="firstaired" type="text" value="{$series.firstaired|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="genre">genre</label>:</td>
-	<td>
-		<input id="genre" class="long" name="genre" type="text" value="{$series.genre|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="imdbid">imdbid</label>:</td>
-	<td>
-		<input id="imdbid" class="long" name="imdbid" type="text" value="{$series.imdbid|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="network">network</label>:</td>
-	<td>
-		<input id="network" class="long" name="network" type="text" value="{$series.network|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="overview">overview</label>:</td>
-	<td>
-		<input id="overview" class="long" name="overview" type="text" value="{$series.overview|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="rating">rating</label>:</td>
-	<td>
-		<input id="rating" class="long" name="rating" type="text" value="{$series.rating|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="ratingcount">ratingcount</label>:</td>
-	<td>
-		<input id="ratingcount" class="long" name="ratingcount" type="text" value="{$series.ratingcount|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="runtime">runtime</label>:</td>
-	<td>
-		<input id="runtime" class="long" name="runtime" type="text" value="{$series.runtime|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="seriesname">seriesname</label>:</td>
-	<td>
-		<input id="seriesname" class="long" name="seriesname" type="text" value="{$series.seriesname|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td><label for="status">status</label>:</td>
-	<td>
-		<input id="status" class="long" name="status" type="text" value="{$series.status|escape:'htmlall'}" />
-	</td>
-</tr>
-
-<tr>
-	<td></td>
-	<td>
-		<input type="submit" value="Save" />
-	</td>
-</tr>
-
-</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-list.tpl
deleted file mode 100644
index b457497b5..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-list.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $serieslist}
-
-<div style="float:right;">
-
-	<form name="thetvdbsearch" action="">
-		<label for="seriesname">Title</label>
-		<input id="seriesname" type="text" name="seriesname" value="{$seriesname}" size="15" />
-		&nbsp;&nbsp;
-		<input type="submit" value="Go" />
-	</form>
-</div>
-
-{$pager}
-
-<br/><br/>
-
-<table style="width:100%;margin-top:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th style="width:90px;">TheTVDB id</th>
-		<th>Title</th>
-		<th style="width:120px;" class="mid">Options</th>
-	</tr>
-
-	{foreach from=$serieslist item=thetvdb}
-	<tr class="{cycle values=",alt"}">
-		<td class="less"><a href="{$site->dereferrer_link}http://thetvdb.com/?tab=series&id={$thetvdb.tvdbid}" title="View in TheTVDB">{$thetvdb.tvdbid}</a></td>
-		<td><a title="Edit" href="{$smarty.const.WWW_TOP}/thetvdb-edit.php?id={$thetvdb.tvdbid}">{$thetvdb.seriesname|escape:"htmlall"}</a></td>
-		<td class="mid"><a title="Delete this TheTVDB entry" href="{$smarty.const.WWW_TOP}/thetvdb-delete.php?id={$thetvdb.tvdbid}">delete</a> | <a title="Remove this tvdbid from all releases" href="{$smarty.const.WWW_TOP}/thetvdb-remove.php?id={$thetvdb.tvdbid}">remove</a></td>
-	</tr>
-	{/foreach}
-
-</table>
-    <br/>
-    {$pager}
-{else}
-<p>No TheTVDB episodes available.</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-remove.tpl b/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-remove.tpl
deleted file mode 100644
index 1c245f125..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/thetvdb-remove.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-Removed tvdbid from {$numtv} releases.
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/tmux-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/tmux-edit.tpl
deleted file mode 100644
index 1a6da66b7..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/tmux-edit.tpl
+++ /dev/null
@@ -1,773 +0,0 @@
-<h1>{$page->title}</h1>
-
-<form action="{$SCRIPT_NAME}?action=submit" method="post">
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<fieldset>
-	<legend>Tmux - How It Works</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="explain">Information:</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			</td>
-			<td>
-				<div class="explanation">Tmux is a screen multiplexer and at least version 1.6 is required. It is used
-					here to allow multiple windows per session and multiple panes per window.<br/><br/>
-					Each script is run in its own shell environment. It is not looped, but allowed to run once and then
-					exit. This notifies tmux that the pane is dead and can then be respawned with another iteration of
-					the script in a new shell environment. <br/>
-					This allows for scripts that crash to be restarted without user intervention.<br/><br/>
-					You can run multiple tmux sessions, but they all must have an associated tmux.conf file and all
-					sessions must use the same tmux.conf file.<br/><br/>
-
-					<h3><b>NOTICE:</b></h3> If "Save Tmux Settings" is the last thing you did on this page or if it is
-					the active element and if you have this page set to autorefresh or you refresh instead of following
-					a link to this page, you will set the db with the settings currently on this page, not reload from
-					db. This could cause tmux scripts to start while optimize or patch the database is running.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Monitor</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="running">Tmux Scripts Running:</label></td>
-			<td>
-				{html_radios id="running" name='running' values=$yesno_ids output=$yesno_names selected=$ftmux->running separator='<br />'}
-				<div class="hint">This is the shutdown, true/on, it runs, false/off and all scripts are terminated. This
-					will start/stop all panes without terminating the monitor pane. This is not instant, it does not
-					kill any panes, it simply does not aloow any pane to restart if set to false.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="monitor_delay">Monitor Loop Timer:</label></td>
-			<td>
-				<input id="monitor_delay" name="monitor_delay" class="short" type="text"
-					   value="{$ftmux->monitor_delay}"/>
-
-				<div class="hint">The time between query refreshes of monitor information, in seconds. This has no
-					effect on any other pane, except in regards to the kill switches. The other panes are checked every
-					10 seconds. The lower the number, the more often it queries the database for numbers.<br/>
-					<b>As the database gets larger in size, the longer this set of queries takes to process.</b><br/>
-					this has been mitigated by using memcache on the count queries. The will stay in cache for whatever
-					you have set in config.ini, default is 900 seconds.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="tmux_session">Tmux Session:</label></td>
-			<td>
-				<input id="tmux_session" name="tmux_session" class="long" type="text" value="{$ftmux->tmux_session}"/>
-
-				<div class="hint">Enter the session name to be used by tmux, no spaces allowed in the name, this can't
-					be changed after scripts start. If you are running multiple servers, you could put your hostname
-					here
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="monitor_path">Monitor a Ramdisk:</label></td>
-			<td>
-				<input id="monitor_path" name="monitor_path" class="long" type="text"
-					   value="{$ftmux->monitor_path}"/><br/>
-				<input id="monitor_path_a" name="monitor_path_a" class="long" type="text"
-					   value="{$ftmux->monitor_path_a}"/><br/>
-				<input id="monitor_path_b" name="monitor_path_b" class="long" type="text"
-					   value="{$ftmux->monitor_path_b}"/>
-
-				<div class="hint">Enter a path here to have Monitor monitor its usage and free space. Must be a valid
-					path.<br/>To use this example, add to fstab and edit path, gid and uid, then mount as user not root:<br/>tmpfs
-					/var/www/newznab/nzbfiles/tmpunrar tmpfs
-					user,uid=1000,gid=33,nodev,nodiratime,nosuid,size=1G,mode=777 0 0<br/>
-					gid == group id == /etc/groups, uid == user id == /etc/passwd
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="explain">Information:</label></td>
-			<td>
-				<div class="explanation">
-					Monitor is the name of the script that monitors all of the tmux panes and windows. It stops/stops
-					scripts based on user settings. It queries the database to provide stats from your newznab database.<br/><br/>
-					There are 2 columns of numbers, 'In Process' and 'In Database'. The 'In Process' is all releases
-					that need to be postprocessed. The 'In Database' is the number of releases matching that
-					category.<br/><br/>
-					The 'In Process' column has 2 sets of numbers, the total for each category that needs to be
-					postprocessed and inside the parenthesis is the difference from when the script started to what it
-					is now.<br/><br/>
-					The 'In Database' column also has 2 sets of numbers, the total releases for each category and inside
-					the parenthesis is the percentage that category is to the total number of releases.<br/><br/>
-					The Misc row means something different in both columns. The 'In Process' column is all releases that
-					have not had 'Additional' run on them. This includes 100% of all releases, not just the Misc
-					Category.<br/><br/>
-					The 'In Database' Misc means the number of releases that have not been categorized in any other
-					category.<br/>
-					The counts for parts, binaries and predb totals are estimates and can vary wildly between queries.
-					It is too slow to query the db for real counts, when using InnoDB. All of the other counts are
-					actual counts.<br/><br/>
-					The 'In Process' predb is the total unmatched predb and inside the parenthesis is the 'matched'
-					changed since the script started. The 'In Database' is the total matched predb's you have and the
-					number inside the parenthesis is the percentage of total releases that you have matched to a predb
-					release.<br/><br/>
-					The 'In Process' NZBs are total nzbs, inside the parenthesis is distinct nzbs and 'In Database' are
-					nzbs that have all parts available and will be processed on next run.<br/><br/>
-					The 'In Process' requestid is the number waiting to be processed and inside the parenthesis is the
-					number changed since the script started. The 'In Database' is the total matches of releases to
-					requestIDs and inside the parenthesis is percentage of total releases that you have matched to a
-					requestid.<br/><br/>
-					The 'In Process' rows PC and Pron are simply subsets of the 'In Process' row Misc. There is no
-					postprocessing specifically for these categories. The 'In Database' is the actual count for the
-					category.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Sequential</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="sequential">Run Sequential:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="sequential" name='sequential' values=$sequential_ids output=$sequential_names selected=$ftmux->sequential}
-				<div class="hint">Basic Sequential runs update_binaries, backfill and update releases_sequentially.<br/>Changing
-					requires restart.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="seq_timer">Sequential Sleep Timer:</label></td>
-			<td>
-				<input id="seq_timer" name="seq_timer" class="short" type="text" value="{$ftmux->seq_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="explain">Information:</label></td>
-			<td>
-				<div class="explanation">I do not recommend using sequential, as it is not tested enough.</div>
-			</td>
-		</tr>
-
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Update Binaries</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="binaries">Update Binaries:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="binaries" name='binaries' values=$binaries_ids output=$binaries_names selected=$ftmux->binaries}
-				<div class="hint">Choose to run update_binaries. Update binaries gets from your last_record to now.<br/>Simple
-					Threaded Update runs 1 group per thread.<br/>Complete Threaded Update splits all work across
-					multiple threads(binaries_safe_threaded.py).
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="bins_timer">Update Binaries Sleep Timer:</label></td>
-			<td>
-				<input id="bins_timer" name="bins_timer" class="short" type="text" value="{$ftmux->bins_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="bins_kill_timer">Binaries Kill Timer:</label></td>
-			<td>
-				<input id="bins_kill_timer" name="bins_kill_timer" class="short" type="text"
-					   value="{$ftmux->bins_kill_timer}"/>
-
-				<div class="hint">The time update_binaries is allowed to run with no updates.Time is in minutes.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Backfill</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="backfill">Backfill:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="backfill" name='backfill' values=$backfill_ids output=$backfill_names selected=$ftmux->backfill}
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{html_options style="width:180px;" class="siteeditstyle" id="backfill_order" name='backfill_order' values=$backfill_group_ids output=$backfill_group selected=$ftmux->backfill_order}
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{html_options style="width:180px;" class="siteeditstyle" id="backfill_days" name='backfill_days' values=$backfill_days_ids output=$backfill_days selected=$ftmux->backfill_days}
-				<div class="hint">Choose to run backfill type. Backfill gets from your first_record back.<br/>
-					Disabled - Disables backfill from running.<br/>
-					Safe - Backfills 1 group by backfill days (set in admin-view groups), using the number of threads
-					set in admin. This downloads Backfill Quantity times the Backfill Threads, each
-					loop(backfill_safe_threaded.py). <br \>
-					example: you have Backfill Threads = 10, Backfill Quantity = 20k, Max Messages = 5k: you will run 10
-					threads, queue of 40 and download 200k headers.<br/>
-					Interval - Backfills the number of groups (set in tmux), by backfill days (set in admin-view
-					groups), completely.<br/>
-					All - Backfills the number of groups (set in tmux), by Backfill Quantity (set in tmux), up to
-					backfill days (set in admin-view groups)<br/>
-					These settings are all per loop and does not use backfill date. Approximately every 80 minutes,
-					every activated backfill group will be backfilled (5k headers).This extra step is not necessary and
-					is not used when using Sequential.<br/>
-					Newest - Sorts the group selection with the least backfill days backfilled, first.<br/>
-					Oldest - Sorts the group selection with the most backfill days backfilled, first.<br/>
-					Alphabetical - Sorts the group selection from a to z.<br/>
-					Alphabetical Reverse - Sorts the group selection from z to a.<br /a>
-					Most Posts - Sorts the group selection by the highest number of posts, first.<br /a>
-					Fewest Posts - Sorts the group selection by the lowest number of posts, first.<br/>
-					Backfill days - Days per Group from admin->view group or the Safe Backfill Date from admin->tmux.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="backfill_qty">Backfill Quantity:</label></td>
-			<td>
-				<input id="backfill_qty" name="backfill_qty" class="short" type="text" value="{$ftmux->backfill_qty}"/>
-
-				<div class="hint">When not running backfill intervals, you select the number of headers per group per
-					thread to download.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="backfill_groups">Backfill Groups:</label></td>
-			<td>
-				<input id="backfill_groups" name="backfill_groups" class="short" type="text"
-					   value="{$ftmux->backfill_groups}"/>
-
-				<div class="hint">When running backfill the groups are sorted by the backfill method chosen above.
-					Select the number of groups to backfill per loop.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="back_timer">Backfill Sleep Timer:</label></td>
-			<td>
-				<input id="back_timer" name="back_timer" class="short" type="text" value="{$ftmux->back_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="progressive">Variable Sleep Timer:</label></td>
-			<td>
-				{html_radios id="progressive" name='progressive' values=$yesno_ids output=$yesno_names selected=$ftmux->progressive separator='<br />'}
-				<div class="hint">This will vary the backfill sleep depending on how many collections you have.<br/>ie
-					50k collections would make sleep timer 100 seconds and 20k releases would make sleep timer 40
-					seconds.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Import nzbs</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="import">Import nzbs:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="import" name='import' values=$import_ids output=$import_names selected=$ftmux->import}
-				<div class="hint">Choose to run import nzb script true/false. This can point to a single folder with
-					multiple subfolders on just the one folder. If you run this threaded, it will run 1 folder per
-					thread.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="nzbs">Nzbs Folder:</label></td>
-			<td>
-				<input id="nzbs" class="long" name="nzbs" type="text" value="{$ftmux->nzbs}"/>
-
-				<div class="hint">Set the path to the nzb dump you downloaded from torrents, this is the path to bulk
-					files folder of nzbs. This is by default, recursive and threaded. You set the threads in Advanced
-					Settings.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="import_count">Import nzbs per process:</label></td>
-			<td>
-				<input id="import_count" name="import_count" class="short" type="text" value="{$ftmux->import_count}"/>
-				<div class="hint">How many NZB files to import per process.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="import_timer">Import nzbs Sleep Timer:</label></td>
-			<td>
-				<input id="import_timer" name="import_timer" class="short" type="text" value="{$ftmux->import_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="explain">Information:</label></td>
-			<td>
-				<div class="explanation">This will import all nzbs in the given path. If in your path you have nzbs in
-					the root folder and subfolders(regardless of nzbs inside), threaded scripts will ignore all nzbs in
-					the root path. Then each subfolder is threaded.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Update Releases</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="releases">Update Releases:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="releases" name='releases' values=$releases_ids output=$releases_names selected=$ftmux->releases}
-				<div class="hint">Create releases, this is really only necessary to turn off when you only want to post
-					process. This runs "Categorizes releases in misc sections using the search name" on first loop and
-					has 33% chance of running on any other loop. Then runs update_releases.php 1 false to create new
-					releases.<br/>Threaded is only used with tablepergroup and is required if using tpg.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="rel_timer">Update Releases Sleep Timer:</label></td>
-			<td>
-				<input id="rel_timer" name="rel_timer" class="short" type="text" value="{$ftmux->rel_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Postprocessing</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="post">Postprocess Additional:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="post" name='post' values=$post_ids output=$post_names selected=$ftmux->post}
-				<div class="hint">Choose to do deep rar inspection, preview and sample creation and/or nfo processing.
-					true/false
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="post_timer">Postprocess Additional Sleep Timer:</label></td>
-			<td>
-				<input id="post_timer" name="post_timer" class="short" type="text" value="{$ftmux->post_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="post_kill_timer">Postprocess Kill Timer:</label></td>
-			<td>
-				<input id="post_kill_timer" name="post_kill_timer" class="short" type="text"
-					   value="{$ftmux->post_kill_timer}"/>
-
-				<div class="hint">The time postprocess is allowed to run with no updates to the screen.Time is in
-					seconds. Activity is detected when the history for the pane changes. The clock is restarted every
-					time activity is detected.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="post_amazon">Postprocess Amazon:</label></td>
-			<td>
-				{html_radios id="post_amazon" name='post_amazon' values=$yesno_ids output=$yesno_names selected=$ftmux->post_amazon separator='<br />'}
-				<div class="hint">Choose to do books, music and games lookups true/false</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="post_timer_amazon">Postprocess Amazon Sleep Timer:</label></td>
-			<td>
-				<input id="post_timer_amazon" name="post_timer_amazon" class="short" type="text"
-					   value="{$ftmux->post_timer_amazon}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="post_non">Postprocess Non-Amazon:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="post_non" name='post_non' values=$post_non_ids output=$post_non_names selected=$ftmux->post_non}
-				<div class="hint">Choose to do movies, anime and tv lookups. true/false</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="post_timer">Postprocess Non-Amazon Sleep Timer:</label></td>
-			<td>
-				<input id="post_timer_non" name="post_timer_non" class="short" type="text"
-					   value="{$ftmux->post_timer_non}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Comment Sharing</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="run_sharing">Comment Sharing :</label></td>
-			<td>
-				{html_radios id="run_sharing" name='run_sharing' values=$yesno_ids output=$yesno_names
-				selected=$ftmux->run_sharing separator='<br />'}
-
-				<div class="hint">Run Comment Sharing from within tmux if you have it enabled in Admin->Comment Sharing
-					Settings.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="sharing_timer">Comments Sharing Timer:</label></td>
-			<td>
-				<input class="short" id="sharing_timer" name="sharing_timer" type="text"
-					   value="{$ftmux->sharing_timer}"/>
-
-				<div class="hint">Set the sleep time between updates</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Fix Release Names</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="fix_names">Fix Release Names:</label></td>
-			<td>
-				{html_radios id="fix_names" name='fix_names' values=$yesno_ids output=$yesno_names selected=$ftmux->fix_names separator='<br />'}
-				<div class="hint">Choose to try to fix Releases Names using NFOs, par2 files, filenames, md5 and
-					sha1. true/false
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="fix_timer">Fix Release Names Sleep Timer:</label></td>
-			<td>
-				<input id="fix_timer" name="fix_timer" class="short" type="text" value="{$ftmux->fix_timer}"/>
-
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Remove Crap Releases</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="fix_crap">Remove Crap Releases:</label></td>
-			<td>
-				{html_radios id="fix_crap_opt" name='fix_crap_opt' onchange="enableFixCrapCustom()" values=$fix_crap_radio_names output=$fix_crap_radio_names selected=$ftmux->fix_crap_opt separator='<br />'}
-				<br>
-				<div class="checkbox-grid">
-					{if $ftmux->fix_crap_opt == "Custom"}
-						{html_checkboxes id="fix_crap" name='fix_crap' values=$fix_crap_check_names output=$fix_crap_check_names selected=explode(', ', $ftmux->fix_crap)}
-					{else}
-						{html_checkboxes id="fix_crap" name='fix_crap' disabled="true" readonly="true" values=$fix_crap_check_names output=$fix_crap_check_names selected=explode(', ', $ftmux->fix_crap)}
-					{/if}
-				</div>
-				<div class="hint">Choose to run Remove Crap Releases. You can enable all or some.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="crap_timer">Remove Crap Releases Sleep Timer:</label></td>
-			<td>
-				<input id="crap_timer" name="crap_timer" class="short" type="text" value="{$ftmux->crap_timer}"/>
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-<fieldset>
-	<legend>Decrypt Hashes</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="dehash">Decrypt Hash Based Release Names:</label></td>
-			<td>
-				{html_options style="width:180px;" class="siteeditstyle" id="dehash" name='dehash' values=$dehash_ids output=$dehash_names selected=$ftmux->dehash}
-				<div class="hint">Choose to run Decrypt Hashes true/false</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="dehash_timer">Decrypt Hashes Sleep Timer:</label></td>
-			<td>
-				<input id="dehash_timer" name="dehash_timer" class="short" type="text" value="{$ftmux->dehash_timer}"/>
-				<div class="hint">The time to sleep from the time the loop ends until it is restarted, in seconds.</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="explain">Information:</label></td>
-			<td>
-				<div class="explanation">Decrypt hashes works by matching a hashed release to the md5 of a release in
-					the predb.<br/>
-					Included in the same pane is Update Predb. This scrapes several predb sites and then tries to match
-					against releases.<br/>
-					This should be run along with fixReleasenames.php, this is faster, but only looks at releases.names.
-					fixReleasenames.php goes further and looks at releasefiles.name.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-<fieldset>
-	<legend>Update TV/Theater</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="update_tv">Update TV and Theater Schedules:</label></td>
-			<td>
-				{html_radios id="update_tv" name='update_tv' values=$yesno_ids output=$yesno_names selected=$ftmux->update_tv separator='<br />'}
-				<div class="hint">Choose to run Update TV and Theater Schedules true/false</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="tv_timer">Update TV and Theater Start Timer:</label></td>
-			<td>
-				<input id="tv_timer" name="tv_timer" class="short" type="text" value="{$ftmux->tv_timer}"/>
-
-				<div class="hint">This is a start timer. The default is 12 hours. This means that if enabled, is will
-					start/run every 12 hours, no matter how long it runs for.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>PreDb IRC Scraper</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="scrape_cz">Scrape Irc Channels:</label></td>
-			<td>
-				{html_radios id="scrape" name='scrape' values=$yesno_ids output=$yesno_names
-				selected=$ftmux->scrape separator='<br />'}
-				<div class="hint">Choose to run IRCScraper on irc channels. Setting SCRAPE_IRC_C_Z_BOOL parameter to
-					true or false in settings.php will toggle between the servers. The pane for this can not be
-					created after tmux starts.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="explain">Information:</label></td>
-			<td>
-				<div class="explanation">IRC Scraper will scrape several predb channels from the enabled servers.<br/>
-					Copy settings_example.php to settings.php in /lib/IRCScraper and change the settings.<br/>
-					As a minimum you should set the username and make sure it is unique.
-				</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Miscellaneous</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="niceness">Niceness:</label></td>
-			<td>
-				<input id="niceness" name="niceness" class="short" type="text" value="{$ftmux->niceness}"/>
-
-				<div class="hint">This sets the 'nice'ness of each script, default is 19, the lowest, the highest is -20
-					anything between -1 and -20 require root/sudo to run
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="postprocess_kill">Maximum Postprocess:</label></td>
-			<td>
-				<input id="postprocess_kill" name="postprocess_kill" class="short" type="text"
-					   value="{$ftmux->postprocess_kill}"/>
-
-				<div class="hint">Set this to any number above 0 and when it is exceeded, import, backfill and update
-					binaries will be terminated. 0 disables.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="write_logs">Logging:</label></td>
-			<td>
-				{html_radios id="write_logs" name='write_logs' values=$yesno_ids output=$yesno_names selected=$ftmux->write_logs separator='<br />'}
-				<div class="hint">Set this to write each panes output to a per pane per day log file. This adds GMT date
-					to the filename.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="powerline">Powerline Status Bar:</label></td>
-			<td>
-				{html_radios id="powerline" name='powerline' values=$yesno_ids output=$yesno_names selected=$ftmux->powerline separator='<br />'}
-				<div class="hint">Choose to use the Powerline tmux status bar. To make this pretty, you need to install
-					a patched font. This can be found on <a href="https://github.com/jonnyboy/powerline-fonts">my
-						fork</a> or <a href="https://github.com/Lokaltog/powerline-fonts">the original git</a><br \>You
-					will need to copy the default theme located at powerline/powerline/themes/default.sh to
-					powerline/powerline/themes/tmux.sh and edit that file for what is displayed, colors, etc.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="safebackfilldate">Safe Backfill Date:</label></td>
-			<td>
-				<input class="small" id="safebackfilldate" name="safebackfilldate" type="text"
-					   value="{$ftmux->safebackfilldate}"/>
-
-				<div class="hint">The target date for safe backfill. Format: YYYY-MM-DD</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<fieldset>
-	<legend>Server Monitors</legend>
-	<table class="input">
-		<tr>
-			<td style="width:180px;"><label for="showquery">Display Query Times:</label></td>
-			<td>
-				{html_radios id="showquery" name='showquery' values=$yesno_ids output=$yesno_names selected=$ftmux->showquery separator='<br />'}
-				<div class="hint">Choose to display the query times for each set of queries. true/false.</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="htop">htop:</label></td>
-			<td>
-				{html_radios id="htop" name='htop' values=$yesno_ids output=$yesno_names selected=$ftmux->htop separator='<br />'}
-				<div class="hint">htop - an interactive process viewer for Linux. The pane for this can not be created
-					after tmux starts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="nmon">nmon:</label></td>
-			<td>
-				{html_radios id="nmon" name='nmon' values=$yesno_ids output=$yesno_names selected=$ftmux->nmon separator='<br />'}
-				<div class="hint">nmon is short for Nigel's performance Monitor for Linux. The pane for this can not be
-					created after tmux starts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="vnstat">vnstat:</label></td>
-			<td>
-				{html_radios id="vnstat" name='vnstat' values=$yesno_ids output=$yesno_names selected=$ftmux->vnstat separator='<br />'}
-				<input id="vnstat_ARGS" name="vnstat_ARGS" class="text" type="text" value="{$ftmux->vnstat_ARGS}"/>
-
-				<div class="hint">vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log
-					of network traffic for the selected interface(s). Any additional arguments should be placed in the
-					text box. The pane for this can not be created after tmux starts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="tcptrack">tcptrack:</label></td>
-			<td>
-				{html_radios id="tcptrack" name='tcptrack' values=$yesno_ids output=$yesno_names selected=$ftmux->tcptrack separator='<br />'}
-				<input id="tcptrack_args" name="tcptrack_args" class="text" type="text"
-					   value="{$ftmux->tcptrack_args}"/>
-
-				<div class="hint">tcptrack displays the status of TCP connections that it sees on a given network
-					interface. tcptrack monitors their state and displays information such as state, source/destination
-					addresses and bandwidth usage in a sorted, updated list very much like the top(1) command. <br/>Any
-					additional arguments should be placed in the text box. <br/>You may need to run "sudo setcap
-					cap_net_raw+ep /usr/bin/tcptrack", to be able to run as user. The pane for this can not be created
-					after tmux starts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="bwmng">bwm-ng:</label></td>
-			<td>
-				{html_radios id="bwmng" name='bwmng' values=$yesno_ids output=$yesno_names selected=$ftmux->bwmng separator='<br />'}
-				<div class="hint">bwm-ng can be used to monitor the current bandwidth of all or some specific network
-					interfaces or disks (or partitions). The pane for this can not be created after tmux starts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="mytop">mytop:</label></td>
-			<td>
-				{html_radios id="mytop" name='mytop' values=$yesno_ids output=$yesno_names selected=$ftmux->mytop separator='<br />'}
-				<div class="hint">mytop - display MySQL server performance info like `top'. <br/>You will need to create
-					~/.mytop, an example can be found in 'perldoc mytop'. The pane for this can not be created after
-					tmux starts.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="showprocesslist">Show Process List:</label></td>
-			<td>
-				{html_radios id="showprocesslist" name='showprocesslist' values=$yesno_ids output=$yesno_names selected=$ftmux->showprocesslist separator='<br />'}
-				<input id="processupdate" name="processupdate" class="short" type="text"
-					   value="{$ftmux->processupdate}"/>
-
-				<div class="hint">This runs the watch command in its own pane. This could be used for a live 'slow query
-					monitor'. Just set the time above and only the queries that exceed it will be displayed.<br/>mysql
-					-e "SELECT time, state, rows_examined, info FROM information_schema.processlist WHERE command !=
-					\"Sleep\" AND time >= .5 ORDER BY time DESC \G"<br/>This shows a grid like layout with the full test
-					of the running queries.<br/>You will need to create a ~/.my.cnf for this to work properlly. The pane
-					for this can not be created after tmux starts and modifying the time above will have no effect until
-					a restart occurs.
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td style="width:180px;"><label for="console">Console:</label></td>
-			<td>
-				{html_radios id="console" name='console' values=$yesno_ids output=$yesno_names selected=$ftmux->console separator='<br />'}
-				<div class="hint">Open an empty bash shell. The pane for this can not be created after tmux starts.
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="width:180px;"><label for="debuginfo">Debug information:</label></td>
-			<td>
-				{html_radios id="debuginfo" name='debuginfo' values=$yesno_ids output=$yesno_names selected=$ftmux->debuginfo separator='<br />'}
-				<div class="hint">For developers. Whether to echo debug information in some scripts.</div>
-			</td>
-		</tr>
-	</table>
-</fieldset>
-
-<input type="submit" value="Save Tmux Settings"/>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/user-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/user-edit.tpl
deleted file mode 100644
index 5abbaf6bc..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/user-edit.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-<h1>{$page->title}</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<form action="{$SCRIPT_NAME}?action=submit" method="POST">
-
-	<table class="input">
-
-		<tr>
-			<td>Name:</td>
-			<td>
-				<input type="hidden" name="id" value="{$user.id}"/>
-				<input autocomplete="off" class="long" name="username" type="text" value="{$user.username}"/>
-			</td>
-		</tr>
-
-		<tr>
-			<td>Email:</td>
-			<td>
-				<input autocomplete="off" class="long" name="email" type="text" value="{$user.email}"/>
-			</td>
-		</tr>
-
-		<tr>
-			<td>Password:</td>
-			<td>
-				<input autocomplete="off" class="long" name="password" type="password" value=""/>
-				{if $user.id}
-					<div class="hint">Only enter a password if you want to change it.</div>
-				{/if}
-			</td>
-		</tr>
-		{if $user.id}
-			<tr>
-				<td>Grabs:</td>
-				<td>
-					<input class="short" name="grabs" type="text" value="{$user.grabs}"/>
-				</td>
-			</tr>
-			<tr>
-				<td>Invites:</td>
-				<td>
-					<input class="short" name="invites" type="text" value="{$user.invites}"/>
-				</td>
-			</tr>
-		{/if}
-		<tr>
-			<td>Movie View:</td>
-			<td>
-				<input name="movieview" type="checkbox" value="1" {if $user.movieview=="1"}checked="checked"{/if} />
-			</td>
-		</tr>
-
-		<tr>
-			<td>Music View:</td>
-			<td>
-				<input name="musicview" type="checkbox" value="1" {if $user.musicview=="1"}checked="checked"{/if} />
-			</td>
-		</tr>
-
-		<tr>
-			<td>Game View:</td>
-			<td>
-				<input name="gameview" type="checkbox" value="1" {if $user.gameview=="1"}checked="checked"{/if}" />
-			</td>
-		</tr>
-
-		<tr>
-			<td>XXX View:</td>
-			<td>
-				<input name="xxxview" type="checkbox" value="1" {if $user.xxxview=="1"}checked="checked"{/if}" />
-			</td>
-		</tr>
-
-		<tr>
-			<td>Console View:</td>
-			<td>
-				<input name="consoleview" type="checkbox" value="1" {if $user.consoleview=="1"}checked="checked"{/if} />
-			</td>
-		</tr>
-
-		<tr>
-			<td>Book View:</td>
-			<td>
-				<input name="bookview" type="checkbox" value="1" {if $user.bookview=="1"}checked="checked"{/if} />
-			</td>
-		</tr>
-
-		<tr>
-			<td><label for="role">Role</label>:</td>
-			<td>
-				{html_radios id="role" name='role' values=$role_ids output=$role_names selected=$user.role separator='<br />'}
-			</td>
-		</tr>
-
-		<tr>
-			<td><a id="notes"></a>Notes:</td>
-			<td>
-				<textarea class="autosize" maxlength="255" id="notes" name="notes">{$user.notes|escape:html}</textarea>
-			</td>
-		</tr>
-
-		<tr>
-			<td></td>
-			<td>
-				<input type="submit" value="Save"/>
-
-				{if $user.id != ""}
-					<input onclick="return doDelete();" type="button" value="Delete"/>
-					<script type="text/javascript">
-						function doDelete() {
-							if (confirm('Are you sure?'))
-								window.location = 'user-delete.php?id={$user.id}&redir=user-list.php';
-							else
-								return false;
-						}
-					</script>
-				{/if}
-			</td>
-		</tr>
-
-	</table>
-
-</form>
-
-
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/user-list.tpl b/lib/copy_this/www/templates/nntmux/views/admin/user-list.tpl
deleted file mode 100644
index bdfbadeaf..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/user-list.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<div style="float:right;">
-
-	<form name="usersearch" action="">
-		<label for="username">username</label>
-		<input id="username" type="text" name="username" value="{$username}" size="10" />
-		&nbsp;&nbsp;
-		<label for="email">email</label>
-		<input id="email" type="text" name="email" value="{$email}" size="10" />
-		&nbsp;&nbsp;
-		<label for="host">host</label>
-		<input id="host" type="text" name="host" value="{$host}" size="10" />
-		&nbsp;&nbsp;
-		<label for="role">role</label>
-		<select name="role">
-			<option value="">-- any --</option>
-			{html_options values=$role_ids output=$role_names selected=$role}
-		</select>
-		&nbsp;&nbsp;
-		<input type="submit" value="Go" />
-	</form>
-</div>
-
-{$pager}
-
-<br/><br/>
-
-<table style="width:100%;margin-top:10px;" class="data highlight">
-
-	<tr>
-		<th>name<br/><a title="Sort Descending" href="{$orderbyusername_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbyusername_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th>email<br/><a title="Sort Descending" href="{$orderbyemail_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbyemail_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th>host<br/><a title="Sort Descending" href="{$orderbyhost_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbyhost_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th>join date<br/><a title="Sort Descending" href="{$orderbycreateddate_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbycreateddate_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th>last login<br/><a title="Sort Descending" href="{$orderbylastlogin_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbylastlogin_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th>api access<br/><a title="Sort Descending" href="{$orderbyapiaccess_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbyapiaccess_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th class="mid">grabs<br/><a title="Sort Descending" href="{$orderbygrabs_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbygrabs_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th class="mid">invites</th>
-		<th class="mid">notes</th>
-		<th>role<br/><a title="Sort Descending" href="{$orderbyrole_desc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_down.gif" alt="" /></a><a title="Sort Ascending" href="{$orderbyrole_asc}"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/sorting/arrow_up.gif" alt="" /></a></th>
-		<th>options</th>
-	</tr>
-
-
-	{foreach from=$userlist item=user}
-	<tr class="{cycle values=",alt"}">
-		<td><a title="Edit user" href="{$smarty.const.WWW_TOP}/user-edit.php?id={$user.id}">{$user.username}</a></td>
-		<td><a title="View profile" href="{$smarty.const.WWW_TOP}/../profile?id={$user.id}">{$user.email}</a></td>
-		<td>{$user.host}</td>
-		<td title="{$user.createddate}">{$user.createddate|date_format}</td>
-		<td title="{$user.lastlogin}">{$user.lastlogin|date_format}</td>
-		<td title="{$user.apiaccess}">{$user.apiaccess|date_format}</td>
-		<td class="mid">{$user.grabs}</td>
-		<td class="mid">{$user.invites}</td>
-		<td class="mid"><a title="{if $user.notes|count_characters > 0}View{else}Add{/if} Notes" href="{$smarty.const.WWW_TOP}/user-edit.php?id={$user.id}#notes"><img src="{$smarty.const.WWW_TOP}/../templates/nntmux/images/icons/{if $user.notes|count_characters > 0}note_edit.png{else}note_add.png{/if}" alt="" /></a></td>
-		<td>{$user.rolename}</td>
-		<td>{if $user.role!="2"}<a class="confirm_action" href="{$smarty.const.WWW_TOP}/user-delete.php?id={$user.id}">delete</a>{/if}</td>
-	</tr>
-	{/foreach}
-
-
-</table>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/admin/view-logs.tpl b/lib/copy_this/www/templates/nntmux/views/admin/view-logs.tpl
deleted file mode 100644
index 3592a0b98..000000000
--- a/lib/copy_this/www/templates/nntmux/views/admin/view-logs.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<h1>{$page->title}</h1>
-<br /><br />
-{if $data}
-	{$pager}
-	<table style="width:100%;margin-top:10px;" class="data highlight">
-		<tr>
-			<th>
-				<select name="logtype" id="logtype" onchange="window.location='{$smarty.const.WWW_TOP}/view-logs.php?t=' + this.value;">
-					{foreach from=$types item=newtype}
-						<option {if $type == $newtype}selected="selected"{/if} value="{$newtype}">
-							{$newtype}
-						</option>
-					{/foreach}
-				</select>
-			</th>
-		</tr>
-		{foreach from=$data item=log}
-			<tr class="{cycle values=",alt"}">
-				<td>{$log}</td>
-			</tr>
-		{/foreach}
-	</table>
-	<br />
-	{$pager}
-{else}
-	<h3>Nothing found, maybe you need to turn on logging in : {$path}</h3>
-	<select name="logtype" id="logtype" onchange="window.location='{$smarty.const.WWW_TOP}/view-logs.php?t=' + this.value;">
-		{foreach from=$types item=newtype}
-			<option {if $type == $newtype}selected="selected"{/if} value="{$newtype}">
-				{$newtype}
-			</option>
-		{/foreach}
-	</select>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/apicaps.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/apicaps.tpl
deleted file mode 100644
index 58ee8e1a3..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/apicaps.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<caps>
-	<server appversion="{$site->version}" version="0.1" title="{$site->title|escape}" strapline="{$site->strapline|escape}" email="{$site->email}" url="{$serverroot}" image="{if $site->style != "" && $site->style != "/"}{$serverroot}theme/{$site->style}/images/banner.jpg{else}{$serverroot}images/banner.jpg{/if}" />
-	<limits max="100" default="100"/>
-
-	<registration available="yes" open="{if $site->registerstatus == 0}yes{else}no{/if}" />
-
-	<searching>
-		<search available="yes"/>
-		<tv-search available="yes"/>
-		<movie-search available="yes"/>
-		<audio-search available="yes"/>
-	</searching>
-
-	<categories>
-	{foreach from=$parentcatlist item=parentcat}
-<category id="{$parentcat.id}" name="{$parentcat.title|escape:html}"{if $parentcat.description != ""} description="{$parentcat.description|escape:html}"{/if}>
-{foreach from=$parentcat.subcatlist item=subcat}
-		<subcat id="{$subcat.id}" name="{$subcat.title|escape:html}"{if $subcat.description != ""} description="{$subcat.description|escape:html}"{/if}/>
-{/foreach}
-	</category>
-	{/foreach}
-</categories>
-
-	<groups>
-{foreach from=$grps item=grp}		<group id="{$grp.id}" name="{$grp.name|escape:html}"{if $grp.description != ""} description="{$grp.description|escape:html}"{/if} lastupdate="{$grp.last_updated|phpdate_format:"DATE_RSS"}"/>
-{/foreach}
-	</groups>
-
-	<genres>
-{foreach from=$genres item=genre}		<genre id="{$genre.id}" categoryid="{$genre.type}" name="{$genre.title|escape:html}"/>
-{/foreach}
-	</genres>
-</caps>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/apicomments.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/apicomments.tpl
deleted file mode 100644
index ce9c04de6..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/apicomments.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{$rsshead}
-
-{foreach from=$comments item=comm}
-<item>
-	<title>{$comm.username}</title>
-	<guid isPermaLink="true">{$serverroot}details/{$comm.guid}&amp;comment={$comm.id}</guid>
-	<link>{$serverroot}details/{$comm.guid}&amp;comment={$comm.id}</link>
-	<pubDate>{$comm.createddate|phpdate_format:"DATE_RSS"}</pubDate>
-	<description>{$comm.text|escape:"htmlall"}</description>
-</item>
-{/foreach}
-
-</channel>
-</rss>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/apidesc.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/apidesc.tpl
deleted file mode 100644
index 1c07aead3..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/apidesc.tpl
+++ /dev/null
@@ -1,163 +0,0 @@
-
-			<h1>{$page->title}</h1>
-
-			{if $site->apienabled != "1"}
-
-			<p>
-				The api is currently disabled. <a href="{$smarty.const.WWW_TOP}/contact-us">Contact us</a> if you require api access.
-			</p>
-
-			{else}
-
-			<p>
-				Here lives the documentation for the api for accessing nzb and index data. Api functions can be
-				called by either logged in users, or by providing an apikey.
-			</p>
-
-			{if $loggedin=="true"}
-				<p>
-					Your credentials should be provided as <span style="font-family:courier;">?apikey={$userdata.rsstoken}</span>
-				</p>
-			{/if}
-
-			<h2>Available Functions</h2>
-			<p>Use the parameter <span style="font-family:courier;">?t=</span> to specify the function being called.</p>
-
-			<h3>Server Functions</h3>
-			<ul>
-				<li>
-					<b>Capabilities</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=caps">?t=caps</a></span>
-					<br/>
-					Reports the capabilities of the server. Includes information about the server name, available search categories and version number of the newznab protocol being used.
-					<br/>
-					Capabilities does not require any credentials in order to be ran.
-				</li>
-			</ul>
-
-			<h3>User Functions</h3>
-			<ul>
-				<li>
-					<b>Register</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=register">?t=register&amp;email=user@newznab.com</a></span>
-					<br/>
-					Registers a new user account. Does not require any credentials in order to be ran.
-					<br/>
-					Returns either the registered username and password if successful or an error code.
-				</li>
-			</ul>
-
-			<h3>Search Functions</h3>
-			<ul>
-				<li>
-					<b>Search</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=search&amp;q=linux&amp;sort=size_asc">?t=search&amp;q=linux&amp;sort=size_asc</a></span>
-					<br/>
-					Returns a list of nzbs matching a query. You can also filter by site category, minimum size, maximum size or group name by including a comma separated list as follows <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=search&amp;cat=1000,2000&amp;group=a.b.multimedia&amp;minsize=0&amp;maxsize=734003200">?t=search&amp;cat=1000,2000&amp;group=a.b.multimedia&amp;minsize=0&amp;maxsize=734003200</a></span>. Include <span style="font-family:courier;">&amp;extended=1</span> to return extended information in the search results. Sort options include cat, name, size, files, stats, posted in the format "value_asc/desc", e.g. &amp;sort=size_desc
-				</li>
-				<li>
-					<b>TV</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=tvsearch&amp;q=beverly%20hillbillies&amp;season=1&amp;ep=1">?t=tvsearch&amp;q=beverly%20hillbillies&amp;season=1&amp;ep=1</a></span>
-					<br/>
-					Returns a list of nzbs matching a query, category, tvrageid, season or episode. You can also filter by site category by including a comma separated list of categories as follows <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=tvsearch&amp;rid=2204&amp;cat=1000,2000">?t=tvsearch&amp;rid=2204&amp;cat=1000,2000</a></span>.  Include <span style="font-family:courier;">&amp;extended=1</span> to return extended information in the search results.
-				</li>
-				<li>
-					<b>Movies</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=movie&amp;imdbid=0023010">?t=movie&amp;imdbid=0023010</a></span>
-					<br/>
-					Returns a list of nzbs matching a query, an imdbid and optionally a category or genre. Filter by site category by including a comma separated list of categories as follows <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=movie&amp;imdbid=0023010&amp;cat=2030,2040&amp;genre=Romance">?t=movie&amp;imdbid=0023010&amp;cat=2030,2040&amp;genre=Romance</a></span>.  Include <span style="font-family:courier;">&amp;extended=1</span> to return extended information in the search results.
-				</li>
-				<li>
-					<b>Music</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=music&amp;artist=Jack">?t=music&amp;artist=Jack</a></span>
-					<br/>
-					Returns a list of nzbs matching an audio based query and optionally a category. Filter by site category by including a comma separated list of categories as follows <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=music&amp;artist=Jack&amp;cat=2030,2040">?t=music&amp;artist=Jack&amp;cat=2030,2040</a></span>.  Include <span style="font-family:courier;">&amp;extended=1</span> to return extended information in the search results. Other search parameters include artist, album, label, year, genre (supports comma separated list).
-				</li>
-				<li>
-					<b>Book</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=book&amp;author=Daniel">?t=book&amp;author=Daniel</a></span>
-					<br/>
-					Returns a list of nzbs matching a book based query. Include <span style="font-family:courier;">&amp;extended=1</span> to return extended information in the search results. Other search parameters include title.
-				</li>
-				<li>
-					<b>Details</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=details&amp;id=9ca52909ba9b9e5e6758d815fef4ecda">?t=details&amp;id=9ca52909ba9b9e5e6758d815fef4ecda</a></span>
-					<br/>
-					Returns detailed information about an nzb.
-				</li>
-				<li>
-					<b>GetNfo</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=getnfo&amp;id=9ca52909ba9b9e5e6758d815fef4ecda">?t=getnfo&amp;id=9ca52909ba9b9e5e6758d815fef4ecda</a></span>
-					<br/>
-					Returns an nfo file for an nzb. Optional parameter <span style="font-family:courier;">&amp;raw=1</span> returns just the nfo file without the rss container.
-				</li>
-				<li>
-					<b>Comments</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=comments&amp;id=9ca52909ba9b9e5e6758d815fef4ecda">?t=comments&amp;id=9ca52909ba9b9e5e6758d815fef4ecda</a></span>
-					<br/>
-					Returns comments for an nzb.
-				</li>
-			</ul>
-
-			<h3>NZB Functions</h3>
-			<ul>
-				<li>
-					<b>Get</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=get&amp;id=9ca52909ba9b9e5e6758d815fef4ecda">?t=get&amp;id=9ca52909ba9b9e5e6758d815fef4ecda</a></span>
-					<br/>
-					Downloads the nzb file associated with an Id.
-				</li>
-				<li>
-					<b>CommentAdd</b> <span style="font-family:courier;"><a href="{$smarty.const.WWW_TOP}/api?t=commentadd&amp;id=9ca52909ba9b9e5e6758d815fef4ecda&amp;text=comment">?t=comments&amp;id=9ca52909ba9b9e5e6758d815fef4ecda&amp;text=comment</a></span>
-					<br/>
-					Adds a comment to an nzb.
-				</li>
-			</ul>
-
-			<h2>Output Format</h2>
-			<p>Obviously not appropriate to functions which return an nzb file.</p>
-			<ul>
-				<li>
-					Xml (default) <span style="font-family:courier;">?t=search&amp;q=linux&amp;o=xml</span>
-					<br/>
-					Returns the data in an xml document.
-				</li>
-				<li>
-					Json <span style="font-family:courier;">?t=search&amp;q=linux&amp;o=json</span>
-					<br/>
-					Returns the data in a json object.
-				</li>
-			</ul>
-
-			<h2>Extended Attributes</h2>
-			<p>Using the attrs tag and a comma separated list of supported values, extended information can be returned in the search results. <br/>For example <span style="font-family:courier;">?attrs=files,poster,group</span>. Note that not every attribute is available for every release type. Below is a list of some of the supported attributes. To return all known attributes per release use the parameter <span style="font-family:courier;">?extended=1</span>. See the API specification for a full list.</p>
-			<ul>
-				<li>files</li>
-				<li>poster</li>
-				<li>group </li>
-				<li>team  </li>
-				<li>grabs </li>
-				<li>password  </li>
-				<li>comments  </li>
-				<li>usenetdate </li>
-				<li>info    </li>
-				<li>year   </li>
-				<li>season  </li>
-				<li>episode </li>
-				<li>rageid </li>
-				<li>tvtitle  </li>
-				<li>tvairdate </li>
-				<li>video  </li>
-				<li>audio  </li>
-				<li>resolution </li>
-				<li>framerate</li>
-				<li>language  </li>
-				<li>subs    </li>
-				<li>imdb   </li>
-				<li>imdbscore </li>
-				<li>imdbtitle  </li>
-				<li>imdbtagline   </li>
-				<li>imdbplot </li>
-				<li>imdbyear   </li>
-				<li>imdbdirector  </li>
-				<li>imdbactors</li>
-				<li>genre   </li>
-				<li>artist  </li>
-				<li>album </li>
-				<li>publisher </li>
-				<li>tracks  </li>
-				<li>coverurl  </li>
-				<li>backdropcoverurl</li>
-				<li>review   </li>
-			</ul>
-
-			{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/apidetail.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/apidetail.tpl
deleted file mode 100644
index 6ee9b3c4f..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/apidetail.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{$rsshead}
-
-{foreach from=$releases item=release}
-<item>
-	<title>{$release.searchname}</title>
-	<guid isPermaLink="true">{$serverroot}details/{$release.guid}</guid>
-	<link>{$serverroot}getnzb/{$release.guid}.nzb&amp;i={$uid}&amp;r={$rsstoken}{if $del=="1"}&amp;del=1{/if}</link>
-	<comments>{$serverroot}details/{$release.guid}#comments</comments>
-	<pubDate>{$release.adddate|phpdate_format:"DATE_RSS"}</pubDate>
-	<category>{$release.category_name|escape:html}</category>
-	<description>{$release.searchname}</description>
-	<enclosure url="{$serverroot}getnzb/{$release.guid}.nzb&amp;i={$uid}&amp;r={$rsstoken}{if $del=="1"}&amp;del=1{/if}" length="{$release.size}" type="application/x-nzb" />
-
-	{foreach from=$release.category_ids|parray:"," item=cat}
-<newznab:attr name="category" value="{$cat}" />
-	{/foreach}
-<newznab:attr name="size" value="{$release.size}" />
-	<newznab:attr name="files" value="{$release.totalpart}" />
-	<newznab:attr name="poster" value="{$release.fromname|escape:html}" />
-	<newznab:attr name="guid" value="{$release.guid}" />
-{if $release.season != ""}	<newznab:attr name="season" value="{$release.season}" />
-{/if}
-{if $release.episode != ""}	<newznab:attr name="episode" value="{$release.episode}" />
-{/if}
-{if $release.rageid != "-1" && $release.rageid != "-2"}	<newznab:attr name="rageid" value="{$release.rageid}" />
-{if $release.tvtitle != ""}	<newznab:attr name="tvtitle" value="{$release.tvtitle|escape:html}" />
-{/if}
-{if $release.tvairdate != ""}	<newznab:attr name="tvairdate" value="{$release.tvairdate|phpdate_format:"DATE_RSS"}" />
-{/if}
-{/if}
-{if $release.imdbid != ""}	<newznab:attr name="imdb" value="{$release.imdbid}" />
-{/if}
-{if $mov.title != ""}	<newznab:attr name="imdbtitle" value="{$mov.title|escape:html}" />
-{/if}
-{if $mov.tagline != ""}	<newznab:attr name="imdbtagline" value="{$mov.tagline|escape:html}" />
-{/if}
-{if $mov.plot != ""}	<newznab:attr name="imdbplot" value="{$mov.plot|escape:html}" />
-{/if}
-{if $mov.rating != ""}	<newznab:attr name="imdbscore" value="{$mov.rating}" />
-{/if}
-{if $mov.genre != ""}	<newznab:attr name="genre" value="{$mov.genre|escape:html}" />
-{/if}
-{if $mov.year != ""}	<newznab:attr name="imdbyear" value="{$mov.year}" />
-{/if}
-{if $mov.director != ""}	<newznab:attr name="imdbdirector" value="{$mov.director|escape:html}" />
-{/if}
-{if $mov.actors != ""}	<newznab:attr name="imdbactors" value="{$mov.actors|escape:html}" />
-{/if}
-{if $mov.cover == 1}	<newznab:attr name="coverurl" value="{$serverroot}covers/movies/{$release.imdbid}-cover.jpg" />
-{/if}
-{if $mov.backdrop == 1}	<newznab:attr name="backdropurl" value="{$serverroot}covers/movies/{$release.imdbid}-backdrop.jpg" />
-{/if}
-{if $release.musicinfoid != "" && $release.mi_title != ""}	<newznab:attr name="album" value="{$release.mi_title|escape:html}" />
-{/if}
-{if $release.musicinfoid != "" && $release.mi_artist != ""}	<newznab:attr name="artist" value="{$release.mi_artist|escape:html}" />
-{/if}
-{if $release.musicinfoid != "" && $release.mi_publisher != ""}	<newznab:attr name="label" value="{$release.mi_publisher|escape:html}" />
-{/if}
-{if $release.musicinfoid != "" && $release.mi_tracks != ""}	<newznab:attr name="tracks" value="{$release.mi_tracks|escape:html}" />
-{/if}
-{if $release.musicinfoid != "" && $release.mi_review != ""}	<newznab:attr name="review" value="{$release.mi_review|escape:html}" />
-{/if}
-{if $release.musicinfoid != "" && $release.mi_cover == "1"}	<newznab:attr name="coverurl" value="{$serverroot}covers/music/{$release.musicinfoid}.jpg" />
-{/if}
-{if $release.musicinfoid != "" && $release.music_genrename != ""}	<newznab:attr name="genre" value="{$release.music_genrename|escape:html}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_author != ""}	<newznab:attr name="author" value="{$release.bi_author|escape:html}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_title != ""}	<newznab:attr name="booktitle" value="{$release.bi_title|escape:html}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_cover == "1"}	<newznab:attr name="coverurl" value="{$serverroot}covers/book/{$release.bookinfoid}.jpg" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_review != ""}	<newznab:attr name="review" value="{$release.bi_review|escape:html}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_publishdate != ""}	<newznab:attr name="publishdate" value="{$release.bi_publishdate|phpdate_format:"DATE_RSS"}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_publisher != ""}	<newznab:attr name="publisher" value="{$release.bi_publisher|escape:html}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_pages != ""}	<newznab:attr name="pages" value="{$release.bi_pages|escape:html}" />
-{/if}
-{if $release.bookinfoid != "" && $release.bi_isbn != ""}	<newznab:attr name="isbn" value="{$release.bi_isbn|escape:html}" />
-{/if}
-	<newznab:attr name="grabs" value="{$release.grabs}" />
-	<newznab:attr name="comments" value="{$release.comments}" />
-	<newznab:attr name="password" value="{$release.passwordstatus}" />
-	<newznab:attr name="usenetdate" value="{$release.postdate|phpdate_format:"DATE_RSS"}" />
-	<newznab:attr name="group" value="{$release.group_name|escape:html}" />
-
-</item>
-{/foreach}
-
-</channel>
-</rss>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/apinfo.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/apinfo.tpl
deleted file mode 100644
index 1d93713d9..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/apinfo.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{$rsshead}
-
-<item>
-	<title>{$release.searchname|escape:"htmlall"}</title>
-	<guid isPermaLink="true">{$serverroot}details/{$release.guid}</guid>
-	<link>{$serverroot}nfo/{$release.guid}</link>
-	<pubDate>{$release.postdate|phpdate_format:"DATE_RSS"}</pubDate> 
-	<description>{$nfoutf|escape:"htmlall"}</description>
-	<enclosure url="{$serverroot}api?t=getnfo&amp;id={$release.guid}&amp;raw=1&amp;i={$uid}&amp;r={$rsstoken}" length="{$nfoutf|count_characters:true}" type="text/x-nfo" />
-</item>
-
-</channel>
-</rss>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/apiresult.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/apiresult.tpl
deleted file mode 100644
index c3ea28b5d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/apiresult.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:newznab="http://www.newznab.com/DTD/2010/feeds/attributes/" encoding="utf-8">
-	<channel>
-		<atom:link href="{$serverroot}api" rel="self" type="application/rss+xml" />
-		<title>{$site->title|escape}</title>
-		<description>{$site->title|escape} API Results</description>
-		<link>{$serverroot}</link>
-		<language>en-gb</language>
-		<webMaster>{$site->email} ({$site->title|escape})</webMaster>
-		<category>{$site->meta_keywords}</category>
-		<image>
-			<url>{$serverroot}templates/nntmux/images/logo.png</url>
-			<title>{$site->title|escape}</title>
-			<link>{$serverroot}</link>
-			<description>Visit {$site->title|escape} - {$site->strapline|escape}</description>
-		</image>
-		<newznab:response offset="{$offset}" total="{if $releases|@count > 0}{$releases[0]._totalrows}{else}0{/if}" />
-		{foreach from=$releases item=release}
-			<item>
-				<title>{$release.searchname|escape:html}</title>
-				<guid isPermaLink="true">{$serverroot}details/{$release.guid}</guid>
-				<link>{$serverroot}getnzb/{$release.guid}.nzb&amp;i={$uid}&amp;r={$rsstoken}</link>
-				<comments>{$serverroot}details/{$release.guid}#comments</comments>
-				<pubDate>{$release.adddate|phpdate_format:"DATE_RSS"}</pubDate>
-				<category>{$release.category_name|escape:html}</category>
-				<description>{$release.searchname|escape:html}</description>
-				<enclosure url="{$serverroot}getnzb/{$release.guid}.nzb&amp;i={$uid}&amp;r={$rsstoken}" length="{$release.size}" type="application/x-nzb" />
-				{foreach from=$release.category_ids|parray:"," item=cat}
-					<newznab:attr name="category" value="{$cat}" />
-				{/foreach}
-				<newznab:attr name="size" value="{$release.size}" />
-				{if $release.coverurl != ""}
-					<newznab:attr name="coverurl" value="{$serverroot}covers/{$release.coverurl}" />
-				{/if}
-				{if $extended=="1"}
-					<newznab:attr name="files" value="{$release.totalpart}" />
-					<newznab:attr name="poster" value="{$release.fromname|escape:html}" />
-					{if $release.season != ""}
-						<newznab:attr name="season" value="{$release.season}" />
-					{/if}
-					{if $release.episode != ""}
-						<newznab:attr name="episode" value="{$release.episode}" />
-					{/if}
-					{if $release.rageid != "-1" && $release.rageid != "-2"}
-						<newznab:attr name="rageid" value="{$release.rageid}" />
-					{/if}
-					{if $release.tvtitle != ""}
-						<newznab:attr name="tvtitle" value="{$release.tvtitle|escape:html}" />
-					{/if}
-					{if $release.tvairdate != ""}
-						<newznab:attr name="tvairdate" value="{$release.tvairdate|phpdate_format:"DATE_RSS"}" />
-					{/if}
-					{if $release.imdbid != ""}
-						<newznab:attr name="imdb" value="{$release.imdbid}" />
-					{/if}
-					<newznab:attr name="grabs" value="{$release.grabs}" />
-					<newznab:attr name="comments" value="{$release.comments}" />
-					<newznab:attr name="password" value="{$release.passwordstatus}" />
-					<newznab:attr name="usenetdate" value="{$release.postdate|phpdate_format:"DATE_RSS"}" />
-					<newznab:attr name="group" value="{$release.group_name|escape:html}" />
-				{/if}
-			</item>
-		{/foreach}
-	</channel>
-</rss>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/articlesmenu.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/articlesmenu.tpl
deleted file mode 100644
index bfee2a63e..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/articlesmenu.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{if $articlecontentlist|@count > 0}
-<li class="menu_articles"> 
-	<h2>Articles</h2> 
-	<ul>
-	{foreach from=$articlecontentlist item=content}
-		<li class="mmenu{if $menu.newwindow =="1"}_new{/if}"><a {if $menu.newwindow =="1"}class="external" target="null"{/if} title="{$content.title}" href="{$smarty.const.WWW_TOP}/content/{$content.id}{$content.url}">{$content.title}</a></li>
-	{/foreach}
-	</ul>
-</li>
-{/if}
-
-
-	
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/basepage.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/basepage.tpl
deleted file mode 100644
index 5b5a036b1..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/basepage.tpl
+++ /dev/null
@@ -1,190 +0,0 @@
-<!doctype html>
-<html lang="en">
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
-<head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-	<meta name="keywords" content="{$page->meta_keywords}{if $page->meta_keywords != "" && $site->metakeywords != ""},{/if}{$site->metakeywords}" />
-	<meta name="description" content="{$page->meta_description}{if $page->meta_description != "" && $site->metadescription != ""} - {/if}{$site->metadescription}" />
-	<meta name="application-name" content="newznab-{$site->version}" />
-	<title>{$page->meta_title}{if $page->meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
-{if $loggedin=="true"}	<link rel="alternate" type="application/rss+xml" title="{$site->title} Full Rss Feed" href="{$smarty.const.WWW_TOP}/rss?t=0&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}" />{/if}
-
-	<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
-	<link href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css" rel="stylesheet" media="screen">
-	<link href="{$smarty.const.WWW_TOP}/templates/nntmux/styles/posterwall.css" rel="stylesheet" type="text/css" media="screen" />
-	<link href="{$smarty.const.WWW_TOP}/templates/nntmux/styles/style.css" rel="stylesheet" type="text/css" media="screen" />
-	<link href="{$smarty.const.WWW_TOP}/templates/nntmux/styles/jquery.qtip.css" rel="stylesheet" type="text/css" media="screen" />
-{if $site->google_adsense_acc != ''}	<link href="http://www.google.com/cse/api/branding.css" rel="stylesheet" type="text/css" media="screen" />
-{/if}
-	<!-- Manual Adjustment for Search input fields on browse pages. -->
-	<style>
-		select { min-width: 120px ; width: auto; }
-		input { width: 180px; }
-	</style>
-	<link rel="shortcut icon" type="image/ico" href="{$smarty.const.WWW_TOP}/templates/nntmux/images/favicon.ico"/>
-	<link rel="search" type="application/opensearchdescription+xml" href="{$smarty.const.WWW_TOP}/opensearch" title="{$site->title|escape}" />
-	<link href="//netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-glyphicons.css" rel="stylesheet">
-	<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.js"></script>
-	{literal}<script>window.jQuery || document.write('<script src="{/literal}{$smarty.const.WWW_TOP}{literal}/templates/nntmux/scripts/jquery-2.1.3.js"><\/script>')</script>{/literal}
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-	{literal}<script>window.jQuery || document.write('<script src="{/literal}{$smarty.const.WWW_TOP}{literal}/templates/nntmux/scripts/bootstrap.min.js"><\/script>')</script>{/literal}
-	<script type="text/javascript" src="https://code.jquery.com/jquery-migrate-1.2.1.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/templates/nntmux/scripts/jquery.colorbox-min.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/templates/nntmux/scripts/jquery.autosize-min.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/templates/nntmux/scripts/jquery.qtip2.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/templates/nntmux/scripts/utils.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_TOP}/templates/nntmux/scripts/sorttable.js"></script>
-
-	<!--[if lt IE 9]>
-	<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-	<script>window.html5 || document.write('<script src="{$smarty.const.WWW_TOP}/templates/nntmux/scripts/html5shiv.js"><\/script>')</script>
-	<![endif]-->
-
-	<script type="text/javascript">
-	/* <![CDATA[ */
-		var WWW_TOP = "{$smarty.const.WWW_TOP}";
-		var SERVERROOT = "{$serverroot}";
-		var UID = "{if $loggedin=="true"}{$userdata.id}{else}{/if}";
-		var RSSTOKEN = "{if $loggedin=="true"}{$userdata.rsstoken}{else}{/if}";
-	/* ]]> */
-	</script>
-	{$page->head}
-</head>
-<body {$page->body}>
-
-	{strip}
-	<div id="statusbar">
-		{if $loggedin=="true"}
-			Welcome back <a href="{$smarty.const.WWW_TOP}/profile">{$userdata.username}</a>. <a href="{$smarty.const.WWW_TOP}/logout">Logout</a>
-		{else}
-			<a href="{$smarty.const.WWW_TOP}/login">Login</a> or <a href="{$smarty.const.WWW_TOP}/register">Register</a>
-		{/if}
-	</div>
-	{/strip}
-
-	<div id="logo">
-		<a class="logolink" title="{$site->title} Logo" href="{$smarty.const.WWW_TOP}{$site->home_link}"><img class="logoimg" alt="{$site->title} Logo" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/clearlogo.png" /></a>
-
-		<h1><a href="{$smarty.const.WWW_TOP}{$site->home_link}">{$site->title}</a></h1>
-		<p><em>{$site->strapline}</em></p>
-
-		{$site->adheader}
-
-	</div>
-	<hr />
-
-	<div id="header">
-		<div id="menu">
-
-			{if $loggedin=="true"}
-				{$header_menu}
-			{/if}
-
-		</div>
-	</div>
-
-	<div id="page">
-
-		<div id="content">
-			{$page->content}
-		</div>
-
-		<div id="sidebar">
-			<ul>
-
-			{$main_menu}
-
-			{$article_menu}
-
-			{$useful_menu}
-
-			{$recentposts_menu}
-
-			{if $site->google_adsense_acc != '' && $site->google_adsense_search != ''}
-			{literal}
-				<li>
-				<h2>Search for {/literal}{$site->term_plural}{literal}</h2>
-				<div style="padding-left:20px;">
-					<div class="cse-branding-bottom" style="background-color:#FFFFFF;color:#000000">
-					  <div class="cse-branding-form">
-					    <form action="http://www.google.co.uk/cse" id="cse-search-box" target="_blank">
-					      <div>
-					        <input type="hidden" name="cx" value="partner-{/literal}{$site->google_adsense_acc}{literal}:{/literal}{$site->google_adsense_search}{literal}" />
-					        <input type="hidden" name="ie" value="UTF-8" />
-					        <input type="text" name="q" size="10" />
-					        <input type="submit" name="sa" value="Search" />
-					      </div>
-					    </form>
-					  </div>
-					  <div class="cse-branding-logo">
-					    <img src="http://www.google.com/images/poweredby_transparent/poweredby_FFFFFF.gif" alt="Google" />
-					  </div>
-					  <div class="cse-branding-text">
-					    Custom Search
-					  </div>
-					</div>
-				</div>
-				</li>
-			{/literal}
-			{/if}
-
-			<li>
-				<a title="Sickbeard - The ultimate usenet PVR" href="http://www.sickbeard.com/"><img class="menupic" alt="Sickbeard - The ultimate usenet PVR" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sickbeard.png" /></a>
-			</li>
-			<li>
-				<a title="Sabznbd - A great usenet binary downloader" href="http://www.sabnzbd.org/"><img class="menupic" alt="Sabznbd - A great usenet binary downloader" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sabnzbd.png" /></a>
-			</li>
-			<li>
-					<a title="NZBGet - The most efficient usenet downloader" href="http://nzbget.net/"><img class="menupic" alt="NZBGet - The most efficient usenet downloader" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/nzbget.png" /></a>
-			</li>
-			<li>
-					<a title="Couchpotato - Download movies automatically, easily and in the best quality as soon as they are available" href="https://couchpota.to/"><img class="menupic" alt="Couchpotato - Download movies automatically, easily and in the best quality as soon as they are available" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/couchpotato.png" /></a>
-			</li>
-			</ul>
-		</div>
-
-		<div style="clear: both;text-align:right;">
-			<a class="w3validator" href="http://validator.w3.org/check?uri=referer">
-			<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/valid-xhtml10.png" alt="Valid XHTML 1.0 Transitional" height="31" width="88" />
-			</a>
-		</div>
-
-	</div>
-
-	<div class="footer">
-	<p>
-		{$site->footer}
-		<br /><br /><br /><a title="newznab - A usenet indexing web application with community features." href="http://www.newznab.com/">newznab</a> all rights reserved {$smarty.now|date_format:"%Y"}. <br/> <a title="Chat about newznab" href="http://www.newznab.com/chat.html">newznab chat</a> <br/><a href="{$smarty.const.WWW_TOP}/terms-and-conditions">{$site->title} terms and conditions</a>
-	</p>
-	</div>
-	{if $site->google_analytics_acc != ''}
-	{literal}
-	<script type="text/javascript">
-	/* <![CDATA[ */
-	  var _gaq = _gaq || [];
-	  _gaq.push(['_setAccount', '{/literal}{$site->google_analytics_acc}{literal}']);
-	  _gaq.push(['_trackPageview']);
-	  _gaq.push(['_trackPageLoadTime']);
-
-	  (function() {
-		var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-	  })();
-	/* ]]> */
-	</script>
-
-	{/literal}
-	{/if}
-
-{if $loggedin=="true"}
-<input type="hidden" name="UID" value="{$userdata.id}" />
-<input type="hidden" name="RSSTOKEN" value="{$userdata.rsstoken}" />
-{/if}
-
-</body>
-</html>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/books.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/books.tpl
deleted file mode 100644
index 47c0c77eb..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/books.tpl
+++ /dev/null
@@ -1,202 +0,0 @@
-<h1>Browse Books</h1>
-
-<form name="browseby" action="books">
-	<table class="rndbtn" border="0" cellpadding="2" cellspacing="0">
-		<tr>
-			<th class="left"><label for="author">Author</label></th>
-			<th class="left"><label for="title">Title</label></th>
-			<th></th>
-		</tr>
-		<tr>
-			<td><input id="author" type="text" name="author" value="{$author}" size="15"/></td>
-			<td><input id="title" type="text" name="title" value="{$title}" size="15"/></td>
-			<td><input type="submit" value="Go"/></td>
-		</tr>
-	</table>
-</form>
-<p></p>
-
-{$site->adbrowse}
-
-<div class="btn-group">
-	<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-</div>
-
-{if $results|@count > 0}
-
-	<form id="nzb_multi_operations_form" action="get">
-
-		<table width="100%">
-			<tr>
-				<td>{$pager}</td>
-				<td style="text-align:right">
-					<div class="nzb_multi_operations">
-						<small>With selected:</small>
-						<div class="btn-group">
-							<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-							<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-							{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-							{if $isadmin}
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-							{/if}
-						</div>
-						<div class="btn-group">
-							<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-						</div>
-					</div>
-				</td>
-			</tr>
-		</table>
-
-		<table style="width:100%;" class="data highlight icons" id="coverstable">
-			<tr>
-				<th width="130"><input type="checkbox" class="nzb_check_all"/></th>
-				<th>author<br/><a title="Sort Descending" href="{$orderbyauthor_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyauthor_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>genre<br/><a title="Sort Descending" href="{$orderbygenre_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbygenre_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>posted<br/><a title="Sort Descending" href="{$orderbyposted_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyposted_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-			</tr>
-
-			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}">
-					<td class="mid">
-						<div class="movcover">
-							<a class="title" href="{$site->dereferrer_link}{$result.url}">
-								<img class="shadow"
-									 src="{$smarty.const.WWW_TOP}/covers/book/{if $result.cover == 1}{$result.bookinfoid}.jpg{else}no-cover.jpg{/if}"
-									 width="120" border="0"
-									 alt="{$result.author|escape:"htmlall"} - {$result.title|escape:"htmlall"}"/>
-							</a>
-
-							<div class="movextra">
-								{if $result.url != ""}<a class="rndbtn" target="_blank"
-														 href="{$site->dereferrer_link}{$result.url}"
-														 name="amazon{$result.bookinfoid}" title="View amazon page">
-										Amazon</a>{/if}
-								<a class="rndbtn" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name}"
-								   title="Browse releases in {$result.group_name|replace:"alt.binaries":"a.b"}">Grp</a>
-							</div>
-						</div>
-					</td>
-					<td colspan="3" class="left">
-						<h2>
-							<a href="{$smarty.const.WWW_TOP}/books/?author={$result.author}">{$result.author|escape:"htmlall"}</a>
-							- {$result.title|escape:"htmlall"}</h2>
-
-						{if $result.review != ""}<span
-								class="descinitial">{$result.review|escape:"htmlall"|nl2br|magicurl|truncate:"350":"</span><a class=\"descmore\" href=\"#\">more...</a>"}{if $result.review|strlen > 350}
-							<span class="descfull">{$result.review|escape:"htmlall"|nl2br|magicurl}</span>{else}</span>{/if}
-							<br/>
-							<br/>
-						{/if}
-
-						{if $result.publisher != ""}<b>Publisher:</b>{$result.publisher|escape:"htmlall"}<br/>{/if}
-						{if $result.publishdate != ""}<b>Published:</b>{$result.publishdate|date_format}<br/>{/if}
-						{if $result.pages != ""}<b>Pages:</b>{$result.pages}<br/>{/if}
-						{if $result.isbn != ""}<b>ISBN:</b>{$result.isbn}<br/>{/if}
-
-						<div class="movextra">
-							<table>
-								{assign var="msplits" value=","|explode:$result.grp_release_id}
-								{assign var="mguid" value=","|explode:$result.grp_release_guid}
-								{assign var="mnfo" value=","|explode:$result.grp_release_nfoID}
-								{assign var="mgrp" value=","|explode:$result.grp_release_grpname}
-								{assign var="mname" value="#"|explode:$result.grp_release_name}
-								{assign var="mpostdate" value=","|explode:$result.grp_release_postdate}
-								{assign var="msize" value=","|explode:$result.grp_release_size}
-								{assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts}
-								{assign var="mcomments" value=","|explode:$result.grp_release_comments}
-								{assign var="mgrabs" value=","|explode:$result.grp_release_grabs}
-								{assign var="mpass" value=","|explode:$result.grp_release_password}
-								{assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount}
-								{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-								{foreach from=$msplits item=m}
-									<tr id="guid{$mguid[$m@index]}" {if $m@index > 1}class="mlextra"{/if}>
-										<td>
-											<div class="icon"><input type="checkbox" class="nzb_check"
-																	 value="{$mguid[$m@index]}"/></div>
-										</td>
-										<td>
-											<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"seourl"}">{$mname[$m@index]|escape:"htmlall"}</a>
-
-											<div>
-												Posted {$mpostdate[$m@index]|timeago}
-												,  {$msize[$m@index]|fsize_format:"MB"}, <a title="View file list"
-																							href="{$smarty.const.WWW_TOP}/filelist/{$mguid[$m@index]}">{$mtotalparts[$m@index]}
-													files</a>, <a
-														title="View comments for {$mname[$m@index]|escape:"htmlall"}"
-														href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/#comments">{$mcomments[$m@index]}
-													cmt{if $mcomments[$m@index] != 1}s{/if}</a>, {$mgrabs[$m@index]}
-												grab{if $mgrabs[$m@index] != 1}s{/if},
-												{if $mnfo[$m@index] > 0}<a
-													href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}"
-													title="View Nfo" class="modal_nfo" rel="nfo">Nfo</a>, {/if}
-												{if $mpass[$m@index] == 1}Passworded, {elseif $mpass[$m@index] == 2}Potential Password, {/if}
-												<a href="{$smarty.const.WWW_TOP}/browse?g={$mgrp[$m@index]}"
-												   title="Browse releases in {$mgrp[$m@index]|replace:"alt.binaries":"a.b"}">Grp</a>
-												{if $mhaspreview[$m@index] == 1 && $userdata.canpreview == 1}, <a
-														href="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"
-														name="name{$mguid[$m@index]}"
-														title="Screenshot of {$mname[$m@index]|escape:"htmlall"}"
-														class="modal_prev" rel="preview">Preview</a>{/if}
-												{if $minnerfiles[$m@index] > 0}, <a href="#" onclick="return false;"
-																					class="mediainfo"
-																					title="{$mguid[$m@index]}">
-														Media</a>{/if}
-											</div>
-										</td>
-										<td class="icons">
-											<div class="icon icon_nzb"><a title="Download Nzb"
-																		  href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}/{$mname[$m@index]|escape:"url"}">
-													&nbsp;</a></div>
-											<div class="icon icon_cart" title="Add to Cart"></div>
-											{if $sabintegrated}
-												<div class="icon icon_sab" title="Send to my Queue"></div>
-											{/if}
-											{if $weHasVortex}
-												<div class="icon icon_nzbvortex" title="Send to NZBVortex"></div>
-											{/if}
-										</td>
-									</tr>
-									{if $m@index == 1 && $m@total > 2}
-										<tr>
-											<td colspan="5"><a class="mlmore" href="#">{$m@total-2} more...</a></td>
-										</tr>
-									{/if}
-								{/foreach}
-							</table>
-						</div>
-					</td>
-				</tr>
-			{/foreach}
-
-		</table>
-
-		<div class="nzb_multi_operations">
-			<small>With Selected:</small>
-			<input type="button" class="rndbtn nzb_multi_operations_download" value="Download NZBs"/>
-			<input type="button" class="rndbtn nzb_multi_operations_cart" value="Add to Cart"/>
-			{if $sabintegrated}<input type="button" class="rndbtn nzb_multi_operations_sab" value="Send tomy Queue"/>{/if}
-		</div>
-
-		<br/>
-
-		{$pager}
-
-	</form>
-{/if}
-
-<br/><br/><br/>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl
deleted file mode 100644
index e2d01966f..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl
+++ /dev/null
@@ -1,234 +0,0 @@
-<h1>Browse {$catname|escape:"htmlall"}</h1>
-
-{$site->adbrowse}
-
-{if $shows}
-	<center>
-		<div class="btn-group">
-			<a class="btn btn-small" href="{$smarty.const.WWW_TOP}/series" title="View available TV series">Series List</a> |
-			<a class="btn btn-small" title="Manage your shows" href="{$smarty.const.WWW_TOP}/myshows">Manage My Shows</a> |
-			<a class="btn btn-small" title="All releases in your shows as an RSS feed" href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss <i class="fa-icon-rss"></i></a>
-		</div>
-	</center>
-	<br/>
-{/if}
-
-{if $results|@count > 0}
-
-	<form id="nzb_multi_operations_form" action="get">
-
-	<table width="100%">
-		<tr>
-			<td>{$pager}</td>
-			<td style="text-align:right"><div class="nzb_multi_operations">
-					<small>With selected:</small>
-					<div class="btn-group">
-						<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-						<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-						{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-						{if $isadmin}
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-						{/if}</div>
-					{if $category==1000}<div class="btn-group"><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/console" title="Covers"><i class="icon-picture"></i></a><span class="btn btn-mini disabled"><i class="icon-list"></i></span></div>
-					{elseif $category==2000}<div class="btn-group"><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/movies" title="Covers"><i class="icon-picture"></i></a><span class="btn btn-mini disabled"><i class="icon-list"></i></span></div>
-					{elseif $category==3000}<div class="btn-group"><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/music" title="Covers"><i class="icon-picture"></i></a><span class="btn btn-mini disabled"><i class="icon-list"></i></span></div>
-					{elseif $category==4050}<div class="btn-group"><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/games" title="Covers"><i class="icon-picture"></i></a><span class="btn btn-mini disabled"><i class="icon-list"></i></span></div>
-					{elseif $category==6000}<div class="btn-group"><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/xxx" title="Covers"><i class="icon-picture"></i></a><span class="btn btn-mini disabled"><i class="icon-list"></i></span></div>
-					{elseif $category==7020}<div class="btn-group"><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/books" title="Covers"><i class="icon-picture"></i></a><span class="btn btn-mini disabled"><i class="icon-list"></i></span></div>
-					{/if}
-				</div>
-			</td>
-		</tr>
-	</table>
-
-		<table style="width:100%;" class="data highlight icons" id="browsetable">
-			<tr>
-				<th><input id="chkSelectAll" type="checkbox" class="nzb_check_all"/><label for="chkSelectAll"
-																						   style="display:none;">Select
-						All</label></th>
-				<th>name<br/><a title="Sort Descending" href="{$orderbyname_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbyname_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-								alt="Sort Ascending"/></a></th>
-				<th>category<br/><a title="Sort Descending" href="{$orderbycat_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbycat_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-								alt="Sort Ascending"/></a></th>
-				<th>posted<br/><a title="Sort Descending" href="{$orderbyposted_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbyposted_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-								alt="Sort Ascending"/></a></th>
-				<th>size<br/><a title="Sort Descending" href="{$orderbysize_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbysize_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-								alt="Sort Ascending"/></a></th>
-				<th>files<br/><a title="Sort Descending" href="{$orderbyfiles_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbyfiles_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-								alt="Sort Ascending"/></a></th>
-				<th>stats<br/><a title="Sort Descending" href="{$orderbystats_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbystats_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-								alt="Sort Ascending"/></a></th>
-				<th></th>
-			</tr>
-
-			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}{if $lastvisit|strtotime<$result.adddate|strtotime} new{/if}"
-					id="guid{$result.guid}">
-					<td class="check"><input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check"
-											 value="{$result.guid}"/></td>
-					<td class="item">
-						<label for="chk{$result.guid|substr:0:7}"><a class="title" title="View details"
-																	 href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a></label>
-
-						{if $userdata.canpre == 1 && $result.nuketype != ''}
-							&nbsp;
-							<img title="{$result.nuketype}"
-								 src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/nuke.png" width="10"
-								 height="10" alt="{$result.nuketype}"/>
-						{/if}
-
-						<div class="resextra">
-							<div class="btns" style="float:right">
-								{release_flag($result.searchname, browse)}
-								{if $result.passwordstatus == 1}
-									<span class="icon-stack" title="Potentially Passworded"><i class="icon-check-empty icon-stack-base"></i><i class="icon-unlock-alt"></i></span>
-								{elseif $result.passwordstatus == 2}
-									<span class="icon-stack" title="Broken Post"><i class="icon-check-empty icon-stack-base"></i><i class="icon-unlink"></i></span>
-								{elseif $result.passwordstatus == 10}
-									<span class="icon-stack" title="Passworded Archive"><i class="icon-check-empty icon-stack-base"></i><i class="icon-lock"></i></span>
-								{/if}
-								{if $result.videostatus > 0}
-									<a
-											class="label label-default model_prev"
-											href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
-											title="This release has a video preview"
-											rel="preview"
-											><i class="icon-youtube-play"></i></a>
-								{/if}
-								{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo" class="modal_nfo rndbtn" rel="nfo"> Nfo</a>{/if}
-								{if $result.imdbid > 0}
-									<a href="#" name="name{$result.imdbid}" title="View movie info" class="modal_imdb rndbtn" rel="movie" >Cover</a>
-								{/if}
-									{if $result.preid > 0 && $userdata.canpre == 1}<span class="preinfo rndbtn"
-																						 title="{$result.searchname}">
-										PreDB</span>{/if}
-									{if $result.prehashid > 0}<span class="prehashinfo rndbtn"
-																	title="{$result.prehashid}">Prehash</span>{/if}
-									{if $result.movieinfoID > 0}<a
-										href="{$smarty.const.WWW_TOP}/movies?imdb={$result.imdbid}"
-										title="View movie info" class="rndbtn" rel="movie" >Movie</a>{/if}
-									{if $result.haspreview == 1 && $userdata.canpreview == 1}<a
-										href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-										name="name{$result.guid}" title="View Screenshot" class="modal_prev rndbtn"
-										rel="preview">Preview</a>{/if}
-									{if $result.jpgstatus == 1 && $userdata.canpreview == 1}<a
-										href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg"
-										name="name{$result.guid}"title="Sample of {$result.searchname|escape:"htmlall"}"
-										class="modal_prev rndbtn" rel="preview">Sample</a>{/if}
-
-									{if $result.haspreview == 2 && $userdata.canpreview == 1}<a href="#"
-																								name="audio{$result.guid}"
-																								title="Listen to {$result.searchname|escape:"htmlall"}"
-																								class="audioprev rndbtn"
-																								rel="audio">Listen</a>
-									<audio id="audprev{$result.guid}" preload="none">
-										<source src="{$smarty.const.WWW_TOP}/covers/audio/{$result.guid}.mp3"
-												type="audio/mpeg">
-										<source src="{$smarty.const.WWW_TOP}/covers/audio/{$result.guid}.ogg"
-												type="audio/ogg"></audio>{/if}
-									{if $result.musicinfoid > 0}<a href="#" name="name{$result.musicinfoid}"
-																   title="View music info" class="modal_music rndbtn"
-																   rel="music" >Cover</a>{/if}
-									{if $result.consoleinfoid > 0}<a href="#" name="name{$result.consoleinfoid}"
-																	 title="View console info"
-																	 class="modal_console rndbtn" rel="console" >
-											Cover</a>{/if}
-									{if $result.bookinfoid > 0}<a href="#" name="name{$result.bookinfoid}"
-																  title="View book info" class="modal_book rndbtn"
-																  rel="console" >Cover</a>{/if}
-									{if $result.rageid > 0}<a class="rndbtn"
-															  href="{$smarty.const.WWW_TOP}/series/{$result.rageid}"
-															  title="View all episodes">View Series</a>{/if}
-									{if $result.anidbid > 0}<a class="rndbtn"
-															   href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}"
-															   title="View all episodes">View Anime</a>{/if}
-									{if $result.tvairdate != ""}<span class="seriesinfo rndbtn" title="{$result.guid}">
-										Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>{/if}
-									{if $result.reID > 0}<span class="mediainfo rndbtn" title="{$result.guid}">
-											Media</span>{/if}
-								{if $result.group_name != ""}
-									<a class="rndbtn" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."}</a>
-								{/if}
-								{/strip}</div>
-						</div>
-					</td>
-					<td class="less"><a title="Browse {$result.category_name}"
-										href="{$smarty.const.WWW_TOP}/browse?t={$result.categoryid}">{$result.category_name}</a>
-					</td>
-					<td class="less mid" title="{$result.postdate}">{$result.postdate|timeago}</td>
-					<td class="less right">{$result.size|fsize_format:"MB"}{if $result.completion > 0}
-							<br/>
-							{if $result.completion < 100}<span class="warning">{$result.completion}
-								%</span>{else}{$result.completion}%{/if}{/if}</td>
-					<td class="less mid">
-						<a title="View file list"
-						   href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
-						{if $result.rarinnerfilecount > 0}
-							<div class="rarfilelist">
-								<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/magnifier.png"
-									 alt="{$result.guid}" class="tooltip"/>
-							</div>
-						{/if}
-					</td>
-					<td class="less nowrap"><a title="View comments"
-											   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments}
-							cmt{if $result.comments != 1}s{/if}</a><br/>{$result.grabs}grab{if $result.grabs != 1}s{/if}
-					</td>
-					<td class="icons">
-						<div class="icon icon_nzb"><a title="Download Nzb"
-													  href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}">
-								&nbsp;</a></div>
-						<div class="icon icon_cart" title="Add to Cart"></div>
-						{if $sabintegrated}
-							<div class="icon icon_sab" title="Send to my Queue"></div>
-						{/if}
-						{if $weHasVortex}
-							<div class="icon icon_nzbvortex" title="Send to NZBVortex"></div>
-						{/if}
-					</td>
-				</tr>
-			{/foreach}
-
-		</table>
-
-		<div class="nzb_multi_operations">
-			<small>With Selected:</small>
-			<input type="button" class="rndbtn nzb_multi_operations_download" value="Download NZBs"/>
-			<input type="button" class="rndbtn nzb_multi_operations_cart" value="Add to Cart"/>
-			{if $sabintegrated}
-				<input type="button" class="nzb_multi_operations_sab" value="Send to my Queue" />
-			{/if}
-			{if $isadmin}
-				<input type="button" class="rndbtn nzb_multi_operations_edit" value="Edit"/>
-				<input type="button" class="rndbtn nzb_multi_operations_delete" value="Del"/>
-			{/if}
-		</div>
-
-		<br/>
-
-		{$pager}
-
-	</form>
-{/if}
-
-<br/><br/><br/>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/browsegroup.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/browsegroup.tpl
deleted file mode 100644
index 44f55a5d6..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/browsegroup.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
- 
-<h1>Browse Groups</h1>
-
-
-{$site->adbrowse}	
-	
-{if $results|@count > 0}
-
-<table style="width:100%;" class="data highlight" id="browsetable">
-	<tr>
-                <th>name<br/><a title="Sort Descending" href="{$orderbyname_desc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending" /></a><a title="Sort Ascending" href="{$orderbyname_asc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending" /></a></th>
-                <th>description<br/><a title="Sort Descending" href="{$orderbydescription_desc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending" /></a><a title="Sort Ascending" href="{$orderbydescription_asc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending" /></a></th>
-                <th>updated<br/><a title="Sort Descending" href="{$orderbyupdated_desc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending" /></a><a title="Sort Ascending" href="{$orderbyupdated_asc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending" /></a></th>
-                <th>releases<br/><a title="Sort Descending" href="{$orderbyreleases_desc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending" /></a><a title="Sort Ascending" href="{$orderbyreleases_asc}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending" /></a></th>
-	</tr>
-
-	{foreach from=$results item=result}
-		{if $result.num_releases > 0}
-		<tr class="{cycle values=",alt"}">
-			<td>
-				<a title="Browse releases from {$result.name|replace:"alt.binaries":"a.b"}" href="{$smarty.const.WWW_TOP}/browse?g={$result.name}">{$result.name|replace:"alt.binaries":"a.b"}</a>
-			</td>
-			<td>
-					{$result.description}
-			</td>
-			<td class="less">{$result.last_updated|timeago} ago</td>
-			<td class="less">{$result.num_releases}</td>
-		</tr>
-		{/if}
-	{/foreach}
-	
-</table>
-
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/cart.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/cart.tpl
deleted file mode 100644
index 2fbad4153..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/cart.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<h1>My Cart</h1>
-
-<p>
-Your cart can be downloaded as an <a href="{$smarty.const.WWW_TOP}/rss?t=-2&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1">Rss Feed</a>.
-</p>
-
-{if $results|@count > 0}
-
-<form id="nzb_multi_operations_form" action="get">
-
-<div class="nzb_multi_operations">
-	<small>With Selected:</small>
-	<input type="button" class="nzb_multi_operations_cartdelete" value="Delete" />
-	{if $sabintegrated}<input type="button" class="nzb_multi_operations_cartsab" value="Send To Sab" />{/if}
-	<input type="button" class="nzb_multi_operations_download" value="Download" />
-</div>
-
-<table style="width:100%;" class="data highlight" id="browsetable">
-	<tr>
-		<th width="50"><input id="chkSelectAll" type="checkbox" class="nzb_check_all" /><label for="chkSelectAll" style="display:none;">Select All</label></th>
-		<th>name</th>
-		<th>added</th>
-		<th>options</th>
-	</tr>
-
-	{foreach from=$results item=result}
-		<tr class="{cycle values=",alt"}">
-			<td class="check">
-				<input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check" value="{$result.guid}" />
-			</td>
-			<td>
-				<a title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|wordwrap:75:"\n":true}</a>
-			</td>
-			<td class="less" title="Added on {$result.createddate}">{$result.createddate|date_format}</td>
-			<td><a title="Delete from your cart" href="?delete={$result.guid}">delete</a></td>
-		</tr>
-	{/foreach}
-
-</table>
-</form>
-
-{else}
-<h2>No NZBs in cart</h2>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/console.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/console.tpl
deleted file mode 100644
index 6d87f0775..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/console.tpl
+++ /dev/null
@@ -1,205 +0,0 @@
-<h1>Browse Console</h1>
-
-<form name="browseby" action="console">
-	<table class="rndbtn" border="0" cellpadding="2" cellspacing="0">
-		<tr>
-			<th class="left"><label for="title">Title</label></th>
-			<th class="left"><label for="platform">Platform</label></th>
-			<th class="left"><label for="genre">Genre</label></th>
-			<th class="left"><label for="category">Category</label></th>
-			<th></th>
-		</tr>
-		<tr>
-			<td><input id="title" type="text" name="title" value="{$title}" size="15"/></td>
-			<td><input id="platform" type="text" name="platform" value="{$platform}" size="15"/></td>
-			<td>
-				<select id="genre" name="genre">
-					<option class="grouping" value=""></option>
-					{foreach from=$genres item=gen}
-						<option {if $gen.id == $genre}selected="selected"{/if} value="{$gen.id}">{$gen.title}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="category" name="t">
-					<option class="grouping" value="1000"></option>
-					{foreach from=$catlist item=ct}
-						<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td><input type="submit" value="Go"/></td>
-		</tr>
-	</table>
-</form>
-<p></p>
-
-{$site->adbrowse}
-
-<div class="btn-group">
-	<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-</div>
-
-{if $results|@count > 0}
-
-	<form id="nzb_multi_operations_form" action="get">
-
-		<table width="100%">
-			<tr>
-				<td>{$pager}</td>
-				<td style="text-align:right">
-					<div class="nzb_multi_operations">
-						<small>With selected:</small>
-						<div class="btn-group">
-							<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-							<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-							{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-							{if $isadmin}
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-							{/if}
-						</div>
-						<div class="btn-group">
-							<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-						</div>
-					</div>
-				</td>
-			</tr>
-		</table>
-
-		<table style="width:100%;" class="data highlight icons" id="coverstable">
-			<tr>
-				<th width="130"><input type="checkbox" class="nzb_check_all"/></th>
-				<th>title<br/><a title="Sort Descending" href="{$orderbytitle_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbytitle_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>platform<br/><a title="Sort Descending" href="{$orderbyplatform_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyplatform_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>genre<br/><a title="Sort Descending" href="{$orderbygenre_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbygenre_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>release date<br/><a title="Sort Descending" href="{$orderbyreleasedate_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyreleasedate_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>posted<br/><a title="Sort Descending" href="{$orderbyposted_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyposted_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>size<br/><a title="Sort Descending" href="{$orderbysize_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbysize_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>files<br/><a title="Sort Descending" href="{$orderbyfiles_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyfiles_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>stats<br/><a title="Sort Descending" href="{$orderbystats_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbystats_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-			</tr>
-
-			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}">
-					<td class="mid">
-						<div class="movcover">
-							<a class="title" title="View details"
-							   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">
-								<img class="shadow"
-									 src="{$smarty.const.WWW_TOP}/covers/console/{if $result.cover == 1}{$result.consoleinfoid}.jpg{else}no-cover.jpg{/if}"
-									 width="120" border="0" alt="{$result.title|escape:"htmlall"}"/>
-							</a>
-
-							<div class="movextra">
-								{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-														 title="View Nfo" class="btn btn-mini modal_nfo" rel="nfo">
-										Nfo</a>{/if}
-								{if $result.url != ""}<a class="btn btn-mini" target="_blank"
-														 href="{$site->dereferrer_link}{$result.url}"
-														 name="amazon{$result.consoleinfoid}" title="View amazon page">
-										Amazon</a>{/if}
-								<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name}"
-								   title="Browse releases in {$result.group_name|replace:"alt.binaries":"a.b"}">Grp</a>
-							</div>
-						</div>
-					</td>
-					<td colspan="8" class="left" id="guid{$result.guid}">
-						<h2><a class="title" title="View details"
-							   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.title|escape:"htmlall"}
-								- {$result.platform|escape:"htmlall"}</a></h2>
-						{if $result.genre != ""}<b>Genre:</b>{$result.genre}<br/>{/if}
-						{if $result.esrb != ""}<b>Rating:</b>{$result.esrb}<br/>{/if}
-						{if $result.publisher != ""}<b>Publisher:</b>{$result.publisher}<br/>{/if}
-						{if $result.releasedate != ""}<b>Released:</b>{$result.releasedate|date_format}<br/>{/if}
-						{if $result.review != ""}<b>Review:</b>{$result.review|escape:'htmlall'}<br/>{/if}
-						<br/>
-
-						<div class="movextra">
-							<b>{$result.searchname|escape:"htmlall"}</b> <a class="rndbtn"
-																			href="{$smarty.const.WWW_TOP}/console?platform={$result.platform}"
-																			title="View similar nzbs">Similar</a>
-							{if $isadmin}
-								<a class="rndbtn"
-								   href="{$smarty.const.WWW_TOP}/admin/release-edit.php?id={$result.releaseid}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-								   title="Edit Release">Edit</a>
-								<a class="rndbtn confirm_action"
-								   href="{$smarty.const.WWW_TOP}/admin/release-delete.php?id={$result.releaseid}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-								   title="Delete Release">Del</a>
-							{/if}
-							<br/>
-							<b>Info:</b> {$result.postdate|timeago},  {$result.size|fsize_format:"MB"}, <a
-									title="View file list"
-									href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart} files</a>,
-							<a title="View comments for {$result.searchname|escape:"htmlall"}"
-							   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments}
-								cmt{if $result.comments != 1}s{/if}</a>, {$result.grabs}
-							grab{if $result.grabs != 1}s{/if}
-							<br/>
-
-							<div class="icon"><input type="checkbox" class="nzb_check" value="{$result.guid}"/></div>
-							<div class="icon icon_nzb"><a title="Download Nzb"
-														  href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}">
-									&nbsp;</a></div>
-							<div class="icon icon_cart" title="Add to Cart"></div>
-							{if $sabintegrated}
-								<div class="icon icon_sab" title="Send to my Queue"></div>
-							{/if}
-							{if $weHasVortex}
-								<div class="icon icon_nzbvortex" title="Send to NZBVortex"></div>
-							{/if}
-						</div>
-					</td>
-				</tr>
-			{/foreach}
-
-		</table>
-
-		<div class="nzb_multi_operations">
-			<small>With Selected:</small>
-			<input type="button" class="rndbtn nzb_multi_operations_download" value="Download NZBs"/>
-			<input type="button" class="rndbtn nzb_multi_operations_cart" value="Add to Cart"/>
-			{if $sabintegrated}<input type="button" class="rndbtn nzb_multi_operations_sab" value="Send to my Queue"/>{/if}
-		</div>
-
-		<br/>
-
-		{$pager}
-
-	</form>
-{/if}
-
-<br/><br/><br/>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/contact.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/contact.tpl
deleted file mode 100644
index 66b172d4c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/contact.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
- 
-			<h1>{$page->title}</h1>
-			<h2>Getting in touch</h2>
-
-			<p>
-				Please send any questions or comments you have in an email to {mailto address=$site->email text=$site->title}.
-			</p>
-
-			{$msg}
-
-			{if $msg == ""}
-			<h2>Contact form</h2>
-			<p>
-				Alternatively use our contact form to get in touch.
-			</p>
-			
-			<form method="post" action="contact-us">
-				<table>
-					<tr>
-						<td width="100px">Your name: </td>
-						<td>
-							<input id="username" type="text" name="username" value="" />
-						</td>
-					</tr>
-					<tr>
-						<td>Your email address: </td>
-						<td>
-							<input type="text" name="useremail" value="" />
-						</td>
-					</tr>
-					<tr>
-						<td>Your comment or review: </td>
-						<td>
-							<textarea rows="10" cols="40" name="comment"></textarea>
-						</td>
-					</tr>
-					<tr>
-						<td></td>
-						<td>
-							<input type="submit" value="Submit" />
-						</td>
-					</tr>
-				</table>
-			</form>
-			{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/content.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/content.tpl
deleted file mode 100644
index fc0230593..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/content.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
- 
-			<h1>{$content.title}</h1>
-
-			{$content.body}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/dlbrowse.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/dlbrowse.tpl
deleted file mode 100644
index 35e9c6504..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/dlbrowse.tpl
+++ /dev/null
@@ -1,109 +0,0 @@
-
-<h1>Browse Downloads</h1>
-
-<h2>/{$subpath|escape:"htmlall"}</h2>
-
-<div class="nzb_multi_operations">
-View:
-	{if $lm}<a href="{$smarty.server.REQUEST_URI|replace:"&lm=1":""}&lm=0">Covers</a> | <b>List</b>
-	{else}<b>Covers</b> | <a href="{$smarty.server.REQUEST_URI|replace:"&lm=0":""}&lm=1">List</a>{/if}
-</div>
-<table style="width:100%;" class="data highlight" id="browsetable">
-	<tr>
-		<th width="20"></th>
-		<th>name</th>
-		<th class="mid" width="70">size</th>
-		<th class="mid" width="80">category</th>
-		<th class="mid" width="80">info</th>
-		<th class="mid" width="40">date</th>
-	</tr>
-
-	{if $parentpath != ""}
-		<tr>
-			<td></td>
-			<td colspan="5"><a href="{if $parentpath==-1}dlbrowse?lm={if $lm}1{else}0{/if}{else}?sp={$parentpath}&lm={if $lm}1{else}0{/if}{/if}"><strong>..</strong></a></td>
-		</tr>
-	{/if}
-
-	{foreach from=$results item=result}
-		<tr class="{cycle values=",alt"}">
-
-			{assign var="icon" value='templates/nntmux/images/fileicons/'|cat:$result.pathinfo.extension|cat:".png"}
-			{if $result.isdir == "1"}
-				{assign var="icon" value='folder'}
-			{elseif $result.pathinfo.extension == "" || !is_file("$icon")}
-				{assign var="icon" value='file'}
-			{else}
-				{assign var="icon" value=$result.pathinfo.extension}
-			{/if}
-
-			<td><img title=".{$result.pathinfo.extension}" alt="{$result.pathinfo.extension}" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/fileicons/{$icon}.png" /></td>
-			<td class="item">
-				{if $result.isdir == 1}
-					<a href="?sp={$subpath|escape:"url"}{$result.name|escape:"url"}&lm={if $lm}1{else}0{/if}">{$result.name|escape:"htmlall"}</a>
-				{else}
-					<a href="{$result.webpath}">{$result.name|escape:"htmlall"}</a>
-				{/if}
-
-				{if $result.release.movie_id != "" && $result.release.ep_id == ""}
-					<div style="padding-top:10px;">
-						{if $result.release.tagline != ''}<b>{$result.release.tagline}</b><br />{/if}
-						{if $result.release.plot != ''}{$result.release.plot}<br /><br />{/if}
-						{if $result.release.genre != ''}<b>Genre:</b> {$result.release.genre}<br />{/if}
-						{if $result.release.director != ''}<b>Director:</b> {$result.release.director}<br />{/if}
-						{if $result.release.actors != ''}<b>Starring:</b> {$result.release.actors}<br /><br />{/if}
-					</div>
-				{/if}
-
-				{if $result.release.ep_id != ""}
-					<div style="padding-top:10px;">
-						{if $result.release.ep_showtitle != ''}<b>{$result.release.ep_showtitle}</b><br />{/if}
-						{if $result.release.ep_overview != ''}{$result.release.ep_overview}<br /><br />{/if}
-						{if $result.release.ep_airdate != ''}<b>Aired:</b> {$result.release.ep_airdate|date_format}<br />{/if}
-						{if $result.release.ep_fullep != ''}<b>Episode:</b> {$result.release.ep_fullep}<br />{/if}
-					</div>
-				{/if}
-
-				{if $result.release.music_id != ""}
-					<div style="padding-top:10px;">
-						{if $result.release.mu_title != ''}<b>{$result.release.mu_title}</b><br />{/if}
-						{if $result.release.mu_artist != ''}{$result.release.mu_artist}<br /><br />{/if}
-						{if $result.release.mu_year != ''}<b>Year:</b> {$result.release.mu_year}<br />{/if}
-					</div>
-				{/if}
-
-				{if $result.release.music_id == "" && $result.release.ep_id == "" && $result.release.movie_id == ""}
-					<br/>
-				{/if}
-				{if $result.release.id != ""}
-					<br/><a class="rndbtn" title="More info" href="{$smarty.const.WWW_TOP}/details/{$result.release.guid}">More Info</a><br/><br/>
-				{/if}
-			</td>
-			<td class="less right">
-				{if $result.isdir == 0}
-					{if $result.size < 100000}{$result.size|fsize_format:"KB"}{else}{$result.size|fsize_format:"MB"}{/if}
-				{/if}
-			</td>
-			<td class="less mid">
-				{if $result.release.categoryid != ""}
-				<a href="{$smarty.const.WWW_TOP}/browse?t={$result.release.categoryid}">{$result.release.category_name}</a>
-				{/if}
-			</td>
-			<td>
-				{if $result.release.movie_id != ""}
-					<img class="shadow" src="{$smarty.const.WWW_TOP}/covers/movies/{if $result.release.cover == 1}{$result.release.imdbid}-cover.jpg{else}no-cover.jpg{/if}" width="120" border="0" alt="{$result.release.title|escape:"htmlall"}" />
-				{/if}
-				{if $result.release.rage_imgdata != ""}
-					<img width="120" class="shadow" alt="{$result.release.showtitle} Logo" src="{$smarty.const.WWW_TOP}/getimage?type=tvrage&amp;id={$result.release.rg_ID}" />
-				{/if}
-				{if $result.release.mu_cover == "1"}
-					<img class="shadow" src="{$smarty.const.WWW_TOP}/covers/music/{if $result.release.mu_cover == 1}{$result.release.music_id}.jpg{else}no-cover.jpg{/if}" width="120" border="0" alt="{$result.release.title|escape:"htmlall"}" />
-				{/if}
-			</td>
-			<td class="less mid" title="{$result.mtime|date_format:"%d/%m/%Y %H:%M:%S"}">{$result.mtime|timeago}</td>
-		</tr>
-	{/foreach}
-
-</table>
-
-<br/><br/><br/>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/forgottenpassword.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/forgottenpassword.tpl
deleted file mode 100644
index b6f90e092..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/forgottenpassword.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
- 
-<h1>{$page->title}</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-{if $confirmed == '' && $sent == ''}
-	<p>
-		Please enter the email address you used to register and we will send an email to reset your password. If you cannot remember your email, or no longer have access to it, please <a href="{$smarty.const.WWW_TOP}/contact-us">contact us</a>.
-	</p>
-
-	<form method="post" action="forgottenpassword?action=submit">
-
-		<table class="data">
-			<tr><th><label for="email">Email</label>: <em>*</em></th>
-				<td>
-					<input id="email" autocomplete="off" name="email" value="{$email}" type="email"/>
-				</td>
-			</tr>
-			<tr><th></th><td><input type="submit" value="Request Password Reset" /><div style="float:right;" class="hint"><em>*</em> Indicates mandatory field.</div></td></tr>
-		</table>
-	</form>
-{elseif $sent != ''}
-	<p>
-		A password reset request has been sent to your email.
-	</p>
-{else}
-	<p>
-		Your password has been reset and sent to you in an email.
-	</p>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/forum.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/forum.tpl
deleted file mode 100644
index 57fbad568..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/forum.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-<h1>Forum</h1>
-
-{if $results|@count > 0}
-
-{$pager}
-
-<div style="float:right;margin-bottom:5px;"><a href="#new">New Post</a></div>
-
-<a id="top"></a>
-
-<table style="width:100%;" class="data highlight" id="forumtable">
-	<tr>
-		<th width="60%">Topic</th>
-		<th>Posted By</th>
-		<th>Last Update</th>
-		<th width="5%" class="mid">Replies</th>
-	</tr>
-
-	{foreach from=$results item=result}
-		<tr class="{cycle values=",alt"}" id="guid{$result.id}">
-			<td style="cursor:pointer;" class="item" onclick="document.location='{$smarty.const.WWW_TOP}/forumpost/{$result.id}';">
-				<a title="View post" class="title" href="{$smarty.const.WWW_TOP}/forumpost/{$result.id}">{$result.subject|escape:"htmlall"|truncate:100:'...':true:true}</a>
-				<div class="hint">
-					{$result.message|escape:"htmlall"|truncate:200:'...':false:false}
-				</div>
-			</td>
-			<td>
-				<a title="View profile" href="{$smarty.const.WWW_TOP}/profile/?name={$result.username}">{$result.username}</a>
-				<br/>
-				on <span title="{$result.createddate}">{$result.createddate|date_format}</span> <div class="hint">({$result.createddate|timeago})</div>
-			</td>
-			<td>
-				<a href="{$smarty.const.WWW_TOP}/forumpost/{$result.id}#last" title="{$result.updateddate}">{$result.updateddate|date_format}</a> <div class="hint">({$result.updateddate|timeago})</div>
-			</td>
-			<td class="mid">{$result.replies}</td>
-		</tr>
-	{/foreach}
-
-</table>
-
-<div style="float:right;margin-top:5px;"><a href="#top">Top</a></div>
-
-<br/>
-
-{$pager}
-
-{/if}
-
-<div style="margin-top:10px;">
-<a id="new"></a>
-<h3>Add New Post</h3>
-<form action="" method="post">
-	<label for="addSubject">Subject</label>:<br/>
-	<input type="text" maxlength="200" id="addSubject" name="addSubject" />
-	<br/>
-	<label for="addMessage">Message</label>:<br/>
-	<textarea class="autosize" maxlength="5000" id="addMessage" name="addMessage" rows="6" cols="60"></textarea>
-	<br/>
-	<input class="forumpostsubmit" type="submit" value="submit"/>
-</form>
-</div>
-
-<br/><br/><br/>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/forumpost.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/forumpost.tpl
deleted file mode 100644
index 97012692c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/forumpost.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<h1><a href="{$smarty.const.WWW_TOP}/forum">Forum</a></h1>
-
-{if $results|@count > 0}
-
-<h2>{$results[0].subject|escape:"htmlall"}</h2>
-
-<div style="float:right;margin-bottom:5px;"><a href="#reply">Reply</a></div>
-
-<a id="top"></a>
-<table style="width:100%;" class="data highlight" id="forumtable">
-	<tr>
-		<th>By</th>
-		<th>Message</th>
-	</tr>
-
-	{foreach from=$results item=result name=result}
-		<tr class="{cycle values=",alt"}">
-			<td width="15%;">
-				{if $result.isadmin == 1}<strong>{/if}
-				<a {if $smarty.foreach.result.last}id="last"{/if} title="{if $result.isadmin == 1}Admin{else}View profile{/if}" href="{$smarty.const.WWW_TOP}/profile/?name={$result.username}">{$result.username}</a>
-				{if $result.isadmin == 1}</strong>{/if}
-				<br/>
-				on <span title="{$result.createddate}">{$result.createddate|date_format}</span> <div class="hint">({$result.createddate|timeago})</div>
-				{if $userdata.role==2}
-				<div>
-					<a class="rndbtn confirm_action" href="{$smarty.const.WWW_TOP}/admin/forum-delete.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}" title="Delete Post">Delete</a>
-				</div>
-				{/if}
-
-			</td>
-			<td>{$result.message|escape:"htmlall"|nl2br|magicurl}</td>
-		</tr>
-	{/foreach}
-
-</table>
-
-<div style="float:right;margin-top:5px;"><a href="#">Top</a></div>
-
-
-<div style="margin-top:10px;">
-<h3>Add Reply</h3>
-<a id="reply"></a>
-<form action="" method="post">
-	<label for="addReply">Message</label>:<br/>
-	<textarea class="autosize" maxlength="5000" id="addReply" name="addReply" rows="6" cols="60"></textarea>
-	<br/>
-	<input class="forumreplysubmit" type="submit" value="submit"/>
-</form>
-</div>
-
-{/if}
-
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/games.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/games.tpl
deleted file mode 100644
index 409757c80..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/games.tpl
+++ /dev/null
@@ -1,252 +0,0 @@
-{if $site->adbrowse}
-	{$site->adbrowse}
-{/if}
-<h1>Browse Games</h1>
-
-<form name="browseby" action="games">
-	<table class="btn btn-mini" border="0" cellpadding="2" cellspacing="0">
-		<tr>
-			<th class="left"><label for="title">Title</label></th>
-			<th class="left"><label for="genre">Genre</label></th>
-			<th class="left"><label for="year">Year</label></th>
-			<th></th>
-		</tr>
-		<tr>
-			<td><input id="title" type="text" name="title" value="{$title}" size="15"/></td>
-			<td>
-				<select id="genre" name="genre">
-					<option class="grouping" value=""></option>
-					{foreach from=$genres item=gen}
-						<option {if $gen.id == $genre}selected="selected"{/if} value="{$gen.id}">{$gen.title}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="year" name="year">
-					<option class="grouping" value=""></option>
-					{foreach from=$years item=yr}
-						<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td><input class='btn btn-mini' type="submit" value="Go"/></td>
-		</tr>
-	</table>
-</form>
-<p></p>
-
-{if $results|@count > 0}
-
-	<form id="nzb_multi_operations_form" action="get">
-
-	<table width="100%">
-		<tr>
-			<td>{$pager}</td>
-			<td style="text-align:right">
-				<div class="nzb_multi_operations">
-					<small>With selected:</small>
-					<div class="btn-group">
-						<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-						<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-						{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-						{if $isadmin}
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-						{/if}
-					</div>
-					<div class="btn-group">
-						<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-					</div>
-				</div>
-			</td>
-		</tr>
-	</table>
-
-		<table style="width:100%;" class="data highlight icons" id="coverstable">
-			<tr>
-				<th width="130"><input type="checkbox" class="nzb_check_all"/></th>
-				<th>title<br/><a title="Sort Descending" href="{$orderbytitle_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbytitle_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>genre<br/><a title="Sort Descending" href="{$orderbygenre_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbygenre_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>release date<br/><a title="Sort Descending" href="{$orderbyreleasedate_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyreleasedate_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>posted<br/><a title="Sort Descending" href="{$orderbyposted_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyposted_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>size<br/><a title="Sort Descending" href="{$orderbysize_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbysize_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>files<br/><a title="Sort Descending" href="{$orderbyfiles_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyfiles_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>stats<br/><a title="Sort Descending" href="{$orderbystats_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbystats_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/default/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-			</tr>
-
-			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}">
-					<td class="mid">
-						<div class="movcover">
-							<a class="title" title="View details"
-							   href="{$smarty.const.WWW_TOP}/details/{$result.grp_release_guid}/{$result.grp_release_name|escape:"htmlall"}">
-								<img class="shadow"
-									 src="{$smarty.const.WWW_TOP}/covers/games/{if $result.cover == 1}{$result.gamesinfo_id}.jpg{else}no-cover.jpg{/if}"
-									 width="120" border="0" alt="{$result.title|escape:"htmlall"}"/>
-							</a>
-
-							<div class="movextra">
-								{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.grp_release_guid}"
-														 title="View Nfo" class="btn btn-mini modal_nfo" rel="nfo">
-										Nfo</a>{/if}
-								{if $result.classused == "gb"}
-									<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$result.url}"
-									   name="giantbomb{$result.gamesinfo_id}" title="View giantbomb page">Giantbomb</a>
-								{/if}
-								{if $result.classused == "steam"}
-									<a class="btn btn-mini" target="_blank"
-									   href="{$site->dereferrer_link}{$result.url|escape:"htmlall"}"
-									   name="steam{$result.gamesinfo_id}" title="View Steam page">Steam</a>
-								{/if}
-								{if $result.classused == "gl"}
-									<a class="btn btn-mini" target="_blank"
-									   href="{$site->dereferrer_link}{$result.url|escape:"htmlall"}"
-									   name="greenlight{$result.gamesinfo_id}" title="View greenlight page">Greenlight</a>
-								{/if}
-								{if $result.classused == "desura"}
-									<a class="btn btn-mini" target="_blank"
-									   href="{$site->dereferrer_link}{$result.url|escape:"htmlall"}"
-									   name="desura{$result.gamesinfo_id}" title="View Desura page">Desura</a>
-								{/if}
-								<a class="btn btn-mini" target="_blank"
-								   href="{$site->dereferrer_link}http://ign.com/search?q={$result.title|escape:"htmlall"}&page=0&count=10&type=object&objectType=game&filter=games&"
-								   name="ign{$result.id}"	title="Find game on IGN">IGN</a>
-								<a class="btn btn-mini" target="_blank"
-								   href="{$site->dereferrer_link}http://www.gamespot.com/search/?q={$result.title|escape:"htmlall"}"
-								   name="gamespot{$result.id}"
-								   title="Find game on Gamespot">Gamespot</a>
-							</div>
-						</div>
-					</td>
-					<td colspan="8" class="left" id="guid{$result.grp_release_guid}">
-						<h2><a class="title" title="View details"
-							   href="{$smarty.const.WWW_TOP}/details/{$result.grp_release_guid}/{$result.grp_release_name|escape:"htmlall"}">{$result.title|stripslashes|escape:"htmlall"}</a></h2>
-						{if $result.genre != ""}<b>Genre:</b>{$result.genre}<br/>{/if}
-						{if $result.esrb != ""}<b>Rating:</b>{$result.esrb}<br/>{/if}
-						{if $result.publisher != ""}<b>Publisher:</b>{$result.publisher}<br/>{/if}
-						{if $result.releasedate != ""}<b>Released:</b>{$result.releasedate|date_format}<br/>{/if}
-						{if $result.review != ""}<b>Review:</b>{$result.review|stripslashes|escape:'htmlall'}<br/>{/if}
-						<br/>
-
-						<div class="movextra">
-							<table>
-								{assign var="msplits" value=","|explode:$result.grp_release_id}
-								{assign var="mguid" value=","|explode:$result.grp_release_guid}
-								{assign var="mnfo" value=","|explode:$result.grp_release_nfoid}
-								{assign var="mgrp" value=","|explode:$result.grp_release_grpname}
-								{assign var="mname" value="#"|explode:$result.grp_release_name}
-								{assign var="mpostdate" value=","|explode:$result.grp_release_postdate}
-								{assign var="msize" value=","|explode:$result.grp_release_size}
-								{assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts}
-								{assign var="mcomments" value=","|explode:$result.grp_release_comments}
-								{assign var="mgrabs" value=","|explode:$result.grp_release_grabs}
-								{assign var="mpass" value=","|explode:$result.grp_release_password}
-								{assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount}
-								{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-								{foreach from=$msplits item=m}
-									<tr id="guid{$mguid[$m@index]}" {if $m@index > 1}class="mlextra"{/if}>
-										<td>
-											<div class="icon"><input type="checkbox" class="nzb_check"
-																	 value="{$mguid[$m@index]}"/></div>
-										</td>
-										<td>
-											<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$mname[$m@index]|escape:"htmlall"}</a>
-
-											<div>
-												<i class="icon-calendar"></i> Posted {$mpostdate[$m@index]|timeago} | <i
-														class="icon-hdd"></i> {$msize[$m@index]|fsize_format:"MB"} | <i
-														class="icon-file"></i> <a title="View file list"
-																				  href="{$smarty.const.WWW_TOP}/filelist/{$mguid[$m@index]}">{$mtotalparts[$m@index]}
-													files</a> | <i class="icon-comments"></i> <a
-														title="View comments for {$mname[$m@index]|escape:"htmlall"}"
-														href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}#comments">{$mcomments[$m@index]}
-													cmt{if $mcomments[$m@index] != 1}s{/if}</a> | <i
-														class="icon-download"></i> {$mgrabs[$m@index]}
-												grab{if $mgrabs[$m@index] != 1}s{/if} |
-												{if $mnfo[$m@index] > 0}<a
-													href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}"
-													title="View Nfo" class="modal_nfo" rel="nfo">Nfo</a> | {/if}
-												{if $mpass[$m@index] == 1}Passworded | {elseif $mpass[$m@index] == 2}Potential Password | {/if}
-												<a href="{$smarty.const.WWW_TOP}/browse?g={$mgrp[$m@index]}"
-												   title="Browse releases in {$mgrp[$m@index]|replace:"alt.binaries":"a.b"}">Grp</a>
-												{if $mhaspreview[$m@index] == 1 && $userdata.canpreview == 1} | <a
-														href="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"
-														name="name{$mguid[$m@index]}"
-														title="Screenshot of {$mname[$m@index]|escape:"htmlall"}"
-														class="modal_prev" rel="preview">Preview</a>{/if}
-												{if $minnerfiles[$m@index] > 0} | <a href="#" onclick="return false;"
-																					 class="mediainfo"
-																					 title="{$mguid[$m@index]}">
-														Media</a>{/if}
-											</div>
-										</td>
-										<td class="icons">
-											<div class="icon icon_nzb"><a title="Download Nzb"
-																		  href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">
-													&nbsp;</a></div>
-											<div class="icon icon_cart" title="Add to Cart"></div>
-											{if $sabintegrated}
-												<div class="icon icon_sab" title="Send to my Queue"></div>
-											{/if}
-										</td>
-									</tr>
-									{if $m@index == 1 && $m@total > 2}
-										<tr>
-											<td colspan="5"><a class="mlmore" href="#">{$m@total-2} more...</a></td>
-										</tr>
-									{/if}
-								{/foreach}
-							</table>
-						</div>
-					</td>
-				</tr>
-			{/foreach}
-
-		</table>
-		<br/>
-
-		{$pager}
-
-		<div class="nzb_multi_operations">
-			<small>With Selected:</small>
-			<input type="button" class="nzb_multi_operations_download" value="Download NZBs"/>
-			<input type="button" class="nzb_multi_operations_cart" value="Add to Cart"/>
-			{if $sabintegrated}<input type="button" class="nzb_multi_operations_sab" value="Send to my Queue"/>{/if}
-		</div>
-
-	</form>
-{else}
-	<h4>There doesn't seem to be any releases here. Please try the <a
-				href="{$smarty.const.WWW_TOP}/browse?t={$category}">list</a> view.</h4>
-{/if}
-
-<br/><br/><br/>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/headermenu.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/headermenu.tpl
deleted file mode 100644
index 48b5ccbf8..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/headermenu.tpl
+++ /dev/null
@@ -1,145 +0,0 @@
-<div id="menucontainer">
-	<div id="menulink">
-		<ul>
-			{foreach from=$parentcatlist item=parentcat}
-				{if $parentcat.id == 1000 && $userdata.consoleview=="1"}
-					<li><a title="Browse {$parentcat.title}"
-						   href="{$smarty.const.WWW_TOP}/console">{$parentcat.title}</a>
-						<ul>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								<li><a title="Browse {$subcat.title}"
-									   href="{$smarty.const.WWW_TOP}/console?t={$subcat.id}">{$subcat.title}</a></li>
-							{/foreach}
-						</ul>
-					</li>
-				{elseif $parentcat.id == 2000 && $userdata.movieview=="1"}
-					<li><a title="Browse {$parentcat.title}"
-						   href="{$smarty.const.WWW_TOP}/movies">{$parentcat.title}</a>
-						<ul>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								<li><a title="Browse {$subcat.title}"
-									   href="{$smarty.const.WWW_TOP}/movies?t={$subcat.id}">{$subcat.title}</a></li>
-							{/foreach}
-						</ul>
-					</li>
-				{elseif ($parentcat.id == 3000 && $userdata.musicview=="1")}
-					<li><a title="Browse {$parentcat.title}" href="{$smarty.const.WWW_TOP}/music">{$parentcat.title}</a>
-						<ul>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								{if $subcat.id == 3030}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/browse?t={$subcat.id}">{$subcat.title}</a></li>
-								{else}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/music?t={$subcat.id}">{$subcat.title}</a></li>
-								{/if}
-							{/foreach}
-						</ul>
-					</li>
-				{elseif ($parentcat.id == 4000 && $userdata.gameview=="1")}
-					<li><a title="Browse {$parentcat.title}" href="{$smarty.const.WWW_TOP}/games">{$parentcat.title}</a>
-						<ul>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								{if $subcat.id == 4050}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/games">{$subcat.title}</a></li>
-								{else}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/browse?t={$subcat.id}">{$subcat.title}</a></li>
-								{/if}
-							{/foreach}
-						</ul>
-					</li>
-				{elseif ($parentcat.id == 6000 && $userdata.xxxview=="1" && $site->lookupxxx=="1")}
-					<li class="dropdown">
-						<a id="cat3"
-						   class="dropdown-toggle"
-						   data-toggle="dropdown"
-						   data-hover="dropdown"
-						   href="{$smarty.const.WWW_TOP}/xxx">{$parentcat.title}
-							<b class="caret"></b></a>
-						<ul class="dropdown-menu" role="menu" aria-labelledby="cat3">
-							<li><a href="{$smarty.const.WWW_TOP}/xxx">All {$parentcat.title}</a></li>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								{if $subcat.id == 6010 OR 6020 OR 6030 OR 6040}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/xxx?t={$subcat.id}">{$subcat.title}</a>
-									</li>
-								{else}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/browse?t={$subcat.id}">{$subcat.title}</a>
-									</li>
-								{/if}
-							{/foreach}
-						</ul>
-					</li>
-				{elseif ($parentcat.id == 6000 && $userdata.xxxview=="1" && $site->lookupxxx=="1")}
-					<li class="dropdown">
-						<a id="cat3"
-						   class="dropdown-toggle"
-						   data-toggle="dropdown"
-						   data-hover="dropdown"
-						   href="{$smarty.const.WWW_TOP}/xxx">{$parentcat.title}
-							<b class="caret"></b></a>
-						<ul class="dropdown-menu" role="menu" aria-labelledby="cat3">
-							<li><a href="{$smarty.const.WWW_TOP}/xxx">All {$parentcat.title}</a></li>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								{if $subcat.id == 6010 OR 6020 OR 6030 OR 6040}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/xxx?t={$subcat.id}">{$subcat.title}</a>
-									</li>
-								{else}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/browse?t={$subcat.id}">{$subcat.title}</a>
-									</li>
-								{/if}
-							{/foreach}
-						</ul>
-					</li>
-				{else}
-					<li><a title="Browse {$parentcat.title}"
-						   href="{$smarty.const.WWW_TOP}/browse?t={$parentcat.id}">{$parentcat.title}</a>
-						<ul>
-							{foreach from=$parentcat.subcatlist item=subcat}
-								{if ($subcat.id == 7020 && $userdata.bookview=="1")}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/books">{$subcat.title}</a></li>
-								{else}
-									<li><a title="Browse {$subcat.title}"
-										   href="{$smarty.const.WWW_TOP}/browse?t={$subcat.id}">{$subcat.title}</a></li>
-								{/if}
-							{/foreach}
-						</ul>
-					</li>
-				{/if}
-			{/foreach}
-			<li><a title="Browse All" href="{$smarty.const.WWW_TOP}/browse">All</a>
-				<ul>
-					<li><a title="Browse Groups" href="{$smarty.const.WWW_TOP}/browsegroup">Groups</a></li>
-				</ul>
-			</li>
-		</ul>
-	</div>
-
-	<div id="menusearchlink">
-		<form id="headsearch_form" action="{$smarty.const.WWW_TOP}/search/" method="get">
-
-			<div class="gobutton" title="Submit search"><input id="headsearch_go" type="submit" value="" tabindex="3" /></div>
-
-			<label style="display:none;" for="headcat">Search Category</label>
-			<select id="headcat" name="t" tabindex="2">
-				<option class="grouping" value="-1">All</option>
-				{foreach from=$parentcatlist item=parentcat}
-					<option {if $header_menu_cat==$parentcat.id}selected="selected"{/if} class="grouping" value="{$parentcat.id}">{$parentcat.title}</option>
-					{foreach from=$parentcat.subcatlist item=subcat}
-						<option {if $header_menu_cat==$subcat.id}selected="selected"{/if} value="{$subcat.id}">&nbsp;&nbsp;{$subcat.title}</option>
-					{/foreach}
-				{/foreach}
-			</select>
-
-			<label style="display:none;" for="headsearch">Search Text</label>
-			<input id="headsearch" name="search" value="{if $header_menu_search == ""}Enter keywords{else}{$header_menu_search|escape:"htmlall"}{/if}" style="width:85px;" type="text" tabindex="1" />
-
-		</form>
-	</div>
-</div>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/login.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/login.tpl
deleted file mode 100644
index aabe6f05e..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/login.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-<h1>Login</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<form action="login" method="post">
-	<input type="hidden" name="redirect" value="{$redirect|escape:"htmlall"}" />
-	<table class="data">
-		<tr><th><label for="username">Username<br/> or Email:</label></th>
-			<td>
-				<input style="width:150px;" id="username" value="{$username|escape:"htmlall"}" name="username" type="text"/>
-			</td></tr>
-		<tr><th><label for="password">Password:</label></th>
-			<td>
-				<input style="width:150px;" id="password" name="password" type="password"/>
-			</td></tr>
-		<tr><th><label for="rememberme">Remember Me:</label></th><td><input id="rememberme" {if $rememberme == 1}checked="checked"{/if} name="rememberme" type="checkbox"/></td>
-		<tr><th></th><td><input type="submit" value="Login"/></td></tr>
-	</table>
-</form>
-<br/>
-<a href="{$smarty.const.WWW_TOP}/forgottenpassword">Forgotten your password?</a>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/mainmenu.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/mainmenu.tpl
deleted file mode 100644
index 64da32f85..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/mainmenu.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{if $menulist|@count > 0} 
-<li class="menu_main">
-	<h2>Menu</h2> 
-	<ul>
-	{foreach from=$menulist item=menu}
-	{assign var="var" value=$menu.menueval}	
-	{eval var="$var," assign='menuevalresult'}
-	{if $menuevalresult|replace:",":"1" == "1"}
-	<li class="mmenu{if $menu.newwindow =="1"}_new{/if}"><a {if $menu.newwindow =="1"}class="external" target="null"{/if} title="{$menu.tooltip}" href="{$menu.href}">{$menu.title}</a></li>
-	{/if}
-	{/foreach}
-	</ul>
-</li>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/movies.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/movies.tpl
deleted file mode 100644
index 3dde6d9ae..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/movies.tpl
+++ /dev/null
@@ -1,260 +0,0 @@
-<h1>Browse {$catname}</h1>
-
-<form name="browseby" action="movies">
-	<table class="rndbtn" border="0" cellpadding="2" cellspacing="0">
-		<tr>
-			<th class="left"><label for="movietitle">Title</label></th>
-			<th class="left"><label for="movieactors">Actor</label></th>
-			<th class="left"><label for="moviedirector">Director</label></th>
-			<th class="left"><label for="rating">Rating</label></th>
-			<th class="left"><label for="genre">Genre</label></th>
-			<th class="left"><label for="year">Year</label></th>
-			<th class="left"><label for="category">Category</label></th>
-			<th></th>
-		</tr>
-		<tr>
-			<td><input id="movietitle" type="text" name="title" value="{$title}" size="15"/></td>
-			<td><input id="movieactors" type="text" name="actors" value="{$actors}" size="15"/></td>
-			<td><input id="moviedirector" type="text" name="director" value="{$director}" size="15"/></td>
-			<td>
-				<select id="rating" name="rating">
-					<option class="grouping" value=""></option>
-					{foreach from=$ratings item=rate}
-						<option {if $rating==$rate}selected="selected"{/if} value="{$rate}">{$rate}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="genre" name="genre">
-					<option class="grouping" value=""></option>
-					{foreach from=$genres item=gen}
-						<option {if $gen==$genre}selected="selected"{/if} value="{$gen}">{$gen}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="year" name="year">
-					<option class="grouping" value=""></option>
-					{foreach from=$years item=yr}
-						<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="category" name="t">
-					<option class="grouping" value="2000"></option>
-					{foreach from=$catlist item=ct}
-						<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td><input type="submit" value="Go"/></td>
-		</tr>
-	</table>
-</form>
-<p></p>
-
-{$site->adbrowse}
-
-
-<form id="nzb_multi_operations_form" action="get">
-
-	<table width="100%">
-		<tr>
-			<td>{$pager}</td>
-			<td style="text-align:right">
-				<div class="nzb_multi_operations">
-					<small>With selected:</small>
-					<div class="btn-group">
-						<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-						<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-						{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-						{if $isadmin}
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-						{/if}
-					</div>
-					<div class="btn-group">
-						<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-					</div>
-				</div>
-			</td>
-		</tr>
-	</table>
-
-	{if $results|@count > 0}
-
-
-	<table style="width:100%;" class="data highlight icons" id="coverstable">
-		<tr>
-			<th width="130"><input type="checkbox" class="nzb_check_all"/></th>
-			<th>title<br/><a title="Sort Descending" href="{$orderbytitle_desc}"><img
-							src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt=""/></a><a
-						title="Sort Ascending" href="{$orderbytitle_asc}"><img
-							src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a></th>
-			<th>year<br/><a title="Sort Descending" href="{$orderbyyear_desc}"><img
-							src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt=""/></a><a
-						title="Sort Ascending" href="{$orderbyyear_asc}"><img
-							src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a></th>
-			<th>rating<br/><a title="Sort Descending" href="{$orderbyrating_desc}"><img
-							src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt=""/></a><a
-						title="Sort Ascending" href="{$orderbyrating_asc}"><img
-							src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a></th>
-		</tr>
-
-		{foreach from=$results item=result}
-			<tr class="{cycle values=",alt"}">
-				<td class="mid">
-					<div class="movcover">
-						<a
-								target="_blank"
-								href="{$smarty.const.WWW_TOP}/movies/?imdb={$result.imdbid}"
-								name="name{$result.imdbid}"
-								title="View movie info"
-								class="modal_imdb thumbnail" rel="movie"
-								><img
-									class="img-rounded" style="margin: 3px 0;"
-									src="{$smarty.const.WWW_TOP}/covers/movies/{if $result.cover == 1}{$result.imdbid}-cover.jpg{else}no-cover.jpg{/if}"
-									width="120" border="0" alt="{$result.title|escape:"htmlall"}"
-									></a>
-
-						<div class="movextra">
-							{if $result.trailer != ""}<a href="#" name="name{$result.imdbid}" title="View movie trailer" class="btn btn-mini modal_imdbtrailer" rel="trailer">Trailer</a>{/if}
-							<a
-									target="_blank"
-									href="{$site->dereferrer_link}http://trakt.tv/search/imdb/tt{$result.imdbid}/"
-									name="trakt{$result.imdbid}"
-									title="View trakt page"
-									><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/trakt.png"></a>
-							{if $cpurl != '' && $cpapi != ''}
-								<a
-										class="sendtocouch"
-										target="blackhole"
-										href="javascript:;"
-										rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result.imdbid}&title={$result.title}"
-										name="CP{$result.imdbid}"
-										title="Add to CouchPotato"
-										><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/couch.png"></a>
-							{/if}
-							<a
-									target="_blank"
-									href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$result.imdbid}/"
-									name="imdb{$result.imdbid}"
-									title="View imdb page"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/imdb.png"></a>
-							<a
-									target="_blank"
-									href="{$site->dereferrer_link}http://www.rottentomatoes.com/m/{$result.title|replace:" ":"_"}/"
-									name="rottentomatoes{$result.title|replace:" ":"_"}}"
-									title="View RT page"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/rottentomatoes.png"></a>
-						</div>
-					</div>
-				</td>
-				<td colspan="3" class="left">
-					<h2><a title="{$result.title|stripslashes|escape:"htmlall"}"
-						   href="{$smarty.const.WWW_TOP}/movies/?imdb={$result.imdbid}">{$result.title|stripslashes|escape:"htmlall"}</a>
-						(<a class="title" title="{$result.year}"
-							href="{$smarty.const.WWW_TOP}/movies?year={$result.year}">{$result.year}</a>) {if $result.rating != ''}{$result.rating}/10{/if}
-
-						{foreach from=$result.languages item=movielanguage}
-							{release_flag($movielanguage, browse)}
-						{/foreach}</h2>
-					{if $result.tagline != ''}<b>{$result.tagline}</b><br/>{/if}
-					{if $result.plot != ''}{$result.plot}<br/><br/>{/if}
-					{if $result.genre != ''}<b>Genre:</b>{$result.genre}<br/>{/if}
-					{if $result.director != ''}<b>Director:</b>{$result.director}<br/>{/if}
-					{if $result.actors != ''}<b>Starring:</b>{$result.actors}<br/><br/>{/if}
-					<div class="movextra">
-						<table>
-							{assign var="msplits" value=","|explode:$result.grp_release_id}
-							{assign var="mguid" value=","|explode:$result.grp_release_guid}
-							{assign var="mnfo" value=","|explode:$result.grp_release_nfoID}
-							{assign var="mgrp" value=","|explode:$result.grp_release_grpname}
-							{assign var="mname" value="#"|explode:$result.grp_release_name}
-							{assign var="mpostdate" value=","|explode:$result.grp_release_postdate}
-							{assign var="msize" value=","|explode:$result.grp_release_size}
-							{assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts}
-							{assign var="mcomments" value=","|explode:$result.grp_release_comments}
-							{assign var="mgrabs" value=","|explode:$result.grp_release_grabs}
-							{assign var="mpass" value=","|explode:$result.grp_release_password}
-							{assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount}
-							{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-							{foreach from=$msplits item=m}
-								<tr id="guid{$mguid[$m@index]}" {if $m@index > 1}class="mlextra"{/if}>
-									<td>
-										<div class="icon"><input type="checkbox" class="nzb_check"
-																 value="{$mguid[$m@index]}"/></div>
-									</td>
-									<td>
-										<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$mname[$m@index]|escape:"htmlall"}</a>
-
-										<div>
-											<i class="icon-calendar"></i> Posted {$mpostdate[$m@index]|timeago} | <i
-													class="icon-hdd"></i> {$msize[$m@index]|fsize_format:"MB"} | <i
-													class="icon-file"></i> <a title="View file list"
-																			  href="{$smarty.const.WWW_TOP}/filelist/{$mguid[$m@index]}">{$mtotalparts[$m@index]}
-												files</a> | <i class="icon-comments"></i> <a
-													title="View comments for {$mname[$m@index]|escape:"htmlall"}"
-													href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}#comments">{$mcomments[$m@index]}
-												cmt{if $mcomments[$m@index] != 1}s{/if}</a> | <i
-													class="icon-download"></i> {$mgrabs[$m@index]}
-											grab{if $mgrabs[$m@index] != 1}s{/if} |
-											{if $mnfo[$m@index] > 0}<a
-												href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}"
-												title="View Nfo" class="modal_nfo" rel="nfo">Nfo</a> | {/if}
-											{if $mpass[$m@index] == 1}Passworded | {elseif $mpass[$m@index] == 2}Potential Password | {/if}
-											<a href="{$smarty.const.WWW_TOP}/browse?g={$mgrp[$m@index]}"
-											   title="Browse releases in {$mgrp[$m@index]|replace:"alt.binaries":"a.b"}">Grp</a>
-											{if $mhaspreview[$m@index] == 1 && $userdata.canpreview == 1} | <a
-													href="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"
-													name="name{$mguid[$m@index]}"
-													title="Screenshot of {$mname[$m@index]|escape:"htmlall"}"
-													class="modal_prev" rel="preview">Preview</a>{/if}
-											{if $minnerfiles[$m@index] > 0} | <a href="#" onclick="return false;"
-																				 class="mediainfo"
-																				 title="{$mguid[$m@index]}">
-													Media</a>{/if}
-										</div>
-									</td>
-									<td class="icons">
-										<div class="icon icon_nzb"><a title="Download Nzb"
-																	  href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}/{$mname[$m@index]|escape:"url"}">
-												&nbsp;</a></div>
-										<div class="icon icon_cart" title="Add to Cart"></div>
-										{if $sabintegrated}
-											<div class="icon icon_sab" title="Send to my Queue"></div>
-										{/if}
-										{if $weHasVortex}
-											<div class="icon icon_nzbvortex" title="Send to NZBVortex"></div>
-										{/if}
-									</td>
-								</tr>
-								{if $m@index == 1 && $m@total > 2}
-									<tr>
-										<td colspan="5"><a class="mlmore" href="#">{$m@total-2} more...</a></td>
-									</tr>
-								{/if}
-							{/foreach}
-						</table>
-					</div>
-				</td>
-			</tr>
-		{/foreach}
-
-	</table>
-
-	<div class="nzb_multi_operations">
-		<small>With Selected:</small>
-		<input type="button" class="rndbtn nzb_multi_operations_download" value="Download NZBs"/>
-		<input type="button" class="rndbtn nzb_multi_operations_cart" value="Add to Cart"/>
-		{if $sabintegrated}<input type="button" class="rndbtn nzb_multi_operations_sab" value="Send to my Queue"/>{/if}
-	</div>
-
-	<br/>
-
-	{$pager}
-</form>
-
-{/if}
-
-<br/><br/><br/>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/multi-operations.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/multi-operations.tpl
deleted file mode 100644
index 249ca53a3..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/multi-operations.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="container nzb_multi_operations">
-	{$pager}
-	<div class="pull-right">
-		With Selected:
-		<button type="button" class="btn btn-info btn-sm nzb_multi_operations_download">Download NZBs</button>
-		<button type="button" class="btn btn-info btn-sm nzb_multi_operations_cart">Add to Cart</button>
-		{if $sabintegrated}
-			<button type="button" class="btn btn-success btn-sm nzb_multi_operations_sab">Send to my Queue</button>
-		{/if}
-	</div>
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/music.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/music.tpl
deleted file mode 100644
index 737e4654d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/music.tpl
+++ /dev/null
@@ -1,233 +0,0 @@
-{if $site->adbrowse}
-	{$site->adbrowse}
-{/if}
-<h1>Browse Music</h1>
-
-<form name="browseby" action="music">
-	<table class="rndbtn" border="0" cellpadding="2" cellspacing="0">
-		<tr>
-			<th class="left"><label for="musicartist">Artist</label></th>
-			<th class="left"><label for="musictitle">Title</label></th>
-			<th class="left"><label for="genre">Genre</label></th>
-			<th class="left"><label for="year">Year</label></th>
-			<th class="left"><label for="category">Category</label></th>
-			<th></th>
-		</tr>
-		<tr>
-			<td><input id="musicartist" type="text" name="artist" value="{$artist}" size="15"/></td>
-			<td><input id="musictitle" type="text" name="title" value="{$title}" size="15"/></td>
-			<td>
-				<select id="genre" name="genre">
-					<option class="grouping" value=""></option>
-					{foreach from=$genres item=gen}
-						<option {if $gen.id == $genre}selected="selected"{/if}
-								value="{$gen.id}">{$gen.title|escape:"htmlall"}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="year" name="year">
-					<option class="grouping" value=""></option>
-					{foreach from=$years item=yr}
-						<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="category" name="t">
-					<option class="grouping" value="3000"></option>
-					{foreach from=$catlist item=ct}
-						<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td><input class='rndbtn' type="submit" value="Go"/></td>
-		</tr>
-	</table>
-</form>
-<p></p>
-
-<div class="btn-group">
-	<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-</div>
-
-{if $results|@count > 0}
-
-	<form id="nzb_multi_operations_form" action="get">
-
-		<table width="100%">
-			<tr>
-				<td>{$pager}</td>
-				<td style="text-align:right">
-					<div class="nzb_multi_operations">
-						<small>With selected:</small>
-						<div class="btn-group">
-							<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-							<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-							{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-							{if $isadmin}
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-								<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-							{/if}
-						</div>
-						<div class="btn-group">
-							<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-						</div>
-					</div>
-				</td>
-			</tr>
-		</table>
-
-		<table style="width:100%;" class="data highlight icons" id="coverstable">
-			<tr>
-				<th width="130"><input type="checkbox" class="nzb_check_all"/></th>
-				<th>artist<br/><a title="Sort Descending" href="{$orderbyartist_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyartist_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>year<br/><a title="Sort Descending" href="{$orderbyyear_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyyear_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>genre<br/><a title="Sort Descending" href="{$orderbygenre_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbygenre_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>posted<br/><a title="Sort Descending" href="{$orderbyposted_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyposted_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>size<br/><a title="Sort Descending" href="{$orderbysize_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbysize_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>files<br/><a title="Sort Descending" href="{$orderbyfiles_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbyfiles_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-				<th>stats<br/><a title="Sort Descending" href="{$orderbystats_desc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-								alt=""/></a><a title="Sort Ascending" href="{$orderbystats_asc}"><img
-								src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt=""/></a>
-				</th>
-			</tr>
-
-			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}">
-					<td class="mid">
-						<div class="movcover">
-							<a class="title" title="View details"
-							   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">
-								<img class="shadow"
-									 src="{$smarty.const.WWW_TOP}/covers/music/{if $result.cover == 1}{$result.musicinfoid}.jpg{else}no-cover.jpg{/if}"
-									 width="120" border="0"
-									 alt="{$result.artist|escape:"htmlall"} - {$result.title|escape:"htmlall"}"/>
-							</a>
-
-							<div class="movextra">
-								{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-														 title="View Nfo" class="btn btn-mini modal_nfo" rel="nfo">
-										Nfo</a>{/if}
-								<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$result.url}"
-								   name="amazon{$result.musicinfoid}" title="View amazon page">Amazon</a>
-								<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name}"
-								   title="Browse releases in {$result.group_name|replace:"alt.binaries":"a.b"}">Grp</a>
-							</div>
-						</div>
-					</td>
-					<td colspan="7" class="left" id="guid{$result.guid}">
-						<h2>{$result.artist}{" - "}{$result.title}</h2>
-						{if $result.genre != ""}<b>Genre:</b>{$result.genre|escape:"htmlall"}<br/>{/if}
-						{if $result.publisher != ""}<b>Publisher:</b>{$result.publisher|escape:"htmlall"}<br/>{/if}
-						{if $result.releasedate != ""}<b>Released:</b>{$result.releasedate|date_format}<br/>{/if}
-						{if $result.review != ""}<b>Review:</b>{$result.review|escape:'htmlall'}<br>{/if}
-						<br/>
-
-						<div class="movextra">
-							<table>
-								{assign var="msplits" value=","|explode:$result.grp_release_id}
-								{assign var="mguid" value=","|explode:$result.grp_release_guid}
-								{assign var="mnfo" value=","|explode:$result.grp_release_nfoid}
-								{assign var="mgrp" value=","|explode:$result.grp_release_grpname}
-								{assign var="mname" value="#"|explode:$result.grp_release_name}
-								{assign var="mpostdate" value=","|explode:$result.grp_release_postdate}
-								{assign var="msize" value=","|explode:$result.grp_release_size}
-								{assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts}
-								{assign var="mcomments" value=","|explode:$result.grp_release_comments}
-								{assign var="mgrabs" value=","|explode:$result.grp_release_grabs}
-								{assign var="mpass" value=","|explode:$result.grp_release_password}
-								{assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount}
-								{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-								{foreach from=$msplits item=m}
-									<tr id="guid{$mguid[$m@index]}" {if $m@index > 1}class="mlextra"{/if}>
-										<td>
-											<div class="icon"><input type="checkbox" class="nzb_check"
-																	 value="{$mguid[$m@index]}"/></div>
-										</td>
-										<td>
-											<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$mname[$m@index]|escape:"htmlall"}</a>
-
-											<div>
-												<i class="icon-calendar"></i> Posted {$mpostdate[$m@index]|timeago} | <i
-														class="icon-hdd"></i> {$msize[$m@index]|fsize_format:"MB"} | <i
-														class="icon-file"></i> <a title="View file list"
-																				  href="{$smarty.const.WWW_TOP}/filelist/{$mguid[$m@index]}">{$mtotalparts[$m@index]}
-													files</a> | <i class="icon-comments"></i> <a
-														title="View comments for {$mname[$m@index]|escape:"htmlall"}"
-														href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}#comments">{$mcomments[$m@index]}
-													cmt{if $mcomments[$m@index] != 1}s{/if}</a> | <i
-														class="icon-download"></i> {$mgrabs[$m@index]}
-												grab{if $mgrabs[$m@index] != 1}s{/if} |
-												{if $mnfo[$m@index] > 0}<a
-													href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}"
-													title="View Nfo" class="modal_nfo" rel="nfo">Nfo</a> | {/if}
-												{if $mpass[$m@index] == 1}Passworded | {elseif $mpass[$m@index] == 2}Potential Password | {/if}
-												<a href="{$smarty.const.WWW_TOP}/browse?g={$mgrp[$m@index]}"
-												   title="Browse releases in {$mgrp[$m@index]|replace:"alt.binaries":"a.b"}">Grp</a>
-												{if $mhaspreview[$m@index] == 1 && $userdata.canpreview == 1} | <a
-														href="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"
-														name="name{$mguid[$m@index]}"
-														title="Screenshot of {$mname[$m@index]|escape:"htmlall"}"
-														class="modal_prev" rel="preview">Preview</a>{/if}
-												{if $minnerfiles[$m@index] > 0} | <a href="#" onclick="return false;"
-																					 class="mediainfo"
-																					 title="{$mguid[$m@index]}">
-														Media</a>{/if}
-											</div>
-										</td>
-										<td class="icons">
-											<div class="icon icon_nzb"><a title="Download Nzb"
-																		  href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">
-													&nbsp;</a></div>
-											<div class="icon icon_cart" title="Add to Cart"></div>
-											{if $sabintegrated}
-												<div class="icon icon_sab" title="Send to my Queue"></div>
-											{/if}
-										</td>
-									</tr>
-									{if $m@index == 1 && $m@total > 2}
-										<tr>
-											<td colspan="5"><a class="mlmore" href="#">{$m@total-2} more...</a></td>
-										</tr>
-									{/if}
-								{/foreach}
-							</table>
-						</div>
-					</td>
-				</tr>
-			{/foreach}
-
-		</table>
-		<br/>
-
-
-{/if}
-
-<br/><br/><br/>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/mymovielist.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/mymovielist.tpl
deleted file mode 100644
index 1648fd4d9..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/mymovielist.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{if $data|@count > 0}
-
-<table style="width:100%;" class="data highlight icons" id="coverstable">
-		<tr>
-			<th></th>
-			<th>Name</th>
-		</tr>
-
-		{foreach $data as $result}
-		{if $result['imdb_id'] != ""}
-		<tr class="{cycle values=",alt"}">
-			<td class="mid">
-			
-				<div class="movcover">
-				
-					<img class="shadow" src="{if $result['cover'] ==""}{$smarty.const.WWW_TOP}/covers/movies/no-cover.jpg{else}{$result['cover']}{/if}" width="120" border="0" alt="{$result['title']|escape:"htmlall"}" />
-					<div class="movextra">
-						{if $ourmovies[$result['imdb_id']] != ""}
-						<a href="#" name="name{$result['imdb_id']}" title="View movie info" class="rndbtn modal_imdb" rel="movie" >Cover</a>
-						{/if}
-						<a class="rndbtn" target="_blank" href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$result['imdb_id']}" title="View Imdb">Imdb</a>
-					</div>
-				</div>
-			</td>
-			<td colspan="3" class="left">
-				<h2>
-				<a href="{$smarty.const.WWW_TOP}/movies?title={$result['title']}">{$result['title']|escape:"htmlall"}</a> 
-				{if $result['year'] != ""}(<a class="title" href="{$smarty.const.WWW_TOP}/movies?year={$result['year']}">{$result['year']}</a>){/if}
-				{if $result['rating'] > 0}{$result['rating']}/10{/if}
-				</h2>				
-				
-				{$result['plot']}
-
-				<br/><br/>
-				{if $ourmovies[$result['imdb_id']] != ""}
-					<a class="rndbtn" href="{$smarty.const.WWW_TOP}/movies?imdb={$result['imdb_id']}">Download</a>
-                {/if}
-                <a style="display:{if $userimdbs[$result['imdb_id']] == ""}inline{else}none;{/if}" onclick="mymovie_add('{$result['imdb_id']}', this);return false;" class="rndbtn" href="#">Add To My Movies</a>
-				<a style="display:{if $userimdbs[$result['imdb_id']] != ""}inline{else}none;{/if}" onclick="mymovie_del('{$result['imdb_id']}', this);return false;" href="#" class="rndbtn">Remove From My Movies</a>
-			</td>
-		</tr>
-		{/if}
-		{/foreach}
-</table>
-
-{else}
-<h2>No results</h2>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/mymovies.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/mymovies.tpl
deleted file mode 100644
index 8b6a06d98..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/mymovies.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>{$page->title}</h1>
-
-<p>
-Using 'My Movies' you can search for movies, and add them to a wishlist. If the movie becomes available it will be added to an <a href="{$smarty.const.WWW_TOP}/rss?t=-4&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss Feed</a> you can use to automatically download. You can <a href="{$smarty.const.WWW_TOP}/mymoviesedit">Manage Your Movie List</a> to remove old items.
-</p>
-<center>
-<table class="rndbtn" border="0" cellpadding="2" cellspacing="0">
-<tr>
-	<th>Movie Title or IMDB Id</th>
-</tr>
-<tr>
-	<td>
-		<form id="frmMyMovieLookup">
-			<input type="text" id="txtsearch" />
-			<input id="btnsearch" type="submit" value="Search" />
-		</form>
-	</td>
-</tr>
-</table>
-</center>
-<div id="divMovResults">
-</div>
-
-
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/mymoviesedit.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/mymoviesedit.tpl
deleted file mode 100644
index b4b67697e..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/mymoviesedit.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<h1>{$page->title}</h1>
-
-<p>
-Use this page to manage movies added to your personal list. If the movie becomes available it will be added to an <a href="{$smarty.const.WWW_TOP}/rss?t=-4&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss Feed</a> you can use to automatically download. To add more movies use the <a href="{$smarty.const.WWW_TOP}/mymovies">My Movies</a> search feature.
-</p>
-
-{if $movies|@count > 0}
-
-<table class="data highlight Sortable" id="browsetable">
-	<tr>
-
-		<th></th>
-		<th>name</th>
-		<th>category</th>
-		<th>added</th>
- 		<th class="mid">options</th>
-	</tr>
-
-	{foreach from=$movies item=movie}
-		<tr class="{cycle values=",alt"}">
-
-			<td class="mid">
-
-				<div class="movcover">
-					<img class="shadow" src="{$smarty.const.WWW_TOP}/covers/movies/{if $movie.cover == 1}{$movie.imdbid}-cover.jpg{else}no-cover.jpg{/if}" width="120" border="0" alt="{$movie.title|escape:"htmlall"}" />
-					<div class="movextra">
-						<a class="rndbtn" target="_blank" href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$movie.imdbid}" title="View Imdb">Imdb</a>
-					</div>
-				</div>
-			</td>
-
-
-			<td>
-				<h2>{$movie.title|escape:"htmlall"} ({$movie.year})</h2>
-				{if $movie.tagline != ''}<b>{$movie.tagline}</b><br />{/if}
-				{if $movie.plot != ''}{$movie.plot}<br /><br />{/if}
-				{if $movie.genre != ''}<b>Genre:</b> {$movie.genre}<br />{/if}
-				{if $movie.director != ''}<b>Director:</b> {$movie.director}<br />{/if}
-				{if $movie.actors != ''}<b>Starring:</b> {$movie.actors}<br /><br />{/if}
-			</td>
-			<td class="less">{if $movie.categoryNames != ''}{$movie.categoryNames|escape:"htmlall"}{else}All{/if}</td>
-			<td class="less" title="Added on {$movie.createddate}">{$movie.createddate|date_format}</td>
-			<td class="mid"><a href="{$smarty.const.WWW_TOP}/mymoviesedit?del={$movie.imdbid}" rel="remove" title="Remove from my movies">Remove</a></td>
-		</tr>
-	{/foreach}
-
-</table>
-
-{else}
-
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/myshows-add.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/myshows-add.tpl
deleted file mode 100644
index 5969f1eb3..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/myshows-add.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>{$type|ucwords} {$show.releasetitle|escape:"htmlall"} in:</h3>
-<form id="myshows" action="{$smarty.const.WWW_TOP}/myshows/do{$type}" method="post">
-	<input type="hidden" name="subpage" value="{$rid}" />
-	{if $from}<input type="hidden" name="from" value="{$from}" />{/if}
-	{html_checkboxes name='category' values=$cat_ids output=$cat_names selected=$cat_selected separator='<br />'}
-	
-	<br />
-	<input type="submit" name="{$type}" value="{$type|ucwords}" />
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/myshows.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/myshows.tpl
deleted file mode 100644
index 806a34d5c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/myshows.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<h1>{$page->title}</h1>
-
-<p>
-<a href="{$smarty.const.WWW_TOP}/series" title="View available TV series">Series List</a> |
-<a title="View a list of all releases in your shows" href="{$smarty.const.WWW_TOP}/myshows/browse">Browse My Shows</a> |
-<a title="All releases in your shows as an RSS feed" href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss Feed</a>
-</p>
-
-{if $shows|@count > 0}
-
-<table width="100%" class="data highlight Sortable" id="browsetable">
-	<tr>
-		<th>name</th>
-		<th width="80">category</th>
-		<th width="80">added</th>
- 		<th width="80" class="mid">options</th>
-	</tr>
-
-	{foreach from=$shows item=show}
-		<tr class="{cycle values=",alt"}">
-			<td>
-				<a title="View details" href="{$smarty.const.WWW_TOP}/series/{$show.rageid}{if $show.categoryid != ''}?t={$show.categoryid|replace:"|":","}{/if}">{$show.releasetitle|escape:"htmlall"|wordwrap:75:"\n":true}</a>
-			</td>
-			<td class="less">{if $show.categoryNames != ''}{$show.categoryNames|escape:"htmlall"}{else}All{/if}</td>
-			<td class="less" title="Added on {$show.createddate}">{$show.createddate|date_format}</td>
-			<td class="mid"><a href="{$smarty.const.WWW_TOP}/myshows/edit/{$show.rageid}" class="myshows" rel="edit" name="series{$show.rageid}" title="Edit Categories">Edit</a>&nbsp;&nbsp;<a href="{$smarty.const.WWW_TOP}/myshows/delete/{$show.rageid}" class="myshows" rel="remove" name="series{$show.rageid}" title="Remove from My Shows">Remove</a></td>
-		</tr>
-	{/foreach}
-
-</table>
-
-{else}
-<h2>No shows bookmarked</h2>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/newposterwall.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/newposterwall.tpl
deleted file mode 100644
index 2dc7e0eee..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/newposterwall.tpl
+++ /dev/null
@@ -1,192 +0,0 @@
-<div class="category" style="padding-bottom:20px;">
-	{if $error}
-		<h2>{$error}</h2>
-	{else}
-		<h2 class="main-title">
-			<a class="see-more" href="{$smarty.const.WWW_TOP}/{$goto}">see more &raquo;</a>
-			The <strong>newest releases</strong> for
-			<strong>
-				<select name="MySelect" id="MySelect"
-						onchange="window.location='{$smarty.const.WWW_TOP}/newposterwall?t=' + this.value;">
-					{foreach from=$types item=newtype}
-						<option {if $type == $newtype}selected="selected"{/if} value="{$newtype}">
-							{$newtype}
-						</option>
-					{/foreach}
-				</select>
-			</strong>
-		</h2>
-		<div class="main-wrapper">
-			<div class="main-content">
-				<!-- library -->
-				<div class="library-wrapper">
-					{foreach from=$newest item=result}
-						<div
-								{if $type == 'Console'}
-									class="library-console"
-								{elseif $type == 'Movies'}
-									class="library-show"
-								{elseif $type == 'XXX'}
-									class="library-show"
-								{elseif $type == 'Audio'}
-									class="library-music"
-								{elseif $type == 'Books'}
-									class="library-show"
-								{elseif $type == 'PC'}
-									class="library-games"
-								{elseif $type == 'TV'}
-									class="library-games"
-								{/if}
-								>
-							<div class="poster">
-								<a class="titleinfo" title="{$result.guid}"
-								   href="{$smarty.const.WWW_TOP}/details/{$result.guid}">
-									{if $type == 'Console'}
-										<img width="130px" alt=""
-											 src="{$smarty.const.WWW_TOP}/covers/console/{$result.consoleinfoid}.jpg"/>
-									{elseif $type == 'Movies'}
-										<img width="140px" height="205px" alt=""
-											 src="{$smarty.const.WWW_TOP}/covers/movies/{$result.imdbid}-cover.jpg"/>
-									{elseif $type == 'XXX'}
-										<img width="140px" height="205px" alt=""
-											 src="{$smarty.const.WWW_TOP}/covers/xxx/{$result.xxxinfo_id}-cover.jpg"/>
-									{elseif $type == 'Audio'}
-										<img height="250px" width="250px" alt=""
-											 src="{$smarty.const.WWW_TOP}/covers/music/{$result.musicinfoid}.jpg"/>
-									{elseif $type == 'Books'}
-										<img height="140px" width="205px" alt=""
-											 src="{$smarty.const.WWW_TOP}/covers/book/{$result.bookinfoid}.jpg"/>
-									{elseif $type == 'PC'}
-										<img height="130px" width="130px" alt=""
-											 src="{$smarty.const.WWW_TOP}/covers/games/{$result.gamesinfo_id}.jpg"/>
-									{elseif $type == 'TV'}
-										<img height="130px" width="130px" alt=""
-											 src="{$smarty.const.WWW_TOP}/getimage?type=tvrage&amp;id={$result.tvid}"/>
-									{/if}
-								</a>
-							</div>
-							<div class="rating-pod" id="guid{$result.guid}">
-								<div class="icons">
-									<div class="icon icon_nzb"><a class="divlink" title="Download Nzb"
-																  href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}"></a>
-									</div>
-									<div class="icon icon_cart" title="Add to Cart"></div>
-									{if $sabintegrated}
-										<div class="icon icon_sab" title="Send to my Queue"></div>
-									{/if}
-								</div>
-								<br>
-								<hr>
-								<div class="icons">
-									{if $type == 'Console'}
-										<div class="icon icon_ign">
-											<a class="divlink" title="Find on IGN"
-											   href="{$site->dereferrer_link}http://ign.com/search?q={$result.searchname|escape:"url"}&page=0&count=10&type=object&objectType=game&filter=games&"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_gamespot">
-											<a class="divlink" title="Find on Gamespot"
-											   href="{$site->dereferrer_link}http://www.gamespot.com/search/?q={$result.searchname|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_predbme">
-											<a class="divlink" title="Find on Predb.me"
-											   href="{$site->dereferrer_link}http://predb.me/?cats=games&search={$result.searchname|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-									{elseif $type == 'Movies'}
-										<div class="icon icon_imdb">
-											<a class="divlink" target="_blank" title="View on IMDB"
-											   href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$result.imdbid}/"></a>
-										</div>
-										<div class="icon icon_trakt">
-											<a class="divlink" target="_blank" title="View on Trakt"
-											   href="{$site->dereferrer_link}http://trakt.tv/search/imdb/tt{$result.imdbid}/"></a>
-										</div>
-										{if $cpapi != '' && $cpurl != ''}
-											<div class="icon icon_cp">
-												<a class="divlink sendtocouch" target="_blank"
-												   title="Send to CouchPotato" href="javascript:;"
-												   rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result.imdbid}&title={$result.searchname|escape:"url"}"></a>
-											</div>
-										{/if}
-									{elseif $type == 'XXX'}
-										<div class="icon icon_ade">
-											<a class="divlink" target="_blank" title="View on AdultDVDEmpire"
-											   href="{$site->dereferrer_link}http://www.adultdvdempire.com/dvd/search?q={$result.title|escape:"url"}/"></a>
-										</div>
-										<div class="icon icon_popporn">
-											<a class="divlink" target="_blank" title="View on PopPorn"
-											   href="{$site->dereferrer_link}http://dereferer.org/?http://www.popporn.com/results/index.cfm?v=4&g=0&searchtext={$result.title|escape:"url"}/"></a>
-										</div>
-										<div class="icon icon_iafd">
-											<a class="divlink" target="_blank"
-											   title="View on Internet Adult Film Database"
-											   href="{$site->dereferrer_link}http://www.iafd.com/results.asp?searchtype=title&searchstring={$result.title|escape:"url"}/"></a>
-										</div>
-									{elseif $type == 'PC'}
-										<div class="icon icon_ign">
-											<a class="divlink" title="Find on IGN"
-											   href="{$site->dereferrer_link}http://ign.com/search?q={$result.searchname|escape:"url"}&page=0&count=10&type=object&objectType=game&filter=games&"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_gamespot">
-											<a class="divlink" title="Find on Gamespot"
-											   href="{$site->dereferrer_link}http://www.gamespot.com/search/?q={$result.searchname|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_predbme">
-											<a class="divlink" title="Find on Predb.me"
-											   href="{$site->dereferrer_link}http://predb.me/?cats=games&search={$result.searchname|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-
-									{elseif $type == 'Audio'}
-										<div class="icon icon_discogs">
-											<a class="divlink" title="Find on Discogs"
-											   href="{$site->dereferrer_link}http://www.discogs.com/search/?q={$result.searchname|regex_replace:"/ ?(\(?\d\d\d\d\)?)? ?(MP3|FLAC)/i":""|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_allmusic">
-											<a class="divlink" title="Find on AllMusic"
-											   href="{$site->dereferrer_link}http://www.allmusic.com/search/all/{$result.searchname|regex_replace:"/ ?(\(?\d\d\d\d\)?)? ?(MP3|FLAC)/i":""|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_lastfm">
-											<a class="divlink" title="Find on Last.FM"
-											   href="{$site->dereferrer_link}http://www.last.fm/search?q={$result.searchname|regex_replace:"/ ?(\(?\d\d\d\d\)?)? ?(MP3|FLAC)/i":""|escape:"url"}&from=ac/"
-											   target="_blank"></a>
-										</div>
-									{elseif $type == 'Books'}
-										<div class="icon icon_amazon">
-											<a class="divlink" title="View Amazon Page"
-											   href="{$site->dereferrer_link}{$result.url}"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_goodreads">
-											<a class="divlink" title="Find on Goodreads"
-											   href="{$site->dereferrer_link}http://www.goodreads.com/search?query={if $result.author != ""}{$result.author|escape:"url"}{"+-+"}{/if}{$result.booktitle|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-										<div class="icon icon_shelfari">
-											<a class="divlink" title="Find on Shelfari"
-											   href="{$site->dereferrer_link}http://www.shelfari.com/search/books?Keywords={if $result.author != ""}{$result.author|escape:"url"}{"+-+"}{/if}{$result.booktitle|escape:"url"}"
-											   target="_blank"></a>
-										</div>
-									{elseif $type == 'TV'}
-										<div class="icon icon_tvrage">
-											<a class="divlink" title="View in TvRage"
-											   href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$result.rageid}"
-											   target="_blank"></a>
-										</div>
-									{/if}
-								</div>
-							</div>
-							<a class="plays" href="#"></a>
-						</div>
-					{/foreach}
-				</div>
-			</div>
-		</div>
-	{/if}
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/nzbvortex-ajax.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/nzbvortex-ajax.tpl
deleted file mode 100644
index f75aa0df3..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/nzbvortex-ajax.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{if $overview['nzbs']|@count gt 0}
-{foreach from=$overview['nzbs'] item=nzb}
-<div style="border-top: 2px solid #eee; margin: 0 0 5px 0; position: relative">
-    <div id="vortex-overlay-{$nzb['id']}" style="position: absolute; background-color: #000; opacity: 0.2; width: 100%; height: 100%; display: none"></div>
-    <div class="vortex-nzb" style="padding: 5px 0 5px 0">
-        <i>{$nzb['uiTitle']}</i>
-        <br />
-        <div style="width: 20px; float: left; margin: 7px 0 0 0">
-            {if $nzb['isPaused'] eq 1}
-                <img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/blah.png" style="float: left; margin: 0 5px 0 0" />
-            {else}
-                <img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/bigsmile.png" style="float: left; margin: 0 5px 0 0" />
-            {/if}
-        </div>
-        <div class="vortex-progressbar" style="margin: 5px 0 0 0; background-color: #eee; height: 15px; padding: 3px; border-radius: 2px; float: left; width: 720px">
-            <div style="float: left; background-color: {if $nzb['isPaused'] eq 1}#FB8084{else}#91BA98{/if}; height: 15px; width: {$nzb['progress']}%"></div>
-        </div>
-        <br style="clear: both" />
-        <strong>{$nzb['state']}{if $nzb['statusText'] neq ''} ({$nzb['statusText']|lower}){/if}</strong>: {$nzb['progress']|round}% of {math|string_format:"%.2f" equation="size / 1024 / 1024" size=$nzb['totalDownloadSize']} MB {if $nzb['transferedSpeed'] neq 0}@ {math|string_format:"%.2f" equation="size / 1024 / 1024" size=$nzb['transferedSpeed']} MB/s{/if}
-        <div class="vortex-controls" style="margin: 5px 0 0 0">
-            <div style="border-right: 2px solid #eee; width: 41px; float: left; margin: 0 5px 0 0">
-            {if $nzb['isPaused'] eq 1}
-                <a class="vortex-resume" title="Resume" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/play.png" /></a>
-            {else}
-                <a class="vortex-pause" title="Pause" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/pause.png" /></a>
-            {/if}
-                <a class="vortex-filelist" title="View filelist" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/tv.png" /></a>
-            </div>
-            <div class="vortex-controls" style="float: left">
-                <a class="vortex-moveup" title="Move up in queue" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/arrow2_n.png" /></a>
-                <a class="vortex-movedown" title="Move down in queue" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/arrow2_s.png" /></a>
-                <a class="vortex-movebottom" title="Move to bottom of queue" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/arrow3_s.png" /></a>
-                <a class="vortex-movetop" title="Move to top of queue" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/arrow3_n.png" /></a>
-                <a class="vortex-trash" title="Cancel and delete NZB" href="{$nzb['id']}"><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/vortex/trash.png" /></a>
-            </div>
-            <br style="clear: both" />
-        </div>
-    </div>
-</div>
-{/foreach}
-{else}
-<div id="vortex-info" style="background-color: #2A8FBD; text-align: center; padding: 5px; color: #eee">
-    Nothing in queue, go ahead and add something!
-</div>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/nzbvortex.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/nzbvortex.tpl
deleted file mode 100644
index d02bb496c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/nzbvortex.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<h1>{$page->title}</h1>
-{if $weHasVortex}
-<div id="vortex-error" style="display: none; background-color: #767A9E; text-align: center; padding: 5px; color: #eee"></div>
-<div id="vortex">
-</div>
-{literal}
-<script type="text/javascript">
-
-    var timer = 0;
-    function getOverview()
-    {
-        $.ajax
-        ({
-            url: WWW_TOP + '/nzbvortex?getOverview&isAjax',
-            cache: false
-        }).done(function(html)
-        {
-            $("#vortex").html(html);
-            timer = setTimeout(getOverview, 2500);
-        }).fail(function(response)
-        {
-            $('#vortex').hide();
-            $('#vortex-error').show();
-            $('#vortex-error').html(response.responseText);
-            clearTimeout(timer);
-        });
-    }
-    
-    getOverview();
-    
-</script>
-{/literal}
-{else}
-<p>Make sure you've entered API key and server URL under profile settings.</p>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/opensearch.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/opensearch.tpl
deleted file mode 100644
index 7d1f0bc21..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/opensearch.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
-	<ShortName>{$site->title|escape}</ShortName>
-	<Description>{$site->title|escape} Search Facility</Description>
-	<Url type="text/html" method="get" template="{$serverroot}search/{literal}{searchTerms}{/literal}"/>
-	<Contact>{$site->email}</Contact>
-	<Image width="16" height="16">{$serverroot}templates/nntmux/images/favicon.ico</Image>
-	<Developer>newznab.com</Developer>
-	<InputEncoding>UTF-8</InputEncoding>
-	<moz:SearchForm>{$serverroot}</moz:SearchForm>
-	<moz:UpdateUrl>{$serverroot}opensearch</moz:UpdateUrl>
-	<moz:IconUpdateUrl>{$serverroot}templates/nntmux/images/favicon.ico</moz:IconUpdateUrl>
-	<moz:UpdateInterval>7</moz:UpdateInterval>
-</OpenSearchDescription>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/pager.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/pager.tpl
deleted file mode 100644
index 1c380f8fd..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/pager.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{assign var="pages" value=($pagertotalitems/$pageritemsperpage)|roundup}
-{assign var="currentpage" value=($pageroffset+$pageritemsperpage)/$pageritemsperpage}
-{assign var="upperhalfwaypoint" value=((($pages-$currentpage)/2)|roundup)+$currentpage}
- 
-{if $pages > 1}
-{strip} 
-<div class="pager">
-	{if $currentpage > 1}
-		<a title="Goto page 1" href="{$pagerquerybase}0{$pagerquerysuffix}">1</a>&nbsp;
-	{/if}
-
-	{if $currentpage > 3}
-		<span class="step">...</span>
-	{/if}
-
-	{if $currentpage > 2}
-		<a title="Goto page {$currentpage-1}" href="{$pagerquerybase}{$pageroffset-$pageritemsperpage}{$pagerquerysuffix}">{$currentpage-1}</a>&nbsp;
-	{/if}	
-
-	<span class="current" title="Current page {$currentpage}">{$currentpage}</span>
-
-	{if ($currentpage+1) < $pages}
-		&nbsp;<a title="Goto page {$currentpage+1}" href="{$pagerquerybase}{$pageroffset+$pageritemsperpage}{$pagerquerysuffix}">{$currentpage+1}</a>
-	{/if}	
-
-	{if ($currentpage+1) < ($pages-1) && ($currentpage+2) < $upperhalfwaypoint}
-		<span class="step">&nbsp;...</span>
-	{/if}	
-
-	{if $upperhalfwaypoint != $pages && $upperhalfwaypoint != ($currentpage+1)}
-		&nbsp;<a title="Goto page {$upperhalfwaypoint}" href="{$pagerquerybase}{$upperhalfwaypoint*$pageritemsperpage}{$pagerquerysuffix}">{$upperhalfwaypoint}</a>
-	{/if}	
-
-	{if ($upperhalfwaypoint+1) < $pages}
-		<span class="step">&nbsp;...</span>
-	{/if}	
-
-	{if $pages > $currentpage}
-		&nbsp;<a title="Goto page {$pages}" href="{$pagerquerybase}{($pages*$pageritemsperpage)-$pageritemsperpage}{$pagerquerysuffix}">{$pages}</a>
-	{/if}			
-
-</div>
-{/strip}
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/prehash.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/prehash.tpl
deleted file mode 100644
index 187087e04..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/prehash.tpl
+++ /dev/null
@@ -1,278 +0,0 @@
-{if $site->adbrowse != ''}
-	{$site->adbrowse}
-{/if}
-<h1>{$page->title}</h1>
-<form name="prehashsearch" method="get" action="{$smarty.const.WWW_TOP}/prehash" id="custom-search-form"
-	  class="form-search form-horizontal col-4 col-lg-4 pull-right">
-	<div id="search" class="input-group col-12 col-lg-12">
-		<input type="text" class="form-control" placeholder="Search prehash" id="prehashsearch" name="prehashsearch"
-			   value="{$lastSearch|escape:'html'}">
-		<span class="input-group-btn">
-			<button type="submit" value="Go" class="btn btn-default">
-				<i class="icon-search"></i>
-			</button>
-		</span>
-	</div>
-</form>
-{$pager}
-<table style="width:100%;margin-bottom:10px; margin-top:5px;" class="data Sortable highlight">
-<tr>
-	<th style="text-align:center;width:125px">Date</th>
-	<th style="text-align:center">Title</th>
-	<th style="width:100px;text-align:center;">Category</th>
-	<th style="width:120px;text-align:center;">Source</th>
-	<th style="width:70px;text-align:center;">ReqID</th>
-	<th style="width:70px;text-align:center;">Size</th>
-	<th style="width:70px;text-align:center;">Files</th>
-	<th style="width:25px"></th>
-	<th style="width:25px"></th>
-</tr>
-{foreach from=$results item=result}
-	<tr class="{cycle values=",alt"}">
-	<td class="prehash" style="text-align:center;">
-		{$result.predate|date_format:"%Y-%m-%d %H:%M:%S"}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		{if isset($result.guid)}
-			<a style="font-style:italic;text-decoration:underline;color:#{if $result.nuked == 1}009933{elseif $result.nuked > 1}990000{/if};"
-			   class="title" title="View details"
-			   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.title|escape:"htmlall"}">
-				<span title="{if $result.nuked == 1}UNNUKED: {$result.nukereason|escape:"htmlall"}{elseif $result.nuked > 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"}</span>
-			</a>
-		{else}
-			<span style="color:#{if $result.nuked == 1}009933{elseif $result.nuked > 1}990000{/if};"
-				  title="{if $result.nuked == 1}UNNUKED: {$result.nukereason|escape:"htmlall"}{elseif $result.nuked > 1}NUKED: {$result.nukereason|escape:"htmlall"}{else}{$result.title|escape:"htmlall"}{/if}">{$result.title|escape:"htmlall"}</span>
-		{/if}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		{* Console *}
-		{* Xbox 360 *}
-		{if {$result.category} == 'XBOX360'}
-			<a class="title" title="View category XBOX 360" href="{$smarty.const.WWW_TOP}/browse?t=1050">Console Xbox
-				360</a>
-			{* Movies *}
-		{elseif in_array({$result.category}, array('Movies'))}
-			<a class="title" title="View category Movies" href="{$smarty.const.WWW_TOP}/browse?t=2000">Movies</a>
-			{* SD *}
-		{elseif in_array({$result.category}, array('movies-sd', 'Movies: STD', 'XVID'))}
-			<a class="title" title="View category Movies SD" href="{$smarty.const.WWW_TOP}/browse?t=2030">Movies SD</a>
-			{* HD *}
-		{elseif in_array({$result.category}, array('Movies: HD', 'X264'))}
-			<a class="title" title="View category Movies HD" href="{$smarty.const.WWW_TOP}/browse?t=2040">Movies HD</a>
-			{* BluRay *}
-		{elseif in_array({$result.category}, array('BLURAY'))}
-			<a class="title" title="View category BluRay" href="{$smarty.const.WWW_TOP}/browse?t=2060">Movies BluRay</a>
-			{* DVD *}
-		{elseif in_array({$result.category}, array('DVDR', 'Movies: DVD'))}
-			<a class="title" title="View category DVDR" href="{$smarty.const.WWW_TOP}/browse?t=2070">DVD</a>
-			{* Audio *}
-		{elseif in_array({$result.category}, array('music-audio'))}
-			<a class="title" title="View category Music" href="{$smarty.const.WWW_TOP}/music">Audio</a>
-			{* MP3 *}
-		{elseif in_array({$result.category}, array('MP3', 'Music: MP3'))}
-			<a class="title" title="View category MP3" href="{$smarty.const.WWW_TOP}/browse?t=3010">MP3</a>
-			{* Video *}
-		{elseif in_array({$result.category}, array('MVID', 'Music: MVID'))}
-			<a class="title" title="View category Audio Video" href="{$smarty.const.WWW_TOP}/browse?t=3020">Music
-				Videos</a>
-			{* Audiobook *}
-		{elseif in_array({$result.category}, array('audiobook', 'Audiobook'))}
-			<a class="title" title="View category Audiobook" href="{$smarty.const.WWW_TOP}/browse?t=3030">Audiobook</a>
-			{* Lossless *}
-		{elseif in_array({$result.category}, array('FLAC', 'Music: FLAC'))}
-			<a class="title" title="View category Music Lossless" href="{$smarty.const.WWW_TOP}/browse?t=3040">Lossless
-				Music</a>
-			{* PC *}
-			{* 0day *}
-		{elseif in_array({$result.category}, array('0DAY', 'APPS', 'Apps: PC', 'Apps: Linux', 'DOX'))}
-			<a class="title" title="View category PC 0day" href="{$smarty.const.WWW_TOP}/browse?t=4010">PC 0DAY</a>
-			{* Mac *}
-		{elseif in_array({$result.category}, array('Apps: MAC', 'Games: MAC'))}
-			<a class="title" title="View category PC Mac" href="{$smarty.const.WWW_TOP}/browse?t=4030">PC Mac</a>
-			{* Phone-Other *}
-		{elseif in_array({$result.category}, array('Apps: Phone', 'PDA'))}
-			<a class="title" title="View category Phone Other" href="{$smarty.const.WWW_TOP}/browse?t=4040">Phone
-				Other</a>
-			{* Games *}
-		{elseif in_array({$result.category}, array('GAMES', 'Games: PC', 'Games: Other'))}
-			<a class="title" title="View category PC Games" href="{$smarty.const.WWW_TOP}/browse?t=4050">PC Games</a>
-			{* TV *}
-		{elseif in_array({$result.category}, array('TV'))}
-			<a class="title" title="View category TV" href="{$smarty.const.WWW_TOP}/browse?t=5000">TV</a>
-			{* SD *}
-		{elseif in_array({$result.category}, array('TV-DVDRIP', 'tv-sd', 'TV: STD', 'TV-XVID'))}
-			<a class="title" title="View category TV SD" href="{$smarty.const.WWW_TOP}/browse?t=5030">SDTV</a>
-			{* HD *}
-		{elseif in_array({$result.category}, array('tv-hd', 'TV: HD', 'TV-x264', 'TV-X264'))}
-			<a class="title" title="View category TV HD" href="{$smarty.const.WWW_TOP}/browse?t=5040">HDTV</a>
-			{* XXX *}
-		{elseif in_array({$result.category}, array('XXX'))}
-			<a class="title" title="View category XXX" href="{$smarty.const.WWW_TOP}/browse?t=6000">XXX</a>
-			{* DVD *}
-		{elseif in_array({$result.category}, array('XXX: DVD'))}
-			<a class="title" title="View category XXX DVD" href="{$smarty.const.WWW_TOP}/browse?t=6010">XXX DVD</a>
-			{* XviD *}
-		{elseif in_array({$result.category}, array('XXX: SD-CLIPS', 'XXX: MOVIES-SD'))}
-			<a class="title" title="View category XXX XviD" href="{$smarty.const.WWW_TOP}/browse?t=6030">XXX SD</a>
-			{* x264 *}
-		{elseif in_array({$result.category}, array('XXX: HD-CLIPS', 'XXX: MOVIES-HD'))}
-			<a class="title" title="View category XXX x264" href="{$smarty.const.WWW_TOP}/browse?t=6040">XXX HD</a>
-			{* Other *}
-		{elseif in_array({$result.category}, array('xxx-videos'))}
-			<a class="title" title="View category XXX Other" href="{$smarty.const.WWW_TOP}/browse?t=6050">XXX Other</a>
-			{* Imageset *}
-		{elseif in_array({$result.category}, array('XXX-IMGSET'))}
-			<a class="title" title="View category XXX Imageset" href="{$smarty.const.WWW_TOP}/browse?t=6060">XXX
-				Imagesets</a>
-			{* Books *}
-		{elseif in_array({$result.category}, array('EBOOK'))}
-			<a class="title" title="View category Books" href="{$smarty.const.WWW_TOP}/browse?t=8000">Ebooks</a>
-			{* Other *}
-		{elseif in_array({$result.category}, array('Other: E-Books'))}
-			<a class="title" title="View category Books Other" href="{$smarty.const.WWW_TOP}/browse?t=8050">Ebooks
-				Other</a>
-		{elseif in_array({$result.category}, array('', 'PRE'))}
-			N/A
-		{else}
-			{$result.category}
-		{/if}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		{if {$result.source} == abgx}
-			<a title="Visit abgx" href="{$site->dereferrer_link}http://www.abgx.net/rss/x360/posted.rss"
-			   target="_blank">
-				abgx.net
-			</a>
-		{elseif in_array({$result.source}, array('abErotica', 'abMooVee', 'abTeeVee', 'abForeign'))}
-			<a title="Visit allfilled {$result.source}"
-			   href="{$site->dereferrer_link}http://{$result.source}.allfilled.com/search.php?q={$result.title}&Search=Search"
-			   target="_blank">
-				{$result.source}
-			</a>
-		{elseif $result.source|strpos:'#a.b.' !== false}
-			<a title="Visit {$result.source} on IRC"
-			   href="irc://irc.Prison.NET:6667/{str_replace('#a.b.', 'alt.binaries.', {$result.source})}"
-			   target="_blank">
-				{$result.source}
-			</a>
-		{elseif {$result.source} == omgwtfnzbs}
-			<a title="Visit omgwtfnzbs" href="{$site->dereferrer_link}http://rss.omgwtfnzbs.org/rss-info.php"
-			   target="_blank">
-				omgwtfnzbs
-			</a>
-		{elseif {$result.source} == orlydb}
-			<a title="Visit ORLYDB" href="{$site->dereferrer_link}http://orlydb.com/?q={$result.title}" target="_blank"
-			   target="_blank">
-				ORLYDB
-			</a>
-		{elseif {$result.source} == predbme}
-			<a title="Visit PreDB.me" href="{$site->dereferrer_link}http://predb.me/?search={$result.title}"
-			   target="_blank">
-				PreDB
-			</a>
-		{elseif {$result.source} == prelist}
-			<a title="Visit Prelist" href="{$site->dereferrer_link}http://www.prelist.ws/?search={$result.title}"
-			   target="_blank">
-				Prelist
-			</a>
-		{elseif {$result.source} == "#Pre@zenet"}
-			<a title="Visit zenet on IRC" href="irc://irc.zenet.org:6667/Pre" target="_blank">
-				Zenet IRC
-			</a>
-		{elseif {$result.source} == "#pre@corrupt"}
-			<a title="Visit corrupt on IRC" href="irc://irc.corrupt-net.org:6667/pre" target="_blank">
-				Corrupt-Net
-			</a>
-		{elseif {$result.source} == srrdb}
-			<a title="Visit srrDB" href="{$site->dereferrer_link}http://www.srrdb.com/browse/{$result.title}"
-			   target="_blank">
-				srrDB
-			</a>
-		{elseif {$result.source} == "#scnzb"}
-			<a title="Visit srrDB" href="irc://irc.Prison.NET:6667/scnzb" target="_blank">
-				srrDB
-			</a>
-		{elseif {$result.source} == "#tvnzb"}
-			<a title="Visit srrDB" href="irc://irc.Prison.NET:6667/tvnzb" target="_blank">
-				srrDB
-			</a>
-		{elseif {$result.source} == "usenet-crawler"}
-			<a title="Visit Usenet-Crawler"
-			   href="{$site->dereferrer_link}http://www.usenet-crawler.com/predb?q={$result.title}" target="_blank">
-				Usenet-Crawler
-			</a>
-		{elseif {$result.source} == womble}
-			<a title="Visit Womble" href="{$site->dereferrer_link}http://www.newshost.co.za/?s={$result.title}"
-			   target="_blank">
-				Womble
-			</a>
-		{elseif {$result.source} == zenet}
-			<a title="Visit ZEnet" href="{$site->dereferrer_link}http://pre.zenet.org/?search={$result.title}"
-			   target="_blank">
-				ZEnet
-			</a>
-		{else}
-			{$result.source}
-		{/if}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		{if is_numeric({$result.requestid}) && {$result.requestid} != 0}
-			<a
-					class="requestid"
-					title="{$result.requestid}"
-					href="{$smarty.const.WWW_TOP}/search?searchadvr=&searchadvsubject={$result.requestid}
-						&searchadvposter=&searchadvdaysnew=&searchadvdaysold=&searchadvgroups=-1&searchadvcat=-1
-						&searchadvsizefrom=-1&searchadvsizeto=-1&searchadvhasnfo=0&searchadvhascomments=0&search_type=adv"
-					>
-				{$result.requestid}
-			</a>
-		{else}
-			N/A
-		{/if}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		{if not in_array({$result.size}, array('NULL', '', '0MB'))}
-			{if strpos($result.size, 'MB') != false && {$result.size|regex_replace:"/(\.\d|,|MB)+/":''|count_characters} > 3}
-				{math equation=($result.size|regex_replace:'/(\.\d|,|MB)+/':'' / 1024)|round}GB
-			{else}
-				{$result.size|regex_replace:"/(\.\d|,)+/":''}
-			{/if}
-		{else}
-			N/A
-		{/if}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		{if isset($result.files)}
-			{$result.files}
-		{else}
-			N/A
-		{/if}
-	</td>
-	<td class="prehash" style="text-align:center;">
-		<a
-				style="float: right;"
-				title="NzbIndex"
-				href="{$site->dereferrer_link}http://nzbindex.com/search/?q={$result.title}"
-				target="_blank"
-				>
-			<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/nzbindex.png"/>
-			&nbsp;
-		</a>
-	</td>
-	<td class="prehash" style="text-align:center;">
-		<a
-				style="float: right;"
-				title="BinSearch"
-				href="{$site->dereferrer_link}http://binsearch.info/?q={$result.title}"
-				target="_blank"
-				>
-			<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/binsearch.png"/>
-			&nbsp;
-		</a>
-	</td>
-	</tr>
-{/foreach}
-</table>
-<pager style="padding-bottom:10px;">
-	{$pager}
-</pager>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/profile.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/profile.tpl
deleted file mode 100644
index 4e8c3af79..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/profile.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-
-<h1>Profile for {$user.username|escape:"htmlall"}</h1>
-
-<table class="data">
-	<tr><th>Username:</th><td>{$user.username|escape:"htmlall"}</td></tr>
-	{if $user.id==$userdata.id || $userdata.role==2}<tr><th title="Not public">Email:</th><td>{$user.email}</td></tr>{/if}
-	<tr><th>Registered:</th><td title="{$user.createddate}">{$user.createddate|date_format}  ({$user.createddate|timeago} ago)</td></tr>
-	<tr><th>Last Login:</th><td title="{$user.lastlogin}">{$user.lastlogin|date_format}  ({$user.lastlogin|timeago} ago)</td></tr>
-	<tr><th>Role:</th><td>{$user.rolename}</td></tr>
-	{if $userdata.role==2}<tr><th title="Admin Notes">Notes:</th><td>{$user.notes|escape:htmlall}{if $user.notes|count_characters > 0}<br/>{/if}<a href="{$smarty.const.WWW_TOP}/admin/user-edit.php?id={$user.id}#notes">Add/Edit</a></td></tr>{/if}
-	{if $user.id==$userdata.id || $userdata.role==2}<tr><th title="Not public">Site Api/Rss Key:</th><td><a href="{$smarty.const.WWW_TOP}/rss?t=0&amp;dl=1&amp;i={$user.id}&amp;r={$user.rsstoken}">{$user.rsstoken}</a></td></tr>{/if}
-	{if $user.id==$userdata.id || $userdata.role==2}
-	<tr><th>API Hits Today:</th><td><span id="uatd">{$apihits.num}</span> {if $userdata.role==2 && $apihits.num > 0}<a onclick="resetapireq({$user.id}, 'api'); document.getElementById('uatd').innerHTML='0'; return false;" href="#">Reset</a>{/if}</td></tr>
-	<tr><th>Grabs Today:</th><td><span id="ugrtd">{$grabstoday.num}</span> {if $grabstoday.num >= $user.downloadrequests}&nbsp;&nbsp;<small>(Next DL in {($grabstoday.nextdl/3600)|intval}h {($grabstoday.nextdl/60) % 60}m)</small>{/if}{if $userdata.role==2 && $grabstoday.num > 0}<a onclick="resetapireq({$user.id}, 'grabs'); document.getElementById('ugrtd').innerHTML='0'; return false;" href="#">Reset</a>{/if}</td></tr>
-	{/if}
-	<tr><th>Grabs Total:</th><td>{$user.grabs}</td></tr>
-
-	{if ($user.id==$userdata.id || $userdata.role==2) && $site->registerstatus==1}
-	<tr>
-		<th title="Not public">Invites:</th>
-		<td>{$user.invites}
-		{if $user.invites > 0}
-			[<a id="lnkSendInvite" onclick="return false;" href="#">Send Invite</a>]
-			<span title="Your invites will be reduced when the invitation is claimed." class="invitesuccess" id="divInviteSuccess">Invite Sent</span>
-			<span class="invitefailed" id="divInviteError"></span>
-			<div style="display:none;" id="divInvite">
-				<form id="frmSendInvite" method="GET">
-					<label for="txtInvite">Email</label>:
-					<input type="text" id="txtInvite" />
-					<input type="submit" value="Send"/>
-				</form>
-			</div>
-		{/if}
-		</td>
-	</tr>
-	{/if}
-
-	{if $userinvitedby && $userinvitedby.username != ""}
-	<tr><th>Invited By:</th><td><a title="View {$userinvitedby.username}'s profile" href="{$smarty.const.WWW_TOP}/profile?name={$userinvitedby.username}">{$userinvitedby.username}</a></td>
-	{/if}
-
-	<tr><th>UI Preferences:</th>
-		<td>
-			{if $user.movieview == "1"}View movie covers{else}View standard movie category{/if}<br/>
-			{if $user.musicview == "1"}View music covers{else}View standard music category{/if}<br/>
-			{if $user.gameview == "1"}View game covers{else}View standard game category{/if}<br/>
-			{if $user.xxxview == "1"}View XXX covers{else}View standard xxx category{/if}<br/>
-			{if $user.consoleview == "1"}View console covers{else}View standard console category{/if}<br/>
-			{if $user.bookview == "1"}View book covers{else}View standard book category{/if}
-		</td>
-	</tr>
-	{if $user.id==$userdata.id || $userdata.role==2}<tr><th title="Not public">Excluded Categories:</th><td>{$exccats|replace:",":"<br/>"}</td></tr>{/if}
-	{if $page->site->sabintegrationtype == 2 && $user.id==$userdata.id}
-		<tr><th>SABnzbd Integration:</th>
-		<td>
-			Url: {if $saburl == ''}N/A{else}{$saburl}{/if}<br/>
-			Key: {if $sabapikey == ''}N/A{else}{$sabapikey}{/if}<br/>
-			Type: {if $sabapikeytype == ''}N/A{else}{$sabapikeytype}{/if}<br/>
-			Priority: {if $sabpriority == ''}N/A{else}{$sabpriority}{/if}<br/>
-			Storage: {if $sabsetting == ''}N/A{else}{$sabsetting}{/if}
-		</td>
-	{/if}
-	<tr>
-		<th>CouchPotato Integration:</th>
-		<td>
-			Url: {if $user.cp_url == ''}N/A{else}{$user.cp_url}{/if}<br/>
-			Key: {if $user.cp_api == ''}N/A{else}{$user.cp_api}{/if}<br/>
-		</td>
-
-	{if ($user.id==$userdata.id)}
-	<tr>
-	   <th>NZBVortex</th>
-        <td>
-            API key: {$user.nzbvortex_api_key}
-            <br />
-            Server URL: <a href="{$user.nzbvortex_server_url}" target="_blank">{$user.nzbvortex_server_url}</a>
-        </td>
-    </tr>
-	{/if}
-
-	{if $user.id==$userdata.id}
-			<tr><th>My TV Shows:</th><td><a href="{$smarty.const.WWW_TOP}/myshows">Manage my shows</a></td></tr>
-			<tr><th>My Movies:</th><td><a href="{$smarty.const.WWW_TOP}/mymovies">Manage my movies</a></td></tr>
-	{/if}
-
-
-	{if $user.id==$userdata.id}<tr><th></th><td><a href="{$smarty.const.WWW_TOP}/profileedit">Edit</a></td></tr>{/if}
-</table>
-
-
-{if $userdata.role==2 && $downloadlist|@count > 0}
-<div style="padding-top:20px;">
-	<h2>Downloads for User</h2>
-
-	<table style="margin-top:10px;" class="data">
-
-		<tr>
-			<th>date</th>
-			<th>release</th>
-		</tr>
-
-		{foreach from=$downloadlist item=download}
-		{if $download@iteration == 10}
-			<tr class="more"><td colspan="3"><a onclick="$('tr.extra').toggle();$('tr.more').toggle();return false;" href="#">show all...</a></td></tr>
-		{/if}
-		<tr {if $download@iteration >= 10}class="extra" style="display:none;"{/if}>
-			<td width="80" title="{$download.timestamp}">{$download.timestamp|date_format}</td>
-			<td>{if $download.guid == ""}n/a{else}<a href="{$smarty.const.WWW_TOP}/details/{$download.guid}/{$download.searchname|escape:"htmlall"}">{$download.searchname}</a>{/if}</td>
-		</tr>
-		{/foreach}
-	</table>
-</div>
-{/if}
-
-{if $commentslist|@count > 0}
-<div style="padding-top:20px;">
-	<a id="comments"></a>
-	<h2>Comments</h2>
-
-	{$pager}
-
-	<table style="margin-top:10px;" class="data Sortable">
-
-		<tr>
-			<th>date</th>
-			<th>release</th>
-			<th>comment</th>
-		</tr>
-
-
-		{foreach from=$commentslist item=comment}
-		<tr>
-			<td width="80" title="{$comment.createddate}">{$comment.createddate|date_format}</td>
-			<td><a href="{$smarty.const.WWW_TOP}/details/{$comment.guid}/{$comment.searchname|escape:"seourl"}">{$comment.searchname}</a></td>
-			<td>{$comment.text|escape:"htmlall"|nl2br}</td>
-		</tr>
-		{/foreach}
-	</table>
-</div>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/profileedit.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/profileedit.tpl
deleted file mode 100644
index ce0e217c7..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/profileedit.tpl
+++ /dev/null
@@ -1,258 +0,0 @@
-<h1>Edit your profile</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-<br/><br/>
-
-<form action="profileedit?action=submit" method="post">
-
-	<fieldset>
-		<legend>User Details</legend>
-		<table class="input">
-			<tr>
-				<th width="100">Username:</th>
-				<td>{$user.username|escape:"htmlall"}</td>
-			</tr>
-			<tr>
-				<th>Email:</th>
-				<td><input id="email" class="long" name="email" type="text" value="{$user.email|escape:"htmlall"}"/>
-				</td>
-			</tr>
-			<tr>
-				<th>Password:</th>
-				<td>
-					<input autocomplete="off" id="password" name="password" type="password" value=""/>
-
-					<div class="hint">Only enter your password if you want to change it.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>Confirm Password:</th>
-				<td><input autocomplete="off" id="confirmpassword" name="confirmpassword" type="password" value=""/>
-				</td>
-			</tr>
-			<tr>
-				<th>Site Api/Rss Key:</th>
-				<td>{$user.rsstoken}<br/><a class="confirm_action" href="?action=newapikey">Generate</a></td>
-			</tr>
-		</table>
-	</fieldset>
-	<fieldset>
-		<legend>Site Preferences</legend>
-		<table class="input">
-			<tr>
-				<th>View Movie Page:</th>
-				<td>
-					<input id="movieview" name="movieview" value="1" type="checkbox"
-						   {if $user.movieview=="1"}checked="checked"{/if}/>
-
-					<div class="hint">Browse movie covers. Only shows movies with known IMDB info.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>View Music Page:</th>
-				<td>
-					<input id="musicview" name="musicview" value="1" type="checkbox"
-						   {if $user.musicview=="1"}checked="checked"{/if}/>
-
-					<div class="hint">Browse music covers. Only shows music with known lookup info.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>View Game Page:</th>
-				<td>
-					<input id="gameview" name="gameview" value="1" type="checkbox" {if $user.gameview=="1"}checked="checked"{/if}>
-					<div class="hint">Browse game covers. Only shows games with known lookup info.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>View XXX Page:</th>
-				<td>
-					<input id="xxxview" name="xxxview" value="1" type="checkbox"
-						   {if $user.xxxview=="1"}checked="checked"{/if}>
-
-					<div class="hint">Browse XXX covers. Only shows XXX releases with known lookup info.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>View Console Page:</th>
-				<td>
-					<input id="consoleview" name="consoleview" value="1" type="checkbox"
-						   {if $user.consoleview=="1"}checked="checked"{/if}/>
-
-					<div class="hint">Browse console covers. Only shows games with known lookup info.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>View Book Page:</th>
-				<td>
-					<input id="bookview" name="bookview" value="1" type="checkbox"
-						   {if $user.bookview=="1"}checked="checked"{/if}/>
-
-					<div class="hint">Browse book covers. Only shows books with known lookup info.</div>
-				</td>
-			</tr>
-			<tr>
-				<th>Excluded Categories:</th>
-				<td>
-					{html_options style="height:105px;" multiple=multiple name="exccat[]" options=$catlist selected=$userexccat}
-					<div class="hint">Use Ctrl and click to exclude multiple categories.</div>
-				</td>
-			</tr>
-		</table>
-	</fieldset>
-
-	{if $page->site->sabintegrationtype != 1}
-		<fieldset>
-			<legend>Queue Type</legend>
-			<table class="table table-condensed input">
-				<colgroup>
-					<col style="width: 150px;">
-				</colgroup>
-				<tr>
-					<th>Queue type:</th>
-					<td>
-						{html_options id="queuetypeids" name='queuetypeids' values=$queuetypeids output=$queuetypes selected=$user.queuetype}
-						<span class="help-block">Pick the type of queue you wish to use, once you save your profile, the page will reload, the box will appear and you can fill out the details.</span>
-					</td>
-				</tr>
-			</table>
-		</fieldset>
-	{/if}
-	{if $user.queuetype == 2 && ($page->site->sabintegrationtype == 0 || $page->site->sabintegrationtype == 2)}
-		<fieldset>
-			<legend>NZBGet Integration</legend>
-			<table class="table table-condensed input">
-				<colgroup>
-					<col style="width: 150px;">
-				</colgroup>
-				<tr>
-					<th><label for="nzbgeturl">NZBGet Url:</label></th>
-					<td>
-						<input id="nzbgeturl" class="form-control" name="nzbgeturl" type="text" value="{$user.nzbgeturl}" />
-						<span class="help-block">The url of the NZBGet installation, for example: http://127.0.0.1:6789/</span>
-					</td>
-				</tr>
-
-				<tr>
-					<th><label for="nzbgetusername">NZBGet Username:</label></th>
-					<td>
-						<input id="nzbgetusername" class="form-control" name="nzbgetusername" type="text" value="{$user.nzbgetusername}" />
-						<span class="help-block">The user name for the NZBGet installation.</span>
-					</td>
-				</tr>
-
-				<tr>
-					<th><label for="nzbgetpassword">NZBGet Password:</label></th>
-					<td>
-						<input id="nzbgetpassword" class="form-control" name="nzbgetpassword" type="text" value="{$user.nzbgetpassword}" />
-						<span class="help-block">The password for the NZBGet installation.</span>
-					</td>
-				</tr>
-
-			</table>
-		</fieldset>
-	{/if}
-	{if $user.queuetype == 1 && $page->site->sabintegrationtype == 2}
-		<fieldset>
-			<legend>SABnzbd Integration</legend>
-			<table class="input">
-				<tr>
-					<th width="100"><label for="saburl">SABnzbd Url:</label></th>
-					<td>
-						<input id="saburl" class="long" name="saburl" type="text" value="{$saburl_selected}" />
-						<div class="hint">The url of the SAB installation, for example: http://localhost:8080/sabnzbd/</div>
-					</td>
-				</tr>
-
-				<tr>
-					<th><label for="sabapikey">SABnzbd Api Key:</label></th>
-					<td>
-						<input id="sabapikey" class="long" name="sabapikey" type="text" value="{$sabapikey_selected}" />
-						<div class="hint">The api key of the SAB installation. Can be the full api key or the nzb api key (as of SAB 0.6)</div>
-					</td>
-				</tr>
-
-				<tr>
-					<th><label for="sabapikeytype">Api Key Type:</label></th>
-					<td>
-						{html_radios id="sabapikeytype" name='sabapikeytype' values=$sabapikeytype_ids output=$sabapikeytype_names selected=$sabapikeytype_selected separator='<br />'}
-						<div class="hint">Select the type of api key you entered in the above setting. Using your full SAB api key will allow you access to the SAB queue from within this site.</div>
-					</td>
-				</tr>
-
-				<tr>
-					<th><label for="sabpriority">Priority Level:</label></th>
-					<td>
-						{html_options id="sabpriority" name='sabpriority' values=$sabpriority_ids output=$sabpriority_names selected=$sabpriority_selected}
-						<div class="hint">Set the priority level for NZBs that are added to your queue</div>
-					</td>
-				</tr>
-				<tr>
-					<th><label for="sabsetting">Setting Storage:</label></th>
-					<td>
-						{html_radios id="sabsetting" name='sabsetting' values=$sabsetting_ids output=$sabsetting_names selected=$sabsetting_selected separator='&nbsp;&nbsp;'}{if $sabsetting_selected == 2}&nbsp;&nbsp;[<a class="confirm_action" href="?action=clearcookies">Clear Cookies</a>]{/if}
-						<div class="hint">Where to store the SAB setting.<br />&bull; <b>Cookie</b> will store the setting in your browsers coookies and will only work when using your current browser.<br/>&bull; <b>Site</b> will store the setting in your user account enabling it to work no matter where you are logged in from.<br /><span class="warning"><b>Please Note:</b></span> You should only store your full SAB api key with sites you trust.</div>
-					</td>
-				</tr>
-			</table>
-		</fieldset>
-	{/if}
-	<fieldset>
-		<legend>NZBVortex Integration</legend>
-		<table class="input">
-			<tr>
-				<th width="100"><label for="nzbvortex_server_url">Server URL</label>:</th>
-				<td>
-					<input id="nzbvortex_server_url" class="long" name="nzbvortex_server_url" maxlength="255"
-						   type="text" value="{$user.nzbvortex_server_url}"/>
-
-					<div class="hint">Server URL for NZBVortex found in <strong>Preferences -> Remote</strong>. Do not
-						put a / at the end!
-						<br/>
-						Example: http://123.123.123.123:8080
-					</div>
-				</td>
-			</tr>
-			<tr>
-				<th width="100"><label for="nzbvortex_remote_api_key">Remote API Key</label>:</th>
-				<td>
-					<input id="nzbvortex_api_key" class="medium" name="nzbvortex_api_key" maxlength="10" type="text"
-						   value="{$user.nzbvortex_api_key}"/>
-
-					<div class="hint">Remote API key for NZBVortex found in <strong>Preferences -> Remote</strong>.
-						<br/>
-						Example: 52FE-5ABD
-					</div>
-				</td>
-			</tr>
-		</table>
-	</fieldset>
-	<fieldset>
-		<legend>CouchPotato Integration</legend>
-		<table class="input">
-			<tr>
-				<td style="width:180px;"><label for="cp_api">CouchPotato API key:</label></td>
-				<td>
-					<input id="cp_api" class="long" name="cp_api" type="text" value="{$cp_api_selected}"/>
-
-					<div class="hint">The CouchPotato api key. Used for 'Add To CouchPotato'.</div>
-				</td>
-			</tr>
-
-			<tr>
-				<td style="width:180px;"><label for="cp_url">CouchPotato Url:</label></td>
-				<td>
-					<input id="cp_url" class="long" name="cp_url" type="text" value="{$cp_url_selected}"/>
-
-					<div class="hint">The CouchPotato url. Used for 'Add To CouchPotato', for example:
-						http://192.168.10.10:5050
-					</div>
-				</td>
-			</tr>
-		</table>
-	</fieldset>
-	<input type="submit" value="Save Profile"/>
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/recentforumposts.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/recentforumposts.tpl
deleted file mode 100644
index 0d6f5b3d8..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/recentforumposts.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{if $recentforumpostslist|@count > 0}
-<li class="menu_recentposts">
-	<h2>Recent Posts</h2>
-	<ul>
-	{foreach from=$recentforumpostslist item=content}
-		<li class="mmenu">
-			<a title="by {$content.username|escape:htmlall}" href="{$smarty.const.WWW_TOP}/forumpost/{$content.id}">{$content.subject|escape:htmlall}</a>
-		</li>
-	{/foreach}
-	</ul>
-</li>
-{/if}
-
-
-
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/register.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/register.tpl
deleted file mode 100644
index c66bd8113..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/register.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<h1>Register</h1>
-
-{if $error != ''}
-	<div class="error">{$error}</div>
-{/if}
-
-{if $showregister != "0"}
-	<form method="post" action="register?action=submit">
-
-		<table style="width:500px;" class="data">
-			<tr><th width="75px;"><label for="username">Username:</label> <em>*</em></th>
-				<td>
-					<input autocomplete="off" id="username" name="username" value="{$username}" type="text"/>
-					<div class="hint">Should be at least three characters and start with a letter.</div>
-				</td>
-			</tr>
-			<tr><th><label for="password">Password:</label> <em>*</em></th>
-				<td>
-					<input id="password" autocomplete="off" name="password" value="{$password}" type="password"/>
-					<input id="invitecode" name="invitecode" type="hidden" value="{$invitecode|escape:html_all}" />
-					<div class="hint">Should be at least six characters long.</div>
-				</td>
-			</tr>
-			<tr><th><label for="confirmpassword">Confirm Password:</label> <em>*</em></th><td><input autocomplete="off" id="confirmpassword" name="confirmpassword" value="{$confirmpassword}" type="password"/></td></tr>
-			<tr><th><label for="email">Email:</label> <em>*</em></th><td><input autocomplete="off" id="email" name="email" value="{$email}" type="text" /></td></tr>
-		</table>
-
-		<table style="width:500px; margin-top:10px;" class="data">
-			<tr><th width="75px;"></th><td><input type="submit" value="Register"/><div style="float:right;" class="hint"><em>*</em> Indicates mandatory field.</div></td></tr>
-		</table>
-
-	</form>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/rss.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/rss.tpl
deleted file mode 100644
index 7109bf893..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/rss.tpl
+++ /dev/null
@@ -1,173 +0,0 @@
-{$rsshead}
-
-{foreach from=$releases item=release}
-<item>
-	<title>{$release.searchname|escape:html}</title>
-	<guid isPermaLink="true">{$serverroot}details/{$release.guid}</guid>
-	<link>{$serverroot}{if $dl=="1"}getnzb{else}details{/if}/{$release.guid}{if $dl=="1"}.nzb&amp;i={$uid}&amp;r={$rsstoken}{/if}{if $del=="1"}&amp;del=1{/if}</link>
-	<comments>{$serverroot}details/{$release.guid}#comments</comments>
-	<pubDate>{$release.adddate|phpdate_format:"DATE_RSS"}</pubDate>
-	<category>{$release.category_name|escape:html}</category>
-	<description>{if $api=="1"}{$release.searchname}{else}
-<![CDATA[{strip}
-	<div>
-	{if $release.cover == 1}
-		<img style="margin-left:10px;margin-bottom:10px;float:right;" src="{$serverroot}covers/movies/{$release.imdbid}-cover.jpg" width="120" border="0" alt="{$release.searchname|escape:"htmlall"}" />
-	{/if}
-	{if $release.mu_cover == 1}
-		<img style="margin-left:10px;margin-bottom:10px;float:right;" src="{$serverroot}covers/music/{$release.musicinfoid}.jpg" width="120" border="0" alt="{$release.searchname|escape:"htmlall"}" />
-	{/if}
-	{if $release.co_cover == 1}
-		<img style="margin-left:10px;margin-bottom:10px;float:right;" src="{$serverroot}covers/console/{$release.consoleinfoid}.jpg" width="120" border="0" alt="{$release.searchname|escape:"htmlall"}" />
-	{/if}
-	{if $release.bo_cover == 1}
-		<img style="margin-left:10px;margin-bottom:10px;float:right;" src="{$serverroot}covers/book/{$release.bookinfoid}.jpg" width="120" border="0" alt="{$release.searchname|escape:"htmlall"}" />
-	{/if}
-	<ul>
-	<li>id: {$release.guid}</li>
-	<li>Name: <a href="{$serverroot}details/{$release.guid}">{$release.searchname}</a></li>
-	<li>Size: {$release.size|fsize_format:"MB"} </li>
-	<li>Attributes: Category - <a href="{$serverroot}browse?t={$release.categoryid}">{$release.category_name}</a></li>
-	<li>Groups: <a href="{$serverroot}browse?g={$release.group_name}">{$release.group_name}</a></li>
-	<li>Poster: {$release.fromname|escape:"htmlall"}</li>
-	<li>PostDate: {$release.postdate|phpdate_format:"DATE_RSS"}</li>
-	<li>Password: {if $release.passwordstatus == 0}None{elseif $release.passwordstatus == 2}Passworded Rar Archive{elseif $release.passwordstatus == 1}Contains Cab/Ace/RAR Archive{else}Unknown{/if}</li>
-
-	{if $release.nfoid != ""}
-		<li>Nfo: <a href="{$serverroot}api?t=getnfo&amp;id={$release.guid}&amp;raw=1&amp;i={$uid}&amp;r={$rsstoken}">{$release.searchname}.nfo</a></li>
-	{/if}
-
-	{if $release.parentCategoryID == 2000}
-		{if $release.imdbid != ""}
-		<li>Imdb Info:
-			<ul>
-				<li>IMDB Link: <a href="http://www.imdb.com/title/tt{$release.imdbid}/">{$release.imdbtitle|escape:"htmlall"}</a></li>
-				{if $release.rating != ""}<li>Rating: <span style="font-weight:bold; color:{if $release.rating < 4}#FF0000{elseif $release.rating < 7}#FFAA2A{else}#2AFF00{/if};">{$release.rating|escape:"htmlall"}</span></li>{/if}
-				{if $release.plot != ""}<li>Plot: {$release.plot|escape:"htmlall"}</li>{/if}
-				{if $release.year != ""}<li>Year: {$release.year|escape:"htmlall"}</li>{/if}
-				{if $release.genre != ""}<li>Genre: {$release.genre|replace:"|":", "|escape:"htmlall"}</li>{/if}
-				{if $release.director != ""}<li>Director: {$release.director|replace:"|":", "|escape:"htmlall"}</li>{/if}
-				{if $release.actors != ""}<li>Actors: {$release.actors|replace:"|":", "|escape:"htmlall"}</li>{/if}
-			</ul>
-		</li>
-		{/if}
-	{/if}
-
-	{if $release.parentCategoryID == 3000}
-		{if $release.musicinfoid > 0}
-		<li>Music Info:
-			<ul>
-				{if $release.mu_url != ""}<li>Amazon: <a href="{$release.mu_url}">{$release.mu_title|escape:"htmlall"}</a></li>{/if}
-				{if $release.mu_artist != ""}<li>Artist: {$release.mu_artist|escape:"htmlall"}</li>{/if}
-				{if $release.mu_genre != ""}<li>Genre: {$release.mu_genre|escape:"htmlall"}</li>{/if}
-				{if $release.mu_publisher != ""}<li>Publisher: {$release.mu_publisher|escape:"htmlall"}</li>{/if}
-				{if $release.year != ""}<li>Released: {$release.mu_releasedate|date_format}</li>{/if}
-				{if $release.mu_review != ""}<li>Review: {$release.mu_review|escape:"htmlall"}</li>{/if}
-				{if $release.mu_tracks != ""}
-				<li>Track Listing:
-					<ol>
-						{assign var="tracksplits" value="|"|explode:$release.mu_tracks}
-						{foreach from=$tracksplits item=tracksplit}
-						<li>{$tracksplit|trim|escape:"htmlall"}</li>
-						{/foreach}
-					</ol>
-				</li>
-				{/if}
-			</ul>
-		</li>
-		{/if}
-	{/if}
-
-	{if $release.parentCategoryID == 1000}
-		{if $release.consoleinfoid > 0}
-		<li>Console Info:
-			<ul>
-				{if $release.co_url != ""}<li>Amazon: <a href="{$release.co_url}">{$release.co_title|escape:"htmlall"}</a></li>{/if}
-				{if $release.co_genre != ""}<li>Genre: {$release.co_genre|escape:"htmlall"}</li>{/if}
-				{if $release.co_publisher != ""}<li>Publisher: {$release.co_publisher|escape:"htmlall"}</li>{/if}
-				{if $release.year != ""}<li>Released: {$release.co_releasedate|date_format}</li>{/if}
-				{if $release.co_review != ""}<li>Review: {$release.co_review|escape:"htmlall"}</li>{/if}
-			</ul>
-		</li>
-		{/if}
-	{/if}
-
-	{if $release.categoryid == 7020}
-		{if $release.bookinfoid > 0}
-		<li>Console Info:
-			<ul>
-				{if $release.bo_author != ""}<li>Author: <a href="{$serverroot}books?author={$release.bo_author|escape:"url"}">{$release.bo_author|escape:"htmlall"}</a></li>{/if}
-				{if $release.bo_url != ""}<li>Amazon: <a href="{$release.bo_url}">{$release.bo_title|escape:"htmlall"}</a></li>{/if}
-				{if $release.bo_publisher != ""}<li>Publisher: {$release.bo_publisher|escape:"htmlall"}</li>{/if}
-				{if $release.bo_publishdate != ""}<li>Publish Date: {$release.bo_publishdate|date_format}</li>{/if}
-				{if $release.bo_review != ""}<li>Review: {$release.bo_review|escape:"htmlall"}</li>{/if}
-			</ul>
-		</li>
-		{/if}
-	{/if}
-
-	</ul>
-
-	</div>
-	<div style="clear:both;">
-	{/strip}]]>
-	{/if}
-</description>
-	{if $dl=="1"}<enclosure url="{$serverroot}getnzb/{$release.guid}.nzb&amp;i={$uid}&amp;r={$rsstoken}{if $del=="1"}&amp;del=1{/if}" length="{$release.size}" type="application/x-nzb" />{/if}
-
-
-	{foreach from=$release.category_ids|parray:"," item=cat}
-<newznab:attr name="category" value="{$cat}" />
-	{/foreach}<newznab:attr name="size" value="{$release.size}" />
-	<newznab:attr name="files" value="{$release.totalpart}" />
-	<newznab:attr name="poster" value="{$release.fromname|escape:html}" />
-{if $release.season != ""}	<newznab:attr name="season" value="{$release.season}" />
-{/if}
-{if $release.episode != ""}	<newznab:attr name="episode" value="{$release.episode}" />
-{/if}
-{if $release.fullep != ""}	<newznab:attr name="fullep">{$release.fullep}</newznab:attr>
-{/if}
-{if $release.showtitle != ""}	<newznab:attr name="showtitle">{$release.showtitle|escape:html}</newznab:attr>
-{/if}
-{if $release.rageid != "-1" && $release.rageid != "-2"}	<newznab:attr name="rageid" value="{$release.rageid}" />
-{/if}
-{if $release.tvtitle != ""}	<newznab:attr name="tvtitle" value="{$release.tvtitle|escape:html}" />
-{/if}
-{if $release.tvairdate != ""}	<newznab:attr name="tvairdate" value="{$release.tvairdate|phpdate_format:"DATE_RSS"}" />
-{/if}
-{if $release.imdbid != ""}	<newznab:attr name="imdb" value="{$release.imdbid}" />
-{/if}
-{if $release.tvdbid != ""}	<newznab:attr name="tvdb-show" value="{$release.tvdbid}" />
-{/if}
-{if $release.ep_tvdbID != ""}	<newznab:attr name="tvdb-ep" value="{$release.ep_tvdbID}" />
-{/if}
-{if $release.rating != ""}	<newznab:attr name="rating" value="{$release.rating}" />
-{/if}
-{if $release.overview != ""}	<newznab:attr name="overview">{$release.overview|escape:html}</newznab:attr>
-{/if}
-{if $release.writer != ""}
-    {foreach from=$release.writer|parray:"," item=writer}
-    <newznab:attr name="writer" value="{$writer|trim|escape:html}" />
-    {/foreach}
-{/if}
-{if $release.gueststars != ""}
-    {foreach from=$release.gueststars|parray:"," item=gueststar}
-    <newznab:attr name="gueststar" value="{$gueststar|trim|escape:html}" />
-    {/foreach}
-{/if}
-{if $release.director != ""}
-    {foreach from=$release.director|parray:"," item=director}
-    <newznab:attr name="director" value="{$director|trim|escape:html}" />
-    {/foreach}
-{/if}
-	<newznab:attr name="grabs" value="{$release.grabs}" />
-	<newznab:attr name="comments" value="{$release.comments|escape:"htmlall"}" />
-	<newznab:attr name="password" value="{$release.passwordstatus}" />
-	<newznab:attr name="usenetdate" value="{$release.postdate|phpdate_format:"DATE_RSS"}" />
-	<newznab:attr name="group" value="{$release.group_name|escape:html}" />
-
-</item>
-{/foreach}
-
-</channel>
-</rss>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/rssdesc.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/rssdesc.tpl
deleted file mode 100644
index 91913e941..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/rssdesc.tpl
+++ /dev/null
@@ -1,100 +0,0 @@
-
-			<h1>{$page->title}</h1>
-
-			<p>
-				Here you can choose rss feeds from site categories. The feeds will present either decriptions or
-				downloads of Nzb files.
-			</p>
-
-			<ul>
-				<li>
-					Add this string to your feed URL to allow NZB downloads without logging in: <span style="font-family:courier;">&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</span>
-				</li>
-				<li>
-					To remove the nzb from your cart after download add this string to your feed URL: <span style="font-family:courier;">&amp;del=1</span>
-				</li>
-				<li>
-					To change the default link to download an nzb: <span style="font-family:courier;">&amp;dl=1</span>
-				</li>
-				<li>
-					To change the number of results (default is 25, max is 100) returned: <span style="font-family:courier;">&amp;num=50</span>
-				</li>
-				<li>
-					To return TV shows only aired in the last x days (default is all): <span style="font-family:courier;">&amp;airdate=20</span>
-				</li>
-			</ul>
-
-			<p>
-				Most Nzb clients which support Nzb rss feeds will appreciate the full URL, with download link and your user token.
-			</p>
-
-			<p>
-				The feeds include additional attributes to help provide better filtering in your Nzb client, such as size, group and categorisation. If you want to chain multiple categories together or do more advanced searching, use the <a href="{$smarty.const.WWW_TOP}/apihelp">api</a>, which returns its data in an rss compatible format.
-			</p>
-
-			<h2>Available Feeds</h2>
-			<h3>General</h3>
-			<ul style="text-align: left;">
-				<li>
-					Full site feed<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?t=0&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss?t=0&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-				</li>
-				<li>
-					<a href="{$smarty.const.WWW_TOP}/cart">My cart</a> feed<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?t=-2&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1">{$smarty.const.WWW_TOP}/rss?t=-2&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1</a>
-				</li>
-				<li>
-					<a href="{$smarty.const.WWW_TOP}/myshows">My shows</a> feed<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1">{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1</a>
-				</li>
-				<li>
-					<a href="{$smarty.const.WWW_TOP}/mymovies">My movies</a> feed<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?t=-4&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1">{$smarty.const.WWW_TOP}/rss?t=-4&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}&amp;del=1</a>
-				</li>
-
-			</ul>
-			<h3>Parent Category</h3>
-			<ul style="text-align: left;">
-				{foreach from=$parentcategorylist item=category}
-					<li>
-						<a href="{$smarty.const.WWW_TOP}/browse?t={$category.id}">{$category.title}</a> feed <br/>
-						<a href="{$smarty.const.WWW_TOP}/rss?t={$category.id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss?t={$category.id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-					</li>
-				{/foreach}
-
-			</ul>
-
-			<h3>Sub Category</h3>
-			<ul style="text-align: left;">
-
-				{foreach from=$categorylist item=category}
-					<li>
-						<a href="{$smarty.const.WWW_TOP}/browse?t={$category.id}">{$category.title}</a> feed <br/>
-						<a href="{$smarty.const.WWW_TOP}/rss?t={$category.id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss?t={$category.id}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-					</li>
-				{/foreach}
-			</ul>
-
-			<h3>Multi Category</h3>
-			<ul style="text-align: left;">
-					<li>
-						Multiple categories separated by comma.<br/>
-						<a href="{$smarty.const.WWW_TOP}/rss?t=1000,2000,3010&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss?t=1000,2000,3010&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-					</li>
-			</ul>
-
-			<h2>Additional Feeds</h2>
-			<ul style="text-align: left;">
-				<li>
-					Tv Series (Use the TVRage id)<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?rage=1234&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss/?rage=1234&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-				</li>
-				<li>
-					Tv Series aired in last seven days (Using the TVRage id and airdate)<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?rage=1234&amp;airdate=7&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss/?rage=1234&amp;airdate=7&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-				</li>
-				<li>
-					Anime Feed (Use the AniDB id)<br/>
-					<a href="{$smarty.const.WWW_TOP}/rss?anidb=1234&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">{$smarty.const.WWW_TOP}/rss/?anidb=1234&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}</a>
-				</li>
-			</ul>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/rssheader.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/rssheader.tpl
deleted file mode 100644
index 48836cf18..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/rssheader.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:newznab="http://www.newznab.com/DTD/2010/feeds/attributes/">
-<channel>
-<atom:link href="{$serverroot}{$smarty.server.REQUEST_URI|escape:"htmlall"|substr:1}" rel="self" type="application/rss+xml" />
-<title>{$site->title|escape}{if $rsstitle!=""} {$rsstitle|escape:"htmlall"}{/if}</title>
-<description>{if $rssdesc==""}{$site->title|escape} Feed{else}{$rssdesc|escape:"htmlall"}{/if}</description>
-<link>{$serverroot}</link>
-<language>en-gb</language>
-<webMaster>{$site->email} ({$site->title|escape})</webMaster>
-<category>{$site->meta_keywords}</category>
-<image>
-	<url>{$serverroot}templates/default/images/banner.jpg</url>
-	<title>{$site->title|escape}</title>
-	<link>{$serverroot}</link>
-	<description>Visit {$site->title|escape} - {$site->strapline|escape}</description>
-</image>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/search-filter.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/search-filter.tpl
deleted file mode 100644
index 55bdd6e61..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/search-filter.tpl
+++ /dev/null
@@ -1,334 +0,0 @@
-{if $covergrp == "movies"}
-	<form class="form-inline" name="browseby" action="{$smarty.const.WWW_TOP}/search" method="get">
-		<input class="form-control" style="width: 150px;" id="movietitle" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<input class="form-control" style="width: 150px;" id="movieactors" type="text" name="actors" value="{$actors}"
-			   placeholder="Actor">
-		<input class="form-control" style="width: 150px;" id="moviedirector" type="text" name="director"
-			   value="{$director}" placeholder="Director">
-		<select class="form-control" style="width: 150px;" id="rating" name="rating">
-			<option class="grouping" value="">Rating...</option>
-			{foreach from=$ratings item=rate}
-				<option {if $rating==$rate}selected="selected"{/if} value="{$rate}">{$rate}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="genre" name="genre" placeholder="Genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen==$genre}selected="selected"{/if} value="{$gen}">{$gen}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="year" name="year">
-			<option class="grouping" value="">Year...</option>
-			{foreach from=$years item=yr}
-				<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="category" name="t">
-			<option class="grouping" value="2000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if $covergrp == "xxx"}
-	<form class="form-inline" name="browseby" action="{$smarty.const.WWW_TOP}/search" method="get">
-		<input class="form-control"
-			   style="width: 150px;"
-			   id="xxxtitle"
-			   type="text"
-			   name="title"
-			   value="{$title}"
-			   placeholder="Title">
-		<input class="form-control"
-			   style="width: 150px;"
-			   id="xxxactors"
-			   type="text"
-			   name="actors"
-			   value="{$actors}"
-			   placeholder="Actor">
-		<input class="form-control"
-			   style="width: 150px;"
-			   id="xxxdirector"
-			   type="text"
-			   name="director"
-			   value="{$director}"
-			   placeholder="Director">
-		<select class="form-control"
-				style="width: 150px;"
-				id="genre"
-				name="genre"
-				placeholder="Genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen==$genre}selected="selected"{/if} value="{$gen}">{$gen}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="category" name="t">
-			<option class="grouping" value="2000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if}
-						value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if $covergrp == "books"}
-	<form class="form-inline" name="browseby" action="{$smarty.const.WWW_TOP}/search" method="get">
-		<input class="form-control" style="width: 150px;" id="author" type="text" name="author" value="{$author}"
-			   placeholder="Author">
-		<input class="form-control" style="width: 150px;" id="title" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if $covergrp == "music"}
-	<form class="form-inline" name="browseby" action="{$smarty.const.WWW_TOP}/search" method="get">
-		<input class="form-control" style="width: 150px;" id="musicartist" type="text" name="artist" value="{$artist}"
-			   placeholder="Artist">
-		<input class="form-control" style="width: 150px;" id="musictitle" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<select class="form-control" style="width: 150px;" id="genre" name="genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen.id == $genre}selected="selected"{/if}
-						value="{$gen.id}">{$gen.title|escape:"htmlall"}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="year" name="year">
-			<option class="grouping" value="">Year...</option>
-			{foreach from=$years item=yr}
-				<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="category" name="t">
-			<option class="grouping" value="3000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if $covergrp == "console"}
-	<form class="form-inline" name="browseby" action="{$smarty.const.WWW_TOP}/search" method="get">
-		<input class="form-control" style="width: 150px;" id="title" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<input class="form-control" style="width: 150px;" id="platform" type="text" name="platform" value="{$platform}"
-			   placeholder="Platform">
-		<select class="form-control" style="width: 150px;" id="genre" name="genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen.id == $genre}selected="selected"{/if} value="{$gen.id}">{$gen.title}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="category" name="t">
-			<option class="grouping" value="1000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if $covergrp == "games"}
-	<form class="form-inline" name="browseby" action="{$smarty.const.WWW_TOP}/search" method="get">
-		<input class="form-control" style="width: 150px;" id="title" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<select class="form-control" style="width: 150px;" id="genre" name="genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen.id == $genre}selected="selected"{/if} value="{$gen.id}">{$gen.title}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: 150px;" id="year" name="year">
-			<option class="grouping" value="">Year...</option>
-			{foreach from=$years item=yr}
-				<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-			{/foreach}
-		</select>
-		{*<select class="form-control" style="width: 150px;" id="category" name="t">*}
-		{*<option class="grouping" value="4000">Category... </option>*}
-		{*{foreach from=$catlist item=ct}*}
-		{*<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>*}
-		{*{/foreach}*}
-		{*</select>*}
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-
-{if {$smarty.get.page} == "console"}
-	<form class="form-inline" name="browseby" action="console" style="margin:0;">
-		<input class="form-control" style="width: 150px;" id="title" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<input class="form-control" style="width: 150px;" id="platform" type="text" name="platform" value="{$platform}"
-			   placeholder="Platform">
-		<select class="form-control" style="width: auto;" id="genre" name="genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen.id == $genre}selected="selected"{/if} value="{$gen.id}">{$gen.title}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="category" name="t">
-			<option class="grouping" value="1000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if {$smarty.get.page} == "games"}
-	<form class="form-inline" name="browseby" action="games" style="margin:0;">
-		<input class="form-control" style="width: 150px;" id="title" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<select class="form-control" style="width: auto;" id="genre" name="genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen.id == $genre}selected="selected"{/if} value="{$gen.id}">{$gen.title}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="year" name="year">
-			<option class="grouping" value="">Year...</option>
-			{foreach from=$years item=yr}
-				<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-			{/foreach}
-		</select>
-		{*<select class="form-control" style="width: auto;" id="category" name="t">*}
-		{*<option class="grouping" value="4000">Category... </option>*}
-		{*{foreach from=$catlist item=ct}*}
-		{*<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>*}
-		{*{/foreach}*}
-		{*</select>*}
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if {$smarty.get.page} == "books"}
-	<form class="form-inline" name="browseby" action="books" style="margin:0;">
-		<input class="form-control" style="width: 150px;" id="author" type="text" name="author" value="{$author}"
-			   placeholder="Author">
-		<input class="form-control" style="width: 150px;" id="title" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if {$smarty.get.page} == "movies"}
-	<form class="form-inline" name="browseby" action="movies">
-		<input class="form-control" style="width: 150px;" id="movietitle" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<input class="form-control" style="width: 150px;" id="movieactors" type="text" name="actors" value="{$actors}"
-			   placeholder="Actor">
-		<input class="form-control" style="width: 150px;" id="moviedirector" type="text" name="director"
-			   value="{$director}" placeholder="Director">
-		<select class="form-control" style="width: auto;" id="rating" name="rating">
-			<option class="grouping" value="">Rating...</option>
-			{foreach from=$ratings item=rate}
-				<option {if $rating==$rate}selected="selected"{/if} value="{$rate}">{$rate}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="genre" name="genre" placeholder="Genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen==$genre}selected="selected"{/if} value="{$gen}">{$gen}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="year" name="year">
-			<option class="grouping" value="">Year...</option>
-			{foreach from=$years item=yr}
-				<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="category" name="t">
-			<option class="grouping" value="2000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if {$smarty.get.page} == "xxx"}
-	<form class="form-inline" name="browseby" action="xxx">
-		<input class="form-control"
-			   style="width: 150px;"
-			   id="xxxtitle"
-			   type="text"
-			   name="title"
-			   value="{$title}"
-			   placeholder="Title">
-		<input class="form-control"
-			   style="width: 150px;"
-			   id="xxxactors"
-			   type="text"
-			   name="actors"
-			   value="{$actors}"
-			   placeholder="Actor">
-		<input class="form-control"
-			   style="width: 150px;"
-			   id="xxxdirector"
-			   type="text"
-			   name="director"
-			   value="{$director}"
-			   placeholder="Director">
-		<select class="form-control"
-				style="width: auto;"
-				id="genre"
-				name="genre"
-				placeholder="Genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen==$genre}selected="selected"{/if} value="{$gen}">{$gen}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="category" name="t">
-			<option class="grouping" value="2000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if}
-						value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
-
-{if {$smarty.get.page} == "music"}
-	<form class="form-inline" name="browseby" action="music" style="margin:0;">
-		<input class="form-control" style="width: 150px;" id="musicartist" type="text" name="artist" value="{$artist}"
-			   placeholder="Artist">
-		<input class="form-control" style="width: 150px;" id="musictitle" type="text" name="title" value="{$title}"
-			   placeholder="Title">
-		<select class="form-control" style="width: auto;" id="genre" name="genre">
-			<option class="grouping" value="">Genre...</option>
-			{foreach from=$genres item=gen}
-				<option {if $gen.id == $genre}selected="selected"{/if}
-						value="{$gen.id}">{$gen.title|escape:"htmlall"}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="year" name="year">
-			<option class="grouping" value="">Year...</option>
-			{foreach from=$years item=yr}
-				<option {if $yr==$year}selected="selected"{/if} value="{$yr}">{$yr}</option>
-			{/foreach}
-		</select>
-		<select class="form-control" style="width: auto;" id="category" name="t">
-			<option class="grouping" value="3000">Category...</option>
-			{foreach from=$catlist item=ct}
-				<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-			{/foreach}
-		</select>
-		<input class="btn btn-success" type="submit" value="Go">
-	</form>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/search.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/search.tpl
deleted file mode 100644
index 6610aed0c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/search.tpl
+++ /dev/null
@@ -1,329 +0,0 @@
-{if {$site->adbrowse} != ''}
-	{$site->adbrowse}
-{/if}
-<h1>Search</h1>
-<div>
-	<center>
-		<a href="#" onclick="if (jQuery(this).text() == 'Advanced Search')
-					jQuery(this).text('Basic Search');
-				else
-					jQuery(this).text('Advanced Search');
-				jQuery('#sbasic,#sadvanced').toggle();
-				return false;">{if $sadvanced}Basic{else}Click For Advanced{/if} Search
-		</a>
-	</center>
-</div>
-<br>
-<center>
-	{$search_description}
-</center>
-<form method="get" action="{$smarty.const.WWW_TOP}/search">
-	<div id="sbasic" style="text-align:center;{if $sadvanced} display:none;"{/if}">
-	<label for="search" style="display:none;">Search</label>
-	<input id="search" name="search" value="{$search|escape:'html'}" type="text">
-	<input class="rndbtn" id="search_search_button" type="submit" value="Name">&nbsp;&nbsp;&nbsp;
-	<input type="hidden" name="t" value="{if $category[0]!=""}{$category[0]}{else}-1{/if}" id="search_cat">
-	<input type="hidden" name="search_type" value="basic" id="search_type">
-	</div>
-</form>
-<form method="get" action="{$smarty.const.WWW_TOP}/search">
-	<div id="sadvanced" {if not $sadvanced}style="display:none"{/if}>
-		<center>
-			<table class="data">
-				<tr>
-					<th><label for="searchadvr">Release Name:</label></th>
-					<td><input class="searchadv" id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}" type="text"></td>
-				</tr>
-				<tr>
-					<th><label for="searchadvsubject">Usenet Name:</label></th>
-					<td><input class="searchadv" id="searchadvsubject" name="searchadvsubject" value="{$searchadvsubject|escape:'html'}" type="text"></td>
-				</tr>
-				<tr>
-					<th><label for="searchadvposter">Poster:</label></th>
-					<td><input class="searchadv" id="searchadvposter" name="searchadvposter" value="{$searchadvposter|escape:'html'}" type="text"></td>
-				</tr>
-				<tr>
-					<th><label for="searchadvdaysnew">Min age(days):</label></th>
-					<td>
-						<input class="searchdaysinput" id="searchadvdaysnew" name="searchadvdaysnew" value="{$searchadvdaysnew|escape:'html'}" type="text">
-					</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvdaysold">Max age(days):</label></th>
-					<td>
-						<input class="searchdaysinput" id="searchadvdaysold" name="searchadvdaysold" value="{$searchadvdaysold|escape:'html'}" type="text">
-					</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvgroups">Group:</label></th>
-					<td>{html_options class="searchadvbtns" id="searchadvgroups" name="searchadvgroups" options=$grouplist selected=$selectedgroup}</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvcat">Category:</label></th>
-					<td>{html_options class="searchadvbtns" id="searchadvcat" name="searchadvcat" options=$catlist selected=$selectedcat}</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvsizefrom">Min/Max Size:</label></th>
-					<td>
-						{html_options id="searchadvsizefrom" name="searchadvsizefrom" options=$sizelist selected=$selectedsizefrom}
-						{html_options id="searchadvsizeto" name="searchadvsizeto" options=$sizelist selected=$selectedsizeto}
-					</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvhasnfo">NFO/Comments:</label></th>
-					<td>
-						<input type="hidden" name="searchadvhasnfo" value="0">
-						<input type="checkbox" name="searchadvhasnfo" value="1">
-						<input type="hidden" name="searchadvhascomments" value="0">
-						<input type="checkbox" name="searchadvhascomments" value="1">
-						<div style="float:right;"><input type="hidden" name="search_type" value="adv" id="search_type">
-							<input id="search_adv_button" type="submit" value="search">
-						</div>
-					</td>
-				</tr>
-			</table>
-		</center>
-	</div>
-</form>
-{if $results|@count == 0 && ($search || $subject|| $searchadvr|| $searchadvsubject || $selectedgroup || $selectedsizefrom || $searchadvdaysold) != ""}
-	<center>
-		<div class="nosearchresults">
-			Your search did not match any releases.
-			<br><br>
-			Suggestions:
-			<br><br>
-			<ul>
-				<center><li>Make sure all words are spelled correctly.</li></center>
-				<center><li>Try different keywords.</li></center>
-				<center><li>Try more general keywords.</li></center>
-				<center><li>Try fewer keywords.</li></center>
-			</ul>
-		</div>
-	</center>
-{elseif ($search || $subject || $searchadvr || $searchadvsubject || $selectedgroup || $selectedsizefrom || $searchadvdaysold) == ""}
-{else}
-	<form style="padding-top:10px;" id="nzb_multi_operations_form" method="get" action="{$smarty.const.WWW_TOP}/search">
-	<table width="100%">
-		<tr>
-			<td>{$pager}</td>
-			<td style="text-align:right">
-				<div class="nzb_multi_operations">
-					<small>With selected:</small>
-					<div class="btn-group">
-						<button type="button" class="btn btn-mini nzb_multi_operations_download">
-							<i class="icon-download"></i> Download NZBs
-						</button>
-						<button type="button" class="btn btn-mini nzb_multi_operations_cart">
-							<i class="icon-shopping-cart"></i> Add to cart</button>
-						{if $sabintegrated}
-							<button type="button" class="btn btn-mini nzb_multi_operations_sab">
-								<i class="icon-download-alt"></i> Send to my Queue
-							</button>
-						{/if}
-						{if $isadmin}
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit">
-								<i class="icon-edit icon-white"></i>
-							</button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete">
-								<i class="icon-trash icon-white"></i>
-							</button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild">
-								<i class="icon-repeat icon-white"></i>
-							</button>
-						{/if}
-					</div>
-				</div>
-			</td>
-		</tr>
-	</table>
-		<table style="width:100%;" class="data highlight icons" id="browsetable">
-			<tr>
-				<th></th>
-				<th>
-					name<br>
-					<a title="Sort Descending" href="{$orderbyname_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbyname_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					category<br>
-					<a title="Sort Descending" href="{$orderbycat_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbycat_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					posted<br>
-					<a title="Sort Descending" href="{$orderbyposted_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbyposted_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					size<br>
-					<a title="Sort Descending" href="{$orderbysize_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbysize_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					files<br>
-					<a title="Sort Descending" href="{$orderbyfiles_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbyfiles_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">stats<br>
-					<a title="Sort Descending" href="{$orderbystats_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbystats_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th>
-					<input id="chkSelectAll" type="checkbox" class="nzb_check_all">
-					<label for="chkSelectAll" style="display:none;">Select All</label>
-				</th>
-			</tr>
-			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}{if $lastvisit|strtotime<$result.adddate|strtotime} new{/if}" id="guid{$result.guid}">
-					<td class="icons">
-						<div class="icon icon_nzb">
-							<a title="Download Nzb" href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}">&nbsp;</a>
-						</div>
-						<div class="icon icon_cart" title="Add to Cart"></div>
-						{if $sabintegrated}
-							<div class="icon icon_sab" title="Send to my Queue"></div>
-						{/if}
-					</td>
-					<td class="item">
-						<label for="chk{$result.guid|substr:0:7}">
-							<a class="title" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}</a></label value="Searchname">
-
-						<div class="resextra">
-							<a class="browsename" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">
-								{$result.name|escape:"htmlall"|truncate:150:"...":true}
-							</a>
-							<div class="btns" style="float:right">
-								{release_flag($result.searchname, browse)}
-								{if $result.passwordstatus == 1}
-									<img title="RAR/ZIP Possibly Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock2.png" alt="RAR/ZIP Possibly Passworded.">
-								{elseif $result.passwordstatus == 2}
-									<img title="RAR/ZIP Possibly Damaged." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/broken.png" alt="RAR/ZIP Possibly Damaged.">
-								{elseif $result.passwordstatus == 10}
-									<img title="RAR/ZIP is Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif" alt="RAR/ZIP is Passworded.">
-								{/if}
-								{if $result.videostatus > 0}
-									<a
-											class="model_prev label label-default"
-											href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
-											title="This release has a video preview."
-											rel="preview"
-											><i class="icon-youtube-play"></i>
-									</a>
-								{/if}
-								{if $result.nfoid > 0}
-									<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo" class="modal_nfo rndbtn" rel="nfo">Nfo</a>
-								{/if}
-								{if $result.imdbid > 0}
-									<a href="#" name="name{$result.imdbid}" title="View movie info" class="modal_imdb rndbtn" rel="movie" >Cover</a>
-								{/if}
-								{if $result.haspreview == 1 && $userdata.canpreview == 1}
-								<a href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Screenshot of {$result.searchname|escape:"htmlall"}" class="modal_prev rndbtn" rel="preview">Preview</a>{/if}
-								{if $result.jpgstatus == 1 && $userdata.canpreview == 1}
-								<a href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Sample of {$result.searchname|escape:"htmlall"}" class="modal_prev rndbtn" rel="preview">Sample</a>{/if}
-								{if $result.musicinfoid > 0}
-									<a href="#" name="name{$result.musicinfoid}" title="View music info" class="modal_music rndbtn" rel="music" >Cover</a>
-								{/if}
-								{if $result.consoleinfoid > 0}
-									<a href="#" name="name{$result.consoleinfoid}" title="View console info" class="modal_console rndbtn" rel="console" >Cover</a>
-								{/if}
-								{if $result.rageid > 0}
-									<a class="rndbtn" href="{$smarty.const.WWW_TOP}/series/{$result.rageid}" title="View all episodes">View Series</a>
-								{/if}
-								{if $result.anidbid > 0}
-									<a class="rndbtn" href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}" title="View all episodes">View Anime</a>
-								{/if}
-								{if $result.tvairdate != ""}
-									<span class="seriesinfo rndbtn" title="{$result.guid}">Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>
-								{/if}
-								{if $result.reid > 0}
-									<span class="mediainfo rndbtn" title="{$result.guid}">Media</span>
-								{/if}
-								{if $result.preid > 0}
-									<span class="preinfo rndbtn" title="{$result.preid}">PreDB</span>
-								{/if}
-								{if $result.prehashid > 0}
-									<span class="prehashinfo rndbtn" title="{$result.prehashid}">PreHash</span>
-								{/if}
-								{if $result.group_name != ""}
-									<a class="rndbtn" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."}</a>
-								{/if}
-							</div>
-						</div>
-					</td>
-					<td class="category">
-						<a title="Browse {$result.category_name}" href="{$smarty.const.WWW_TOP}/browse?t={$result.categoryid}">{$result.category_name}</a>
-					</td>
-					<td class="posted" title="{$result.postdate}">
-						{$result.postdate|timeago}
-					</td>
-					<td class="size">
-						{$result.size|fsize_format:"MB"}
-						{if $result.completion > 0}
-							<br>
-							{if $result.completion < 100}
-								<span class="warning">{$result.completion}%</span>
-							{else}
-								{$result.completion}%
-							{/if}
-						{/if}
-					</td>
-					<td class="files">
-						<a title="View file list" href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
-						{if $result.rarinnerfilecount > 0}
-							<div class="rarfilelist">
-								<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/magnifier.png" alt="{$result.guid}">
-							</div>
-						{/if}
-					</td>
-					<td class="stats" nowrap="nowrap">
-						<a title="View comments" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments} cmt{if $result.comments != 1}s{/if}</a>
-						<br>{$result.grabs} grab{if $result.grabs != 1}s{/if}
-					</td>
-					<td class="check">
-						<input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check" value="{$result.guid}">
-					</td>
-				</tr>
-			{/foreach}
-		</table>
-		<br/>
-		{$pager}
-		<div class="nzb_multi_operations">
-			<small>With selected:</small>
-			<input type="button" class="nzb_multi_operations_download" value="Download NZBs">
-			{if $sabintegrated}
-				<input type="button" class="nzb_multi_operations_sab" value="Send to my Queue">
-			{/if}
-			<input type="button" class="nzb_multi_operations_cart" value="Add to Cart">
-			{if $isadmin}
-				&nbsp;&nbsp;
-				<input type="button" class="nzb_multi_operations_edit" value="Edit">
-				<input type="button" class="nzb_multi_operations_delete" value="Del">
-			{/if}
-		</div>
-		<br><br><br>
-	</form>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/searchraw.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/searchraw.tpl
deleted file mode 100644
index 2435570e7..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/searchraw.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<h1>Search Binaries</h1>
-
-<form method="get" action="{$smarty.const.WWW_TOP}/searchraw">
-	<div style="text-align:center;">
-		<label for="search" style="display:none;">Search</label>
-		<input id="search" name="search" value="{$search|escape:'htmlall'}" type="text"/>
-		<input id="searchraw_search_button" type="submit" value="search" />
-	</div>
-</form>
-
-{if $results|@count == 0 && $search != ""}
-	<div class="nosearchresults">
-		Your search - <strong>{$search|escape:'htmlall'}</strong> - did not match any headers.
-		<br/><br/>
-		Suggestions:
-		<br/><br/>
-		<ul>
-		<li>Make sure all words are spelled correctly.</li>
-		<li>Try different keywords.</li>
-		<li>Try more general keywords.</li>
-		<li>Try fewer keywords.</li>
-		</ul>
-	</div>
-{elseif $search == ""}
-{else}
-
-{$site->adbrowse}
-
-<form method="post" id="dl" name="dl" action="{$smarty.const.WWW_TOP}/searchraw">
-<table style="width:100%;" class="data" id="browsetable">
-	<tr>
-		<!--<th width="10"></th>-->
-		<th>filename</th>
-		<th>group</th>
-		<th>posted</th>
-		{if $isadmin}
-		<th>Misc</th>
-		<th>%</th>
-		{/if}
-		<th>Nzb</th>
-	</tr>
-
-	{foreach from=$results item=result}
-		<tr class="{cycle values=",alt"}">
-			<!--<td class="selection"><input name="file{$result.id}" id="file{$result.id}" value="{$result.id}" type="checkbox"/></td>-->
-			<td title="{$result.xref|escape:"htmlall"}">{$result.name|escape:"htmlall"}</td>
-			<td class="less">{$result.group_name|replace:"alt.binaries":"a.b"}</td>
-			<td class="less" title="{$result.date}">{$result.date|date_format}</td>
-			{if $isadmin}
-			<td><span title="procstat">{$result.procstat}</span>/<span title="totalparts">{$result.totalparts}</span>/<span title="regex">{if $result.regexid==""}_{else}{$result.regexid}{/if}</span>/<span title="relpart">{$result.relpart}</span>/<span title="reltotalpart">{$result.reltotalpart}</span></td>
-			<td class="less">{if $result.binnum < $result.totalparts}<span style="color:red;">{$result.binnum}/{$result.totalparts}</span>{else}100%{/if}</td>
-			{/if}
-			<td class="less">{if $result.releaseid > 0}<a title="View Nzb details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.filename|escape:"seourl"}">Yes</a>{/if}</td>
-		</tr>
-	{/foreach}
-
-</table>
-</form>
-
-<!--
-<div class="checkbox_operations">
-	Selection:
-	<a href="#" class="select_all">All</a>
-	<a href="#" class="select_none">None</a>
-	<a href="#" class="select_invert">Invert</a>
-	<a href="#" class="select_range">Range</a>
-</div>
-
-<div style="padding-top:20px;">
-	<a href="#" id="searchraw_download_selected">Download selected as Nzb</a>
-</div>
--->
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/sitemap-xml.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/sitemap-xml.tpl
deleted file mode 100644
index e096ec9fc..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/sitemap-xml.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
-
-{foreach from=$sitemaps item=sitemap}
-<url>
-	<loc>{$scheme}{$smarty.server.SERVER_NAME}{$port}{$sitemap->loc}</loc>
-	<changefreq>{$sitemap->priority}</changefreq>
-	<priority>{$sitemap->changefreq}</priority>
-</url>
-	
-{/foreach}
-
-</urlset>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/sitemap.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/sitemap.tpl
deleted file mode 100644
index d2041542d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/sitemap.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>{$page->title}</h1> 
-
-<table>
-{foreach from=$sitemaps item=sitemap}
-	{if $last_type != $sitemap->type}
-		{assign var=last_type value=$sitemap->type}
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td>
-		{$sitemap->type} \
-	{else}
-	<tr>
-		<td>
-	{/if}
-	</td>
-
-	<td>
-		<a title="{$sitemap->type} - {$sitemap->name}" href="{$smarty.const.WWW_TOP}{$sitemap->loc}">{$sitemap->name}</a>
-		
-	</td>
-</tr>	
-{/foreach}
-</table>
-
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/terms.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/terms.tpl
deleted file mode 100644
index 4e4ef663c..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/terms.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
- 
-			<h1>{$page->title}</h1>
-
-			{$site->tandc}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/upcoming.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/upcoming.tpl
deleted file mode 100644
index f299ee8c1..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/upcoming.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{if $site->adbrowse}
-	{$site->adbrowse}
-{/if}
-<h1>{$page->title}</h1>
-
-<p>
-	<a href="{$smarty.const.WWW_TOP}/upcoming/1">Box Office</a> |
-	<a href="{$smarty.const.WWW_TOP}/upcoming/2">In Theatre</a> |
-	<a href="{$smarty.const.WWW_TOP}/upcoming/3">Opening</a> |
-	<a href="{$smarty.const.WWW_TOP}/upcoming/4">Upcoming</a> |
-	<a href="{$smarty.const.WWW_TOP}/upcoming/5">DVD Releases</a>
-</p>
-
-{if $data|@count > 0}
-	<table style="width:100%;" class="data highlight icons" id="coverstable">
-		<tr>
-			<th></th>
-			<th>Name</th>
-		</tr>
-
-		{foreach $data as $result}
-			<tr class="{cycle values=",alt"}">
-				<td class="mid">
-					<div class="movcover">
-						<img class="shadow"
-							 src="{replace_quality($result->posters->{$site->rottentomatoquality}, $site->rottentomatoquality)}""
-						width="120" border="0" alt="{$result->title|escape:"htmlall"}"/>
-
-						<div class="movextra">
-							{if $result->ratings->critics_score > 60}
-								<a
-										target="_blank"
-										href="{$site->dereferrer_link}{$result->links->alternate}"
-										title="View Rotten Tomatoes Details"><img
-											src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/fresh.png"></a>
-							{else}
-								<a
-										target="_blank"
-										href="{$site->dereferrer_link}{$result->links->alternate}"
-										title="View Rotten Tomatoes Details"><img
-											src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/rotten.png"></a>
-							{/if}
-							<a
-									target="_blank"
-									href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$result->alternate_ids->imdb}/"
-									name="imdb{$result->alternate_ids->imdb}"
-									title="View imdb page"><img
-										src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/imdb.png"></a>
-							<a
-									target="_blank"
-									href="{$site->dereferrer_link}http://trakt.tv/search/imdb/tt{$result->alternate_ids->imdb}/"
-									name="trakt{$result->alternate_ids->imdb}"
-									title="View trakt page"><img
-										src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/trakt.png"></a>
-							{if $cpurl != '' && $cpapi != ''}
-								<a
-										class="sendtocouch"
-										target="blackhole"
-										href="javascript:;"
-										rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result->alternate_ids->imdb}&title={$result->title}"
-										name="CP{$result->alternate_ids->imdb}" title="Add to CouchPotato"><img
-											src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/couch.png">
-								</a>
-							{/if}
-						</div>
-					</div>
-				</td>
-				<td colspan="3" class="left">
-					<h2>
-						<a href="{$smarty.const.WWW_TOP}/movies?title={$result->title}&year={$result->year}">{$result->title|escape:"htmlall"}</a>
-						(<a class="title" title="{$result->year}"
-							href="{$smarty.const.WWW_TOP}/movies?year={$result->year}">{$result->year}</a>) {if $result->ratings->critics_score > 0}{$result->ratings->critics_score}/100{/if}
-					</h2>
-					{if $result->synopsis == ""}No synopsis. Check
-						<a target="_blank" href="{$site->dereferrer_link}{$result->links->alternate}"
-						   title="View Rotten Tomatoes Details">Rotten Tomatoes</a>
-						for more information.{else}{$result->synopsis}{/if}
-					{if $result->abridged_cast|@count > 0}
-						<br/>
-						<br/>
-						<b>Starring:</b>
-						{foreach from=$result->abridged_cast item=cast name=cast}
-							<a href="{$smarty.const.WWW_TOP}/movies?actors={$cast->name|escape:"htmlall"}"
-							   title="Search for movies starring {$cast->name|escape:"htmlall"}">{$cast->name|escape:"htmlall"}</a>
-							{if $smarty.foreach.cast.last}<br/><br/>{else},{/if}
-						{/foreach}
-					{else}
-						<br/>
-						<br/>
-					{/if}
-					{if $ourmovies[$result->alternate_ids->imdb] != ""}
-						<a class="rndbtn" href="{$smarty.const.WWW_TOP}/movies?imdb={$result->alternate_ids->imdb}">Download</a>
-					{/if}
-					<a style="display:{if $userimdbs[$result->alternate_ids->imdb] == ""}inline{else}none;{/if}" onclick="mymovie_add('{$result->alternate_ids->imdb}', this);return false;" class="rndbtn" href="#">Add To My Movies</a>
-					<a style="display:{if $userimdbs[$result->alternate_ids->imdb] != ""}inline{else}none;{/if}" onclick="mymovie_del('{$result->alternate_ids->imdb}', this);return false;" href="#" class="rndbtn">Remove From My Movies</a>
-				</td>
-			</tr>
-		{/foreach}
-	</table>
-{else}
-	<h2>No results</h2>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/usefullinksmenu.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/usefullinksmenu.tpl
deleted file mode 100644
index 82325a584..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/usefullinksmenu.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<li class="menu_useful"> 
-	<h2>Useful Links</h2> 
-	<ul>
-	<li class="mmenu"><a title="Contact Us" href="{$smarty.const.WWW_TOP}/contact-us">Contact Us</a></li>
-	<li class="mmenu"><a title="Site Map" href="{$smarty.const.WWW_TOP}/sitemap">Site Map</a></li>
-	{if $loggedin=="true"}
-	<li class="mmenu"><a title="Search Raw Headers" href="{$smarty.const.WWW_TOP}/searchraw">Raw Search</a></li>
-	<li class="mmenu"><a title="{$site->title} Rss Feeds" href="{$smarty.const.WWW_TOP}/rss">Rss Feeds</a></li>
-	<li class="mmenu"><a title="{$site->title} Api" href="{$smarty.const.WWW_TOP}/apihelp">Api</a></li>
-	{/if}
-	{foreach from=$usefulcontentlist item=content}
-		<li class="mmenu{if $menu.newwindow =="1"}_new{/if}"><a {if $menu.newwindow =="1"}class="external" target="null"{/if} title="{$content.title}" href="{$smarty.const.WWW_TOP}/content/{$content.id}{$content.url}">{$content.title}</a></li>
-	{/foreach}
-	</ul>
-</li>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewanime.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewanime.tpl
deleted file mode 100644
index 22a6f8ecb..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewanime.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<h1>
-	{if $isadmin}
-		<a title="Edit AniDB data"
-		   href="{$smarty.const.WWW_TOP}/admin/anidb-edit.php?id={$animeAnidbid}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">{$animeTitle} </a>
-	{else}
-		{$animeTitle}
-	{/if}
-
-	{if $catname != ''} in {$catname|escape:"htmlall"}{/if}
-</h1>
-
-<div class="tvseriesheading">
-	{if $animeType != ''}<i>({$animeType|escape:"htmlall"})</i>{/if}
-	{if animePicture != ""}<img class="shadow" alt="{$animeTitle} Picture"
-								src="{$smarty.const.WWW_TOP}/covers/anime/{$animeAnidbid}.jpg" />{/if}
-	<p>
-		{if $animeCategories != ''}<b>{$animeCategories}</b><br/>{/if}
-		<span class="descinitial">{$animeDescription|escape:"htmlall"|nl2br|magicurl|truncate:"1500":" </span><a class=\"descmore\" href=\"#\">more...</a>"}
-			{if $animeDescription|strlen > 1500}<span
-					class="descfull">{$animeDescription|escape:"htmlall"|nl2br|magicurl}</span>{else}</span>{/if}
-		{if $animeRating != ''}<br><b>AniDB Rating: {$animeRating|escape:"htmlall"}</b>{/if}
-		{if $animeRelated != ''}<br><i>Related Anime: {$animeRelated|escape:"htmlall"}</i><br/>{/if}
-	</p>
-
-</div>
-
-<form id="nzb_multi_operations_form" action="get">
-
-	<div class="nzb_multi_operations">
-		<div style="padding-bottom:10px;">
-			<a target="_blank"
-			   href="{$site->dereferrer_link}http://anidb.net/perl-bin/animedb.pl?show=anime&amp;aid={$animeAnidbid}"
-			   title="View AniDB">View AniDB</a> |
-			{if $animeTvdbID > 0}<a target="_blank"
-									href="{$site->dereferrer_link}http://thetvdb.com/?tab=series&id={$animeTvdbID}"
-									title="View TheTVDB">View TheTVDB</a> | {/if}
-			{if $animeImdbID > 0}<a target="_blank"
-									href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$animeImdbID}"
-									title="View IMDb">View IMDb</a> | {/if}
-			<a href="{$smarty.const.WWW_TOP}/rss?anidb={$animeAnidbid}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">RSS
-				feed for this Anime</a>
-		</div>
-		<div class="btn-group">
-			<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-			<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-			{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-			{if $isadmin}
-				<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-				<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-			{/if}
-		</div>
-	</div>
-
-
-	<table style="width:100%;" class="data highlight icons" id="browsetable">
-		{foreach $animeEpisodeTitles as $animeEpno => $animeEpisodeTitle}
-			<tr>
-				<td style="padding-top:15px;" colspan="10"><a href="#top" class="top_link">Top</a>
-
-					<h2>{$animeEpno}</h2></td>
-			</tr>
-			<tr>
-				<th>Name</th>
-				<th></th>
-				<th>Category</th>
-				<th style="text-align:center;">Posted</th>
-				<th>Size</th>
-				<th>Files</th>
-				<th>Stats</th>
-				<th></th>
-			</tr>
-			{foreach $animeEpisodeTitle as $result}
-				<tr class="{cycle values=",alt"}" id="guid{$result.guid}">
-					<td>
-						<a title="View details"
-						   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
-
-						<div class="resextra">
-							<div class="btns">
-								{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-														 title="View Nfo" class="modal_nfo rndbtn" rel="nfo">
-										Nfo</a>{/if}
-								{if $result.haspreview == 1 && $userdata.canpreview == 1}<a
-									href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-									name="name{$result.guid}"title="Screenshot of {$result.searchname|escape:"htmlall"}"
-									class="modal_prev rndbtn" rel="preview">Preview</a>{/if}
-								{if $result.tvairdate != ""}<span class="rndbtn"
-																  title="{$result.tvtitle} Aired on {$result.tvairdate|date_format}">
-									Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>{/if}
-								{if $result.reID > 0}<span class="mediainfo rndbtn" title="{$result.guid}">
-										Media</span>{/if}
-							</div>
-
-							{if $isadmin}
-								<div class="admin">
-									<a class="rndbtn"
-									   href="{$smarty.const.WWW_TOP}/admin/release-edit.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-									   title="Edit Release">Edit</a> <a class="rndbtn confirm_action"
-																		href="{$smarty.const.WWW_TOP}/admin/release-delete.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-																		title="Delete Release">Del</a>
-								</div>
-							{/if}
-						</div>
-					</td>
-					<td class="check"><input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check"
-											 name="{$seasonnum}" value="{$result.guid}"/></td>
-					<td class="less"><a title="This anime in {$result.category_name}"
-										href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}?t={$result.categoryid}">{$result.category_name}</a>
-					</td>
-					<td class="less mid" width="40" title="{$result.postdate}">{$result.postdate|timeago}</td>
-					<td width="40" class="less right">{$result.size|fsize_format:"MB"}{if $result.completion > 0}
-							<br/>
-							{if $result.completion < 100}<span class="warning">{$result.completion}
-								%</span>{else}{$result.completion}%{/if}{/if}</td>
-					<td class="less mid"><a title="View file list"
-											href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
-					</td>
-					<td width="40" class="less nowrap"><a
-								title="View comments for {$result.searchname|escape:"htmlall"}"
-								href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments}
-							cmt{if $result.comments != 1}s{/if}</a><br/>{$result.grabs}grab{if $result.grabs != 1}s{/if}
-					</td>
-					<td class="icons">
-						<div class="icon icon_nzb"><a title="Download NZB"
-													  href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}">
-								&nbsp;</a></div>
-						<div class="icon icon_cart" title="Add to Cart"></div>
-						{if $sabintegrated}
-							<div class="icon icon_sab" title="Send to my Queue"></div>
-						{/if}
-					</td>
-				</tr>
-			{/foreach}
-		{/foreach}
-	</table>
-
-</form>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewanimelist.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewanimelist.tpl
deleted file mode 100644
index 78dac280d..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewanimelist.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<h1>{$page->title}</h1>
-
-<div class="pagination pagination-mini">
-	<ul style="padding-bottom:1.5px;">
-		<li{if $animeletter == '0-9'} class="active"{/if}>
-			<a href="{$smarty.const.WWW_TOP}/anime/0-9">0-9</a>
-		</li>
-		{foreach $animerange as $range}
-			<li{if $range == $animeletter} class="active"{/if}>
-				<a href="{$smarty.const.WWW_TOP}/anime/{$range}">{$range}</a>
-			</li>
-		{/foreach}
-	</ul>
-	<form style="float:right;" name="anidbsearch" action="" method="get">
-			<input id="title" type="text" value="{$animetitle|escape:'html'}" />
-			<button type="submit" class="btn"><i class="icon-search"></i></button>
-	</form>
-</div>
-
-{$site->adbrowse}
-
-{if $animelist|@count > 0}
-
-	<table style="width:100%;" class="data highlight icons" id="browsetable">
-		{foreach $animelist as $aletter => $anime}
-			<tr>
-				<td style="padding-top:15px;" colspan="10"><a href="#top" class="top_link">Top</a><h2>{$animeletter}...</h2></td>
-			</tr>
-			<tr>
-				<th width="40%">Name</th>
-				<th width="10%">Type</th>
-				<th width="35%">Categories</th>
-				<th width="5%">Rating</th>
-				<th>View</th>
-			</tr>
-			{foreach $anime as $a}
-				<tr class="{cycle values=",alt"}">
-					<td><a class="title" title="View anime" href="{$smarty.const.WWW_TOP}/anime/{$a.anidbid}">{$a.title|escape:"htmlall"}</a>{if {$a.startdate} != ''}<br />({$a.startdate|date_format} - {/if}{if $a.enddate != ''}{$a.enddate|date_format}{/if})</td>
-					<td style="text-align: center;">{if {$a.type} != ''}{$a.type|escape:"htmlall"}{/if}</td>
-					<td>{if {$a.categories} != ''}{$a.categories|escape:"htmlall"|replace:'|':', '}{/if}</td>
-					<td style="text-align: center;">{if {$a.rating} != ''}{$a.rating}{/if}</td>
-					<td><a title="View anime" href="{$smarty.const.WWW_TOP}/anime/{$a.anidbid}">Anime</a>&nbsp;&nbsp;{if $a.anidbid > 0}<a title="View at AniDB" target="_blank" href="{$site->dereferrer_link}http://anidb.net/perl-bin/animedb.pl?show=anime&aid={$a.anidbid}">AniDB</a>{/if}</td>
-				</tr>
-			{/foreach}
-		{/foreach}
-	</table>
-
-{else}
-	<h2>No results</h2>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewbook.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewbook.tpl
deleted file mode 100644
index 1b2739406..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewbook.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="musicinfo">
-
-<img src="{$smarty.const.WWW_TOP}/covers/book/{if $book.cover == 1}{$book.id}{else}no-cover{/if}.jpg" class="cover" alt="{$book.title|ss}" />
-
-<h1>{$book.author} - {$book.title}</h1>
-
-{if $book.publisher != ""}<h3>Publisher: {$book.publisher}</h3>{/if}
-
-{if $book.publishdate != ""}<h3>Published: {$book.publishdate|date_format}</h3>{/if}
-
-{if $book.pages != ""}<h3>Pages: {$book.pages}</h3>{/if}
-
-{if $book.review != ""}
-<h3>Review: </h3>
-<p>{$book.review}</p>
-{/if}
-
-</div>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewcalendar.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewcalendar.tpl
deleted file mode 100644
index 4e6fa5722..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewcalendar.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<h1>{$page->title}</h1>
-
-<div style="float:right;">
-{foreach $cal as $c}
-<a href="{$smarty.const.WWW_TOP}/calendar?date={$c}">{$c}</a>&nbsp;&nbsp;&nbsp;
-{/foreach}
-</div>
-<table><tr valign="top"><td width="33%";>
-<table width="100%;" class="data highlight icons" id="browsetable">
-	<tr>
-	{if $predata|@count > 0}
-		<td style="padding-top:15px;" colspan="10"><h2>{$predate}</h2></td>
-	</tr>
-	{foreach $predata as $s}
-		<tr class="{cycle values=",alt"}">
-			<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.rageid}">{$s.showtitle}</a><br/>{$s.fullep} - {$s.eptitle}</td>
-		</tr>
-	{/foreach}
-{else}
-<td style="padding-top:15px;" colspan="10"><h2>No results</h2></td></tr>
-{/if}
-</table>
-</td><td width="33%";>
-<table width="100%;" class="data highlight icons" id="browsetable">
-	<tr>
-	{if $daydata|@count > 0}
-		<td style="padding-top:15px;" colspan="10"><h2>{$date}</h2></td>
-	</tr>
-	{foreach $daydata as $s}
-		<tr class="{cycle values=",alt"}">
-			<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.rageid}">{$s.showtitle}</a><br/>{$s.fullep} - {$s.eptitle}</td>
-		</tr>
-	{/foreach}
-{else}
-<td style="padding-top:15px;" colspan="10"><h2>No results</h2></td></tr>
-{/if}
-</table>
-</td><td width="33%";>
-<table width="100%;" class="data highlight icons" id="browsetable">
-	<tr>
-	{if $nxtdata|@count > 0}
-		<td style="padding-top:15px;" colspan="10"><h2>{$nxtdate}</h2></td>
-	</tr>
-	{foreach $nxtdata as $s}
-		<tr class="{cycle values=",alt"}">
-			<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.rageid}">{$s.showtitle}</a><br/>{$s.fullep} - {$s.eptitle}</td>
-		</tr>
-	{/foreach}
-{else}
-<td style="padding-top:15px;" colspan="10"><h2>No results</h2></td></tr>
-{/if}
-</table>
-</td></tr></table>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewconsole.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewconsole.tpl
deleted file mode 100644
index 51905463a..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewconsole.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="musicinfo">
-
-<img src="{$smarty.const.WWW_TOP}/covers/console/{if $console.cover == 1}{$console.id}{else}no-cover{/if}.jpg" class="cover" alt="{$console.title|ss}" />
-
-<h1>{$console.title} {if $console.year != ""}({$console.year}){/if}</h1>
-
-{if $console.genres != ""}<h3>Genre: {$console.genres}</h3>{/if}
-
-{if $console.publisher != ""}<h3>Publisher: {$console.publisher}</h3>{/if}
-
-{if $console.releasedate != ""}<h3>Released: {$console.releasedate|date_format}</h3>{/if}
-
-{if $console.review != ""}
-<h3>Review: </h3>
-<p>{$console.review}</p>
-{/if}
-
-</div>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewfilelist.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewfilelist.tpl
deleted file mode 100644
index f2bbe49f9..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewfilelist.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<table style="width:100%;margin-bottom:10px;" class="data Sortable highlight">
-
-	<tr>
-		<th>#</th>
-		<th>filename</th>
-		<th></th>
-		<th style="text-align:center;">completion</th>
-		<th style="text-align:center;">size</th>
-	</tr>
-
-	{foreach item=i name=iteration from=$files item=file}
-	<tr class="{cycle values=",alt"}">
-		<td width="20">{$smarty.foreach.iteration.index+1}</td>
-		<td>{$file.title|escape:'htmlall'}</td>
-
-		{assign var="icon" value='templates/nntmux/images/fileicons/'|cat:$file.ext|cat:".png"}
-		{if $file.ext == "" || !is_file("$icon")}
-			{assign var="icon" value='file'}
-		{else}
-			{assign var="icon" value=$file.ext}
-		{/if}
-
-		{if $file.partstotal != 0}
-			{assign var="completion" value=($file.partsactual/$file.partstotal*100)|number_format:1}
-		{else}
-			{assign var="completion" value=0|number_format:1}
-		{/if}
-
-		<td width="30"><img title=".{$file.ext}" alt="{$file.ext}" src="{$smarty.const.WWW_TOP}/templates/nntmux/images/fileicons/{$icon}.png" /></td>
-		<td class="less right">{if $completion < 100}<span class="label label-important">{$completion}%</span>{else}<span class="label label-success">{$completion}%</span>{/if}</td>
-		<td width="80" class="less right">{if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if}</td>
-	</tr>
-	{/foreach}
-
-</table>
-
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewmovie.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewmovie.tpl
deleted file mode 100644
index 3df104665..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewmovie.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{if not $modal}
-<h1>{$page->title}</h1>
-<h2>For <a href="{$smarty.const.WWW_TOP}/details/{$rel.guid}/{$rel.searchname|escape:'seourl'}">{$rel.searchname|escape:'htmlall'}</a></h2>
-{/if}
-
-{if $movie.backdrop == 1}<div id="backdrop"><img src="{$smarty.const.WWW_TOP}/covers/movies/{$movie.imdbid}-backdrop.jpg" alt="" /></div>{/if}
-
-<div id="movieinfo">
-
-<h1>{$movie.title|ss} {if $movie.year != ''}({$movie.year}){/if}</h1>
-<h2>{if $movie.cover == 1}<img src="{$smarty.const.WWW_TOP}/covers/movies/{$movie.imdbid}-cover.jpg" class="cover" alt="{$movie.title|ss}" align="left" width="180" border="0"/>{/if}
-{if $movie.tagline != ''}<b>{$movie.tagline|ss}</b>{/if}</h2>
-
-{if $movie.plot != ''}
-	<h2>{$movie.plot|ss}</h2>
-{/if}
-
-<h3>
-	{if $movie.rating != ''}Rating: {$movie.rating}/10<br />{/if}
-	{if $movie.director != ''}Director: {$movie.director}<br />{/if}
-	{if $movie.genre != ''}Genre: {$movie.genre|ss}{/if}
-</h3>
-
-{if $movie.actors != ''}<h3>Starring:<br />{$movie.actors}</h3>{/if}
-
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewmoviefull.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewmoviefull.tpl
deleted file mode 100644
index 7107d8366..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewmoviefull.tpl
+++ /dev/null
@@ -1,209 +0,0 @@
-{if $results|@count > 0}
-
-	{foreach from=$results item=result}
-		<div id="moviefull">
-			{if $result.banner == 1}<img class="shadow img-thumbnail" alt="{$result.title|escape:"htmlall"} Logo"
-										src="{$smarty.const.WWW_TOP}/covers/movies/{$result.imdbid}-banner.jpg"/>
-			{elseif $result.cover == 1}<img class="shadow pic" alt="{$result.title|escape:"htmlall"} Logo"
-											 src="{$smarty.const.WWW_TOP}/covers/movies/{$result.imdbid}-cover.jpg" width="180" border="0"/>{/if}
-			<h1>{$result.title|escape:"htmlall"} ({$result.year})</h1>
-
-			<h2>{if $result.genre != ''}{$result.genre|replace:"|":" / "}{/if}</h2>
-
-			<p>
-				{if $result.tagline != ''}<strong>{$result.tagline|escape:"htmlall"}</strong>{/if}
-				{if $result.plot != ''}<br/><span class="descinitial">{$result.plot|escape:"htmlall"}</span>{/if}
-				{if $result.rating != ''}
-					<br/>
-					<br/>
-					<strong>Rating:</strong>
-					{$result.rating}/10{if $result.ratingcount != ''}
-					<small>({$result.ratingcount|number_format} votes)</small>{/if}{/if}
-				{if $result.director != ''}<br/><strong>Director:</strong>{$result.director|replace:"|":", "}{/if}
-				{if $result.actors != ''}<br/><strong>Actors:</strong>{$result.actors|replace:"|":", "}{/if}
-				{if in_array("1", ","|explode:$result.grp_haspreview) && $userdata.canpreview == 1}
-					<br/>
-					<strong>Previews:</strong>
-					<a id="showmoviepreviews" href="#">Show previews</a>
-				{/if}
-				{if $result.trailer != ''}
-					<br/>
-					<strong>Trailer:</strong>
-				<a name="name{$result.imdbid}" class="modal_imdbtrailer" href="#">Show trailer</a>{/if}
-			</p>
-		</div>
-		{if in_array("1", ","|explode:$result.grp_haspreview) && $userdata.canpreview == 1}
-			<div id="moviepreviews" style="display:none;">
-				{assign var="msplits" value=","|explode:$result.grp_release_id}
-				{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-				{assign var="mguid" value=","|explode:$result.grp_release_guid}
-				{assign var="mname" value="#"|explode:$result.grp_release_name}
-				{foreach from=$msplits item=m}
-					{if $mhaspreview[$m@index] == 1}
-						<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"seourl"}">
-							<img class="shadow pic"
-								 src="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"/><br/>
-
-							<div class="previewtitle">{$mname[$m@index]}</div>
-						</a>
-					{/if}
-				{/foreach}
-			</div>
-		{/if}
-		<form id="nzb_multi_operations_form" action="get">
-
-			<div class="nzb_multi_operations">
-				{if $section != ''}View:
-					<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
-					|
-					<b>List</b>
-					<br/>
-				{/if}
-				<small>With Selected:</small>
-				<input type="button" class="rndbtn nzb_multi_operations_download" value="Download NZBs"/>
-				<input type="button" class="rndbtn nzb_multi_operations_cart" value="Add to Cart"/>
-				{if $sabintegrated}
-					<input type="button" class="rndbtn nzb_multi_operations_sab" value="Send to my Queue"/>
-				{/if}
-				{if $isadmin}
-					<input type="button" class="rndbtn nzb_multi_operations_edit" value="Edit"/>
-					<input type="button" class="rndbtn nzb_multi_operations_delete" value="Del"/>
-				{/if}
-			</div>
-
-			<table style="width:100%;" class="data highlight icons" id="browsetable">
-				<tr>
-					<th><input id="chkSelectAll" type="checkbox" class="nzb_check_all"/><label for="chkSelectAll"
-																							   style="display:none;">Select
-							All</label></th>
-					<th>name<br/><a title="Sort Descending" href="{$orderbyname_desc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-									alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbyname_asc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-									alt="Sort Ascending"/></a></th>
-					<th>category<br/><a title="Sort Descending" href="{$orderbycat_desc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-									alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbycat_asc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-									alt="Sort Ascending"/></a></th>
-					<th>posted<br/><a title="Sort Descending" href="{$orderbyposted_desc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-									alt="Sort Descending"/></a><a title="Sort Ascending"
-																  href="{$orderbyposted_asc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-									alt="Sort Ascending"/></a></th>
-					<th>size<br/><a title="Sort Descending" href="{$orderbysize_desc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-									alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbysize_asc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-									alt="Sort Ascending"/></a></th>
-					<th>files<br/><a title="Sort Descending" href="{$orderbyfiles_desc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-									alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbyfiles_asc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-									alt="Sort Ascending"/></a></th>
-					<th>stats<br/><a title="Sort Descending" href="{$orderbystats_desc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif"
-									alt="Sort Descending"/></a><a title="Sort Ascending" href="{$orderbystats_asc}"><img
-									src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif"
-									alt="Sort Ascending"/></a></th>
-					<th></th>
-				</tr>
-
-				{assign var="msplits" value=","|explode:$result.grp_release_id}
-				{assign var="mguid" value=","|explode:$result.grp_release_guid}
-				{assign var="mnfo" value=","|explode:$result.grp_release_nfoid}
-				{assign var="mgrp" value=","|explode:$result.grp_release_grpname}
-				{assign var="mname" value="#"|explode:$result.grp_release_name}
-				{assign var="mpostdate" value=","|explode:$result.grp_release_postdate}
-				{assign var="msize" value=","|explode:$result.grp_release_size}
-				{assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts}
-				{assign var="mcomments" value=","|explode:$result.grp_release_comments}
-				{assign var="mgrabs" value=","|explode:$result.grp_release_grabs}
-				{assign var="mpass" value=","|explode:$result.grp_release_password}
-				{assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount}
-				{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-				{assign var="mcat" value=","|explode:$result.grp_release_categoryid}
-				{assign var="mcatname" value=","|explode:$result.grp_release_categoryname}
-
-				{foreach from=$msplits item=m}
-					<tr class="{cycle values=",alt"}" id="guid{$mguid[$m@index]}">
-						<td class="check"><input id="chk{$mguid[$m@index]|substr:0:7}" type="checkbox" class="nzb_check"
-												 value="{$mguid[$m@index]}"/></td>
-						<td class="item">
-							<label for="chk{$mguid[$m@index]|substr:0:7}"><a class="title" title="View details"
-																			 href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"seourl"}">{$mname[$m@index]|escape:"htmlall"|replace:".":" "}</a></label>
-
-							{if $mpass[$m@index] == 2}
-								<img title="Passworded Rar Archive"
-									 src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif"
-									 alt="Passworded Rar Archive"/>
-							{elseif $mpass[$m@index] == 1}
-								<img title="Contains .cab/ace/rar Archive"
-									 src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif"
-									 alt="Contains .cab/ace/rar Archive"/>
-							{/if}
-
-							<div class="resextra">
-								<div class="btns">{strip}
-										{if $mnfo[$m@index] > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}"
-																   title="View Nfo" class="modal_nfo rndbtn" rel="nfo">
-												Nfo</a>{/if}
-										{if $mhaspreview[$m@index] == 1 && $userdata.canpreview == 1}<a
-											href="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"
-											name="name{$mguid[$m@index]}" title="View Screenshot"
-											class="modal_prev rndbtn" rel="preview">Preview</a>{/if}
-										{if $mre[$m@index] > 0}<span class="mediainfo rndbtn"title="{$mguid[$m@index]}">
-												Media</span>{/if}
-									{/strip}</div>
-							</div>
-						</td>
-						<td class="less"><a title="Browse {$mcatname[$m@index]}"
-											href="{$smarty.const.WWW_TOP}/browse?t={$mcat[$m@index]}">{$mcatname[$m@index]}</a>
-						</td>
-						<td class="less mid" title="{$mpostdate[$m@index]}">{$mpostdate[$m@index]|timeago}</td>
-						<td class="less right">{$msize[$m@index]|fsize_format:"MB"}</td>
-						<td class="less mid">
-							<a title="View file list"
-							   href="{$smarty.const.WWW_TOP}/filelist/{$mguid[$m@index]}">{$mtotalparts[$m@index]}</a>
-							{if $minnerfiles[$m@index] > 0}
-								<div class="rarfilelist">
-									<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/magnifier.png"
-										 alt="{$mguid[$m@index]}" class="tooltip"/>
-								</div>
-							{/if}
-						</td>
-						<td class="less nowrap"><a title="View comments"
-												   href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/#comments">{$mcomments[$m@index]}
-								cmt{if $mcomments[$m@index] != 1}s{/if}</a><br/>{$mgrabs[$m@index]}
-							grab{if $mgrabs[$m@index] != 1}s{/if}</td>
-						<td class="icons">
-							<div class="icon icon_nzb"><a title="Download Nzb"
-														  href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}/{$mname[$m@index]|escape:"url"}">
-									&nbsp;</a></div>
-							<div class="icon icon_cart" title="Add to Cart"></div>
-							{if $sabintegrated}
-								<div class="icon icon_sab" title="Send to my Queue"></div>
-							{/if}
-						</td>
-					</tr>
-				{/foreach}
-
-			</table>
-
-			<div class="nzb_multi_operations">
-				<small>With Selected:</small>
-				<input type="button" class="rndbtn nzb_multi_operations_download" value="Download NZBs"/>
-				<input type="button" class="rndbtn nzb_multi_operations_cart" value="Add to Cart"/>
-				{if $sabintegrated}
-					<input type="button" class="rndbtn nzb_multi_operations_sab" value="Send to my Queue"/>
-				{/if}
-				{if $isadmin}
-					<input type="button" class="rndbtn nzb_multi_operations_edit" value="Edit"/>
-					<input type="button" class="rndbtn nzb_multi_operations_delete" value="Del"/>
-				{/if}
-			</div>
-
-		</form>
-	{/foreach}
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewmovietrailer.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewmovietrailer.tpl
deleted file mode 100644
index 063d614b5..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewmovietrailer.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="movieinfo">
-    <object style="width:800px; height:450px;" data="http{if $page->secure_connection}s{/if}://www.youtube.com/v/{$movie.trailer}?modestbranding=0&amp;rel=0&amp;showinfo=0&amp;autohide=1&amp;vq=hd720" type="application/x-shockwave-flash">
-        <param name="src" value="http{if $page->secure_connection}s{/if}://www.youtube.com/v/{$movie.trailer}?modestbranding=0&amp;rel=0&amp;showinfo=0&amp;autohide=1&amp;vq=hd720" />
-        <param name="allowFullScreen" value="true" />
-    </object>
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewmusic.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewmusic.tpl
deleted file mode 100644
index 5f6a69702..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewmusic.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="musicinfo">
-
-<img src="{$smarty.const.WWW_TOP}/covers/music/{if $music.cover == 1}{$music.id}{else}no-cover{/if}.jpg" class="cover" alt="{$movie.title|ss}"/>
-
-<h1>{$music.title} {if $music.year != ""}({$music.year}){/if}</h1>
-
-{if $music.artist != ""}<h3>Artist: {$music.artist}</h3>{/if}
-
-{if $music.genres != ""}<h3>Genre: {$music.genres}</h3>{/if}
-
-{if $music.publisher != ""}<h3>Publisher: {$music.publisher}</h3>{/if}
-
-{if $music.releasedate != ""}<h3>Released: {$music.releasedate|date_format}</h3>{/if}
-
-{if $music.tracks != ""}
-<h3>Track Listing:</h3>
-<ol class="tracklist">
-	{assign var="tracksplits" value="|"|explode:$music.tracks}
-	{foreach from=$tracksplits item=tracksplit}
-	<li>{$tracksplit|trim}</li>
-	{/foreach}
-</ol>
-{/if}
-
-{if $music.review != ""}
-<h3>Review: </h3>
-<p>{$music.review}</p>
-{/if}
-
-</div>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewnfo.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewnfo.tpl
deleted file mode 100644
index bcb5c3756..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewnfo.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
- 
-{if not $modal}
-<h1>{$page->title}</h1>
-<h2>For <a href="{$smarty.const.WWW_TOP}/details/{$rel.guid}/{$rel.searchname|escape:'seourl'}">{$rel.searchname|escape:'htmlall'}</a></h2>
-{/if}
-
-<pre id="nfo">{$nfo.nfoUTF|magicurl:$site->dereferrer_link}</pre>
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl
deleted file mode 100644
index 4eb247456..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl
+++ /dev/null
@@ -1,638 +0,0 @@
-
-<h1>{$release.searchname|escape:"htmlall"}</h1>
-
-{if $site->addetail != ""}
-	<table class="adblock" cellspacing="0" cellpadding="0"><tr><td>{$site->addetail}</td></tr></table><br />
-{/if}
-
-
-<!-- group/etc -->
-<span class="label">
-    <a style="color:white" title="Browse by {$release.category_name}" href="{$smarty.const.WWW_TOP}/browse?t={$release.categoryid}">{$release.category_name}</a>
-</span>
-<span class="label">
-    <a style="color:white" title="Browse {$release.group_name}" href="{$smarty.const.WWW_TOP}/browse?g={$release.group_name}">{$release.group_name|replace:"alt.binaries":"a.b"}</a>
-</span>
-{if $predb}
-	{if $predb.nuketype != '' && $predb.nukereason != ''}
-		<span class="badge label-warning">
-			<!--<tr><th>Pre:</th><td>{$predb.ctime|date_format:"%b %e, %Y %T"} ({$predb.ctime|daysago})</td></tr>-->
-			<i class="icon-warning-sign icon-white"></i>
-			{if preg_match('/^(UN)?((MOD)?NUKED?|DELPRE|MOD|LOCAL)$/', $predb.nuketype)}
-				{$predb.nuketype} : {$predb.nukereason}
-			{else}
-				{$predb.nukereason} [{$predb.nuketype}]
-			{/if}
-		</span>
-	{/if}
-{/if}
-{if $site->checkpasswordedrar > 0 && $release.passwordstatus > 0}
-	<span class="badge label-warning"><i class="icon-lock icon-white"></i> {if $release.passwordstatus == 2}Passworded Rar Archive{elseif $release.passwordstatus == 1}Contains Cab/Ace/Rar Inside Archive{else}Unknown{/if}
-    </span>
-{/if}
-
-{foreach from=$reAudio item=audio}
-	{if $audio.audiolanguage != ""}
-		<i class="icon-flag {$audio.audioflag}" title="{$audio.audiolanguage}-{$audio.audioformat}"></i>
-	{/if}
-{/foreach}
-<br />
-
-<!-- ### -- IMAGE ON RIGHT -->
-{if $rage && $release.rageid > 0 && $rage.imgdata != ""}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/getimage?type=tvrage&amp;id={$rage.id}" width="220" height="auto" alt="{$rage.releasetitle|escape:"htmlall"}" style="float:right;" />{/if}
-{if $movie && $release.rageid < 0 && $movie.banner == 1}<img class="shadow img-thumbnail" src="{$smarty.const.WWW_TOP}/covers/movies/{$movie.imdbid}-banner.jpg" alt="{$movie.title|escape:"htmlall"}" style="vertical-align:top;" />
-	{elseif $movie && $release.rageid < 0 && $movie.cover == 1}<img class="shadow img-thumbnail" src="{$smarty.const.WWW_TOP}/covers/movies/{$movie.imdbid}-cover.jpg" width="220" height="auto" alt="{$movie.title|escape:"htmlall"}" style="float:right;" />{/if}
-{if $game && $game.cover == 1}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/covers/games/{$game.id}.jpg" width="160"
-								   alt="{$con.title|escape:"htmlall"}" style="float:right;" />{/if}
-{if $xxx && $xxx.cover == 1}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/covers/xxx/{$xxx.id}-cover.jpg" width="160"
-								 alt="{$movie.title|escape:"htmlall"}" style="float:right;" />{/if}
-{if $anidb && $release.anidbid > 0 && $anidb.picture != ""}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/covers/anime/{$anidb.anidbid}.jpg" width="220" alt="{$anidb.title|escape:"htmlall"}" style="float:right;" />{/if}
-{if $con && $con.cover == 1}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/covers/console/{$con.id}.jpg" width="220" alt="{$con.title|escape:"htmlall"}" style="float:right;" />{/if}
-{if $music && $music.cover == 1}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/covers/music/{$music.id}.jpg" width="220" alt="{$music.title|escape:"htmlall"}" style="float:right;" />{/if}
-{if $book && $book.cover == 1}<img class="img-rounded" src="{$smarty.const.WWW_TOP}/covers/book/{$book.id}.jpg" width="220" alt="{$book.title|escape:"htmlall"}" style="float:right;" />{/if}
-
-<!-- ### -- MEDIA DESCRIPTION -->
-{if $rage && $release.rageid > 0}
-	<!-- TV Info -->
-	<strong>{if $release.tvtitle != ""}{$release.tvtitle|escape:"htmlall"} - {/if}{$release.seriesfull|replace:"S":"Season "|replace:"E":" Episode "}</strong><br />
-	{if $rage.description != ""}<span class="descinitial">{$rage.description|escape:"htmlall"|nl2br|magicurl|truncate:"350":"</span><a class=\"descmore\" href=\"#\">more...</a>"}{if $rage.description|strlen > 350}<span class="descfull">{$rage.description|escape:"htmlall"|nl2br|magicurl}</span>{else}{/if}<br /><br />{/if}
-{if $rage.genre != ""}<strong>Genre:</strong> {$rage.genre|escape:"htmlall"|replace:"|":", "}<br />{/if}
-{if $release.tvairdate != ""}<strong>Aired:</strong> {$release.tvairdate|date_format}<br/>{/if}
-{if $rage.country != ""}<strong>Country:</strong> {$rage.country}<br/>{/if}
-{if $episode && $release.episodeinfoid > 0}
-{if $episode.overview != ""}<strong>Overview:</strong> <span class="descinitial">{$episode.overview|escape:"htmlall"|nl2br|magicurl|truncate:"350":"</span><a class=\"descmore\" href=\"#\">more...</a>"}{if $episode.overview|strlen > 350}<span class="descfull">{$episode.overview|escape:"htmlall"|nl2br|magicurl}</span>{else}{/if}<br /><br />{/if}
-{if $episode.rating > 0}<strong>Rating:</strong> {$episode.rating}/10 <div class="progress progress-striped" style="width:150px">
-	<div class="bar" style="width: {$episode.rating * 10}%;"></div>
-</div> {/if}
-{if $episode.director != ""}<strong>Director:</strong> {$episode.director|escape:"htmlall"|replace:"|":", "}{/if}
-{if $episode.writer != ""}<strong>Writer:</strong> {$episode.writer|escape:"htmlall"|replace:"|":", "}{/if}
-{if $episode.gueststars != ""}<strong>Guest Stars:</strong> {$episode.gueststars|escape:"htmlall"|replace:"|":", "}{/if}
-{/if}<br /><div class="btn-group">
-	<a class="btn btn-mini" title="View all episodes from this series" href="{$smarty.const.WWW_TOP}/series/{$release.rageid}">All Episodes</a>
-	<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$release.rageid}" title="View at TV Rage">TV Rage</a>
-	{if $release.tvdbid > 0}<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://thetvdb.com/?tab=series&id={$release.tvdbid}&lid=7" title="View at TheTVDB">TheTVDB</a>{/if}
-	<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/rss?rage={$release.rageid}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}" title="Rss feed for this series">Series Rss Feed</a></div>
-{/if}
-{if $movie && $release.rageid < 0}
-	<!-- Movie Info -->
-	<strong>{$movie.title|escape:"htmlall"} ({$movie.year})</strong>
-	{if $movie.tagline != ''}<br />{$movie.tagline|escape:"htmlall"}{/if}
-    {if $movie.plot != ''}{if $movie.tagline != ''} - {else}<br />{/if}{$movie.plot|escape:"htmlall"}{/if}
-    <br /><br />{if $movie.director != ""} <strong>Director:</strong> {$movie.director}<br />{/if}
-    <strong>Genre:</strong> {$movie.genre}
-    <br /><strong>Starring:</strong> {$movie.actors}<br />
-	{if $movie.trailer != ''}
-	<br/>
-	<strong>Trailer:</strong>
-	<div>{$movie.trailer}</div>
-{/if}
-	<strong>Rating:</strong>
-	{if $movie.rating == ''}N/A{else}{$movie.rating}/10
-	<div class="progress progress-striped" style="width:150px">
-		<div class="bar" style="width: {$movie.rating * 10}%;"></div>
-	</div> {/if}
-	<div class="btn-group">
-	<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://www.imdb.com/title/tt{$release.imdbid}/" title="View at IMDB">IMDB</a>
-	{if $movie.tmdbID != ''}<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://www.themoviedb.org/movie/{$movie.tmdbID}" title="View at TMDb">TMDb</a>{/if}
-	<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/movies?imdb={$release.imdbid}" title="View all versions">Movie View</a>
-	<a
-			class="btn btn-mini" target="blackhole"
-			href="javascript:;"
-			rel="{$site->dereferrer_link}{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$release.imdbid}&title={$movie.title}"
-			name="CP{$release.imdbid}" title="Add to CouchPotato">
-		CouchPotato
-	</a>
-	<a class="btn btn-mini" target="_blank" href="http://www.opensubtitles.org/search/sublanguageid-all/moviename-{$movie.title|replace:" ":"+"}"title="Opensubtitles">OpenSubtitles</a>
-	<a class="btn btn-mini" target="_blank" href="http://www.subtitleseeker.com/search/MOVIE_TITLES/{$movie.title}"title="SubtitleSeeker">SubtitleSeeker</a>
-</div>
-
-{/if}
-{if $anidb && $release.anidbid > 0}
-<!-- ANIME INFO -->
-    <strong>{if $release.tvtitle != ""}{$release.tvtitle|escape:"htmlall"}{/if}</strong><br />
-{if $anidb.description != ""}<span class="descinitial">{$anidb.description|escape:"htmlall"|nl2br|magicurl|truncate:"350":"</span><a class=\"descmore\" href=\"#\">more...</a>"}{if $anidb.description|strlen > 350}<span class="descfull">{$anidb.description|escape:"htmlall"|nl2br|magicurl}</span>{else}{/if}<br /><br />{/if}
-{if $anidb.categories != ""}<strong>Categories:</strong> {$anidb.categories|escape:"htmlall"|replace:"|":", "}<br />{/if}
-{if $release.tvairdate != "0000-00-00 00:00:00"}<strong>Aired:</strong> {$release.tvairdate|date_format}<br/>{/if}
-{if $episode && $release.episodeinfoid > 0}
-	{if $episode.overview != ""}<strong>Overview:</strong> {$episode.overview}{/if}
-				{if $episode.rating > 0}<strong>Rating:</strong> {$episode.rating}{/if}
-				{if $episode.director != ""}<strong>Director:</strong> {$episode.director|escape:"htmlall"|replace:"|":", "}{/if}
-				{if $episode.gueststars != ""}<strong>Guest Stars:</strong> {$episode.gueststars|escape:"htmlall"|replace:"|":", "}{/if}
-				{if $episode.writer != ""}<strong>Writer:</strong> {$episode.writer|escape:"htmlall"|replace:"|":", "}{/if}
-			{/if}<br /><br />
-    <div class="btn-group">
-		<a class="btn btn-mini" title="View all episodes from this anime" href="{$smarty.const.WWW_TOP}/anime/{$release.anidbid}">All Episodes</a>
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://anidb.net/perl-bin/animedb.pl?show=anime&aid={$anidb.anidbid}" title="View at AniDB">AniDB</a>
-		{if $release.tvdbid > 0}<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://thetvdb.com/?tab=series&id={$release.tvdbid}&lid=7" title="View at TheTVDB">TheTVDB</a>{/if}
-		<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/rss?anidb={$release.anidbid}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}" title="RSS feed for this anime">Anime RSS Feed</a>
-	</div>
-{/if}
-{if $con}
-	<!-- Console Info -->
-	{$con.title|escape:"htmlall"} ({$con.releasedate|date_format:"%Y"})
-	{if $con.review != ""}{$con.review|escape:"htmlall"|nl2br|magicurl|truncate:"350":"more..."}{if $con.review|strlen > 350}{$con.review|escape:"htmlall"|nl2br|magicurl}{else}{/if}
-
-	{/if} {if $con.esrb != ""}ESRB: {$con.esrb|escape:"htmlall"}
-{/if} {if $con.genres != ""}Genre: {$con.genres|escape:"htmlall"}
-{/if} {if $con.publisher != ""}Publisher: {$con.publisher|escape:"htmlall"}
-{/if} {if $con.platform != ""}Platform: {$con.platform|escape:"htmlall"}
-{/if} {if $con.releasedate != ""}Released: {$con.releasedate|date_format}{/if} {if $con.url != ""} Amazon
-{/if}
-{/if}
-{if $game}
-	<!-- Game Info -->
-	<strong>{$game.title|escape:"htmlall"} ({$game.releasedate|date_format:"%Y"})</strong><br/>
-	{if $game.review != ""}<span
-			class="descinitial">{$game.review|escape:"htmlall"|nl2br|magicurl|truncate:"350":" <a class=\"descmore\" href=\"#\">more...</a>"}</span>{if $game.review|strlen > 350}
-				<span class="descfull">{$game.review|escape:"htmlall"|nl2br|magicurl}</span>{/if}
-				<br/>
-		<br/>
-	{/if}
-			{if $game.esrb != ""}<strong>ESRB:</strong>{$game.esrb|escape:"htmlall"}<br/>{/if}
-			{if $game.genres != ""}<strong>Genre:</strong>{$game.genres|escape:"htmlall"}<br/>{/if}
-			{if $game.publisher != ""}<strong>Publisher:</strong>{$game.publisher|escape:"htmlall"}<br/>{/if}
-			{if $game.platform != ""}<strong>Platform:</strong>{$game.platform|escape:"htmlall"}<br/>{/if}
-			{if $game.releasedate != ""}<strong>Released:</strong>{$game.releasedate|date_format}{/if}
-			<div style="margin-top:10px;">
-	{if $game.classused == "gb"}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$game.url}"
-		   title="View game at Giantbomb">Giantbomb</a>
-	{/if}
-	{if $game.classused == "steam"}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$game.url}"
-		   title="View game at Steam">Steam</a>
-	{/if}
-</div>
-{/if}
-
-{if $xxx}
-	<!-- XXX Info -->
-	<strong>{$xxx.title|stripslashes|escape:"htmlall"}</strong>
-	{if $xxx.tagline != ''}<br/>{$xxx.tagline|stripslashes|escape:"htmlall"}{/if}
-			{if $xxx.plot != ''}{if $xxx.tagline != ''} - {else}<br/>{/if}{$xxx.plot|stripslashes|escape:"htmlall"}{/if}
-			<br/><br/>{if $xxx.director != ""} <strong>Director:</strong> {$xxx.director}<br/>{/if}
-			<strong>Genre:</strong> {$xxx.genres}
-			<br/><strong>Starring:</strong> {$xxx.actors}
-			{if $xxx.trailer != ''}
-	<br/>
-	<strong>Trailer:</strong>
-	<div>{$xxx.trailer}</div>
-{/if}
-			<div style="margin-top:10px;">
-	{if $xxx.classused === "ade"}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$xxx.directurl}"
-		   title="View at Adult DVD Empire">ADE</a>
-	{elseif $xxx.classused === "pop"}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$xxx.directurl}/"
-		   title="View at Popporn">Popporn</a>
-	{elseif $xxx.classused === "aebn"}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$xxx.directurl}"
-		   title="View at Adult Entertainment Broadcast Network">AEBN</a>
-	{else}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$xxx.directurl}"
-		   title="View at Hot Movies">HM</a>
-	{/if}
-	<a class="btn btn-mini" target="_blank"
-	   href="{$site->dereferrer_link}http://www.iafd.com/results.asp?searchtype=title&searchstring={$xxx.title}"
-	   title="Search IAFD">IAFD</a>
-</div>
-{/if}
-{if $book}
-<!-- Book info -->
-    <strong>{$book.author|escape:"htmlall"} - {$book.title|escape:"htmlall"}</strong><br />
-{if $book.review != ""}<span class="descinitial">{$book.review|escape:"htmlall"|nl2br|magicurl|truncate:"350":"</span><a class=\"descmore\" href=\"#\">more...</a>"}{if $book.review|strlen > 350}<span class="descfull">{$book.review|escape:"htmlall"|nl2br|magicurl}</span>{else}{/if}<br /><br />{/if}
-{if $book.ean != ""}<strong>EAN:</strong> {$book.ean|escape:"htmlall"}<br />{/if}
-{if $book.isbn != ""}<strong>ISBN:</strong> {$book.isbn|escape:"htmlall"}<br />{/if}
-{if $book.pages != ""}<strong>Pages:</strong> {$book.pages|escape:"htmlall"}<br />{/if}
-{if $book.dewey != ""}<strong>Dewey:</strong> {$book.dewey|escape:"htmlall"}<br />{/if}
-{if $book.publisher != ""}<strong>Publisher:</strong> {$book.publisher|escape:"htmlall"}<br />{/if}
-{if $book.publishdate != ""}<strong>Publish Date:</strong> {$book.publishdate|date_format}{/if}
-{if $book.url != ""}<br /><br />
-	<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$book.url}/" title="View book at Amazon">Amazon</a>
-{/if}
-{/if}
-{if $music}
-<!-- Music Info -->
-    <strong>{$music.title|escape:"htmlall"} {if $music.year != ""}({$music.year}){/if}</strong><br />
-{if $music.review != ""}<span class="descinitial">{$music.review|nl2br|magicurl|truncate:"350":"</span><a class=\"descmore\" href=\"#\">more...</a>"}{if $music.review|strlen > 350}<span class="descfull">{$music.review|escape:"htmlall"|nl2br|magicurl}</span>{else}{/if}<br /><br />{/if}
-{if $music.genres != ""}<strong>Genre:</strong> {$music.genres|escape:"htmlall"}<br />{/if}
-{if $music.publisher != ""}<strong>Publisher:</strong> {$music.publisher|escape:"htmlall"}<br />{/if}
-{if $music.releasedate != ""}<strong>Released:</strong> {$music.releasedate|date_format}<br />{/if}
-{if $music.tracks != ""}
-	<strong>Track Listing:</strong>
-	<ol class="tracklist">
-		{assign var="tracksplits" value="|"|explode:$music.tracks}
-		{foreach from=$tracksplits item=tracksplit}
-			<li>{$tracksplit|trim|escape:"htmlall"}</li>
-		{/foreach}
-	</ol>
-{/if}
-{if $music.url != ""} <br /><br />
-	<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}{$music.url}/" title="View record at Amazon">Amazon</a>
-{/if}
-
-{/if}
-<br /><br />
-<!-- NAV-TAB PILLS -->
-<ul class="nav nav-tabs">
-	<li class="active"><a href="#details" data-toggle="tab" style="color: black;"><i class="icon-time"></i> Details</a></li>
-	{if $reVideo.releaseid|@count > 0 || $reAudio|@count > 0}
-		<li><a href="#mediainfo" data-toggle="tab" style="color: black;"><i class="icon-info-sign"></i> Media Info</a></li>
-	{/if}
-	{if $nfo.id|@count > 0}
-		<li><a href="#viewnfo" data-toggle="tab" style="color: black;"><i class="icon-file"></i> View NFO</a></li>
-	{/if}
-	<li><a href="#fileinfo" data-toggle="tab" style="color: black;"><i class="icon-folder-open"></i> File Info</a></li>
-	<li><a href="#nzbcontents" data-toggle="tab" style="color: black;"><i class="icon-list"></i> NZB Contents</a></li>
-
-	{if ($release.haspreview == 1 && $userdata.canpreview == 1) || ($release.haspreview == 2 && $userdata.canpreview == 1)}
-		<li><a href="#preview" data-toggle="tab" style="color: black;"><i class="icon-picture"></i> Preview</a></li>
-	{/if}
-	{if ($release.jpgstatus == 1 && $userdata.canpreview == 1)}
-		<li><a href="#sample" data-toggle="tab" style="color: black;"><i class="icon-picture"></i> Sample</a></li>
-	{/if}
-	{if ($release.videostatus == 1 && $userdata.canpreview == 1)}
-		<li><a href="#video" data-toggle="tab" style="color: black;"><i class="icon-picture"></i> Video</a></li>
-	{/if}
-	{if ($release.audiostatus == 1 && $userdata.canpreview == 1)}
-		<li><a href="#audio" data-toggle="tab" style="color: black;"><i class="icon-picture"></i> Audio</a></li>
-	{/if}
-	{if $isadmin}
-		<li><a href="#admin" data-toggle="tab" style="color: black;"><i class="icon-font"></i> Admin Info</a></li>
-	{/if}
-	<li><a href="#comments" data-toggle="tab" style="color:black;"><i class="icon-comment"></i> Comments</a></li>
-</ul>
-
-<div class="tab-content">
-<div class="tab-pane active" id="details">
-	<table class="table " id="detailstable" >
-		<tr><th>Group:</th><td title="{$release.group_name}"><a title="Browse {$release.group_name}" href="{$smarty.const.WWW_TOP}/browse?g={$release.group_name}">{$release.group_name|replace:"alt.binaries":"a.b"}</a></td></tr>
-		<tr><th>Category:</th><td><a title="Browse by {$release.category_name}" href="{$smarty.const.WWW_TOP}/browse?t={$release.categoryid}">{$release.category_name}</a></td></tr>
-		<tr><th>Size:</th><td>{$release.size|fsize_format:"MB"}{if $release.completion > 0}&nbsp;({if $release.completion < 100}<span class="warning">{$release.completion}%</span>{else}{$release.completion}%{/if}){/if}</td></tr>
-		<tr><th>Grabs:</th><td>{$release.grabs} time{if $release.grabs==1}{else}s{/if}</td></tr>
-		{if $release.name != $release.searchname}
-			<tr><th>Original Name:</th><td title="{$release.name}">{$release.name}</td></tr>
-		{/if}
-		<tr><th>Poster:</th><td>{$release.fromname|escape:"htmlall"}</td></tr>
-		{if $predb}
-			<tr><th>Pre:</th><td>{$predb.ctime|date_format:"%b %e, %Y %T"} ({$predb.ctime|daysago})</td></tr>
-			{if $predb.nuketype != '' && $predb.nukereason != '' && $predb.nuketime != 0}
-				<tr><th>Nuked:</th><td>{$predb.nuketime|date_format:"%b %e, %Y %T"} ({$predb.nuketime|daysago})</td></tr>
-			{/if}
-		{/if}
-		{if $prehash|@count > 0}
-			<tr>
-				<th>Prehash:</th>
-				<td style="padding:0;">
-					<table style="width:100%;">
-						<tr>
-							<th>Title</th>
-							<th class="mid">Date</th>
-							<th class="mid">Source</th>
-							<th class="mid">Size</th>
-							<th class="mid">Files</th>
-							<th class="mid">Nukereason</th>
-						</tr>
-						{foreach from=$prehash item=pd}
-							<tr>
-								<td>{$pd.title}</td>
-								<td class="mid">{$pd.predate|date_format}</td>
-								<td class="mid">{$pd.source}</td>
-								{if isset($pd.size)}{if $pd.size > 0}
-									<td class="right">{$pd.size}</td>{/if}{/if}
-								{if isset($pd.files)}{if $pd.files != ''}
-									<td class="right">{$pd.files}</td>{/if}{/if}
-								{if isset($pd.nuked) && $pd.nuked > 0 && $pd.nukereason !=''}
-									<td class="right">{$pd.nukereason}</td>{/if}
-							</tr>
-						{/foreach}
-					</table>
-				</td>
-			</tr>
-		{/if}
-		<tr><th>Posted:</th><td title="{$release.postdate}">{$release.postdate|date_format:"%b %e, %Y %T"} ({$release.postdate|daysago})</td></tr>
-		<tr><th>Added:</th><td title="{$release.adddate}">{$release.adddate|date_format:"%b %e, %Y %T"} ({$release.adddate|daysago})</td></tr>
-		<tr id="guid{$release.guid}"><th>Download:</th><td>
-				<div class="icon icon_nzb"><a title="Download Nzb" href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"htmlall"}">&nbsp;</a></div>
-				<div class="icon icon_cart" title="{$themevars.cart_name_add}"></div>
-				{if $sabintegrated}<div class="icon icon_sab" title="Send to my Queue"></div>{/if}
-			</td></tr>
-		<tr>
-			<th>Similar:</th>
-			<td>
-				<a title="Search for similar Nzbs" href="{$smarty.const.WWW_TOP}/search/{$searchname|escape:"url"}">Search for similar</a><br/>
-			</td>
-		</tr>
-
-	</table>
-</div>
-{if $reVideo.releaseid|@count > 0 || $reAudio|@count > 0}
-	<div class="tab-pane" id="mediainfo">
-		<table style="width:100%;" class="table table-bordered table-hover">
-			<tr>
-				<th width="15%"></th>
-				<th>Property</th>
-				<th class="right">Value</th>
-			</tr>
-			{if $reVideo.containerformat != ""}
-				<tr>
-					<td style="width:15%;"><strong>Overall</strong></td>
-					<td>Container Format</td>
-					<td class="right">{$reVideo.containerformat}</td>
-				</tr>
-			{/if}
-			{if $reVideo.overallbitrate != ""}
-				<tr>
-					<td></td>
-					<td>Bitrate</td>
-					<td class="right">{$reVideo.overallbitrate}</td>
-				</tr>
-			{/if}
-			{if $reVideo.videoduration != ""}
-				<tr>
-					<td><strong>Video</strong></td>
-					<td>Duration</td>
-					<td class="right">{$reVideo.videoduration}</td>
-				</tr>
-			{/if}
-			{if $reVideo.videoformat != ""}
-				<tr>
-					<td></td>
-					<td>Format</td>
-					<td class="right">{$reVideo.videoformat}</td>
-				</tr>
-			{/if}
-			{if $reVideo.videocodec != ""}
-				<tr>
-					<td></td>
-					<td>Codec</td>
-					<td class="right">{$reVideo.videocodec}</td>
-				</tr>
-			{/if}
-			{if $reVideo.videowidth != "" && $reVideo.videoheight != ""}
-				<tr>
-					<td></td>
-					<td>Width x Height</td>
-					<td class="right">{$reVideo.videowidth}x{$reVideo.videoheight}</td>
-				</tr>
-			{/if}
-			{if $reVideo.videoaspect != ""}
-				<tr>
-					<td></td>
-					<td>Aspect</td>
-					<td class="right">{$reVideo.videoaspect}</td>
-				</tr>
-			{/if}
-			{if $reVideo.videoframerate != ""}
-				<tr>
-					<td></td>
-					<td>Framerate</td>
-					<td class="right">{$reVideo.videoframerate} fps</td>
-				</tr>
-			{/if}
-			{if $reVideo.videolibrary != ""}
-				<tr>
-					<td></td>
-					<td>Library</td>
-					<td class="right">{$reVideo.videolibrary}</td>
-				</tr>
-			{/if}
-			{foreach from=$reAudio item=audio}
-				<tr>
-					<td><strong>Audio {$audio.audioid}</strong></td>
-					<td>Format</td>
-					<td class="right">{$audio.audioformat}</td>
-				</tr>
-				{if $audio.audiolanguage != ""}
-					<tr>
-						<td></td>
-						<td>Language</td>
-						<td class="right">{$audio.audiolanguage}</td>
-					</tr>
-				{/if}
-				{if $audio.audiotitle != ""}
-					<tr>
-						<td></td>
-						<td>Title</td>
-						<td class="right">{$audio.audiotitle}</td>
-					</tr>
-				{/if}
-				{if $audio.audiomode != ""}
-					<tr>
-						<td></td>
-						<td>Mode</td>
-						<td class="right">{$audio.audiomode}</td>
-					</tr>
-				{/if}
-				{if $audio.audiobitratemode != ""}
-					<tr>
-						<td></td>
-						<td>Bitrate Mode</td>
-						<td class="right">{$audio.audiobitratemode}</td>
-					</tr>
-				{/if}
-				{if $audio.audiobitrate != ""}
-					<tr>
-						<td></td>
-						<td>Bitrate</td>
-						<td class="right">{$audio.audiobitrate}</td>
-					</tr>
-				{/if}
-				{if $audio.audiochannels != ""}
-					<tr>
-						<td></td>
-						<td>Channels</td>
-						<td class="right">{$audio.audiochannels}</td>
-					</tr>
-				{/if}
-				{if $audio.audiosamplerate != ""}
-					<tr>
-						<td></td>
-						<td>Sample Rate</td>
-						<td class="right">{$audio.audiosamplerate}</td>
-					</tr>
-				{/if}
-				{if $audio.audiolibrary != ""}
-					<tr>
-						<td></td>
-						<td>Library</td>
-						<td class="right">{$audio.audiolibrary}</td>
-					</tr>
-				{/if}
-			{/foreach}
-			{if $reSubs.subs != ""}
-				<tr>
-					<td><strong>Subtitles</strong></td>
-					<td>Languages</td>
-					<td class="right">{$reSubs.subs|escape:"htmlall"}</td>
-				</tr>
-			{/if}
-		</table>
-
-	</div>
-{/if}
-{if $nfo.id|@count > 0}
-	<div class="tab-pane" id="viewnfo">
-	</div>
-{/if}
-<div class="tab-pane" id="fileinfo">
-	<table class="table table-bordered" id="detailstable" >
-		{if $site->checkpasswordedrar > 0}
-			<tr><th>Password:</th>
-				<td>
-					{if $release.passwordstatus == 0}None{elseif $release.passwordstatus == 2}Passworded Rar Archive{elseif $release.passwordstatus == 1}Contains Cab/Ace/Rar Inside Archive{else}Unknown{/if}
-				</td>
-			</tr>
-		{/if}
-		{if $releasefiles|@count > 0}
-			<tr><th>Rar Contains:</th>
-				<td style="padding:0px;">
-					<table style="width:100%;" class="table table-striped">
-						<tr>
-							<th>Filename</th>
-							<th class="mid">Password</th>
-							<th class="mid">Size</th>
-							<th class="mid">Date</th>
-						</tr>
-						{foreach from=$releasefiles item=rf}
-							<tr>
-								<td>{$rf.name}</td>
-								<td class="mid">{if $rf.passworded != 1}No{else}Yes{/if}</td>
-								<td class="right">{$rf.size|fsize_format:"MB"}</td>
-								<td title="{$rf.createddate}" class="right" >{$rf.createddate|date_format}</td>
-							</tr>
-						{/foreach}
-					</table>
-				</td>
-			</tr>
-		{/if}
-	</table>
-</div>
-<div class="tab-pane" id="nzbcontents"></div>
-{if $release.haspreview == 1 && $userdata.canpreview == 1}
-	<div class="tab-pane" id="preview">
-		<img class="img-rounded" width="770" src="{$smarty.const.WWW_TOP}/covers/preview/{$release.guid}_thumb.jpg" alt="{$release.searchname|escape:"htmlall"} screenshot" />
-	</div>
-{/if}
-{if $release.haspreview == 2 && $userdata.canpreview == 1}
-	<div class="tab-pane" id="preview">
-		<a href="#" name="audio{$release.guid}" title="Listen to {$release.searchname|escape:"htmlall"}" class="audioprev btn" rel="audio">Listen</a><audio id="audprev{$release.guid}" src="{$smarty.const.WWW_TOP}/covers/audio/{$release.guid}.mp3" preload="none"></audio>
-	</div>
-{/if}
-{if $release.jpgstatus == 1 && $userdata.canpreview == 1}
-	<div class="tab-pane" id="sample">
-		<img class="img-rounded" width="770" src="{$smarty.const.WWW_TOP}/covers/sample/{$release.guid}_thumb.jpg"
-			 alt="{$release.searchname|escape:"htmlall"} screenshot"/>
-	</div>
-{/if}
-{if $release.videostatus == 1 && $userdata.canpreview == 1}
-	<div class="tab-pane" id="video">
-		<video width="770" controls>
-			<source src="{$smarty.const.WWW_TOP}/covers/video/{$release.guid}.ogg" type="video/ogg">
-			Your browser does not support the video tag.
-		</video>
-	</div>
-{/if}
-{if $release.audiostatus == 1 && $userdata.canpreview == 1}
-	<div class="tab-pane" id="audio">
-		<audio controls>
-			<source src="{$smarty.const.WWW_TOP}/covers/audio/{$release.guid}.ogg" type="audio/ogg">
-			Your browser does not support the audio element.
-		</audio>
-	</div>
-{/if}
-{if $isadmin}
-	<div class="tab-pane" id="admin">
-
-		<table class="table table-bordered" id="detailstable" >
-			<tr><th>Actions:</th>
-				<td><div class="btn-group">
-						<a class="btn btn-mini btn-inverse" href="{$smarty.const.WWW_TOP}/admin/release-edit.php?id={$release.id}&amp;from={$smarty.server.REQUEST_URI}" title="Edit Release"><i class="icon-edit icon-white"></i> Edit</a>
-						<a class="btn btn-mini btn-inverse" href="{$smarty.const.WWW_TOP}/admin/release-delete.php?id={$release.id}&amp;from={$smarty.server.HTTP_REFERER}" title="Delete Release"><i class="icon-trash icon-white"></i> Delete</a>
-					</div></td>
-			</tr>
-			<tr><th>Release Info:</th>
-				<td>
-					Regex Id (<a href="{$smarty.const.WWW_TOP}/admin/regex-list.php#{$release.regexid}">{$release.regexid}</a>) <br/>
-					{if $release.reqid != ""}
-						Request Id ({$release.reqid})
-					{/if}
-				</td>
-			</tr>
-		</table>
-	</div>
-{/if}
-<div class="tab-pane" id="comments">
-	<h2><i class="icon-comment"></i> Comments</h2>
-	{if $comments|@count > 0}
-		<table style="margin-bottom:20px;" class="table table-striped Sortable">
-			<tr class="{cycle values=",alt"}">
-				<th width="80">User</th>
-				<th>Comment</th>
-			</tr>
-			{foreach from=$comments|@array_reverse:true item=comment}
-				<tr>
-					<td class="less" title="{$comment.createddate}">
-						{if $comment.role == -1}<i class="icon-globe" title="Syndicated User"></i>
-							{$comment.username}{if $isadmin} @<a href="{$smarty.const.WWW_TOP}/admin/spotnab-edit.php?id={$comment.sourceid}&amp;from={$smarty.server.REQUEST_URI}">{$comment.rolename}</a>{/if}
-						{elseif $comment.role == 2}<i class="icon-font" title="{$comment.rolename}"></i>
-							<strong><a title="View {$comment.username}'s profile" href="{$smarty.const.WWW_TOP}/profile?name={$comment.username}">{$comment.username}</a></strong>
-						{elseif $comment.role == 4}<i class="icon-certificate" title="{$comment.rolename}"></i>
-							<a title="View {$comment.username}'s profile" href="{$smarty.const.WWW_TOP}/profile?name={$comment.username}">{$comment.username}</a>
-						{else}<i class="icon-user" title="{$comment.username}"></i>
-							<a title="View {$comment.username}'s profile" href="{$smarty.const.WWW_TOP}/profile?name={$comment.username}">{$comment.username}</a>
-						{/if}
-						<br/>{$comment.createddate|daysago}
-					</td>
-					<td>{$comment.text|escape:"htmlall"|nl2br}</td>
-				</tr>
-			{/foreach}
-		</table>
-	{/if}
-	<form action="" method="post">
-		<label for="txtAddComment">Add Comment:</label><br/>
-		<textarea id="txtAddComment" name="txtAddComment" rows="6" cols="60"></textarea>
-		<br/>
-		<input class="btn" type="submit" value="Submit"/>
-	</form>
-	</div>
-</div
-
-</div>
-<script>
-	// nzbcontents loader
-	$(document).ready(function() {
-		$('#nzbcontents').load('{$smarty.const.WWW_TOP}/filelist/{$release.guid}&modal', function() {
-			$('.tabs').tab('show'); //reinitialize tabs
-		});
-
-		$('.tabs').bind('change', function(e) {
-			var pattern=/#.+/gi //set a regex pattern (all the things after "#").
-			var contentID = e.target.toString().match(pattern)[0]; //find pattern
-
-			$(contentID).load('/'+contentID.replace('#',''), function(){
-				$('.tabs').tabs(); //reinitialize tabs
-			});
-		});
-	});
-</script>
-
-{if $nfo.id|@count > 0}
-<script>
-	// nfo loader
-	$(document).ready(function() {
-		$('#viewnfo').load('{$smarty.const.WWW_TOP}/nfo/{$release.guid}&modal', function() {
-			$('.tabs').tab('show'); //reinitialize tabs
-		});
-
-		$('.tabs').bind('change', function(e) {
-			var pattern=/#.+/gi //set a regex pattern (all the things after "#").
-			var contentID = e.target.toString().match(pattern)[0]; //find pattern
-
-			$(contentID).load('/'+contentID.replace('#',''), function(){
-				$('.tabs').tabs(); //reinitialize tabs
-			});
-		});
-	});
-</script>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewprelist.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewprelist.tpl
deleted file mode 100644
index cc17189fa..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewprelist.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<h1>{$page->title}</h1>
-
-<div style="float:right;margin-bottom:5px;">
-
-	<form name="predbsearch" action="" method="get">
-		<label for="title">Search:</label>
-		&nbsp;&nbsp;<input id="q" type="text" name="q" value="{$query}" size="25" />
-		&nbsp;&nbsp;
-		<input type="submit" value="Go" />
-	</form>
-</div>
-
-{$site->adbrowse}	
-
-{if $results|@count > 0}
-
-{$pager}
-
-<table style="width:100%;" class="data highlight icons" id="browsetable">
-	<tr>
-		<th width="125" class="mid">Date</th>
-		<th class="left">Directory</th>
-		<th class="mid">Category</th>
-		<th class="mid">FS/FC</th>
-	</tr>
-
-	{foreach $results as $pre}
-		<tr class="{cycle values=",alt"}">
-			<td class="left">{$pre.ctime|date_format:"%b %e, %Y %T"}</td>
-			<td class="left">
-				{if $pre.guid != ''}
-				<a title="View details" href="{$smarty.const.WWW_TOP}/details/{$pre.guid}/{$pre.dirname}">{$pre.dirname|wordwrap:80:"\n":true}</a>
-				{else}
-				{$pre.dirname|wordwrap:80:"\n":true}
-				{if $pre.nuketype != '' && $pre.nukereason != ''}</br style="font-size: 12px"><sub>({$pre.nuketype}: {$pre.nukereason})</sub>{/if}
-				{/if}
-			</td>
-			<td class="mid"><a href="{$smarty.const.WWW_TOP}/predb?c={$pre.category}">{$pre.category}</a></td>
-			<td class="mid">{if $pre.filesize > 0}{$pre.filesize}MB{if $pre.filecount > 0}/{$pre.filecount}F{/if}{else}--{/if}</td>
-		</tr>
-	{/foreach}
-</table>
-
-</br>
-
-{$pager}
-
-{else}
-<h2>No results.</h2>
-{/if}
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewqueue.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewqueue.tpl
deleted file mode 100644
index 70a90e3b0..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewqueue.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<h1>{$page->title}</h1>
-{if $error == ''}
-	{if $page->site->sabintegrationtype > 0 || $user.queuetype == 2}
-		<p style="text-align:center;">
-			The following queue is pulled from
-			<a href="{if $user.queuetype == 2}{$user.nzbgeturl}{else}{$sabserver|escape:"htmlall"}{/if}">
-				{if $user.queuetype == 2}{$user.nzbgeturl}{else}{$sabserver|escape:"htmlall"}{/if}
-			</a>.
-			<br />
-			{if $page->site->sabintegrationtype == 2 || $user.queuetype == 2}Edit your queue settings in <a href="{$smarty.const.WWW_TOP}/profileedit">your profile</a>.{/if}
-		</p>
-		<div class="sab_queue"></div>
-		{literal}
-			<script type="text/javascript">
-				function getQueue()
-				{
-					var rand_no = Math.random();
-					$.ajax({
-						url: "sabqueuedata?id=" + rand_no,
-						cache: false,
-						success: function(html)
-						{
-							$(".sab_queue").html(html);
-							setTimeout("getQueue()", 2500);
-						},
-						error: function ()
-						{
-							$(".sab_queue").html("<p style='text-align:center;'>Could not contact your queue. <a href=\"javascript:location.reload(true)\">Refresh</a></p>");
-						},
-						timeout:5000
-					});
-				}
-			</script>
-		{/literal}
-		<body onLoad="getQueue();">
-	{else}
-		<p style="text-align:center;">The {$queueType} queue has been disabled by the administrator.</p>
-	{/if}
-{else}
-	<p style="text-align:center;">{$error}</p>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewseries.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewseries.tpl
deleted file mode 100644
index 106801cf6..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewseries.tpl
+++ /dev/null
@@ -1,176 +0,0 @@
-{if $nodata != ""}
-	<h1>View TV Series</h1>
-	<p>{$nodata}</p>
-{else}
-	<h1>
-		{foreach $rage as $r}
-			{if $isadmin}
-				<a title="Edit rage data"
-				   href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">{$r.releasetitle} </a>
-			{else}
-				{$r.releasetitle}
-			{/if}
-			{if !$r@last} / {/if}
-		{/foreach}
-
-		{if $catname != ''} in {$catname|escape:"htmlall"}{/if}
-
-	</h1>
-	<div class="tvseriesheading">
-		{if $rage[0].imgdata != ""}<img class="shadow" alt="{$rage[0].releasetitle} Logo"
-										src="{$smarty.const.WWW_TOP}/getimage?type=tvrage&amp;id={$rage[0].id}" />{/if}
-		<p>
-			{if $seriesgenre != ''}<b>{$seriesgenre}</b><br/>{/if}
-			<span class="descinitial">{$seriesdescription|escape:"htmlall"|nl2br|magicurl|truncate:"1000":" </span><a class=\"descmore\" href=\"#\">more...</a>"}
-				{if $seriesdescription|strlen > 1000}<span
-						class="descfull">{$seriesdescription|escape:"htmlall"|nl2br|magicurl}</span>{else}</span>{/if}
-		</p>
-
-	</div>
-	<div class="btn-group">
-		<a class="btn btn-small" title="Manage your shows" href="{$smarty.const.WWW_TOP}/myshows">My Shows</a>
-		{if $myshows.id != ''}
-			<a class="btn btn-small" href="{$smarty.const.WWW_TOP}/myshows/delete/{$rage[0].rageid}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows" rel="remove" name="series{$rage[0].rageid}" title="Remove from My Shows"><i class="icon-minus-sign"></i></a>
-			<a class="btn btn-small" href="{$smarty.const.WWW_TOP}/myshows/edit/{$rage[0].rageid}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows" rel="edit" name="series{$rage[0].rageid}" title="Edit Categories for this show"><i class="icon-edit"></i></a>
-		{else}
-			<a class="btn btn-small" href="{$smarty.const.WWW_TOP}/myshows/add/{$rage[0].rageid}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows" rel="add" name="series{$rage[0].rageid}" title="Add to My Shows"><i class="icon-plus-sign"></i></a>
-		{/if}
-	</div>
- <form id="nzb_multi_operations_form" action="get">
-	<div class="btn-group">
-		{if $rage|@count == 1 && $isadmin}<a class="btn btn-mini btn-inverse" href="{$smarty.const.WWW_TOP}/admin/rage-edit.php?id={$r.id}&amp;action=update&amp;from={$smarty.server.REQUEST_URI|escape:"url"}">Update From Tv Rage</a> | {/if}
-		<a class="btn btn-mini" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$rage[0].rageid}" title="View in TvRage">View in Tv Rage</a> |
-		<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/rss?rage={$rage[0].rageid}{if $category != ''}&amp;t={$category}{/if}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Series RSS <i class="fa-icon-rss"></i></a>
-	</div>
-	<form id="nzb_multi_operations_form" action="get">
-
-		<br clear="all"/>
-
-		<a id="latest"></a>
-
-		<ul class="tabs" style="float:left;margin:0;">
-			{foreach $seasons as $seasonnum => $season name="seas"}
-				<li {if $smarty.foreach.seas.first}class="active"{/if}><h2><a id="seas_{$seasonnum}"
-																			  title="View Season {$seasonnum}"
-																			  href="#{$seasonnum}">{$seasonnum}</a></h2>
-				</li>
-			{/foreach}
-		</ul>
-
-		<div class="nzb_multi_operations">
-			<small>With selected:</small>
-			<div class="btn-group">
-				<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-				<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-				{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-				{if $isadmin}
-					<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-					<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-				{/if}
-			</div>
-		</div>
-
-		{foreach $seasons as $seasonnum => $season name=tv}
-			<table style="width:100%; {if !$smarty.foreach.tv.first}display:none;{/if}"
-				   class="tb_{$seasonnum} data highlight icons" id="browsetable">
-				<tr>
-					<td style="padding-top:15px;" colspan="10"><h2>Season {$seasonnum}</h2></td>
-				</tr>
-				<tr>
-					<th>Ep</th>
-					<th>Name</th>
-					<th><input id="chkSelectAll{$seasonnum}" type="checkbox" name="{$seasonnum}"
-							   class="nzb_check_all_season"/><label for="chkSelectAll{$seasonnum}"
-																	style="display:none;">Select All</label></th>
-					<th>Category</th>
-					<th style="text-align:center;">Posted</th>
-					<th>Size</th>
-					<th>Files</th>
-					<th>Stats</th>
-					<th></th>
-				</tr>
-				{foreach $season as $episodes}
-					{foreach $episodes as $result}
-						<tr class="{cycle values=",alt"}" id="guid{$result.guid}">
-							{if $result@total>1 && $result@index == 0}
-								<td width="20" rowspan="{$result@total}" class="static">{$episodes@key}</td>
-							{elseif $result@total == 1}
-								<td width="20" class="static">{$episodes@key}</td>
-							{/if}
-							<td>
-								<a title="View details"
-								   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
-
-								<div class="resextra">
-									<div class="btns">
-										{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-																 title="View Nfo" class="modal_nfo rndbtn" rel="nfo">
-												Nfo</a>{/if}
-										{if $result.haspreview == 1 && $userdata.canpreview == 1}<a
-											href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-											name="name{$result.guid}" title="View Screenshot" class="modal_prev rndbtn"
-											rel="preview">Preview</a>{/if}
-										{if $result.tvairdate != ""}<span class="rndbtn"
-																		  title="{$result.tvtitle} Aired on {$result.tvairdate|date_format}">
-											Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>{/if}
-										{if $result.reID > 0}<span class="mediainfo rndbtn" title="{$result.guid}">
-												Media</span>{/if}
-									</div>
-
-									{if $isadmin}
-										<div class="admin">
-											<a class="rndbtn"
-											   href="{$smarty.const.WWW_TOP}/admin/release-edit.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-											   title="Edit Release">Edit</a> <a class="rndbtn confirm_action"
-																				href="{$smarty.const.WWW_TOP}/admin/release-delete.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-																				title="Delete Release">Del</a>
-										</div>
-									{/if}
-								</div>
-							</td>
-							<td class="check"><input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check"
-													 name="{$seasonnum}" value="{$result.guid}"/></td>
-							<td class="less"><a title="This series in {$result.category_name}"
-												href="{$smarty.const.WWW_TOP}/series/{$result.rageid}?t={$result.categoryid}">{$result.category_name}</a>
-							</td>
-							<td class="less mid" width="40" title="{$result.postdate}">{$result.postdate|timeago}</td>
-							<td width="40"
-								class="less right">{$result.size|fsize_format:"MB"}{if $result.completion > 0}
-									<br/>
-									{if $result.completion < 100}<span class="warning">{$result.completion}
-										%</span>{else}{$result.completion}%{/if}{/if}</td>
-							<td class="less mid">
-								<a title="View file list"
-								   href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
-								{if $result.rarinnerfilecount > 0}
-									<div class="rarfilelist">
-										<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/magnifier.png"
-											 alt="{$result.guid}" class="tooltip"/>
-									</div>
-								{/if}
-							</td>
-							<td width="40" class="less nowrap"><a
-										title="View comments for {$result.searchname|escape:"htmlall"}"
-										href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments}
-									cmt{if $result.comments != 1}s{/if}</a><br/>{$result.grabs}
-								grab{if $result.grabs != 1}s{/if}</td>
-							<td class="icons">
-								<div class="icon icon_nzb"><a title="Download Nzb"
-															  href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}">
-										&nbsp;</a></div>
-								<div class="icon icon_cart" title="Add to Cart"></div>
-								{if $sabintegrated}
-									<div class="icon icon_sab" title="Send to my Queue"></div>
-								{/if}
-								{if $weHasVortex}
-									<div class="icon icon_nzbvortex" title="Send to NZBVortex"></div>
-								{/if}
-							</td>
-						</tr>
-					{/foreach}
-				{/foreach}
-			</table>
-		{/foreach}
-
-	</form>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewserieslist.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewserieslist.tpl
deleted file mode 100644
index 56357d103..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewserieslist.tpl
+++ /dev/null
@@ -1,83 +0,0 @@
-<h1>{$page->title}</h1>
-
-<div class="pagination pagination-mini">
-	<ul style="padding-bottom:1.5px;">
-		<li{if $seriesletter == '0-9'} class="active"{/if}>
-			<a href="{$smarty.const.WWW_TOP}/series/0-9">0-9</a>
-		</li>
-		{foreach $seriesrange as $range}
-			<li{if $range == $seriesletter} class="active"{/if}>
-				<a href="{$smarty.const.WWW_TOP}/series/{$range}">{$range}</a>
-			</li>
-		{/foreach}
-	</ul>
-
-	<ul class="nav nav-pills">
-		<li><a href="{$smarty.const.WWW_TOP}/myshows" title="List my watched shows">My Shows</a></li>
-		<li><a href="{$smarty.const.WWW_TOP}/myshows/browse" title="browse releases that match your shows">Browse My Shows</a></li>
-	</ul>
-</div>
-
-<div style="float:right;">
-	<form name="ragesearch" action="" method="get">
-		&nbsp;&nbsp;<input id="title" type="text" name="title" value="{$ragename}" size="25" />
-		&nbsp;&nbsp;
-		<button type="submit" class="btn"><i class="icon-search"></i></button>
-
-
-	</form>
-
-</div>
-
-{if $site->adbrowse != ""}
-	<table class="adblock" cellspacing="0" cellpadding="0"><tr><td>{$site->adbrowse}</td></tr></table><br />
-{/if}
-
-{if $serieslist|@count > 0}
-
-	<table style="width:100%;" class="table table-bordered table-striped table-hover data highlight icons" id="browsetable">
-		{foreach $serieslist as $sletter => $series}
-			<tr>
-				<td style="padding-top:15px;" colspan="10"><a href="#top" class="top_link">Top</a><h2>{$sletter}...</h2></td>
-			</tr>
-			<tr>
-				<th width="35%">Name</th>
-				<th>Country</th>
-				<th width="35%">Genre</th>
-				<th class="mid">Option</th>
-				<th class="mid">View</th>
-			</tr>
-			{foreach $series as $s}
-				<tr class="{cycle values=",alt"}">
-					<td><a class="title" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.rageid}">{$s.releasetitle|escape:"htmlall"}</a>{if $s.prevdate != ''}<br />Last: {$s.previnfo|escape:"htmlall"} aired {$s.prevdate|date_format}{/if}</td>
-					<td>{$s.country|escape:"htmlall"}</td>
-					<td>{$s.genre|escape:"htmlall"|replace:'|':', '}</td>
-					<td class="mid"><div class="btn-group">
-							{if $s.userseriesID != ''}
-
-								<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/myshows/delete/{$s.rageid}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows" rel="remove" name="series{$s.rageid}" title="Remove from My Shows"><i class="icon-minus-sign"></i></a>
-								<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/myshows/edit/{$s.rageid}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows" rel="edit" name="series{$s.rageid}" title="Edit"><i class="icon-edit"></i></a>
-
-							{else}
-								<a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/myshows/add/{$s.rageid}?from={$smarty.server.REQUEST_URI|escape:"url"}" class="myshows" rel="add" name="series{$s.rageid}" title="Add to My Shows"><i class="icon-plus-sign"></i></a>
-							{/if}
-						</div></td>
-					<td class="mid">
-						<div class="btn-group">
-							<a class="btn btn-mini" title="View series" href="{$smarty.const.WWW_TOP}/series/{$s.rageid}">Series</a>
-							{if $s.rageid > 0}<a class="btn btn-mini" title="View at TVRage" target="_blank" href="{$site->dereferrer_link}http://www.tvrage.com/shows/id-{$s.rageid}">TVRage</a>
-							<a class="btn btn-mini" title="RSS Feed for {$s.releasetitle|escape:"htmlall"}" href="{$smarty.const.WWW_TOP}/rss?rage={$s.rageid}&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}"><i class="icon-rss"></i></a>{/if}
-
-						</div>
-					</td>
-				</tr>
-			{/foreach}
-		{/foreach}
-	</table>
-
-{else}
-
-
-
-	<h2>No results</h2>
-{/if}
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewxxx.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewxxx.tpl
deleted file mode 100644
index cc39e680e..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/viewxxx.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{if not $modal}
-	<h1>{$page->title}</h1>
-	<h3>For
-		<a href="{$smarty.const.WWW_TOP}/details/{$rel.guid}/{$rel.searchname|escape:'htmlall'}">{$rel.searchname|escape:'htmlall'}</a>
-	</h3>
-{/if}
-
-<div id="xxxbackdrop"><img
-			src="{$smarty.const.WWW_TOP}/covers/xxx/{if $movie.backdrop == 1}{$movie.id}{else}no{/if}-backdrop.jpg"
-			alt=""></div>
-
-<div id="xxxinfo">
-
-	<h1>{$movie.title|ss}</h1>
-
-	<h3>{if $movie.cover == 1}<img src="{$smarty.const.WWW_TOP}/covers/xxx/{$movie.id}-cover.jpg" class="cover"
-								   alt="{$movie.title|ss}" align="left">{/if}
-		{if $movie.tagline != ''}<b>{$movie.tagline|ss}</b>{/if}</h3>
-
-	{if $movie.plot != ''}
-		<h3>{$movie.plot|ss}</h3>
-	{/if}
-
-	<h4>
-		{if $movie.director != ''}Director: {$movie.director}<br>{/if}
-		{if $movie.genre != ''}Genre: {$movie.genre|ss}{/if}
-	</h4>
-
-	{if $movie.actors != ''}<h4>Starring:<br>{$movie.actors}</h4>{/if}
-
-</div>
\ No newline at end of file
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/xxx.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/xxx.tpl
deleted file mode 100644
index 58117bbad..000000000
--- a/lib/copy_this/www/templates/nntmux/views/frontend/xxx.tpl
+++ /dev/null
@@ -1,363 +0,0 @@
-{if {$site->adbrowse} != ''}
-	<div class="container" style="width:500px;">
-		<fieldset class="adbanner div-center">
-			<legend class="adbanner">Advertisement</legend>
-			{$site->adbrowse}
-		</fieldset>
-	</div>
-	<br>
-{/if}
-<h1>Browse {$catname}</h1>
-<form name="browseby" action="xxx">
-	<table class="rndbtn" border="0" cellpadding="2" cellspacing="0">
-		<tr>
-			<th class="left"><label for="xxxtitle">Title</label></th>
-			<th class="left"><label for="xxxactors">Actor</label></th>
-			<th class="left"><label for="xxxdirector">Director</label></th>
-			<th class="left"><label for="genre">Genre</label></th>
-			<th class="left"><label for="category">Category</label></th>
-			<th></th>
-		</tr>
-		<tr>
-			<td><input id="xxxtitle" type="text" name="title" value="{$title}" size="15"/></td>
-			<td><input id="xxxactors" type="text" name="actors" value="{$actors}" size="15"/></td>
-			<td><input id="xxxdirector" type="text" name="director" value="{$director}" size="15"/></td>
-			<td>
-				<select id="genre" name="genre">
-					<option class="grouping" value=""></option>
-					{foreach from=$genres item=gen}
-						<option {if $gen==$genre}selected="selected"{/if} value="{$gen}">{$gen}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td>
-				<select id="category" name="t">
-					<option class="grouping" value="6000"></option>
-					{foreach from=$catlist item=ct}
-						<option {if $ct.id==$category}selected="selected"{/if} value="{$ct.id}">{$ct.title}</option>
-					{/foreach}
-				</select>
-			</td>
-			<td><input type="submit" value="Go"/></td>
-		</tr>
-	</table>
-</form>
-<p></p>
-{if $results|@count > 0}
-
-	<form id="nzb_multi_operations_form" action="get">
-
-	<table width="100%">
-		<tr>
-			<td>{$pager}</td>
-			<td style="text-align:right">
-				<div class="nzb_multi_operations">
-					<small>With selected:</small>
-					<div class="btn-group">
-						<button type="button" class="btn btn-mini nzb_multi_operations_download"><i class="icon-download"></i> Download NZBs</button>
-						<button type="button" class="btn btn-mini nzb_multi_operations_cart"><i class="icon-shopping-cart"></i> Add to cart</button>
-						{if $sabintegrated}<button type="button" class="btn btn-mini nzb_multi_operations_sab"><i class="icon-download-alt"></i> Send to my Queue</button>{/if}
-						{if $isadmin}
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_edit"><i class="icon-edit icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_delete"><i class="icon-trash icon-white"></i></button>
-							<button type="button" class="btn btn-mini btn-inverse nzb_multi_operations_rebuild"><i class="icon-repeat icon-white"></i></button>
-						{/if}
-					</div>
-					<div class="btn-group">
-						<span class="btn btn-mini active"><i class="icon-picture"></i></span><a class="btn btn-mini" href="{$smarty.const.WWW_TOP}/browse?t={$category}" title="List"><i class="icon-list"></i></a>
-					</div>
-				</div>
-			</td>
-		</tr>
-	</table>
-
-	<table class="table table-striped table-condensed data" id="coverstable">
-	<thead>
-	<tr>
-		<th><input type="checkbox" class="nzb_check_all"></th>
-		<th>title<a title="Sort Descending" href="{$orderbytitle_desc}"><i class="icon-chevron-down icon-black"></i></a><a
-					title="Sort Ascending" href="{$orderbytitle_asc}"><i class="icon-chevron-up icon-black"></i></a>
-		</th>
-		<th>year<a title="Sort Descending" href="{$orderbyyear_desc}"><i class="icon-chevron-down icon-black"></i></a><a
-					title="Sort Ascending" href="{$orderbyyear_asc}"><i class="icon-chevron-up icon-black"></i></a></th>
-		<th>rating<a title="Sort Descending" href="{$orderbyrating_desc}"><i
-						class="icon-chevron-down icon-black"></i></a><a
-					title="Sort Ascending" href="{$orderbyrating_asc}"><i class="icon-chevron-up icon-black"></i></a>
-		</th>
-	</tr>
-	</thead>
-	<tbody>
-	{foreach from=$results item=result}
-		<tr>
-		<td style="vertical-align:top;text-align:center;width:150px;padding:10px;">
-			<div class="movcover">
-				<a
-						target="_blank"
-						href="{$smarty.const.WWW_TOP}/xxx/?id={$result.id}"
-						name="name{$result.id}"
-						title="View XXX info"
-						class="modal_xxx thumbnail" rel="viewxxx"
-						><img
-							class="shadow" style="margin: 3px 0;"
-							src="{$smarty.const.WWW_TOP}/covers/xxx/{if $result.cover == 1}{$result.id}-cover.jpg{else}no-cover.jpg{/if}"
-							width="130" border="0" alt="{$result.title|escape:"htmlall"}"
-							></a>
-
-				<div class="relextra" style="margin-top:5px;">
-					{if $result.classused == "ade"}
-						<a
-								target="_blank"
-								href="{$site->dereferrer_link}{$result.directurl}"
-								name="viewade{$result.title}"
-								title="View AdultdvdEmpire page"
-								><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/ade.png"></a>
-					{else}
-						<a
-								target="_blank"
-								href="{$site->dereferrer_link}http://www.adultdvdempire.com/dvd/search?q={$result.title}"
-								name="viewade{$result.title}"
-								title="Search AdultdvdEmpire page"
-								><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/ade.png"></a>
-					{/if}
-					{if $result.classused == "hm"}
-						<a
-								target="_blank"
-								href="{$site->dereferrer_link}{$result.directurl}"
-								name="viewhm{$result.title}"
-								title="View Hot Movies page"
-								><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/hotmovies.png"></a>
-					{else}
-						<a
-								target="_blank"
-								href="{$site->dereferrer_link}http://www.hotmovies.com/search.php?words={$result.title}&complete=on&search_in=video_title"
-								name="viewhm{$result.title}"
-								title="Search Hot Movies page"
-								><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/hotmovies.png"></a>
-					{/if}
-					{if $result.classused == "pop"}
-						<a
-								target="_blank"
-								href="{$site->dereferrer_link}{$result.directurl}"
-								name="viewpop{$result.id}"
-								title="View Popporn page"
-								><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/popporn.png"></a>
-					{else}
-						<a
-								target="_blank"
-								href="{$site->dereferrer_link}http://www.popporn.com/results/index.cfm?v=4&g=0&searchtext={$result.title}"
-								name="viewpop{$result.id}"
-								title="Search Popporn page"
-								><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/popporn.png"></a>
-					{/if}
-					<a
-							target="_blank"
-							href="{$site->dereferrer_link}http://www.iafd.com/results.asp?searchtype=title&searchstring={$result.title}"
-							name="viewiafd{$result.title}"
-							title="Search Internet Adult Film Database"
-							><img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/iafd.png"></a>
-				</div>
-				<hr>
-				<div>
-					<a
-							class="label label-info"
-							href="{$smarty.const.WWW_TOP}/search/{$result.title|escape:"url"}?t=2000"
-							title="View similar nzbs"
-							>Similar</a>
-				</div>
-			</div>
-		</td>
-		<td colspan="3" class="left">
-			<h2>
-				<a
-						title="{$result.title|stripslashes|escape:"htmlall"}"
-						href="{$smarty.const.WWW_TOP}/xxx?id={$result.id}">{$result.title|stripslashes|escape:"htmlall"}
-				</a>
-			</h2>
-			{if $result.tagline != ''}
-				<b>{$result.tagline|stripslashes}</b>
-				<br>
-			{/if}
-			{if $result.plot != ''}
-				{$result.plot|stripslashes}
-				<br>
-			{/if}
-			<br>
-			{if $result.genre != ''}
-				<b>Genre:</b>
-				{$result.genre|stripslashes}
-				<br>
-			{/if}
-			{if $result.director != ''}
-				<b>Director:</b>
-				{$result.director}
-				<br>
-			{/if}
-			{if $result.actors != ''}
-				<b>Starring:</b>
-				{$result.actors}
-				<br>
-			{/if}
-			<br>
-
-			<div class="relextra">
-				<table class="table table-condensed table-hover data">
-					{assign var="msplits" value=","|explode:$result.grp_release_id}
-					{assign var="mguid" value=","|explode:$result.grp_release_guid}
-					{assign var="mnfo" value=","|explode:$result.grp_release_nfoid}
-					{assign var="mgrp" value=","|explode:$result.grp_release_grpname}
-					{assign var="mname" value="#"|explode:$result.grp_release_name}
-					{assign var="mpostdate" value=","|explode:$result.grp_release_postdate}
-					{assign var="msize" value=","|explode:$result.grp_release_size}
-					{assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts}
-					{assign var="mcomments" value=","|explode:$result.grp_release_comments}
-					{assign var="mgrabs" value=","|explode:$result.grp_release_grabs}
-					{assign var="mpass" value=","|explode:$result.grp_release_password}
-					{assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount}
-					{assign var="mhaspreview" value=","|explode:$result.grp_haspreview}
-					<tbody>
-					{foreach from=$msplits item=m}
-						<tr id="guid{$mguid[$m@index]}" {if $m@index > 1}class="mlextra"{/if}>
-							<td style="width: 27px;">
-								<input type="checkbox" class="nzb_check" value="{$mguid[$m@index]}">
-							</td>
-							<td class="name">
-								<a href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">
-									<b>{$mname[$m@index]|escape:"htmlall"}</b>
-								</a>
-								<br>
-
-								<div class="resextra">
-									<div class="pull-left">
-										<i class="icon-calendar"></i> Posted {$mpostdate[$m@index]|timeago} |
-										<i class="icon-hdd"></i> {$msize[$m@index]|fsize_format:"MB"} |
-										<i class="icon-file"></i>
-										<a
-												title="View file list"
-												href="{$smarty.const.WWW_TOP}/filelist/{$mguid[$m@index]}">{$mtotalparts[$m@index]}
-											files
-										</a> |
-										<i class="icon-comments"></i>
-										<a
-												title="View comments for {$mname[$m@index]|escape:"htmlall"}"
-												href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}#comments">{$mcomments[$m@index]}
-											cmt{if $mcomments[$m@index] != 1}s{/if}
-										</a> |
-										<i class="icon-download"></i> {$mgrabs[$m@index]}
-										grab{if $mgrabs[$m@index] != 1}s{/if}
-									</div>
-									<div class="pull-right">
-										{if $mnfo[$m@index] > 0}
-											<span class="label label-default">
-														<a
-																href="{$smarty.const.WWW_TOP}/nfo/{$mguid[$m@index]}"
-																title="View Nfo"
-																class="modal_nfo"
-																rel="nfo"
-																><i class="icon-info-sign"></i></a></span
-													>
-										{/if}
-										{if $mhaspreview[$m@index] == 1 && $userdata.canpreview == 1}
-											<span class="label label-default">
-														<a
-																href="{$smarty.const.WWW_TOP}/covers/preview/{$mguid[$m@index]}_thumb.jpg"
-																name="name{$mguid[$m@index]}"
-																title="Screenshot of {$mname[$m@index]|escape:"htmlall"}"
-																class="modal_prev"
-																rel="preview"
-																><i class="icon-camera"></i></a></span
-													>
-										{/if}
-										{if $minnerfiles[$m@index] > 0}
-											<span class="label label-default">
-														<a
-																href="#" onclick="return false;" class="mediainfo"
-																title="{$mguid[$m@index]}"
-																><i class="icon-list-alt"></i></a></span
-													>
-										{/if}
-										<span class="label label-default">
-													<a
-															href="{$smarty.const.WWW_TOP}/browse?g={$mgrp[$m@index]}"
-															title="Browse releases in {$mgrp[$m@index]}"
-															><i class="icon-share-alt"></i></a></span
-												>
-										{if $mpass[$m@index] == 1}
-											<span class="icon-stack" title="Potentially Passworded"><i
-														class="icon-check-empty icon-stack-base"></i><i
-														class="icon-unlock-alt"></i></span>
-										{elseif $mpass[$m@index] == 2}
-											<span class="icon-stack" title="Broken Post"><i
-														class="icon-check-empty icon-stack-base"></i><i
-														class="icon-unlink"></i></span>
-										{elseif $mpass[$m@index] == 10}
-											<span class="icon-stack" title="Passworded Archive"><i
-														class="icon-check-empty icon-stack-base"></i><i
-														class="icon-lock"></i></span>
-										{/if}
-									</div>
-								</div>
-							</td>
-							<td class="icons" style="width:90px;">
-								<div class="icon icon_nzb float-right">
-									<a
-											title="Download Nzb"
-											href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"
-											></a>
-								</div>
-								{if $sabintegrated}
-									<div class="icon icon_sab float-right" title="Send to my Queue"></div>
-								{/if}
-								<div class="icon icon_cart float-right" title="Add to Cart"></div>
-								<br>
-								{*s{if $isadmin || $ismod}
-								<a class="label label-warning" href="{$smarty.const.WWW_TOP}/admin/release-edit.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}" title="Edit Release">Edit</a>
-								<a class="label confirm_action label-danger" href="{$smarty.const.WWW_TOP}/admin/release-delete.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}" title="Delete Release">Delete</a>
-								{/if}*}
-							</td>
-						</tr>
-						{if $m@index == 1 && $m@total > 2}
-							<tr>
-								<td colspan="5">
-									<a class="mlmore" href="#">{$m@total-2} more...</a>
-								</td>
-							</tr>
-						{/if}
-					{/foreach}
-					</tbody>
-				</table>
-			</div>
-		</td>
-		</tr>
-	{/foreach}
-	</tbody>
-	</table>
-	<br/>
-
-	{$pager}
-
-	<div class="nzb_multi_operations">
-		<small>With Selected:</small>
-		<input type="button" class="nzb_multi_operations_download" value="Download NZBs"/>
-		<input type="button" class="nzb_multi_operations_cart" value="Add to Cart"/>
-		{if $sabintegrated}<input type="button" class="nzb_multi_operations_sab" value="Send to my Queue"/>{/if}
-	</div>
-
-	</form>
-{else}
-	<div class="alert alert-link" style="vertical-align:middle;">
-		<button type="button" class="close" data-dismiss="alert">&times;</button>
-		<div class="pull-left" style="margin-right: 15px;">
-			<h2 style="margin-top: 7px;"> ಠ_ಠ </h2>
-		</div>
-		<p>No movie releases have XXX covers.
-			<br>This might mean the Administrator's has file permission issues, or he has disabled looking up XXX
-			covers.
-			<br>This could also mean there are no movie releases.
-			<br>Please try looking in the
-			<a href="{$smarty.const.WWW_TOP}/browse?t={$category}" style="text-decoration:underline;"
-					>list view</a>, which does not require XXX covers.
-		</p>
-	</div>
-{/if}
-
-<br/><br/><br/>
\ No newline at end of file
diff --git a/lib/copy_this/www/tmp/unrar/.gitignore b/lib/copy_this/www/tmp/unrar/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/tmp/unrar/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/copy_this/www/tmp/yEnc/.gitignore b/lib/copy_this/www/tmp/yEnc/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/lib/copy_this/www/tmp/yEnc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/lib/decrypt_hashes.php b/lib/decrypt_hashes.php
deleted file mode 100644
index d358cbe8e..000000000
--- a/lib/decrypt_hashes.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../bin/config.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once("namefixer.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-
-$pdo = new DB();
-
-if (!isset($argv[1]) || ($argv[1] != "all" && $argv[1] != "full" && !is_numeric($argv[1]))) {
-	exit($pdo->log->error(
-		"\nThis script tries to match hashes of the releases.name or releases.searchname to predb hashes.\n"
-		. "To display the changes, use 'show' as the second argument.\n\n"
-		. "php decrypt_hashes.php 1000		...: to limit to 1000 sorted by newest postdate.\n"
-		. "php decrypt_hashes.php full 		...: to run on full database.\n"
-		. "php decrypt_hashes.php all 		...: to run on all hashed releases(including previously renamed).\n"
-	));
-}
-
-echo $pdo->log->header("\nDecrypt Hashes (${argv[1]}) Started at " . date('g:i:s'));
-echo $pdo->log->primary("Matching predb hashes to hash(releases.name or releases.searchname)");
-
-getPreName($argv);
-
-function getPreName($argv)
-{
-	global $pdo;
-	$timestart = time();
-	$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-	$namefixer = new \NameFixer(['Settings' => $pdo, 'ConsoleTools' => $consoletools]);
-
-	$res = false;
-	if (isset($argv[1]) && $argv[1] === "all") {
-		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groupid, categoryid, dehashstatus FROM releases WHERE prehashid = 0 AND ishashed = 1');
-	} else if (isset($argv[1]) && $argv[1] === "full") {
-		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groupid, categoryid, dehashstatus FROM releases WHERE categoryid = 8020 AND dehashstatus BETWEEN -6 AND 0');
-	} else if (isset($argv[1]) && is_numeric($argv[1])) {
-		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groupid, categoryid, dehashstatus FROM releases WHERE categoryid = 8020 AND dehashstatus BETWEEN -6 AND 0 ORDER BY postdate DESC LIMIT ' . $argv[1]);
-	}
-
-	$counter = $counted = $total = 0;
-	if ($res !== false) {
-		$total = $res->rowCount();
-	}
-	$show = (!isset($argv[2]) || $argv[2] !== 'show') ? 0 : 1;
-	if ($total > 0) {
-		echo $pdo->log->header("\n" . number_format($total) . ' releases to process.');
-		sleep(2);
-
-		foreach ($res as $row) {
-			$success = 0;
-			if (preg_match('/[a-fA-F0-9]{32,40}/i', $row['name'], $matches)) {
-				$success = $namefixer->matchPredbHash($matches[0], $row, 1, 1, true, $show);
-			} else if (preg_match('/[a-fA-F0-9]{32,40}/i', $row['searchname'], $matches)) {
-				$success = $namefixer->matchPredbHash($matches[0], $row, 1, 1, true, $show);
-			}
-
-			if ($success === 0) {
-				$pdo->queryDirect(sprintf('UPDATE releases SET dehashstatus = dehashstatus - 1 WHERE id = %d', $row['releaseid']));
-			} else {
-				$counted++;
-			}
-			if ($show === 0) {
-				$consoletools->overWritePrimary("Renamed Releases: [" . number_format($counted) . "] " . $consoletools->percentString(++$counter, $total));
-			}
-		}
-	}
-	if ($total > 0) {
-		echo $pdo->log->header("\nRenamed " . $counted . " releases in " . $consoletools->convertTime(TIME() - $timestart) . ".");
-	} else {
-		echo $pdo->log->info("\nNothing to do.");
-	}
-}
\ No newline at end of file
diff --git a/lib/fixReleaseNames.php b/lib/fixReleaseNames.php
deleted file mode 100644
index 4ef7aa9f2..000000000
--- a/lib/fixReleaseNames.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This script attemps to clean release names using the NFO, file name and release name, Par2 file.
- * A good way to use this script is to use it in this order: php fixReleaseNames.php 3 true other yes
- * php fixReleaseNames.php 5 true other yes
- * If you used the 4th argument yes, but you want to reset the status,
- * there is another script called resetRelnameStatus.php
- */
-require_once("namefixer.php");
-require_once("prehash.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/site.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-
-$n = "\n";
-$pdo = new \DB();
-$namefixer = new \NameFixer(['Settings' => $pdo]);
-$predb = new \PreHash(['Echo' => true, 'Settings' => $pdo]);
-$s = new Sites();
-$site = $s->get();
-
-if (isset($argv[1]) && isset($argv[2]) && isset($argv[3]) && isset($argv[4])) {
-	$update = ($argv[2] == "true") ? 1 : 2;
-	$other = 1;
-	if ($argv[3] === 'all') {
-		$other = 2;
-	} else if ($argv[3] === 'preid') {
-		$other = 3;
-	}
-	$setStatus = ($argv[4] == "yes") ? 1 : 2;
-
-	$show = 2;
-	if (isset($argv[5]) && $argv[5] === 'show') {
-		$show = 1;
-	}
-
-	$nntp = null;
-	if ($argv[1] == 7 || $argv[1] == 8) {
-		$nntp = new \NNTP(['Settings' => $pdo]);
-		if (($site->alternate_nntp == '1' ? $nntp->doConnect(true, true) : $nntp->doConnect()) !== true) {
-			echo $pdo->log->error("Unable to connect to usenet.\n");
-			return;
-		}
-	}
-
-	switch ($argv[1]) {
-		case 1:
-			$predb->parseTitles(1, $update, $other, $setStatus, $show);
-			break;
-		case 2:
-			$predb->parseTitles(2, $update, $other, $setStatus, $show);
-			break;
-		case 3:
-			$namefixer->fixNamesWithNfo(1, $update, $other, $setStatus, $show);
-			break;
-		case 4:
-			$namefixer->fixNamesWithNfo(2, $update, $other, $setStatus, $show);
-			break;
-		case 5:
-			$namefixer->fixNamesWithFiles(1, $update, $other, $setStatus, $show);
-			break;
-		case 6:
-			$namefixer->fixNamesWithFiles(2, $update, $other, $setStatus, $show);
-			break;
-		case 7:
-			$namefixer->fixNamesWithPar2(1, $update, $other, $setStatus, $show, $nntp);
-			break;
-		case 8:
-			$namefixer->fixNamesWithPar2(2, $update, $other, $setStatus, $show, $nntp);
-			break;
-		default :
-			exit($pdo->log->error("\nERROR: Wrong argument, type php $argv[0] to see a list of valid arguments." . $n));
-			break;
-	}
-} else {
-	exit($pdo->log->error("\nYou must supply 4 arguments.\n"
-		. "The 2nd argument, false, will display the results, but not change the name, type true to have the names changed.\n"
-		. "The 3rd argument, other, will only do against other categories, to do against all categories use all, or preid to process all not matched to predb.\n"
-		. "The 4th argument, yes, will set the release as checked, so the next time you run it will not be processed, to not set as checked type no.\n"
-		. "The 5th argument (optional), show, wiil display the release changes or only show a counter.\n\n"
-		. "php $argv[0] 1 false other no ...: Fix release names using the usenet subject in the past 3 hours with predb information.\n"
-		. "php $argv[0] 2 false other no ...: Fix release names using the usenet subject with predb information.\n"
-		. "php $argv[0] 3 false other no ...: Fix release names using NFO in the past 6 hours.\n"
-		. "php $argv[0] 4 false other no ...: Fix release names using NFO.\n"
-		. "php $argv[0] 5 false other no ...: Fix release names in misc categories using File Name in the past 6 hours.\n"
-		. "php $argv[0] 6 false other no ...: Fix release names in misc categories using File Name.\n"
-		. "php $argv[0] 7 false other no ...: Fix release names in misc categories using Par2 Files in the past 6 hours.\n"
-		. "php $argv[0] 8 false other no ...: Fix release names in misc categories using Par2 Files.\n"));
-}
\ No newline at end of file
diff --git a/lib/getid3/.gitattributes b/lib/getid3/.gitattributes
deleted file mode 100644
index 412eeda78..000000000
--- a/lib/getid3/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
diff --git a/lib/getid3/.gitignore b/lib/getid3/.gitignore
deleted file mode 100644
index 5ebd21a16..000000000
--- a/lib/getid3/.gitignore
+++ /dev/null
@@ -1,163 +0,0 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-.builds
-*.dotCover
-
-## TODO: If you have NuGet Package Restore enabled, uncomment this
-#packages/
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-*.Cache
-ClientBin
-stylecop.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-
-
-
-############
-## Windows
-############
-
-# Windows image file caches
-Thumbs.db
-
-# Folder config file
-Desktop.ini
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-# Mac crap
-.DS_Store
diff --git a/lib/getid3/changelog.txt b/lib/getid3/changelog.txt
deleted file mode 100644
index 2163da79a..000000000
--- a/lib/getid3/changelog.txt
+++ /dev/null
@@ -1,2772 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// changelog.txt - part of getID3()                            //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-        » denotes a major feature addition/change
-        ¤  denotes a change in the returned structure
-        !  denotes a cry for help from developers
-* Bugfix:  denotes a fixed bug
-
-Version History
-===============
-
-1.9.7: [2013-07-05] James Heinrich
-    * Bugfix: [module.audio-video.quicktime.php] track languages set
-      with 15-bit-encoded ISO639-2 language codes not parsed correctly
-    * Bugfix: (#1717) QuickTime atom hierarchy broken
-    * Bugfix: (#1716) truncate MIDI file could cause infinite loop
-    * Bugfix: all source files converted to UTF-8
-
-1.9.6: [2013-06-03] James Heinrich
-    » getID3() is now licensed under GPL / LGPL / MozillaPL / gCL
-      See license.txt for more details.
-    * Bugfix: (#1550) Quicktime video track sample description parsed
-      incorrectly
-    * Bugfix: (#1550) Quicktime matrix U/V/W values calculated incorrectly
-    * [demo.browse] disable edit-tag and delete-file links by default
-    * Bugfix: option_max_2gb_check should issue warning not error on >2GB
-
-1.9.5: [2013-02-20] James Heinrich, Dmitry Arkhipov
-    » DTS-in-WAV now properly supported
-    ¤ DSS files return additional data in new keys, and some existing
-      keys have been renamed
-    * Bugfix: open_basedir not parsed correctly under Windows
-      (thanks yannick*jamontØgmail*com)
-    * Bugfix: [demo/demo.browse] might not display file or directory name
-      on PHP >=5.4.0 if filename not UTF-8 friendly
-    * Bugfix: [demo/demo.zip] could read more uncompressed data than
-      required; fail to read file if local data descriptor not set;
-      some wrong include files were listed; improved error message display
-    * Bugfix: [module.audio-video.riff] INFO comment chunks with null name
-      chunk not parsed correctly
-    * Bugfix: [module.archive.gz] gzip files with filename stored may have
-      filename reduplicated in [gzip][files] output
-    * Bugfix: [module.archive.zip] data_descriptor not parsed correctly
-    * Bugfix: [module.archive.zip] some newer compression methods unknown
-    * Bugfix: [module.archive.zip] not all flags parsed
-    * Bugfix: [module.archive.zip] local file header not parsed correctly
-      if file has zero values for compressed_size in Local File Header
-    * Bugfix: (#1493) better support for >2GB filesize on 32-bit Linux
-    * Bugfix: (#1474) unneccesary call to GetDataImageSize in JPEG module
-    * Bugfix: (#1470) GIF files falsely detected as TS format
-    * Bugfix: (#1431) Matroska did not parse PixelCrop* / DisplayUnit
-      (thanks jgerberØwikimedia*org)
-    * Bugfix: (#1430) split ID3v2 text values on null separator
-    * Bugfix: (#1426) MS Office 2007 file format now recognized as zip.msoffice
-    * Bugfix: (#1423) optimized CreateDeepArray function
-    * Bugfix: (#1415) add support for DS2 variant of DSS
-
-1.9.4b1: [2012-10-05] James Heinrich, Dmitry Arkhipov, Karl G. Holz
-    » New module: extension.cache.sqlite3.php (by Karl G. Holz)
-    » New demo: demos/getid3.demo.dirscan.php (by Karl G. Holz)
-    » PHP5 standards improvements (thanks phansysØgmail*com)
-    » more reliable >4GB file size parsing using COM (if available)
-      Scripting.FileSystemObject rather than parsing `dir` output
-    * added support for FLAC inside Matroska (audio bitrate cannot
-        be determined in this case)
-    * XMP module now returns all tags, not just whitelisted ones
-    * (#1297) Added detection of MPEG Transport Stream files.
-      Stub module.audio-video.ts.php incomplete
-    * (#1383) removed unneeded ?> tags (thanks daveØholyfield*info)
-    * Bugfix: XMP returns attributes array not just value strings
-    * Bugfix: (#1369) ID3v2 IPLS contents not parsed
-    * Bugfix: (#1357) demo.mysql.php mysql_table_exists() failed
-    * Bugfix: (#1355) copy Foobar2000 QuickTime tags to [comments]
-    * Bugfix: (#1351) QuickTime files with zero-sized atom boxes
-      could cause infinite loop
-    * Bugfix: (#1343) FLAC attached pictures Ogg not handled
-    * Bugfix: (#1343) ID3v2 inside WAV "id3 " chunk not handled
-    * Bugfix: (#1315) BMP detection was broken
-    * Bugfix: (#1309) ID3v2.2 content_group_description (TT2) did
-      not copy to same place as ID3v2.3/ID3v2.4 (TIT2)
-    * Bugfix: (#1308) [playtime_string] could show hh:mm:60
-    * Bugfix: (#1306) extension.cache.mysql.php keyword TYPE->ENGINE
-    * Bugfix: (#1295) missing video information if QuickTime file has
-      disabled tracks
-    * Bugfix: (#1275) MD5/SHA1 data hashes not working properly
-      under Windows
-
-
-1.9.3: [2011-12-13] Dmitry Arkhipov, James Heinrich
-    * Matroska module improved:
-      1. Added support for A_MS/ACM audio codec
-      2. Fixed issues in tags, cues, chapters and clusters parsing
-      3. Fixed almost all errors with track_data_offset, errors
-         still may occur with Xiph data lacing
-      4. Optimized audio/video streams population with usage of the
-         official default values for missing elements
-      5. Audio/video keys are now populated with data from the
-         default stream, not from the first one as before
-      6. Full WebM support
-    * Bugfix: demo.browse would not pop up warnings when clicked
-      if warning contains apostrophe/single-quote character
-    * Bugfix: (#1269) ID3v1 genre typo "Trash"->"Thrash" Metal
-
-
-1.9.2: [2011-12-08] James Heinrich, Dmitry Arkhipov
-	» significant rewrite to module.audio-video.matroska.php
-    ¤ (#1256) ID3 tags in AIFF 'ID3 ' chunks now parsed
-    ¤ (#1039) iXML data in WAV files now returned and parsed into
-        [riff][WAVE][iXML][0][data] and [riff][WAVE][iXML][0][parsed]
-    ¤ [playtime_string] now returns M:SS if less than 1 hour, and
-        H:MM:SS if 1 hour or longer
-    * Bugfix: (#1266) variable tablename: extension.cache.mysql.php
-    * Bugfix: (#1265) unescaped # in regex in write.id3v2.php
-    * Bugfix: (#1252) MediaMonkey writes blank ID3v2 RGAD frames
-      and puts replay-gain values in TXXX frames
-    * Bugfix: (#1251) FLV playtime could be inaccurate for longer
-        files where meta frame is present but meta-playtime is zero
-    * Bugfix: (#1216) show hex values of unknown atom names
-    * Bugfix: (#1215) undefined variable in PrintHexBytes()
-    * Bugfix: FLV audio bitrate was returning kbps not bps
-    * Bugfix: missing ) in write.real.php::RemoveReal()
-    * Bugfix: replace $this::VERSION with getID3::VERSION in
-        extension.cache.*.php
-
-
-1.9.1: [2011-08-10] James Heinrich
-    ¤ ASF Extended Header Object data now (partially) parsed
-    * Default getID3 encoding now set to UTF-8 not ISO-8859-1
-    * Bugfix: (#1212) truncated Matroska files may result in
-        infinite loop and memory exhaustion
-    * Bugfix: (#1203) parse RIFF JUNK chunks for version strings
-    * Bugfix: (#1201) multi-byte characters strings incorrectly
-        displayed by table_var_dump() in demo.browse.php
-    * Bugfix: (#1199) prevent PHP warning on malformed ID3v2 APIC
-    * Bugfix: (#1196) typo in module.audio-video.quicktime.php
-    * Bugfix: (#1195) QuicktimeStoreFrontCodeLookup() broken
-    * Bugfix: (#1194) mp4 embedded images not handled correctly
-    * Bugfix: (#1193) [image_mime] key not set fo WM/picture data
-    * Bugfix: (#1193) ASF Extended Header Object Metadata Library
-        now parsed for embedded images and handled per usual style
-    * Bugfix: (#1190) demo.mimeonly.php was broken since v1.9.0
-    * Bugfix: ID3v2 comment is now called 'comment' not 'comments'
-    * Bugfix: AVI unknown codec fourcc would be reported as blank
-    * Bugfix: AVI zero-size JUNK chunk would give warning
-
-
-1.9.0: [2011-06-20] James Heinrich
-    » changed all module classes to have proper constructors
-      with the actual analysis code moved to function Analyze()
-    * removed unnecessary ob_* calls, replaced with appropriate
-      checks and judicious use of @ error suppression
-    ¤ GETID3_VERSION constant replaced with $getID3->version()
-    ¤ picture data is now returned only in the original source
-      location and [comments][picture], it is no longer replicated
-      in [comments_html], [tags] or [tags_html]
-    ¤ Matroska tags are now returned in [comments] as per normal
-    ¤ Matroska tags are better supported, including pictures
-    ¤ GPS data in MP4 files (e.g. iPhone) is now parsed (#1157)
-    ¤ Matroska audio/video tracks with a default flag, the default
-      stream flag is now copied to [audio|video][streams] (#1147)
-    ¤ Nikon-specific data (NCDT atom) in Quicktime videos now parsed
-    ¤ QuickTime atoms 'meta' and 'data' now (mostly) parsed
-    * Bugfix: remove false warning of junk data on WAV+ID3v1
-    * Bugfix: DolbyDigitalWAV files returned wrong audio bitrate
-    * Bugfix: large attachment data in Matroska tags were not
-      returned completely.
-    * Bugfix: wrong image_mime used for images in demo.browse.php
-    * Bugfix: broken preg_match in module.audio.dss.php
-    * Bugfix: Lyrics3 end offset was off by 1
-    * Bugfix: audio channelmode could be wrong for 2 channels
-      (e.g. joint stereo reported as stereo)
-    * Bugfix: MultiByteCharString2HTML() would return empty string
-      if passed float or int value, now casts to string first
-    * Bugfix: FLAC.picture was not returning under [data] +
-      [image_mime] per standardized format
-    * Bugfix: BigEndian2Int() could incorrectly return negative
-      signed synchsafe integer instead of casting to float
-    * Bugfix: (#1177) ID3v2.4 extended headers were broken
-    * Bugfix: (#1173) some MIDI files not completely parsed
-    * Bugfix: (#1171) change helperapps error to nonblocking warning
-    * Bugfix: (#1170) possible infinite loop in FLV module
-    * Bugfix: (#1169) $this reference in static function (ID3v2)
-    * Bugfix: (#1156) demo.mysql.php not working
-    * Bugfix: (#1153) badly-tagged files could produce invalid
-      argument errors in module.tag.xmp.php
-    * Bugfix: (#1152) add error-suppression to iconv() calls
-    * Bugfix: (#1151) AAC-ADTS files could sometimes not find sync
-    * Bugfix: (#1136) last character of unicode tags (e.g. ASF)
-      was being truncated
-    * Bugfix: (#1133) write.id3v2.php IsValidURL() was broken
-    * Bugfix: (#1126) ID3v2.POPM field was being clobbered
-    * Bugfix: (#999, #1154) ID3v2 UFID data was missing
-
-
-1.8.5: [2011-02-18] James Heinrich
-    » support >2GB files on 64-bit PHP
-      - note current unofficial 64-bit PHP builds for Windows
-        do not actually support 64-bit integers so are still
-        subject to normal 32-bit limits (2GB) for file functions
-    » PHP v5.0.5 now minimum required version.
-      Removed obsolte functions from getid3.lib.php:
-        md5_file, sha1_file, image_type_to_mime_type
-    » IDivX tags now parsed on AVI files
-    ¤ embedded image data is returned inside [comments][picture]
-      in a 2-element array (data, image_mime) for all formats
-    * $this->overwrite_tags=false is now known to be buggy and
-      has been disabled for this version until a full review
-      of tag writing can be completed. Certainly affects ID3v2,
-      the other writable tag formats may or may not be broken
-    * getID3 constructor no longer checks for (or sets) timezone
-    * demo.browse.php now shows cover art as inline images
-      rather than dumped to separate files
-    * [audio][streams][x][language] now set when known
-    * Bugfix: RIFF-AVI "JUNK" chunks are now parsed properly,
-      including zero-sized ones (no more false errors)
-    * Bugfix: msoffice documents now return correct error message
-    * Bugfix: demo.browse.php now encodes data according to
-      current page encoding (default=UTF-8)
-    * Bugfix: (#1120) sometimes incorrect ID3v2 genre parsing
-    * Bugfix: (#1116) possibly incorrect warnings (or lack of)
-      for RIFFs > 2GB.
-    * Bugfix: (#1115) wrong RIFFtype in RIFF files
-    * Bugfix: (#1114) wrong MIME type may be set for Matroska
-    * Bugfix: (#1113) support DSS v3 files
-    * Bugfix: (#1111) cover art in APE tags now supported
-    * Bugfix: (#1091) RemoveID3v1() unitialized variables
-    * Bugfix: (# 504) do not set Quicktime resolution if
-      'tkhd' atom is disabled
-    * Bugfix: (#  95) return [quicktime][controller] if known
-
-
-1.8.4: [2011-02-03] James Heinrich
-    * change default encoding in ID3v2 writing to UTF16-LE+BOM
-      (or ISO-8859-1 where possible) for better compatability
-      with broken versions of Windows Media Player and iTunes
-    * Bugfix: [FLV] incorrect overall bitrate in some files
-    * Bugfix: (#1102) missing parentheses in write[.id3v2].php
-    * Bugfix: (#510) undefined IsValidDottedIP() in write.id3v2.php
-
-
-1.8.3: [2011-01-18] James Heinrich
-    » magic_quotes_gpc must now be disabled to use getID3
-    » replace all error-suppressing @$variable calls with
-      isset() or empty() as appropriate for some configurations
-      where @ does not act to suppress warnings of undefined
-      variables (e.g. support forum thread #798)
-    * remove SafeStripSlashes() and FixTextFields functions
-    * [quicktime] use fourcc if codec name zero-length
-    * [quicktime] support "iods" atom
-    * Bugfix: (#1099) sometimes incorrect detection of safe_mode
-    * Bugfix: (#1095) more robust setting of temp dir
-    * Bugfix: (#1093) add support for ClusterSimpleBlock to
-      prevent "Undefined index: track_data_offsets" errors
-      in Matroska files
-    * Bugfix: [riff] prevent errors when RIFF.WAVE.BEXT chunk
-      contains null date/time  (thanks moysevichØgmail*com)
-    * Bugfix: [quicktime] prevent divide-by-zero errors if
-      time_to_sample_table has zero-sample entry
-      (thanks moysevichØgmail*com)
-
-
-1.8.2: [2010-12-06] James Heinrich
-    * include startup warning for PHP < v5
-    * magic_quotes_runtime must now be disabled to use getID3
-    ¤ MusicBrainz / AmpliFIND data more accessible in returned data
-      from Quicktime-style files (e.g. MP4/AAC)
-    * Bugfix: (#1079) wrong encoding might be used for ID3v2
-        text data, and/or garbage data prepended before text
-        data; DataLengthIndicator value was being ignored
-    * Bugfix: (#1055) clearer warnings on non-EXIF contents in
-      JPEG [APP1]
-    * Bugfix: (#999) ID3v2 UFID data was missing
-
-
-1.8.1: [2010-11-25] James Heinrich
-    * replaced calls to deprecated mysql_escape_string() with
-      mysql_real_escape_string()
-    * Bugfix: (#1072) memory limit not handled correctly if
-      in gigabytes in php.ini (e.g. "2G")
-    * Bugfix: (#1068) wrong encoding for Quicktime tags
-    * Bugfix: (#1040) possible infinite loop in genre parsing
-    * Bugfix: (#1036) helperapps directory not resolving 8.3
-        path names correctly
-    * Bugfix: (#1023) dbm cache extension not correctly handling
-        types other than "db3"
-    * Bugfix: (#1023) mysql cache extension now base64_encodes
-        data to make binary-safe. Existing cached data must be
-        purged from your database cache
-    * Bugfix: (#1007) ClosestStandardMP3Bitrate() not selecting
-        most appropriate value
-    * Bugfix: (#996) inefficient and buggy ID3v1 and ID3v2
-        genre parsing
-    * Bugfix: (#974) track number handled incorrectly in
-        demo.write.php
-    * Bugfix: (#969) tempnam() calls failing with open_basedir
-    * Bugfix: (#955) UTF-16LE text files could be falsely
-        identified as corrupt mp3 files
-    * Bugfix: (#877) detect if mbstring.func_overload is set in php.ini
-    * Bugfix: (#858) PHP safe_mode setting in php.ini incorrectly
-        handled if set to "Off"
-    * Bugfix: (#838) prevent warnings with assorted unhandled
-        Quicktime atoms
-
-
-1.8.0: [2010-11-23] James Heinrich
-    » Changes required for PHP v5.3+ compatability, including:
-      - change ereg* functions to preg_* equivalents
-      - declare functions static as needed
-      note: users of PHP v4.x may need to stay with getID3 v1.7.x
-    » Added CUE (cuesheet) support
-      new file: module.misc.cue.php
-      (thanks Nigel Barnes ngbarnesØhotmail*com)
-    » Added XMP (Adobe Extensible Metadata Platform) support
-      currently used with module.graphic.jpg.php
-      new file: module.tag.xmp.php
-      (thanks Nigel Barnes ngbarnesØhotmail*com)
-    ¤ [jpg][exif][GPS][computed] now exists when possible with
-      calculated values (decimal latitude, longitude, altitude, time)
-    ¤ Prevent clobbering WMA artist with albumartist value; added WMA
-      partofset tag; added WMA tag picture data to WMA comments
-      (thanks ngbarnesØhotmail*com)
-    ¤ RIFF.WAVE.SNDM (SoundMiner) metadata now parsed
-      (thanks emerrittØwbgu*bgsu*edu)
-    ¤ FLAC embedded pictures now return [data_length] key
-      (thanks darrenburnhillØhotmail*com)
-    * added support for a number of new comment atom types added in
-      iTunes v4.0-v7.0  (thanks ngbarnesØhotmail*com)
-    * demo.browse.php now shows video resolution and framerate (if no
-      artist or title info present)
-    * additional FLV details parsed, may be faster as well
-      (thanks ngbarnesØhotmail*com)
-    * Bugfix: DSS files longer than 60 seconds had wrong playtime
-    * Bugfix: possible empty array encountered in APE tags
-      (thanks csnaitsirchØweb*de)
-    * Bugfix: prevent fatal error when calling BigEndian2Int() on
-      zero-length string  (thanks taylor*fausakØgmail*com)
-    * Bugfix: prevent errors when parsing invalid Vorbis comments
-      (thanks dr*dieselØgmail*com)
-    * Bugfix: files could not be analyzed from Windows shares
-      (e.g. \\SERVER\Directory\Filename.mp3)
-    * Bugfix: RAR file opening should use 'filenamepath'
-      (thanks adrien*gibratØgmail*com)
-    * Bugfix: [asf][codec_list_object][codec_entries][x][description]
-      not containing expected comma-seperated values no longer aborts
-      (thanks larry_globusØyahoo*com)
-    * Bugfix: [id3v2] UFID was not returning data
-      (thanks joostØdecock*org)
-
-1.7.9: [2009-03-08] James Heinrich
-    » Added DSS (Digital Speech Standard) support
-      new file: module.audio.dss.php
-      (thanks luke*wilkinsØdtsam*com)
-    » Added MPC (Musepack) SV8 support
-      (thanks WaldoMonster)
-    ¤ some MPC [header] keys renamed to be the same between SV7/SV8
-    ¤ start aligning demos CSS styling with v2.x styles
-      new file: demos/getid3.css
-    ¤ JPEG now returns parsed IPTC tags in [iptc]
-    ¤ getid3_lib::GetDataImageSize now requires $imageinfo parameter
-    ¤ better support for Matroska files with AC3/DTS/MP3/OGG audio
-      (support still lacking for AAC)
-    ¤ standardize ID3v2 TCMP key to 'part_of_a_set' between reading
-      and writing  (thanks aaron_stormØyahoo*com)
-    ¤ added ID3v2 keys 'TCMP','TCP' to for writing iTunes-style tags
-      (thanks aaron_stormØyahoo*com)
-    ¤ back-ported PICTURE tag handling in FLAC tags
-      (thanks WaldoMonster)
-    ¤ added alternate method to get [video][frame_rate] from QuickTime
-    * added partial support for "TCMP"/"TCP" ID3v2 frames (iTunes
-      non-standard part-of-a-compilation tag)
-      (thanks aaron_stormØyahoo*com)
-    * slightly improved scanning through FLV files speed
-      (thanks franki)
-    * faster Matroska scanning by stopping at cluster chunks once
-      needed header chunks are found (much faster for large files)
-    * added workaround for broken tagging programs that miss terminating
-      null byte for numeric ID3v2.4 genres
-      (thanks yam655Øgmail*com)
-    * Bugfix: MultiByteCharString2HTML() did not escape common HTML
-      special characters like & and ?
-    * Bugfix: cleaned up some malformed HTML errors in demo.browse.php
-    * Bugfix: under Windows files >2GB might not be processed due to
-      "dir" command not finding file with double directory slashes
-    * Bugfix: "MODule (assorted sub-formats)" was falsely matching
-      some random files (e.g. JPEGs)  (thanks qwertywin)
-    * Bugfix: suppress PHP_notice on failed SWF-compressed
-      decompression failure  (thanks mkron)
-
-
-1.7.8b3: [2008-07-13] James Heinrich
-    » Experimental partial support for files > 2GB (gets filesize
-      from shell call to "dir" or "ls", parse files with PHP only
-      up to 2GB limit). See readme.txt for details on what formats
-      work properly and other limitations
-    » Initial support for Matroska. Has only been tested with a
-      limited number of sample files, please report any bugs
-    » Experimental support for PHP-RAR reading. Known buggy, disabled
-      by default, enable with care
-    ¤ getid3_lib::CastAsInt() now returns ints up to 2^31 (not 2^30)
-    ¤ Quicktime: [video] now returns [frame_rate] and [fourcc] for MP4
-      video files
-    * MP3: headerless VBR files now only have up to 10 blocks of 5000
-      frames each scanned by default and bitrate extrapolated from that
-      distribution for speed  (thanks glau*stuffØridiculousprods*com)
-    * Quicktime: support "co64" atom
-    * SWF: lower memory use when compressed SWF files processed
-      (thanks doughammondØblueyonder*co*uk)
-    * Bugfix: FLV height and width was calculated incorrectly
-      (thanks moysevichØgmail*com)
-    * Bugfix: FLV GETID3_FLV_TAG_META parsed incorrectly
-      (thanks moysevichØgmail*com)
-    * Bugfix: Quicktime: 'tkhd' matrix_v and matrix_d were switched
-      (thanks rjjmoroØhotmail*com)
-    * Bugfix: Quicktime: frame_rate was often incorrect for MP4 video
-    * Bugfix: getid3_lib::CastAsInt returned -2147483648 when passed
-      2147483648 (0x80000000)
-
-
-1.7.8b2: [2007-10-15] James Heinrich, Allan Hansen
-    * Video bitrate now calculated even if not explicitly stated in
-      file metadata, but if overall and audio bitrates are known
-    * Bugfix: 'comments_html' missing last letter in id3v2 tags.
-    * Bugfix: module objects (e.g. getid3_riff) that are instantiated
-      in other modules are explicitly disposed once no longer needed.
-    * Bugfix: some AVI files were not returning audio information
-      because "strh" chunk was not being read in
-    * Bugfix: asf [audio][<streamnumber>][dataformat] should be set
-      to "wma" but wasn't
-    * Bugfix: [mpeg][audio][bitrate_mode] should always be one of
-      ("cbr", "vbr", "abr") but wasn't for some values in
-      LAMEvbrMethodLookup()
-    * Bugfix: MP3 audio in AVI files could show "cbr" instead of
-      correct audio bitrate_mode, and audio bitrate could be slightly
-      incorrect if multiple files were scanned in a loop (scanning
-      single files produced correct values).
-    * Bugfix: remove [audio/video][bitrate] key if falsely set to zero
-    * Bugfix: PlaytimeString returned non-matching value for negative
-      playtimes (which shouldn't happen either, but now they're at
-      least shown correctly, if they happen due to other bugs)
-    * Bugfix: Several ASF header values are invalid if the broadcast
-      flag is set, getID3() now calculates these values in other
-      ways if the broadcast flag is set  (thanks fletchØpobox*com)
-    * Bugfix: lyrics3-flags-lyrics field was always false, and there
-      never was a lyrics3-flags-timestamp field present even though
-      the lyrics3-raw-IND field consisted of "10" (lyrics present,
-      timestamp not present).  (thanks i*f*schulzØweb*de)
-    * Bugfix: TAR.GZ files produce PHP errors when
-      option_gzip_parse_contents == true in module.archive.gzip.php
-      (thanks alan*harderØsun*com)
-
-
-1.7.8b1: [2007-01-08] Allan Hansen
-    » Major update to readme.txt
-    » PHP 4.2.0 required
-    » Tagwriter requires metaflac 1.1.1+ in order to write FLAC tags.
-    » Removed broken and non-fixable tagwriting module for real format.
-    ! Developers please help fix the above module:
-      http://www.getid3.org/phpBB3/viewtopic.php?t=677
-    » Avoided security issues with demo.browse.php, demo.write.php and
-      demo.mysql.php. These demos are now disabled by default and has
-      to be enabled in the source.
-    * Bugfix: id3v2 genre broken since 1.7.7.
-    » Added DTS module (module.audio.dts.php)
-    ¤ ASF/WMV files now return largest video stream dimensions in
-      [video][resolution_x] and [video][resolution_y]
-    * Bugfix: Minor issues with midi module (avoid PHP_NOTICE).
-    * Bugfix: Minor issues with lyrics3 (avoid PHP_NOTICE).
-    * Bugfix: PHP_NOTICE issues in MultiByteCharString2HTML()
-    * Bugfix: PHP_NOTICE issue  in BigEndian2Float()
-    * Bugfix: fread() zero bytes issue in real module.
-    * Bugfix: ASF module returned mime type video/x-ms-wma instead of
-      video/x-ms-wmv for certain FourCCs.
-    * Bugfix: PHP_NOTICE issues with broken ID3v2 tag/garbage.
-    * Bugfix: PNG module broken in regards to gIFg and gIFx chunks.
-    » Removed detection of short filenames 8dot3 under windows, as
-      it only worked for English versions of windows and has other
-      problems.
-    * Bugfix: Some CBR MP3 files detected as VBR with plenty of warnings.
-    * Bugfix: PHP_NOTICE issues in MP3 module.
-    * Bugfix: Quicktime returned incorrect frame rate.
-    * Bugfix: DivByZero on zero length FLV files.
-    * Bugfix: PHP_NOTICE one some FLV files.
-    * Bugfix: ID3v2 UTF-8/16 encoded frames terminated by \x00
-    * Bugfix: ID3v2 LINK frames iconv error.
-    * Bugfix: ID3v2 padding length calculated incorrectly.
-    * Bugfix: ID3v2.3 extended headers non-conformance
-    » SVG file detection.
-    » Added SVG user module (user_modules/module.graphic.svg.php).
-      Thanks to Roan Horning.
-    » PAR2 file detection (no parsing)
-    * Bugfix: Wave files being detected as MP3.
-    * Bugfix: ASF padding offset bug.
-    * Bugfix: Shorten module not working for wav files with fmt
-      chunks <> 16 bytes.
-    ¤ RIFF: Zero sized chunk invokes warning instead of error.
-    ¤ FLAC: Removed some ['raw'] keys.
-    ¤ MPC: Mime type returned: audio/x-musepack
-
-1.7.7: [2006-06-25] Allan Hansen
-    * Bugfix: AAC static bitrate cache wrong result when parsing
-      several files.
-    * Bugfix: Do not return NULL video bitrate for ASF v3.
-    * Bugfix: getid3_lib::GetImageSize() broken => JPG module broken.
-    * Bugfix: Encoder options should now be returned with correct
-      "--alt-preset n" /  "--alt-preset cbr n" when scanning more files.
-    * Bugfix: Shorten module not escapeshellarg() filenames (UNIX only).
-    * Bugfix: Filenames not escapeshellarg() for md5_data and
-      sha1_data (UNIX only).
-    * Bugfix: UNIX: head and tail called with -cNNN instead of "-c NNN".
-    » Added detection support for PDF and MS Office documents
-      (*.doc, *.xls, *.pps, etc)  (thanks zeromassmediaØgmail*com)
-    ¤ Bugfix: ID3v2 "TDRC" frame now used as "year" in comments if TYER
-      unavailable (TYER is deprecated in ID3v2.4)
-      (thanks matthiasØpanczyk*org)
-    ¤ Removed GETID3_OS_DIRSLASH, replaced with DIRECTORY_SEPARATOR
-    * Bugfix: added LAME preset guessing for presets 410,420,440,490
-      (thanks adminØlogbud*com)
-    * Bugfix: Added escapeshellarg() call in getid3_lib::hash_data
-      (thanks towbØgmx*net)
-    » TAR module no longer reads entire file into memory
-    » FLV module no longer reads entire file into memory
-    * Bugfix: added LAME preset guessing for presets 410,420,440,490
-      (thanks adminØlogbud*com)
-    * Bugfix: Added escapeshellarg() call in getid3_lib::hash_data
-      (thanks towbØgmx*net)
-    * Bugfix: Error message when padding in FLAC files were used up.
-    * Bugfix: Shorten module not working under windows.
-    ¤ Bugfix: gmmktime() instead of mktime().
-    ¤ Using gmmktime() instead of mktime() in ISO, ZIP, PNG and RIFF
-      modules to avoid E_STRICT notices with PHP5.1+.
-    * Bugfix: ['comments_html'] and ['comments'] contains different
-      value when having multiple tags (one of them ID3v1) and the
-      long field names.
-
-1.7.6: [2006-03-12] James Heinrich
-    * Rewrote getid3_lib::GetDataImageSize() to use GetImageSize()
-      instead of using code by filØrezox*com
-    * Bugfix: incorrect dimensions from disabled Quicktime tracks
-      (thanks m-1Øgmx*net)
-    * Bugfix: ['codec'] key warning in module.audio-video.asf.php
-      (thanks niel*archerØblueyonder*co*uk)
-    * Bugfix: undefined array in write.php
-      (thanks drewishØkatherinehouse*com)
-    * Bugfix: DeleteAPEtag() incorrectly failing when no tag present
-      (thanks drewishØkatherinehouse*com)
-    * Bugfix: ID3v2 writing frames with URL fields failing when URL
-      is not in ISO-8859-1  (thanks drewishØkatherinehouse*com)
-    * Bugfix: PHP notices on bad ID3v2 frames
-      (thanks cw264701Øohiou*edu)
-    * Bugfix: audio & video bitrates sometimes wrong in ASF files
-      (thanks kris_kauperØexcite*com)
-
-1.7.5: [2005-12-29] James Heinrich
-    » Added FLV (FLash Video) support -- new file:
-      module.audio-video.flv.php
-      (thanks Seth Kaufman <seth@whirl-i-gig.com> for code)
-    » Real tags can now be written (previous Real tag writing
-      code was not supposed to be in public releases, as it
-      was not complete)
-    » GETID3_HELPERAPPSDIR now autodetected under Windows
-    ¤ ASF lyrics now returned under [comments][lyrics]
-    * Bugfix: removed "--lowpass xxxxx" info from guessed
-      LAME presets when source frequency <= 32kHz
-    * Bugfix: ID3v2 extended header errors
-    * Bugfix: missing ob_end_clean() in write.id3v2.php
-      (thanks rasherØgmail*com)
-
-1.7.4: [2005-05-04] James Heinrich
-    ¤ Added ['quicktime']['hinting'] key (boolean)
-      (thanks jonØwebignition*net)
-    * Bugfix: major UTF-8 to UTF-16/ISO-8859-1 conversion
-      bug (empty string returned) when using iconv_fallback
-      (thanks chrisØfmgp*com)
-    * Bugfix: Missing 'lossless' key in RIFF-WAV
-      (thanks bobbfwedØcomcast*net)
-
-1.7.3: [2005-04-22] James Heinrich
-    » Added TAR support -- new file: module.archive.tar.php
-      (thanks Mike Mozolin <teddybearØmail*ru> for code!)
-    » Added GZIP support -- new file: module.archive.gzip.php
-      (thanks Mike Mozolin <teddybearØmail*ru> for code!)
-    * Bugfix: demo.browse.php now displays embedded images
-      internally instead of passing local filename as IMG
-      SRC (should allow demo.browse.php to correctly show
-      embedded images over a network)
-      (thanks patpowermanØhotmail*com)
-    * Bugfix: minor UTF-8 display issues in demo.browse.php
-    * Bugfix: demo.browse.php now works even if the evil
-      setting magic_quotes_gpc is turned on
-      (thanks patpowermanØhotmail*com)
-    * Bugfix: incorrect MIDI playtime for some files
-      (thanks joelØoneporpoise*com)
-    * Bugfix: 'url_source' typo in module.tag.id3v2.php
-      (thanks richardlynchØusers*sourceforge*net)
-    * Bugfix: Quicktime 'mvhd' matrix values were wrong
-      (thanks webØbobbymac*net)
-    ¤ ID3v2 now returns xx/yy for ['track'] (if
-      available), with xx in ['tracknum'] and yy in
-      ['totaltracks']. Previously ['tracknum'] was not
-      available and ['track'] had only xx.
-    Bugfixes and improvements to /demo/demo.mysql.php:
-      - remix/version parsed from tags and stored in
-        database, can be used when renaming files
-      - track number can be used for renaming files
-
-
-1.7.2: [2004-10-18] Allan Hansen
-    » Added support for WavPack v4.0+
-      (thanks ahØartemis*dk)
-    » Removed code for parsing EXE files
-      (thanks ahØartemis*dk)
-      Removed file: module.misc.exe.php
-    * Bugfix: Large ID3v2 tags inside ASF not parsed
-      properly under PHP5.
-    * Bugfix: Certain Wavpack3 files failed under PHP5 due
-      to new undocumented tmpfile() limit (same problem as
-      above).
-    * Bugfix: New iTunes crashes PHP - temp fix - no tags
-      on those files.
-    * Bugfix: ['nsv']['NSVs']['framerate_index'] might be
-      wrong  (thanks ahØartemis*dk)
-    * Bugfix: transparent color was wrong from truecolor
-      PNG  (thanks ahØartemis*dk)
-    * Bugfix: Changed MPC SV7 header size from 30 to 28,
-      this will change hash values for MPC files
-      (thanks ahØartemis*dk)
-    * Bugfix: Changed MPC SV4-6 header size from 28 to 8,
-      this will change hash values for MPC files
-      (thanks ahØartemis*dk)
-    ¤ Trim/unset wavpack encoder_options to match 2.0.0b2
-      output.
-    ¤ Commented-out unknown/unused values in NSV and ISO
-      modules  (thanks ahØartemis*dk)
-
-
-1.7.1b1: [July-26-2004] James Heinrich
-    » Added support for Apple Lossless Audio Codec
-    » Added support for RealAudio Lossless
-    » Added support for TTA v3
-    » Added support for TIFF
-      New file: /getid3/module.graphic.tiff.php
-    » Modified iconv_fallback to work with UTF-8, UTF-16, UTF-16LE,
-      UTF-16BE and ISO-8859-1 even if iconv() and/or XML support is
-      not available. This means that iconv() is no longer required
-      for most users of getID3()
-      (thanks Jeremia, khleeØbitpass*com)
-    » Added support for Monkey's Audio v3.98+ (thanks ahØartemis*dk)
-    » Included new demo showing most-basic getID3() usage
-      New file: /demos/demo.basic.php
-    * Bugfix: LAME3.94+ presets cached incorrectly if multiple files
-      are scanned in one batch and first file is LAME3.93 or earlier
-      (thanks enoyandØyahoo*com)
-    * Bugfix: Added warning if compressed ID3v2 frame decompression
-      fails. (thanks Mike Billings)
-    * Bugfix: Assorted small fixes to ensure compatability with PHP5
-    * Bugfix: ID3v1 genre "Blues" could not be written
-      (thanks Jeremia)
-    * Bugfix: ['bitrate_mode'] typo in module.audio-video.real.php
-      (thanks asukakenjiØusers*sourceforge*net)
-    * Bugfix: ['zip']['files'] is now populated with filenames even
-      if End Of Central Directory couldn't be parsed
-    * Bugfix: ['audio']['lossless'] was incorrect for FLAC
-      (thanks WaldoMonster)
-    * Bugfix: MD5 File was incorrect in directory browse mode for
-      /demo/getid3.browse.php
-    * Bugfix: PHP v5 compatability changes (float array keys, fread()
-      calls with zero data length)
-      (thanks getid3Øjsc*pp*ru)
-    * Bugfix: was dying if on compressed ID3v2 frames if
-      gzuncompress() function was unavailable
-    * Bugfix: ['vqf']['COMM'] was always empty
-    * Bugfix: MIDI playtime was missing for single-track MIDI files
-    * Bugfix: removed &#0; characters from ['comments_html']
-      (thanks p*quaedackersØplanet*nl)
-    * Bugfix: improved MIDI playtime accuracy
-      (thanks joelØoneporpoise*com)
-    * Bugfix: BMP subtypes 4 and 5 were not being identified
-    * Bugfix: frame_rate in AVI was incorrectly truncated to integer
-    * Bugfix: FLAC cuesheet track index was incorrect
-      (thanks tetsuo*yokozukaØoperamail*com)
-    ¤ ['quicktime']['display_scale'] now contains the playback scale
-      multiplier for QuickTime movies - a movie set to playback at
-      double-size will have "2" here. Other values are "1" and "0.5"
-    ¤ Added LAME preset guessing for --preset medium with v3.90.3
-      (thanks phwipØfish*co*uk)
-    ¤ Added $encoding_id3v1 to allow for ID3v1 encodings other than
-      the standard ISO-8859-1
-    ¤ Default AVI video bitrate_mode is now 'vbr'
-      (thanks eltoderØpisem*net)
-    Force getID3() to abort if Shorten files have ID3 or APE tags
-      (thanks ahØartemis*dk)
-    Editable textbox for parent directory in demo.browse.php
-      (thanks eltoderØpisem*net)
-
-
-1.7.0-hotfix [2004-03-17] Allan Hansen
-    (hotfix version released by Allan Hansen)
-    * Bugfix: PHP 4.1.x compatiblity - fgets($fp) => fgets($fp, 1024)
-    * Bugfix: Added default charset to TextEncodingNameLookup() in
-      module.tag.id3v2.php
-    Ø Removed option_no_iconv
-      iconv() support is only a requirement for WMA/WMW/ASF, and for
-      destination encodings other than ISO-8859-1 and UTF-8, iconv is
-      not needed otherwise. New 'iconv_req' in GetFileFormatArray()
-      only set for WMA/WMV/ASF. analyze() now refuses to analyse
-      WMA/ASF file if iconv is not present.
-    iconv_fallback() only dies on internal errors not missing iconv()
-
-
-1.7.0: [January-19-2004] James Heinrich
-    » Added support for RIFF/CDXA files (MPEG video in RIFF container
-      format (thanks chrisØdigitekdesign*com)
-    » Added support for TTA v2  (thanks ahØartemis*dk)
-    ¤ ID3v2 unsynchronisation scheme disabled by default because most
-      tag-reading programs cannot read unsynchronised tags. Can be
-      overridden by setting id3v2_use_unsynchronisation to true.
-      (thanks mikeØdelusion*org)
-    ¤ extention.*.php renamed to extension.*.php
-      (thanks tp62Øcornell*edu)
-    ¤ /demo/demo.check.php renamed to /demo/demo.browse.php
-    ¤ Added id3v2_paddedlength configuration parameter to WriteTags()
-      and renamed tag_language to id3v2_tag_language
-    ¤ MPEG audio layers are now represented as 1, 2 or 3 instead of
-      'I', 'II', or 'III'
-    ¤ Added [audio][wformattag] and [video][fourcc] for WAV and AVI
-    ¤ Added [audio][streams] which contains one entry for each audio
-      stream present in the file (usually only one). The data is a
-      copy of what is usually found in [audio]. If there are multiple
-      audio streams then [audio] will contain a sum of the bitrates
-      of all audio streams, and the data format of the first stream
-      (if streams are of different data types)
-    ¤ Added BruteForce mode to mp3 scanning. Disabled by default as
-      it is extremely slow and only files that are broken enough to
-      not really play will gain any benefit from this.
-    ¤ Suppress '--resample xxxxx' appended to encoder options for mp3
-      with low-quality presets for default sampling frequencies
-    ¤ Enhanced LAME preset guessing for pre-3.93 with a better lookup
-      table, --resample/--lowpass guessing (thanks phwipØfish*co*uk)
-    ¤ RIFF files with non-MP3 contents no longer have
-      [audio][encoder_options] set
-    ¤ Added [audio][encoder_options] to audio formats where possible
-      (including LiteWave, LPAC, OptimFROG, TTA)
-    ¤ Moved [quantization] and [max_prediction_order] from
-      [lpac][flags] to just [lpac]
-    ¤ WavPack flags are now parsed into [wavpack][flags]
-    * Bugfix: APEtags with ReplayGain information stored with comma-
-      seperated decimal values (ie "0,95" instead of "0.95") were
-      giving wrong peak and gain values
-    * Bugfix: Filesize > 2GB not always detected correctly
-    * Bugfix: Some ID3v2 frames had data key unset incorrectly
-      (thanks chrisØdigitekdesign*com)
-    * Bugfix: Warnings on empty-strings-only comments
-    * Bugfix: ID3v2 tag writing may have had incorrect padding length
-      if padded length less than current ID3v2 tag length and
-      merge_existing_data is false  (thanks mikeØdelusion*org)
-    * Bugfix: hash_data() for SHA1 was broken under Windows
-    * Bugfix: BigEndian2Float()/LittleEndian2Float() were broken
-    * Bugfix: LAME header calculated track peaks were incorrect for
-      LAME3.94a15 and earlier
-    * Bugfix: AVIs with VBR MP3 audio data reported incorrect bitrate
-      and bitrate_mode
-    * Bugfix: AVIs sometimes had incorrect or missing video and total
-      bitrates
-    * Bugifx: AVIs sometimes had incorrect ['avdataend'] and
-      therefore also incorrect data hashes (md5_data, sha1_data)
-    * Bugfix: ID3v1 genreid no longer returned for Unknown genre
-    * Bugfix: ID3v1 SCMPX genres were broken
-    Modified LAME header parsing to correctly process peak track
-      value for LAME3.94a16+ (thanks Gabriel)
-    md5_file() and sha1_file() now work under Windows in PHP < 4.2.0
-      and 4.3.0 respectively with helper apps
-    Default md5_data() tempfile location is now system temp directory
-      instead of same directory as file (thanks towbØtiscali*de)
-    Improved list of RIFF ['INFO'] comment key translations
-    More helpful error message when GETID3_HELPERAPPSDIR has spaces
-    /demo/demo.browse.php now autogets both MD5 and SHA1 hashes for
-      files < 50MB
-    Replaced PHP_OS comparisons with GETID3_OS_ISWINDOWS define
-      (thanks necroticØusers*sourceforge*net)
-
-
-1.7.0b5: [December-29-2003] James Heinrich
-    » Windows only: Various binary files are now required for some
-      file formats, especially for tag writing, as well as md5sum
-      (and other) calculations. These binaries are now stored in the
-      directory defined as GETID3_HELPERAPPSDIR in getid3.php
-      (default is /helperapps/ parallel to /getid3/).
-      Note: This directory must not have any spaces in the pathname.
-      All neccesary files are available as a seperate download.
-      See /helperapps/readme.txt for more information
-      New file: /helperapps/readme.txt
-    » Unified tag-writing interface for all tag formats
-      New file: /getid3/write.php
-                /getid3/write.apetag.php
-                /getid3/write.id3v1.php
-                /getid3/write.id3v2.php
-                /getid3/write.lyrics3.php
-                /getid3/write.metaflac.php
-                /getid3/write.vorbiscomment.php
-    » Added support for Shorten - requires shorten binary (head.exe
-      is also required under Windows).
-      New file: /getid3/module.audio.shorten.php
-    » Added support for RKAU
-      New file: /getid3/module.audio.rkau.php
-    » Added (minimal) support for SZIP
-      New file: /getid3/module.archive.szip.php
-    » Added MySQL caching extention  (thanks ahØartemis*dk)
-      New file: /getid3/extention.cache.mysql.php
-    » Added DBM caching extention  (thanks ahØartemis*dk)
-      New file: /getid3/extention.cache.dbm.php
-    » Added sha1_data hash option  (thanks ahØartemis*dk)
-    » Added option to allow getID3() to skip ID3v2 without parsing it
-      for faster scanning when ID3v2 data is not required. If you
-      want to enable this feature delete /getid3/module.tag.id3v2.php
-      (thanks ahØartemis*dk)
-    ¤ 8-bit WAV data now calculates MD5 checksums as normal, not
-      converting to signed data as before, so stored md5_data_source
-      in FLAC files will no longer match md5_data for the equivalent
-      decoded 8-bit WAV. A warning will be generated for 8-bit FLAC
-      files
-    ¤ Added option_no_iconv option to allow getID3() to work
-      partially without iconv() support enabled in PHP
-      (thanks ahØartemis*dk)
-    ¤ All '*_ascii' keys removed for ASF/WMA/WMV files
-    ¤ All 'ascii*' keys removed for ID3v2 tags
-    ¤ Ogg filetypes now return MIME of "application/ogg" instead of
-      the previous "application/x-ogg"
-      (thanks blakewattersØusers*sourceforge*net)
-    ¤ Force contents of ['id3v2']['comments'] to UTF-8 format from
-      whatever encoding each frame may have (text encoding can vary
-      from frame to frame in ID3v2)
-    ¤ MP3Gain information from APE tags suppressed from ['tags'] and
-      parsed into ['replay_gain']
-    ¤ ReplayGain information (all formats) changed from "Radio" and
-      "Audiophile" to "Track" and "Album" respectively
-    ¤ ['volume'] and ['max_noclip_gain'] are now available in both
-      ['replay_gain']['track'] and ['replay_gain']['album'] for all
-      formats that calculate ReplayGain.
-    ¤ ['video']['total_frames'] is available for AVIs
-    ¤ All parsed ID3v2 frame data is now in ['id3v2'][XXXX][#]
-      (previously some frame types would have numeric array keys if
-      multiple instances of that frame type were allowed and other
-      frame types would not)
-    ¤ ASF/WMA "WM/Picture" images are now parsed in the same manner
-      as ID3v2 with the image (ex JPEG) data returned in [data]
-      rather than [value]
-    * Bugfix: Optional tag processing options were being ignored (ie
-      ID3v1 still processed even if option_tag_id3v1 == false)
-      (thanks ahØartemis*dk)
-    * Bugfix: fixed MultiByteCharString2HTML() for UTF-8
-    * Bugfix: Quicktime files not always reporting video frame_rate
-    * Bugfix: False ID3v1 synch patterns in APE or Lyrics3 tags are
-      now detected and incorrect ID3v1 data not returned
-      (thanks sebastian_maresØusers*sourceforge*net for the idea)
-    * Bugfix: WMA9 Lossless now reported as lossless
-    * Bugfix: two typos in ID3v1 genre list
-    * Bugfix: MPEG-2/2.5 ABR/VBR MP3 files had doubled playtime
-    * Bugfix: MPEG-2/2.5 LayerII (ie MP2: 24/22.05/16kHz) files were
-      not detected due to incorrect frame length calculation
-    * Bugfix: MPEG LayerI files were not detected due to incorrect
-      frame length calculation (must be multiple of slot length)
-    Added alternative md5_data via system call - twice as fast. Needs
-      "getID3()-WindowsSupport" to work under Windows.
-      (thanks ahØartemis*dk)
-    ID3v2.4 compressed frames are now supported
-    php_uname() calls changed to use PHP_OS constant
-    Added SCMPX extensions to ID3v1 genres (0xF0-0xFE)
-    Obfuscated contributor email address in changelog and sourcecode
-    Added memory-saving EmbeddedLookup() function for lookup tables
-      in RIFF and ID3v2 modules (thanks ahØartemis*dk)
-    Major memory patches to many modules by using
-      $var = &$INFO_ARRAY_AT_SOME_INDEX
-      in place of large multi-dimensional array declarations.
-      Memory saved:  RIFF: ~200kB;  ID3v2: ~475kB;  ASF: ~50kB  etc.
-      (thanks ahØartemis*dk)
-
-
-1.7.0b4: [November-19-2003] James Heinrich
-   » Support added for MPC files with old SV4-SV6 structure
-   » RealVideo now properly supported with resolution, framerate, etc
-     (thanks jcsston)
-   » RealAudio files with old-style file format (v2-v4) are now
-     fully supported
-   » Support added for DolbyDigital WAV files (thanks ahØartemis*dk)
-   ¤ ['RIFF'] is now ['riff'] to conform to make all root key names
-     lowercase
-   ¤ ['OFR'] is now ['ofr'] to conform to make all root key names
-     lowercase
-   ¤ ['tags_html'] is now available as a copy of ['tags'] but
-     with all text replaced with an HTML version of all characters
-     above chr(127), translated according to whatever the encoding
-     of the source tag is, in the HTML form &#1234;
-   ¤ CopyTagsToComments() is now available in getid3_lib
-   ¤ QuicktimeVR files now return a ['video']['dataformat'] of
-     'quicktimevr' instead of 'quicktime' (thanks gtsØtsu*biz)
-   ¤ Quicktime video files with DivX, Xvid, 3ivx or MPEG4 video
-     streams now return those names as ['video']['dataformat']
-   ¤ MPEG video files are now identified with ['video']['codec'] set
-     to either 'MPEG-1' or 'MPEG-2' (rather than just 'MPEG'). If you
-     see a file wrongly identified, please report it!
-     (thanks fccHandler)
-   ¤ All bitrate values in ['mpeg']['audio'] is now reported in bps
-     rather than kbps (ie 128000 instead of 128) for consistancy
-   ¤ AVIs with MP2 audio now report ['audio']['dataformat'] as 'mp2'
-     rather than 'wav'  (thanks metalbrainØnetian*com)
-   ¤ Added ['md5_data_source'] for OptimFROG
-   ¤ AC3 in RIFF-WAV now identified with ['audio']['dataformat']
-     returning 'ac3'
-   ¤ WavPack ['extra_bc'] now returned as integer
-   ¤ WavPack ['extras'] now returned as 3-element array of integers
-   ¤ MP3 ['audio']['encoder options'] now returns 'VBR' or 'CBR' only
-     (no bitrate) if no LAME preset is used, or 'VBR q??' where ?? is
-     a number 0-100 for Fraunhofer-encoded VBR MP3s
-   * Bugfix: VBR MP3s could have incorrect bitrate reported
-   * Bugfix: Quicktime files with MP4 audio were not returning
-     ['video']['dataformat'] (thanks robØmassive-interactive*nl)
-   * Bugfix: strpad vs str_pad typo in module.riff.php
-     (thanks nicojunØusers*sourceforge*net)
-   * Bugfix: ReplayGain information was often wrong for MPC files
-   * Bugfix: MD5 and other post-TAIL chunks were not being processed
-     in module.audio.optimfrog.php
-   * Bugfix: Undefined variable in table_var_dump() in demo/check.php
-   * Bugfix: QuickTime files now only return information in [audio]
-     or [video] if those exist in the file
-   * Bugfix: WavPack no longer tries to read entire compressed data
-     chunk
-   * Bugfix: Properly handle VBR MP3s with "Info" (rather than
-     "Xing") header frame. foobar2000 adds this to MP3 files when
-     "Fix MP3 Header" function is used (thanks ahØartemis*dk)
-   * Bugfix: Fraunhofer VBRI headers for MP3s were assuming 2-byte
-     entries for TOC rather than using stride, and were ignoring the
-     scaling value. (thanks sebastianØmaresweb*net)
-   Several QuickTime atoms have been added to an exclusion list
-     because they have been observed, but I have no idea what they
-     are supposed to do so I can't add real support for them, but
-     they should not generate warnings (robØmassive-interactive*nl)
-   Old MPC encoder (before v1.06) was return as v0.00, now returned
-     as 'Buschmann v1.7.0-v1.7.9 or Klemm v0.90-v1.05'
-     (thanks ahØartemis*dk)
-   Added check for magic_quotes_runtime and code to disable it if
-     neccesary (thanks stefan*kischkelØt-online*de)
-   Added 3ivx fourCCs to module.audio-video.quicktime.php
-   MP3 and AC3 streams are now parsed when contained inside RIFF-WAV
-     or RIFF-AVI container formats
-   Better detection of named presets in LAME 3.93/3.94
-
-
-1.7.0b3: [October-17-2003] James Heinrich
-   » AC-3 (aka Dolby Digital) is now supported.
-     New file: /getid3/module.audio.ac3.php
-   * Bugfix: ID3v2-writing function Unsynchronise() was broken, which
-     made ID3v2 tag containing binary data (typically pictures) get
-     corrupted. (thanks t*coombesØbendigo*vic*gov*au,
-     i*kuehlbornØndh*net, mikeØdelusion*org, mikeØftl*com)
-   * Bugfix: Zip comments now returned as array instead of string,
-     as they're supposed to be.
-   * Bugfix: Quicktime/MP4 files may have reported extremely low
-     bitrates (thanks spunkØdasspunk*com)
-   Improved double-ID3v1 check to prevent false detection when string
-     "TAG" is present in APE or Lyrics3
-   Fixed /demo/simple.php
-   Fixed /demo/joinmp3.php
-   Fixed /demo/mimeonly.php
-   Fixed /demo/write.php
-
-
-1.7.0b2: [October-15-2003] James Heinrich
-   » TTA Lossless Audio Compressor format now supported.
-     (http://tta.iszf.irk.ru)
-     New file: /getid3/module.graphic.tta.php
-   » PhotoCD (PCD) format now supported. Image data for the three
-     lowest resolutions (192x128, 384x256, 768x512) can be optionally
-     extracted.
-     New file: /getid3/module.graphic.pcd.php
-   ¤ RIFF-MP3 files now should return the same ['md5_data'] as the
-     identical MP3 file outside the RIFF container
-   ¤ Name of LAME preset used (if available, needs LAME v3.90+)
-     returned in ['mpeg']['audio']['LAME']['preset_used'] and also as
-     part of ['audio']['encoder_options']
-   ¤ VQF module now sets ['audio']['encoder_options'] to i.e. CBR96
-   ¤ MP3 module now sets ['audio']['encoder_options'] on CBR files
-     and all LAME-encoded files
-   ¤ MPC module now sets ['audio']['encoder_options']
-   ¤ Monkey module now sets ['audio']['encoder_options']
-   ¤ AAC module now sets ['audio']['encoder_options'] to profile name
-   ¤ ASF module now sets ['audio']['encoder_options']
-   ¤ Ogg module adds ['audio']['encoder_options'] -b 128 on
-     Ogg Vorbis 1.0+ ABR files
-   ¤ Ogg module adds ['audio']['encoder_options'] -q N   on
-     Ogg Vorbis 1.0+ VBR files 44k/48k sample rate/stereo files only.
-   ¤ Ogg module ['audio']['encoder_options'] "Nominal birate: 80k" to
-     other Ogg Vorbis files.
-   ¤ ID3v2 track number now returned as string (with leading zeros,
-     if present in data) rather than integer (thanks Plamen)
-   ¤ ASF module returns ['asf']['comments']['encoding_time_unix'] if
-     available (from WM/EncodingTime)
-   ¤ Fixed /demo/mysql.php and added some new features:
-     - encoder options
-     - ID3v2 "Encoded By"
-     - non-empty comments
-     - total entries in database summary (totals & averages)
-     - database version update
-   * Bugfix: 'UNICODE' iconv() charset changed to 'UTF-16LE' or
-     'UTF-16BE' as appropriate
-   * Bugfix: iconv_fallback() function created in case iconv() fails
-   * Bugfix: fixed MD5 calls in demo/check.php
-   * Bugfix: reenabled detection of APE + Lyrics3 tags in same file
-   * Bugfix: ASF module now returns ID3v1 genre as string instead of
-     number - patch from Eugene Toder.
-   * Bugfix: ASF module now reads non-standard field names,
-     i.e. "date" as well as WM/Year - patch from Eugene Toder.
-   * Bugfix: ASF module now returns genre as-is if it is not a
-     standard ID3v1 genre (thanks wonderboy)
-   * Bugfix: Eliminated false-synch problem in MP3 module
-   * Bugfix: Fixed missing root ['bitrate'] for most formats
-   * Bugfix: ['audio']['compression_ration'] missing for MPC
-     (thanks WaldoMonster)
-   * Bugfix: NSV module died in 1.7.0b1
-   * Bugfix: ASF module died in 1.7.0b1 when WM/Picture preset
-   * Bugfix: ASF tracknumber incorrect when specified by WM/Track
-     rather than WM/TrackNumber (thanks jgriffiniiiØhotmail*com)
-   * Bugfix: MPEG audio+video playtime should now be pretty accurate
-     (ie within 0.1% variation at most)
-     (thanks mgrimmØhealthtvchannel*org)
-   * Bugfix: ID3v2 not being copied to ['tags'] in some cases
-   * Bugfix: LAME CBR files with Info tag were being incorrectly
-     flagged as VBR (thanks Jojo)
-   * Bugfix: LAME tag not being detected for LAME 3.90 (original)
-   Changed regex pattern match for MP3 to include 3rd byte for more
-     reliable/accurate pattern matching
-   Added duplicate-ID3v1 tag checking (two ID3v1 tags, one after the
-     other) that has been known to occur with iTunes
-     (thanks towbØtiscali*de)
-   Added instructions for enabling iconv() support under Windows
-   Removed some unneccesary debugging code
-   Suppressed duplicate PHP warnings for missing include files
-   Included some missing dependencies in various files
-   /demo/audioinfo.class.php now copies ['audio']['encoder_options']
-
-
-1.7.0b1: [2003-09-28] Allan Hansen
-   This beta version was not made by James Heinrich. It was made by
-   Allan Hansen <ahØartemis*dk> - please send bug reports on this
-   beta directly to me.
-
-   James Heinrich will release 1.7.0 final, but it may take some time
-   to work out the bugs from the major rewrite.
-
-   This version could be called getID3lite. It makes a lot of checks
-   optional and makes it easy to remove support for undesired formats
-
-   It also is more library-like. Older versions of getID3() declared
-   an incredible amount of global scope functions and defined several
-   constants. 1.7.0beta1 still declares constants, but they are all
-   prepended by GETID3_. It declares no global scope functions - they
-   are all wrapped into classes.
-
-   » Made getID3() depend on iconv library: compile PHP --with-iconv
-   » Created new directory structure
-       Moved all demos to demos/
-       Moved all getID3() files to getid3/
-       Renamed most files to module.something
-       Changed header in all module.something to explain what they do
-       Simply remove all modules you don't need
-       Wrapped all modules into classes
-   * Bugfix: Implemented misc patches from Eugene Toder
-   * Bugfix: Implemented misc patches from "six"
-   ¤ Added root key 'encoding'
-   ¤ Added prefix GETID3_ to all defined constants.
-   ¤ Wrapped getid3.php into getid3 class
-   ¤ Wrapped getid3.functions.php into getid3_lib class
-       Removed unused functions
-       Moved several functions away from getid3.functions.php and
-         into the files where they are actually used.
-       Renamed getid3.functions.php to getid3.lib.php
-       Moved getid3.rgad.php functions into getid3_lib
-       Moved getid3.getimagesize.php funcitons ingo getid3_lib
-   ¤ Moved getid3.ogginfo.php into ogg module
-   ¤ Combined GetTagOnly() and GetAllFileInfo() in method analyze
-   ¤ Removed redundant and unuseful root keys
-       'file_modified_time' == filemtime($filename)
-       'md5_file' == md5_file($filename)
-       'exist' == file_exists($filename)
-   ¤ Changed root key ['tags'] from array of string to array of array
-     of comments.
-   Simplified code for detecting base path.
-   Removed ob_ from InitializeFilepointerArray(). That was really a
-     ugly HACK to get output from fopen. If user want the reason,
-     he should open the file himself!
-   Checking for APE tags before lyrics3 - makes Lyrics3 not depend
-     on APE tag. It seems to work on my test file.
-   Changed ['error'] and ['warning'] in multiple files to append to
-     array instead of appending to string. That simplified code in
-     getid3.php too.
-   Simplified clean-up procedure: simply remove all empty root keys
-   Setting tags in individual modules instead of main getid3.php
-   Made Bonk and ASF modules non-dependent on id3 modules - id3
-     optional.
-   Rewrote HandleAllTags() - simplified and convert comments to
-     desired encoding.
-   Replaced all calls to RoughTranslateUnicodeToASCII() in ASF module
-     with a TrimConvert() method. This uses iconv() for conversion.
-     It also converts from UNICODE instead of UTF-16BE, as the spec
-     says it should.
-   Replaced all calls to RoughTranslateUnicodeToASCII() in id3v2
-     module with iconv(). id3v2 module also reads
-     $ThisFileInfo['encoding'] and converts all comments to this
-     format. All other formats just add their comments in their
-     native charset, but every comment field in id3v2 can have a
-     different encoding, so this is needed.
-   Did same thing as above with ISO module. However - it does not
-     work. I need to find out how to specify big-endian unicode !=
-     UNICODING encoding name given to iconv().
-   Built-in assume mp3 format in getid3.php
-   Temporarily nuked root key ['comments'] and CopyCommentsToRoot()
-   Updated demo/audioinfo.class.php
-   Updated demo/check.php - some thing don't work!
-   Other demos are out of order!
-
-
-1.6.5: [October-06-2003] James Heinrich
-   » Added support for LiteWave (thanks supportØclearjump*com)
-   Ø Split out speedup info from ['OFR']['OFR']['compression'] into
-     ['OFR']['OFR']['speedup']
-   Ø If EXIF functions for JPEG not available, now warning not error
-   Ø ID3v2 track number now returned as string (with leading zeros,
-     if present in data) rather than integer (thanks Plamen)
-   * Bugfix: now correctly parses cbSize element of WAVEFORMATEX
-     structure (thanks supportØclearjump*com)
-   * Bugfix: ASF module now reads non-standard field names,
-     i.e. "date" as well as WM/Year - patch from Eugene Toder.
-   * Bugfix: ASF module now returns genre as-is if it is not a
-     standard ID3v1 genre (thanks wonderboy)
-   * Bugfix: ['audio']['compression_ration'] missing for MPC
-     (thanks WaldoMonster)
-   Prevent infinite loop in MP3 histogram if framelength == 0
-   Added wFormatTag values 0x00FF and 0x2001 - 0x2005
-     (thanks steveØheadbands*com)
-   Added "twos" and "sowt" FourCCs for Mac AIFC
-
-
-1.6.4: [June-30-2003] James Heinrich
-   » Added support for free-format MP3s
-     (thanks Sebastian Mares for the idea)
-   » Compressed (Flash 6+) SWF files are now handled properly
-     (thanks alan*cheungØalumni*ust*hk)
-   » Added DeleteLyrics3() to getid3.lyrics3.php
-   » Added FixID3v1Padding() to getid3.putid3.php
-   » Added new simple MP3-splicing sample file
-     (thanks tommybobØmailandnews*com for the idea)
-     New file: getid3.demo.joinmp3.php
-   » Moved all contents of getid3.putid3.php into either
-     getid3.id3v1.php or getid3.id3v2.php or getid3.functions.php as
-     appropriate
-     Removed file: getid3.putid3.php
-   ¤ ['error'] and ['warning'] keys now return as arrays, not strings
-   ¤ New root key for all files: ['file_modified_time'] (UNIX time)
-   ¤ getid3.demo.scandir.php renamed to getid3.demo.mysql.php
-   ¤ New demo file returns the MIME type only for a single file
-     (thanks adminØe-tones*co*uk for the idea)
-     New file: getid3.demo.mimeonly.php
-   ¤ Added check for valid ID3v1 padding (strings should be padded
-     with null characters but some taggers incorrectly use spaces).
-     A warning will be generated if padding is invalid. New boolean
-     key ['id3v1']['padding_valid'] indicates padding validity.
-   ¤ CleanUpGetAllMP3info() removes more useless root keys for
-     unknown-format files
-   ¤ Extended LAME information in ['mpeg']['audio']['LAME'] is now
-     only returned for LAME v3.90+
-   ¤ LAME-encoded MP3s now return
-     ['mpeg']['audio']['LAME']['long_version'] as well as
-     ['mpeg']['audio']['LAME']['short_version'] - these are identical
-     in LAME v3.90+ but older versions will report longer more
-     detailed version information if available
-   ¤ New Lyrics3 values: ['lyrics3']['raw']['offset_start'] and
-     ['lyrics3']['raw']['offset_end']
-   ¤ New optional parameter on getAPEtagFilepointer() to scan from a
-     defined offset rather than end-of-file to allow scanning of APE
-     tags before Lyrics3 tags
-   ¤ ['tag_offset_start'] and ['tag_offset_end'] are now present in
-     ['ape'], ['lyrics3'], ['id3v1'] and ['id3v2']
-   ¤ Numerous changes to the returned structure and content for La
-     files, including parsing the seektable (if applicable) and
-     parsing RIFF data occuring after the end of the compressed audio
-     data (notably RIFF comments)
-     (thanks mikeØbevin*de)
-   ¤ getSWFHeaderFilepointer() now has optional 3rd parameter
-     $ReturnAllTagData (default == false) which if set to true will
-     return data on all tags in ['swf']['tags']
-   ¤ ['swf']['bgcolor'] now returns the 6-character string
-     representing the background color in HTML hex color format
-     (thanks ubergeekØubergeek*tv)
-   ¤ ['swf']['header']['frame_delay'] is no longer returned
-   ¤ getQuicktimeHeaderFilepointer() now has two additional optional
-     parameters: $ReturnAtomData (default == true) and
-     $ParseAllPossibleAtoms (default == false). Setting
-     $ReturnAtomData to false will reduce the size of the returned
-     data array by unsetting ['quicktime']['moov'] before returning.
-     Leaving $ParseAllPossibleAtoms as false now suppresses parsing
-     of several atom types that contain very large tables of data
-     that are not typically useful. Atom type suppressed are:
-     stts, stss, stsc, stsz, and stco
-     (thanks ubergeekØubergeek*tv)
-   ¤ ['fileformat'] no longer set to 'id3' if ID3v1 or ID3v2 tag
-     detected but no other data format recognized
-   * Bugfix: La files now return the correct values for
-     ['avdataoffset'] and ['avdataend'] and therefore the correct
-     values for ['md5_data'] - note that ['md5_data'] values will not
-     match values from previous versions of getID3() - the previous
-     versions were incorrect
-     (thanks mikeØbevin*de)
-   * Bugfix: A temporary file was being created in the web server's
-     root directory (not DocumentRoot) each time ['md5_data'] was
-     calculated, and not removed due to lack of permissions. Temp
-     file is now created (as it was supposed to be) in the directory
-     of the file being examined, or the system temp directory, and
-     properly removed when done.
-   * Bugfix: Several incorrect values were being returned inside
-     ['mpeg']['audio']['LAME'] (thanks bouvigneØmp3-tech*org)
-   * Bugfix: SWF frame rates values were usually incorrect.
-     (thanks alan.cheungØalumni*ust*hk and ubergeekØubergeek*tv)
-   * Bugfix: ID3v2.2 files always flagged 4 bytes of invalid padding
-     (thanks marcaØmac*com)
-   * Bugfix: Lyrics3 without ID3v1 was not working properly
-   * Bugfix: Lyrics3, APE & ID3v1 can all now exist in the same file.
-     A warning is issued if APE comes after Lyrics3 (because Lyrics3-
-     aware taggers probably are not APE-aware and therefore won't be
-     able to find the Lyrics3 tag)  (thanks mp3gainØhotmail*com)
-   * Bugfix: WriteAPEtag() now writes the APE tag before any Lyrics3
-     tags (if present) and removes any incorrect ones that are after
-     existing Lyrics3 tags  (thanks mp3gainØhotmail*com)
-   * Bugfix: RIFF-WAVE file with incorrect NumberOfSamples values in
-     the 'fact' chunk no longer cause incorrect playtime calculation
-     (thanks stprasadØindusnetworks*com)
-   * Bugfix: getid3.demo.simple.php had undefined variables if the
-     file needed to be deep-scanned with assumeFormat
-   * Bugfix: fixed previously-incorrect ['avdataend'] values for APE
-     and Lyrics3 tags in some cases, which in some cases means that
-     ['md5_data'] is different than previously (now correct)
-   Much-improved detection of AAC-ADTS, which also means MP3
-     format detection should now be nearly twice as fast
-   Truncated AVIs and WAVs are now reported
-   Number of new features and bugfixes in getid3.demo.mysql.php
-   Quicktime 'meta' atoms now parsed, so Quicktime MP4 files can now
-     return artist, title, album, etc  (thanks spunkØdasspunk*com)
-   Consolidated all comments processing functions (processing the
-     ['comments'] and ['tags'] keys) into HandleAllTags() which now
-     also checks to ensure that APE tags are really better than ID3v2
-     before using them in ['comments']
-   Known issue with Meracl ID3 Tag Writer v1.3.4 truncating last byte
-     of MP3 file when appending new ID3v1 tag now specifically noted
-     (rather than generic Probably Truncated File message)
-   getid3.demo.mysql.php now stores last-modified time for each file
-   getid3.demo.mysql.php is now case-sensitive for filenames
-   getid3.demo.mysql.php can generate M3U playlists of any of the
-     groups of files it can select (duplicate filenames, tag types,
-     etc.)
-   getid3.demo.mysql.php can now find mismatched tag contents and
-     filenames
-   getid3.demo.check.php now shows total number of errors & warnings
-   GetFileFormatArray() now matches actual patterns for MP3 files
-     based on the first two bytes of the file, rather than just the
-     first one
-   Simplified DeleteAPEtag() and made it work properly with Lyrics3
-
-
-1.6.3: [May-17-2003] James Heinrich
-   » Added support for Bonk  (thanks ahØartemis*dk)
-     New file: getid3.bonk.php
-   » Added support for AVR  (thanks ahØartemis*dk)
-     New file: getid3.avr.php
-   ¤ Contents of getid3.id3.php moved to getid3.id3v1.php
-     Removed file: getid3.id3.php
-   ¤ Contents of getid3.frames.php moved to getid3.id3v2.php
-     Removed file: getid3.frames.php
-   ¤ Returned data structure documentation improved and updated and
-     now stored in getid3.structure.txt rather than getid3.readme.txt
-     New file: getid3.structure.txt
-   ¤ Now including the GNU General Public License in the distribution
-     as getid3.license.txt
-     New file: getid3.license.txt
-   ¤ Added new, optional, parameter to WriteAPEtag() (and also
-     GenerateAPEtag()) which must be set to TRUE if the values you
-     are passing are already UTF8-encoded, otherwise all data is
-     encoded to UTF8 by default. For all ASCII/ANSI data this value
-     should be left at the defaul value of FALSE.
-   ¤ Added third, optional, parameter to getID3v2Filepointer() -
-     $StartingOffset (default == 0) which can parse an ID3v2 tag
-     in a file at a position other than the start-of-file.
-   ¤ ['video']['pixel_aspect_ratio'] now returned when known
-   ¤ AVI files with WMA audio now return ['audio']['dataformat']
-     of 'wma' rather than 'wav'
-   ¤ ASF-WMA files now return the artist value from WM/AlbumArtist
-     in ['comments']['artist']  (thanks msibbaldØsaebauld*com)
-   ¤ ASF-WMA files now return the 'author' value from
-     ['asf']['content_description'] in ['comments']['artist']
-     instead of ['comments']['author']
-   ¤ ASF-WMA files now return the 'description' value from
-     ['asf']['content_description'] in ['comments']['comment']
-     instead of ['comments']['description']
-   * Bugfix: APE tag writing with multiple values for a tag (more
-     than one ARTIST for example) was not being correctly written
-     (thanks ahØartemis*dk)
-   * Bugfix: CreateDeepArray() was returning an empty-string key as
-     the top-level returned value - ['iso']['files'] now directly
-     contains the file listing without an empty array in between.
-   * Bugfix: ID3v2 genreid was not being returned in some cases.
-   * Bugfix: APEv1 tags would generate error messages
-   * Bugfix: APE tags would sometimes show phantom second entry for
-     each item (title, artist, etc) with no data
-   * Bugfix: APE tag writing was not UTF8-encoding the data -
-     non-ASCII characters (above chr(127)) were being incorrectly
-     stored  (thanks ahØartemis*dk)
-   * Bugfix: getid3.demo.scandir.php had undefined function error
-   * Bugfix: getid3.demo.scandir.php would not display list of files
-     with no tags
-   Added link to getid3.demo.check.php from list of specific-tags
-     files in getid3.demo.scandir.php
-
-
-1.6.2: [May-04-2003] James Heinrich
-   » New official mirror site for getID3() - http://www.getid3.org
-   » Added basic support for SWF (Flash)  (thanks n8n8Øyahoo*com)
-     New file: getid3.swf.php
-   » Added experimental support for parsing the audio portion of
-     MPEG-video files. I don't have any actual documentation for
-     this, so this part is experimental and not guaranteed accurate,
-     but it seems to be working OK as far as I have been able to test
-     it. Bug reports (or even better - documentation!) are welcome at
-     info@getid3.org
-   » Added new simple directory-scanning sample file
-     New file: getid3.demo.simple.php
-   » getid3.demo.write.php now writes APE tags as well.
-   ¤ Renamed getid3.write.php to getid3.demo.write.php
-   ¤ Renamed audioinfo.class.php to getid3.demo.audioinfo.class.php
-   ¤ getid3.php now automatically includes the getid3.functions.php
-     function library file, no need to include it seperately.
-   ¤ getLyrics3Filepointer() has been changed to be consistant with
-     all the other similar function structures - the parameters have
-     changed. The old function has been renamed to getLyrics3Data()
-   ¤ Added DeleteAPEtag() function to getid3.ape.php
-   ¤ HandleID3v1Tag() now only handles ID3v1. Lyrics3 processing is
-     now done by HandleLyrics3Tag()
-   ¤ If BitrateHistogram is enabled in getOnlyMPEGaudioInfo() it now
-     also returns ['mpeg']['audio']['version_distribution'] showing
-     the number of frames of each MPEG version (1, 2 or 2.5) - all
-     frames *should* be of the same MPEG version
-   ¤ getID3v1Filepointer() always returns TRUE now, even if it didn't
-     find a valid ID3v1 tag
-   ¤ getOnlyMPEGaudioInfo() now looks for MPEG sync in the first 128k
-     bytes rather than the first 64k bytes
-   ¤ Added dummy function GetAllMP3info() to generate warning not to
-     use that deprecated function.
-   ¤ ['video']['codec'] is now 'MPEG' for all MPEG video files (this
-     will change to 'MPEG-1' or 'MPEG-2' as soon as I figure out how
-     to determine that)  (thanks jigalØspill*nl)
-   ¤ ['mpeg']['audio']['LAME']['mp3_gain'] renamed to
-     ['mpeg']['audio']['LAME']['mp3_gain_db'] (gain in dB)
-   ¤ Added ['mpeg']['audio']['LAME']['mp3_gain_factor'] (gain as a
-     multiplication factor)
-   ¤ Added support for Preset and Surround Info bytes from LAME VBR
-     tag (http://gabriel.mp3-tech.org/mp3infotag.html)
-   * Bugfix: APE tag writing would put the string 'Array' for all
-     values rather than the actual data  (thanks ahØartemis*dk)
-   * Bugfix: Warning now generated for VBR MPEG-video files because
-     getID3() cannot determine average bitrate. If you know of
-     documentation that would tell me how to do this, please email
-     info@getid3.org
-   * Bugfix: Replay Gain values from Vorbis comments are now
-     returned in ['replay_gain'] (and not in ['comments'])
-     (thanks ahØartemis*dk)
-   * Bugfix: Replay Gain values from APE comments are now correctly
-     returned in ['replay_gain']  (thanks ahØartemis*dk)
-   * Bugfix: getid3.demo.check.php is now case-insensitive when
-     assuming a format for a corrupted file if standard detection
-     does not identify the file type.
-   * Bugfix: RIFF comments were overwriting/suppressing ID3 comments
-     for RIFF-MP3 files  (thanks wmØwofuer*com)
-   * Bugfix: RIFF-MP3 files with 'RMP3' chunks instead of 'WAVE' were
-     not being correctly identified.
-   * Bugfix: ID3v2 padding shorter than the length of an ID3v2 frame
-     header was not correctly detected
-   * Bugfix: getid3.demo.check.php now does in-depth scanning for MP2
-     and MP1 files the same as for MP3 files based on file extension
-     if a MPEG-audio structure isn't found immediately at the start
-     of the file
-   * Bugfix: removed condition where RIFF-WAV was being scanned for
-     MPEG-audio signature when it shouldn't be present (non-MP3 WAV)
-   * Bugfix: ASF files were not always showing correct audio datatype
-   * Bugfix: array_merge_clobber() and array_merge_noclobber() were
-     not being conditionally defined in getid3.functions.php
-     (thanks rich.martinØreden-anders*com)
-   * Bugfix: stream_numbers was not being correctly returned in
-     bitrate_mutual_exclusion_object chunks of ASF files
-   * Bugfix: Added support for 24kHz and 12kHz audio in ASF files
-   * Bugfix: Removed possible undefined offset error in MP3s where
-     cannot find synch before end of file
-   * Bugfix: Removed potential out-of-memory crash situation when
-     parsing Real files with chunks larger than the available memory
-     (thanks jigalØspill*nl)
-   * Bugfix: ID3v1 was incorrectly taking precedence over ID3v2 in
-     the ['comments'] array (thanks lionelflØwanadoo*fr)
-   * Bugfix: No longer calculates overall bitrate and playtime for
-     VBR MPEG video files based on the audio bitrate.
-   * Bugfix: AssumeFormat was not working properly
-   Added summary footer line to getid3.demo.check.php
-   Added '.mpeg' to the list of assume-format-from-filenames list in
-     getid3.demo.check.php
-   MPEG-video files now more reliably detected
-   A number of additional features have been added to
-     getid3.demo.scandir.php
-   Added many RIFF-AVI audio types and fourcc video types to the
-     lookup functions in getid3.riff.php
-   Now identifes files with Lyrics3 v1 tags that are of incorrect
-     length (v1 Lyrics3 is supposed to be 5100 bytes long, but
-     [unknown program] writes variable-length tags (which is illegal
-     for Lyrics3 v1)). getID3() now correctly parses these tags and
-     issues a warning.
-   Split GetFileFormat() to GetFileFormat() and GetFileFormatArray()
-   HTML colors in getid3.demo.check.php are now defined as constant
-     variables at the top of the file (if you want to change them)
-   Added support for OptimFROG v4.50x (non-alpha) (new header fields)
-     (thanks floringhidoØyahoo*com)
-   Added support for Lossless Audio v0.4 (thanks mikeØbevin*de)
-
-
-1.6.1: [March-03-2003] James Heinrich
-   » Added support for writing APE v2.
-     WriteAPEtag() in getid3.ape.php
-     NOTE: APE v1 writing support will *not* be added to future
-     versions of getID3()
-     (thanks ahØartemis*dk and adamØphysco*com for the idea)
-   » Added support for AIFF (Audio Interchange File Format) including
-     AIFF, AIFC and 8SVX  (thanks ahØartemis*dk for the idea)
-     Removed file: getid3.aiff.php
-   » Added support for OptimFROG (v4.50a and v4.2x)
-     (thanks ahØartemis*dk for the idea)
-     New file: getid3.optimfrog.php
-   » Added support for WavPack  (thanks ahØartemis*dk for the idea)
-   » Added support for LPAC  (thanks ahØartemis*dk for the idea)
-   » Added support for NeXT/Sun .au format
-     New file: getid3.au.php
-   » Added support for Creative SoundBlaster VOC format
-     New file: getid3.voc.php
-   » Added support for the BWF (Broadcast Wave File) RIFF chunks
-     "bext" and "MEXT"  (thanks Ryan and njhØsurgeradio*co*uk)
-   » Added support for the CART (Broadcast Wave File) RIFF chunks
-     (thanks Ryan)
-   » Added getid3.demo.scandir.php - a sample recursive scanning demo
-     that scans every file in a given directory, and all sub-
-     directories, and stores the resulting data in MySQL database,
-     and then displays a list of duplicate files based on md5_data
-   ¤ ['md5_data_source'] now contains the MD5 value for the original
-     uncompressed data for formats that store that information
-     (currently only FLAC v0.5+). ['md5_data'] (if chosen to be
-     calculated) will contain the calculated MD5 value for the
-     compressed file. To check if 2 files are identical in every way,
-     including all comments: compare ['md5_file']. To check if two
-     files were compressed from the same source file: compare
-     ['md5_data_source']. To check if the compressed audio/video data
-     of two files is identical, even if comments or even the
-     container file format is different (MP3 in RIFF container,
-     FLAC in Ogg container, etc): compare ['md5_data'].
-   ¤ ['md5_data'] for 8-bit WAV files is now calculated based on a
-     converted version of the data from unsigned to signed (MSB
-     inverted) to match the MD5 value calculated by FLAC
-   ¤ New optional parameter added to GetAllFileInfo() -
-     $MD5dataIfMD5SourceKnown (default: false). If false the md5_data
-     value will NOT be calculated for files (such as FLAC) that have
-     ['md5_data_source'] set, even if $MD5data == true.
-     (thanks ahØartemis*dk)
-   ¤ getid3.check.php renamed to getid3.demo.check.php
-   ¤ Added GetTagOnly() function to getid3.php - similar to
-     GetAllFileInfo() except only takes a filename as a parameter and
-     only returns ID3v2, APE, Lyrics3 and ID3v1 tag information - no
-     attempt is made to parse the data contents of the file at all.
-     (thanks Phil for the idea)
-   ¤ Added ['audio']['lossless'] and ['video']['lossless'] for all
-     formats (when known). Both are boolean values - true means the
-     data is lossless-compressed, false means the data is lossy-
-     compressed.
-   ¤ Added ['audio']['compression_ratio'] and/or
-     ['video']['compression_ratio'] for all formats. Returns a number
-     (usually) less than 1, where 1 represents no compression and 0.5
-     represents a compressed file half the size of the original file
-   ¤ Added ['video']['bits_per_sample'] to all video formats (when
-     known)
-   ¤ Added ['video']['frame_rate'] to all video formats (when known)
-   ¤ ['fileformat'] set to 'mp1' or 'mp2' instead of 'mp3' when
-     ['audio']['dataformat'] is one of those  (thanks ahØartemis*dk)
-   ¤ Added 4th parameter to md5_data(), $invertsign, which will invert
-     the MSB of each byte before MD5'ing. This is needed for 8-bit
-     WAV files because FLAC calculates the stored MD5 value on
-     signed data rather than the original byte values. ['md5_data']
-     of an 8-bit WAV will now match the ['md5_data_source'] value
-     (thanks lichvarmØphoenix*inf*upol*cz)
-   ¤ ['ape']['items']['data'] and ['ape']['items']['data_ascii'] now
-     contains an array of values, if the tag contains UTF-8 text (as
-     opposed to binary data)
-   ¤ ['mpeg']['audio']['bitratemode'] renamed to
-     ['mpeg']['audio']['bitrate_mode']
-   * Bugfix: Removed potential bug that could replace all MP3 file
-     contents with only the new ID3v2 tag in getid3.putid3.php
-   * Bugfix: md5_data values calculated for RIFF (WAV, AVI) files
-     were incorrect  (thanks ahØartemis*dk)
-   * Bugfix: MP3 data in an MP4 wrapper fileformat could not identify
-     bitrate  (thanks ahØartemis*dk)
-   * Bugfix: ['audio'] and/or ['video'] keys would sometimes get
-     removed even if not empty
-   * Bugfix: Prevented creation of null entries in
-     ['RIFF']['WAVE']['INFO'] if a comment entry was not present
-   * Bugfix: Potential infinite-loop condition in getid3.ogg.php
-     (thanks afshin.behniaØsbcglobal*net)
-   * Bugfix: Ogg files with illegal ID3v1 (and/or APE or Lyrics3)
-     tags were not finding the last Ogg page
-     (thanks afshin.behniaØsbcglobal*net)
-   * Bugfix: replay-gain values not properly set from LAME tag
-   * Bugfix: RIFF-MP3 had incorrect md5_data
-   * Bugfix: the LAME DLL CBR problem of not re-writing the LAME
-     frame at the beginning of the data is now detected for MP3s
-     with ID3v2 tags as well
-   * Bugfix: APE tags with multiple values (ie multiple entries in
-     the "artist" tag) are now shown properly in ['ape']['items']
-   * Bugfix: fixed condition where APE tag with no ID3v1 tag could be
-     mistaken for APE tag with ID3v1 (and incorrectly parsed)
-   * Bugfix: added warning if ID3v2 frame has zero-length data
-     (thanks cmassetØclubinternet*fr)
-   * Bugfix: getid3.frames.php looking for non-existant key in USER
-     frames
-   Improved detection of RIFF-MP3 data. [unknown program] encodes
-     RIFF-WAV data with a chunk name of 'RMP3' instead of the
-     standard 'RIFF'
-   Encoder now returned in both ['comments'] and ['audio']['encoder']
-     for RIFF-WAV files with an INFO.ISFT chunk
-   Generate a warning for FLAC files encoded with v0.3 or v0.4
-     because audio_signature is not calculated during encoding
-     (thanks ahØartemis*dk)
-   Modified getid3.check.php to display md5_data_source as well as
-     md5_file and md5_data if display-MD5 mode is selected
-   Modified getid3.check.php to assume-format based on file extension
-     in browse mode if fileformat is found to be 'id3' (formerly only
-     if the fileformat was null)
-   Changed scaling of BitrateColor() from representing 1-256kbps to
-     representing 1-768kbps for better display of high-bitrate files,
-     specifically lossless-compressed CD-audio (FLAC, LA, etc)
-
-
-1.6.0: [January-30-2003] James Heinrich
-   » Added support for OggFLAC (FLAC data stored in an Ogg container)
-     (thanks ahØartemis*dk for the idea)
-   » Added support for Speex (the data stored in an Ogg container)
-   » Comments are now available in the root 2-dimensional array
-     ['comments'] - each entry in this array will contain one or more
-     strings. For example, if there are two artists then
-     ['comments']['artist'][0] will contain the first one and
-     ['comments']['artist'][1] the other. All keys are forced
-     lowercase. Comments will be stored in the ['comments'] array in
-     this order of precedence:
-     1) Native format tags (ASF, VQF, NSV, RIFF, Quicktime, Vorbis)
-     2) APE tags
-     3) ID3v2
-     4) Lyrics3
-     5) ID3v1
-     Lower-priority tags will not overwrite or append existing values
-     of higher-priority tags (for example, 'artist' in ID3v1 will be
-     ignored if already specified in APE), but missing values will be
-     filled in (for example, if 'album' is specified in ID3v2 but not
-     in APE, it will be included in the ['comments'] array).
-     Note: Root keys (['title'], ['artist'], etc) are NOT available
-     in this or future versions of getID3().
-     (thanks ahØartemis*dk)
-   » MD5 hashes are now available for all formats for both the entire
-     file (['md5_file']) and the portion of the file containing only
-     the audio/video data, stripped of all prepended/appended tags
-     like ID3v2, ID3v1, APE, etc - ['md5_data']
-     (thanks ahØartemis*dk for alternate md5_file() function that
-     runs on UNIX system running PHP < 4.2.0)
-     NOTE: Ogg files require the use of vorbiscomment to obtain the
-     md5_data value. vorbiscomment must be downloaded from
-     http://www.vorbis.com/download.psp and placed in the getID3()
-     directory. All Ogg formats (Vorbis, OggFLAC, Speex) are affected
-     by this problem, but only OggVorbis files can be processed with
-     vorbiscomment. OggFLAC and Speex files will be processed by
-     getID3(), but this may result in an incorrect value for md5_data
-     in the event that VorbisComments are larger than 1 page (4-8kB).
-     NOTE: md5_data for Ogg will not work if PHP is running in Safe
-     Mode
-   » There is now a wrapper class available, written by Allan Hansen,
-     which should simplify extracting most common basic information
-     (such as format, bitrate, comments).
-     New file: audioinfo.class.php
-   » OggWrite() in getid3.ogginfo.php has been replaced with a new
-     version that uses vorbiscomment to write the comments, because
-     of a reported bug that can corrupt OggVorbis files such they
-     cannot be played.
-     NOTE: Ogg comment writing now requires the use of vorbiscomment
-     which must be downloaded from http://www.vorbis.com/download.psp
-     and placed in the getID3() directory.
-     NOTE: Ogg comment writing will not work if PHP is running in
-     Safe Mode
-   ¤ New root key ['tags'] is now always returned for all formats.
-     It is an array that may contain any of:
-     * Native format tags: 'vqf', 'riff', 'vorbiscomment', 'asf',
-       'nsv', 'real', 'midi', 'zip', 'quicktime'
-     * Appended data tags:  'ape', 'lyrics3', 'id3v2', 'id3v1'
-   ¤ New root key ['audio'] is an array containing any or all of:
-       codec, channels, channelmode, bitrate, bits_per_sample,
-       dataformat, bitrate_mode, sample_rate, encoder
-       Note: This replaces several root keys, including:
-         bitrate_audio, bits_per_sample, frequency, channels
-   ¤ New root key ['video'] is an array containing any or all of:
-       bitrate_mode, bitrate, codec, resolution_x,  resolution_y,
-       resolution_y, frame_rate, encoder
-       Note: This replaces several root keys, including:
-         bitrate_video, resolution_x, resolution_y, frame_rate
-   ¤ ['id3']['id3v1'] has moved to ['id3v1']
-   ¤ ['id3']['id3v2'] has moved to ['id3v2']
-   ¤ ['audiodataoffset'] and ['audiodataend'] have been renamed to
-     ['avdataoffset'] and ['avdataend'] respectively
-   ¤ GetAllMP3info() has been changed to GetAllFileInfo() with a
-     different parameter list ($allowedFormats is no longer a
-     parameter).  Check your code where you're calling
-     GetAllMP3Info() - you will need to change both the function
-     name and the parameter list if you pass more than 2 parameters
-   ¤ All formats now return ['audio']['dataformat'] and/or
-     ['video']['dataformat'] where appropriate - this goes along with
-     ['fileformat'] - ['fileformat'] will return the actual structure
-     of the file, whereas ['dataformat'] will return the format of
-     the data inside that structure. For example, an Ogg file can
-     contain Vobis data (normal), or it can contain FLAC data in the
-     Ogg container format. In that case, ['fileformat'] would be
-     'ogg', but ['dataformat'] would be 'flac'.
-     Note: this means that WAV and AVI files now return a
-     ['fileformat'] of 'riff' rather than 'wav' or 'avi'.
-   ¤ ['filesize'] is no longer returned for files larger than 2GB
-     because PHP does not support large file access. Attempting to
-     parse a file larger than 2GB will result in a message stored in
-     ['error'] and ['filesize'] not set.
-   ¤ APEtag, ID3v1, and ID3v2 are now supported on ALL multimedia
-     files - even if illegal by format. Ogg will return warning if
-     ID3/APE tags are present.  (thanks ahØartemis*dk)
-   ¤ All files: non-critical errors are now returned in the root key
-     ['warning'] rather than ['error'] (only critical errors that
-     prevent getID3() from correctly parsing the file are returned in
-     ['error']  (thanks ahØartemis*dk)
-   ¤ Renamed all references to $MP3fileInfo to $ThisFileInfo
-   ¤ Joliet now supported for ISO-9660.
-     ['iso']['supplementary_volume_descriptor'] is now returned, if
-     available, and ['iso']['files'] will contain ASCII equivalents
-     of the Unicode directory structure & filenames stored.
-   ¤ Moved Monkey's Audio code from getid3.ape.php to seperate file.
-     New file: getid3.monkey.php
-   ¤ Added new keys for ISO-9660: ['name_ascii'] for directories,
-     ['file_identifier_ascii'] for files
-   ¤ Added root key ['track'] for CD-audio files
-   ¤ Ogg/Vorbis-comment files now have comments returned inside
-     ['ogg']['comments_common'] as an array of strings, rather than
-     simple strings in ['ogg']
-   ¤ Quicktime files now have comments returned inside
-     ['quicktime']['comments'] as an array of strings, rather than
-     simple strings in ['quicktime']
-   ¤ ['mime_type'] is a new root key returned for all supported
-     formats (thanks ahØartemis*dk)
-   ¤ ['fileformat'] now returns 'mp1' instead of 'mp3' for MPEG-1
-     layer-I audio files (thanks ahØartemis*dk)
-   ¤ ['mpeg']['audio']['bitratemode'] now returns lowercase
-   ¤ MPEG-4 audio files which consist of MP3 data wrapped in a
-     Quicktime fileformat will now return the usual data in
-     ['mpeg']['audio']
-   ¤ Type-1 DV AVIs are now supported
-   ¤ DV AVIs will return 1 or 2 in ['RIFF']['video'][x]['dv_type']
-   ¤ Changed ['fileformat'] from 'mpg' to 'mpeg' for MPEG video files
-   ¤ ASF comments are now stored in ['asf']['comments'] instead of
-     ['asf']
-   ¤ RealMedia chunk data is now returned inside ['real']['chunks']
-     instead of ['real']
-   ¤ ['replay_gain'] now properly populated from APE tags
-   ¤ Added support for ASF_Old_ASF_Index_Object in ASF files
-     (thanks ahØartemis*dk)
-   ¤ AAC-ADTS files now return ['aac']['bitrate_distribution']
-   ¤ ParseVorbisComments() has been replaced with
-     ParseVorbisCommentsFilepointer() (with different parameters)
-   ¤ All references to any key ['frequency'] are now ['sample_rate']
-   ¤ Moved ID3v2 comments from ['id3v2'] into common root
-     ['comments'] structure, and now returns more values than before
-   * Bugfix: ['iso']['files'] and ['zip']['files'] could potentially
-     contain duplicate entries (in a numeric-indexed array) for files
-     if the directory structure specifies files multiple times.
-     Entries are now guaranteed unique, with the last entry for the
-     file overwriting any former ones.
-   * Bugfix: RIFF parsing had numerous issues, including:
-     - large AVIs would take a very very long time to parse
-     - chunks with odd (not even) sizes would cause the parser fail
-     - video and/or audio codecs not always identified
-     The ParseRIFF() function has been completely rewritten and fixes
-     all known issues with RIFF parsing. Users are, however,
-     encouraged to double-check output of any parsed (AVI/WAV/CDDA)
-     files.
-   * Bugfix: Modified getid3.riff.php to return correct total
-     bitrates for AVIs with multiple audio streams
-   * Bugfix: GetFileFormat() was not creating array structure
-     correctly  (thanks ahØartemis*dk)
-   * Bugfix: LAME tag for MP3s can only specify up to 255kbps, so any
-     files with actual CBR bitrate of >=256 were reported incorrectly
-   * Bugfix: Lyrics3 synched lyrics were not being correctly returned
-   * Bugfix: CreateDeepArray() was broken for non-nested cases, which
-     meant ZIP and ISO ['files'] structures were broken
-   * Bugfix: Incorrect pattern matching for ZIP files meant no zip
-     files were being detected as such
-   * Bugfix: AAC-ADIF was returning an incorrect number of channels
-     (too few) in some cases  (thanks ahØartemis*dk)
-   * Bugfix: Vorbis comments were returning an incorrect value for
-     ['dataoffset'] in some cases
-   * Bugfix: MPEG video ['marker_bit'] and ['vbv_buffer_size'] were
-     incorrect
-   * Bugfix: ['playtime_string'] could potentially have a value of
-     x minutes and 60 seconds (ie 3:60 instead of 4:00)
-   Added support for FLAC cuesheets (FLAC 1.1.0+)
-     (thanks ahØartemis*dk)
-   Improved parsing speed in MP3, MP2 and AAC  (thanks ahØartemis*dk)
-   Extra error-checking added to try and identify corrupt files for
-     most audio formats  (thanks ahØartemis*dk)
-   More accurate playtime calculation for RealMedia
-     (thanks ahØartemis*dk)
-   Changed all relevant files to use ['audiodataoffset'] and
-     ['audiodataend'] rather than ['filesize'] where appropriate
-     (thanks ahØartemis*dk)
-   Added text encoding type 255 as a duplicate of UTF-16BE but with
-     Big-Endian rather than Little-Endian byte order
-   Added many RIFF-AVI audio types and fourcc video types to the
-     lookup functions in getid3.riff.php
-   Added numerous new known GUIDs to getid3.asf.php
-   Added PoweredBygetID3() function to easily get a "powered by"
-     string with the current getID3() version.
-   Added "Morgan Multimedia Motion JPEG2000" (MJ2C), "DivX v5" (DX50)
-     and "XviD" (XVID) codecs to list of known codecs in
-     getid3.riff.php
-   Changed GETID3_INCLUDEPATH path seperators to forced /
-     (from \ for Windows)
-   Modified getid3.check.php to only change \ directory seperators to
-     / on Windows operating systems
-   Modified getid3.check.php to handle larger-than-2GB files (which
-     now do not return a filesize)
-   Modified getid3.check.php to handle ['dataformat_audio'] and
-     ['dataformat_video']
-   Modified getid3.check.php to show a list of present tags in one
-     column rather than one column for each of ID3v1, ID3v2, etc
-   Modified getid3.check.php to show MD5 values. Initially disabled
-     but can be enabled for a directory with a click. md5_file is
-     always calculated when displaying detailed info about a single
-     file; md5_data is calculated if the file is < 50MB
-   Modified getid3.check.php to show errors and warnings. Details are
-     visible with a mouseover or a click.
-   Changed getid3.check.php to use SafeStripSlashes instead of a
-     manual conditional directory name replacement for special
-     characters
-   Added sample recursive scanning sample code to getid3.readme.txt
-     (thanks lipisinØmail*ru for the idea)
-
-
-1.5.7: [January-10-2003] James Heinrich
-   » Added support for ISO 9660 (CD-ROM image) format. Most-useful
-     data is directory structure returned under ['iso']['files']
-     Note: Only ISO-9660 supported, not (yet) Joliet extension
-     (thanks nebula_djØsofthome*net for the idea)
-     New file: getid3.iso.php
-   ¤ ZIP files are now parsed by getID3() itself without relying on
-     built-in PHP functions and/or ZZipLib support.
-     (thanks Vince for the idea)
-   ¤ ZIP files now return a simple directory listing with filename
-     and filesize info only under ['zip']['files'].
-     Note: empty subdirectories will note appear in here, only files
-     and non-empty subdirectories. Information for all entries,
-     including empty subdirectories, is available under
-     ['zip']['central_directory'] (or under ['zip']['entries'] if the
-     Central Directory cannot be located (usually due to a trucated
-     file).
-   ¤ RIFF-WAV files with MP3 data (or MP3s with RIFF headers, if you
-     want to think of it that way) now have the MPEG audio portion
-     scanned and the usual data returned in ['mpeg']['audio'] if the
-     RIFF audio codec has wFormatTag of "85" (identified by getID3()
-     as "MPEG Layer 3")
-     (thanks ahØartemis*dk for the idea)
-   ¤ EXIF data (if present) is returned for JPEG files under
-     ['jpg']['exif']  (thanks nebula_djØsofthome*net)
-   ¤ ['filepath'] now returned for all files with the directory part
-     of the full filename.
-   ¤ ['filenamepath'] is now returned for all files (equivalent to
-     ['filepath'].'/'.['filename'])
-   * Bugfix: ['id3']['id3v2'][<framename>]['dataoffset'] was wrong
-   * Bugfix: MP3s tagged with iTunes have an invalid comment field
-     frame name ('COM ' - should be 'COMM') but the data is valid
-     otherwise; the frame is now renamed to 'COMM' and parsed
-     normally (with the error noted in ['error'])
-     (thanks kheller2Ømac*com for the sample file)
-   * Bugfix: Some ASF/WMA audio files were not being identified as
-     any format  (thanks ahØartemis*dk)
-   * Bugfix: Warning now generated and ASCII format assumed for
-     invalid text encoding values in ID3v2
-   * Bugfix: Changed ZIP detection pattern from 'PK' to 'PK\x04\x03'
-   * Bugfix: Ogg/FLAC files with large Vorbis comments were dying in
-     an infinite loop with lots of error messages due to missing $fd
-     parameter on ParseVorbisComments()  (thanks ahØartemis*dk)
-   * Bugfix: ['data'] and ['image_mime'] were being returned for all
-     Ogg comments even if they were not images for versions of PHP
-     that have image_type_to_mime_type() built in (ie PHP 4.3.0+)
-
-
-1.5.6: [December-31-2002] James Heinrich
-   » Added support for NSV (Nullsoft Streaming Video)
-     (www.nullsoft.com/nsv/)
-     (thanks demonØsoundplanet*com for the idea)
-     New file: getid3.nsv.php
-   » Added support for CD-audio track files (track01.cda etc)
-   ¤ Added standard ['frame_rate'] root value when known (AVI, NSV,
-     MPEG-video)
-   ¤ ASF files now report ['fileformat'] of:
-     'wmv' when Windows Media Video codec v7/v8/v9 is used;
-     'wma' when any 'Windows Media Audio' named audio codec is used
-           and no video stream is present;
-     'asf' in all other cases (audio-only, video-only, or both)
-   ¤ Removed support for ZIP functions (will be rewritten to not
-     require ZZIPlib support in future versions)
-   ¤ Added function SafeStripSlashes() as a drop-in replacement for
-     stripslashes(), but that only strips slashes if magic_quotes_gpc
-     is set
-   ¤ Removed support for remote file scanning (HTTP / FTP)
-   ¤ Added ['aac']['frames'] (number of AAC frames in file)
-   ¤ Added ['mpeg']['audio']['frame_count'] when a bitrate histogram
-     is created
-   ¤ Average bitrate for VBR MP3/MP2 is calculated from actual counts
-     of frames of various bitrates (rather than relying on the header
-     values or filesize) when a bitrate histogram is created
-   ¤ RecursiveFrameScanning() split out into seperate function
-     (getid3.mp3.php)
-   ¤ Removed old function getMP3header() from getid3.mp3.php
-   ¤ Changed default MPEG_VALID_CHECK_FRAMES (number of mp3 frames
-     scanned to ensure a valid audio sequence has been located) from
-     10 to 25. This means scanning will be slightly slower, but more
-     reliable/accurate
-   * Bugfix: ID3v2.2 - valid frame names not correctly detected
-     (thanks maeckerØweb*de for the sample file)
-   * Bugfix: ID3v2.2 - valid padding not correctly detected
-     (thanks maeckerØweb*de for the sample file)
-   * Bugfix: MIDI files with flat key signatures were not being
-     correctly reported (thanks alexleeisØshaw*ca for sample file)
-   * Bugfix: now returns message in ['error'] if file does not exist
-   * Bugfix: ['RIFF']['video'][x]['codec'] wasn't always being
-     correctly populated
-   * Bugfix: ['bitrate'] was incorrect for multi-stream RealMedia
-   * Bugfix: ['playtime_seconds'] was sometimes null or incorrect
-     for multi-stream RealMedia
-   * Bugfix: ChannelTypeID was incorrect in RVA2 ID3v2.4 frames
-   * Bugfix: Fixed potential divide-by-zero error for corrupt FLAC
-     files  (thanks ahØartemis*dk)
-   * Bugfix: AAC-ADTS was not returning ['bitrate_mode'] unless
-     $ReturnExtendedInfo was TRUE  (thanks ahØartemis*dk)
-   * Bugfix: LAME-encoded CBR MP3s now properly identified as CBR
-     with correct bitrate  (thanks ahØartemis*dk)
-   * Bugfix: VBR MP2 (or headerless MP3) is now identified as VBR
-     rather than CBR. Note: to obtain VBR bitrate for headerless
-     files, the entire file is scanned and a histogram distribution
-     of bitrates is created, and the average bitrate calculated from
-     that.  (thanks ahØartemis*dk for sample file)
-   Added support for DSIZ chunks in VQF, and checks to make sure size
-     of audio data matches DSIZ value, if present
-     (thanks ahØartemis*dk for sample file)
-   Rewrote GetAllMP3info() - removed some unneccesary code, changed
-     format-detection routine from ParseAsThisFormat() to
-     GetFileFormat() to allow for more flexible format parsing
-     (needed for ISO CD-ROM images, helpful for Quicktime and others)
-   Changed references in all files from string-cast indexes: ["$i"]
-     to non-cast indexes: [$i] where appropriate
-   Put a sans-serif 9pt style on all text in getid3.check.php
-   getAACADTSheaderFilepointer() now return TRUE if synch is lost
-     after the first frame has been successfully parsed (previously
-     it would return FALSE if synch was lost at any time, meaning the
-     file is most likely MP3, which was incorrect)
-     (thanks ahØartemis*dk for sample file)
-   Speed improvement code changes to getid3.mp3.php (up to 24% faster
-     in some cases)  (thanks ahØartemis*dk for the code)
-   Changed all include_once() to require_once()
-
-
-1.5.5: [November-25-2002] James Heinrich
-   » Added support for La (Lossless Audio - www.lossless-audio.com)
-     (thanks ahØartemis*dk for the idea)
-     New file: getid3.la.php
-   ¤ Moved lookup functions from getid3.lookup.php to the files where
-     they are used.
-     New file: getid3.id3.php
-     New file: getid3.rgad.php
-     Removed file: getid3.lookup.php
-   ¤ getID3v1Filepointer() returns FALSE if ID3v1 tag not found
-   ¤ Added new paramter "ReturnExtendedInfo" to the function
-     getAACADTSheaderFilepointer() in getid3.aac.php which now
-     defaults to FALSE - if TRUE then the data for every frame is
-     returned (containing aac_frame_length, adts_buffer_fullness and
-     num_raw_data_blocks, which aren't usually very useful). Speed
-     improvement with FALSE is about 35%.
-   ¤ Now returns fopen() errors in ['error'], for example if a remote
-     file is not accessible.
-   ¤ Changed default number of MP3 audio frames to scan to determine
-     if a valid stream has been found from 5 to 10, now also defined
-     as a constant at the top of getid3.mp3.php  This will result in
-     slightly slower MP3 parsing, but greater reliability in
-     detecting false/invalid/corrupted VBR headers.
-   ¤ fopen() errors now displayed in getid3.putid3.php
-     (thanks miguel.dieckmannØhamburg*de)
-   ¤ Added 4th parameter to decodeMPEGaudioHeader() $ScanAsCBR which
-     will force an MP3 audio frame sequence to be force-scanned in
-     CBR mode. You should never need to call this directly, it's only
-     used internally to scan for MP3 files that have an illegal VBR
-     header with CBR data. (thanks fletchØpobox*com)
-   * Bugfix: ASF_Marker_Object in getid3.asf.php was always returning
-     an error in non-existant "reserved_1" and failing
-   * Bugfix: VBR bitrate calculations in getid3.mp3.php only occur if
-     ['mpeg']['audio']['VBR_frames'] is defined.
-     (thanks fletchØpobox*com)
-   * Bugfix: getid3.putid3.php no longer deletes original MP3 if
-     ID3v2 tag writing fails (thanks miguel*dieckmannØhamburg*de)
-   * Bugfix: incorrect order of if-statement error messages in
-     getid3.putid3.php (thanks miguel*dieckmannØhamburg*de)
-   getid3.asf.php now notes the error and continues parsing rather
-     than failing when it encounters an error parsing a chunk
-   Now actually scan 1000 frames for AAC ADTS as reported in the
-     v1.5.4 changelog, rather than 100. (thanks ahØartemis*dk)
-   Improved scanning speed in getAACADTSheaderFilepointer() by ~30%
-     (thanks ahØartemis*dk for the fix)
-   Added FileSizeNiceDisplay() function to getid3.functions.php for
-     formatting filesize output in kB, MB, GB, etc.
-
-
-1.5.4: [October-07-2002] James Heinrich
-   » Added support for Quicktime.
-     New file: getid3.quicktime.php
-   » Added support for AAC files, both ADTS and ADIF header formats.
-     ADIF format is a pain because it's very similar to standard MP3
-     header format, and it's hard to distinguish between the two. I
-     have tried to make the detection accurate, but I have a limited
-     number of AAC test files to play with so if you have an AAC file
-     that gets detected as MP3/MP2 (or vice-versa), please send me
-     the details via email at infoØgetid3Øorg
-     ADTS format is very slow to parse because to get the bitrate of
-     VBR files the whole file has to be stepped through frame by
-     frame (getID3() scans up to the first 1000 frames and assumes
-     that to be close enough).
-     Note: I would suggest commenting out support for AAC (see top of
-     GetAllMP3info() function in getid3.php) unless you need it.
-     (thanks jfaulØgmx*de for the idea and sample Delphi source code)
-     New file: getid3.aac.php
-   » Added bitrate distribution analysis option for MP3 VBR files. A
-     new boolean parameter for getOnlyMPEGaudioInfo() enabled this
-     feature which steps through the MP3 file frame by frame and
-     counts how many frames of each bitrate exist. This information
-     is returned in ['mpeg']['audio']['bitrate_distribution']
-     Caution: this feature is very inefficient for large files and
-     takes a very long time and does lots of disk I/O. Use with care.
-   ¤ Changed layout of allowedFormats in GetAllMP3info() function in
-     getid3.php to allow easy removal of support for any of the
-     supported format. As stated above, I recommend commenting out
-     AAC unless needed.
-   ¤ Added ['flac']['compressed_audio_bytes'],
-     ['flac']['uncompressed_audio_bytes'], and
-     ['flac']['compression_ratio']
-   ¤ Replaced FXPT2DOT30toFloat() function with FixedPoint2_30()
-   * Bugfix: getid3.mpc.php was slightly miscalculating the number of
-     samples, therefore also bitrate and playtime
-     (thanks ahØartemis*dk for the fix)
-   * Bugfix: MonkeyCompressionLevelNameLookup() didn't know about
-     'insane' compression (thanks ahØartemis*dk for the fix)
-   * Bugfix: MonkeySamplesPerFrame() was incorrect for MAC v3.95+
-     (thanks ahØartemis*dk for the fix)
-   * Bugfix: getid3.check.php wasn't processing the assumeFormat
-     directive when (register_globals == off)
-   * Bugfix: detecting of synch pattern for MP3 files with invalid
-     data at the beginning wasn't always correct, also meant possible
-     incorrect bitrate/duration/etc info for such corrupt files.
-   getid3.functions.php now includes a replacement utf8_decode()
-     function for those PHP installations that are not configured
-     with the --with-xml option. (thanks stephaneØtekartists*com)
-
-
-1.5.3: [September-30-2002] James Heinrich
-   » Added support for VQF. (thanks mtØmansonthomas*com for the idea)
-     New file: getid3.vqf.php
-   » Added support for FLAC. Comments, if present, are returned under
-     ['ogg'] because they follow the Ogg Vorbis structure standard.
-     New file: getid3.flac.php
-   ¤ OS/2-format bitmaps are now correctly interpreted. The format of
-     the bitmap is now returned in ['bmp']['type_os'] and
-     ['bmp']['type_version']. OS/2 bitmaps can be v1 or v2, Windows
-     can be v1, v4 or v5
-
-
-1.5.2: [September-25-2002] James Heinrich
-   » Support for RealMedia (audio & video) added
-     Note: only tested on G2 and v5 audio and video files - if anyone
-     has older and/or newer sample files, please test it and/or send
-     me the sample files.
-     (thanks stephaneØtekartists*com for idea)
-     New file: getid3.real.php
-   » Support for BMP added. Palette and pixel data can optionally be
-     extracted as well - this is slow and generally unneccesary, but
-     the option is there if you need it. Also includes PlotBMP()
-     which will take the extracted pixel data and output it as a true
-     color PNG. This function requires GD v2.0+
-     Note: Untested on 16-bit and 32-bit BMPs because I couldn't find
-     any sample files - if you know of a program that can create such
-     files, please email infoØgetid3Øorg
-     Note: Support for RGB (uncompressed), RLE8 and RLE4 is included
-     and tested. BITFIELDS support is also included for 16- & 32-bit
-     formats, but it's untested, so if anybody has any test files
-     please send them to infoØgetid3Øorg
-     Note: Support currently only for Windows-format BMPs, and trying
-     to parse an OS/2-format bitmap leads to unpredictable/invalid
-     results.
-     New file: getid3.bmp.php
-   » PNG now fully parsed, including all information chunks
-     New file: getid3.png.php
-   ¤ Support for GIF/JPG/PNG moved to seperate files and expanded,
-     including standard ['resolution_x'] and ['resolution_y'] as well
-     as more thorough parsing of header information
-     New file: getid3.gif.php
-     New file: getid3.jpg.php
-   table_var_dump() simplified and now outputs &#123;-style character
-     entities for characters outside the normal alphanumeric range
-   CleanOggCommentName() changed to a regular expression
-     (thanks chris-getid3Øbolt*cx for rewriting the function)
-
-
-1.5.1: [September-20-2002] James Heinrich
-   » Added support for MPEGplus/Musepack SV7. ['fileformat'] is 'SV7'
-     for version 7 files (versions 4, 5 ,6 and 8 are not supported
-     yet, but will be of ['fileformat'] SV4, SV5, SV6 and SV8) when
-     they are supported (thanks Christian Fritz for the idea)
-     New file: getid3.mpc.php
-   ¤ ['bitrate_audio'], ['bitrate_video'], ['bitrate_mode'],
-     ['channels'], ['resolution_x'], and ['resolution_y'] keys added
-     for all appropriate formats
-   ¤ Ogg files with a COVERART comment now save and display the
-     attached image the same way as is done with ID3v2 APICs
-   ¤ ['ogg']['comments'][n]['data'] and
-     ['ogg']['comments'][n]['dataoffset'] is now returned for all
-     comments. ['ogg']['comments'][n]['data'] is only useful if
-     the field is supposed to contain binary data. It is a
-     base64_decode()'d version of ['value'].
-     ['ogg']['comments'][n]['dataoffset'] is the byte offset in the
-     file at which the 'COMMENTNAME=value string' starts, not the
-     start of just 'value'
-   ¤ ['ogg']['comments'][n]['image_mime'] is now returned if
-     ['ogg']['comments'][n]['data'] contains valid image data.
-   ¤ More than 3 Ogg pages may now be read in, if the comment data
-     is longer than 1 page (usually about 4kB)
-   ¤ ['fileformat'] is now 'mp2' rather than 'mp3' if it's MPEG-1,
-     Layer-II audio
-   ¤ ASF bitrates now calculated even if stream_bitrate_properties
-     object not present
-   ¤ ['asf']['stream_properties_object'] is now a numeric-key array
-     with one entry for each stream - the key being the stream number
-   ¤ ['replay_gain'] is returned for all audio formats that support
-     it (MP3-LAME, ID3v2, Ogg) (thanks Christian Fritz for the idea)
-   ¤ ['mpeg']['audio']['LAME']['RGAD']['radio_replay_gain'] is now
-     ['mpeg']['audio']['LAME']['RGAD']['radio'] (same for audiophile)
-   ¤ ASF/WMA files now use WM/Track to get track number from if
-     WM/TrackNumber is not available (thanks stephaneØtekartists*com)
-   ¤ ASF/WMV files now returns ['year'] and ['asf']['year']
-   ¤ ASV/WMV files now use ['content_description']['description'] for
-     the ['comment'] field (thanks stephaneØtekartists*com)
-   ¤ ['track'] is now always returned as an integer
-   * Bugfix: Ogg comments that are larger than one data page (usually
-     about 4kB) are now correctly parsed (thanks Christian Fritz)
-   * Bugfix: Ogg comment data is now UTF8-decoded
-   * Bugfix: Ogg comment writing now UTF8-encodes the data
-   * Bugfix: playtime for ASF files was off by <preroll> (usually
-     between 3 and 12 seconds)
-   * Bugfix: ['asf']['stream_properties_objects']['flags'] data was
-     possibly incorrect
-   * Bugfix: ASF Padding Object was overwriting
-     Stream Bitrate Properties Object data (now returned correctly in
-     ['asf']['padding_object']
-   * Bugfix: ASF Marker Object Reserved_2 field was incorrect
-   * Bugfix: ASF Bitrate Mutual Exclusion Object had incorrect stream
-     numbers
-   Warning displayed if incorrectly-formatted Ogg comment is present
-     (known to be an issue with CDex v1.40, but fixed by v1.50b7)
-     (thanks Christian Fritz)
-   Ogg comment writing now checks for valid comment names
-   Added bitrate column in getid3.check.php, and added some formatting
-     (font, colour)
-   Performance tweaks using bitwise math instead of binary string
-     operations
-
-
-1.5.0: [September-18-2002] James Heinrich
-   » Ogg comment writing support added. getid3.write.php has been
-     updated to allow for writing comment tags to both MP3 and Ogg.
-     Big thanks to Chris Bolt <chris-getid3Øbolt*cx> for writing the
-     OggWrite() function and offering it for inclusion in getID3()
-     New file: getid3.ogginfo.php
-   » Support for Monkey's Audio and APE tag added.
-     (thanks Christian Fritz for the idea)
-     New file: getid3.ape.php
-     ['fileformat'] now returns 'mac' for Monkey's Audio files, or
-     'ape' for files with an APE tag (Monkey's Audio or other format)
-   » getid3.thumbnail.php has been removed from the distribution and
-     the table_var_dump() function now outputs APICs as seperate
-     files in the same directory as the analyzed file. This should
-     make the image-displaying more reliable as well as reduce
-     complexity. The naming convention for the images is
-     filename.ext.[byte offset of APIC data].[jpg|gif|png]
-     If anybody still has any problems with corrupted images please
-     let me know at infoØgetid3Øorg
-   » Support for extended Xing/LAME tag
-     (see http://users.belgacom.net/gc247244/extra/tag.html)
-     Data is returned in ['mpeg']['audio']['LAME']
-   ¤ ['ogg']['tracknumber'] has been renamed to ['ogg']['track'] and
-     ['track'] is now returned in the root of the array
-   ¤ ['ogg']['pageheader'][n]['flag'] has been renamed to
-     ['ogg']['pageheader'][n]['flags'] and the unprocessed flag byte
-     is available in ['ogg']['pageheader'][n]['flags_raw']
-   ¤ ['frequency'] is now returned for WAVE files in the root of the
-     array (thanks danielØelectroteque*org)
-   ¤ ASF files now return codec, bitrate, resolution, etc information
-     under ['asf']['video_media'] or ['asf']['audio_media']
-   * Bugfix: RVA2 and EQU2 writing in getid3.putid3.php were
-     incorrectly writing Volume Adjustment field
-   * Bugfix: EQU2 in getid3.frames.php was reading Volume Adjustment
-     as unsigned integer instead of signed integer
-   * Bugfix: handling of remote files over HTTP & FTP was broken
-     (thanks Vince)
-   * Bugfix: incorrect handling of some ASF packets
-   ASF/Windows Media format now more fully parsed, including Index
-     Objects
-   Added several new fourCC video codecs
-
-
-1.4.3: [September-15-2002] James Heinrich
-   » Now parses ASF / WMV / WMA files
-   ¤ New file: getid3.asf.php
-   * Bugfix: RoughTranslateUnicodeToASCII() would return nothing
-     if didn't find a terminator it was expecting
-   Added FILETIMEtoUNIXtime() function (for converting 64-bit
-     Microsoft FILETIME timestamps, used in ASF files and elsewhere,
-     to UNIX Epoch timestamps)
-   Added GUIDtoBytestring() and BytestringToGUID() functions
-
-
-1.4.2: [September-12-2002] James Heinrich
-   » getID3() now requires PHP v4.1.0 or higher because it now is
-     designed to work with register_globals = off and the new auto-
-     globals ($_GET, $_SERVER, etc).
-   * Bugfix: VBR MP3 files with Fraunhofer-style VBR header were not
-     being correctly detected in most cases
-     (thanks dkushnerØoddcast*com and mikeØftl*com for sample files)
-   * Bugfix: IsValidTextEncoding() was broken
-   * Bugfix: Add stripslashes($EditorFilename) to getid3.write.php
-     (writing was broken for files with ' or " in the filename)
-     (thanks mikeØftl*com and kthejoker)
-   * Bugfix: 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. (thanks to mikeØftl*com for sample
-     Fraunhofer-style VBR file produced with MusicMatch v7.2)
-   ¤ Changed variable system to work with (register_globals = off)
-   ¤ Moved relevant code into seperate PlaytimeString() function
-   ¤ Added nl2br() to table_var_dump() for cleaner output
-   ¤ Now returns the following keys from Fraunhofer-VBR files:
-     ['VBR_seek_offsets'], ['VBR_seek_offsets_stride'],
-     ['VBR_offsets_relative'] and ['VBR_offsets_absolute']
-   ¤ Added ID3v1matchesID3v2() function and implemented in
-     getid3.check.php (thanks to "Guest" in the forums for the idea)
-   Changed amount of data read in getid3.getimagesize.php from 10kB
-     to entire file. (thanks mikeØftl*com)
-   Wrapped function_exists() checks around function definitions in
-     getid3.functions.php
-   Fixed a lot of E_WARNING and E_NOTICE situations, especially in
-     ID3-writing code (getid3.putid3.php, etc)
-   Added checks to make sure all needed data is available for writing
-     ID3v2 tags
-
-
-1.4.1b5: [May-30-2002] James Heinrich
-   * Bugfix: Unsynchronise() was broken, now fixed
-     (thanks mikeØftl*com)
-   * Bugfix: GenerateID3v2Tag() now correctly uses non-synchsafe
-     integers for frame size descriptors in ID3v2.3 and ID3v2.2
-     (thanks mikeØftl*com)
-   ¤ Added ['artist'], ['title'], etc keys to root of returned
-     array to provide a common place to access any returned info
-     from any file type. Currently gets info from ID3v1, ID3v2,
-     Ogg, and RIFF/WAVE. Possible returned keys are:
-     title, artist, album, year, genre, comment, track
-   ¤ Modified LookupGenre() function to search for either genre based
-     on numeric ID, or now reverse lookup as well
-   ¤ Added ['artist'], ['title'], etc keys to ['RIFF'] information
-     if info tags are present
-   Added functionality to attach a picture to the ID3v2 tag in
-     getid3.write.php
-   Sorted genres into alphabetical order (special 3 at end of list)
-     in getid3.write.php
-   Changed the comment-edit field in getid3.write.php to a multi-line
-     <textarea> from a single-line <input>
-   getid3.write.php now only writes ID3v2 frames that have data
-   Added default TXXX field to getid3.write.php to put a tagger info
-     field when writing ID3v2 tags. Description is "ID3v2-tagged by"
-     and data is "getID3() v[version] (www.silisoftware.com)"
-   Changed getid3.check.php to use the new common info keys
-   Improved file-format detection in getid3.check.php - if the auto-
-     detect based on the first few bytes of the file doesn't find a
-     known format (for example if the header is corrupt), a more
-     thorough scan is done based on the file extension
-   Added 'Edit ID3' link from getid3.check.php to getid3.write.php for
-     MP3 files  (thanks maxØgutalin*com for the idea)
-   Added 'Delete file' link from getid3.check.php to getid3.write.php
-     allowing you to permanently delete a file (be careful with this!!)
-     (thanks maxØgutalin*com for the idea)
-   Added some mouse-over titles for links in getid3.check.php
-
-
-1.4.1b4: [May-15-2002] James Heinrich
-   * Bugfix: getid3.check.php wasn't parsing MP3s with invalid headers
-     or padding at the beginning of the file - added 'assumeFormat'
-     parameter and 'Parse this file as:' options to force parsing in a
-     particular format  (thanks Alcohol for the sample file)
-   * Bugfix: unset(['fileformat']) and ['error'] added in cases where
-     file cannot be parsed in the assumed or forced format
-
-
-1.4.1b3: [May-01-2002] James Heinrich
-   ¤ For Ogg files, now calculates the real average bitrate (returned
-     in ['ogg']['bitrate_average']) and so the playtime of the file is
-     calculated on actual average bitrate, not nominal bitrate, so it
-     should be accurate now  (thanks to stephaneØtekartists*com for
-     telling me it was wrong)
-   * Bugfix: ID3v2FrameIsAllowed() wasn't behaving properly if the
-     writing functions were called for more than one file, because of
-     the static array not being cleared between uses. This is an
-     updated fix because the one in 1.4.1b2 didn't work :o)
-     (thanks soulcatcherØevilsoft*org and yoyo)
-   Added rawurlencode() to the filename parameter in table_var_dump()
-     for images (wouldn't work with path/file names containing special
-     characters (#, &, ", +)  (thanks Christian Fritz)
-   getid3.check.php no longer attempts to scan all MIDI tracks in
-     directory-browse mode, since this can take a long time. Detailed
-     single-file view is still fully scanned (new third parameter for
-     getMIDIHeaderFilepointer() controls this)
-   Small improvements to MoreNaturalSort()
-
-
-1.4.1b2: [April-18-2002] James Heinrich
-   ¤ GetAllMP3Info()'s 2nd parameter has changed from boolean to string
-     (now specifying the parse-this-file-as-this format, like 'mp3',
-     but also can be FALSE to mean don't assume any format, auto-detect
-     only), and a third parameter (array containing allowed formats)
-     has been added. The assumedFormat parameter allows a file to be
-     forced to be parsed as a certain format rather than relying on the
-     auto-detection of getID3() (ex: an MP3 wrapped in a RIFF/WAV
-     header will be auto-detected as RIFF/WAV, but if forced to parse
-     as MP3 will extract the original MP3 information)
-     (thanks reel_tazØusers*sourceforge*net)
-   * Bugfix: ID3v2FrameIsAllowed() wasn't behaving properly if the
-     writing functions were called for more than one file, because of
-     the static array not being cleared between uses (thanks yoyo)
-   * Bugfix: Lyrics3 data wasn't being properly copied from the ['raw']
-     keys to the easy keys (['title'], etc.)  (thanks Christian Fritz)
-   * Bugfix: some testing code was accidentally left in
-     getid3.thumbnail.php  (thanks Christian Fritz)
-   * Bugfix: RIFF/WAVE files are now more likely to have all their
-     chunks parsed.
-   * Bugfix: RIFF/WAVE bitrate & playtime now better calculated
-   * Bugfix: MP3 scanning for synch doesn't go beyond 64k now, to stop
-     intensive scanning through large file that don't have a synch
-     (thanks soulcatcherØevilsoft*org for a weird sample file)
-   Improved performance when scanning for MP3 synch (about 600% faster
-     if the synch is never found)
-   ZIP files no longer return the contents of each compressed file, as
-     that would very easily be more data than PHP could handle.
-     (thanks davidbullockØtech-center*com)
-   getid3.check.php now displays entries in a more natural sort order:
-     case insensitive, ignores most punctuation, treats accented chars
-     the same as their unaccent equivalent  (thanks mikeØftl*com)
-   Added support for SmartSound-format RIFF files (which are regular
-     RIFF/WAVE files with the first 4 chars changed from RIFF to SDSS)
-   All instances of while(list() = each()) replaced with foreach()
-
-
-1.4.1b1: [April-11-2002] James Heinrich
-   » Parses MIDI files.
-     NOTE: very slow at parsing, much slower than any other file type
-     NOTE: playtime is generally mostly accurate, but not always 100%
-   » Parses ZIP files (if ZZIPlib available, and only in PHP 4.0.7RC1
-     and later (see http://www.php.net/manual/en/ref.zip.php)
-     NOTE: currently untested as I'm unable to find php_zip.dll for
-     PHP/Win32 - if someone has a copy of this file, please email me:
-     infoØgetid3Øorg
-   » Parses JPEG files (requires GD installed)
-   » Parses PNG files  (requires GD v1.6+ installed)
-   » Parses GIF files  (requires GD < v1.6 installed)
-   » For MP3s, once a valid synch is detected, the next 5 frames are
-     also scanned for valid synch signatures, to prevent false
-     identification of synch. For corrupt MP3 files this will be a bit
-     slower, but hopefully produce more reliable results.
-     (Thanks to mpdjØbtinternet*com for bringing this to my attention,
-     and xbhoffØpacbell*net for explaining what was happening)
-     (Thanks also to macik for helping me with MP3 frame lengths:
-     http://66.96.216.160/cgi-bin/YaBB.pl
-     ?board=c&action=display&num=1018474068)
-   » The actual image data is now displayed (for JPEG, PNG and GIF
-     images only) rather than a binary text dump in getid3.check.php
-     (specifically table_var_dump()) for APIC frames. Made possible
-     by the inclusion of (a modified version of) GetURLImageSize() by
-     Filipe Laborde-Basto (www.rezox.com). You can right-click, save-as
-     to extract the image to a file.
-     NOTE: The actual image data is still returned in ['data']
-   ¤ ['image_mime'], ['image_width'], ['image_height'], ['image_bytes']
-     are now returned for APICs
-   ¤ split parsing functions out into seperate files: lyrics3, id3v1,
-     id3v2, mp3, ogg, riff, mpeg, midi, zip
-   ¤ ['ogg']['bitrate_ave'] -> ['ogg']['bitrate_nominal'] (thanks to
-     stephaneØtekartists*com for pointing out that "nominal" bitrate
-     may actually differ significantly from the "average" bitrate)
-     The real average bitrate seems to be only extractable by parsing
-     the entire file and calculating the average bitrate. This is not
-     yet an option, but hopefully in a future version of getID3()
-   ¤ ['filename'] now returned for all files
-   ¤ ['ogg']['date'] and ['ogg']['description'] now returned when
-     available  (thanks stephaneØtekartists*com)
-   ¤ ['mpeg']['audio']['crc'] now contains the CRC (if present)
-   ¤ ['bitrate'] is now returned as a double instead of an int
-   ¤ ['dataoffset'] is now returned for all ID3v2 frames
-   * Bugfix: MP3 CRC presence ['mpeg']['audio']['protection'] was being
-     reported as opposite of what it actually should be
-   * Bugfix: MPEG videos weren't being detected (they were being
-     parsed as MP3), and even if they were, there was a typo in
-     getMPEGHeaderFilepointer()  (thanks Christian Fritz)
-   * Bugfix: getid3.functions.php wasn't being included in
-     getid3.write.php  (thanks mikeØftl*com)
-   * Bugfix: Browse:___ directory name in getid3.check.php wasn't
-     correct with directory names with ' and other strange characters
-     (thanks Christian Fritz)
-   ID3v2FrameProcessing() now checks to see if the next frame is valid
-     after it encounters an invalid FrameID, and if the next frameID
-     appears valid, it will just skip the current (invalid) frame and
-     continue processing (it would previously abort at the first sign
-     of incorrect structure)   (thanks stephaneØtekartists*com)
-   getid3.check.php now scans filetypes based on content, not filename
-     extension, and shows the filetype in the displayed output. Files
-     are only scanned as MP3 if ID3v2 or MPEG-audio signatures are at
-     the immediate beginning of the file (MP3 used to be the default
-     format), so a corrupt file may not show up as MP3 format in the
-     browse screen, but in detail it will scan in-depth
-   getid3.check.php now has columns to show the presence of ID3v1,
-     ID3v2 and Lyrics3 content
-   Helium2 (www.helium2.com) has been known to write ID3v2.4 tags with
-     non-synchsafe-integer framesizes, getID3() now checks for this and
-     will override and parse the tag as ID3v2.3 if the tag would parse
-     fine as ID3v2.3 when it's really specified as ID3v2.4  (thanks
-     Christian Fritz for the test files)
-
-
-1.4.0b9: [April-05-2002] James Heinrich
-   » Ogg files now return bitrate and playtime (playtime calculated
-     from nominal bitrate and filesize, so it's only approximately
-     accurate).  (thanks stephaneØtekartists*com for the idea)
-   * Bugfix: ID3v1 tags were not properly being parsed - track, genre
-     and comment fields were incorrect.  (thanks Christian Fritz)
-   * Bugfix: getid3.check.php would not browse directories with single
-     quotes (') or double quotes (") in the directory name.
-     (thanks Christian Fritz)
-   * Bugfix: Improved detection of MPEG-video files (a sample MP3 file
-     had a false MPEG video signature at the beginning), and the MPEG-
-     video parsing function now only looks for the MPEG-video header
-     in the first 100k bytes of the file, to prevent needlessly
-     scanning very large files. Also will not infinitely loop if it
-     does not find what it's looking for.  (thanks Christian Fritz)
-   ['error'] now returned if MP3 synch doesn't occur at beginning of
-     file if ID3v2 not used (ie there's some kind of padding there that
-     should not be)
-   Reduced use of fread() in getMPEGHeaderFilepointer() (now faster)
-   Added "file parsed in x.xxx seconds" to getid3.check.php
-   Added "browse: <directory>" link to getid3.check.php
-   Changed default ID3v2 majorversion from 2.4 to 2.3 in
-     getid3.write.php because Winamp (and probably many other
-     ID3v2-aware tools) can only read up to ID3v2.3
-     (thanks mikeØftl*com)
-
-
-1.4.0b8: [April-04-2002] James Heinrich
-   » Lyrics3 support added  (thanks Christian Fritz for the idea)
-   ¤ check.php renamed to getid3.check.php
-   ¤ write.php renamed to getid3.write.php
-   ¤ ['id3']['id3v2']['error'] (if present) now reported in ['error']
-   ¤ ['mpeg']['audio']['error'] (if present) now reported in ['error']
-   * Bugfix: RoughTranslateUnicodeToASCII() was completely mangling
-     UTF-16/UTF-16BE encoded text
-   * Bugfix: The warning about MP3ext wasn't always showing up
-     (thanks davidbullockØtech-center*com)
-   getID3v1Filepointer() cleaned up & shortened
-   Moved the include_once() statements around so that a minimum of code
-     is included
-
-
-1.4.0b7: [April-03-2002] James Heinrich
-   » RIFFs (specifically AVIs) are now more completely parsed,
-     almost everything in the returned ['RIFF'] array has been moved
-     around and/or restructured. A lot of new data is in there too -
-     codecs, frame size, etc.
-   ¤ Better recursive parsing of RIFFs (sub-arrays are now in the right
-     place)
-   * Bugfix: the isset() idea introduced in beta 5 was incorrectly
-     implemented, such that ['asciidata'] and ['asciidescription'] were
-     never returned - this had the side effect that ID3v2 comments were
-     not copied to ['id3']['id3v2']['comment']  (thanks mikeØftl*com)
-   * Bugfix: MPEG audio synch wasn't being detected, and therefore MPEG
-     audio data not parsed, if no ID3v2 header present in an MP3
-   ID3v1 track number only returned if greater than zero
-   Removed !== FALSE (introduced in 1.4.0b6) from while(fread()) loops,
-     some users were reporting problems with that syntax.
-   Changed substr($string, 0, 1) to $string{0} syntax in most files
-   Reformatted changelog.txt to 72-column width
-
-
-1.4.0b6: [April-01-2002] James Heinrich
-   * Bugfix: 1.4.0b5 introduced a bug where any RIFF file other than
-     PCM WAVE (this includes any compressed WAV, as well as all AVIs)
-     would crash getID3()
-   Reduced use of fread() in getOggHeaderFilepointer() for increased
-     speed
-   Added constant FREAD_BUFFER_SIZE for many fread() operations
-   Added !== FALSE check to while(fread()) loops
-     (thanks davidbullockØtech-center*com)
-   Added more entries to RIFFwFormatTagLookup()
-     (still looking for a good complete list)
-   Converted use of hexdec() in getid3.lookup.php to 0x1234 notation
-
-
-1.4.0b5: [March-28-2002] James Heinrich
-   ¤ Renamed decodeheader() to decodeMPEGaudioHeader()
-   * Bugfix: Fixed infinite loop problem for RIFF/WAV files with
-     unknown chunks
-   * Bugfix: WXXX frames were incorrectly writing from ['URL'] instead
-     of ['url']
-   * Bugfix: RoughTranslateUnicodeToASCII() wasn't properly decoding
-     UTF-16/UTF-16BE
-   Changed all quoted strings from " to ' to hopefully improve speed
-     (although benchmarks have not yet shown any significant
-     improvement in speed)  (thanks davidbullockØtech-center*com)
-   Improved code in check.php for dealing with symbolic links
-     (thanks davidbullockØtech-center*com)
-   Changed '<?' tags to '<?php'  (thanks davidbullockØtech-center*com)
-   Added processing time indicator in check.php
-     (ie 'directory scanned in 2.45 seconds')
-   Replaced all instances of feof() to prevent infinite loop conditions
-   Moved lookup portions of decodeMPEGaudioHeader() to
-     getid3.lookup.php
-   Replaced $arrayname[$index] with $arrayname["$index"] to avoid PHP
-     E_NOTICEs  (thanks davidbullockØtech-center*com)
-   Wrapped isset() around many if statements, to avoid PHP E_NOTICEs,
-     hence improve speed (up to 30x speed improvement reported in some
-     cases :)
-
-
-1.4.0b4: [March-26-2002] James Heinrich
-   ¤ RIFF/WAV file format now parsed, returned under ['riff']
-   ¤ Support for Relative Gain Adjustment in RIFF/WAV files
-   ¤ ['channels'] (1 or 2) now returned for MP3 and WAV files
-   ¤ ['bitrate'] now returned (in bits-per-second) at root level for
-     MP3 and WAV files
-   Added support for RGAD (Relative Gain ADjustment) ID3v2 frames, both
-     reading & writing
-     (see http://privatewww.essex.ac.uk/~djmrob/replaygain/ for details
-     on RGAD)  (thanks Christian Fritz for the idea)
-   Removed some test data-dumping from the ID3v2 writing functions
-   Language code 'XXX' now returns descriptive string 'unknown' instead
-     of NULL
-   Seperated out comments from top of getid3.php into getid3.readme.txt
-     and changelog.txt
-   Split out non-lookup functions from getid3.lookup.php to
-     getid3.functions.php
-
-
-1.4.0b3: [March-25-2002] James Heinrich
-   ¤ ['asciidata'] for WXXX frames now returns correct information, but
-     under ['asciidescription']  (thanks Christian Fritz)
-   ¤ Added ['framenamelong'] to all returned frame data arrays with
-     text description of that frame (ie 'RVA2' would return 'Relative
-     volume adjustment (2)')  (thanks Christian Fritz)
-   ¤ ['datalength'] is now ['indexeddatalength'] in ASPI frames (was
-     confliciting with the all-frames ['datalength'] as introduced in
-     v1.4.0b1
-   ¤ ['datalength'] now returned as integer (rather than double) where
-     possible
-
-
-1.4.0b2: [March-21-2002] James Heinrich
-   ¤ ['mpeg']['audio']['bitrate'] now returned as int rather than
-     double for VBR files
-   * Bugfix: MPEG audio information wasn't being parsed on files that
-     had neither ID3v1 or ID3v2
-   * Bugfix: COMM/WXXX frames weren't returning 'asciidata' in
-     ID3v2.2, which also meant the ['id3']['id3v2']['comment'] field
-     wasn't being returned  (thanks stephaneØtekartists*com)
-   * Bugfix: file might not be found if filename actually contains
-     escaped chars or %xx-formatted characters
-     (thanks reel_tazØusers*sourceforge*net)
-   Added support for running with Register Globals turned off
-     (thanks reel_tazØusers*sourceforge*net)
-   Added urlencode() where needed in check.php
-     (thanks reel_tazØusers*sourceforge*net)
-   Fixed IE buffering/display problem in progress counter in check.php
-
-
-1.4.0b1: [March-11-2002] James Heinrich
-   » ID3v2 writing support via WriteID3v2() in putid3.php
-     RemoveID3v2() and RemoveID3v1() functions now available in
-     putid3.php  All ID3v1 and ID3v2 writing functions have been moved
-     to putid3.php and example file write.php has been added to the
-     distribution
-   ¤ MPEG audio frame information (bitrate, frequency, etc) now
-     returned inside ['mpeg']['audio'] instead of just ['mpeg']
-   ¤ MPEG video information now parsed, returned in ['mpeg']['video']
-     Note: audio portion of video system files is not yet being parsed
-   ¤ All flag bits are now returned as boolean rather than int or
-     string
-   ¤ RVA2 data now returned as an array (multiple RVA2 tags are
-     allowed)
-   ¤ RVA2/EQU2 description returned under ['description'] rather than
-     ['identification']
-   ¤ RVAD/EQUA adjustments now returned as signed integers, rather than
-     absolute values which required you to check flag bytes
-   ¤ RVRB/REV data no longer returns under ['reverb'] array
-   ¤ WXXX/W???/LINK frames now return ['url'] instead of ['URL']
-   ¤ USER now properly returns both ['language'] and ['languagename']
-   ¤ OWNE now returns ['purchasedateunix'] as a UNIX timestamp
-     (only if ['purchasedate'] is a valid date)
-   ¤ ['id3']['id3v2']['padding'] now returned with information on padding
-   ¤ ['headerlength'] now includes the initial 6 or 10 bytes of the
-     ID3v2 header
-   ¤ ['artist'], ['title'], ['album'], ['tracknumber'], ['genre'] now
-     returned for easier access for Ogg files
-   ¤ added ['datalength'] to all ID3v2 frames: length of frame data,
-     not including frame header
-   ¤ ['fileformat'] now returns 'id3' if there are ID3v1 or ID3v2 tags
-     but no audio data
-   ¤ ['fileformat'] now returns 'mpg' if it's an MPEG system (video +
-     audio) file
-   * Bugfix: RVAD was being parsed incorrectly
-   * Bugfix: ['currency'] and ['purchasedate'] now correctly returned
-     in OWNE
-   * Bugfix: Frequncies in 'EQU2' frames were incorrectly double
-   * Bugfix: ['bytedeviation'] and ['msdeviation'] now properly
-     returned as integer rather than binary string for 'MLLT' frames
-   * Bugfix: ['filename'] now properly returned for 'GEOB' frames
-   * Bugfix: ['imagetype'] now properly returned for 'PIC' frames in
-     ID3v2.2
-   * Bugfix: Genre not being written if not set in WriteID3v1()
-     (thanks reel_tazØusers*sourceforge*net)
-   * Bugfix: Changed write mode to 'r+b' from 'a+' because ID3v1 tags
-     were being appended instead of overwritten if they already existed
-     (thanks reel_tazØusers*sourceforge*net)
-   * Bugfix: open would fail on filenames containing quotes
-     (thanks javierØcrackdealer*com)
-   * Bugfix: various values were incorrectly returned (unneeded ord())
-     in these frames: COMR, USER, ENCR, GRID, PRIV, SIGN
-   * Bugfix: ASPI ['bitsperpoint'] was not correctly returned
-   * Bugfix: RoughTranslateUnicodeToASCII() was not returning the last
-     char for UTF-16
-   * Bugfix: ['audiobytes'] now correctly 0 if no synch found
-   * Bugfix: GenreLookup was incorrectly returning 'Remix' instead of
-     'Blues' for GenreID 0
-   Added sample directory browser to check.php
-   Seperated out MPEGaudio-parsing functionality into
-     getOnlyMPEGaudioInfo() which may be called directly if you don't
-     need any ID3 parsing  (thanks djpretzelØcox*rr*com for idea)
-   Reduced use of fread() for increased performance in
-     getID3v1Filepointer()
-   Added clearstatcache() before checking filesize - size after writing
-     tag now correct
-   Added 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 for test file)
-
-
-1.3.2: [February-15-2002] James Heinrich
-   ¤ UFID/UFI, USLT/ULT, COMM/COM, APIC/PIC, GEOB/GEO, CRM, RVA2, EQU2,
-     POPM/POP, AENC/CRA, ENCR and GRID frame data now returned under
-     numeric array index rather than by ownerID
-   ¤ RVA2 frame data is now returned keyed by $channeltypeid instead of
-     $frame_idstring
-   ¤ WXXX/WXX frame description now returned under ['description']
-     instead of ['data']
-   Trailing null bytes now trimmed from frame (W??? & T???) text data
-     (it shouldn't be there to begin with, but a sample file encoded by
-     [unknown program] had data padded to 50 chars with null bytes,
-     which caused ParseID3v2GenreString() to freeze).
-
-
-1.3.1: [February-13-2002] James Heinrich
-   * Bugfix: ['playtime_seconds'] and ['playtime_string'] were not
-     being returned
-   * Bugfix: ['fileformat'] was incorrectly being returned as a
-     2-element array
-   * Bugfix: USLT wasn't being correctly parsed
-   Improved RoughTranslateUnicodeToASCII()
-     (thanks reel_tazØusers*sourceforge*net for Unicode test file)
-
-
-1.3.0: [February-13-2002] James Heinrich
-   » ID3v1 writing support via WriteID3v1()
-   ¤ MPEG audio frame information (bitrate, frequency, etc) now
-     returned inside ['mpeg']
-   ¤ ['mpeg']['raw'] returns the integer values of the bits for MPEG
-     audio information as returned in ['mpeg'] by decodeheader()
-     (thanks reel_tazØusers*sourceforge*net)
-   ¤ 'protection', 'padding', 'private', 'copyright' and 'original' now
-     return as boolean
-   ¤ 'bitrate' and 'frequency' now return as int (except in special
-     case of 'free')
-   Language name as well as code retured where appropriate
-     (ie 'English' and 'eng')
-   Text frames with invalid TextEncoding value are now passed through
-     anyway
-   ID3v1 data (title, artist, album, year, comment) is now trimmed
-     (no more nulls)
-   RoughTranslateUnicodeToASCII() now uses utf8_decode() for UTF-8
-
-
-1.2.5: [January-30-2002] James Heinrich
-   * Bugfix: Playtime calculations for VBR files were off slightly
-     (rounding error)
-   * Bugfix: Extended header length was incorrectly calculated
-   * Bugfix: Genre strings such as '03' weren't being handled correctly
-   More complete support for ID3v2.3 FrameIDs
-   Split out getid3.frames.php (FrameID-specific parsing function)
-   Split out getid3.lookup.php (assorted lookup-table functions)
-   Searches for what directory getid3.*.php support files are in (must
-     be same as getid3.php, but doesn't have to be same as main file -
-     for example your main file could be /index.php, but including
-     /lib/getid3/getid3.php)
-   Simplified, tweaked, changed and/or eliminated several functions.
-
-
-1.2.4: [January-26-2002] James Heinrich
-   » Basic support for reading Ogg-Vorbis comment tags
-
-
-1.2.3: [January-24-2002] James Heinrich
-   » ID3v2.2.x 3-char FrameIDs are now fully parsed
-     Note: While I've included support for 22 FrameIDs as defined in
-     the specs, I don't have test files for all of them. If anyone
-     knows of programs that generate any of the untested tags, please
-     email infoØgetid3Øorg ! Here's what's tested and not:
-       Tested: T??, COM
-     Untested: UFI, TXX, W??, WXX, IPL, MCI, ETC, MLL, STC, ULT, SLT,
-               RVA, EQU, REV, PIC, GEO, CNT, POP, BUF, CRM, CRA, LNK
-   table_var_dump() now displays boolean variables as TRUE or FALSE
-   table_var_dump() now uses htmlspecialchars() to avoid broken-table
-     problems
-
-
-1.2.2: [January-18-2002] James Heinrich
-   ¤ Parses ID3v2 genres into ['id3']['id3v2']['genreid'] and
-     ['id3']['id3v2']['genrelist'] where appropriate
-     (thanks stephaneØtekartists*com for the idea)
-   Added ID3v2 genre abbreviations 'RX' (remix) and 'CR' (cover)
-
-
-1.2.1: [January-17-2002] James Heinrich
-   * Bugfix: 'mp3' was being returned in ['format'], but 'zip' was
-     being returned in ['fileformat'], both are now returned in
-     ['fileformat']
-   ¤ Splits ['id3']['id3v2']['track'] in the format '5/12' into
-     ['track'] = '5' and ['totaltracks'] = '12'
-   ¤ Enabled ['id3']['id3v2']['title'] etc for ID3v2.2.x
-     (3-char frame names)  (thanks stephaneØtekartists*com)
-   ¤ Changed v1.?? version number format to v1.?.?
-   Scans through the file until it finds the MPEG synch (start of audio
-     frame) - some files encoded by LAME 3.91 had undocumented padding
-     after the ID3v2 header; getMP3headerFilepointer() now scans until
-     it finds synch (or EOF)  (thanks adamØtrekjapan*com)
-   Improved Unicode conversion in RoughTranslateUnicodeToASCII()
-
-
-1.20:  [January-15-2002] James Heinrich
-   » Support for variable-bitrate (VBR) files, both Xing and Fraunhofer
-     headers
-   » All 4-character FrameIDs are now fully parsed according to the
-     specs at http://www.id3.org/id3v2.4.0-frames.txt
-     ¤ This means that most no longer return ['flags'] and ['data']
-     Note: While I've included support for 30 FrameIDs as defined in
-     the specs, I don't have test files for all of them. If anyone
-     knows of programs that generate any of the untested tags, please
-     email infoØgetid3Øorg ! Here's what's tested and not:
-       Tested: UFID, T???, WXXX, USLT, SYLT, COMM, APIC, GEOB
-     Untested: TXXX, W???, MCDI, ETCO, MLLT, SYTC, RVA2, EQU2, RVRB,
-               PCNT, POPM, RBUF, AENC, USER, OWNE, COMR, ENCR, GRID,
-               PRIV, SIGN, SEEK, ASPI
-   ¤ Added 'title', 'artist', etc names to ID3v2 data (easier to access
-     than the 4-character FrameIDs of the ID3v2 standard)
-     (thanks jaksonØgmx.net)
-   * Bugfix: added fclose() at end of GetAllMP3Info()
-     (thanks stephaneØtekartists*com)
-   * Bugfix: ID3v1 wasn't being parsed if ID3v2 wasn't present
-     (thanks jaksonØgmx.net)
-   * Bugfix: several flags were being parsed incorrectly (the structure
-     had changed from ID3v2.3 to ID3v2.4) - v2.3 flags were being
-     incorrectly parsed
-   Much more compact implementation of decodeheader()
-     (thanks jaksonØgmx.net for the idea)
-   ID3v1 genres 126 through 147  (thanks jaksonØgmx.net)
-   New table_var_dump() function in check.php
-     (based partially on idea by jaksonØgmx.net)
-   Seperated ID3v1 retrieval into seperate function
-
-
-1.11:  [December-23-2001] James Heinrich
-   All functions merged into file getid3.php
-   Updated documentation to reflect new returned information
-
-
-1.10:  [December-20-2001] James Heinrich
-   * Bugfix: ID3v1 Track# was incorrectly being parsed whether it
-     existed or not
-   Changed calling procedure to recommend using
-     GetAllMP3info($filename) from getmp3header.php
-   Now includes check.php - example file
-   ¤ Checks to see if file is in ZIP or MP3 format
-     (returned in ['format'])
-     [Ed. Note: ['fileformat'] as of v1.2.1]
-
-
-1.06:  [November-05-2001] James Heinrich
-   * Bugfix: ID3v2.2.x frames weren't being parsed since they use
-     6-byte rather than 10-byte headers as v2.3+ does
-     (thanks spunkØmac*com for pointing that out)
-
-
-1.05:  [September-06-2001] James Heinrich
-   * Bugfix: ID3v2 was being parsed even if it didn't exist
-
-
-1.04:  [July-16-2001] James Heinrich
-   * Bugfix: typo in Extended Header section (strpad() should be
-     str_pad()) (thanks jurroonØyahoo*com)
-
-
-1.03:  [May-07-2001] James Heinrich
-   * Bugfix: Added missing ['id3']['id3v1']['genreid'] and
-     ['id3']['id3v1']['genre']
-
-
-1.02:  [May-05-2001] James Heinrich
-   ¤ Added ['getID3version']
-
-
-1.01:  [May-04-2001] James Heinrich
-   » Added support for frame-level de-unsynchronisation (as per
-     ID3v2.4.0 specs) in addition to ID3v2.3.x tag-level
-     de-unsynchronisation
-
-
-1.00:  [May-04-2001] James Heinrich
-   » Initial public release
-
diff --git a/lib/getid3/demos/demo.audioinfo.class.php b/lib/getid3/demos/demo.audioinfo.class.php
deleted file mode 100644
index dc12a1ea1..000000000
--- a/lib/getid3/demos/demo.audioinfo.class.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------+
-// | PHP version 4.1.0                                                    |
-// +----------------------------------------------------------------------+
-// | Placed in public domain by Allan Hansen, 2002. Share and enjoy!      |
-// +----------------------------------------------------------------------+
-// | /demo/demo.audioinfo.class.php                                       |
-// |                                                                      |
-// | Example wrapper class to extract information from audio files        |
-// | through getID3().                                                    |
-// |                                                                      |
-// | getID3() returns a lot of information. Much of this information is   |
-// | not needed for the end-application. It is also possible that some    |
-// | users want to extract specific info. Modifying getID3() files is a   |
-// | bad idea, as modifications needs to be done to future versions of    |
-// | getID3().                                                            |
-// |                                                                      |
-// | Modify this wrapper class instead. This example extracts certain     |
-// | fields only and adds a new root value - encoder_options if possible. |
-// | It also checks for mp3 files with wave headers.                      |
-// +----------------------------------------------------------------------+
-// | Example code:                                                        |
-// |   $au = new AudioInfo();                                             |
-// |   print_r($au->Info('file.flac');                                    |
-// +----------------------------------------------------------------------+
-// | Authors: Allan Hansen <ahØartemis*dk>                                |
-// +----------------------------------------------------------------------+
-//
-
-
-
-/**
-* getID3() settings
-*/
-
-require_once('../getid3/getid3.php');
-
-
-
-
-/**
-* Class for extracting information from audio files with getID3().
-*/
-
-class AudioInfo {
-
-	/**
-	* Private variables
-	*/
-	var $result = NULL;
-	var $info   = NULL;
-
-
-
-
-	/**
-	* Constructor
-	*/
-
-	function AudioInfo() {
-
-		// Initialize getID3 engine
-		$this->getID3 = new getID3;
-		$this->getID3->option_md5_data        = true;
-		$this->getID3->option_md5_data_source = true;
-		$this->getID3->encoding               = 'UTF-8';
-	}
-
-
-
-
-	/**
-	* Extract information - only public function
-	*
-	* @access   public
-	* @param    string  file    Audio file to extract info from.
-	*/
-
-	function Info($file) {
-
-		// Analyze file
-		$this->info = $this->getID3->analyze($file);
-
-		// Exit here on error
-		if (isset($this->info['error'])) {
-			return array ('error' => $this->info['error']);
-		}
-
-		// Init wrapper object
-		$this->result = array();
-		$this->result['format_name']     = (isset($this->info['fileformat']) ? $this->info['fileformat'] : '').'/'.(isset($this->info['audio']['dataformat']) ? $this->info['audio']['dataformat'] : '').(isset($this->info['video']['dataformat']) ? '/'.$this->info['video']['dataformat'] : '');
-		$this->result['encoder_version'] = (isset($this->info['audio']['encoder'])         ? $this->info['audio']['encoder']         : '');
-		$this->result['encoder_options'] = (isset($this->info['audio']['encoder_options']) ? $this->info['audio']['encoder_options'] : '');
-		$this->result['bitrate_mode']    = (isset($this->info['audio']['bitrate_mode'])    ? $this->info['audio']['bitrate_mode']    : '');
-		$this->result['channels']        = (isset($this->info['audio']['channels'])        ? $this->info['audio']['channels']        : '');
-		$this->result['sample_rate']     = (isset($this->info['audio']['sample_rate'])     ? $this->info['audio']['sample_rate']     : '');
-		$this->result['bits_per_sample'] = (isset($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : '');
-		$this->result['playing_time']    = (isset($this->info['playtime_seconds'])         ? $this->info['playtime_seconds']         : '');
-		$this->result['avg_bit_rate']    = (isset($this->info['audio']['bitrate'])         ? $this->info['audio']['bitrate']         : '');
-		$this->result['tags']            = (isset($this->info['tags'])                     ? $this->info['tags']                     : '');
-		$this->result['comments']        = (isset($this->info['comments'])                 ? $this->info['comments']                 : '');
-		$this->result['warning']         = (isset($this->info['warning'])                  ? $this->info['warning']                  : '');
-		$this->result['md5']             = (isset($this->info['md5_data'])                 ? $this->info['md5_data']                 : '');
-
-		// Post getID3() data handling based on file format
-		$method = (isset($this->info['fileformat']) ? $this->info['fileformat'] : '').'Info';
-		if ($method && method_exists($this, $method)) {
-			$this->$method();
-		}
-
-		return $this->result;
-	}
-
-
-
-
-	/**
-	* post-getID3() data handling for AAC files.
-	*
-	* @access   private
-	*/
-
-	function aacInfo() {
-		$this->result['format_name']     = 'AAC';
-	}
-
-
-
-
-	/**
-	* post-getID3() data handling for Wave files.
-	*
-	* @access   private
-	*/
-
-	function riffInfo() {
-		if ($this->info['audio']['dataformat'] == 'wav') {
-
-			$this->result['format_name'] = 'Wave';
-
-		} elseif (preg_match('#^mp[1-3]$#', $this->info['audio']['dataformat'])) {
-
-			$this->result['format_name'] = strtoupper($this->info['audio']['dataformat']);
-
-		} else {
-
-			$this->result['format_name'] = 'riff/'.$this->info['audio']['dataformat'];
-
-		}
-	}
-
-
-
-
-	/**
-	* * post-getID3() data handling for FLAC files.
-	*
-	* @access   private
-	*/
-
-	function flacInfo() {
-		$this->result['format_name']     = 'FLAC';
-	}
-
-
-
-
-
-	/**
-	* post-getID3() data handling for Monkey's Audio files.
-	*
-	* @access   private
-	*/
-
-	function macInfo() {
-		$this->result['format_name']     = 'Monkey\'s Audio';
-	}
-
-
-
-
-
-	/**
-	* post-getID3() data handling for Lossless Audio files.
-	*
-	* @access   private
-	*/
-
-	function laInfo() {
-		$this->result['format_name']     = 'La';
-	}
-
-
-
-
-
-	/**
-	* post-getID3() data handling for Ogg Vorbis files.
-	*
-	* @access   private
-	*/
-
-	function oggInfo() {
-		if ($this->info['audio']['dataformat'] == 'vorbis') {
-
-			$this->result['format_name']     = 'Ogg Vorbis';
-
-		} else if ($this->info['audio']['dataformat'] == 'flac') {
-
-			$this->result['format_name'] = 'Ogg FLAC';
-
-		} else if ($this->info['audio']['dataformat'] == 'speex') {
-
-			$this->result['format_name'] = 'Ogg Speex';
-
-		} else {
-
-			$this->result['format_name'] = 'Ogg '.$this->info['audio']['dataformat'];
-
-		}
-	}
-
-
-
-
-	/**
-	* post-getID3() data handling for Musepack files.
-	*
-	* @access   private
-	*/
-
-	function mpcInfo() {
-		$this->result['format_name']     = 'Musepack';
-	}
-
-
-
-
-	/**
-	* post-getID3() data handling for MPEG files.
-	*
-	* @access   private
-	*/
-
-	function mp3Info() {
-		$this->result['format_name']     = 'MP3';
-	}
-
-
-
-
-	/**
-	* post-getID3() data handling for MPEG files.
-	*
-	* @access   private
-	*/
-
-	function mp2Info() {
-		$this->result['format_name']     = 'MP2';
-	}
-
-
-
-
-
-	/**
-	* post-getID3() data handling for MPEG files.
-	*
-	* @access   private
-	*/
-
-	function mp1Info() {
-		$this->result['format_name']     = 'MP1';
-	}
-
-
-
-
-	/**
-	* post-getID3() data handling for WMA files.
-	*
-	* @access   private
-	*/
-
-	function asfInfo() {
-		$this->result['format_name']     = strtoupper($this->info['audio']['dataformat']);
-	}
-
-
-
-	/**
-	* post-getID3() data handling for Real files.
-	*
-	* @access   private
-	*/
-
-	function realInfo() {
-		$this->result['format_name']     = 'Real';
-	}
-
-
-
-
-
-	/**
-	* post-getID3() data handling for VQF files.
-	*
-	* @access   private
-	*/
-
-	function vqfInfo() {
-		$this->result['format_name']     = 'VQF';
-	}
-
-}
diff --git a/lib/getid3/demos/demo.basic.php b/lib/getid3/demos/demo.basic.php
deleted file mode 100644
index b82dac14d..000000000
--- a/lib/getid3/demos/demo.basic.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.basic.php - part of getID3()                     //
-// Sample script showing most basic use of getID3()            //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-
-// include getID3() library (can be in a different directory if full path is specified)
-require_once('../getid3/getid3.php');
-
-// Initialize getID3 engine
-$getID3 = new getID3;
-
-// Analyze file and store returned data in $ThisFileInfo
-$ThisFileInfo = $getID3->analyze($filename);
-
-/*
- Optional: copies data from all subarrays of [tags] into [comments] so
- metadata is all available in one location for all tag formats
- metainformation is always available under [tags] even if this is not called
-*/
-getid3_lib::CopyTagsToComments($ThisFileInfo);
-
-/*
- Output desired information in whatever format you want
- Note: all entries in [comments] or [tags] are arrays of strings
- See structure.txt for information on what information is available where
- or check out the output of /demos/demo.browse.php for a particular file
- to see the full detail of what information is returned where in the array
- Note: all array keys may not always exist, you may want to check with isset()
- or empty() before deciding what to output
-*/
-
-//echo $ThisFileInfo['comments_html']['artist'][0]; // artist from any/all available tag formats
-//echo $ThisFileInfo['tags']['id3v2']['title'][0];  // title from ID3v2
-//echo $ThisFileInfo['audio']['bitrate'];           // audio bitrate
-//echo $ThisFileInfo['playtime_string'];            // playtime in minutes:seconds, formatted string
-
-/*
- if you want to see ALL the output, uncomment this line:
-*/
-//echo '<pre>'.htmlentities(print_r($ThisFileInfo, true)).'</pre>';
diff --git a/lib/getid3/demos/demo.browse.php b/lib/getid3/demos/demo.browse.php
deleted file mode 100644
index 1f6a414e3..000000000
--- a/lib/getid3/demos/demo.browse.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.browse.php - part of getID3()                     //
-// Sample script for browsing/scanning files and displaying    //
-// information returned by getID3()                            //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('For security reasons, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in demos/'.basename(__FILE__));
-define('GETID3_DEMO_BROWSE_ALLOW_EDIT_LINK',   false);
-define('GETID3_DEMO_BROWSE_ALLOW_DELETE_LINK', false);
-define('GETID3_DEMO_BROWSE_ALLOW_MD5_LINK',    false);
-
-/////////////////////////////////////////////////////////////////
-// die if magic_quotes_runtime or magic_quotes_gpc are set
-if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime()) {
-	die('magic_quotes_runtime is enabled, getID3 will not run.');
-}
-if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
-	die('magic_quotes_gpc is enabled, getID3 will not run.');
-}
-if (!defined('ENT_SUBSTITUTE')) { // defined in PHP v5.4.0
-	define('ENT_SUBSTITUTE', ENT_QUOTES);
-}
-/////////////////////////////////////////////////////////////////
-
-$PageEncoding = 'UTF-8';
-
-$writescriptfilename = 'demo.write.php';
-
-require_once('../getid3/getid3.php');
-
-// Needed for windows only. Leave commented-out to auto-detect, only define here if auto-detection does not work properly
-//define('GETID3_HELPERAPPSDIR', 'C:\\helperapps\\');
-
-// Initialize getID3 engine
-$getID3 = new getID3;
-$getID3->setOption(array('encoding' => $PageEncoding));
-
-$getID3checkColor_Head           = 'CCCCDD';
-$getID3checkColor_DirectoryLight = 'FFCCCC';
-$getID3checkColor_DirectoryDark  = 'EEBBBB';
-$getID3checkColor_FileLight      = 'EEEEEE';
-$getID3checkColor_FileDark       = 'DDDDDD';
-$getID3checkColor_UnknownLight   = 'CCCCFF';
-$getID3checkColor_UnknownDark    = 'BBBBDD';
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-header('Content-Type: text/html; charset='.$PageEncoding);
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-echo '<html><head>';
-echo '<title>getID3() - /demo/demo.browse.php (sample script)</title>';
-echo '<link rel="stylesheet" href="getid3.css" type="text/css">';
-echo '<meta http-equiv="Content-Type" content="text/html;charset='.$PageEncoding.'" />';
-echo '</head><body>';
-
-if (isset($_REQUEST['deletefile'])) {
-	if (file_exists($_REQUEST['deletefile'])) {
-		if (unlink($_REQUEST['deletefile'])) {
-			$deletefilemessage = 'Successfully deleted '.addslashes($_REQUEST['deletefile']);
-		} else {
-			$deletefilemessage = 'FAILED to delete '.addslashes($_REQUEST['deletefile']).' - error deleting file';
-		}
-	} else {
-		$deletefilemessage = 'FAILED to delete '.addslashes($_REQUEST['deletefile']).' - file does not exist';
-	}
-	if (isset($_REQUEST['noalert'])) {
-		echo '<b><font color="'.(($deletefilemessage{0} == 'F') ? '#FF0000' : '#008000').'">'.$deletefilemessage.'</font></b><hr>';
-	} else {
-		echo '<script type="text/javascript">alert("'.$deletefilemessage.'");</script>';
-	}
-}
-
-
-if (isset($_REQUEST['filename'])) {
-
-	if (!file_exists($_REQUEST['filename']) || !is_file($_REQUEST['filename'])) {
-		die(getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-8', $_REQUEST['filename'].' does not exist'));
-	}
-	$starttime = microtime(true);
-
-	//$getID3->setOption(array(
-	//	'option_md5_data'  => $AutoGetHashes,
-	//	'option_sha1_data' => $AutoGetHashes,
-	//));
-	$ThisFileInfo = $getID3->analyze($_REQUEST['filename']);
-	$AutoGetHashes = (bool) (isset($ThisFileInfo['filesize']) && ($ThisFileInfo['filesize'] > 0) && ($ThisFileInfo['filesize'] < (50 * 1048576))); // auto-get md5_data, md5_file, sha1_data, sha1_file if filesize < 50MB, and NOT zero (which may indicate a file>2GB)
-	$AutoGetHashes = ($AutoGetHashes && GETID3_DEMO_BROWSE_ALLOW_MD5_LINK);
-	if ($AutoGetHashes) {
-		$ThisFileInfo['md5_file']  = md5_file($_REQUEST['filename']);
-		$ThisFileInfo['sha1_file'] = sha1_file($_REQUEST['filename']);
-	}
-
-
-	getid3_lib::CopyTagsToComments($ThisFileInfo);
-
-	$listdirectory = dirname($_REQUEST['filename']);
-	$listdirectory = realpath($listdirectory); // get rid of /../../ references
-
-	if (GETID3_OS_ISWINDOWS) {
-		// this mostly just gives a consistant look to Windows and *nix filesystems
-		// (windows uses \ as directory seperator, *nix uses /)
-		$listdirectory = str_replace(DIRECTORY_SEPARATOR, '/', $listdirectory.'/');
-	}
-
-	if (strstr($_REQUEST['filename'], 'http://') || strstr($_REQUEST['filename'], 'ftp://')) {
-		echo '<i>Cannot browse remote filesystems</i><br>';
-	} else {
-		echo 'Browse: <a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.urlencode($listdirectory), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'">'.getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-8', $listdirectory).'</a><br>';
-	}
-
-	getid3_lib::ksort_recursive($ThisFileInfo);
-	echo table_var_dump($ThisFileInfo, false, $PageEncoding);
-	$endtime = microtime(true);
-	echo 'File parsed in '.number_format($endtime - $starttime, 3).' seconds.<br>';
-
-} else {
-
-	$listdirectory = (isset($_REQUEST['listdirectory']) ? $_REQUEST['listdirectory'] : '.');
-	$listdirectory = realpath($listdirectory); // get rid of /../../ references
-	$currentfulldir = $listdirectory.'/';
-
-	if (GETID3_OS_ISWINDOWS) {
-		// this mostly just gives a consistant look to Windows and *nix filesystems
-		// (windows uses \ as directory seperator, *nix uses /)
-		$currentfulldir = str_replace(DIRECTORY_SEPARATOR, '/', $listdirectory.'/');
-	}
-
-	ob_start();
-	if ($handle = opendir($listdirectory)) {
-
-		ob_end_clean();
-		echo str_repeat(' ', 300); // IE buffers the first 300 or so chars, making this progressive display useless - fill the buffer with spaces
-		echo 'Processing';
-
-		$starttime = microtime(true);
-
-		$TotalScannedUnknownFiles  = 0;
-		$TotalScannedKnownFiles    = 0;
-		$TotalScannedPlaytimeFiles = 0;
-		$TotalScannedBitrateFiles  = 0;
-		$TotalScannedFilesize      = 0;
-		$TotalScannedPlaytime      = 0;
-		$TotalScannedBitrate       = 0;
-		$FilesWithWarnings         = 0;
-		$FilesWithErrors           = 0;
-
-		while ($file = readdir($handle)) {
-			$currentfilename = $listdirectory.'/'.$file;
-			set_time_limit(30); // allocate another 30 seconds to process this file - should go much quicker than this unless intense processing (like bitrate histogram analysis) is enabled
-			echo ' .'; // progress indicator dot
-			flush();  // make sure the dot is shown, otherwise it's useless
-
-			switch ($file) {
-				case '..':
-					$ParentDir = realpath($file.'/..').'/';
-					if (GETID3_OS_ISWINDOWS) {
-						$ParentDir = str_replace(DIRECTORY_SEPARATOR, '/', $ParentDir);
-					}
-					$DirectoryContents[$currentfulldir]['dir'][$file]['filename'] = $ParentDir;
-					continue 2;
-					break;
-
-				case '.':
-					// ignore
-					continue 2;
-					break;
-			}
-			// symbolic-link-resolution enhancements by davidbullock×´ech-center*com
-			$TargetObject     = realpath($currentfilename);  // Find actual file path, resolve if it's a symbolic link
-			$TargetObjectType = filetype($TargetObject);     // Check file type without examining extension
-
-			if ($TargetObjectType == 'dir') {
-
-				$DirectoryContents[$currentfulldir]['dir'][$file]['filename'] = $file;
-
-			} elseif ($TargetObjectType == 'file') {
-
-				$getID3->setOption(array('option_md5_data' => (isset($_REQUEST['ShowMD5']) && GETID3_DEMO_BROWSE_ALLOW_MD5_LINK)));
-				$fileinformation = $getID3->analyze($currentfilename);
-
-				getid3_lib::CopyTagsToComments($fileinformation);
-
-				$TotalScannedFilesize += (isset($fileinformation['filesize']) ? $fileinformation['filesize'] : 0);
-
-				if (isset($_REQUEST['ShowMD5']) && GETID3_DEMO_BROWSE_ALLOW_MD5_LINK) {
-					$fileinformation['md5_file'] = md5_file($currentfilename);
-				}
-
-				if (!empty($fileinformation['fileformat'])) {
-					$DirectoryContents[$currentfulldir]['known'][$file] = $fileinformation;
-					$TotalScannedPlaytime += (isset($fileinformation['playtime_seconds']) ? $fileinformation['playtime_seconds'] : 0);
-					$TotalScannedBitrate  += (isset($fileinformation['bitrate'])          ? $fileinformation['bitrate']          : 0);
-					$TotalScannedKnownFiles++;
-				} else {
-					$DirectoryContents[$currentfulldir]['other'][$file] = $fileinformation;
-					$DirectoryContents[$currentfulldir]['other'][$file]['playtime_string'] = '-';
-					$TotalScannedUnknownFiles++;
-				}
-				if (isset($fileinformation['playtime_seconds']) && ($fileinformation['playtime_seconds'] > 0)) {
-					$TotalScannedPlaytimeFiles++;
-				}
-				if (isset($fileinformation['bitrate']) && ($fileinformation['bitrate'] > 0)) {
-					$TotalScannedBitrateFiles++;
-				}
-			}
-		}
-		$endtime = microtime(true);
-		closedir($handle);
-		echo 'done<br>';
-		echo 'Directory scanned in '.number_format($endtime - $starttime, 2).' seconds.<br>';
-		flush();
-
-		$columnsintable = 14;
-		echo '<table class="table" cellspacing="0" cellpadding="3">';
-
-		echo '<tr bgcolor="#'.$getID3checkColor_Head.'"><th colspan="'.$columnsintable.'">Files in '.getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-8', $currentfulldir).'</th></tr>';
-		$rowcounter = 0;
-		foreach ($DirectoryContents as $dirname => $val) {
-			if (isset($DirectoryContents[$dirname]['dir']) && is_array($DirectoryContents[$dirname]['dir'])) {
-				uksort($DirectoryContents[$dirname]['dir'], 'MoreNaturalSort');
-				foreach ($DirectoryContents[$dirname]['dir'] as $filename => $fileinfo) {
-					echo '<tr bgcolor="#'.(($rowcounter++ % 2) ? $getID3checkColor_DirectoryLight : $getID3checkColor_DirectoryDark).'">';
-					if ($filename == '..') {
-						echo '<td colspan="'.$columnsintable.'">';
-						echo '<form action="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'" method="get">';
-						echo 'Parent directory: ';
-						echo '<input type="text" name="listdirectory" size="50" style="background-color: '.$getID3checkColor_DirectoryDark.';" value="';
-						if (GETID3_OS_ISWINDOWS) {
-							echo htmlentities(str_replace(DIRECTORY_SEPARATOR, '/', realpath($dirname.$filename)), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1');
-						} else {
-							echo htmlentities(realpath($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1');
-						}
-						echo '"> <input type="submit" value="Go">';
-						echo '</form></td>';
-					} else {
-						$escaped_filename = htmlentities($filename, ENT_SUBSTITUTE, 'ISO-8859-1'); // do filesystems always return filenames in ISO-8859-1?
-						$escaped_filename = ($escaped_filename ? $escaped_filename : rawurlencode($filename));
-						echo '<td colspan="'.$columnsintable.'"><a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'"><b>'.$escaped_filename.'</b></a></td>';
-					}
-					echo '</tr>';
-				}
-			}
-
-			echo '<tr bgcolor="#'.$getID3checkColor_Head.'">';
-			echo '<th>Filename</th>';
-			echo '<th>File Size</th>';
-			echo '<th>Format</th>';
-			echo '<th>Playtime</th>';
-			echo '<th>Bitrate</th>';
-			echo '<th>Artist</th>';
-			echo '<th>Title</th>';
-			if (isset($_REQUEST['ShowMD5']) && GETID3_DEMO_BROWSE_ALLOW_MD5_LINK) {
-				echo '<th>MD5&nbsp;File (File) (<a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.rawurlencode(isset($_REQUEST['listdirectory']) ? $_REQUEST['listdirectory'] : '.'), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'">disable</a>)</th>';
-				echo '<th>MD5&nbsp;Data (File) (<a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.rawurlencode(isset($_REQUEST['listdirectory']) ? $_REQUEST['listdirectory'] : '.'), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'">disable</a>)</th>';
-				echo '<th>MD5&nbsp;Data (Source) (<a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.rawurlencode(isset($_REQUEST['listdirectory']) ? $_REQUEST['listdirectory'] : '.'), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'">disable</a>)</th>';
-			} else {
-				echo '<th colspan="3">MD5&nbsp;Data'.(GETID3_DEMO_BROWSE_ALLOW_MD5_LINK ?' (<a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.rawurlencode(isset($_REQUEST['listdirectory']) ? $_REQUEST['listdirectory'] : '.').'&ShowMD5=1', ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'">enable</a>)' : '').'</th>';
-			}
-			echo '<th>Tags</th>';
-			echo '<th>Errors &amp; Warnings</th>';
-			echo (GETID3_DEMO_BROWSE_ALLOW_EDIT_LINK   ? '<th>Edit</th>'   : '');
-			echo (GETID3_DEMO_BROWSE_ALLOW_DELETE_LINK ? '<th>Delete</th>' : '');
-			echo '</tr>';
-
-			if (isset($DirectoryContents[$dirname]['known']) && is_array($DirectoryContents[$dirname]['known'])) {
-				uksort($DirectoryContents[$dirname]['known'], 'MoreNaturalSort');
-				foreach ($DirectoryContents[$dirname]['known'] as $filename => $fileinfo) {
-					echo '<tr bgcolor="#'.(($rowcounter++ % 2) ? $getID3checkColor_FileDark : $getID3checkColor_FileLight).'">';
-					$escaped_filename = htmlentities($filename, ENT_SUBSTITUTE, 'ISO-8859-1');
-					$escaped_filename = ($escaped_filename ? $escaped_filename : rawurlencode($filename));
-					echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?filename='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'" title="View detailed analysis">'.$escaped_filename.'</a></td>';
-					echo '<td align="right">&nbsp;'.number_format($fileinfo['filesize']).'</td>';
-					echo '<td align="right">&nbsp;'.NiceDisplayFiletypeFormat($fileinfo).'</td>';
-					echo '<td align="right">&nbsp;'.(isset($fileinfo['playtime_string']) ? $fileinfo['playtime_string'] : '-').'</td>';
-					echo '<td align="right">&nbsp;'.(isset($fileinfo['bitrate']) ? BitrateText($fileinfo['bitrate'] / 1000, 0, ((isset($fileinfo['audio']['bitrate_mode']) && ($fileinfo['audio']['bitrate_mode'] == 'vbr')) ? true : false)) : '-').'</td>';
-					echo '<td align="left">&nbsp;'.(isset($fileinfo['comments_html']['artist']) ? implode('<br>', $fileinfo['comments_html']['artist']) : ((isset($fileinfo['video']['resolution_x']) && isset($fileinfo['video']['resolution_y'])) ? $fileinfo['video']['resolution_x'].'x'.$fileinfo['video']['resolution_y'] : '')).'</td>';
-					echo '<td align="left">&nbsp;'.(isset($fileinfo['comments_html']['title'])  ? implode('<br>', $fileinfo['comments_html']['title'])  :  (isset($fileinfo['video']['frame_rate'])                                                 ? number_format($fileinfo['video']['frame_rate'], 3).'fps'                  : '')).'</td>';
-					if (isset($_REQUEST['ShowMD5']) && GETID3_DEMO_BROWSE_ALLOW_MD5_LINK) {
-						echo '<td align="left"><tt>'.(isset($fileinfo['md5_file'])        ? $fileinfo['md5_file']        : '&nbsp;').'</tt></td>';
-						echo '<td align="left"><tt>'.(isset($fileinfo['md5_data'])        ? $fileinfo['md5_data']        : '&nbsp;').'</tt></td>';
-						echo '<td align="left"><tt>'.(isset($fileinfo['md5_data_source']) ? $fileinfo['md5_data_source'] : '&nbsp;').'</tt></td>';
-					} else {
-						echo '<td align="center" colspan="3">-</td>';
-					}
-					echo '<td align="left">&nbsp;'.(!empty($fileinfo['tags']) ? implode(', ', array_keys($fileinfo['tags'])) : '').'</td>';
-
-					echo '<td align="left">&nbsp;';
-					if (!empty($fileinfo['warning'])) {
-						$FilesWithWarnings++;
-						echo '<a href="#" onClick="alert(\''.htmlentities(str_replace("'", "\\'", preg_replace('#[\r\n\t]+#', ' ', implode('\\n', $fileinfo['warning']))), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'\'); return false;" title="'.htmlentities(implode("; \n", $fileinfo['warning']), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'">warning</a><br>';
-					}
-					if (!empty($fileinfo['error'])) {
-						$FilesWithErrors++;
-						echo '<a href="#" onClick="alert(\''.htmlentities(str_replace("'", "\\'", preg_replace('#[\r\n\t]+#', ' ', implode('\\n', $fileinfo['error']))),   ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'\'); return false;" title="'.htmlentities(implode("; \n", $fileinfo['error']),   ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'">error</a><br>';
-					}
-					echo '</td>';
-
-					if (GETID3_DEMO_BROWSE_ALLOW_EDIT_LINK) {
-						echo '<td align="left">&nbsp;';
-						$fileinfo['fileformat'] = (isset($fileinfo['fileformat']) ? $fileinfo['fileformat'] : '');
-						switch ($fileinfo['fileformat']) {
-							case 'mp3':
-							case 'mp2':
-							case 'mp1':
-							case 'flac':
-							case 'mpc':
-							case 'real':
-								echo '<a href="'.htmlentities($writescriptfilename.'?Filename='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'" title="Edit tags">edit&nbsp;tags</a>';
-								break;
-							case 'ogg':
-								if (isset($fileinfo['audio']['dataformat']) && ($fileinfo['audio']['dataformat'] == 'vorbis')) {
-									echo '<a href="'.htmlentities($writescriptfilename.'?Filename='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'" title="Edit tags">edit&nbsp;tags</a>';
-								}
-								break;
-							default:
-								break;
-						}
-						echo '</td>';
-					}
-					if (GETID3_DEMO_BROWSE_ALLOW_DELETE_LINK) {
-						echo '<td align="left">&nbsp;<a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.urlencode($listdirectory).'&deletefile='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'" onClick="return confirm(\'Are you sure you want to delete '.addslashes(htmlentities($dirname.$filename)).'? \n(this action cannot be un-done)\');" title="'.htmlentities('Permanently delete '."\n".$filename."\n".' from'."\n".' '.$dirname, ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'">delete</a></td>';
-					}
-					echo '</tr>';
-				}
-			}
-
-			if (isset($DirectoryContents[$dirname]['other']) && is_array($DirectoryContents[$dirname]['other'])) {
-				uksort($DirectoryContents[$dirname]['other'], 'MoreNaturalSort');
-				foreach ($DirectoryContents[$dirname]['other'] as $filename => $fileinfo) {
-					echo '<tr bgcolor="#'.(($rowcounter++ % 2) ? $getID3checkColor_UnknownDark : $getID3checkColor_UnknownLight).'">';
-					$escaped_filename = htmlentities($filename, ENT_SUBSTITUTE, 'ISO-8859-1');
-					$escaped_filename = ($escaped_filename ? $escaped_filename : rawurlencode($filename));
-					echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?filename='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'"><i>'.$escaped_filename.'</i></a></td>';
-					echo '<td align="right">&nbsp;'.(isset($fileinfo['filesize']) ? number_format($fileinfo['filesize']) : '-').'</td>';
-					echo '<td align="right">&nbsp;'.NiceDisplayFiletypeFormat($fileinfo).'</td>';
-					echo '<td align="right">&nbsp;'.(isset($fileinfo['playtime_string']) ? $fileinfo['playtime_string'] : '-').'</td>';
-					echo '<td align="right">&nbsp;'.(isset($fileinfo['bitrate']) ? BitrateText($fileinfo['bitrate'] / 1000) : '-').'</td>';
-					echo '<td align="left">&nbsp;</td>'; // Artist
-					echo '<td align="left">&nbsp;</td>'; // Title
-					echo '<td align="left" colspan="3">&nbsp;</td>'; // MD5_data
-					echo '<td align="left">&nbsp;</td>'; // Tags
-
-					//echo '<td align="left">&nbsp;</td>'; // Warning/Error
-					echo '<td align="left">&nbsp;';
-					if (!empty($fileinfo['warning'])) {
-						$FilesWithWarnings++;
-						echo '<a href="#" onClick="alert(\''.htmlentities(implode('\\n', $fileinfo['warning']), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'\'); return false;" title="'.htmlentities(implode("\n", $fileinfo['warning']), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'">warning</a><br>';
-					}
-					if (!empty($fileinfo['error'])) {
-						if ($fileinfo['error'][0] != 'unable to determine file format') {
-							$FilesWithErrors++;
-							echo '<a href="#" onClick="alert(\''.htmlentities(implode('\\n', $fileinfo['error']), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'\'); return false;" title="'.htmlentities(implode("\n", $fileinfo['error']), ENT_QUOTES | ENT_SUBSTITUTE, $PageEncoding).'">error</a><br>';
-						}
-					}
-					echo '</td>';
-
-					if (GETID3_DEMO_BROWSE_ALLOW_EDIT_LINK) {
-						echo '<td align="left">&nbsp;</td>'; // Edit
-					}
-					if (GETID3_DEMO_BROWSE_ALLOW_DELETE_LINK) {
-						echo '<td align="left">&nbsp;<a href="'.htmlentities($_SERVER['PHP_SELF'].'?listdirectory='.urlencode($listdirectory).'&deletefile='.urlencode($dirname.$filename), ENT_QUOTES | ENT_SUBSTITUTE, 'ISO-8859-1').'" onClick="return confirm(\'Are you sure you want to delete '.addslashes($dirname.$filename).'? \n(this action cannot be un-done)\');" title="Permanently delete '.addslashes($dirname.$filename).'">delete</a></td>';
-					}
-					echo '</tr>';
-				}
-			}
-
-			echo '<tr bgcolor="#'.$getID3checkColor_Head.'">';
-			echo '<td><b>Average:</b></td>';
-			echo '<td align="right">'.number_format($TotalScannedFilesize / max($TotalScannedKnownFiles, 1)).'</td>';
-			echo '<td>&nbsp;</td>';
-			echo '<td align="right">'.getid3_lib::PlaytimeString($TotalScannedPlaytime / max($TotalScannedPlaytimeFiles, 1)).'</td>';
-			echo '<td align="right">'.BitrateText(round(($TotalScannedBitrate / 1000) / max($TotalScannedBitrateFiles, 1))).'</td>';
-			echo '<td rowspan="2" colspan="'.($columnsintable - 5).'"><table class="table" border="0" cellspacing="0" cellpadding="2"><tr><th align="right">Identified Files:</th><td align="right">'.number_format($TotalScannedKnownFiles).'</td><td>&nbsp;&nbsp;&nbsp;</td><th align="right">Errors:</th><td align="right">'.number_format($FilesWithErrors).'</td></tr><tr><th align="right">Unknown Files:</th><td align="right">'.number_format($TotalScannedUnknownFiles).'</td><td>&nbsp;&nbsp;&nbsp;</td><th align="right">Warnings:</th><td align="right">'.number_format($FilesWithWarnings).'</td></tr></table>';
-			echo '</tr>';
-			echo '<tr bgcolor="#'.$getID3checkColor_Head.'">';
-			echo '<td><b>Total:</b></td>';
-			echo '<td align="right">'.number_format($TotalScannedFilesize).'</td>';
-			echo '<td>&nbsp;</td>';
-			echo '<td align="right">'.getid3_lib::PlaytimeString($TotalScannedPlaytime).'</td>';
-			echo '<td>&nbsp;</td>';
-			echo '</tr>';
-		}
-		echo '</table>';
-	} else {
-		$errormessage = ob_get_contents();
-		ob_end_clean();
-		echo '<b>ERROR: Could not open directory: <u>'.$currentfulldir.'</u></b><br>';
-	}
-}
-echo PoweredBygetID3().'<br clear="all">';
-echo '</body></html>';
-
-
-/////////////////////////////////////////////////////////////////
-
-
-function RemoveAccents($string) {
-	// Revised version by markstewardרotmail*com
-	// Again revised by James Heinrich (19-June-2006)
-	return strtr(
-		strtr(
-			$string,
-			"\x8A\x8E\x9A\x9E\x9F\xC0\xC1\xC2\xC3\xC4\xC5\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD1\xD2\xD3\xD4\xD5\xD6\xD8\xD9\xDA\xDB\xDC\xDD\xE0\xE1\xE2\xE3\xE4\xE5\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF1\xF2\xF3\xF4\xF5\xF6\xF8\xF9\xFA\xFB\xFC\xFD\xFF",
-			'SZszYAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy'
-		),
-		array(
-			"\xDE" => 'TH',
-			"\xFE" => 'th',
-			"\xD0" => 'DH',
-			"\xF0" => 'dh',
-			"\xDF" => 'ss',
-			"\x8C" => 'OE',
-			"\x9C" => 'oe',
-			"\xC6" => 'AE',
-			"\xE6" => 'ae',
-			"\xB5" => 'u'
-		)
-	);
-}
-
-
-function BitrateColor($bitrate, $BitrateMaxScale=768) {
-	// $BitrateMaxScale is bitrate of maximum-quality color (bright green)
-	// below this is gradient, above is solid green
-
-	$bitrate *= (256 / $BitrateMaxScale); // scale from 1-[768]kbps to 1-256
-	$bitrate = round(min(max($bitrate, 1), 256));
-	$bitrate--;    // scale from 1-256kbps to 0-255kbps
-
-	$Rcomponent = max(255 - ($bitrate * 2), 0);
-	$Gcomponent = max(($bitrate * 2) - 255, 0);
-	if ($bitrate > 127) {
-		$Bcomponent = max((255 - $bitrate) * 2, 0);
-	} else {
-		$Bcomponent = max($bitrate * 2, 0);
-	}
-	return str_pad(dechex($Rcomponent), 2, '0', STR_PAD_LEFT).str_pad(dechex($Gcomponent), 2, '0', STR_PAD_LEFT).str_pad(dechex($Bcomponent), 2, '0', STR_PAD_LEFT);
-}
-
-function BitrateText($bitrate, $decimals=0, $vbr=false) {
-	return '<span style="color: #'.BitrateColor($bitrate).($vbr ? '; font-weight: bold;' : '').'">'.number_format($bitrate, $decimals).' kbps</span>';
-}
-
-function string_var_dump($variable) {
-	if (version_compare(PHP_VERSION, '4.3.0', '>=')) {
-		return print_r($variable, true);
-	}
-	ob_start();
-	var_dump($variable);
-	$dumpedvariable = ob_get_contents();
-	ob_end_clean();
-	return $dumpedvariable;
-}
-
-function table_var_dump($variable, $wrap_in_td=false, $encoding='ISO-8859-1') {
-	$returnstring = '';
-	switch (gettype($variable)) {
-		case 'array':
-			$returnstring .= ($wrap_in_td ? '<td>' : '');
-			$returnstring .= '<table class="dump" cellspacing="0" cellpadding="2">';
-			foreach ($variable as $key => $value) {
-				$returnstring .= '<tr><td valign="top"><b>'.str_replace("\x00", ' ', $key).'</b></td>'."\n";
-				$returnstring .= '<td valign="top">'.gettype($value);
-				if (is_array($value)) {
-					$returnstring .= '&nbsp;('.count($value).')';
-				} elseif (is_string($value)) {
-					$returnstring .= '&nbsp;('.strlen($value).')';
-				}
-				//if (($key == 'data') && isset($variable['image_mime']) && isset($variable['dataoffset'])) {
-				if (($key == 'data') && isset($variable['image_mime'])) {
-					$imageinfo = array();
-					$imagechunkcheck = getid3_lib::GetDataImageSize($value, $imageinfo);
-					$returnstring .= '</td>'."\n".'<td><img src="data:'.$variable['image_mime'].';base64,'.base64_encode($value).'" width="'.$imagechunkcheck[0].'" height="'.$imagechunkcheck[1].'"></td></tr>'."\n";
-				} else {
-					$returnstring .= '</td>'."\n".table_var_dump($value, true, $encoding).'</tr>'."\n";
-				}
-			}
-			$returnstring .= '</table>'."\n";
-			$returnstring .= ($wrap_in_td ? '</td>'."\n" : '');
-			break;
-
-		case 'boolean':
-			$returnstring .= ($wrap_in_td ? '<td class="dump_boolean">' : '').($variable ? 'TRUE' : 'FALSE').($wrap_in_td ? '</td>'."\n" : '');
-			break;
-
-		case 'integer':
-			$returnstring .= ($wrap_in_td ? '<td class="dump_integer">' : '').$variable.($wrap_in_td ? '</td>'."\n" : '');
-			break;
-
-		case 'double':
-		case 'float':
-			$returnstring .= ($wrap_in_td ? '<td class="dump_double">' : '').$variable.($wrap_in_td ? '</td>'."\n" : '');
-			break;
-
-		case 'object':
-		case 'null':
-			$returnstring .= ($wrap_in_td ? '<td>' : '').string_var_dump($variable).($wrap_in_td ? '</td>'."\n" : '');
-			break;
-
-		case 'string':
-			$returnstring = htmlentities($variable, ENT_QUOTES | ENT_SUBSTITUTE, $encoding);
-			$returnstring = ($wrap_in_td ? '<td class="dump_string">' : '').nl2br($returnstring).($wrap_in_td ? '</td>'."\n" : '');
-			break;
-
-		default:
-			$imageinfo = array();
-			$imagechunkcheck = getid3_lib::GetDataImageSize($variable, $imageinfo);
-			if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
-				$returnstring .= ($wrap_in_td ? '<td>' : '');
-				$returnstring .= '<table class="dump" cellspacing="0" cellpadding="2">';
-				$returnstring .= '<tr><td><b>type</b></td><td>'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]).'</td></tr>'."\n";
-				$returnstring .= '<tr><td><b>width</b></td><td>'.number_format($imagechunkcheck[0]).' px</td></tr>'."\n";
-				$returnstring .= '<tr><td><b>height</b></td><td>'.number_format($imagechunkcheck[1]).' px</td></tr>'."\n";
-				$returnstring .= '<tr><td><b>size</b></td><td>'.number_format(strlen($variable)).' bytes</td></tr></table>'."\n";
-				$returnstring .= ($wrap_in_td ? '</td>'."\n" : '');
-			} else {
-				$returnstring .= ($wrap_in_td ? '<td>' : '').nl2br(htmlspecialchars(str_replace("\x00", ' ', $variable))).($wrap_in_td ? '</td>'."\n" : '');
-			}
-			break;
-	}
-	return $returnstring;
-}
-
-
-function NiceDisplayFiletypeFormat(&$fileinfo) {
-
-	if (empty($fileinfo['fileformat'])) {
-		return '-';
-	}
-
-	$output  = $fileinfo['fileformat'];
-	if (empty($fileinfo['video']['dataformat']) && empty($fileinfo['audio']['dataformat'])) {
-		return $output;  // 'gif'
-	}
-	if (empty($fileinfo['video']['dataformat']) && !empty($fileinfo['audio']['dataformat'])) {
-		if ($fileinfo['fileformat'] == $fileinfo['audio']['dataformat']) {
-			return $output; // 'mp3'
-		}
-		$output .= '.'.$fileinfo['audio']['dataformat']; // 'ogg.flac'
-		return $output;
-	}
-	if (!empty($fileinfo['video']['dataformat']) && empty($fileinfo['audio']['dataformat'])) {
-		if ($fileinfo['fileformat'] == $fileinfo['video']['dataformat']) {
-			return $output; // 'mpeg'
-		}
-		$output .= '.'.$fileinfo['video']['dataformat']; // 'riff.avi'
-		return $output;
-	}
-	if ($fileinfo['video']['dataformat'] == $fileinfo['audio']['dataformat']) {
-		if ($fileinfo['fileformat'] == $fileinfo['video']['dataformat']) {
-			return $output; // 'real'
-		}
-		$output .= '.'.$fileinfo['video']['dataformat']; // any examples?
-		return $output;
-	}
-	$output .= '.'.$fileinfo['video']['dataformat'];
-	$output .= '.'.$fileinfo['audio']['dataformat']; // asf.wmv.wma
-	return $output;
-
-}
-
-function MoreNaturalSort($ar1, $ar2) {
-	if ($ar1 === $ar2) {
-		return 0;
-	}
-	$len1     = strlen($ar1);
-	$len2     = strlen($ar2);
-	$shortest = min($len1, $len2);
-	if (substr($ar1, 0, $shortest) === substr($ar2, 0, $shortest)) {
-		// the shorter argument is the beginning of the longer one, like "str" and "string"
-		if ($len1 < $len2) {
-			return -1;
-		} elseif ($len1 > $len2) {
-			return 1;
-		}
-		return 0;
-	}
-	$ar1 = RemoveAccents(strtolower(trim($ar1)));
-	$ar2 = RemoveAccents(strtolower(trim($ar2)));
-	$translatearray = array('\''=>'', '"'=>'', '_'=>' ', '('=>'', ')'=>'', '-'=>' ', '  '=>' ', '.'=>'', ','=>'');
-	foreach ($translatearray as $key => $val) {
-		$ar1 = str_replace($key, $val, $ar1);
-		$ar2 = str_replace($key, $val, $ar2);
-	}
-
-	if ($ar1 < $ar2) {
-		return -1;
-	} elseif ($ar1 > $ar2) {
-		return 1;
-	}
-	return 0;
-}
-
-function PoweredBygetID3($string='') {
-	global $getID3;
-	if (!$string) {
-		$string = '<div style="border: 1px #CCCCCC solid; padding: 5px; margin: 5px 0px; float: left; background-color: #EEEEEE; font-size: 8pt; font-face: sans-serif;">Powered by <a href="http://getid3.sourceforge.net"><b>getID3() v<!--GETID3VER--></b><br>http://getid3.sourceforge.net</a><br>Running on PHP v'.phpversion().' ('.(ceil(log(PHP_INT_MAX, 2)) + 1).'-bit)</div>';
-	}
-	return str_replace('<!--GETID3VER-->', $getID3->version(), $string);
-}
diff --git a/lib/getid3/demos/demo.cache.dbm.php b/lib/getid3/demos/demo.cache.dbm.php
deleted file mode 100644
index 0570d035b..000000000
--- a/lib/getid3/demos/demo.cache.dbm.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.cache.dbm.php - part of getID3()                 //
-// Sample script demonstrating the use of the DBM caching      //
-// extension for getID3()                                      //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-
-require_once('../getid3/getid3.php');
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'extension.cache.dbm.php', __FILE__, true);
-
-$getID3 = new getID3_cached_dbm('db3', '/zimweb/test/test.dbm', '/zimweb/test/test.lock');
-
-$r = $getID3->analyze('/path/to/files/filename.mp3');
-
-echo '<pre>';
-var_dump($r);
-echo '</pre>';
-
-// uncomment to clear cache
-// $getID3->clear_cache();
diff --git a/lib/getid3/demos/demo.cache.mysql.php b/lib/getid3/demos/demo.cache.mysql.php
deleted file mode 100644
index 745619d59..000000000
--- a/lib/getid3/demos/demo.cache.mysql.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.cache.mysql.php - part of getID3()               //
-// Sample script demonstrating the use of the DBM caching      //
-// extension for getID3()                                      //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-
-require_once('../getid3/getid3.php');
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'extension.cache.mysql.php', __FILE__, true);
-
-$getID3 = new getID3_cached_mysql('localhost', 'database', 'username', 'password');
-
-$r = $getID3->analyze('/path/to/files/filename.mp3');
-
-echo '<pre>';
-var_dump($r);
-echo '</pre>';
-
-// uncomment to clear cache
-//$getID3->clear_cache();
diff --git a/lib/getid3/demos/demo.joinmp3.php b/lib/getid3/demos/demo.joinmp3.php
deleted file mode 100644
index 09760c9f6..000000000
--- a/lib/getid3/demos/demo.joinmp3.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.joinmp3.php - part of getID3()                   //
-// Sample script for splicing two or more MP3s together into   //
-// one file. Does not attempt to fix VBR header frames.        //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-// sample usage:
-// $FilenameOut   = 'combined.mp3';
-// $FilenamesIn[] = 'file1.mp3';
-// $FilenamesIn[] = 'file2.mp3';
-// $FilenamesIn[] = 'file3.mp3';
-//
-// if (CombineMultipleMP3sTo($FilenameOut, $FilenamesIn)) {
-//     echo 'Successfully copied '.implode(' + ', $FilenamesIn).' to '.$FilenameOut;
-// } else {
-//     echo 'Failed to copy '.implode(' + ', $FilenamesIn).' to '.$FilenameOut;
-// }
-
-function CombineMultipleMP3sTo($FilenameOut, $FilenamesIn) {
-
-	foreach ($FilenamesIn as $nextinputfilename) {
-		if (!is_readable($nextinputfilename)) {
-			echo 'Cannot read "'.$nextinputfilename.'"<BR>';
-			return false;
-		}
-	}
-	if (!is_writeable($FilenameOut)) {
-		echo 'Cannot write "'.$FilenameOut.'"<BR>';
-		return false;
-	}
-
-	require_once('../getid3/getid3.php');
-	ob_start();
-	if ($fp_output = fopen($FilenameOut, 'wb')) {
-
-		ob_end_clean();
-		// Initialize getID3 engine
-		$getID3 = new getID3;
-		foreach ($FilenamesIn as $nextinputfilename) {
-
-			$CurrentFileInfo = $getID3->analyze($nextinputfilename);
-			if ($CurrentFileInfo['fileformat'] == 'mp3') {
-
-				ob_start();
-				if ($fp_source = fopen($nextinputfilename, 'rb')) {
-
-					ob_end_clean();
-					$CurrentOutputPosition = ftell($fp_output);
-
-					// copy audio data from first file
-					fseek($fp_source, $CurrentFileInfo['avdataoffset'], SEEK_SET);
-					while (!feof($fp_source) && (ftell($fp_source) < $CurrentFileInfo['avdataend'])) {
-						fwrite($fp_output, fread($fp_source, 32768));
-					}
-					fclose($fp_source);
-
-					// trim post-audio data (if any) copied from first file that we don't need or want
-					$EndOfFileOffset = $CurrentOutputPosition + ($CurrentFileInfo['avdataend'] - $CurrentFileInfo['avdataoffset']);
-					fseek($fp_output, $EndOfFileOffset, SEEK_SET);
-					ftruncate($fp_output, $EndOfFileOffset);
-
-				} else {
-
-					$errormessage = ob_get_contents();
-					ob_end_clean();
-					echo 'failed to open '.$nextinputfilename.' for reading';
-					fclose($fp_output);
-					return false;
-
-				}
-
-			} else {
-
-				echo $nextinputfilename.' is not MP3 format';
-				fclose($fp_output);
-				return false;
-
-			}
-
-		}
-
-	} else {
-
-		$errormessage = ob_get_contents();
-		ob_end_clean();
-		echo 'failed to open '.$FilenameOut.' for writing';
-		return false;
-
-	}
-
-	fclose($fp_output);
-	return true;
-}
diff --git a/lib/getid3/demos/demo.mimeonly.php b/lib/getid3/demos/demo.mimeonly.php
deleted file mode 100644
index 3ef70a900..000000000
--- a/lib/getid3/demos/demo.mimeonly.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                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.mimeonly.php - part of getID3()                  //
-// Sample script for scanning a single file and returning only //
-// the MIME information                                        //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-echo '<html><head><title>getID3 demos - MIME type only</title><style type="text/css">BODY, TD, TH { font-family: sans-serif; font-size: 10pt; }</style></head><body>';
-
-if (!empty($_REQUEST['filename'])) {
-
-	echo 'The file "'.htmlentities($_REQUEST['filename']).'" has a MIME type of "'.htmlentities(GetMIMEtype($_REQUEST['filename'])).'"';
-
-} else {
-
-	echo 'Usage: <span style="font-family: monospace;">'.htmlentities($_SERVER['PHP_SELF']).'?filename=<i>filename.ext</i></span>';
-
-}
-
-
-function GetMIMEtype($filename) {
-	$filename = realpath($filename);
-	if (!file_exists($filename)) {
-		echo 'File does not exist: "'.htmlentities($filename).'"<br>';
-		return '';
-	} elseif (!is_readable($filename)) {
-		echo 'File is not readable: "'.htmlentities($filename).'"<br>';
-		return '';
-	}
-
-	// include getID3() library (can be in a different directory if full path is specified)
-	require_once('../getid3/getid3.php');
-	// Initialize getID3 engine
-	$getID3 = new getID3;
-
-	$DeterminedMIMEtype = '';
-	if ($fp = fopen($filename, 'rb')) {
-		$getID3->openfile($filename);
-		if (empty($getID3->info['error'])) {
-
-			// ID3v2 is the only tag format that might be prepended in front of files, and it's non-trivial to skip, easier just to parse it and know where to skip to
-			getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
-			$getid3_id3v2 = new getid3_id3v2($getID3);
-			$getid3_id3v2->Analyze();
-
-			fseek($fp, $getID3->info['avdataoffset'], SEEK_SET);
-			$formattest = fread($fp, 16);  // 16 bytes is sufficient for any format except ISO CD-image
-			fclose($fp);
-
-			$DeterminedFormatInfo = $getID3->GetFileFormat($formattest);
-			$DeterminedMIMEtype = $DeterminedFormatInfo['mime_type'];
-
-		} else {
-			echo 'Failed to getID3->openfile "'.htmlentities($filename).'"<br>';
-		}
-	} else {
-		echo 'Failed to fopen "'.htmlentities($filename).'"<br>';
-	}
-	return $DeterminedMIMEtype;
-}
-
-echo '</body></html>';
\ No newline at end of file
diff --git a/lib/getid3/demos/demo.mp3header.php b/lib/getid3/demos/demo.mp3header.php
deleted file mode 100644
index 846db679a..000000000
--- a/lib/getid3/demos/demo.mp3header.php
+++ /dev/null
@@ -1,2888 +0,0 @@
-<?php
-
-if (!function_exists('PrintHexBytes')) {
-	function PrintHexBytes($string) {
-		$returnstring = '';
-		for ($i = 0; $i < strlen($string); $i++) {
-			$returnstring .= str_pad(dechex(ord(substr($string, $i, 1))), 2, '0', STR_PAD_LEFT).' ';
-		}
-		return $returnstring;
-	}
-}
-
-if (!function_exists('PrintTextBytes')) {
-	function PrintTextBytes($string) {
-		$returnstring = '';
-		for ($i = 0; $i < strlen($string); $i++) {
-			if (ord(substr($string, $i, 1)) <= 31) {
-				$returnstring .= '   ';
-			} else {
-				$returnstring .= ' '.substr($string, $i, 1).' ';
-			}
-		}
-		return $returnstring;
-	}
-}
-
-if (!function_exists('table_var_dump')) {
-	function table_var_dump($variable) {
-		$returnstring = '';
-		switch (gettype($variable)) {
-			case 'array':
-				$returnstring .= '<TABLE BORDER="1" CELLSPACING="0" CELLPADDING="2">';
-				foreach ($variable as $key => $value) {
-					$returnstring .= '<TR><TD VALIGN="TOP"><B>'.str_replace(chr(0), ' ', $key).'</B></TD>';
-					$returnstring .= '<TD VALIGN="TOP">'.gettype($value);
-					if (is_array($value)) {
-						$returnstring .= '&nbsp;('.count($value).')';
-					} elseif (is_string($value)) {
-						$returnstring .= '&nbsp;('.strlen($value).')';
-					}
-					if (($key == 'data') && isset($variable['image_mime']) && isset($variable['dataoffset'])) {
-						require_once(GETID3_INCLUDEPATH.'getid3.getimagesize.php');
-						$imageinfo = array();
-						$imagechunkcheck = GetDataImageSize($value, $imageinfo);
-						$DumpedImageSRC = (!empty($_REQUEST['filename']) ? $_REQUEST['filename'] : '.getid3').'.'.$variable['dataoffset'].'.'.ImageTypesLookup($imagechunkcheck[2]);
-						if ($tempimagefile = fopen($DumpedImageSRC, 'wb')) {
-							fwrite($tempimagefile, $value);
-							fclose($tempimagefile);
-						}
-						$returnstring .= '</TD><TD><IMG SRC="'.$DumpedImageSRC.'" WIDTH="'.$imagechunkcheck[0].'" HEIGHT="'.$imagechunkcheck[1].'"></TD></TR>';
-					} else {
-						$returnstring .= '</TD><TD>'.table_var_dump($value).'</TD></TR>';
-					}
-				}
-				$returnstring .= '</TABLE>';
-				break;
-
-			case 'boolean':
-				$returnstring .= ($variable ? 'TRUE' : 'FALSE');
-				break;
-
-			case 'integer':
-			case 'double':
-			case 'float':
-				$returnstring .= $variable;
-				break;
-
-			case 'object':
-			case 'null':
-				$returnstring .= string_var_dump($variable);
-				break;
-
-			case 'string':
-				$variable = str_replace(chr(0), ' ', $variable);
-				$varlen = strlen($variable);
-				for ($i = 0; $i < $varlen; $i++) {
-					if (preg_match('#['.chr(0x0A).chr(0x0D).' -;0-9A-Za-z]#', $variable{$i})) {
-						$returnstring .= $variable{$i};
-					} else {
-						$returnstring .= '&#'.str_pad(ord($variable{$i}), 3, '0', STR_PAD_LEFT).';';
-					}
-				}
-				$returnstring = nl2br($returnstring);
-				break;
-
-			default:
-				require_once(GETID3_INCLUDEPATH.'getid3.getimagesize.php');
-				$imageinfo = array();
-				$imagechunkcheck = GetDataImageSize(substr($variable, 0, 32768), $imageinfo);
-
-				if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
-					$returnstring .= '<table border="1" cellspacing="0" cellpadding="2">';
-					$returnstring .= '<tr><td><b>type</b></td><td>'.ImageTypesLookup($imagechunkcheck[2]).'</td></tr>';
-					$returnstring .= '<tr><td><b>width</b></td><td>'.number_format($imagechunkcheck[0]).' px</td></tr>';
-					$returnstring .= '<tr><td><b>height</b></td><td>'.number_format($imagechunkcheck[1]).' px</td></tr>';
-					$returnstring .= '<tr><td><b>size</b></td><td>'.number_format(strlen($variable)).' bytes</td></tr></table>';
-				} else {
-					$returnstring .= nl2br(htmlspecialchars(str_replace(chr(0), ' ', $variable)));
-				}
-				break;
-		}
-		return $returnstring;
-	}
-}
-
-if (!function_exists('string_var_dump')) {
-	function string_var_dump($variable) {
-		if (version_compare(PHP_VERSION, '4.3.0', '>=')) {
-			return print_r($variable, true);
-		}
-		ob_start();
-		var_dump($variable);
-		$dumpedvariable = ob_get_contents();
-		ob_end_clean();
-		return $dumpedvariable;
-	}
-}
-
-if (!function_exists('fileextension')) {
-	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 '';
-	}
-}
-
-if (!function_exists('RemoveAccents')) {
-	function RemoveAccents($string) {
-		// return strtr($string, 'ŠŒŽšœžŸ¥µÀ�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ', 'SOZsozYYuAAAAAAACEEEEIIIIDNOOOOOOUUUUYsaaaaaaaceeeeiiiionoooooouuuuyy');
-		// Revised version by marksteward@hotmail.com
-		return strtr(strtr($string, 'ŠŽšžŸÀ�ÂÃÄÅÇÈÉÊËÌ�Î�ÑÒÓÔÕÖØÙÚÛÜ�àáâãäåçèéêëìíîïñòóôõöøùúûüýÿ', 'SZszYAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy'), array('Þ' => 'TH', 'þ' => 'th', '�' => 'DH', 'ð' => 'dh', 'ß' => 'ss', 'Œ' => 'OE', 'œ' => 'oe', 'Æ' => 'AE', 'æ' => 'ae', 'µ' => 'u'));
-	}
-}
-
-if (!function_exists('MoreNaturalSort')) {
-	function MoreNaturalSort($ar1, $ar2) {
-		if ($ar1 === $ar2) {
-			return 0;
-		}
-		$len1     = strlen($ar1);
-		$len2     = strlen($ar2);
-		$shortest = min($len1, $len2);
-		if (substr($ar1, 0, $shortest) === substr($ar2, 0, $shortest)) {
-			// the shorter argument is the beginning of the longer one, like "str" and "string"
-			if ($len1 < $len2) {
-				return -1;
-			} elseif ($len1 > $len2) {
-				return 1;
-			}
-			return 0;
-		}
-		$ar1 = RemoveAccents(strtolower(trim($ar1)));
-		$ar2 = RemoveAccents(strtolower(trim($ar2)));
-		$translatearray = array('\''=>'', '"'=>'', '_'=>' ', '('=>'', ')'=>'', '-'=>' ', '  '=>' ', '.'=>'', ','=>'');
-		foreach ($translatearray as $key => $val) {
-			$ar1 = str_replace($key, $val, $ar1);
-			$ar2 = str_replace($key, $val, $ar2);
-		}
-
-		if ($ar1 < $ar2) {
-			return -1;
-		} elseif ($ar1 > $ar2) {
-			return 1;
-		}
-		return 0;
-	}
-}
-
-if (!function_exists('trunc')) {
-	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 ($truncatednumber <= pow(2, 30)) {
-			$truncatednumber = (int) $truncatednumber;
-		}
-		return $truncatednumber;
-	}
-}
-
-if (!function_exists('CastAsInt')) {
-	function CastAsInt($floatnum) {
-		// convert to float if not already
-		$floatnum = (float) $floatnum;
-
-		// convert a float to type int, only if possible
-		if (trunc($floatnum) == $floatnum) {
-			// it's not floating point
-			if ($floatnum <= pow(2, 30)) {
-				// it's within int range
-				$floatnum = (int) $floatnum;
-			}
-		}
-		return $floatnum;
-	}
-}
-
-if (!function_exists('getmicrotime')) {
-	function getmicrotime() {
-		list($usec, $sec) = explode(' ', microtime());
-		return ((float) $usec + (float) $sec);
-	}
-}
-
-if (!function_exists('DecimalBinary2Float')) {
-	function DecimalBinary2Float($binarynumerator) {
-		$numerator   = Bin2Dec($binarynumerator);
-		$denominator = Bin2Dec(str_repeat('1', strlen($binarynumerator)));
-		return ($numerator / $denominator);
-	}
-}
-
-if (!function_exists('NormalizeBinaryPoint')) {
-	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);
-	}
-}
-
-if (!function_exists('Float2BinaryDecimal')) {
-	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   = trunc($floatvalue);
-		$floatpart = abs($floatvalue - $intpart);
-		$pointbitstring = '';
-		while (($floatpart != 0) && (strlen($pointbitstring) < $maxbits)) {
-			$floatpart *= 2;
-			$pointbitstring .= (string) trunc($floatpart);
-			$floatpart -= trunc($floatpart);
-		}
-		$binarypointnumber = decbin($intpart).'.'.$pointbitstring;
-		return $binarypointnumber;
-	}
-}
-
-if (!function_exists('Float2String')) {
-	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  = NormalizeBinaryPoint(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 BigEndian2String(Bin2Dec($signbit.$exponentbitstring.$fractionbitstring), $bits % 8, false);
-	}
-}
-
-if (!function_exists('LittleEndian2Float')) {
-	function LittleEndian2Float($byteword) {
-		return BigEndian2Float(strrev($byteword));
-	}
-}
-
-if (!function_exists('BigEndian2Float')) {
-	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 = BigEndian2Bin($byteword);
-		$signbit = $bitword{0};
-
-		switch (strlen($byteword) * 8) {
-			case 32:
-				$exponentbits = 8;
-				$fractionbits = 23;
-				break;
-
-			case 64:
-				$exponentbits = 11;
-				$fractionbits = 52;
-				break;
-
-			case 80:
-				$exponentbits = 16;
-				$fractionbits = 64;
-				break;
-
-			default:
-				return false;
-				break;
-		}
-		$exponentstring = substr($bitword, 1, $exponentbits - 1);
-		$fractionstring = substr($bitword, $exponentbits, $fractionbits);
-		$exponent = Bin2Dec($exponentstring);
-		$fraction = Bin2Dec($fractionstring);
-
-		if (($exponentbits == 16) && ($fractionbits == 64)) {
-			// 80-bit
-			// As used in Apple AIFF for sample_rate
-			// A bit of a hack, but it works ;)
-			return pow(2, ($exponent  - 16382)) * DecimalBinary2Float($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))) * DecimalBinary2Float($fractionstring);
-			if ($signbit == '1') {
-				$floatvalue *= -1;
-			}
-		} elseif ($exponent != 0) {
-			$floatvalue = pow(2, ($exponent - (pow(2, $exponentbits - 1) - 1))) * (1 + DecimalBinary2Float($fractionstring));
-			if ($signbit == '1') {
-				$floatvalue *= -1;
-			}
-		}
-		return (float) $floatvalue;
-	}
-}
-
-if (!function_exists('BigEndian2Int')) {
-	function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
-		$intvalue = 0;
-		$bytewordlen = strlen($byteword);
-		for ($i = 0; $i < $bytewordlen; $i++) {
-			if ($synchsafe) { // disregard MSB, effectively 7-bit bytes
-				$intvalue = $intvalue | (ord($byteword{$i}) & 0x7F) << (($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
-			switch ($bytewordlen) {
-				case 1:
-				case 2:
-				case 3:
-				case 4:
-					$signmaskbit = 0x80 << (8 * ($bytewordlen - 1));
-					if ($intvalue & $signmaskbit) {
-						$intvalue = 0 - ($intvalue & ($signmaskbit - 1));
-					}
-					break;
-
-				default:
-					die('ERROR: Cannot have signed integers larger than 32-bits in BigEndian2Int()');
-					break;
-			}
-		}
-		return CastAsInt($intvalue);
-	}
-}
-
-if (!function_exists('LittleEndian2Int')) {
-	function LittleEndian2Int($byteword, $signed=false) {
-		return BigEndian2Int(strrev($byteword), false, $signed);
-	}
-}
-
-if (!function_exists('BigEndian2Bin')) {
-	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;
-	}
-}
-
-if (!function_exists('BigEndian2String')) {
-	function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
-		if ($number < 0) {
-			return false;
-		}
-		$maskbyte = (($synchsafe || $signed) ? 0x7F : 0xFF);
-		$intstring = '';
-		if ($signed) {
-			if ($minbytes > 4) {
-				die('ERROR: Cannot have signed integers larger than 32-bits in 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, chr(0), STR_PAD_LEFT);
-	}
-}
-
-if (!function_exists('Dec2Bin')) {
-	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;
-	}
-}
-
-if (!function_exists('Bin2Dec')) {
-	function Bin2Dec($binstring) {
-		$decvalue = 0;
-		for ($i = 0; $i < strlen($binstring); $i++) {
-			$decvalue += ((int) substr($binstring, strlen($binstring) - $i - 1, 1)) * pow(2, $i);
-		}
-		return CastAsInt($decvalue);
-	}
-}
-
-if (!function_exists('Bin2String')) {
-	function Bin2String($binstring) {
-		// return 'hi' for input of '0110100001101001'
-		$string = '';
-		$binstringreversed = strrev($binstring);
-		for ($i = 0; $i < strlen($binstringreversed); $i += 8) {
-			$string = chr(Bin2Dec(strrev(substr($binstringreversed, $i, 8)))).$string;
-		}
-		return $string;
-	}
-}
-
-if (!function_exists('LittleEndian2String')) {
-	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, chr(0), STR_PAD_RIGHT);
-	}
-}
-
-if (!function_exists('Bool2IntString')) {
-	function Bool2IntString($intvalue) {
-		return ($intvalue ? '1' : '0');
-	}
-}
-
-if (!function_exists('IntString2Bool')) {
-	function IntString2Bool($char) {
-		if ($char == '1') {
-			return true;
-		} elseif ($char == '0') {
-			return false;
-		}
-		return null;
-	}
-}
-
-if (!function_exists('InverseBoolean')) {
-	function InverseBoolean($value) {
-		return ($value ? false : true);
-	}
-}
-
-if (!function_exists('DeUnSynchronise')) {
-	function DeUnSynchronise($data) {
-		return str_replace(chr(0xFF).chr(0x00), chr(0xFF), $data);
-	}
-}
-
-if (!function_exists('Unsynchronise')) {
-	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(chr(0xFF).chr(0x00), chr(0xFF).chr(0x00).chr(0x00), $data);
-		$unsyncheddata = '';
-		for ($i = 0; $i < strlen($data); $i++) {
-			$thischar = $data{$i};
-			$unsyncheddata .= $thischar;
-			if ($thischar == chr(255)) {
-				$nextchar = ord(substr($data, $i + 1, 1));
-				if (($nextchar | 0xE0) == 0xE0) {
-					// previous byte = 11111111, this byte = 111?????
-					$unsyncheddata .= chr(0);
-				}
-			}
-		}
-		return $unsyncheddata;
-	}
-}
-
-if (!function_exists('is_hash')) {
-	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;
-	}
-}
-
-if (!function_exists('array_join_merge')) {
-	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 (is_hash($arr1) && is_hash($arr2)) {
-				// hashes -> merge based on keys
-				$keys = array_merge(array_keys($arr1), array_keys($arr2));
-				foreach ($keys as $key) {
-					$arr1[$key] = (isset($arr1[$key]) ? $arr1[$key] : '');
-					$arr2[$key] = (isset($arr2[$key]) ? $arr2[$key] : '');
-					$new_array[$key] = array_join_merge($arr1[$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;
-		}
-	}
-}
-
-if (!function_exists('array_merge_clobber')) {
-	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] = array_merge_clobber($newarray[$key], $val);
-			} else {
-				$newarray[$key] = $val;
-			}
-		}
-		return $newarray;
-	}
-}
-
-if (!function_exists('array_merge_noclobber')) {
-	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] = array_merge_noclobber($newarray[$key], $val);
-			} elseif (!isset($newarray[$key])) {
-				$newarray[$key] = $val;
-			}
-		}
-		return $newarray;
-	}
-}
-
-if (!function_exists('RoughTranslateUnicodeToASCII')) {
-	function RoughTranslateUnicodeToASCII($rawdata, $frame_textencoding) {
-		// rough translation of data for application that can't handle Unicode data
-
-		$tempstring = '';
-		switch ($frame_textencoding) {
-			case 0: // ISO-8859-1. Terminated with $00.
-				$asciidata = $rawdata;
-				break;
-
-			case 1: // UTF-16 encoded Unicode with BOM. Terminated with $00 00.
-				$asciidata = $rawdata;
-				if (substr($asciidata, 0, 2) == chr(0xFF).chr(0xFE)) {
-					// remove BOM, only if present (it should be, but...)
-					$asciidata = substr($asciidata, 2);
-				}
-				if (substr($asciidata, strlen($asciidata) - 2, 2) == chr(0).chr(0)) {
-					$asciidata = substr($asciidata, 0, strlen($asciidata) - 2); // remove terminator, only if present (it should be, but...)
-				}
-				for ($i = 0; $i < strlen($asciidata); $i += 2) {
-					if ((ord($asciidata{$i}) <= 0x7F) || (ord($asciidata{$i}) >= 0xA0)) {
-						$tempstring .= $asciidata{$i};
-					} else {
-						$tempstring .= '?';
-					}
-				}
-				$asciidata = $tempstring;
-				break;
-
-			case 2: // UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-				$asciidata = $rawdata;
-				if (substr($asciidata, strlen($asciidata) - 2, 2) == chr(0).chr(0)) {
-					$asciidata = substr($asciidata, 0, strlen($asciidata) - 2); // remove terminator, only if present (it should be, but...)
-				}
-				for ($i = 0; $i < strlen($asciidata); $i += 2) {
-					if ((ord($asciidata{$i}) <= 0x7F) || (ord($asciidata{$i}) >= 0xA0)) {
-						$tempstring .= $asciidata{$i};
-					} else {
-						$tempstring .= '?';
-					}
-				}
-				$asciidata = $tempstring;
-				break;
-
-			case 3: // UTF-8 encoded Unicode. Terminated with $00.
-				$asciidata = utf8_decode($rawdata);
-				break;
-
-			case 255: // Unicode, Big-Endian. Terminated with $00 00.
-				$asciidata = $rawdata;
-				if (substr($asciidata, strlen($asciidata) - 2, 2) == chr(0).chr(0)) {
-					$asciidata = substr($asciidata, 0, strlen($asciidata) - 2); // remove terminator, only if present (it should be, but...)
-				}
-				for ($i = 0; ($i + 1) < strlen($asciidata); $i += 2) {
-					if ((ord($asciidata{($i + 1)}) <= 0x7F) || (ord($asciidata{($i + 1)}) >= 0xA0)) {
-						$tempstring .= $asciidata{($i + 1)};
-					} else {
-						$tempstring .= '?';
-					}
-				}
-				$asciidata = $tempstring;
-				break;
-
-
-			default:
-				// shouldn't happen, but in case $frame_textencoding is not 1 <= $frame_textencoding <= 4
-				// just pass the data through unchanged.
-				$asciidata = $rawdata;
-				break;
-		}
-		if (substr($asciidata, strlen($asciidata) - 1, 1) == chr(0)) {
-			// remove null terminator, if present
-			$asciidata = NoNullString($asciidata);
-		}
-		return $asciidata;
-		// return str_replace(chr(0), '', $asciidata); // just in case any nulls slipped through
-	}
-}
-
-if (!function_exists('PlaytimeString')) {
-	function PlaytimeString($playtimeseconds) {
-		$contentseconds = round((($playtimeseconds / 60) - floor($playtimeseconds / 60)) * 60);
-		$contentminutes = floor($playtimeseconds / 60);
-		if ($contentseconds >= 60) {
-			$contentseconds -= 60;
-			$contentminutes++;
-		}
-		return number_format($contentminutes).':'.str_pad($contentseconds, 2, 0, STR_PAD_LEFT);
-	}
-}
-
-if (!function_exists('CloseMatch')) {
-	function CloseMatch($value1, $value2, $tolerance) {
-		return (abs($value1 - $value2) <= $tolerance);
-	}
-}
-
-if (!function_exists('ID3v1matchesID3v2')) {
-	function ID3v1matchesID3v2($id3v1, $id3v2) {
-
-		$requiredindices = array('title', 'artist', 'album', 'year', 'genre', 'comment');
-		foreach ($requiredindices as $requiredindex) {
-			if (!isset($id3v1["$requiredindex"])) {
-				$id3v1["$requiredindex"] = '';
-			}
-			if (!isset($id3v2["$requiredindex"])) {
-				$id3v2["$requiredindex"] = '';
-			}
-		}
-
-		if (trim($id3v1['title']) != trim(substr($id3v2['title'], 0, 30))) {
-			return false;
-		}
-		if (trim($id3v1['artist']) != trim(substr($id3v2['artist'], 0, 30))) {
-			return false;
-		}
-		if (trim($id3v1['album']) != trim(substr($id3v2['album'], 0, 30))) {
-			return false;
-		}
-		if (trim($id3v1['year']) != trim(substr($id3v2['year'], 0, 4))) {
-			return false;
-		}
-		if (trim($id3v1['genre']) != trim($id3v2['genre'])) {
-			return false;
-		}
-		if (isset($id3v1['track'])) {
-			if (!isset($id3v1['track']) || (trim($id3v1['track']) != trim($id3v2['track']))) {
-				return false;
-			}
-			if (trim($id3v1['comment']) != trim(substr($id3v2['comment'], 0, 28))) {
-				return false;
-			}
-		} else {
-			if (trim($id3v1['comment']) != trim(substr($id3v2['comment'], 0, 30))) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
-
-if (!function_exists('FILETIMEtoUNIXtime')) {
-	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 round(($FILETIME - 116444736000000000) / 10000000);
-		}
-		return ($FILETIME - 116444736000000000) / 10000000;
-	}
-}
-
-if (!function_exists('GUIDtoBytestring')) {
-	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;
-	}
-}
-
-if (!function_exists('BytestringToGUID')) {
-	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);
-	}
-}
-
-if (!function_exists('BitrateColor')) {
-	function BitrateColor($bitrate) {
-		$bitrate /= 3; // scale from 1-768kbps to 1-256kbps
-		$bitrate--;    // scale from 1-256kbps to 0-255kbps
-		$bitrate = max($bitrate, 0);
-		$bitrate = min($bitrate, 255);
-		//$bitrate = max($bitrate, 32);
-		//$bitrate = min($bitrate, 143);
-		//$bitrate = ($bitrate * 2) - 32;
-
-		$Rcomponent = max(255 - ($bitrate * 2), 0);
-		$Gcomponent = max(($bitrate * 2) - 255, 0);
-		if ($bitrate > 127) {
-			$Bcomponent = max((255 - $bitrate) * 2, 0);
-		} else {
-			$Bcomponent = max($bitrate * 2, 0);
-		}
-		return str_pad(dechex($Rcomponent), 2, '0', STR_PAD_LEFT).str_pad(dechex($Gcomponent), 2, '0', STR_PAD_LEFT).str_pad(dechex($Bcomponent), 2, '0', STR_PAD_LEFT);
-	}
-}
-
-if (!function_exists('BitrateText')) {
-	function BitrateText($bitrate) {
-		return '<SPAN STYLE="color: #'.BitrateColor($bitrate).'">'.round($bitrate).' kbps</SPAN>';
-	}
-}
-
-if (!function_exists('image_type_to_mime_type')) {
-	function image_type_to_mime_type($imagetypeid) {
-		// only available in PHP v4.3.0+
-		static $image_type_to_mime_type = array();
-		if (empty($image_type_to_mime_type)) {
-			$image_type_to_mime_type[1]  = 'image/gif';                     // GIF
-			$image_type_to_mime_type[2]  = 'image/jpeg';                    // JPEG
-			$image_type_to_mime_type[3]  = 'image/png';                     // PNG
-			$image_type_to_mime_type[4]  = 'application/x-shockwave-flash'; // Flash
-			$image_type_to_mime_type[5]  = 'image/psd';                     // PSD
-			$image_type_to_mime_type[6]  = 'image/bmp';                     // BMP
-			$image_type_to_mime_type[7]  = 'image/tiff';                    // TIFF: little-endian (Intel)
-			$image_type_to_mime_type[8]  = 'image/tiff';                    // TIFF: big-endian (Motorola)
-			//$image_type_to_mime_type[9]  = 'image/jpc';                   // JPC
-			//$image_type_to_mime_type[10] = 'image/jp2';                   // JPC
-			//$image_type_to_mime_type[11] = 'image/jpx';                   // JPC
-			//$image_type_to_mime_type[12] = 'image/jb2';                   // JPC
-			$image_type_to_mime_type[13] = 'application/x-shockwave-flash'; // Shockwave
-			$image_type_to_mime_type[14] = 'image/iff';                     // IFF
-		}
-		return (isset($image_type_to_mime_type[$imagetypeid]) ? $image_type_to_mime_type[$imagetypeid] : 'application/octet-stream');
-	}
-}
-
-if (!function_exists('utf8_decode')) {
-	// PHP has this function built-in if it's configured with the --with-xml option
-	// This version of the function is only provided in case XML isn't installed
-	function utf8_decode($utf8text) {
-		// http://www.php.net/manual/en/function.utf8-encode.php
-		// bytes  bits  representation
-		//   1     7    0bbbbbbb
-		//   2     11   110bbbbb 10bbbbbb
-		//   3     16   1110bbbb 10bbbbbb 10bbbbbb
-		//   4     21   11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-
-		$utf8length = strlen($utf8text);
-		$decodedtext = '';
-		for ($i = 0; $i < $utf8length; $i++) {
-			if ((ord($utf8text{$i}) & 0x80) == 0) {
-				$decodedtext .= $utf8text{$i};
-			} elseif ((ord($utf8text{$i}) & 0xF0) == 0xF0) {
-				$decodedtext .= '?';
-				$i += 3;
-			} elseif ((ord($utf8text{$i}) & 0xE0) == 0xE0) {
-				$decodedtext .= '?';
-				$i += 2;
-			} elseif ((ord($utf8text{$i}) & 0xC0) == 0xC0) {
-				//   2     11   110bbbbb 10bbbbbb
-				$decodedchar = Bin2Dec(substr(Dec2Bin(ord($utf8text{$i})), 3, 5).substr(Dec2Bin(ord($utf8text{($i + 1)})), 2, 6));
-				if ($decodedchar <= 255) {
-					$decodedtext .= chr($decodedchar);
-				} else {
-					$decodedtext .= '?';
-				}
-				$i += 1;
-			}
-		}
-		return $decodedtext;
-	}
-}
-
-if (!function_exists('DateMac2Unix')) {
-	function DateMac2Unix($macdate) {
-		// Macintosh timestamp: seconds since 00:00h January 1, 1904
-		// UNIX timestamp:      seconds since 00:00h January 1, 1970
-		return CastAsInt($macdate - 2082844800);
-	}
-}
-
-
-if (!function_exists('FixedPoint8_8')) {
-	function FixedPoint8_8($rawdata) {
-		return BigEndian2Int(substr($rawdata, 0, 1)) + (float) (BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
-	}
-}
-
-
-if (!function_exists('FixedPoint16_16')) {
-	function FixedPoint16_16($rawdata) {
-		return BigEndian2Int(substr($rawdata, 0, 2)) + (float) (BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
-	}
-}
-
-
-if (!function_exists('FixedPoint2_30')) {
-	function FixedPoint2_30($rawdata) {
-		$binarystring = BigEndian2Bin($rawdata);
-		return Bin2Dec(substr($binarystring, 0, 2)) + (float) (Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
-	}
-}
-
-
-if (!function_exists('Pascal2String')) {
-	function Pascal2String($pascalstring) {
-		// Pascal strings have 1 byte at the beginning saying how many chars are in the string
-		return substr($pascalstring, 1);
-	}
-}
-
-if (!function_exists('NoNullString')) {
-	function NoNullString($nullterminatedstring) {
-		// remove the single null terminator on null terminated strings
-		if (substr($nullterminatedstring, strlen($nullterminatedstring) - 1, 1) === chr(0)) {
-			return substr($nullterminatedstring, 0, strlen($nullterminatedstring) - 1);
-		}
-		return $nullterminatedstring;
-	}
-}
-
-if (!function_exists('FileSizeNiceDisplay')) {
-	function FileSizeNiceDisplay($filesize, $precision=2) {
-		if ($filesize < 1000) {
-			$sizeunit  = 'bytes';
-			$precision = 0;
-		} else {
-			$filesize /= 1024;
-			$sizeunit = 'kB';
-		}
-		if ($filesize >= 1000) {
-			$filesize /= 1024;
-			$sizeunit = 'MB';
-		}
-		if ($filesize >= 1000) {
-			$filesize /= 1024;
-			$sizeunit = 'GB';
-		}
-		return number_format($filesize, $precision).' '.$sizeunit;
-	}
-}
-
-if (!function_exists('DOStime2UNIXtime')) {
-	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 mktime($UNIXhour, $UNIXminute, $UNIXsecond, $UNIXmonth, $UNIXday, $UNIXyear);
-	}
-}
-
-if (!function_exists('CreateDeepArray')) {
-	function CreateDeepArray($ArrayPath, $Separator, $Value) {
-		// assigns $Value to a nested array path:
-		//   $foo = 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{0} == $Separator) {
-			$ArrayPath = substr($ArrayPath, 1);
-		}
-		if (($pos = strpos($ArrayPath, $Separator)) !== false) {
-			$ReturnedArray[substr($ArrayPath, 0, $pos)] = CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
-		} else {
-			$ReturnedArray["$ArrayPath"] = $Value;
-		}
-		return $ReturnedArray;
-	}
-}
-
-if (!function_exists('md5_file')) {
-	// Allan Hansen <ah@artemis.dk>
-	// md5_file() exists in PHP 4.2.0.
-	// The following works under UNIX only, but dies on windows
-	function md5_file($file) {
-		if (substr(php_uname(), 0, 7) == 'Windows') {
-			die('PHP 4.2.0 or newer required for md5_file()');
-		}
-
-		$file = str_replace('`', '\\`', $file);
-		if (preg_match("#^([0-9a-f]{32})[ \t\n\r]#i", `md5sum "$file"`, $r)) {
-			return $r[1];
-		}
-		return false;
-	}
-}
-
-if (!function_exists('md5_data')) {
-	// Allan Hansen <ah@artemis.dk>
-	// md5_data() - returns md5sum for a file from startuing position to absolute end position
-
-	function md5_data($file, $offset, $end, $invertsign=false) {
-		// first try and create a temporary file in the same directory as the file being scanned
-		if (($dataMD5filename = tempnam(dirname($file), preg_replace('#[^[:alnum:]]#i', '', basename($file)))) === false) {
-			// if that fails, create a temporary file in the system temp directory
-			if (($dataMD5filename = tempnam('/tmp', 'getID3')) === false) {
-				// if that fails, create a temporary file in the current directory
-				if (($dataMD5filename = tempnam('.', preg_replace('#[^[:alnum:]]#i', '', basename($file)))) === false) {
-					// can't find anywhere to create a temp file, just die
-					return false;
-				}
-			}
-		}
-		$md5 = false;
-		set_time_limit(max(filesize($file) / 1000000, 30));
-
-		// copy parts of file
-		ob_start();
-		if ($fp = fopen($file, 'rb')) {
-			ob_end_clean();
-
-			ob_start();
-			if ($MD5fp = fopen($dataMD5filename, 'wb')) {
-
-				ob_end_clean();
-				if ($invertsign) {
-					// Load conversion lookup strings for 8-bit unsigned->signed conversion below
-					$from = '';
-					$to   = '';
-					for ($i = 0; $i < 128; $i++) {
-						$from .= chr($i);
-						$to   .= chr($i + 128);
-					}
-					for ($i = 128; $i < 256; $i++) {
-						$from .= chr($i);
-						$to   .= chr($i - 128);
-					}
-				}
-
-				fseek($fp, $offset, SEEK_SET);
-				$byteslefttowrite = $end - $offset;
-				while (($byteslefttowrite > 0) && ($buffer = fread($fp, 32768))) {
-					if ($invertsign) {
-						// Possibly FLAC-specific (?)
-						// FLAC calculates the MD5sum of the source data of 8-bit files
-						// not on the actual byte values in the source file, but of those
-						// values converted from unsigned to signed, or more specifcally,
-						// with the MSB inverted. ex: 01 -> 81; F5 -> 75; etc
-
-						// Therefore, 8-bit WAV data has to be converted before getting the
-						// md5_data value so as to match the FLAC value
-
-						// Flip the MSB for each byte in the buffer before copying
-						$buffer = strtr($buffer, $from, $to);
-					}
-					$byteswritten = fwrite($MD5fp, $buffer, $byteslefttowrite);
-					$byteslefttowrite -= $byteswritten;
-				}
-				fclose($MD5fp);
-				$md5 = md5_file($dataMD5filename);
-
-			} else {
-				$errormessage = ob_get_contents();
-				ob_end_clean();
-			}
-			fclose($fp);
-
-		} else {
-			$errormessage = ob_get_contents();
-			ob_end_clean();
-		}
-		unlink($dataMD5filename);
-		return $md5;
-	}
-}
-
-if (!function_exists('TwosCompliment2Decimal')) {
-	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;
-
-		}
-
-	}
-}
-
-if (!function_exists('LastArrayElement')) {
-	function LastArrayElement($MyArray) {
-		if (!is_array($MyArray)) {
-			return false;
-		}
-		if (empty($MyArray)) {
-			return null;
-		}
-		foreach ($MyArray as $key => $value) {
-		}
-		return $value;
-	}
-}
-
-if (!function_exists('safe_inc')) {
-	function safe_inc(&$variable, $increment=1) {
-		if (isset($variable)) {
-			$variable += $increment;
-		} else {
-			$variable = $increment;
-		}
-		return true;
-	}
-}
-
-if (!function_exists('CalculateCompressionRatioVideo')) {
-	function CalculateCompressionRatioVideo(&$ThisFileInfo) {
-		if (empty($ThisFileInfo['video'])) {
-			return false;
-		}
-		if (empty($ThisFileInfo['video']['resolution_x']) || empty($ThisFileInfo['video']['resolution_y'])) {
-			return false;
-		}
-		if (empty($ThisFileInfo['video']['bits_per_sample'])) {
-			return false;
-		}
-
-		switch ($ThisFileInfo['video']['dataformat']) {
-			case 'bmp':
-			case 'gif':
-			case 'jpeg':
-			case 'jpg':
-			case 'png':
-			case 'tiff':
-				$FrameRate = 1;
-				$PlaytimeSeconds = 1;
-				$BitrateCompressed = $ThisFileInfo['filesize'] * 8;
-				break;
-
-			default:
-				if (!empty($ThisFileInfo['video']['frame_rate'])) {
-					$FrameRate = $ThisFileInfo['video']['frame_rate'];
-				} else {
-					return false;
-				}
-				if (!empty($ThisFileInfo['playtime_seconds'])) {
-					$PlaytimeSeconds = $ThisFileInfo['playtime_seconds'];
-				} else {
-					return false;
-				}
-				if (!empty($ThisFileInfo['video']['bitrate'])) {
-					$BitrateCompressed = $ThisFileInfo['video']['bitrate'];
-				} else {
-					return false;
-				}
-				break;
-		}
-		$BitrateUncompressed = $ThisFileInfo['video']['resolution_x'] * $ThisFileInfo['video']['resolution_y'] * $ThisFileInfo['video']['bits_per_sample'] * $FrameRate;
-
-		$ThisFileInfo['video']['compression_ratio'] = $BitrateCompressed / $BitrateUncompressed;
-		return true;
-	}
-}
-
-if (!function_exists('CalculateCompressionRatioAudio')) {
-	function CalculateCompressionRatioAudio(&$ThisFileInfo) {
-		if (empty($ThisFileInfo['audio']['bitrate']) || empty($ThisFileInfo['audio']['channels']) || empty($ThisFileInfo['audio']['sample_rate']) || empty($ThisFileInfo['audio']['bits_per_sample'])) {
-			return false;
-		}
-		$ThisFileInfo['audio']['compression_ratio'] = $ThisFileInfo['audio']['bitrate'] / ($ThisFileInfo['audio']['channels'] * $ThisFileInfo['audio']['sample_rate'] * $ThisFileInfo['audio']['bits_per_sample']);
-		return true;
-	}
-}
-
-if (!function_exists('IsValidMIMEstring')) {
-	function IsValidMIMEstring($mimestring) {
-		if ((strlen($mimestring) >= 3) && (strpos($mimestring, '/') > 0) && (strpos($mimestring, '/') < (strlen($mimestring) - 1))) {
-			return true;
-		}
-		return false;
-	}
-}
-
-if (!function_exists('IsWithinBitRange')) {
-	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;
-	}
-}
-
-if (!function_exists('safe_parse_url')) {
-	function safe_parse_url($url) {
-		ob_start();
-		$parts = parse_url($url);
-		$errormessage = ob_get_contents();
-		ob_end_clean();
-		$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;
-	}
-}
-
-if (!function_exists('IsValidURL')) {
-	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 = 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 (!preg_match("#^[[:alnum:]?&=+:;_()%#/,\.-]*$#i", $parts['query'], $regs)) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-		return false;
-	}
-}
-
-echo '<form action="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES).'" method="get">';
-echo 'Enter 4 hex bytes of MPEG-audio header (ie <I>FF FA 92 44</I>)<BR>';
-echo '<input type="text" name="HeaderHexBytes" value="'.htmlentities(isset($_POST['HeaderHexBytes']) ? strtoupper($_POST['HeaderHexBytes']) : '', ENT_QUOTES).'" size="11" maxlength="11">';
-echo '<input type="submit" name="Analyze" value="Analyze"></form>';
-echo '<hr>';
-
-echo '<form action="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES).'" METHOD="get">';
-echo 'Generate a MPEG-audio 4-byte header from these values:<BR>';
-echo '<table border="0">';
-
-$MPEGgenerateValues = array(
-								'version'=>array('1', '2', '2.5'),
-								'layer'=>array('I', 'II', 'III'),
-								'protection'=>array('Y', 'N'),
-								'bitrate'=>array('free', '8', '16', '24', '32', '40', '48', '56', '64', '80', '96', '112', '128', '144', '160', '176', '192', '224', '256', '288', '320', '352', '384', '416', '448'),
-								'frequency'=>array('8000', '11025', '12000', '16000', '22050', '24000', '32000', '44100', '48000'),
-								'padding'=>array('Y', 'N'),
-								'private'=>array('Y', 'N'),
-								'channelmode'=>array('stereo', 'joint stereo', 'dual channel', 'mono'),
-								'modeextension'=>array('none', 'IS', 'MS', 'IS+MS', '4-31', '8-31', '12-31', '16-31'),
-								'copyright'=>array('Y', 'N'),
-								'original'=>array('Y', 'N'),
-								'emphasis'=>array('none', '50/15ms', 'CCIT J.17')
-							);
-
-foreach ($MPEGgenerateValues as $name => $dataarray) {
-	echo '<tr><th>'.$name.':</th><td><select name="'.$name.'">';
-	foreach ($dataarray as $key => $value) {
-		echo '<option'.((isset($_POST["$name"]) && ($_POST["$name"] == $value)) ? ' SELECTED' : '').'>'.$value.'</option>';
-	}
-	echo '</select></td></tr>';
-}
-
-if (isset($_POST['bitrate'])) {
-	echo '<tr><th>Frame Length:</th><td>'.(int) MPEGaudioFrameLength($_POST['bitrate'], $_POST['version'], $_POST['layer'], (($_POST['padding'] == 'Y') ? '1' : '0'), $_POST['frequency']).'</td></tr>';
-}
-echo '</table>';
-echo '<input type="submit" name="Generate" value="Generate"></form>';
-echo '<hr>';
-
-
-if (isset($_POST['Analyze']) && $_POST['HeaderHexBytes']) {
-
-	$headerbytearray = explode(' ', $_POST['HeaderHexBytes']);
-	if (count($headerbytearray) != 4) {
-		die('Invalid byte pattern');
-	}
-	$headerstring = '';
-	foreach ($headerbytearray as $textbyte) {
-		$headerstring .= chr(hexdec($textbyte));
-	}
-
-	$MP3fileInfo['error'] = '';
-
-	$MPEGheaderRawArray = MPEGaudioHeaderDecode(substr($headerstring, 0, 4));
-
-	if (MPEGaudioHeaderValid($MPEGheaderRawArray, true)) {
-
-		$MP3fileInfo['raw'] = $MPEGheaderRawArray;
-
-		$MP3fileInfo['version']              = MPEGaudioVersionLookup($MP3fileInfo['raw']['version']);
-		$MP3fileInfo['layer']                = MPEGaudioLayerLookup($MP3fileInfo['raw']['layer']);
-		$MP3fileInfo['protection']           = MPEGaudioCRCLookup($MP3fileInfo['raw']['protection']);
-		$MP3fileInfo['bitrate']              = MPEGaudioBitrateLookup($MP3fileInfo['version'], $MP3fileInfo['layer'], $MP3fileInfo['raw']['bitrate']);
-		$MP3fileInfo['frequency']            = MPEGaudioFrequencyLookup($MP3fileInfo['version'], $MP3fileInfo['raw']['sample_rate']);
-		$MP3fileInfo['padding']              = (bool) $MP3fileInfo['raw']['padding'];
-		$MP3fileInfo['private']              = (bool) $MP3fileInfo['raw']['private'];
-		$MP3fileInfo['channelmode']          = MPEGaudioChannelModeLookup($MP3fileInfo['raw']['channelmode']);
-		$MP3fileInfo['channels']             = (($MP3fileInfo['channelmode'] == 'mono') ? 1 : 2);
-		$MP3fileInfo['modeextension']        = MPEGaudioModeExtensionLookup($MP3fileInfo['layer'], $MP3fileInfo['raw']['modeextension']);
-		$MP3fileInfo['copyright']            = (bool) $MP3fileInfo['raw']['copyright'];
-		$MP3fileInfo['original']             = (bool) $MP3fileInfo['raw']['original'];
-		$MP3fileInfo['emphasis']             = MPEGaudioEmphasisLookup($MP3fileInfo['raw']['emphasis']);
-
-		if ($MP3fileInfo['protection']) {
-			$MP3fileInfo['crc'] = BigEndian2Int(substr($headerstring, 4, 2));
-		}
-
-		if ($MP3fileInfo['frequency'] > 0) {
-			$MP3fileInfo['framelength'] = MPEGaudioFrameLength($MP3fileInfo['bitrate'], $MP3fileInfo['version'], $MP3fileInfo['layer'], (int) $MP3fileInfo['padding'], $MP3fileInfo['frequency']);
-		}
-		if ($MP3fileInfo['bitrate'] != 'free') {
-			$MP3fileInfo['bitrate'] *= 1000;
-		}
-
-	} else {
-
-		$MP3fileInfo['error'] .= "\n".'Invalid MPEG audio header';
-
-	}
-
-	if (!$MP3fileInfo['error']) {
-		unset($MP3fileInfo['error']);
-	}
-
-	echo table_var_dump($MP3fileInfo);
-
-} elseif (isset($_POST['Generate'])) {
-
-	// AAAA AAAA  AAAB BCCD  EEEE FFGH  IIJJ KLMM
-
-	$headerbitstream  = '11111111111';                               // A - Frame sync (all bits set)
-
-	$MPEGversionLookup = array('2.5'=>'00', '2'=>'10', '1'=>'11');
-	$headerbitstream .= $MPEGversionLookup[$_POST['version']];       // B - MPEG Audio version ID
-
-	$MPEGlayerLookup = array('III'=>'01', 'II'=>'10', 'I'=>'11');
-	$headerbitstream .= $MPEGlayerLookup[$_POST['layer']];           // C - Layer description
-
-	$headerbitstream .= (($_POST['protection'] == 'Y') ? '0' : '1'); // D - Protection bit
-
-	$MPEGaudioBitrateLookup['1']['I']     = array('free'=>'0000', '32'=>'0001', '64'=>'0010', '96'=>'0011', '128'=>'0100', '160'=>'0101', '192'=>'0110', '224'=>'0111', '256'=>'1000', '288'=>'1001', '320'=>'1010', '352'=>'1011', '384'=>'1100', '416'=>'1101', '448'=>'1110');
-	$MPEGaudioBitrateLookup['1']['II']    = array('free'=>'0000', '32'=>'0001', '48'=>'0010', '56'=>'0011',  '64'=>'0100',  '80'=>'0101',  '96'=>'0110', '112'=>'0111', '128'=>'1000', '160'=>'1001', '192'=>'1010', '224'=>'1011', '256'=>'1100', '320'=>'1101', '384'=>'1110');
-	$MPEGaudioBitrateLookup['1']['III']   = array('free'=>'0000', '32'=>'0001', '40'=>'0010', '48'=>'0011',  '56'=>'0100',  '64'=>'0101',  '80'=>'0110',  '96'=>'0111', '112'=>'1000', '128'=>'1001', '160'=>'1010', '192'=>'1011', '224'=>'1100', '256'=>'1101', '320'=>'1110');
-	$MPEGaudioBitrateLookup['2']['I']     = array('free'=>'0000', '32'=>'0001', '48'=>'0010', '56'=>'0011',  '64'=>'0100',  '80'=>'0101',  '96'=>'0110', '112'=>'0111', '128'=>'1000', '144'=>'1001', '160'=>'1010', '176'=>'1011', '192'=>'1100', '224'=>'1101', '256'=>'1110');
-	$MPEGaudioBitrateLookup['2']['II']    = array('free'=>'0000',  '8'=>'0001', '16'=>'0010', '24'=>'0011',  '32'=>'0100',  '40'=>'0101',  '48'=>'0110',  '56'=>'0111',  '64'=>'1000',  '80'=>'1001',  '96'=>'1010', '112'=>'1011', '128'=>'1100', '144'=>'1101', '160'=>'1110');
-	$MPEGaudioBitrateLookup['2']['III']   = $MPEGaudioBitrateLookup['2']['II'];
-	$MPEGaudioBitrateLookup['2.5']['I']   = $MPEGaudioBitrateLookup['2']['I'];
-	$MPEGaudioBitrateLookup['2.5']['II']  = $MPEGaudioBitrateLookup['2']['II'];
-	$MPEGaudioBitrateLookup['2.5']['III'] = $MPEGaudioBitrateLookup['2']['II'];
-	if (isset($MPEGaudioBitrateLookup[$_POST['version']][$_POST['layer']][$_POST['bitrate']])) {
-		$headerbitstream .= $MPEGaudioBitrateLookup[$_POST['version']][$_POST['layer']][$_POST['bitrate']]; // E - Bitrate index
-	} else {
-		die('Invalid <B>Bitrate</B>');
-	}
-
-	$MPEGaudioFrequencyLookup['1']   = array('44100'=>'00', '48000'=>'01', '32000'=>'10');
-	$MPEGaudioFrequencyLookup['2']   = array('22050'=>'00', '24000'=>'01', '16000'=>'10');
-	$MPEGaudioFrequencyLookup['2.5'] = array('11025'=>'00', '12000'=>'01', '8000'=>'10');
-	if (isset($MPEGaudioFrequencyLookup[$_POST['version']][$_POST['frequency']])) {
-		$headerbitstream .= $MPEGaudioFrequencyLookup[$_POST['version']][$_POST['frequency']];  // F - Sampling rate frequency index
-	} else {
-		die('Invalid <B>Frequency</B>');
-	}
-
-	$headerbitstream .= (($_POST['padding'] == 'Y') ? '1' : '0');            // G - Padding bit
-
-	$headerbitstream .= (($_POST['private'] == 'Y') ? '1' : '0');            // H - Private bit
-
-	$MPEGaudioChannelModeLookup = array('stereo'=>'00', 'joint stereo'=>'01', 'dual channel'=>'10', 'mono'=>'11');
-	$headerbitstream .= $MPEGaudioChannelModeLookup[$_POST['channelmode']];  // I - Channel Mode
-
-	$MPEGaudioModeExtensionLookup['I']   = array('4-31'=>'00', '8-31'=>'01', '12-31'=>'10', '16-31'=>'11');
-	$MPEGaudioModeExtensionLookup['II']  = $MPEGaudioModeExtensionLookup['I'];
-	$MPEGaudioModeExtensionLookup['III'] = array('none'=>'00',   'IS'=>'01',    'MS'=>'10', 'IS+MS'=>'11');
-	if ($_POST['channelmode'] != 'joint stereo') {
-		$headerbitstream .= '00';
-	} elseif (isset($MPEGaudioModeExtensionLookup[$_POST['layer']][$_POST['modeextension']])) {
-		$headerbitstream .= $MPEGaudioModeExtensionLookup[$_POST['layer']][$_POST['modeextension']];  // J - Mode extension (Only if Joint stereo)
-	} else {
-		die('Invalid <B>Mode Extension</B>');
-	}
-
-	$headerbitstream .= (($_POST['copyright'] == 'Y') ? '1' : '0');          // K - Copyright
-
-	$headerbitstream .= (($_POST['original']  == 'Y') ? '1' : '0');          // L - Original
-
-	$MPEGaudioEmphasisLookup = array('none'=>'00', '50/15ms'=>'01', 'CCIT J.17'=>'11');
-	if (isset($MPEGaudioEmphasisLookup[$_POST['emphasis']])) {
-		$headerbitstream .= $MPEGaudioEmphasisLookup[$_POST['emphasis']];    // M - Emphasis
-	} else {
-		die('Invalid <B>Emphasis</B>');
-	}
-
-	echo strtoupper(str_pad(dechex(bindec(substr($headerbitstream,  0, 8))), 2, '0', STR_PAD_LEFT)).' ';
-	echo strtoupper(str_pad(dechex(bindec(substr($headerbitstream,  8, 8))), 2, '0', STR_PAD_LEFT)).' ';
-	echo strtoupper(str_pad(dechex(bindec(substr($headerbitstream, 16, 8))), 2, '0', STR_PAD_LEFT)).' ';
-	echo strtoupper(str_pad(dechex(bindec(substr($headerbitstream, 24, 8))), 2, '0', STR_PAD_LEFT)).'<BR>';
-
-}
-
-function MPEGaudioVersionLookup($rawversion) {
-	$MPEGaudioVersionLookup = array('2.5', FALSE, '2', '1');
-	return (isset($MPEGaudioVersionLookup["$rawversion"]) ? $MPEGaudioVersionLookup["$rawversion"] : FALSE);
-}
-
-function MPEGaudioLayerLookup($rawlayer) {
-	$MPEGaudioLayerLookup = array(FALSE, 'III', 'II', 'I');
-	return (isset($MPEGaudioLayerLookup["$rawlayer"]) ? $MPEGaudioLayerLookup["$rawlayer"] : FALSE);
-}
-
-function MPEGaudioBitrateLookup($version, $layer, $rawbitrate) {
-	static $MPEGaudioBitrateLookup;
-	if (empty($MPEGaudioBitrateLookup)) {
-		$MPEGaudioBitrateLookup = MPEGaudioBitrateArray();
-	}
-	return (isset($MPEGaudioBitrateLookup["$version"]["$layer"]["$rawbitrate"]) ? $MPEGaudioBitrateLookup["$version"]["$layer"]["$rawbitrate"] : FALSE);
-}
-
-function MPEGaudioFrequencyLookup($version, $rawfrequency) {
-	static $MPEGaudioFrequencyLookup;
-	if (empty($MPEGaudioFrequencyLookup)) {
-		$MPEGaudioFrequencyLookup = MPEGaudioFrequencyArray();
-	}
-	return (isset($MPEGaudioFrequencyLookup["$version"]["$rawfrequency"]) ? $MPEGaudioFrequencyLookup["$version"]["$rawfrequency"] : FALSE);
-}
-
-function MPEGaudioChannelModeLookup($rawchannelmode) {
-	$MPEGaudioChannelModeLookup = array('stereo', 'joint stereo', 'dual channel', 'mono');
-	return (isset($MPEGaudioChannelModeLookup["$rawchannelmode"]) ? $MPEGaudioChannelModeLookup["$rawchannelmode"] : FALSE);
-}
-
-function MPEGaudioModeExtensionLookup($layer, $rawmodeextension) {
-	$MPEGaudioModeExtensionLookup['I']   = array('4-31', '8-31', '12-31', '16-31');
-	$MPEGaudioModeExtensionLookup['II']  = array('4-31', '8-31', '12-31', '16-31');
-	$MPEGaudioModeExtensionLookup['III'] = array('', 'IS', 'MS', 'IS+MS');
-	return (isset($MPEGaudioModeExtensionLookup["$layer"]["$rawmodeextension"]) ? $MPEGaudioModeExtensionLookup["$layer"]["$rawmodeextension"] : FALSE);
-}
-
-function MPEGaudioEmphasisLookup($rawemphasis) {
-	$MPEGaudioEmphasisLookup = array('none', '50/15ms', FALSE, 'CCIT J.17');
-	return (isset($MPEGaudioEmphasisLookup["$rawemphasis"]) ? $MPEGaudioEmphasisLookup["$rawemphasis"] : FALSE);
-}
-
-function MPEGaudioCRCLookup($CRCbit) {
-	// inverse boolean cast :)
-	if ($CRCbit == '0') {
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                ///
-//            or http://www.getid3.org                        ///
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// getid3.mp3.php - part of getID3()                           //
-// See getid3.readme.txt for more details                      //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-
-// 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('MPEG_VALID_CHECK_FRAMES', 35);
-
-function getMP3headerFilepointer(&$fd, &$ThisFileInfo) {
-
-	getOnlyMPEGaudioInfo($fd, $ThisFileInfo, $ThisFileInfo['avdataoffset']);
-
-	if (isset($ThisFileInfo['mpeg']['audio']['bitrate_mode'])) {
-		$ThisFileInfo['audio']['bitrate_mode'] = strtolower($ThisFileInfo['mpeg']['audio']['bitrate_mode']);
-	}
-
-	if (((isset($ThisFileInfo['id3v2']) && ($ThisFileInfo['avdataoffset'] > $ThisFileInfo['id3v2']['headerlength'])) || (!isset($ThisFileInfo['id3v2']) && ($ThisFileInfo['avdataoffset'] > 0)))) {
-
-		$ThisFileInfo['warning'] .= "\n".'Unknown data before synch ';
-		if (isset($ThisFileInfo['id3v2']['headerlength'])) {
-			$ThisFileInfo['warning'] .= '(ID3v2 header ends at '.$ThisFileInfo['id3v2']['headerlength'].', then '.($ThisFileInfo['avdataoffset'] - $ThisFileInfo['id3v2']['headerlength']).' bytes garbage, ';
-		} else {
-			$ThisFileInfo['warning'] .= '(should be at beginning of file, ';
-		}
-		$ThisFileInfo['warning'] .= 'synch detected at '.$ThisFileInfo['avdataoffset'].')';
-		if ($ThisFileInfo['audio']['bitrate_mode'] == 'cbr') {
-			if (!empty($ThisFileInfo['id3v2']['headerlength']) && (($ThisFileInfo['avdataoffset'] - $ThisFileInfo['id3v2']['headerlength']) == $ThisFileInfo['mpeg']['audio']['framelength'])) {
-				$ThisFileInfo['warning'] .= '. This is a known problem with some versions of LAME (3.91, 3.92) DLL in CBR mode.';
-				$ThisFileInfo['audio']['codec'] = 'LAME';
-			} elseif (empty($ThisFileInfo['id3v2']['headerlength']) && ($ThisFileInfo['avdataoffset'] == $ThisFileInfo['mpeg']['audio']['framelength'])) {
-				$ThisFileInfo['warning'] .= '. This is a known problem with some versions of LAME (3.91, 3.92) DLL in CBR mode.';
-				$ThisFileInfo['audio']['codec'] = 'LAME';
-			}
-		}
-
-	}
-
-	if (isset($ThisFileInfo['mpeg']['audio']['layer']) && ($ThisFileInfo['mpeg']['audio']['layer'] == 'II')) {
-		$ThisFileInfo['audio']['dataformat'] = 'mp2';
-	} elseif (isset($ThisFileInfo['mpeg']['audio']['layer']) && ($ThisFileInfo['mpeg']['audio']['layer'] == 'I')) {
-		$ThisFileInfo['audio']['dataformat'] = 'mp1';
-	}
-	if ($ThisFileInfo['fileformat'] == 'mp3') {
-		switch ($ThisFileInfo['audio']['dataformat']) {
-			case 'mp1':
-			case 'mp2':
-			case 'mp3':
-				$ThisFileInfo['fileformat'] = $ThisFileInfo['audio']['dataformat'];
-				break;
-
-			default:
-				$ThisFileInfo['warning'] .= "\n".'Expecting [audio][dataformat] to be mp1/mp2/mp3 when fileformat == mp3, [audio][dataformat] actually "'.$ThisFileInfo['audio']['dataformat'].'"';
-				break;
-		}
-	}
-
-	if (empty($ThisFileInfo['fileformat'])) {
-		$ThisFileInfo['error'] .= "\n".'Synch not found';
-		unset($ThisFileInfo['fileformat']);
-		unset($ThisFileInfo['audio']['bitrate_mode']);
-		unset($ThisFileInfo['avdataoffset']);
-		unset($ThisFileInfo['avdataend']);
-		return false;
-	}
-
-	$ThisFileInfo['mime_type']         = 'audio/mpeg';
-	$ThisFileInfo['audio']['lossless'] = false;
-
-	// Calculate playtime
-	if (!isset($ThisFileInfo['playtime_seconds']) && isset($ThisFileInfo['audio']['bitrate']) && ($ThisFileInfo['audio']['bitrate'] > 0)) {
-		$ThisFileInfo['playtime_seconds'] = ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8 / $ThisFileInfo['audio']['bitrate'];
-	}
-
-	if (isset($ThisFileInfo['mpeg']['audio']['LAME'])) {
-		$ThisFileInfo['audio']['codec'] = 'LAME';
-		if (!empty($ThisFileInfo['mpeg']['audio']['LAME']['long_version'])) {
-			$ThisFileInfo['audio']['encoder'] = trim($ThisFileInfo['mpeg']['audio']['LAME']['long_version']);
-		}
-	}
-
-	return true;
-}
-
-
-function decodeMPEGaudioHeader($fd, $offset, &$ThisFileInfo, $recursivesearch=true, $ScanAsCBR=false, $FastMPEGheaderScan=false) {
-
-	static $MPEGaudioVersionLookup;
-	static $MPEGaudioLayerLookup;
-	static $MPEGaudioBitrateLookup;
-	static $MPEGaudioFrequencyLookup;
-	static $MPEGaudioChannelModeLookup;
-	static $MPEGaudioModeExtensionLookup;
-	static $MPEGaudioEmphasisLookup;
-	if (empty($MPEGaudioVersionLookup)) {
-		$MPEGaudioVersionLookup       = MPEGaudioVersionArray();
-		$MPEGaudioLayerLookup         = MPEGaudioLayerArray();
-		$MPEGaudioBitrateLookup       = MPEGaudioBitrateArray();
-		$MPEGaudioFrequencyLookup     = MPEGaudioFrequencyArray();
-		$MPEGaudioChannelModeLookup   = MPEGaudioChannelModeArray();
-		$MPEGaudioModeExtensionLookup = MPEGaudioModeExtensionArray();
-		$MPEGaudioEmphasisLookup      = MPEGaudioEmphasisArray();
-	}
-
-	if ($offset >= $ThisFileInfo['avdataend']) {
-		$ThisFileInfo['error'] .= "\n".'end of file encounter looking for MPEG synch';
-		return false;
-	}
-	fseek($fd, $offset, SEEK_SET);
-	$headerstring = fread($fd, 1441); // worse-case max length = 32kHz @ 320kbps layer 3 = 1441 bytes/frame
-
-	// 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 = MPEGaudioHeaderDecode($head4);
-		$MPEGaudioHeaderDecodeCache[$head4] = $MPEGheaderRawArray;
-	}
-
-	static $MPEGaudioHeaderValidCache = array();
-
-	// Not in cache
-	if (!isset($MPEGaudioHeaderValidCache[$head4])) {
-		$MPEGaudioHeaderValidCache[$head4] = MPEGaudioHeaderValid($MPEGheaderRawArray);
-	}
-
-	if ($MPEGaudioHeaderValidCache[$head4]) {
-		$ThisFileInfo['mpeg']['audio']['raw'] = $MPEGheaderRawArray;
-	} else {
-		$ThisFileInfo['error'] .= "\n".'Invalid MPEG audio header at offset '.$offset;
-		return false;
-	}
-
-	if (!$FastMPEGheaderScan) {
-
-		$ThisFileInfo['mpeg']['audio']['version']       = $MPEGaudioVersionLookup[$ThisFileInfo['mpeg']['audio']['raw']['version']];
-		$ThisFileInfo['mpeg']['audio']['layer']         = $MPEGaudioLayerLookup[$ThisFileInfo['mpeg']['audio']['raw']['layer']];
-
-		$ThisFileInfo['mpeg']['audio']['channelmode']   = $MPEGaudioChannelModeLookup[$ThisFileInfo['mpeg']['audio']['raw']['channelmode']];
-		$ThisFileInfo['mpeg']['audio']['channels']      = (($ThisFileInfo['mpeg']['audio']['channelmode'] == 'mono') ? 1 : 2);
-		$ThisFileInfo['mpeg']['audio']['sample_rate']   = $MPEGaudioFrequencyLookup[$ThisFileInfo['mpeg']['audio']['version']][$ThisFileInfo['mpeg']['audio']['raw']['sample_rate']];
-		$ThisFileInfo['mpeg']['audio']['protection']    = !$ThisFileInfo['mpeg']['audio']['raw']['protection'];
-		$ThisFileInfo['mpeg']['audio']['private']       = (bool) $ThisFileInfo['mpeg']['audio']['raw']['private'];
-		$ThisFileInfo['mpeg']['audio']['modeextension'] = $MPEGaudioModeExtensionLookup[$ThisFileInfo['mpeg']['audio']['layer']][$ThisFileInfo['mpeg']['audio']['raw']['modeextension']];
-		$ThisFileInfo['mpeg']['audio']['copyright']     = (bool) $ThisFileInfo['mpeg']['audio']['raw']['copyright'];
-		$ThisFileInfo['mpeg']['audio']['original']      = (bool) $ThisFileInfo['mpeg']['audio']['raw']['original'];
-		$ThisFileInfo['mpeg']['audio']['emphasis']      = $MPEGaudioEmphasisLookup[$ThisFileInfo['mpeg']['audio']['raw']['emphasis']];
-
-		$ThisFileInfo['audio']['channels']    = $ThisFileInfo['mpeg']['audio']['channels'];
-		$ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['mpeg']['audio']['sample_rate'];
-
-		if ($ThisFileInfo['mpeg']['audio']['protection']) {
-			$ThisFileInfo['mpeg']['audio']['crc'] = BigEndian2Int(substr($headerstring, 4, 2));
-		}
-
-	}
-
-	if ($ThisFileInfo['mpeg']['audio']['raw']['bitrate'] == 15) {
-		// http://www.hydrogenaudio.org/?act=ST&f=16&t=9682&st=0
-		$ThisFileInfo['warning'] .= "\n".'Invalid bitrate index (15), this is a known bug in free-format MP3s encoded by LAME v3.90 - 3.93.1';
-		$ThisFileInfo['mpeg']['audio']['raw']['bitrate'] = 0;
-	}
-	$ThisFileInfo['mpeg']['audio']['padding'] = (bool) $ThisFileInfo['mpeg']['audio']['raw']['padding'];
-	$ThisFileInfo['mpeg']['audio']['bitrate'] = $MPEGaudioBitrateLookup[$ThisFileInfo['mpeg']['audio']['version']][$ThisFileInfo['mpeg']['audio']['layer']][$ThisFileInfo['mpeg']['audio']['raw']['bitrate']];
-
-	if (($ThisFileInfo['mpeg']['audio']['bitrate'] == 'free') && ($offset == $ThisFileInfo['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 II there are some combinations of bitrate and mode which are not allowed.
-	if (!$FastMPEGheaderScan && ($ThisFileInfo['mpeg']['audio']['layer'] == 'II')) {
-
-		$ThisFileInfo['audio']['dataformat'] = 'mp2';
-		switch ($ThisFileInfo['mpeg']['audio']['channelmode']) {
-
-			case 'mono':
-				if (($ThisFileInfo['mpeg']['audio']['bitrate'] == 'free') || ($ThisFileInfo['mpeg']['audio']['bitrate'] <= 192)) {
-					// these are ok
-				} else {
-					$ThisFileInfo['error'] .= "\n".$ThisFileInfo['mpeg']['audio']['bitrate'].'kbps not allowed in Layer II, '.$ThisFileInfo['mpeg']['audio']['channelmode'].'.';
-					return false;
-				}
-				break;
-
-			case 'stereo':
-			case 'joint stereo':
-			case 'dual channel':
-				if (($ThisFileInfo['mpeg']['audio']['bitrate'] == 'free') || ($ThisFileInfo['mpeg']['audio']['bitrate'] == 64) || ($ThisFileInfo['mpeg']['audio']['bitrate'] >= 96)) {
-					// these are ok
-				} else {
-					$ThisFileInfo['error'] .= "\n".$ThisFileInfo['mpeg']['audio']['bitrate'].'kbps not allowed in Layer II, '.$ThisFileInfo['mpeg']['audio']['channelmode'].'.';
-					return false;
-				}
-				break;
-
-		}
-
-	}
-
-
-	if ($ThisFileInfo['audio']['sample_rate'] > 0) {
-		$ThisFileInfo['mpeg']['audio']['framelength'] = MPEGaudioFrameLength($ThisFileInfo['mpeg']['audio']['bitrate'], $ThisFileInfo['mpeg']['audio']['version'], $ThisFileInfo['mpeg']['audio']['layer'], (int) $ThisFileInfo['mpeg']['audio']['padding'], $ThisFileInfo['audio']['sample_rate']);
-	}
-
-	if ($ThisFileInfo['mpeg']['audio']['bitrate'] != 'free') {
-
-		$ThisFileInfo['audio']['bitrate'] = 1000 * $ThisFileInfo['mpeg']['audio']['bitrate'];
-
-		if (isset($ThisFileInfo['mpeg']['audio']['framelength'])) {
-			$nextframetestoffset = $offset + $ThisFileInfo['mpeg']['audio']['framelength'];
-		} else {
-			$ThisFileInfo['error'] .= "\n".'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
-
-		$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'vbr';
-		$ThisFileInfo['mpeg']['audio']['VBR_method']   = 'Fraunhofer';
-		$ThisFileInfo['audio']['codec']                = 'Fraunhofer';
-
-		$SideInfoData = substr($headerstring, 4 + 2, 32);
-
-		$FraunhoferVBROffset = 36;
-
-		$ThisFileInfo['mpeg']['audio']['VBR_encoder_version']     = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  4, 2));
-		$ThisFileInfo['mpeg']['audio']['VBR_encoder_delay']       = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  6, 2));
-		$ThisFileInfo['mpeg']['audio']['VBR_quality']             = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset +  8, 2));
-		$ThisFileInfo['mpeg']['audio']['VBR_bytes']               = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 10, 4));
-		$ThisFileInfo['mpeg']['audio']['VBR_frames']              = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 14, 4));
-		$ThisFileInfo['mpeg']['audio']['VBR_seek_offsets']        = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 18, 2));
-		//$ThisFileInfo['mpeg']['audio']['reserved']              = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 20, 4)); // hardcoded $00 $01 $00 $02  - purpose unknown
-		$ThisFileInfo['mpeg']['audio']['VBR_seek_offsets_stride'] = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset + 24, 2));
-
-		$ExpectedNumberOfAudioBytes = $ThisFileInfo['mpeg']['audio']['VBR_bytes'];
-
-		$previousbyteoffset = $offset;
-		for ($i = 0; $i < $ThisFileInfo['mpeg']['audio']['VBR_seek_offsets']; $i++) {
-			$Fraunhofer_OffsetN = BigEndian2Int(substr($headerstring, $FraunhoferVBROffset, 2));
-			$FraunhoferVBROffset += 2;
-			$ThisFileInfo['mpeg']['audio']['VBR_offsets_relative'][$i] = $Fraunhofer_OffsetN;
-			$ThisFileInfo['mpeg']['audio']['VBR_offsets_absolute'][$i] = $Fraunhofer_OffsetN + $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
-
-		if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
-			if ($ThisFileInfo['mpeg']['audio']['channelmode'] == 'mono') {
-				// MPEG-1 (mono)
-				$VBRidOffset  = 4 + 17; // 0x15
-				$SideInfoData = substr($headerstring, 4 + 2, 17);
-			} else {
-				// MPEG-1 (stereo, joint-stereo, dual-channel)
-				$VBRidOffset = 4 + 32; // 0x24
-				$SideInfoData = substr($headerstring, 4 + 2, 32);
-			}
-		} else { // 2 or 2.5
-			if ($ThisFileInfo['mpeg']['audio']['channelmode'] == 'mono') {
-				// MPEG-2, MPEG-2.5 (mono)
-				$VBRidOffset = 4 + 9;  // 0x0D
-				$SideInfoData = substr($headerstring, 4 + 2, 9);
-			} else {
-				// MPEG-2, MPEG-2.5 (stereo, joint-stereo, dual-channel)
-				$VBRidOffset = 4 + 17; // 0x15
-				$SideInfoData = substr($headerstring, 4 + 2, 17);
-			}
-		}
-
-		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.)
-
-			$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'vbr';
-			$ThisFileInfo['mpeg']['audio']['VBR_method']   = 'Xing';
-
-			$ThisFileInfo['mpeg']['audio']['xing_flags_raw'] = BigEndian2Int(substr($headerstring, $VBRidOffset + 4, 4));
-
-			$ThisFileInfo['mpeg']['audio']['xing_flags']['frames']    = (bool) ($ThisFileInfo['mpeg']['audio']['xing_flags_raw'] & 0x00000001);
-			$ThisFileInfo['mpeg']['audio']['xing_flags']['bytes']     = (bool) ($ThisFileInfo['mpeg']['audio']['xing_flags_raw'] & 0x00000002);
-			$ThisFileInfo['mpeg']['audio']['xing_flags']['toc']       = (bool) ($ThisFileInfo['mpeg']['audio']['xing_flags_raw'] & 0x00000004);
-			$ThisFileInfo['mpeg']['audio']['xing_flags']['vbr_scale'] = (bool) ($ThisFileInfo['mpeg']['audio']['xing_flags_raw'] & 0x00000008);
-
-			if ($ThisFileInfo['mpeg']['audio']['xing_flags']['frames']) {
-				$ThisFileInfo['mpeg']['audio']['VBR_frames'] = BigEndian2Int(substr($headerstring, $VBRidOffset +  8, 4));
-			}
-			if ($ThisFileInfo['mpeg']['audio']['xing_flags']['bytes']) {
-				$ThisFileInfo['mpeg']['audio']['VBR_bytes']  = BigEndian2Int(substr($headerstring, $VBRidOffset + 12, 4));
-			}
-
-			if (($ThisFileInfo['mpeg']['audio']['bitrate'] == 'free') && !empty($ThisFileInfo['mpeg']['audio']['VBR_frames']) && !empty($ThisFileInfo['mpeg']['audio']['VBR_bytes'])) {
-				$framelengthfloat = $ThisFileInfo['mpeg']['audio']['VBR_bytes'] / $ThisFileInfo['mpeg']['audio']['VBR_frames'];
-				if ($ThisFileInfo['mpeg']['audio']['layer'] == 'I') {
-					// BitRate = (((FrameLengthInBytes / 4) - Padding) * SampleRate) / 12
-					$ThisFileInfo['audio']['bitrate'] = ((($framelengthfloat / 4) - intval($ThisFileInfo['mpeg']['audio']['padding'])) * $ThisFileInfo['mpeg']['audio']['sample_rate']) / 12;
-				} else {
-					// Bitrate = ((FrameLengthInBytes - Padding) * SampleRate) / 144
-					$ThisFileInfo['audio']['bitrate'] = (($framelengthfloat - intval($ThisFileInfo['mpeg']['audio']['padding'])) * $ThisFileInfo['mpeg']['audio']['sample_rate']) / 144;
-				}
-				$ThisFileInfo['mpeg']['audio']['framelength'] = floor($framelengthfloat);
-			}
-
-			if ($ThisFileInfo['mpeg']['audio']['xing_flags']['toc']) {
-				$LAMEtocData = substr($headerstring, $VBRidOffset + 16, 100);
-				for ($i = 0; $i < 100; $i++) {
-					$ThisFileInfo['mpeg']['audio']['toc'][$i] = ord($LAMEtocData{$i});
-				}
-			}
-			if ($ThisFileInfo['mpeg']['audio']['xing_flags']['vbr_scale']) {
-				$ThisFileInfo['mpeg']['audio']['VBR_scale'] = BigEndian2Int(substr($headerstring, $VBRidOffset + 116, 4));
-			}
-
-			// http://gabriel.mp3-tech.org/mp3infotag.html
-			if (substr($headerstring, $VBRidOffset + 120, 4) == 'LAME') {
-				$ThisFileInfo['mpeg']['audio']['LAME']['long_version']  = substr($headerstring, $VBRidOffset + 120, 20);
-				$ThisFileInfo['mpeg']['audio']['LAME']['short_version'] = substr($ThisFileInfo['mpeg']['audio']['LAME']['long_version'], 0, 9);
-				$ThisFileInfo['mpeg']['audio']['LAME']['long_version']  = rtrim($ThisFileInfo['mpeg']['audio']['LAME']['long_version'], "\x55\xAA");
-
-				if ($ThisFileInfo['mpeg']['audio']['LAME']['short_version'] >= 'LAME3.90.') {
-
-					// 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;
-
-					// 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($ThisFileInfo['mpeg']['audio']['VBR_scale']);
-					$ThisFileInfo['mpeg']['audio']['LAME']['vbr_quality'] = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0x9B, 1));
-
-					// bytes $9C-$A4  Encoder short VersionString
-					$ThisFileInfo['mpeg']['audio']['LAME']['short_version'] = substr($headerstring, $LAMEtagOffsetContant + 0x9C, 9);
-					$ThisFileInfo['mpeg']['audio']['LAME']['long_version']  = $ThisFileInfo['mpeg']['audio']['LAME']['short_version'];
-
-					// byte $A5  Info Tag revision + VBR method
-					$LAMEtagRevisionVBRmethod = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
-
-					$ThisFileInfo['mpeg']['audio']['LAME']['tag_revision']      = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['vbr_method'] =  $LAMEtagRevisionVBRmethod & 0x0F;
-					$ThisFileInfo['mpeg']['audio']['LAME']['vbr_method']        = LAMEvbrMethodLookup($ThisFileInfo['mpeg']['audio']['LAME']['raw']['vbr_method']);
-
-					// byte $A6  Lowpass filter value
-					$ThisFileInfo['mpeg']['audio']['LAME']['lowpass_frequency'] = 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"
-					$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'] = BigEndian2Float(substr($headerstring, $LAMEtagOffsetContant + 0xA7, 4));
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_radio']      =   BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAB, 2));
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_audiophile'] =   BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAD, 2));
-
-					if ($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'] == 0) {
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'] = false;
-					}
-
-					if ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_radio'] != 0) {
-						require_once(GETID3_INCLUDEPATH.'getid3.rgad.php');
-
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['name']        = ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_radio'] & 0xE000) >> 13;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['originator']  = ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_radio'] & 0x1C00) >> 10;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['sign_bit']    = ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_radio'] & 0x0200) >> 9;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['gain_adjust'] =  $ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_radio'] & 0x01FF;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['name']       = RGADnameLookup($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['name']);
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['originator'] = RGADoriginatorLookup($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['originator']);
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['gain_db']    = RGADadjustmentLookup($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['gain_adjust'], $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['raw']['sign_bit']);
-
-						if ($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'] !== false) {
-							$ThisFileInfo['replay_gain']['radio']['peak']   = $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'];
-						}
-						$ThisFileInfo['replay_gain']['radio']['originator'] = $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['originator'];
-						$ThisFileInfo['replay_gain']['radio']['adjustment'] = $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['radio']['gain_db'];
-					}
-					if ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_audiophile'] != 0) {
-						require_once(GETID3_INCLUDEPATH.'getid3.rgad.php');
-
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['name']        = ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_audiophile'] & 0xE000) >> 13;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['originator']  = ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_audiophile'] & 0x1C00) >> 10;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['sign_bit']    = ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_audiophile'] & 0x0200) >> 9;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['gain_adjust'] = $ThisFileInfo['mpeg']['audio']['LAME']['raw']['RGAD_audiophile'] & 0x01FF;
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['name']       = RGADnameLookup($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['name']);
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['originator'] = RGADoriginatorLookup($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['originator']);
-						$ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['gain_db']    = RGADadjustmentLookup($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['gain_adjust'], $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['raw']['sign_bit']);
-
-						if ($ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'] !== false) {
-							$ThisFileInfo['replay_gain']['audiophile']['peak']   = $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['peak_amplitude'];
-						}
-						$ThisFileInfo['replay_gain']['audiophile']['originator'] = $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['originator'];
-						$ThisFileInfo['replay_gain']['audiophile']['adjustment'] = $ThisFileInfo['mpeg']['audio']['LAME']['RGAD']['audiophile']['gain_db'];
-					}
-
-
-					// byte $AF  Encoding flags + ATH Type
-					$EncodingFlagsATHtype = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xAF, 1));
-					$ThisFileInfo['mpeg']['audio']['LAME']['encoding_flags']['nspsytune']   = (bool) ($EncodingFlagsATHtype & 0x10);
-					$ThisFileInfo['mpeg']['audio']['LAME']['encoding_flags']['nssafejoint'] = (bool) ($EncodingFlagsATHtype & 0x20);
-					$ThisFileInfo['mpeg']['audio']['LAME']['encoding_flags']['nogap_next']  = (bool) ($EncodingFlagsATHtype & 0x40);
-					$ThisFileInfo['mpeg']['audio']['LAME']['encoding_flags']['nogap_prev']  = (bool) ($EncodingFlagsATHtype & 0x80);
-					$ThisFileInfo['mpeg']['audio']['LAME']['ath_type']                      =         $EncodingFlagsATHtype & 0x0F;
-
-					// byte $B0  if ABR {specified bitrate} else {minimal bitrate}
-					$ABRbitrateMinBitrate = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB0, 1));
-					if ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['vbr_method'] == 2) { // Average BitRate (ABR)
-						$ThisFileInfo['mpeg']['audio']['LAME']['bitrate_abr'] = $ABRbitrateMinBitrate;
-					} elseif ($ABRbitrateMinBitrate > 0) { // Variable BitRate (VBR) - minimum bitrate
-						$ThisFileInfo['mpeg']['audio']['LAME']['bitrate_min'] = $ABRbitrateMinBitrate;
-					}
-
-					// bytes $B1-$B3  Encoder delays
-					$EncoderDelays = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB1, 3));
-					$ThisFileInfo['mpeg']['audio']['LAME']['encoder_delay'] = ($EncoderDelays & 0xFFF000) >> 12;
-					$ThisFileInfo['mpeg']['audio']['LAME']['end_padding']   =  $EncoderDelays & 0x000FFF;
-
-					// byte $B4  Misc
-					$MiscByte = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB4, 1));
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['noise_shaping']       = ($MiscByte & 0x03);
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['stereo_mode']         = ($MiscByte & 0x1C) >> 2;
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['source_sample_freq']  = ($MiscByte & 0xC0) >> 6;
-					$ThisFileInfo['mpeg']['audio']['LAME']['noise_shaping']       = $ThisFileInfo['mpeg']['audio']['LAME']['raw']['noise_shaping'];
-					$ThisFileInfo['mpeg']['audio']['LAME']['stereo_mode']         = LAMEmiscStereoModeLookup($ThisFileInfo['mpeg']['audio']['LAME']['raw']['stereo_mode']);
-					$ThisFileInfo['mpeg']['audio']['LAME']['not_optimal_quality'] = (bool) $ThisFileInfo['mpeg']['audio']['LAME']['raw']['not_optimal_quality'];
-					$ThisFileInfo['mpeg']['audio']['LAME']['source_sample_freq']  = LAMEmiscSourceSampleFrequencyLookup($ThisFileInfo['mpeg']['audio']['LAME']['raw']['source_sample_freq']);
-
-					// byte $B5  MP3 Gain
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['mp3_gain'] = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
-					$ThisFileInfo['mpeg']['audio']['LAME']['mp3_gain_db']     = 1.5 * $ThisFileInfo['mpeg']['audio']['LAME']['raw']['mp3_gain'];
-					$ThisFileInfo['mpeg']['audio']['LAME']['mp3_gain_factor'] = pow(2, ($ThisFileInfo['mpeg']['audio']['LAME']['mp3_gain_db'] / 6));
-
-					// bytes $B6-$B7  Preset and surround info
-					$PresetSurroundBytes = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
-					// Reserved                                                    = ($PresetSurroundBytes & 0xC000);
-					$ThisFileInfo['mpeg']['audio']['LAME']['raw']['surround_info'] = ($PresetSurroundBytes & 0x3800);
-					$ThisFileInfo['mpeg']['audio']['LAME']['surround_info']        = LAMEsurroundInfoLookup($ThisFileInfo['mpeg']['audio']['LAME']['raw']['surround_info']);
-					$ThisFileInfo['mpeg']['audio']['LAME']['preset_used_id']       = ($PresetSurroundBytes & 0x07FF);
-
-					// bytes $B8-$BB  MusicLength
-					$ThisFileInfo['mpeg']['audio']['LAME']['audio_bytes'] = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB8, 4));
-					$ExpectedNumberOfAudioBytes = (($ThisFileInfo['mpeg']['audio']['LAME']['audio_bytes'] > 0) ? $ThisFileInfo['mpeg']['audio']['LAME']['audio_bytes'] : $ThisFileInfo['mpeg']['audio']['VBR_bytes']);
-
-					// bytes $BC-$BD  MusicCRC
-					$ThisFileInfo['mpeg']['audio']['LAME']['music_crc']    = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBC, 2));
-
-					// bytes $BE-$BF  CRC-16 of Info Tag
-					$ThisFileInfo['mpeg']['audio']['LAME']['lame_tag_crc'] = BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xBE, 2));
-
-
-					// LAME CBR
-					if ($ThisFileInfo['mpeg']['audio']['LAME']['raw']['vbr_method'] == 1) {
-
-						$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'cbr';
-						if (empty($ThisFileInfo['mpeg']['audio']['bitrate']) || ($ThisFileInfo['mpeg']['audio']['LAME']['bitrate_min'] != 255)) {
-							$ThisFileInfo['mpeg']['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['LAME']['bitrate_min'];
-						}
-
-					}
-
-				}
-			}
-
-		} else {
-
-			// not Fraunhofer or Xing VBR methods, most likely CBR (but could be VBR with no header)
-			$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'cbr';
-			if ($recursivesearch) {
-				$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'vbr';
-				if (RecursiveFrameScanning($fd, $ThisFileInfo, $offset, $nextframetestoffset, true)) {
-					$recursivesearch = false;
-					$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'cbr';
-				}
-				if ($ThisFileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr') {
-					$ThisFileInfo['warning'] .= "\n".'VBR file with no VBR header. Bitrate values calculated from actual frame bitrates.';
-				}
-			}
-
-		}
-
-	}
-
-	if (($ExpectedNumberOfAudioBytes > 0) && ($ExpectedNumberOfAudioBytes != ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']))) {
-		if (($ExpectedNumberOfAudioBytes - ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'])) == 1) {
-			$ThisFileInfo['warning'] .= "\n".'Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)';
-		} elseif ($ExpectedNumberOfAudioBytes > ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'])) {
-			$ThisFileInfo['warning'] .= "\n".'Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'])).' bytes)';
-		} else {
-			$ThisFileInfo['warning'] .= "\n".'Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' ('.(($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)';
-		}
-	}
-
-	if (($ThisFileInfo['mpeg']['audio']['bitrate'] == 'free') && empty($ThisFileInfo['audio']['bitrate'])) {
-		if (($offset == $ThisFileInfo['avdataoffset']) && empty($ThisFileInfo['mpeg']['audio']['VBR_frames'])) {
-			$framebytelength = FreeFormatFrameLength($fd, $offset, $ThisFileInfo, true);
-			if ($framebytelength > 0) {
-				$ThisFileInfo['mpeg']['audio']['framelength'] = $framebytelength;
-				if ($ThisFileInfo['mpeg']['audio']['layer'] == 'I') {
-					// BitRate = (((FrameLengthInBytes / 4) - Padding) * SampleRate) / 12
-					$ThisFileInfo['audio']['bitrate'] = ((($framebytelength / 4) - intval($ThisFileInfo['mpeg']['audio']['padding'])) * $ThisFileInfo['mpeg']['audio']['sample_rate']) / 12;
-				} else {
-					// Bitrate = ((FrameLengthInBytes - Padding) * SampleRate) / 144
-					$ThisFileInfo['audio']['bitrate'] = (($framebytelength - intval($ThisFileInfo['mpeg']['audio']['padding'])) * $ThisFileInfo['mpeg']['audio']['sample_rate']) / 144;
-				}
-			} else {
-				$ThisFileInfo['error'] .= "\n".'Error calculating frame length of free-format MP3 without Xing/LAME header';
-			}
-		}
-	}
-
-	if (($ThisFileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr') && isset($ThisFileInfo['mpeg']['audio']['VBR_frames']) && ($ThisFileInfo['mpeg']['audio']['VBR_frames'] > 1)) {
-		$ThisFileInfo['mpeg']['audio']['VBR_frames']--; // don't count the Xing / VBRI frame
-		if (($ThisFileInfo['mpeg']['audio']['version'] == '1') && ($ThisFileInfo['mpeg']['audio']['layer'] == 'I')) {
-			$ThisFileInfo['mpeg']['audio']['VBR_bitrate'] = ((($ThisFileInfo['mpeg']['audio']['VBR_bytes'] / $ThisFileInfo['mpeg']['audio']['VBR_frames']) * 8) * ($ThisFileInfo['audio']['sample_rate'] / 384)) / 1000;
-		} elseif ((($ThisFileInfo['mpeg']['audio']['version'] == '2') || ($ThisFileInfo['mpeg']['audio']['version'] == '2.5')) && ($ThisFileInfo['mpeg']['audio']['layer'] == 'III')) {
-			$ThisFileInfo['mpeg']['audio']['VBR_bitrate'] = ((($ThisFileInfo['mpeg']['audio']['VBR_bytes'] / $ThisFileInfo['mpeg']['audio']['VBR_frames']) * 8) * ($ThisFileInfo['audio']['sample_rate'] / 576)) / 1000;
-		} else {
-			$ThisFileInfo['mpeg']['audio']['VBR_bitrate'] = ((($ThisFileInfo['mpeg']['audio']['VBR_bytes'] / $ThisFileInfo['mpeg']['audio']['VBR_frames']) * 8) * ($ThisFileInfo['audio']['sample_rate'] / 1152)) / 1000;
-		}
-		if ($ThisFileInfo['mpeg']['audio']['VBR_bitrate'] > 0) {
-			$ThisFileInfo['audio']['bitrate']         = 1000 * $ThisFileInfo['mpeg']['audio']['VBR_bitrate'];
-			$ThisFileInfo['mpeg']['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['VBR_bitrate']; // to avoid confusion
-		}
-	}
-
-	// End variable-bitrate headers
-	////////////////////////////////////////////////////////////////////////////////////
-
-	if ($recursivesearch) {
-
-		if (!RecursiveFrameScanning($fd, $ThisFileInfo, $offset, $nextframetestoffset, $ScanAsCBR)) {
-			return false;
-		}
-
-	}
-
-
-	//if (false) {
-	//	// experimental side info parsing section - not returning anything useful yet
-	//
-	//	$SideInfoBitstream = BigEndian2Bin($SideInfoData);
-	//	$SideInfoOffset = 0;
-	//
-	//	if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
-	//		if ($ThisFileInfo['mpeg']['audio']['channelmode'] == 'mono') {
-	//			// MPEG-1 (mono)
-	//			$ThisFileInfo['mpeg']['audio']['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-	//			$SideInfoOffset += 9;
-	//			$SideInfoOffset += 5;
-	//		} else {
-	//			// MPEG-1 (stereo, joint-stereo, dual-channel)
-	//			$ThisFileInfo['mpeg']['audio']['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-	//			$SideInfoOffset += 9;
-	//			$SideInfoOffset += 3;
-	//		}
-	//	} else { // 2 or 2.5
-	//		if ($ThisFileInfo['mpeg']['audio']['channelmode'] == 'mono') {
-	//			// MPEG-2, MPEG-2.5 (mono)
-	//			$ThisFileInfo['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)
-	//			$ThisFileInfo['mpeg']['audio']['side_info']['main_data_begin'] = substr($SideInfoBitstream, $SideInfoOffset, 8);
-	//			$SideInfoOffset += 8;
-	//			$SideInfoOffset += 2;
-	//		}
-	//	}
-	//
-	//	if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
-	//		for ($channel = 0; $channel < $ThisFileInfo['audio']['channels']; $channel++) {
-	//			for ($scfsi_band = 0; $scfsi_band < 4; $scfsi_band++) {
-	//				$ThisFileInfo['mpeg']['audio']['scfsi'][$channel][$scfsi_band] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-	//				$SideInfoOffset += 2;
-	//			}
-	//		}
-	//	}
-	//	for ($granule = 0; $granule < (($ThisFileInfo['mpeg']['audio']['version'] == '1') ? 2 : 1); $granule++) {
-	//		for ($channel = 0; $channel < $ThisFileInfo['audio']['channels']; $channel++) {
-	//			$ThisFileInfo['mpeg']['audio']['part2_3_length'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 12);
-	//			$SideInfoOffset += 12;
-	//			$ThisFileInfo['mpeg']['audio']['big_values'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-	//			$SideInfoOffset += 9;
-	//			$ThisFileInfo['mpeg']['audio']['global_gain'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 8);
-	//			$SideInfoOffset += 8;
-	//			if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
-	//				$ThisFileInfo['mpeg']['audio']['scalefac_compress'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 4);
-	//				$SideInfoOffset += 4;
-	//			} else {
-	//				$ThisFileInfo['mpeg']['audio']['scalefac_compress'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 9);
-	//				$SideInfoOffset += 9;
-	//			}
-	//			$ThisFileInfo['mpeg']['audio']['window_switching_flag'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-	//			$SideInfoOffset += 1;
-	//
-	//			if ($ThisFileInfo['mpeg']['audio']['window_switching_flag'][$granule][$channel] == '1') {
-	//
-	//				$ThisFileInfo['mpeg']['audio']['block_type'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 2);
-	//				$SideInfoOffset += 2;
-	//				$ThisFileInfo['mpeg']['audio']['mixed_block_flag'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-	//				$SideInfoOffset += 1;
-	//
-	//				for ($region = 0; $region < 2; $region++) {
-	//					$ThisFileInfo['mpeg']['audio']['table_select'][$granule][$channel][$region] = substr($SideInfoBitstream, $SideInfoOffset, 5);
-	//					$SideInfoOffset += 5;
-	//				}
-	//				$ThisFileInfo['mpeg']['audio']['table_select'][$granule][$channel][2] = 0;
-	//
-	//				for ($window = 0; $window < 3; $window++) {
-	//					$ThisFileInfo['mpeg']['audio']['subblock_gain'][$granule][$channel][$window] = substr($SideInfoBitstream, $SideInfoOffset, 3);
-	//					$SideInfoOffset += 3;
-	//				}
-	//
-	//			} else {
-	//
-	//				for ($region = 0; $region < 3; $region++) {
-	//					$ThisFileInfo['mpeg']['audio']['table_select'][$granule][$channel][$region] = substr($SideInfoBitstream, $SideInfoOffset, 5);
-	//					$SideInfoOffset += 5;
-	//				}
-	//
-	//				$ThisFileInfo['mpeg']['audio']['region0_count'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 4);
-	//				$SideInfoOffset += 4;
-	//				$ThisFileInfo['mpeg']['audio']['region1_count'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 3);
-	//				$SideInfoOffset += 3;
-	//				$ThisFileInfo['mpeg']['audio']['block_type'][$granule][$channel] = 0;
-	//			}
-	//
-	//			if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
-	//				$ThisFileInfo['mpeg']['audio']['preflag'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-	//				$SideInfoOffset += 1;
-	//			}
-	//			$ThisFileInfo['mpeg']['audio']['scalefac_scale'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-	//			$SideInfoOffset += 1;
-	//			$ThisFileInfo['mpeg']['audio']['count1table_select'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 1);
-	//			$SideInfoOffset += 1;
-	//		}
-	//	}
-	//}
-
-	return true;
-}
-
-function RecursiveFrameScanning(&$fd, &$ThisFileInfo, &$offset, &$nextframetestoffset, $ScanAsCBR) {
-	for ($i = 0; $i < MPEG_VALID_CHECK_FRAMES; $i++) {
-		// check next MPEG_VALID_CHECK_FRAMES frames for validity, to make sure we haven't run across a false synch
-		if (($nextframetestoffset + 4) >= $ThisFileInfo['avdataend']) {
-			// end of file
-			return true;
-		}
-
-		$nextframetestarray = array('error'=>'', 'warning'=>'', 'avdataend'=>$ThisFileInfo['avdataend'], 'avdataoffset'=>$ThisFileInfo['avdataoffset']);
-		if (decodeMPEGaudioHeader($fd, $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($ThisFileInfo['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $ThisFileInfo['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 {
-				$ThisFileInfo['error'] .= "\n".'Frame at offset ('.$offset.') is has an invalid frame length.';
-				return false;
-			}
-
-		} else {
-
-			// next frame is not valid, note the error and fail, so scanning can contiue for a valid frame sequence
-			$ThisFileInfo['error'] .= "\n".'Frame at offset ('.$offset.') is valid, but the next one at ('.$nextframetestoffset.') is not.';
-
-			return false;
-		}
-	}
-	return true;
-}
-
-function FreeFormatFrameLength($fd, $offset, &$ThisFileInfo, $deepscan=false) {
-	fseek($fd, $offset, SEEK_SET);
-	$MPEGaudioData = fread($fd, 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) {
-			$ThisFileInfo['error'] .= "\n".'Cannot find next free-format synch pattern ('.PrintHexBytes($SyncPattern1).' or '.PrintHexBytes($SyncPattern2).') after offset '.$offset;
-			return false;
-		} else {
-			$ThisFileInfo['warning'] .= "\n".'ModeExtension varies between first frame and other frames (known free-format issue in LAME 3.88)';
-			$ThisFileInfo['audio']['codec']   = 'LAME';
-			$ThisFileInfo['audio']['encoder'] = 'LAME3.88';
-			$SyncPattern1 = substr($SyncPattern1, 0, 3);
-			$SyncPattern2 = substr($SyncPattern2, 0, 3);
-		}
-	}
-
-	if ($deepscan) {
-
-		$ActualFrameLengthValues = array();
-		$nextoffset = $offset + $framelength;
-		while ($nextoffset < ($ThisFileInfo['avdataend'] - 6)) {
-			fseek($fd, $nextoffset - 1, SEEK_SET);
-			$NextSyncPattern = fread($fd, 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 {
-				$ThisFileInfo['error'] .= "\n".'Did not find expected free-format sync pattern at offset '.$nextoffset;
-				return false;
-			}
-			$nextoffset += $framelength;
-		}
-		if (count($ActualFrameLengthValues) > 0) {
-			$framelength = round(array_sum($ActualFrameLengthValues) / count($ActualFrameLengthValues));
-		}
-	}
-	return $framelength;
-}
-
-
-function getOnlyMPEGaudioInfo($fd, &$ThisFileInfo, $avdataoffset, $BitrateHistogram=false) {
-	// looks for synch, decodes MPEG audio header
-
-	fseek($fd, $avdataoffset, SEEK_SET);
-	$header = '';
-	$SynchSeekOffset = 0;
-
-	if (!defined('CONST_FF')) {
-		define('CONST_FF', chr(0xFF));
-		define('CONST_E0', chr(0xE0));
-	}
-
-	static $MPEGaudioVersionLookup;
-	static $MPEGaudioLayerLookup;
-	static $MPEGaudioBitrateLookup;
-	if (empty($MPEGaudioVersionLookup)) {
-		$MPEGaudioVersionLookup = MPEGaudioVersionArray();
-		$MPEGaudioLayerLookup   = MPEGaudioLayerArray();
-		$MPEGaudioBitrateLookup = MPEGaudioBitrateArray();
-
-	}
-
-	$header_len = strlen($header) - round(32768 / 2);
-	while (true) {
-
-		if (($SynchSeekOffset > $header_len) && (($avdataoffset + $SynchSeekOffset)  < $ThisFileInfo['avdataend']) && !feof($fd)) {
-
-			if ($SynchSeekOffset > 131072) {
-				// if a synch's not found within the first 128k bytes, then give up
-				$ThisFileInfo['error'] .= "\n".'could not find valid MPEG synch within the first 131072 bytes';
-				if (isset($ThisFileInfo['audio']['bitrate'])) {
-					unset($ThisFileInfo['audio']['bitrate']);
-				}
-				if (isset($ThisFileInfo['mpeg']['audio'])) {
-					unset($ThisFileInfo['mpeg']['audio']);
-				}
-				if (isset($ThisFileInfo['mpeg']) && (!is_array($ThisFileInfo['mpeg']) || (count($ThisFileInfo['mpeg']) == 0))) {
-					unset($ThisFileInfo['mpeg']);
-				}
-				return false;
-
-			} elseif ($header .= fread($fd, 32768)) {
-
-				// great
-				$header_len = strlen($header) - round(32768 / 2);
-
-			} else {
-
-				$ThisFileInfo['error'] .= "\n".'could not find valid MPEG synch before end of file';
-				if (isset($ThisFileInfo['audio']['bitrate'])) {
-					unset($ThisFileInfo['audio']['bitrate']);
-				}
-				if (isset($ThisFileInfo['mpeg']['audio'])) {
-					unset($ThisFileInfo['mpeg']['audio']);
-				}
-				if (isset($ThisFileInfo['mpeg']) && (!is_array($ThisFileInfo['mpeg']) || (count($ThisFileInfo['mpeg']) == 0))) {
-					unset($ThisFileInfo['mpeg']);
-				}
-				return false;
-
-			}
-		}
-
-		if (($SynchSeekOffset + 1) >= strlen($header)) {
-			$ThisFileInfo['error'] .= "\n".'could not find valid MPEG synch before end of file';
-			return false;
-		}
-
-		if (($header{$SynchSeekOffset} == CONST_FF) && ($header{($SynchSeekOffset + 1)} > CONST_E0)) { // synch detected
-
-			if (!isset($FirstFrameThisfileInfo) && !isset($ThisFileInfo['mpeg']['audio'])) {
-				$FirstFrameThisfileInfo = $ThisFileInfo;
-				$FirstFrameAVDataOffset = $avdataoffset + $SynchSeekOffset;
-				if (!decodeMPEGaudioHeader($fd, $avdataoffset + $SynchSeekOffset, $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 = $ThisFileInfo; // only overwrite real data if valid header found
-
-			if (decodeMPEGaudioHeader($fd, $avdataoffset + $SynchSeekOffset, $dummy, true)) {
-
-				$ThisFileInfo = $dummy;
-				$ThisFileInfo['avdataoffset'] = $avdataoffset + $SynchSeekOffset;
-				switch ($ThisFileInfo['fileformat']) {
-					case '':
-					case 'id3':
-					case 'ape':
-					case 'mp3':
-						$ThisFileInfo['fileformat']               = 'mp3';
-						$ThisFileInfo['audio']['dataformat']      = 'mp3';
-				}
-				if (isset($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode']) && ($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr')) {
-					if (!CloseMatch($ThisFileInfo['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.
-						$ThisFileInfo = $FirstFrameThisfileInfo;
-						$ThisFileInfo['avdataoffset']        = $FirstFrameAVDataOffset;
-						$ThisFileInfo['fileformat']          = 'mp3';
-						$ThisFileInfo['audio']['dataformat'] = 'mp3';
-						$dummy                               = $ThisFileInfo;
-						unset($dummy['mpeg']['audio']);
-						$GarbageOffsetStart = $FirstFrameAVDataOffset + $FirstFrameThisfileInfo['mpeg']['audio']['framelength'];
-						$GarbageOffsetEnd   = $avdataoffset + $SynchSeekOffset;
-						if (decodeMPEGaudioHeader($fd, $GarbageOffsetEnd, $dummy, true, true)) {
-
-							$ThisFileInfo = $dummy;
-							$ThisFileInfo['avdataoffset'] = $GarbageOffsetEnd;
-							$ThisFileInfo['warning'] .= "\n".'apparently-valid VBR header not used because could not find '.MPEG_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 {
-
-							$ThisFileInfo['warning'] .= "\n".'using data from VBR header even though could not find '.MPEG_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')';
-
-						}
-					}
-				}
-
-				if (isset($ThisFileInfo['mpeg']['audio']['bitrate_mode']) && ($ThisFileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr') && !isset($ThisFileInfo['mpeg']['audio']['VBR_method'])) {
-					// VBR file with no VBR header
-					$BitrateHistogram = true;
-				}
-
-				if ($BitrateHistogram) {
-
-					$ThisFileInfo['mpeg']['audio']['stereo_distribution']  = array('stereo'=>0, 'joint stereo'=>0, 'dual channel'=>0, 'mono'=>0);
-					$ThisFileInfo['mpeg']['audio']['version_distribution'] = array('1'=>0, '2'=>0, '2.5'=>0);
-
-					if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
-						if ($ThisFileInfo['mpeg']['audio']['layer'] == 'III') {
-							$ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32=>0, 40=>0, 48=>0, 56=>0, 64=>0, 80=>0, 96=>0, 112=>0, 128=>0, 160=>0, 192=>0, 224=>0, 256=>0, 320=>0);
-						} elseif ($ThisFileInfo['mpeg']['audio']['layer'] == 'II') {
-							$ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32=>0, 48=>0, 56=>0, 64=>0, 80=>0, 96=>0, 112=>0, 128=>0, 160=>0, 192=>0, 224=>0, 256=>0, 320=>0, 384=>0);
-						} elseif ($ThisFileInfo['mpeg']['audio']['layer'] == 'I') {
-							$ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32=>0, 64=>0, 96=>0, 128=>0, 160=>0, 192=>0, 224=>0, 256=>0, 288=>0, 320=>0, 352=>0, 384=>0, 416=>0, 448=>0);
-						}
-					} elseif ($ThisFileInfo['mpeg']['audio']['layer'] == 'I') {
-						$ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32=>0, 48=>0, 56=>0, 64=>0, 80=>0, 96=>0, 112=>0, 128=>0, 144=>0, 160=>0, 176=>0, 192=>0, 224=>0, 256=>0);
-					} else {
-						$ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 8=>0, 16=>0, 24=>0, 32=>0, 40=>0, 48=>0, 56=>0, 64=>0, 80=>0, 96=>0, 112=>0, 128=>0, 144=>0, 160=>0);
-					}
-
-					$dummy = array('error'=>$ThisFileInfo['error'], 'warning'=>$ThisFileInfo['warning'], 'avdataend'=>$ThisFileInfo['avdataend'], 'avdataoffset'=>$ThisFileInfo['avdataoffset']);
-					$synchstartoffset = $ThisFileInfo['avdataoffset'];
-
-					$FastMode = false;
-					while (decodeMPEGaudioHeader($fd, $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']];
-
-						$ThisFileInfo['mpeg']['audio']['bitrate_distribution'][$thisframebitrate]++;
-						$ThisFileInfo['mpeg']['audio']['stereo_distribution'][$dummy['mpeg']['audio']['channelmode']]++;
-						$ThisFileInfo['mpeg']['audio']['version_distribution'][$dummy['mpeg']['audio']['version']]++;
-						if (empty($dummy['mpeg']['audio']['framelength'])) {
-							$ThisFileInfo['warning'] .= "\n".'Invalid/missing framelength in histogram analysis - aborting';
-$synchstartoffset += 4;
-//							return false;
-						}
-						$synchstartoffset += $dummy['mpeg']['audio']['framelength'];
-					}
-
-					$bittotal     = 0;
-					$framecounter = 0;
-					foreach ($ThisFileInfo['mpeg']['audio']['bitrate_distribution'] as $bitratevalue => $bitratecount) {
-						$framecounter += $bitratecount;
-						if ($bitratevalue != 'free') {
-							$bittotal += ($bitratevalue * $bitratecount);
-						}
-					}
-					if ($framecounter == 0) {
-						$ThisFileInfo['error'] .= "\n".'Corrupt MP3 file: framecounter == zero';
-						return false;
-					}
-					$ThisFileInfo['mpeg']['audio']['frame_count'] = $framecounter;
-					$ThisFileInfo['mpeg']['audio']['bitrate']     = 1000 * ($bittotal / $framecounter);
-
-					$ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['bitrate'];
-
-
-					// Definitively set VBR vs CBR, even if the Xing/LAME/VBRI header says differently
-					$distinct_bitrates = 0;
-					foreach ($ThisFileInfo['mpeg']['audio']['bitrate_distribution'] as $bitrate_value => $bitrate_count) {
-						if ($bitrate_count > 0) {
-							$distinct_bitrates++;
-						}
-					}
-					if ($distinct_bitrates > 1) {
-						$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'vbr';
-					} else {
-						$ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'cbr';
-					}
-					$ThisFileInfo['audio']['bitrate_mode'] = $ThisFileInfo['mpeg']['audio']['bitrate_mode'];
-
-				}
-
-				break; // exit while()
-			}
-		}
-
-		$SynchSeekOffset++;
-		if (($avdataoffset + $SynchSeekOffset) >= $ThisFileInfo['avdataend']) {
-			// end of file/data
-
-			if (empty($ThisFileInfo['mpeg']['audio'])) {
-
-				$ThisFileInfo['error'] .= "\n".'could not find valid MPEG synch before end of file';
-				if (isset($ThisFileInfo['audio']['bitrate'])) {
-					unset($ThisFileInfo['audio']['bitrate']);
-				}
-				if (isset($ThisFileInfo['mpeg']['audio'])) {
-					unset($ThisFileInfo['mpeg']['audio']);
-				}
-				if (isset($ThisFileInfo['mpeg']) && (!is_array($ThisFileInfo['mpeg']) || empty($ThisFileInfo['mpeg']))) {
-					unset($ThisFileInfo['mpeg']);
-				}
-				return false;
-
-			}
-			break;
-		}
-
-	}
-	$ThisFileInfo['audio']['bits_per_sample'] = 16;
-	$ThisFileInfo['audio']['channels']        = $ThisFileInfo['mpeg']['audio']['channels'];
-	$ThisFileInfo['audio']['channelmode']     = $ThisFileInfo['mpeg']['audio']['channelmode'];
-	$ThisFileInfo['audio']['sample_rate']     = $ThisFileInfo['mpeg']['audio']['sample_rate'];
-	return true;
-}
-
-
-function MPEGaudioVersionArray() {
-	static $MPEGaudioVersion = array('2.5', false, '2', '1');
-	return $MPEGaudioVersion;
-}
-
-function MPEGaudioLayerArray() {
-	static $MPEGaudioLayer = array(false, 'III', 'II', 'I');
-	return $MPEGaudioLayer;
-}
-
-function MPEGaudioBitrateArray() {
-	static $MPEGaudioBitrate;
-	if (empty($MPEGaudioBitrate)) {
-		$MPEGaudioBitrate['1']['I']     = array('free', 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448);
-		$MPEGaudioBitrate['1']['II']    = array('free', 32, 48, 56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384);
-		$MPEGaudioBitrate['1']['III']   = array('free', 32, 40, 48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320);
-		$MPEGaudioBitrate['2']['I']     = array('free', 32, 48, 56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256);
-		$MPEGaudioBitrate['2']['II']    = array('free',  8, 16, 24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160);
-		$MPEGaudioBitrate['2']['III']   = $MPEGaudioBitrate['2']['II'];
-		$MPEGaudioBitrate['2.5']['I']   = $MPEGaudioBitrate['2']['I'];
-		$MPEGaudioBitrate['2.5']['II']  = $MPEGaudioBitrate['2']['II'];
-		$MPEGaudioBitrate['2.5']['III'] = $MPEGaudioBitrate['2']['III'];
-	}
-	return $MPEGaudioBitrate;
-}
-
-function MPEGaudioFrequencyArray() {
-	static $MPEGaudioFrequency;
-	if (empty($MPEGaudioFrequency)) {
-		$MPEGaudioFrequency['1']   = array(44100, 48000, 32000);
-		$MPEGaudioFrequency['2']   = array(22050, 24000, 16000);
-		$MPEGaudioFrequency['2.5'] = array(11025, 12000,  8000);
-	}
-	return $MPEGaudioFrequency;
-}
-
-function MPEGaudioChannelModeArray() {
-	static $MPEGaudioChannelMode = array('stereo', 'joint stereo', 'dual channel', 'mono');
-	return $MPEGaudioChannelMode;
-}
-
-function MPEGaudioModeExtensionArray() {
-	static $MPEGaudioModeExtension;
-	if (empty($MPEGaudioModeExtension)) {
-		$MPEGaudioModeExtension['I']   = array('4-31', '8-31', '12-31', '16-31');
-		$MPEGaudioModeExtension['II']  = array('4-31', '8-31', '12-31', '16-31');
-		$MPEGaudioModeExtension['III'] = array('', 'IS', 'MS', 'IS+MS');
-	}
-	return $MPEGaudioModeExtension;
-}
-
-function MPEGaudioEmphasisArray() {
-	static $MPEGaudioEmphasis = array('none', '50/15ms', false, 'CCIT J.17');
-	return $MPEGaudioEmphasis;
-}
-
-
-function MPEGaudioHeaderBytesValid($head4) {
-	return MPEGaudioHeaderValid(MPEGaudioHeaderDecode($head4));
-}
-
-function MPEGaudioHeaderValid($rawarray, $echoerrors=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       = MPEGaudioVersionArray();
-		$MPEGaudioLayerLookup         = MPEGaudioLayerArray();
-		$MPEGaudioBitrateLookup       = MPEGaudioBitrateArray();
-		$MPEGaudioFrequencyLookup     = MPEGaudioFrequencyArray();
-		$MPEGaudioChannelModeLookup   = MPEGaudioChannelModeArray();
-		$MPEGaudioModeExtensionLookup = MPEGaudioModeExtensionArray();
-		$MPEGaudioEmphasisLookup      = MPEGaudioEmphasisArray();
-	}
-
-	if (isset($MPEGaudioVersionLookup[$rawarray['version']])) {
-		$decodedVersion = $MPEGaudioVersionLookup[$rawarray['version']];
-	} else {
-		if ($echoerrors) {
-			echo "\n".'invalid Version ('.$rawarray['version'].')';
-		}
-		return false;
-	}
-	if (isset($MPEGaudioLayerLookup[$rawarray['layer']])) {
-		$decodedLayer = $MPEGaudioLayerLookup[$rawarray['layer']];
-	} else {
-		if ($echoerrors) {
-			echo "\n".'invalid Layer ('.$rawarray['layer'].')';
-		}
-		return false;
-	}
-	if (!isset($MPEGaudioBitrateLookup[$decodedVersion][$decodedLayer][$rawarray['bitrate']])) {
-		if ($echoerrors) {
-			echo "\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
-		} else {
-			return false;
-		}
-	}
-	if (!isset($MPEGaudioFrequencyLookup[$decodedVersion][$rawarray['sample_rate']])) {
-		if ($echoerrors) {
-			echo "\n".'invalid Frequency ('.$rawarray['sample_rate'].')';
-		}
-		return false;
-	}
-	if (!isset($MPEGaudioChannelModeLookup[$rawarray['channelmode']])) {
-		if ($echoerrors) {
-			echo "\n".'invalid ChannelMode ('.$rawarray['channelmode'].')';
-		}
-		return false;
-	}
-	if (!isset($MPEGaudioModeExtensionLookup[$decodedLayer][$rawarray['modeextension']])) {
-		if ($echoerrors) {
-			echo "\n".'invalid Mode Extension ('.$rawarray['modeextension'].')';
-		}
-		return false;
-	}
-	if (!isset($MPEGaudioEmphasisLookup[$rawarray['emphasis']])) {
-		if ($echoerrors) {
-			echo "\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;
-}
-
-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']         = (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;
-}
-
-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 == 'I') {
-
-					// For Layer I slot is 32 bits long
-					$FrameLengthCoefficient = 48;
-					$SlotLength = 4;
-
-				} else { // Layer II / III
-
-					// for Layer II and Layer III slot is 8 bits long.
-					$FrameLengthCoefficient = 144;
-					$SlotLength = 1;
-
-				}
-
-			} else { // MPEG-2 / MPEG-2.5
-
-				if ($layer == 'I') {
-
-					// For Layer I slot is 32 bits long
-					$FrameLengthCoefficient = 24;
-					$SlotLength = 4;
-
-				} elseif ($layer == 'II') {
-
-					// for Layer II and Layer III slot is 8 bits long.
-					$FrameLengthCoefficient = 144;
-					$SlotLength = 1;
-
-				} else { // III
-
-					// for Layer II and Layer III slot is 8 bits long.
-					$FrameLengthCoefficient = 72;
-					$SlotLength = 1;
-
-				}
-
-			}
-
-			// FrameLengthInBytes = ((Coefficient * BitRate) / SampleRate) + Padding
-			// http://66.96.216.160/cgi-bin/YaBB.pl?board=c&action=display&num=1018474068
-			// -> [Finding the next frame synch] on www.r3mix.net forums if the above link goes dead
-			if ($samplerate > 0) {
-				$NewFramelength  = ($FrameLengthCoefficient * $bitrate * 1000) / $samplerate;
-				$NewFramelength  = floor($NewFramelength / $SlotLength) * $SlotLength; // round to next-lower multiple of SlotLength (1 byte for Layer II/III, 4 bytes for Layer I)
-				if ($padding) {
-					$NewFramelength += $SlotLength;
-				}
-				$AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate] = (int) $NewFramelength;
-			}
-		}
-	}
-	return $AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate];
-}
-
-function LAMEvbrMethodLookup($VBRmethodID) {
-	static $LAMEvbrMethodLookup = array();
-	if (empty($LAMEvbrMethodLookup)) {
-		$LAMEvbrMethodLookup[0x00] = 'unknown';
-		$LAMEvbrMethodLookup[0x01] = 'cbr';
-		$LAMEvbrMethodLookup[0x02] = 'abr';
-		$LAMEvbrMethodLookup[0x03] = 'vbr-old / vbr-rh';
-		$LAMEvbrMethodLookup[0x04] = 'vbr-mtrh';
-		$LAMEvbrMethodLookup[0x05] = 'vbr-new / vbr-mt';
-	}
-	return (isset($LAMEvbrMethodLookup[$VBRmethodID]) ? $LAMEvbrMethodLookup[$VBRmethodID] : '');
-}
-
-function LAMEmiscStereoModeLookup($StereoModeID) {
-	static $LAMEmiscStereoModeLookup = array();
-	if (empty($LAMEmiscStereoModeLookup)) {
-		$LAMEmiscStereoModeLookup[0] = 'mono';
-		$LAMEmiscStereoModeLookup[1] = 'stereo';
-		$LAMEmiscStereoModeLookup[2] = 'dual';
-		$LAMEmiscStereoModeLookup[3] = 'joint';
-		$LAMEmiscStereoModeLookup[4] = 'forced';
-		$LAMEmiscStereoModeLookup[5] = 'auto';
-		$LAMEmiscStereoModeLookup[6] = 'intensity';
-		$LAMEmiscStereoModeLookup[7] = 'other';
-	}
-	return (isset($LAMEmiscStereoModeLookup[$StereoModeID]) ? $LAMEmiscStereoModeLookup[$StereoModeID] : '');
-}
-
-function LAMEmiscSourceSampleFrequencyLookup($SourceSampleFrequencyID) {
-	static $LAMEmiscSourceSampleFrequencyLookup = array();
-	if (empty($LAMEmiscSourceSampleFrequencyLookup)) {
-		$LAMEmiscSourceSampleFrequencyLookup[0] = '<= 32 kHz';
-		$LAMEmiscSourceSampleFrequencyLookup[1] = '44.1 kHz';
-		$LAMEmiscSourceSampleFrequencyLookup[2] = '48 kHz';
-		$LAMEmiscSourceSampleFrequencyLookup[3] = '> 48kHz';
-	}
-	return (isset($LAMEmiscSourceSampleFrequencyLookup[$SourceSampleFrequencyID]) ? $LAMEmiscSourceSampleFrequencyLookup[$SourceSampleFrequencyID] : '');
-}
-
-function LAMEsurroundInfoLookup($SurroundInfoID) {
-	static $LAMEsurroundInfoLookup = array();
-	if (empty($LAMEsurroundInfoLookup)) {
-		$LAMEsurroundInfoLookup[0] = 'no surround info';
-		$LAMEsurroundInfoLookup[1] = 'DPL encoding';
-		$LAMEsurroundInfoLookup[2] = 'DPL2 encoding';
-		$LAMEsurroundInfoLookup[3] = 'Ambisonic encoding';
-	}
-	return (isset($LAMEsurroundInfoLookup[$SurroundInfoID]) ? $LAMEsurroundInfoLookup[$SurroundInfoID] : 'reserved');
-}
-
-for ($i = 0x00; $i <= 0xFF; $i++) {
-	$head4 = "\xFF\xFE".chr($i)."\x00";
-	$isvalid = MPEGaudioHeaderBytesValid($head4);
-	echo '<div style="color: '.($isvalid ? 'green' : 'red').';">'.str_pad(strtoupper(dechex($i)), 2, '0', STR_PAD_LEFT).' = '.htmlentities(chr($i)).' = '.($isvalid ? 'valid' : 'INVALID').'</div>';
-}
diff --git a/lib/getid3/demos/demo.mysql.php b/lib/getid3/demos/demo.mysql.php
deleted file mode 100644
index a84e7cd2d..000000000
--- a/lib/getid3/demos/demo.mysql.php
+++ /dev/null
@@ -1,2195 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.mysql.php - part of getID3()                     //
-// Sample script for recursively scanning directories and      //
-// storing the results in a database                           //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line 16 in demos/demo.mysql.php');
-
-
-// OPTIONS:
-$getid3_demo_mysql_encoding = 'ISO-8859-1';
-$getid3_demo_mysql_md5_data = false;        // All data hashes are by far the slowest part of scanning
-$getid3_demo_mysql_md5_file = false;
-
-define('GETID3_DB_HOST',  'localhost');
-define('GETID3_DB_USER',  'root');
-define('GETID3_DB_PASS',  'password');
-define('GETID3_DB_DB',    'getid3');
-define('GETID3_DB_TABLE', 'files');
-
-// CREATE DATABASE `getid3`;
-
-ob_start();
-if (!mysql_connect(GETID3_DB_HOST, GETID3_DB_USER, GETID3_DB_PASS)) {
-	$errormessage = ob_get_contents();
-	ob_end_clean();
-	die('Could not connect to MySQL host: <blockquote style="background-color: #FF9933; padding: 10px;">'.mysql_error().'</blockquote>');
-}
-if (!mysql_select_db(GETID3_DB_DB)) {
-	$errormessage = ob_get_contents();
-	ob_end_clean();
-	die('Could not select database: <blockquote style="background-color: #FF9933; padding: 10px;">'.mysql_error().'</blockquote>');
-}
-ob_end_clean();
-
-$getid3PHP_filename = realpath('../getid3/getid3.php');
-if (!file_exists($getid3PHP_filename) || !include_once($getid3PHP_filename)) {
-	die('Cannot open '.$getid3PHP_filename);
-}
-// Initialize getID3 engine
-$getID3 = new getID3;
-$getID3->setOption(array(
-	'option_md5_data' => $getid3_demo_mysql_md5_data,
-	'encoding'        => $getid3_demo_mysql_encoding,
-));
-
-
-function RemoveAccents($string) {
-	// Revised version by markstewardØhotmail*com
-	return strtr(strtr($string, 'ŠŽšžŸÀ�ÂÃÄÅÇÈÉÊËÌ�Î�ÑÒÓÔÕÖØÙÚÛÜ�àáâãäåçèéêëìíîïñòóôõöøùúûüýÿ', 'SZszYAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy'), array('Þ' => 'TH', 'þ' => 'th', '�' => 'DH', 'ð' => 'dh', 'ß' => 'ss', 'Œ' => 'OE', 'œ' => 'oe', 'Æ' => 'AE', 'æ' => 'ae', 'µ' => 'u'));
-}
-
-function BitrateColor($bitrate, $BitrateMaxScale=768) {
-	// $BitrateMaxScale is bitrate of maximum-quality color (bright green)
-	// below this is gradient, above is solid green
-
-	$bitrate *= (256 / $BitrateMaxScale); // scale from 1-[768]kbps to 1-256
-	$bitrate = round(min(max($bitrate, 1), 256));
-	$bitrate--;    // scale from 1-256kbps to 0-255kbps
-
-	$Rcomponent = max(255 - ($bitrate * 2), 0);
-	$Gcomponent = max(($bitrate * 2) - 255, 0);
-	if ($bitrate > 127) {
-		$Bcomponent = max((255 - $bitrate) * 2, 0);
-	} else {
-		$Bcomponent = max($bitrate * 2, 0);
-	}
-	return str_pad(dechex($Rcomponent), 2, '0', STR_PAD_LEFT).str_pad(dechex($Gcomponent), 2, '0', STR_PAD_LEFT).str_pad(dechex($Bcomponent), 2, '0', STR_PAD_LEFT);
-}
-
-function BitrateText($bitrate, $decimals=0) {
-	return '<span style="color: #'.BitrateColor($bitrate).'">'.number_format($bitrate, $decimals).' kbps</span>';
-}
-
-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 '';
-}
-
-function RenameFileFromTo($from, $to, &$results) {
-	$success = true;
-	if ($from === $to) {
-		$results = '<span style="color: #FF0000;"><b>Source and Destination filenames identical</b><br>FAILED to rename';
-	} elseif (!file_exists($from)) {
-		$results = '<span style="color: #FF0000;"><b>Source file does not exist</b><br>FAILED to rename';
-	} elseif (file_exists($to) && (strtolower($from) !== strtolower($to))) {
-		$results = '<span style="color: #FF0000;"><b>Destination file already exists</b><br>FAILED to rename';
-	} else {
-		ob_start();
-		if (rename($from, $to)) {
-			ob_end_clean();
-			$SQLquery  = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($from).'")';
-			mysql_query_safe($SQLquery);
-			$results = '<span style="color: #008000;">Successfully renamed';
-		} else {
-			$errormessage = ob_get_contents();
-			ob_end_clean();
-			$results = '<br><span style="color: #FF0000;">FAILED to rename';
-			$success = false;
-		}
-	}
-	$results .= ' from:<br><i>'.$from.'</i><br>to:<br><i>'.$to.'</i></span><hr>';
-	return $success;
-}
-
-if (!empty($_REQUEST['renamefilefrom']) && !empty($_REQUEST['renamefileto'])) {
-
-	$results = '';
-	RenameFileFromTo($_REQUEST['renamefilefrom'], $_REQUEST['renamefileto'], $results);
-	echo $results;
-	exit;
-
-} elseif (!empty($_REQUEST['m3ufilename'])) {
-
-	header('Content-type: audio/x-mpegurl');
-	echo '#EXTM3U'."\n";
-	echo WindowsShareSlashTranslate($_REQUEST['m3ufilename'])."\n";
-	exit;
-
-} elseif (!isset($_REQUEST['m3u']) && !isset($_REQUEST['m3uartist']) && !isset($_REQUEST['m3utitle'])) {
-
-	echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  "http://www.w3.org/TR/html4/loose.dtd">';
-	echo '<html><head><title>getID3() demo - /demo/mysql.php</title><style>BODY, TD, TH { font-family: sans-serif; font-size: 10pt; } A { text-decoration: none; } A:hover { text-decoration: underline; } A:visited { font-style: italic; }</style></head><body>';
-
-}
-
-
-function WindowsShareSlashTranslate($filename) {
-	if (substr($filename, 0, 2) == '//') {
-		return str_replace('/', '\\', $filename);
-	}
-	return $filename;
-}
-
-function mysql_query_safe($SQLquery) {
-	static $TimeSpentQuerying = 0;
-	if ($SQLquery === null) {
-		return $TimeSpentQuerying;
-	}
-	$starttime = microtime(true);
-	$result = mysql_query($SQLquery);
-	$TimeSpentQuerying += (microtime(true) - $starttime);
-	if (mysql_error()) {
-		die('<div style="color: red; padding: 10px; margin: 10px; border: 3px red ridge;"><div style="font-weight: bold;">SQL error:</div><div style="color: blue; padding: 10px;">'.htmlentities(mysql_error()).'</div><hr size="1"><pre>'.htmlentities($SQLquery).'</pre></div>');
-	}
-	return $result;
-}
-
-function mysql_table_exists($tablename) {
-	return (bool) mysql_query('DESCRIBE '.$tablename);
-}
-
-function AcceptableExtensions($fileformat, $audio_dataformat='', $video_dataformat='') {
-	static $AcceptableExtensionsAudio = array();
-	if (empty($AcceptableExtensionsAudio)) {
-		$AcceptableExtensionsAudio['mp3']['mp3']  = array('mp3');
-		$AcceptableExtensionsAudio['mp2']['mp2']  = array('mp2');
-		$AcceptableExtensionsAudio['mp1']['mp1']  = array('mp1');
-		$AcceptableExtensionsAudio['asf']['asf']  = array('asf');
-		$AcceptableExtensionsAudio['asf']['wma']  = array('wma');
-		$AcceptableExtensionsAudio['riff']['mp3'] = array('wav');
-		$AcceptableExtensionsAudio['riff']['wav'] = array('wav');
-	}
-	static $AcceptableExtensionsVideo = array();
-	if (empty($AcceptableExtensionsVideo)) {
-		$AcceptableExtensionsVideo['mp3']['mp3']  = array('mp3');
-		$AcceptableExtensionsVideo['mp2']['mp2']  = array('mp2');
-		$AcceptableExtensionsVideo['mp1']['mp1']  = array('mp1');
-		$AcceptableExtensionsVideo['asf']['asf']  = array('asf');
-		$AcceptableExtensionsVideo['asf']['wmv']  = array('wmv');
-		$AcceptableExtensionsVideo['gif']['gif']  = array('gif');
-		$AcceptableExtensionsVideo['jpg']['jpg']  = array('jpg');
-		$AcceptableExtensionsVideo['png']['png']  = array('png');
-		$AcceptableExtensionsVideo['bmp']['bmp']  = array('bmp');
-	}
-	if (!empty($video_dataformat)) {
-		return (isset($AcceptableExtensionsVideo[$fileformat][$video_dataformat]) ? $AcceptableExtensionsVideo[$fileformat][$video_dataformat] : array());
-	} else {
-		return (isset($AcceptableExtensionsAudio[$fileformat][$audio_dataformat]) ? $AcceptableExtensionsAudio[$fileformat][$audio_dataformat] : array());
-	}
-}
-
-
-if (!empty($_REQUEST['scan'])) {
-	if (mysql_table_exists(GETID3_DB_TABLE)) {
-		$SQLquery  = 'DROP TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		mysql_query_safe($SQLquery);
-	}
-}
-if (!mysql_table_exists(GETID3_DB_TABLE)) {
-	$SQLquery  = "CREATE TABLE `".mysql_real_escape_string(GETID3_DB_TABLE)."` (";
-	$SQLquery .= " `ID` int(11) unsigned NOT NULL auto_increment,";
-	$SQLquery .= " `filename` text NOT NULL,";
-	$SQLquery .= " `last_modified` int(11) NOT NULL default '0',";
-	$SQLquery .= " `md5_file` varchar(32) NOT NULL default '',";
-	$SQLquery .= " `md5_data` varchar(32) NOT NULL default '',";
-	$SQLquery .= " `md5_data_source` varchar(32) NOT NULL default '',";
-	$SQLquery .= " `filesize` int(10) unsigned NOT NULL default '0',";
-	$SQLquery .= " `fileformat` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `audio_dataformat` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `video_dataformat` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `audio_bitrate` float NOT NULL default '0',";
-	$SQLquery .= " `video_bitrate` float NOT NULL default '0',";
-	$SQLquery .= " `playtime_seconds` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `tags` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `artist` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `title` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `remix` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `album` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `genre` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `comment` text NOT NULL,";
-	$SQLquery .= " `track` varchar(7) NOT NULL default '',";
-	$SQLquery .= " `comments_all` longtext NOT NULL,";
-	$SQLquery .= " `comments_id3v2` longtext NOT NULL,";
-	$SQLquery .= " `comments_ape` longtext NOT NULL,";
-	$SQLquery .= " `comments_lyrics3` longtext NOT NULL,";
-	$SQLquery .= " `comments_id3v1` text NOT NULL,";
-	$SQLquery .= " `warning` longtext NOT NULL,";
-	$SQLquery .= " `error` longtext NOT NULL,";
-	$SQLquery .= " `track_volume` float NOT NULL default '0',";
-	$SQLquery .= " `encoder_options` varchar(255) NOT NULL default '',";
-	$SQLquery .= " `vbr_method` varchar(255) NOT NULL default '',";
-	$SQLquery .= " PRIMARY KEY (`ID`)";
-	$SQLquery .= ")";
-	mysql_query_safe($SQLquery);
-}
-
-$ExistingTableFields = array();
-$result = mysql_query_safe('DESCRIBE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`');
-while ($row = mysql_fetch_array($result)) {
-	$ExistingTableFields[$row['Field']] = $row;
-}
-if (!isset($ExistingTableFields['encoder_options'])) { // Added in 1.7.0b2
-	echo '<b>adding field `encoder_options`</b><br>';
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `encoder_options` VARCHAR(255) default "" NOT NULL AFTER `error`');
-	mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`');
-}
-if (isset($ExistingTableFields['track']) && ($ExistingTableFields['track']['Type'] != 'varchar(7)')) { // Changed in 1.7.0b2
-	echo '<b>changing field `track` to VARCHAR(7)</b><br>';
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `track` `track` VARCHAR(7) default "" NOT NULL');
-	mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`');
-}
-if (!isset($ExistingTableFields['track_volume'])) { // Added in 1.7.0b5
-	echo '<H1><FONT COLOR="red">WARNING! You should erase your database and rescan everything because the comment storing has been changed since the last version</FONT></H1><hr>';
-	echo '<b>adding field `track_volume`</b><br>';
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `track_volume` FLOAT NOT NULL AFTER `error`');
-	mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`');
-}
-if (!isset($ExistingTableFields['remix'])) { // Added in 1.7.3b1
-	echo '<b>adding field `encoder_options`, `alternate_name`, `parody`</b><br>';
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `remix` VARCHAR(255) default "" NOT NULL AFTER `title`');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `alternate_name` VARCHAR(255) default "" NOT NULL AFTER `track`');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` ADD `parody` VARCHAR(255) default "" NOT NULL AFTER `alternate_name`');
-	mysql_query_safe('OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`');
-}
-if (isset($ExistingTableFields['comments_all']) && ($ExistingTableFields['comments_all']['Type'] != 'longtext')) { // Changed in 1.9.0
-	echo '<b>changing comments fields from text to longtext</b><br>';
-	// no need to change id3v1
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_all`     `comments_all`     LONGTEXT NOT NULL');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_id3v2`   `comments_id3v2`   LONGTEXT NOT NULL');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_ape`     `comments_ape`     LONGTEXT NOT NULL');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `comments_lyrics3` `comments_lyrics3` LONGTEXT NOT NULL');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `warning`          `warning`          LONGTEXT NOT NULL');
-	mysql_query_safe('ALTER TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` CHANGE `error`            `error`            LONGTEXT NOT NULL');
-}
-
-
-function SynchronizeAllTags($filename, $synchronizefrom='all', $synchronizeto='A12', &$errors) {
-	global $getID3;
-
-	set_time_limit(30);
-
-	$ThisFileInfo = $getID3->analyze($filename);
-	getid3_lib::CopyTagsToComments($ThisFileInfo);
-
-	if ($synchronizefrom == 'all') {
-		$SourceArray = (!empty($ThisFileInfo['comments']) ? $ThisFileInfo['comments'] : array());
-	} elseif (!empty($ThisFileInfo['tags'][$synchronizefrom])) {
-		$SourceArray = (!empty($ThisFileInfo['tags'][$synchronizefrom]) ? $ThisFileInfo['tags'][$synchronizefrom] : array());
-	} else {
-		die('ERROR: $ThisFileInfo[tags]['.$synchronizefrom.'] does not exist');
-	}
-
-	$SQLquery  = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($filename).'")';
-	mysql_query_safe($SQLquery);
-
-
-	$TagFormatsToWrite = array();
-	if ((strpos($synchronizeto, '2') !== false) && ($synchronizefrom != 'id3v2')) {
-		$TagFormatsToWrite[] = 'id3v2.3';
-	}
-	if ((strpos($synchronizeto, 'A') !== false) && ($synchronizefrom != 'ape')) {
-		$TagFormatsToWrite[] = 'ape';
-	}
-	if ((strpos($synchronizeto, 'L') !== false) && ($synchronizefrom != 'lyrics3')) {
-		$TagFormatsToWrite[] = 'lyrics3';
-	}
-	if ((strpos($synchronizeto, '1') !== false) && ($synchronizefrom != 'id3v1')) {
-		$TagFormatsToWrite[] = 'id3v1';
-	}
-
-	getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.php', __FILE__, true);
-	$tagwriter = new getid3_writetags;
-	$tagwriter->filename       = $filename;
-	$tagwriter->tagformats     = $TagFormatsToWrite;
-	$tagwriter->overwrite_tags = true;
-	$tagwriter->tag_encoding   = $getID3->encoding;
-	$tagwriter->tag_data       = $SourceArray;
-
-	if ($tagwriter->WriteTags()) {
-		$errors = $tagwriter->errors;
-		return true;
-	}
-	$errors = $tagwriter->errors;
-	return false;
-}
-
-$IgnoreNoTagFormats = array('', 'png', 'jpg', 'gif', 'bmp', 'swf', 'pdf', 'zip', 'rar', 'mid', 'mod', 'xm', 'it', 's3m');
-
-if (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan']) || !empty($_REQUEST['rescanerrors'])) {
-
-	$SQLquery  = 'DELETE from `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`fileformat` = "")';
-	mysql_query_safe($SQLquery);
-
-	$FilesInDir = array();
-
-	if (!empty($_REQUEST['rescanerrors'])) {
-
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF']).'">abort</a><hr>';
-
-		echo 'Re-scanning all media files already in database that had errors and/or warnings in last scan<hr>';
-
-		$SQLquery  = 'SELECT `filename`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`error` <> "")';
-		$SQLquery .= ' OR (`warning` <> "")';
-		$SQLquery .= ' ORDER BY `filename` ASC';
-		$result = mysql_query_safe($SQLquery);
-		while ($row = mysql_fetch_array($result)) {
-
-			if (!file_exists($row['filename'])) {
-				echo '<b>File missing: '.$row['filename'].'</b><br>';
-				$SQLquery = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-				$SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")';
-				mysql_query_safe($SQLquery);
-			} else {
-				$FilesInDir[] = $row['filename'];
-			}
-
-		}
-
-	} elseif (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan'])) {
-
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF']).'">abort</a><hr>';
-
-		echo 'Scanning all media files in <b>'.str_replace('\\', '/', realpath(!empty($_REQUEST['scan']) ? $_REQUEST['scan'] : $_REQUEST['newscan'])).'</b> (and subdirectories)<hr>';
-
-		$SQLquery  = 'SELECT COUNT(*) AS `num`, `filename`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' GROUP BY `filename`';
-		$SQLquery .= ' HAVING (`num` > 1)';
-		$SQLquery .= ' ORDER BY `num` DESC';
-		$result = mysql_query_safe($SQLquery);
-		$DupesDeleted = 0;
-		while ($row = mysql_fetch_array($result)) {
-			set_time_limit(30);
-			$SQLquery  = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE `filename` LIKE "'.mysql_real_escape_string($row['filename']).'"';
-			mysql_query_safe($SQLquery);
-			$DupesDeleted++;
-		}
-		if ($DupesDeleted > 0) {
-			echo 'Deleted <b>'.number_format($DupesDeleted).'</b> duplicate filenames<hr>';
-		}
-
-		if (!empty($_REQUEST['newscan'])) {
-			$AlreadyInDatabase = array();
-			set_time_limit(60);
-			$SQLquery  = 'SELECT `filename`';
-			$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' ORDER BY `filename` ASC';
-			$result = mysql_query_safe($SQLquery);
-			while ($row = mysql_fetch_array($result)) {
-				//$AlreadyInDatabase[] = strtolower($row['filename']);
-				$AlreadyInDatabase[] = $row['filename'];
-			}
-		}
-
-		$DirectoriesToScan  = array(!empty($_REQUEST['scan']) ? $_REQUEST['scan'] : $_REQUEST['newscan']);
-		$DirectoriesScanned = array();
-		while (count($DirectoriesToScan) > 0) {
-			foreach ($DirectoriesToScan as $DirectoryKey => $startingdir) {
-				if ($dir = opendir($startingdir)) {
-					set_time_limit(30);
-					echo '<b>'.str_replace('\\', '/', $startingdir).'</b><br>';
-					flush();
-					while (($file = readdir($dir)) !== false) {
-						if (($file != '.') && ($file != '..')) {
-							$RealPathName = realpath($startingdir.'/'.$file);
-							if (is_dir($RealPathName)) {
-								if (!in_array($RealPathName, $DirectoriesScanned) && !in_array($RealPathName, $DirectoriesToScan)) {
-									$DirectoriesToScan[] = $RealPathName;
-								}
-							} elseif (is_file($RealPathName)) {
-								if (!empty($_REQUEST['newscan'])) {
-									if (!in_array(str_replace('\\', '/', $RealPathName), $AlreadyInDatabase)) {
-										$FilesInDir[] = $RealPathName;
-									}
-								} elseif (!empty($_REQUEST['scan'])) {
-									$FilesInDir[] = $RealPathName;
-								}
-							}
-						}
-					}
-					closedir($dir);
-				} else {
-					echo '<div style="color: red;">Failed to open directory "<b>'.htmlentities($startingdir).'</b>"</div><br>';
-				}
-				$DirectoriesScanned[] = $startingdir;
-				unset($DirectoriesToScan[$DirectoryKey]);
-			}
-		}
-		echo '<i>List of files to scan complete (added '.number_format(count($FilesInDir)).' files to scan)</i><hr>';
-		flush();
-	}
-
-	$FilesInDir = array_unique($FilesInDir);
-	sort($FilesInDir);
-
-	$starttime = time();
-	$rowcounter = 0;
-	$totaltoprocess = count($FilesInDir);
-
-	foreach ($FilesInDir as $filename) {
-		set_time_limit(300);
-
-		echo '<br>'.date('H:i:s').' ['.number_format(++$rowcounter).' / '.number_format($totaltoprocess).'] '.str_replace('\\', '/', $filename);
-
-		$ThisFileInfo = $getID3->analyze($filename);
-		getid3_lib::CopyTagsToComments($ThisFileInfo);
-
-		if (file_exists($filename)) {
-			$ThisFileInfo['file_modified_time'] = filemtime($filename);
-			$ThisFileInfo['md5_file']           = ($getid3_demo_mysql_md5_file ? md5_file($filename) : '');
-		}
-
-		if (empty($ThisFileInfo['fileformat'])) {
-
-			echo ' (<span style="color: #990099;">unknown file type</span>)';
-
-		} else {
-
-			if (!empty($ThisFileInfo['error'])) {
-				echo ' (<span style="color: #FF0000;">errors</span>)';
-			} elseif (!empty($ThisFileInfo['warning'])) {
-				echo ' (<span style="color: #FF9999;">warnings</span>)';
-			} else {
-				echo ' (<span style="color: #009900;">OK</span>)';
-			}
-
-			$this_track_track = '';
-			if (!empty($ThisFileInfo['comments']['track'])) {
-				foreach ($ThisFileInfo['comments']['track'] as $key => $value) {
-					if (strlen($value) > strlen($this_track_track)) {
-						$this_track_track = str_pad($value, 2, '0', STR_PAD_LEFT);
-					}
-				}
-				if (preg_match('#^([0-9]+)/([0-9]+)$#', $this_track_track, $matches)) {
-					// change "1/5"->"01/05", "3/12"->"03/12", etc
-					$this_track_track = str_pad($matches[1], 2, '0', STR_PAD_LEFT).'/'.str_pad($matches[2], 2, '0', STR_PAD_LEFT);
-				}
-			}
-
-			$this_track_remix = '';
-			$this_track_title = '';
-			if (!empty($ThisFileInfo['comments']['title'])) {
-				foreach ($ThisFileInfo['comments']['title'] as $possible_title) {
-					if (strlen($possible_title) > strlen($this_track_title)) {
-						$this_track_title = $possible_title;
-					}
-				}
-			}
-
-			$ParenthesesPairs = array('()', '[]', '{}');
-			foreach ($ParenthesesPairs as $pair) {
-				if (preg_match_all('/(.*) '.preg_quote($pair{0}).'(([^'.preg_quote($pair).']*[\- '.preg_quote($pair{0}).'])?(cut|dub|edit|version|live|reprise|[a-z]*mix))'.preg_quote($pair{1}).'/iU', $this_track_title, $matches)) {
-					$this_track_title = $matches[1][0];
-					$this_track_remix = implode("\t", $matches[2]);
-				}
-			}
-
-
-
-			if (!empty($_REQUEST['rescanerrors'])) {
-
-				$SQLquery  = 'UPDATE `'.mysql_real_escape_string(GETID3_DB_TABLE).'` SET ';
-				$SQLquery .= '  `last_modified` = "'.   mysql_real_escape_string(!empty($ThisFileInfo['file_modified_time']            ) ?                          $ThisFileInfo['file_modified_time']              : '').'"';
-				$SQLquery .= ', `md5_file` = "'.        mysql_real_escape_string(!empty($ThisFileInfo['md5_file']                      ) ?                          $ThisFileInfo['md5_file']                        : '').'"';
-				$SQLquery .= ', `md5_data` = "'.        mysql_real_escape_string(!empty($ThisFileInfo['md5_data']                      ) ?                          $ThisFileInfo['md5_data']                        : '').'"';
-				$SQLquery .= ', `md5_data_source` = "'. mysql_real_escape_string(!empty($ThisFileInfo['md5_data_source']               ) ?                          $ThisFileInfo['md5_data_source']                 : '').'"';
-				$SQLquery .= ', `filesize` = "'.        mysql_real_escape_string(!empty($ThisFileInfo['filesize']                      ) ?                          $ThisFileInfo['filesize']                        :  0).'"';
-				$SQLquery .= ', `fileformat` = "'.      mysql_real_escape_string(!empty($ThisFileInfo['fileformat']                    ) ?                          $ThisFileInfo['fileformat']                      : '').'"';
-				$SQLquery .= ', `audio_dataformat` = "'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['dataformat']           ) ?                          $ThisFileInfo['audio']['dataformat']             : '').'"';
-				$SQLquery .= ', `video_dataformat` = "'.mysql_real_escape_string(!empty($ThisFileInfo['video']['dataformat']           ) ?                          $ThisFileInfo['video']['dataformat']             : '').'"';
-				$SQLquery .= ', `vbr_method` = "'.      mysql_real_escape_string(!empty($ThisFileInfo['mpeg']['audio']['VBR_method']   ) ?                          $ThisFileInfo['mpeg']['audio']['VBR_method']     : '').'"';
-				$SQLquery .= ', `audio_bitrate` = "'.   mysql_real_escape_string(!empty($ThisFileInfo['audio']['bitrate']              ) ?                 floatval($ThisFileInfo['audio']['bitrate'])               :  0).'"';
-				$SQLquery .= ', `video_bitrate` = "'.   mysql_real_escape_string(!empty($ThisFileInfo['video']['bitrate']              ) ?                 floatval($ThisFileInfo['video']['bitrate'])               :  0).'"';
-				$SQLquery .= ', `playtime_seconds` = "'.mysql_real_escape_string(!empty($ThisFileInfo['playtime_seconds']              ) ?                 floatval($ThisFileInfo['playtime_seconds'])               :  0).'"';
-				$SQLquery .= ', `track_volume` = "'.    mysql_real_escape_string(!empty($ThisFileInfo['replay_gain']['track']['volume']) ?                 floatval($ThisFileInfo['replay_gain']['track']['volume']) :  0).'"';
-				$SQLquery .= ', `comments_all` = "'.    mysql_real_escape_string(!empty($ThisFileInfo['comments']                      ) ?                serialize($ThisFileInfo['comments'])                       : '').'"';
-				$SQLquery .= ', `comments_id3v2` = "'.  mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v2']                 ) ?                serialize($ThisFileInfo['tags']['id3v2'])                  : '').'"';
-				$SQLquery .= ', `comments_ape` = "'.    mysql_real_escape_string(!empty($ThisFileInfo['tags']['ape']                   ) ?                serialize($ThisFileInfo['tags']['ape'])                    : '').'"';
-				$SQLquery .= ', `comments_lyrics3` = "'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['lyrics3']               ) ?                serialize($ThisFileInfo['tags']['lyrics3'])                : '').'"';
-				$SQLquery .= ', `comments_id3v1` = "'.  mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v1']                 ) ?                serialize($ThisFileInfo['tags']['id3v1'])                  : '').'"';
-				$SQLquery .= ', `warning` = "'.         mysql_real_escape_string(!empty($ThisFileInfo['warning']                       ) ?            implode("\t", $ThisFileInfo['warning'])                        : '').'"';
-				$SQLquery .= ', `error` = "'.           mysql_real_escape_string(!empty($ThisFileInfo['error']                         ) ?            implode("\t", $ThisFileInfo['error'])                          : '').'"';
-				$SQLquery .= ', `album` = "'.           mysql_real_escape_string(!empty($ThisFileInfo['comments']['album']             ) ?            implode("\t", $ThisFileInfo['comments']['album'])              : '').'"';
-				$SQLquery .= ', `genre` = "'.           mysql_real_escape_string(!empty($ThisFileInfo['comments']['genre']             ) ?            implode("\t", $ThisFileInfo['comments']['genre'])              : '').'"';
-				$SQLquery .= ', `comment` = "'.         mysql_real_escape_string(!empty($ThisFileInfo['comments']['comment']           ) ?            implode("\t", $ThisFileInfo['comments']['comment'])            : '').'"';
-				$SQLquery .= ', `artist` = "'.          mysql_real_escape_string(!empty($ThisFileInfo['comments']['artist']            ) ?            implode("\t", $ThisFileInfo['comments']['artist'])             : '').'"';
-				$SQLquery .= ', `tags` = "'.            mysql_real_escape_string(!empty($ThisFileInfo['tags']                          ) ? implode("\t", array_keys($ThisFileInfo['tags']))                          : '').'"';
-				$SQLquery .= ', `encoder_options` = "'. mysql_real_escape_string(trim((!empty($ThisFileInfo['audio']['encoder']) ? $ThisFileInfo['audio']['encoder'] : '').' '.(!empty($ThisFileInfo['audio']['encoder_options']) ? $ThisFileInfo['audio']['encoder_options'] : ''))).'"';
-				$SQLquery .= ', `title` = "'.           mysql_real_escape_string($this_track_title).'"';
-				$SQLquery .= ', `remix` = "'.           mysql_real_escape_string($this_track_remix).'"';
-				$SQLquery .= ', `track` = "'.           mysql_real_escape_string($this_track_track).'"';
-				$SQLquery .= 'WHERE (`filename` = "'. mysql_real_escape_string(isset($ThisFileInfo['filenamepath']) ? $ThisFileInfo['filenamepath'] : '').'")';
-
-			} elseif (!empty($_REQUEST['scan']) || !empty($_REQUEST['newscan'])) {
-
-				//$SQLquery  = 'INSERT INTO `'.mysql_real_escape_string(GETID3_DB_TABLE).'` (`filename`, `last_modified`, `md5_file`, `md5_data`, `md5_data_source`, `filesize`, `fileformat`, `audio_dataformat`, `video_dataformat`, `audio_bitrate`, `video_bitrate`, `playtime_seconds`, `artist`, `title`, `remix`, `album`, `genre`, `comment`, `track`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`, `warning`, `error`, `encoder_options`, `vbr_method`, `track_volume`) VALUES (';
-				$SQLquery  = 'INSERT INTO `'.mysql_real_escape_string(GETID3_DB_TABLE).'` (`filename`, `last_modified`, `md5_file`, `md5_data`, `md5_data_source`, `filesize`, `fileformat`, `audio_dataformat`, `video_dataformat`, `audio_bitrate`, `video_bitrate`, `playtime_seconds`, `tags`, `artist`, `title`, `remix`, `album`, `genre`, `comment`, `track`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`, `warning`, `error`, `encoder_options`, `vbr_method`, `track_volume`) VALUES (';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['filenamepath']                  ) ?                          $ThisFileInfo['filenamepath']                    : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['file_modified_time']            ) ?                          $ThisFileInfo['file_modified_time']              : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['md5_file']                      ) ?                          $ThisFileInfo['md5_file']                        : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['md5_data']                      ) ?                          $ThisFileInfo['md5_data']                        : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['md5_data_source']               ) ?                          $ThisFileInfo['md5_data_source']                 : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['filesize']                      ) ?                          $ThisFileInfo['filesize']                        :  0).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['fileformat']                    ) ?                          $ThisFileInfo['fileformat']                      : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['dataformat']           ) ?                          $ThisFileInfo['audio']['dataformat']             : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['video']['dataformat']           ) ?                          $ThisFileInfo['video']['dataformat']             : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['audio']['bitrate']              ) ?                 floatval($ThisFileInfo['audio']['bitrate'])               :  0).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['video']['bitrate']              ) ?                 floatval($ThisFileInfo['video']['bitrate'])               :  0).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['playtime_seconds']              ) ?                 floatval($ThisFileInfo['playtime_seconds'])               :  0).'", ';
-				//$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']                          ) ?            implode("\t", $ThisFileInfo['tags'])                           : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']                          ) ? implode("\t", array_keys($ThisFileInfo['tags']))                          : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['artist']            ) ?            implode("\t", $ThisFileInfo['comments']['artist'])             : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string($this_track_title).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string($this_track_remix).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['album']             ) ?            implode("\t", $ThisFileInfo['comments']['album'])              : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['genre']             ) ?            implode("\t", $ThisFileInfo['comments']['genre'])              : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']['comment']           ) ?            implode("\t", $ThisFileInfo['comments']['comment'])            : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string($this_track_track).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['comments']                      ) ?                serialize($ThisFileInfo['comments'])                       : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v2']                 ) ?                serialize($ThisFileInfo['tags']['id3v2'])                  : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['ape']                   ) ?                serialize($ThisFileInfo['tags']['ape'])                    : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['lyrics3']               ) ?                serialize($ThisFileInfo['tags']['lyrics3'])                : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['tags']['id3v1']                 ) ?                serialize($ThisFileInfo['tags']['id3v1'])                  : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['warning']                       ) ?            implode("\t", $ThisFileInfo['warning'])                        : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['error']                         ) ?            implode("\t", $ThisFileInfo['error'])                          : '').'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(trim((!empty($ThisFileInfo['audio']['encoder']) ? $ThisFileInfo['audio']['encoder'] : '').' '.(!empty($ThisFileInfo['audio']['encoder_options']) ? $ThisFileInfo['audio']['encoder_options'] : ''))).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['mpeg']['audio']['LAME']) ? 'LAME' : (!empty($ThisFileInfo['mpeg']['audio']['VBR_method']) ? $ThisFileInfo['mpeg']['audio']['VBR_method'] : '')).'", ';
-				$SQLquery .= '"'.mysql_real_escape_string(!empty($ThisFileInfo['replay_gain']['track']['volume']) ?                 floatval($ThisFileInfo['replay_gain']['track']['volume']) :  0).'")';
-
-			}
-			flush();
-			mysql_query_safe($SQLquery);
-		}
-
-	}
-
-	$SQLquery = 'OPTIMIZE TABLE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	mysql_query_safe($SQLquery);
-
-	echo '<hr>Done scanning!<hr>';
-
-} elseif (!empty($_REQUEST['missingtrackvolume'])) {
-
-	$MissingTrackVolumeFilesScanned  = 0;
-	$MissingTrackVolumeFilesAdjusted = 0;
-	$MissingTrackVolumeFilesDeleted  = 0;
-	$SQLquery  = 'SELECT `filename`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`track_volume` = 0)';
-	$SQLquery .= ' AND (`audio_bitrate` > 0)';
-	$result = mysql_query_safe($SQLquery);
-	echo 'Scanning <span ID="missingtrackvolumeNowScanning">0</span> / '.number_format(mysql_num_rows($result)).' files for track volume information:<hr>';
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(30);
-		echo '<script type="text/javascript">if (document.getElementById("missingtrackvolumeNowScanning")) document.getElementById("missingtrackvolumeNowScanning").innerHTML = "'.number_format($MissingTrackVolumeFilesScanned++).'";</script>. ';
-		flush();
-		if (file_exists($row['filename'])) {
-
-			$ThisFileInfo = $getID3->analyze($row['filename']);
-			if (!empty($ThisFileInfo['replay_gain']['track']['volume'])) {
-				$MissingTrackVolumeFilesAdjusted++;
-				$SQLquery  = 'UPDATE `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-				$SQLquery .= ' SET `track_volume` = "'.$ThisFileInfo['replay_gain']['track']['volume'].'"';
-				$SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")';
-				mysql_query_safe($SQLquery);
-			}
-
-		} else {
-
-			$MissingTrackVolumeFilesDeleted++;
-			$SQLquery  = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")';
-			mysql_query_safe($SQLquery);
-
-		}
-	}
-	echo '<hr>Scanned '.number_format($MissingTrackVolumeFilesScanned).' files with no track volume information.<br>';
-	echo 'Found track volume information for '.number_format($MissingTrackVolumeFilesAdjusted).' of them (could not find info for '.number_format($MissingTrackVolumeFilesScanned - $MissingTrackVolumeFilesAdjusted).' files; deleted '.number_format($MissingTrackVolumeFilesDeleted).' records of missing files)<hr>';
-
-} elseif (!empty($_REQUEST['deadfilescheck'])) {
-
-	$SQLquery  = 'SELECT COUNT(*) AS `num`, `filename`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' GROUP BY `filename`';
-	$SQLquery .= ' ORDER BY `num` DESC';
-	$result = mysql_query_safe($SQLquery);
-	$DupesDeleted = 0;
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(30);
-		if ($row['num'] <= 1) {
-			break;
-		}
-		echo '<br>'.htmlentities($row['filename']).' (<font color="#FF9999">duplicate</font>)';
-		$SQLquery  = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE `filename` LIKE "'.mysql_real_escape_string($row['filename']).'"';
-		mysql_query_safe($SQLquery);
-		$DupesDeleted++;
-	}
-	if ($DupesDeleted > 0) {
-		echo '<hr>Deleted <b>'.number_format($DupesDeleted).'</b> duplicate filenames<hr>';
-	}
-
-	$SQLquery  = 'SELECT `filename`, `filesize`, `last_modified`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	$totalchecked = 0;
-	$totalremoved = 0;
-	$previousdir = '';
-	while ($row = mysql_fetch_array($result)) {
-		$totalchecked++;
-		set_time_limit(30);
-		$reason = '';
-		if (!file_exists($row['filename'])) {
-			$reason = 'deleted';
-		} elseif (filesize($row['filename']) != $row['filesize']) {
-			$reason = 'filesize changed';
-		} elseif (filemtime($row['filename']) != $row['last_modified']) {
-			if (abs(filemtime($row['filename']) - $row['last_modified']) != 3600) {
-				// off by exactly one hour == daylight savings time
-				$reason = 'last-modified time changed';
-			}
-		}
-
-		$thisdir = dirname($row['filename']);
-		if ($reason) {
-
-			$totalremoved++;
-			echo '<br>'.htmlentities($row['filename']).' (<font color="#FF9999">'.$reason.'</font>)';
-			flush();
-			$SQLquery  = 'DELETE FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`filename` = "'.mysql_real_escape_string($row['filename']).'")';
-			mysql_query_safe($SQLquery);
-
-		} elseif ($thisdir != $previousdir) {
-
-			echo '. ';
-			flush();
-
-		}
-		$previousdir = $thisdir;
-	}
-
-	echo '<hr><b>'.number_format($totalremoved).' of '.number_format($totalchecked).' files in database no longer exist, or have been altered since last scan. Removed from database.</b><hr>';
-
-} elseif (!empty($_REQUEST['encodedbydistribution'])) {
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-
-		$SQLquery  = 'SELECT `filename`, `comments_id3v2`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`encoder_options` = "'.mysql_real_escape_string($_REQUEST['encodedbydistribution']).'")';
-		$result = mysql_query_safe($SQLquery);
-		$NonBlankEncodedBy = '';
-		$BlankEncodedBy = '';
-		while ($row = mysql_fetch_array($result)) {
-			set_time_limit(30);
-			$CommentArray = unserialize($row['comments_id3v2']);
-			if (isset($CommentArray['encoded_by'][0])) {
-				$NonBlankEncodedBy .= WindowsShareSlashTranslate($row['filename'])."\n";
-			} else {
-				$BlankEncodedBy    .= WindowsShareSlashTranslate($row['filename'])."\n";
-			}
-		}
-		echo $NonBlankEncodedBy;
-		echo $BlankEncodedBy;
-		exit;
-
-	} elseif (!empty($_REQUEST['showfiles'])) {
-
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?encodedbydistribution='.urlencode('%')).'">show all</a><br>';
-		echo '<table border="1">';
-
-		$SQLquery  = 'SELECT `filename`, `comments_id3v2`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$result = mysql_query_safe($SQLquery);
-		while ($row = mysql_fetch_array($result)) {
-			set_time_limit(30);
-			$CommentArray = unserialize($row['comments_id3v2']);
-			if (($_REQUEST['encodedbydistribution'] == '%') || (!empty($CommentArray['encoded_by'][0]) && ($_REQUEST['encodedbydistribution'] == $CommentArray['encoded_by'][0]))) {
-				echo '<tr><td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename'])).'">m3u</a></td>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td></tr>';
-			}
-		}
-		echo '</table>';
-
-	} else {
-
-		$SQLquery  = 'SELECT `encoder_options`, `comments_id3v2`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' ORDER BY (`encoder_options` LIKE "LAME%") DESC, (`encoder_options` LIKE "CBR%") DESC';
-		$result = mysql_query_safe($SQLquery);
-		$EncodedBy = array();
-		while ($row = mysql_fetch_array($result)) {
-			set_time_limit(30);
-			$CommentArray = unserialize($row['comments_id3v2']);
-			if (isset($CommentArray['encoded_by'][0])) {
-				if (isset($EncodedBy[$row['encoder_options']][$CommentArray['encoded_by'][0]])) {
-					$EncodedBy[$row['encoder_options']][$CommentArray['encoded_by'][0]]++;
-				} else {
-					$EncodedBy[$row['encoder_options']][$CommentArray['encoded_by'][0]] = 1;
-				}
-			}
-		}
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?encodedbydistribution='.urlencode('%').'&m3u=1').'">.m3u version</a><br>';
-		echo '<table border="1"><tr><th>m3u</th><th>Encoder Options</th><th>Encoded By (ID3v2)</th></tr>';
-		foreach ($EncodedBy as $key => $value) {
-			echo '<tr><TD VALIGN="TOP"><a href="'.htmlentities($_SERVER['PHP_SELF'].'?encodedbydistribution='.urlencode($key).'&showfiles=1&m3u=1').'">m3u</a></td>';
-			echo '<TD VALIGN="TOP"><b>'.$key.'</b></td>';
-			echo '<td><table border="0" WIDTH="100%">';
-			arsort($value);
-			foreach ($value as $string => $count) {
-				echo '<tr><TD ALIGN="RIGHT" WIDTH="50"><i>'.number_format($count).'</i></td><td>&nbsp;</td>';
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?encodedbydistribution='.urlencode($string).'&showfiles=1').'">'.$string.'</a></td></tr>';
-			}
-			echo '</table></td></tr>';
-		}
-		echo '</table>';
-
-	}
-
-} elseif (!empty($_REQUEST['audiobitrates'])) {
-
-	getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-	$BitrateDistribution = array();
-	$SQLquery  = 'SELECT ROUND(audio_bitrate / 1000) AS `RoundBitrate`, COUNT(*) AS `num`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`audio_bitrate` > 0)';
-	$SQLquery .= ' GROUP BY `RoundBitrate`';
-	$result = mysql_query_safe($SQLquery);
-	while ($row = mysql_fetch_array($result)) {
-		$this_bitrate = getid3_mp3::ClosestStandardMP3Bitrate($row['RoundBitrate'] * 1000);
-		if (isset($BitrateDistribution[$this_bitrate])) {
-			$BitrateDistribution[$this_bitrate] += $row['num'];
-		} else {
-			$BitrateDistribution[$this_bitrate]  = $row['num'];
-		}
-	}
-
-	echo '<table border="1" cellspacing="0" cellpadding="3">';
-	echo '<tr><th>Bitrate</th><th>Count</th></tr>';
-	foreach ($BitrateDistribution as $Bitrate => $Count) {
-		echo '<tr>';
-		echo '<td align="right">'.round($Bitrate / 1000).' kbps</td>';
-		echo '<td align="right">'.number_format($Count).'</td>';
-		echo '</tr>';
-	}
-	echo '</table>';
-
-
-} elseif (!empty($_REQUEST['emptygenres'])) {
-
-	$SQLquery  = 'SELECT `fileformat`, `filename`, `genre`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`genre` = "")';
-	$SQLquery .= ' OR (`genre` = "Unknown")';
-	$SQLquery .= ' OR (`genre` = "Other")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			if (!in_array($row['fileformat'], $IgnoreNoTagFormats)) {
-				echo WindowsShareSlashTranslate($row['filename'])."\n";
-			}
-		}
-		exit;
-
-	} else {
-
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?emptygenres='.urlencode($_REQUEST['emptygenres']).'&m3u=1').'">.m3u version</a><br>';
-		$EmptyGenreCounter = 0;
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>m3u</th><th>filename</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			if (!in_array($row['fileformat'], $IgnoreNoTagFormats)) {
-				$EmptyGenreCounter++;
-				echo '<tr>';
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">m3u</a></td>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-				echo '</tr>';
-			}
-		}
-		echo '</table>';
-		echo '<b>'.number_format($EmptyGenreCounter).'</b> files with empty genres';
-
-	}
-
-} elseif (!empty($_REQUEST['nonemptycomments'])) {
-
-	$SQLquery  = 'SELECT `filename`, `comment`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`comment` <> "")';
-	$SQLquery .= ' ORDER BY `comment` ASC';
-	$result = mysql_query_safe($SQLquery);
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	} else {
-
-		$NonEmptyCommentsCounter = 0;
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?nonemptycomments='.urlencode($_REQUEST['nonemptycomments']).'&m3u=1').'">.m3u version</a><br>';
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>m3u</th><th>filename</th><th>comments</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			$NonEmptyCommentsCounter++;
-			echo '<tr>';
-			echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">m3u</a></td>';
-			echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-			if (strlen(trim($row['comment'])) > 0) {
-				echo '<td>'.htmlentities($row['comment']).'</td>';
-			} else {
-				echo '<td><i>space</i></td>';
-			}
-			echo '</tr>';
-		}
-		echo '</table>';
-		echo '<b>'.number_format($NonEmptyCommentsCounter).'</b> files with non-empty comments';
-
-	}
-
-} elseif (!empty($_REQUEST['trackzero'])) {
-
-	$SQLquery  = 'SELECT `filename`, `track`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`track` <> "")';
-	$SQLquery .= ' AND ((`track` < "1")';
-	$SQLquery .= ' OR (`track` > "99"))';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			if ((strlen($row['track']) > 0) && ($row['track'] < 1) || ($row['track'] > 99)) {
-				echo WindowsShareSlashTranslate($row['filename'])."\n";
-			}
-		}
-		exit;
-
-	} else {
-
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?trackzero='.urlencode($_REQUEST['trackzero']).'&m3u=1').'">.m3u version</a><br>';
-		$TrackZeroCounter = 0;
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>m3u</th><th>filename</th><th>track</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			if ((strlen($row['track']) > 0) && ($row['track'] < 1) || ($row['track'] > 99)) {
-				$TrackZeroCounter++;
-				echo '<tr>';
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">m3u</a></td>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-				echo '<td>'.htmlentities($row['track']).'</td>';
-				echo '</tr>';
-			}
-		}
-		echo '</table>';
-		echo '<b>'.number_format($TrackZeroCounter).'</b> files with track "zero"';
-
-	}
-
-
-} elseif (!empty($_REQUEST['titlefeat'])) {
-
-	$SQLquery  = 'SELECT `filename`, `title`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`title` LIKE "%feat.%")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	} else {
-
-		echo '<b>'.number_format(mysql_num_rows($result)).'</b> files with "feat." in the title (instead of the artist)<br><br>';
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?titlefeat='.urlencode($_REQUEST['titlefeat']).'&m3u=1').'">.m3u version</a><br>';
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>m3u</th><th>filename</th><th>title</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr>';
-			echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">m3u</a></td>';
-			echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-			echo '<td>'.preg_replace('#(feat\. .*)#i', '<b>\\1</b>', htmlentities($row['title'])).'</td>';
-			echo '</tr>';
-		}
-		echo '</table>';
-
-	}
-
-
-} elseif (!empty($_REQUEST['tracknoalbum'])) {
-
-	$SQLquery  = 'SELECT `filename`, `track`, `album`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`track` <> "")';
-	$SQLquery .= ' AND (`album` = "")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	} else {
-
-		echo '<b>'.number_format(mysql_num_rows($result)).'</b> files with a track number, but no album<br><br>';
-		echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?tracknoalbum='.urlencode($_REQUEST['tracknoalbum']).'&m3u=1').'">.m3u version</a><br>';
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>m3u</th><th>filename</th><th>track</th><th>album</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr>';
-			echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">m3u</a></td>';
-			echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-			echo '<td>'.htmlentities($row['track']).'</td>';
-			echo '<td>'.htmlentities($row['album']).'</td>';
-			echo '</tr>';
-		}
-		echo '</table>';
-
-	}
-
-
-} elseif (!empty($_REQUEST['synchronizetagsfrom']) && !empty($_REQUEST['filename'])) {
-
-	echo 'Applying new tags from <b>'.$_REQUEST['synchronizetagsfrom'].'</b> in <b>'.htmlentities($_REQUEST['filename']).'</b><ul>';
-	$errors = array();
-	if (SynchronizeAllTags($_REQUEST['filename'], $_REQUEST['synchronizetagsfrom'], 'A12', $errors)) {
-		echo '<li>Sucessfully wrote tags</li>';
-	} else {
-		echo '<li>Tag writing had errors: <ul><li>'.implode('</li><li>', $errors).'</li></ul></li>';
-	}
-	echo '</ul>';
-
-
-} elseif (!empty($_REQUEST['unsynchronizedtags'])) {
-
-	$NotOKfiles        = 0;
-	$Autofixedfiles    = 0;
-	$FieldsToCompare   = array('title', 'artist', 'album', 'year', 'genre', 'comment', 'track');
-	$TagsToCompare     = array('id3v2'=>false, 'ape'=>false, 'lyrics3'=>false, 'id3v1'=>false);
-	$ID3v1FieldLengths = array('title'=>30, 'artist'=>30, 'album'=>30, 'year'=>4, 'genre'=>99, 'comment'=>28);
-	if (strpos($_REQUEST['unsynchronizedtags'], '2') !== false) {
-		$TagsToCompare['id3v2'] = true;
-	}
-	if (strpos($_REQUEST['unsynchronizedtags'], 'A') !== false) {
-		$TagsToCompare['ape'] = true;
-	}
-	if (strpos($_REQUEST['unsynchronizedtags'], 'L') !== false) {
-		$TagsToCompare['lyrics3'] = true;
-	}
-	if (strpos($_REQUEST['unsynchronizedtags'], '1') !== false) {
-		$TagsToCompare['id3v1'] = true;
-	}
-
-	echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?unsynchronizedtags='.urlencode($_REQUEST['unsynchronizedtags']).'&autofix=1').'">Auto-fix empty tags</a><br><br>';
-	echo '<div id="Autofixing"></div>';
-	echo '<table border="1" cellspacing="0" cellpadding="3">';
-	echo '<tr>';
-	echo '<th>View</th>';
-	echo '<th>Filename</th>';
-	echo '<th>Combined</th>';
-	if ($TagsToCompare['id3v2']) {
-		echo '<th><a href="'.htmlentities($_SERVER['PHP_SELF'].'?unsynchronizedtags='.urlencode($_REQUEST['unsynchronizedtags']).'&autofix=1&autofixforcesource=id3v2&autofixforcedest=A1').'" title="Auto-fix all tags to match ID3v2 contents" onClick="return confirm(\'Are you SURE you want to synchronize all tags to match ID3v2?\');">ID3v2</a></th>';
-	}
-	if ($TagsToCompare['ape']) {
-		echo '<th><a href="'.htmlentities($_SERVER['PHP_SELF'].'?unsynchronizedtags='.urlencode($_REQUEST['unsynchronizedtags']).'&autofix=1&autofixforcesource=ape&autofixforcedest=21').'" title="Auto-fix all tags to match APE contents" onClick="return confirm(\'Are you SURE you want to synchronize all tags to match APE?\');">APE</a></th>';
-	}
-	if ($TagsToCompare['lyrics3']) {
-		echo '<th>Lyrics3</th>';
-	}
-	if ($TagsToCompare['id3v1']) {
-		echo '<th><a href="'.htmlentities($_SERVER['PHP_SELF'].'?unsynchronizedtags='.urlencode($_REQUEST['unsynchronizedtags']).'&autofix=1&autofixforcesource=ape&autofixforcedest=2A').'" title="Auto-fix all tags to match ID3v1 contents" onClick="return confirm(\'Are you SURE you want to synchronize all tags to match ID3v1?\');">ID3v1</a></th>';
-	}
-	echo '</tr>';
-
-	$SQLquery  = 'SELECT `filename`, `comments_all`, `comments_id3v2`, `comments_ape`, `comments_lyrics3`, `comments_id3v1`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`fileformat` = "mp3")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	$lastdir = '';
-	$serializedCommentsFields = array('all', 'id3v2', 'ape', 'lyrics3', 'id3v1');
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(30);
-		if ($lastdir != dirname($row['filename'])) {
-			echo '<script type="text/javascript">if (document.getElementById("Autofixing")) document.getElementById("Autofixing").innerHTML = "'.htmlentities($lastdir, ENT_QUOTES).'";</script>';
-			flush();
-		}
-
-		$FileOK      = true;
-		$Mismatched  = array('id3v2'=>false, 'ape'=>false, 'lyrics3'=>false, 'id3v1'=>false);
-		$SemiMatched = array('id3v2'=>false, 'ape'=>false, 'lyrics3'=>false, 'id3v1'=>false);
-		$EmptyTags   = array('id3v2'=>true,  'ape'=>true,  'lyrics3'=>true,  'id3v1'=>true);
-
-		foreach ($serializedCommentsFields as $field) {
-			$Comments[$field] = array();
-			ob_start();
-			if ($unserialized = unserialize($row['comments_'.$field])) {
-				$Comments[$field] = $unserialized;
-			}
-			$errormessage = ob_get_contents();
-			ob_end_clean();
-		}
-
-		if (isset($Comments['ape']['tracknumber'])) {
-			$Comments['ape']['track'] = $Comments['ape']['tracknumber'];
-			unset($Comments['ape']['tracknumber']);
-		}
-		if (isset($Comments['ape']['track_number'])) {
-			$Comments['ape']['track'] = $Comments['ape']['track_number'];
-			unset($Comments['ape']['track_number']);
-		}
-		if (isset($Comments['id3v2']['track_number'])) {
-			$Comments['id3v2']['track'] = $Comments['id3v2']['track_number'];
-			unset($Comments['id3v2']['track_number']);
-		}
-		if (!empty($Comments['all']['track'])) {
-			$besttrack = '';
-			foreach ($Comments['all']['track'] as $key => $value) {
-				if (strlen($value) > strlen($besttrack)) {
-					$besttrack = $value;
-				}
-			}
-			$Comments['all']['track'] = array(0=>$besttrack);
-		}
-
-		$ThisLine  = '<tr>';
-		$ThisLine .= '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">view</a></td>';
-		$ThisLine .= '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-		$tagvalues = '';
-		foreach ($FieldsToCompare as $fieldname) {
-			$tagvalues .= $fieldname.' = '.(!empty($Comments['all'][$fieldname]) ? implode(" \n", $Comments['all'][$fieldname]) : '')." \n";
-		}
-		$ThisLine .= '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?synchronizetagsfrom=all&filename='.urlencode($row['filename'])).'" title="'.htmlentities(rtrim($tagvalues, "\n"), ENT_QUOTES).'" target="retagwindow">all</a></td>';
-		foreach ($TagsToCompare as $tagtype => $CompareThisTagType) {
-			if ($CompareThisTagType) {
-				$tagvalues = '';
-				foreach ($FieldsToCompare as $fieldname) {
-
-					if ($tagtype == 'id3v1') {
-
-						getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
-						if (($fieldname == 'genre') && !empty($Comments['all'][$fieldname][0]) && !getid3_id3v1::LookupGenreID($Comments['all'][$fieldname][0])) {
-
-							// non-standard genres can never match, so just ignore
-							$tagvalues .= $fieldname.' = '.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '')."\n";
-
-						} elseif ($fieldname == 'comment') {
-
-							if (isset($Comments[$tagtype][$fieldname][0]) && isset($Comments['all'][$fieldname][0]) && (rtrim(substr($Comments[$tagtype][$fieldname][0], 0, 28)) != rtrim(substr($Comments['all'][$fieldname][0], 0, 28)))) {
-								$tagvalues .= $fieldname.' = [['.$Comments[$tagtype][$fieldname][0].']]'."\n";
-								if (trim(strtolower(RemoveAccents(substr($Comments[$tagtype][$fieldname][0], 0, 28)))) == trim(strtolower(RemoveAccents(substr($Comments['all'][$fieldname][0], 0, 28))))) {
-									$SemiMatched[$tagtype] = true;
-								} else {
-									$Mismatched[$tagtype]  = true;
-								}
-								$FileOK = false;
-							} else {
-								$tagvalues .= $fieldname.' = '.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '')."\n";
-							}
-
-						} elseif ($fieldname == 'track') {
-
-							// intval('01/20') == intval('1')
-							$trackA = (isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '');
-							$trackB = (isset($Comments['all'][$fieldname][0])    ? $Comments['all'][$fieldname][0]    : '');
-							if (intval($trackA) != intval($trackB)) {
-								$tagvalues .= $fieldname.' = [['.$trackA.']]'."\n";
-								$Mismatched[$tagtype]  = true;
-								$FileOK = false;
-							} else {
-								$tagvalues .= $fieldname.' = '.$trackA."\n";
-							}
-
-						} elseif ((isset($Comments[$tagtype][$fieldname][0]) ? rtrim(substr($Comments[$tagtype][$fieldname][0], 0, 30)) : '') != (isset($Comments['all'][$fieldname][0]) ? rtrim(substr($Comments['all'][$fieldname][0], 0, 30)) : '')) {
-
-							$tagvalues .= $fieldname.' = [['.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '').']]'."\n";
-							if (strtolower(RemoveAccents(trim(substr((isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : ''), 0, 30)))) == strtolower(RemoveAccents(trim(substr((isset($Comments['all'][$fieldname][0]) ? $Comments['all'][$fieldname][0] : ''), 0, 30))))) {
-								$SemiMatched[$tagtype] = true;
-							} else {
-								$Mismatched[$tagtype]  = true;
-							}
-							$FileOK = false;
-							if (!empty($Comments[$tagtype][$fieldname][0]) && (strlen(trim($Comments[$tagtype][$fieldname][0])) > 0)) {
-								$EmptyTags[$tagtype] = false;
-							}
-
-						} else {
-
-							$tagvalues .= $fieldname.' = '.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '')."\n";
-							if (isset($Comments[$tagtype][$fieldname][0]) && (strlen(trim($Comments[$tagtype][$fieldname][0])) > 0)) {
-								$EmptyTags[$tagtype] = false;
-							}
-
-						}
-
-					} elseif (($tagtype == 'ape') && ($fieldname == 'year')) {
-
-						if (((isset($Comments['ape']['date'][0]) ? $Comments['ape']['date'][0] : '') != (isset($Comments['all']['year'][0]) ? $Comments['all']['year'][0] : '')) && ((isset($Comments['ape']['year'][0]) ? $Comments['ape']['year'][0] : '') != (isset($Comments['all']['year'][0]) ? $Comments['all']['year'][0] : ''))) {
-
-							$tagvalues .= $fieldname.' = [['.(isset($Comments['ape']['date'][0]) ? $Comments['ape']['date'][0] : '').']]'."\n";
-							$Mismatched[$tagtype]  = true;
-							$FileOK = false;
-							if (isset($Comments['ape']['date'][0]) && (strlen(trim($Comments['ape']['date'][0])) > 0)) {
-								$EmptyTags[$tagtype] = false;
-							}
-
-						} else {
-
-							$tagvalues .= $fieldname.' = '.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '')."\n";
-							if (isset($Comments[$tagtype][$fieldname][0]) && (strlen(trim($Comments[$tagtype][$fieldname][0])) > 0)) {
-								$EmptyTags[$tagtype] = false;
-							}
-
-						}
-
-					} elseif (($fieldname == 'genre') && !empty($Comments['all'][$fieldname]) && !empty($Comments[$tagtype][$fieldname]) && in_array($Comments[$tagtype][$fieldname][0], $Comments['all'][$fieldname])) {
-
-						$tagvalues .= $fieldname.' = '.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '')."\n";
-						if (isset($Comments[$tagtype][$fieldname][0]) && (strlen(trim($Comments[$tagtype][$fieldname][0])) > 0)) {
-							$EmptyTags[$tagtype] = false;
-						}
-
-					} elseif ((isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '') != (isset($Comments['all'][$fieldname][0]) ? $Comments['all'][$fieldname][0] : '')) {
-
-						$skiptracknumberfield = false;
-						switch ($fieldname) {
-							case 'track':
-							case 'tracknumber':
-							case 'track_number':
-								$trackA = (isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '');
-								$trackB = (isset($Comments['all'][$fieldname][0])    ? $Comments['all'][$fieldname][0]    : '');
-								if (intval($trackA) == intval($trackB)) {
-									$skiptracknumberfield = true;
-								}
-								break;
-						}
-						if (!$skiptracknumberfield) {
-							$tagvalues .= $fieldname.' = [['.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '').']]'."\n";
-							$tagA = (isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '');
-							$tagB = (isset($Comments['all'][$fieldname][0])    ? $Comments['all'][$fieldname][0]    : '');
-							if (trim(strtolower(RemoveAccents($tagA))) == trim(strtolower(RemoveAccents($tagB)))) {
-								$SemiMatched[$tagtype] = true;
-							} else {
-								$Mismatched[$tagtype]  = true;
-							}
-							$FileOK = false;
-							if (isset($Comments[$tagtype][$fieldname][0]) && (strlen(trim($Comments[$tagtype][$fieldname][0])) > 0)) {
-								$EmptyTags[$tagtype] = false;
-							}
-						}
-
-					} else {
-
-						$tagvalues .= $fieldname.' = '.(isset($Comments[$tagtype][$fieldname][0]) ? $Comments[$tagtype][$fieldname][0] : '')."\n";
-						if (isset($Comments[$tagtype][$fieldname][0]) && (strlen(trim($Comments[$tagtype][$fieldname][0])) > 0)) {
-							$EmptyTags[$tagtype] = false;
-						}
-
-					}
-				}
-
-				if ($EmptyTags[$tagtype]) {
-					$FileOK = false;
-					$ThisLine .= '<td bgcolor="#0099cc">';
-				} elseif ($SemiMatched[$tagtype]) {
-					$ThisLine .= '<td bgcolor="#ff9999">';
-				} elseif ($Mismatched[$tagtype]) {
-					$ThisLine .= '<td bgcolor="#ff0000">';
-				} else {
-					$ThisLine .= '<td bgcolor="#00cc00">';
-				}
-				$ThisLine .= '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?synchronizetagsfrom='.$tagtype.'&filename='.urlencode($row['filename'])).'" title="'.htmlentities(rtrim($tagvalues, "\n"), ENT_QUOTES).'" TARGET="retagwindow">'.$tagtype.'</a>';
-				$ThisLine .= '</td>';
-			}
-		}
-		$ThisLine .= '</tr>';
-
-		if (!$FileOK) {
-			$NotOKfiles++;
-
-			echo '<script type="text/javascript">if (document.getElementById("Autofixing")) document.getElementById("Autofixing").innerHTML = "'.htmlentities($row['filename'], ENT_QUOTES).'";</script>';
-			flush();
-
-			if (!empty($_REQUEST['autofix'])) {
-
-				$AnyMismatched = false;
-				foreach ($Mismatched as $key => $value) {
-					if ($value && ($EmptyTags["$key"] === false)) {
-						$AnyMismatched = true;
-					}
-				}
-				if ($AnyMismatched && empty($_REQUEST['autofixforcesource'])) {
-
-					echo $ThisLine;
-
-				} else {
-
-					$TagsToSynch = '';
-					foreach ($EmptyTags as $key => $value) {
-						if ($value) {
-							switch ($key) {
-								case 'id3v1':
-									$TagsToSynch .= '1';
-									break;
-								case 'id3v2':
-									$TagsToSynch .= '2';
-									break;
-								case 'ape':
-									$TagsToSynch .= 'A';
-									break;
-							}
-						}
-					}
-
-					$autofixforcesource = (!empty($_REQUEST['autofixforcesource']) ? $_REQUEST['autofixforcesource'] : 'all');
-					$TagsToSynch        = (!empty($_REQUEST['autofixforcedest'])   ? $_REQUEST['autofixforcedest']   : $TagsToSynch);
-
-					$errors = array();
-					if (SynchronizeAllTags($row['filename'], $autofixforcesource, $TagsToSynch, $errors)) {
-						$Autofixedfiles++;
-						echo '<tr bgcolor="#00CC00">';
-					} else {
-						echo '<tr bgcolor="#FF0000">';
-					}
-					echo '<td>&nbsp;</th>';
-					echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename'])).'" title="'.htmlentities(implode("\n", $errors), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-					echo '<td><table border="0">';
-					echo '<tr><td><b>'.$TagsToSynch.'</b></td></tr>';
-					echo '</table></td></tr>';
-				}
-
-			} else {
-
-				echo $ThisLine;
-
-			}
-		}
-	}
-
-	echo '</table><br>';
-	echo '<script type="text/javascript">if (document.getElementById("Autofixing")) document.getElementById("Autofixing").innerHTML = "";</script>';
-	echo 'Found <b>'.number_format($NotOKfiles).'</b> files with unsynchronized tags, and auto-fixed '.number_format($Autofixedfiles).' of them.';
-
-} elseif (!empty($_REQUEST['filenamepattern'])) {
-
-	$patterns['A'] = 'artist';
-	$patterns['T'] = 'title';
-	$patterns['M'] = 'album';
-	$patterns['N'] = 'track';
-	$patterns['G'] = 'genre';
-	$patterns['R'] = 'remix';
-
-	$FieldsToUse = explode(' ', wordwrap(preg_replace('#[^A-Z]#i', '', $_REQUEST['filenamepattern']), 1, ' ', 1));
-	//$FieldsToUse = explode(' ', wordwrap($_REQUEST['filenamepattern'], 1, ' ', 1));
-	foreach ($FieldsToUse as $FieldID) {
-		$FieldNames[] = $patterns["$FieldID"];
-	}
-
-	$SQLquery  = 'SELECT `filename`, `fileformat`, '.implode(', ', $FieldNames);
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	echo 'Files that do not match naming pattern: (<a href="'.htmlentities($_SERVER['PHP_SELF'].'?filenamepattern='.urlencode($_REQUEST['filenamepattern']).'&autofix=1').'">auto-fix</a>)<br>';
-	echo '<table border="1" cellspacing="0" cellpadding="3">';
-	echo '<tr><th>view</th><th>Why</th><td><b>Actual filename</b><br>(click to play/edit file)</td><td><b>Correct filename (based on tags)</b>'.(empty($_REQUEST['autofix']) ? '<br>(click to rename file to this)' : '').'</td></tr>';
-	$nonmatchingfilenames = 0;
-	$Pattern = $_REQUEST['filenamepattern'];
-	$PatternLength = strlen($Pattern);
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(10);
-		$PatternFilename = '';
-		for ($i = 0; $i < $PatternLength; $i++) {
-			if (isset($patterns[$Pattern{$i}])) {
-				$PatternFilename .= trim(strtr($row[$patterns[$Pattern{$i}]], ':\\*<>|', ';-¤«»¦'), ' ');
-			} else {
-				$PatternFilename .= $Pattern{$i};
-			}
-		}
-
-		// Replace "~" with "-" if characters immediately before and after are both numbers,
-		// "/" has been replaced with "~" above which is good for multi-song medley dividers,
-		// but for things like 24/7, 7/8ths, etc it looks better if it's 24-7, 7-8ths, etc.
-		$PatternFilename = preg_replace('#([ a-z]+)/([ a-z]+)#i', '\\1~\\2', $PatternFilename);
-		$PatternFilename = str_replace('/',  '×',  $PatternFilename);
-
-		$PatternFilename = str_replace('?',  '¿',  $PatternFilename);
-		$PatternFilename = str_replace(' "', ' “', $PatternFilename);
-		$PatternFilename = str_replace('("', '(“', $PatternFilename);
-		$PatternFilename = str_replace('-"', '-“', $PatternFilename);
-		$PatternFilename = str_replace('" ', '” ', $PatternFilename.' ');
-		$PatternFilename = str_replace('"',  '”',  $PatternFilename);
-		$PatternFilename = str_replace('  ', ' ',  $PatternFilename);
-
-
-		$ParenthesesPairs = array('()', '[]', '{}');
-		foreach ($ParenthesesPairs as $pair) {
-
-			// multiple remixes are stored tab-seperated in the database.
-			// change "{2000 Version\tSomebody Remix}" into "{2000 Version} {Somebody Remix}"
-			while (preg_match('#^(.*)'.preg_quote($pair{0}).'([^'.preg_quote($pair{1}).']*)('."\t".')([^'.preg_quote($pair{0}).']*)'.preg_quote($pair{1}).'#', $PatternFilename, $matches)) {
-				$PatternFilename = $matches[1].$pair{0}.$matches[2].$pair{1}.' '.$pair{0}.$matches[4].$pair{1};
-			}
-
-			// remove empty parenthesized pairs (probably where no track numbers, remix version, etc)
-			$PatternFilename = preg_replace('#'.preg_quote($pair).'#', '', $PatternFilename);
-
-			// "[01]  - Title With No Artist.mp3"  ==>  "[01] Title With No Artist.mp3"
-			$PatternFilename = preg_replace('#'.preg_quote($pair{1}).' +\- #', $pair{1}.' ', $PatternFilename);
-
-		}
-
-		// get rid of leading & trailing spaces if end items (artist or title for example) are missing
-		$PatternFilename  = trim($PatternFilename, ' -');
-
-		if (!$PatternFilename) {
-			// no tags to create a filename from -- skip this file
-			continue;
-		}
-		$PatternFilename .= '.'.$row['fileformat'];
-
-		$ActualFilename = basename($row['filename']);
-		if ($ActualFilename != $PatternFilename) {
-
-			$NotMatchedReasons = '';
-			if (strtolower($ActualFilename) === strtolower($PatternFilename)) {
-				$NotMatchedReasons .= 'Aa ';
-			} elseif (RemoveAccents($ActualFilename) === RemoveAccents($PatternFilename)) {
-				$NotMatchedReasons .= 'ée ';
-			}
-
-
-			$actualExt  = '.'.fileextension($ActualFilename);
-			$patternExt = '.'.fileextension($PatternFilename);
-			$ActualFilenameNoExt  = (($actualExt  != '.') ? substr($ActualFilename,   0, 0 - strlen($actualExt))  : $ActualFilename);
-			$PatternFilenameNoExt = (($patternExt != '.') ? substr($PatternFilename,  0, 0 - strlen($patternExt)) : $PatternFilename);
-
-			if (strpos($PatternFilenameNoExt, $ActualFilenameNoExt) !== false) {
-				$DifferenceBoldedName  = str_replace($ActualFilenameNoExt, '</b>'.$ActualFilenameNoExt.'<b>', $PatternFilenameNoExt);
-			} else {
-				$ShortestNameLength = min(strlen($ActualFilenameNoExt), strlen($PatternFilenameNoExt));
-				for ($DifferenceOffset = 0; $DifferenceOffset < $ShortestNameLength; $DifferenceOffset++) {
-					if ($ActualFilenameNoExt{$DifferenceOffset} !== $PatternFilenameNoExt{$DifferenceOffset}) {
-						break;
-					}
-				}
-				$DifferenceBoldedName  = '</b>'.substr($PatternFilenameNoExt, 0, $DifferenceOffset).'<b>'.substr($PatternFilenameNoExt, $DifferenceOffset);
-			}
-			$DifferenceBoldedName .= (($actualExt == $patternExt) ? '</b>'.$patternExt.'<b>' : $patternExt);
-
-
-			echo '<tr>';
-			echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename'])).'">view</a></td>';
-			echo '<td>&nbsp;'.$NotMatchedReasons.'</td>';
-			echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($ActualFilename).'</a></td>';
-
-			if (!empty($_REQUEST['autofix'])) {
-
-				$results = '';
-				if (RenameFileFromTo($row['filename'], dirname($row['filename']).'/'.$PatternFilename, $results)) {
-					echo '<TD BGCOLOR="#009900">';
-				} else {
-					echo '<TD BGCOLOR="#FF0000">';
-				}
-				echo '<b>'.$DifferenceBoldedName.'</b></td>';
-
-
-			} else {
-
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?filenamepattern='.urlencode($_REQUEST['filenamepattern']).'&renamefilefrom='.urlencode($row['filename']).'&renamefileto='.urlencode(dirname($row['filename']).'/'.$PatternFilename)).'" title="'.htmlentities(basename($row['filename'])."\n".basename($PatternFilename), ENT_QUOTES).'" target="renamewindow">';
-				echo '<b>'.$DifferenceBoldedName.'</b></a></td>';
-
-			}
-			echo '</tr>';
-
-			$nonmatchingfilenames++;
-		}
-	}
-	echo '</table><br>';
-	echo 'Found '.number_format($nonmatchingfilenames).' files that do not match naming pattern<br>';
-
-
-} elseif (!empty($_REQUEST['encoderoptionsdistribution'])) {
-
-	if (isset($_REQUEST['showtagfiles'])) {
-		$SQLquery  = 'SELECT `filename`, `encoder_options` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`encoder_options` LIKE "'.mysql_real_escape_string($_REQUEST['showtagfiles']).'")';
-		$SQLquery .= ' AND (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-		$SQLquery .= ' ORDER BY `filename` ASC';
-		$result = mysql_query_safe($SQLquery);
-
-		if (!empty($_REQUEST['m3u'])) {
-
-			header('Content-type: audio/x-mpegurl');
-			echo '#EXTM3U'."\n";
-			while ($row = mysql_fetch_array($result)) {
-				echo WindowsShareSlashTranslate($row['filename'])."\n";
-			}
-			exit;
-
-		} else {
-
-			echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?encoderoptionsdistribution=1').'">Show all Encoder Options</a><hr>';
-			echo 'Files with Encoder Options <b>'.$_REQUEST['showtagfiles'].'</b>:<br>';
-			echo '<table border="1" cellspacing="0" cellpadding="3">';
-			while ($row = mysql_fetch_array($result)) {
-				echo '<tr>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-				echo '<td>'.$row['encoder_options'].'</td>';
-				echo '</tr>';
-			}
-			echo '</table>';
-
-		}
-
-	} elseif (!isset($_REQUEST['m3u'])) {
-
-		$SQLquery  = 'SELECT `encoder_options`, COUNT(*) AS `num` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-		$SQLquery .= ' GROUP BY `encoder_options`';
-		$SQLquery .= ' ORDER BY (`encoder_options` LIKE "LAME%") DESC, (`encoder_options` LIKE "CBR%") DESC, `num` DESC, `encoder_options` ASC';
-		$result = mysql_query_safe($SQLquery);
-		echo 'Files with Encoder Options:<br>';
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>Encoder Options</th><th>Count</th><th>M3U</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr>';
-			echo '<td>'.$row['encoder_options'].'</td>';
-			echo '<TD ALIGN="RIGHT"><a href="'.htmlentities($_SERVER['PHP_SELF'].'?encoderoptionsdistribution=1&showtagfiles='.($row['encoder_options'] ? urlencode($row['encoder_options']) : '')).'">'.number_format($row['num']).'</a></td>';
-			echo '<TD ALIGN="RIGHT"><a href="'.htmlentities($_SERVER['PHP_SELF'].'?encoderoptionsdistribution=1&showtagfiles='.($row['encoder_options'] ? urlencode($row['encoder_options']) : '').'&m3u=.m3u').'">m3u</a></td>';
-			echo '</tr>';
-		}
-		echo '</table><hr>';
-
-	}
-
-} elseif (!empty($_REQUEST['tagtypes'])) {
-
-	if (!isset($_REQUEST['m3u'])) {
-		$SQLquery  = 'SELECT `tags`, COUNT(*) AS `num` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-		$SQLquery .= ' GROUP BY `tags`';
-		$SQLquery .= ' ORDER BY `num` DESC';
-		$result = mysql_query_safe($SQLquery);
-		echo 'Files with tags:<br>';
-		echo '<table border="1" cellspacing="0" cellpadding="3">';
-		echo '<tr><th>Tags</th><th>Count</th><th>M3U</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr>';
-			echo '<td>'.$row['tags'].'</td>';
-			echo '<td align="right"><a href="'.htmlentities($_SERVER['PHP_SELF'].'?tagtypes=1&showtagfiles='.($row['tags'] ? urlencode($row['tags']) : '')).'">'.number_format($row['num']).'</a></td>';
-			echo '<td align="right"><a href="'.htmlentities($_SERVER['PHP_SELF'].'?tagtypes=1&showtagfiles='.($row['tags'] ? urlencode($row['tags']) : '').'&m3u=.m3u').'">m3u</a></td>';
-			echo '</tr>';
-		}
-		echo '</table><hr>';
-	}
-
-	if (isset($_REQUEST['showtagfiles'])) {
-		$SQLquery  = 'SELECT `filename`, `tags` FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`tags` LIKE "'.mysql_real_escape_string($_REQUEST['showtagfiles']).'")';
-		$SQLquery .= ' AND (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-		$SQLquery .= ' ORDER BY `filename` ASC';
-		$result = mysql_query_safe($SQLquery);
-
-		if (!empty($_REQUEST['m3u'])) {
-
-			header('Content-type: audio/x-mpegurl');
-			echo '#EXTM3U'."\n";
-			while ($row = mysql_fetch_array($result)) {
-				echo WindowsShareSlashTranslate($row['filename'])."\n";
-			}
-			exit;
-
-		} else {
-
-			echo '<table border="1" cellspacing="0" cellpadding="3">';
-			while ($row = mysql_fetch_array($result)) {
-				echo '<tr>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-				echo '<td>'.$row['tags'].'</td>';
-				echo '</tr>';
-			}
-			echo '</table>';
-
-		}
-	}
-
-
-} elseif (!empty($_REQUEST['md5datadupes'])) {
-
-	$OtherFormats = '';
-	$AVFormats    = '';
-
-	$SQLquery  = 'SELECT `md5_data`, `filename`, COUNT(*) AS `num`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`md5_data` <> "")';
-	$SQLquery .= ' GROUP BY `md5_data`';
-	$SQLquery .= ' ORDER BY `num` DESC';
-	$result = mysql_query_safe($SQLquery);
-	while (($row = mysql_fetch_array($result)) && ($row['num'] > 1)) {
-		set_time_limit(30);
-
-		$filenames = array();
-		$tags      = array();
-		$md5_data  = array();
-		$SQLquery  = 'SELECT `fileformat`, `filename`, `tags`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`md5_data` = "'.mysql_real_escape_string($row['md5_data']).'")';
-		$SQLquery .= ' ORDER BY `filename` ASC';
-		$result2 = mysql_query_safe($SQLquery);
-		while ($row2 = mysql_fetch_array($result2)) {
-			$thisfileformat = $row2['fileformat'];
-			$filenames[] = $row2['filename'];
-			$tags[]      = $row2['tags'];
-			$md5_data[]  = $row['md5_data'];
-		}
-
-		$thisline  = '<tr>';
-		$thisline .= '<TD VALIGN="TOP" style="font-family: monospace;">'.implode('<br>', $md5_data).'</td>';
-		$thisline .= '<TD VALIGN="TOP" NOWRAP>'.implode('<br>', $tags).'</td>';
-		$thisline .= '<TD VALIGN="TOP">'.implode('<br>', $filenames).'</td>';
-		$thisline .= '</tr>';
-
-		if (in_array($thisfileformat, $IgnoreNoTagFormats)) {
-			$OtherFormats .= $thisline;
-		} else {
-			$AVFormats .= $thisline;
-		}
-	}
-	echo 'Duplicated MD5_DATA (Audio/Video files):<table border="1" cellspacing="0" cellpadding="2">';
-	echo $AVFormats.'</table><hr>';
-	echo 'Duplicated MD5_DATA (Other files):<table border="1" cellspacing="0" cellpadding="2">';
-	echo $OtherFormats.'</table><hr>';
-
-
-} elseif (!empty($_REQUEST['artisttitledupes'])) {
-
-	if (isset($_REQUEST['m3uartist']) && isset($_REQUEST['m3utitle'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		$SQLquery  = 'SELECT `filename`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`artist` = "'.mysql_real_escape_string($_REQUEST['m3uartist']).'")';
-		$SQLquery .= ' AND (`title` = "'.mysql_real_escape_string($_REQUEST['m3utitle']).'")';
-		$SQLquery .= ' ORDER BY `playtime_seconds` ASC, `remix` ASC, `filename` ASC';
-		$result = mysql_query_safe($SQLquery);
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	}
-
-	$SQLquery  = 'SELECT `artist`, `title`, `filename`, COUNT(*) AS `num`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`artist` <> "")';
-	$SQLquery .= ' AND (`title` <> "")';
-	$SQLquery .= ' GROUP BY `artist`, `title`'.(!empty($_REQUEST['samemix']) ? ', `remix`' : '');
-	$SQLquery .= ' ORDER BY `num` DESC, `artist` ASC, `title` ASC, `playtime_seconds` ASC, `remix` ASC';
-	$result = mysql_query_safe($SQLquery);
-	$uniquetitles = 0;
-	$uniquefiles  = 0;
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while (($row = mysql_fetch_array($result)) && ($row['num'] > 1)) {
-			$SQLquery  = 'SELECT `filename`';
-			$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`artist` = "'.mysql_real_escape_string($row['artist']).'")';
-			$SQLquery .= ' AND (`title` = "'.mysql_real_escape_string($row['title']).'")';
-			if (!empty($_REQUEST['samemix'])) {
-				$SQLquery .= ' AND (`remix` = "'.mysql_real_escape_string($row['remix']).'")';
-			}
-			$SQLquery .= ' ORDER BY `playtime_seconds` ASC, `remix` ASC, `filename` ASC';
-			$result2 = mysql_query_safe($SQLquery);
-			while ($row2 = mysql_fetch_array($result2)) {
-				echo WindowsShareSlashTranslate($row2['filename'])."\n";
-			}
-		}
-		exit;
-
-	} else {
-
-		echo 'Duplicated aritst + title: (<a href="'.htmlentities($_SERVER['PHP_SELF'].'?artisttitledupes=1&samemix=1').'">Identical Mix/Version only</a>)<br>';
-		echo '(<a href="'.htmlentities($_SERVER['PHP_SELF'].'?artisttitledupes=1&m3u=.m3u').'">.m3u version</a>)<br>';
-		echo '<table border="1" cellspacing="0" cellpadding="2">';
-		echo '<tr><th colspan="3">&nbsp;</th><th>Artist</th><th>Title</th><th>Version</th><th>&nbsp;</th><th>&nbsp;</th><th>Filename</th></tr>';
-
-		while (($row = mysql_fetch_array($result)) && ($row['num'] > 1)) {
-			$uniquetitles++;
-			set_time_limit(30);
-
-			$filenames = array();
-			$artists   = array();
-			$titles    = array();
-			$remixes   = array();
-			$bitrates  = array();
-			$playtimes = array();
-			$SQLquery  = 'SELECT `filename`, `artist`, `title`, `remix`, `audio_bitrate`, `vbr_method`, `playtime_seconds`, `encoder_options`';
-			$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`artist` = "'.mysql_real_escape_string($row['artist']).'")';
-			$SQLquery .= ' AND (`title` = "'.mysql_real_escape_string($row['title']).'")';
-			$SQLquery .= ' ORDER BY `playtime_seconds` ASC, `remix` ASC, `filename` ASC';
-			$result2 = mysql_query_safe($SQLquery);
-			while ($row2 = mysql_fetch_array($result2)) {
-				$uniquefiles++;
-				$filenames[] = $row2['filename'];
-				$artists[]   = $row2['artist'];
-				$titles[]    = $row2['title'];
-				$remixes[]   = $row2['remix'];
-				if ($row2['vbr_method']) {
-					$bitrates[]  = '<B'.($row2['encoder_options'] ? ' style="text-decoration: underline; cursor: help;" title="'.$row2['encoder_options'] : '').'">'.BitrateText($row2['audio_bitrate'] / 1000).'</b>';
-				} else {
-					$bitrates[]  = BitrateText($row2['audio_bitrate'] / 1000);
-				}
-				$playtimes[] = getid3_lib::PlaytimeString($row2['playtime_seconds']);
-			}
-
-			echo '<tr>';
-			echo '<TD NOWRAP VALIGN="TOP">';
-			foreach ($filenames as $file) {
-				echo '<a href="'.htmlentities('demo.browse.php?deletefile='.urlencode($file).'&noalert=1').'" onClick="return confirm(\'Are you sure you want to delete '.addslashes($file).'? \n(this action cannot be un-done)\');" title="'.htmlentities('Permanently delete '."\n".$file, ENT_QUOTES).'" target="deletedupewindow">delete</a><br>';
-			}
-			echo '</td>';
-			echo '<TD NOWRAP VALIGN="TOP">';
-			foreach ($filenames as $file) {
-				echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($file)).'">play</a><br>';
-			}
-			echo '</td>';
-			echo '<TD VALIGN="MIDDLE" ALIGN="CENTER" ><a href="'.htmlentities($_SERVER['PHP_SELF'].'?artisttitledupes=1&m3uartist='.urlencode($artists[0]).'&m3utitle='.urlencode($titles[0])).'">play all</a></td>';
-			echo '<TD VALIGN="TOP" NOWRAP>'.implode('<br>', $artists).'</td>';
-			echo '<TD VALIGN="TOP" NOWRAP>'.implode('<br>', $titles).'</td>';
-			echo '<TD VALIGN="TOP" NOWRAP>'.implode('<br>', $remixes).'</td>';
-			echo '<TD VALIGN="TOP" NOWRAP ALIGN="RIGHT">'.implode('<br>', $bitrates).'</td>';
-			echo '<TD VALIGN="TOP" NOWRAP ALIGN="RIGHT">'.implode('<br>', $playtimes).'</td>';
-
-			echo '<TD VALIGN="TOP" NOWRAP ALIGN="LEFT"><table border="0" cellspacing="0" cellpadding="0">';
-			foreach ($filenames as $file) {
-				echo '<tr><TD NOWRAP ALIGN="RIGHT"><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($file)).'"><span style="color: #339966;">'.dirname($file).'/</span>'.basename($file).'</a></td></tr>';
-			}
-			echo '</table></td>';
-
-			echo '</tr>';
-		}
-
-	}
-	echo '</table>';
-	echo number_format($uniquefiles).' files with '.number_format($uniquetitles).' unique <i>aritst + title</i><br>';
-	echo '<hr>';
-
-} elseif (!empty($_REQUEST['filetypelist'])) {
-
-	list($fileformat, $audioformat) = explode('|', $_REQUEST['filetypelist']);
-	$SQLquery  = 'SELECT `filename`, `fileformat`, `audio_dataformat`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`fileformat` = "'.mysql_real_escape_string($fileformat).'")';
-	$SQLquery .= ' AND (`audio_dataformat` = "'.mysql_real_escape_string($audioformat).'")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	echo 'Files of format <b>'.$fileformat.'.'.$audioformat.'</b>:<table border="1" cellspacing="0" cellpadding="4">';
-	echo '<tr><th>file</th><th>audio</th><th>filename</th></tr>';
-	while ($row = mysql_fetch_array($result)) {
-		echo '<tr>';
-		echo '<td>'.$row['fileformat'].'</td>';
-		echo '<td>'.$row['audio_dataformat'].'</td>';
-		echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-		echo '</tr>';
-	}
-	echo '</table><hr>';
-
-} elseif (!empty($_REQUEST['trackinalbum'])) {
-
-	$SQLquery  = 'SELECT `filename`, `album`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`album` LIKE "% [%")';
-	$SQLquery .= ' ORDER BY `album` ASC, `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	} elseif (!empty($_REQUEST['autofix'])) {
-
-		getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
-		getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
-
-		while ($row = mysql_fetch_array($result)) {
-			set_time_limit(30);
-			$ThisFileInfo = $getID3->analyze($filename);
-			getid3_lib::CopyTagsToComments($ThisFileInfo);
-
-			if (!empty($ThisFileInfo['tags'])) {
-
-				$Album = trim(str_replace(strstr($ThisFileInfo['comments']['album'][0], ' ['), '', $ThisFileInfo['comments']['album'][0]));
-				$Track = (string) intval(str_replace(' [', '', str_replace(']', '', strstr($ThisFileInfo['comments']['album'][0], ' ['))));
-				if ($Track == '0') {
-					$Track = '';
-				}
-				if ($Album && $Track) {
-					echo '<hr>'.htmlentities($row['filename']).'<br>';
-					echo '<i>'.htmlentities($Album).'</i> (track #'.$Track.')<br>';
-					echo '<b>ID3v2:</b> '.(RemoveID3v2($row['filename'], false) ? 'removed' : 'REMOVAL FAILED!').', ';
-					$WriteID3v1_title   = (isset($ThisFileInfo['comments']['title'][0])   ? $ThisFileInfo['comments']['title'][0]   : '');
-					$WriteID3v1_artist  = (isset($ThisFileInfo['comments']['artist'][0])  ? $ThisFileInfo['comments']['artist'][0]  : '');
-					$WriteID3v1_year    = (isset($ThisFileInfo['comments']['year'][0])    ? $ThisFileInfo['comments']['year'][0]    : '');
-					$WriteID3v1_comment = (isset($ThisFileInfo['comments']['comment'][0]) ? $ThisFileInfo['comments']['comment'][0] : '');
-					$WriteID3v1_genreid = (isset($ThisFileInfo['comments']['genreid'][0]) ? $ThisFileInfo['comments']['genreid'][0] : '');
-					echo '<b>ID3v1:</b> '.(WriteID3v1($row['filename'], $WriteID3v1_title, $WriteID3v1_artist, $Album, $WriteID3v1_year, $WriteID3v1_comment, $WriteID3v1_genreid, $Track, false) ? 'updated' : 'UPDATE FAILED').'<br>';
-				} else {
-					echo ' . ';
-				}
-
-			} else {
-
-				echo '<hr>FAILED<br>'.htmlentities($row['filename']).'<hr>';
-
-			}
-			flush();
-		}
-
-	} else {
-
-		echo '<b>'.number_format(mysql_num_rows($result)).'</b> files with <b>[??]</b>-format track numbers in album field:<br>';
-		if (mysql_num_rows($result) > 0) {
-			echo '(<a href="'.htmlentities($_SERVER['PHP_SELF'].'?trackinalbum=1&m3u=.m3u').'">.m3u version</a>)<br>';
-			echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?trackinalbum=1&autofix=1').'">Try to auto-fix</a><br>';
-			echo '<table border="1" cellspacing="0" cellpadding="4">';
-			while ($row = mysql_fetch_array($result)) {
-				echo '<tr>';
-				echo '<td>'.$row['album'].'</td>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-				echo '</tr>';
-			}
-			echo '</table>';
-		}
-		echo '<hr>';
-
-	}
-
-} elseif (!empty($_REQUEST['fileextensions'])) {
-
-	$SQLquery  = 'SELECT `filename`, `fileformat`, `audio_dataformat`, `video_dataformat`, `tags`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	$invalidextensionfiles = 0;
-	$invalidextensionline  = '<table border="1" cellspacing="0" cellpadding="4">';
-	$invalidextensionline .= '<tr><th>file</th><th>audio</th><th>video</th><th>tags</th><th>actual</th><th>correct</th><th>filename</th></tr>';
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(30);
-
-		$acceptableextensions = AcceptableExtensions($row['fileformat'], $row['audio_dataformat'], $row['video_dataformat']);
-		$actualextension      = strtolower(fileextension($row['filename']));
-		if ($acceptableextensions && !in_array($actualextension, $acceptableextensions)) {
-			$invalidextensionfiles++;
-
-			$invalidextensionline .= '<tr>';
-			$invalidextensionline .= '<td>'.$row['fileformat'].'</td>';
-			$invalidextensionline .= '<td>'.$row['audio_dataformat'].'</td>';
-			$invalidextensionline .= '<td>'.$row['video_dataformat'].'</td>';
-			$invalidextensionline .= '<td>'.$row['tags'].'</td>';
-			$invalidextensionline .= '<td>'.$actualextension.'</td>';
-			$invalidextensionline .= '<td>'.implode('; ', $acceptableextensions).'</td>';
-			$invalidextensionline .= '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-			$invalidextensionline .= '</tr>';
-		}
-	}
-	$invalidextensionline .= '</table><hr>';
-	echo number_format($invalidextensionfiles).' files with incorrect filename extension:<br>';
-	echo $invalidextensionline;
-
-} elseif (isset($_REQUEST['genredistribution'])) {
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		$SQLquery  = 'SELECT `filename`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (BINARY `genre` = "'.$_REQUEST['genredistribution'].'")';
-		$SQLquery .= ' AND (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-		$SQLquery .= ' ORDER BY `filename` ASC';
-		$result = mysql_query_safe($SQLquery);
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	} else {
-
-		if ($_REQUEST['genredistribution'] == '%') {
-
-			$SQLquery  = 'SELECT COUNT(*) AS `num`, `genre`';
-			$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`fileformat` NOT LIKE "'.implode('") AND (`fileformat` NOT LIKE "', $IgnoreNoTagFormats).'")';
-			$SQLquery .= ' GROUP BY `genre`';
-			$SQLquery .= ' ORDER BY `num` DESC';
-			$result = mysql_query_safe($SQLquery);
-			getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
-			echo '<table border="1" cellspacing="0" cellpadding="4">';
-			echo '<tr><th>Count</th><th>Genre</th><th>m3u</th></tr>';
-			while ($row = mysql_fetch_array($result)) {
-				$GenreID = getid3_id3v1::LookupGenreID($row['genre']);
-				if (is_numeric($GenreID)) {
-					echo '<tr bgcolor="#00FF00;">';
-				} else {
-					echo '<tr bgcolor="#FF9999;">';
-				}
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?genredistribution='.urlencode($row['genre'])).'">'.number_format($row['num']).'</a></td>';
-				echo '<td nowrap>'.str_replace("\t", '<br>', $row['genre']).'</td>';
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3u=.m3u&genredistribution='.urlencode($row['genre'])).'">.m3u</a></td>';
-				echo '</tr>';
-			}
-			echo '</table><hr>';
-
-		} else {
-
-			$SQLquery  = 'SELECT `filename`, `genre`';
-			$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-			$SQLquery .= ' WHERE (`genre` LIKE "'.mysql_real_escape_string($_REQUEST['genredistribution']).'")';
-			$SQLquery .= ' ORDER BY `filename` ASC';
-			$result = mysql_query_safe($SQLquery);
-			echo '<a href="'.htmlentities($_SERVER['PHP_SELF'].'?genredistribution='.urlencode('%')).'">All Genres</a><br>';
-			echo '<table border="1" cellspacing="0" cellpadding="4">';
-			echo '<tr><th>Genre</th><th>m3u</th><th>Filename</th></tr>';
-			while ($row = mysql_fetch_array($result)) {
-				echo '<tr>';
-				echo '<TD NOWRAP>'.str_replace("\t", '<br>', $row['genre']).'</td>';
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename'])).'">m3u</a></td>';
-				echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-				echo '</tr>';
-			}
-			echo '</table><hr>';
-
-		}
-
-
-	}
-
-} elseif (!empty($_REQUEST['formatdistribution'])) {
-
-	$SQLquery  = 'SELECT `fileformat`, `audio_dataformat`, COUNT(*) AS `num`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' GROUP BY `fileformat`, `audio_dataformat`';
-	$SQLquery .= ' ORDER BY `num` DESC';
-	$result = mysql_query_safe($SQLquery);
-	echo 'File format distribution:<table border="1" cellspacing="0" cellpadding="4">';
-	echo '<tr><th>Number</th><th>Format</th></tr>';
-	while ($row = mysql_fetch_array($result)) {
-		echo '<tr>';
-		echo '<TD ALIGN="RIGHT">'.number_format($row['num']).'</td>';
-		echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?filetypelist='.$row['fileformat'].'|'.$row['audio_dataformat']).'">'.($row['fileformat'] ? $row['fileformat'] : '<i>unknown</i>').(($row['audio_dataformat'] && ($row['audio_dataformat'] != $row['fileformat'])) ? '.'.$row['audio_dataformat'] : '').'</a></td>';
-		echo '</tr>';
-	}
-	echo '</table><hr>';
-
-} elseif (!empty($_REQUEST['errorswarnings'])) {
-
-	$SQLquery  = 'SELECT `filename`, `error`, `warning`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`error` <> "")';
-	$SQLquery .= ' OR (`warning` <> "")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-
-	if (!empty($_REQUEST['m3u'])) {
-
-		header('Content-type: audio/x-mpegurl');
-		echo '#EXTM3U'."\n";
-		while ($row = mysql_fetch_array($result)) {
-			echo WindowsShareSlashTranslate($row['filename'])."\n";
-		}
-		exit;
-
-	} else {
-
-		echo number_format(mysql_num_rows($result)).' files with errors or warnings:<br>';
-		echo '(<a href="'.htmlentities($_SERVER['PHP_SELF'].'?errorswarnings=1&m3u=.m3u').'">.m3u version</a>)<br>';
-		echo '<table border="1" cellspacing="0" cellpadding="4">';
-		echo '<tr><th>Filename</th><th>Error</th><th>Warning</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr>';
-			echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td>';
-			echo '<td>'.(!empty($row['error'])   ? '<li>'.str_replace("\t", '<li>', htmlentities($row['error'])).'</li>' : '&nbsp;').'</td>';
-			echo '<td>'.(!empty($row['warning']) ? '<li>'.str_replace("\t", '<li>', htmlentities($row['warning'])).'</li>' : '&nbsp;').'</td>';
-			echo '</tr>';
-		}
-	}
-	echo '</table><hr>';
-
-} elseif (!empty($_REQUEST['fixid3v1padding'])) {
-
-	getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.id3v1.php', __FILE__, true);
-	$id3v1_writer = new getid3_write_id3v1;
-
-	$SQLquery  = 'SELECT `filename`, `error`, `warning`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`fileformat` = "mp3")';
-	$SQLquery .= ' AND (`warning` <> "")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	$totaltofix = mysql_num_rows($result);
-	$rowcounter = 0;
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(30);
-		if (strpos($row['warning'], 'Some ID3v1 fields do not use NULL characters for padding') !== false) {
-			set_time_limit(30);
-			$id3v1_writer->filename = $row['filename'];
-			echo ($id3v1_writer->FixID3v1Padding() ? '<span style="color: #009900;">fixed - ' : '<span style="color: #FF0000;">error - ');
-		} else {
-			echo '<span style="color: #0000FF;">No error? - ';
-		}
-		echo '['.++$rowcounter.' / '.$totaltofix.'] ';
-		echo htmlentities($row['filename']).'</span><br>';
-		flush();
-	}
-
-} elseif (!empty($_REQUEST['vbrmethod'])) {
-
-	if ($_REQUEST['vbrmethod'] == '1') {
-
-		$SQLquery  = 'SELECT COUNT(*) AS `num`, `vbr_method`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' GROUP BY `vbr_method`';
-		$SQLquery .= ' ORDER BY `vbr_method`';
-		$result = mysql_query_safe($SQLquery);
-		echo 'VBR methods:<table border="1" cellspacing="0" cellpadding="4">';
-		echo '<tr><th>Count</th><th>VBR Method</th></tr>';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr>';
-			echo '<TD ALIGN="RIGHT">'.htmlentities(number_format($row['num'])).'</td>';
-			if ($row['vbr_method']) {
-				echo '<td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?vbrmethod='.$row['vbr_method'], ENT_QUOTES).'">'.htmlentities($row['vbr_method']).'</a></td>';
-			} else {
-				echo '<td><i>CBR</i></td>';
-			}
-			echo '</tr>';
-		}
-		echo '</table>';
-
-	} else {
-
-		$SQLquery  = 'SELECT `filename`';
-		$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-		$SQLquery .= ' WHERE (`vbr_method` = "'.mysql_real_escape_string($_REQUEST['vbrmethod']).'")';
-		$result = mysql_query_safe($SQLquery);
-		echo number_format(mysql_num_rows($result)).' files with VBR_method of "'.$_REQUEST['vbrmethod'].'":<table border="1" cellspacing="0" cellpadding="3">';
-		while ($row = mysql_fetch_array($result)) {
-			echo '<tr><td><a href="'.htmlentities($_SERVER['PHP_SELF'].'?m3ufilename='.urlencode($row['filename'])).'">m3u</a></td>';
-			echo '<td><a href="'.htmlentities('demo.browse.php?filename='.rawurlencode($row['filename']), ENT_QUOTES).'">'.htmlentities($row['filename']).'</a></td></tr>';
-		}
-		echo '</table>';
-
-	}
-	echo '<hr>';
-
-} elseif (!empty($_REQUEST['correctcase'])) {
-
-	$SQLquery  = 'SELECT `filename`, `fileformat`';
-	$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-	$SQLquery .= ' WHERE (`fileformat` <> "")';
-	$SQLquery .= ' ORDER BY `filename` ASC';
-	$result = mysql_query_safe($SQLquery);
-	echo 'Copy and paste the following into a DOS batch file. You may have to run this script more than once to catch all the changes (remember to scan for deleted/changed files and rescan directory between scans)<hr>';
-	echo '<PRE>';
-	$lastdir = '';
-	while ($row = mysql_fetch_array($result)) {
-		set_time_limit(30);
-		$CleanedFilename = CleanUpFileName($row['filename']);
-		if ($row['filename'] != $CleanedFilename) {
-			if (strtolower($lastdir) != strtolower(str_replace('/', '\\', dirname($row['filename'])))) {
-				$lastdir = str_replace('/', '\\', dirname($row['filename']));
-				echo 'cd "'.$lastdir.'"'."\n";
-			}
-			echo 'ren "'.basename($row['filename']).'" "'.basename(CleanUpFileName($row['filename'])).'"'."\n";
-		}
-	}
-	echo '</PRE>';
-	echo '<hr>';
-
-}
-
-function CleanUpFileName($filename) {
-	$DirectoryName = dirname($filename);
-	$FileExtension = fileextension(basename($filename));
-	$BaseFilename  = basename($filename, '.'.$FileExtension);
-
-	$BaseFilename = strtolower($BaseFilename);
-	$BaseFilename = str_replace('_', ' ', $BaseFilename);
-	//$BaseFilename = str_replace('-', ' - ', $BaseFilename);
-	$BaseFilename = str_replace('(', ' (', $BaseFilename);
-	$BaseFilename = str_replace('( ', '(', $BaseFilename);
-	$BaseFilename = str_replace(')', ') ', $BaseFilename);
-	$BaseFilename = str_replace(' )', ')', $BaseFilename);
-	$BaseFilename = str_replace(' \'\'', ' “', $BaseFilename);
-	$BaseFilename = str_replace('\'\' ', '” ', $BaseFilename);
-	$BaseFilename = str_replace(' vs ', ' vs. ', $BaseFilename);
-	while (strstr($BaseFilename, '  ') !== false) {
-		$BaseFilename = str_replace('  ', ' ', $BaseFilename);
-	}
-	$BaseFilename = trim($BaseFilename);
-
-	return $DirectoryName.'/'.BetterUCwords($BaseFilename).'.'.strtolower($FileExtension);
-}
-
-function BetterUCwords($string) {
-	$stringlength = strlen($string);
-
-	$string{0} = strtoupper($string{0});
-	for ($i = 1; $i < $stringlength; $i++) {
-		if (($string{$i - 1} == '\'') && ($i > 1) && (($string{$i - 2} == 'O') || ($string{$i - 2} == ' '))) {
-			// O'Clock, 'Em
-			$string{$i} = strtoupper($string{$i});
-		} elseif (preg_match('#^[\'A-Za-z0-9À-ÿ]$#', $string{$i - 1})) {
-			$string{$i} = strtolower($string{$i});
-		} else {
-			$string{$i} = strtoupper($string{$i});
-		}
-	}
-
-	static $LowerCaseWords = array('vs.', 'feat.');
-	static $UpperCaseWords = array('DJ', 'USA', 'II', 'MC', 'CD', 'TV', '\'N\'');
-
-	$OutputListOfWords = array();
-	$ListOfWords = explode(' ', $string);
-	foreach ($ListOfWords as $ThisWord) {
-		if (in_array(strtolower(str_replace('(', '', $ThisWord)), $LowerCaseWords)) {
-			$ThisWord = strtolower($ThisWord);
-		} elseif (in_array(strtoupper(str_replace('(', '', $ThisWord)), $UpperCaseWords)) {
-			$ThisWord = strtoupper($ThisWord);
-		} elseif ((substr($ThisWord, 0, 2) == 'Mc') && (strlen($ThisWord) > 2)) {
-			$ThisWord{2} = strtoupper($ThisWord{2});
-		} elseif ((substr($ThisWord, 0, 3) == 'Mac') && (strlen($ThisWord) > 3)) {
-			$ThisWord{3} = strtoupper($ThisWord{3});
-		}
-		$OutputListOfWords[] = $ThisWord;
-	}
-	$UCstring = implode(' ', $OutputListOfWords);
-	$UCstring = str_replace(' From “', ' from “', $UCstring);
-	$UCstring = str_replace(' \'n\' ', ' \'N\' ', $UCstring);
-
-	return $UCstring;
-}
-
-
-
-echo '<hr><form action="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES).'" method="get">';
-echo '<b>Warning:</b> Scanning a new directory will erase all previous entries in the database!<br>';
-echo 'Directory: <input type="text" name="scan" size="50" value="'.htmlentities(!empty($_REQUEST['scan']) ? $_REQUEST['scan'] : '', ENT_QUOTES).'"> ';
-echo '<input type="submit" value="Go" onClick="return confirm(\'Are you sure you want to erase all entries in the database and start scanning again?\');">';
-echo '</form>';
-echo '<hr><form action="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES).'" method="get">';
-echo 'Re-scanning a new directory will only add new, previously unscanned files into the list (and not erase the database).<br>';
-echo 'Directory: <input type="text" name="newscan" size="50" value="'.htmlentities(!empty($_REQUEST['newscan']) ? $_REQUEST['newscan'] : '', ENT_QUOTES).'"> ';
-echo '<input type="submit" value="Go">';
-echo '</form><hr>';
-echo '<ul>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?deadfilescheck=1').'">Remove deleted or changed files from database</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?md5datadupes=1').'">List files with identical MD5_DATA values</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?artisttitledupes=1').'">List files with identical artist + title</a> (<a href="'.$_SERVER['PHP_SELF'].'?artisttitledupes=1&samemix=1">same mix only</a>)</li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?fileextensions=1').'">File with incorrect file extension</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?formatdistribution=1').'">File Format Distribution</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?audiobitrates=1').'">Audio Bitrate Distribution</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?vbrmethod=1').'">VBR_Method Distribution</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?tagtypes=1').'">Tag Type Distribution</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?genredistribution='.urlencode('%')).'">Genre Distribution</a></li>';
-//echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?missingtrackvolume=1').'">Scan for missing track volume information (update database from pre-v1.7.0b5)</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?encoderoptionsdistribution=1').'">Encoder Options Distribution</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?encodedbydistribution='.urlencode('%')).'">Encoded By (ID3v2) Distribution</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?trackinalbum=1').'">Track number in Album field</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?tracknoalbum=1').'">Track number, but no Album</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?titlefeat=1').'">"feat." in Title field</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?emptygenres=1').'">Blank genres</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?trackzero=1').'">Track "zero"</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?nonemptycomments=1').'">non-empty comments</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?unsynchronizedtags=2A1').'">Tags that are not synchronized</a> (<a href="'.$_SERVER['PHP_SELF'].'?unsynchronizedtags=2A1&autofix=1">autofix</a>)</li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?filenamepattern='.urlencode('[N] A - T {R}')).'">Filenames that don\'t match pattern</a> (<a href="?filenamepattern='.urlencode('[N] A - T {R}').'&autofix=1">auto-fix</a>)</li>';
-//echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?filenamepattern='.urlencode('A - T')).'">Filenames that don\'t match pattern</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?correctcase=1').'">Correct filename case (Win/DOS)</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?fixid3v1padding=1').'">Fix ID3v1 invalid padding</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?errorswarnings=1').'">Files with Errors and/or Warnings</a></li>';
-echo '<li><a href="'.htmlentities($_SERVER['PHP_SELF'].'?rescanerrors=1').'">Re-scan only files with Errors and/or Warnings</a></li>';
-echo '</ul>';
-
-$SQLquery  = 'SELECT COUNT(*) AS `TotalFiles`, SUM(`playtime_seconds`) AS `TotalPlaytime`, SUM(`filesize`) AS `TotalFilesize`, AVG(`playtime_seconds`) AS `AvgPlaytime`, AVG(`filesize`) AS `AvgFilesize`, AVG(`audio_bitrate` + `video_bitrate`) AS `AvgBitrate`';
-$SQLquery .= ' FROM `'.mysql_real_escape_string(GETID3_DB_TABLE).'`';
-$result = mysql_query_safe($SQLquery);
-if ($row = mysql_fetch_array($result)) {
-	echo '<hr size="1">';
-	echo '<div style="float: right;">';
-	echo 'Spent '.number_format(mysql_query_safe(null), 3).' seconds querying the database<br>';
-	echo '</div>';
-	echo '<b>Currently in the database:</b><TABLE>';
-	echo '<tr><th align="left">Total Files</th><td>'.number_format($row['TotalFiles']).'</td></tr>';
-	echo '<tr><th align="left">Total Filesize</th><td>'.number_format($row['TotalFilesize'] / 1048576).' MB</td></tr>';
-	echo '<tr><th align="left">Total Playtime</th><td>'.number_format($row['TotalPlaytime'] / 3600, 1).' hours</td></tr>';
-	echo '<tr><th align="left">Average Filesize</th><td>'.number_format($row['AvgFilesize'] / 1048576, 1).' MB</td></tr>';
-	echo '<tr><th align="left">Average Playtime</th><td>'.getid3_lib::PlaytimeString($row['AvgPlaytime']).'</td></tr>';
-	echo '<tr><th align="left">Average Bitrate</th><td>'.BitrateText($row['AvgBitrate'] / 1000, 1).'</td></tr>';
-	echo '</table>';
-	echo '<br clear="all">';
-}
-
-echo '</body></html>';
\ No newline at end of file
diff --git a/lib/getid3/demos/demo.simple.php b/lib/getid3/demos/demo.simple.php
deleted file mode 100644
index bdde123d0..000000000
--- a/lib/getid3/demos/demo.simple.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.simple.php - part of getID3()                    //
-// Sample script for scanning a single directory and           //
-// displaying a few pieces of information for each file        //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-echo '<html><head>';
-echo '<title>getID3() - /demo/demo.simple.php (sample script)</title>';
-echo '<style type="text/css">BODY,TD,TH { font-family: sans-serif; font-size: 9pt; }</style>';
-echo '</head><body>';
-
-
-// include getID3() library (can be in a different directory if full path is specified)
-require_once('../getid3/getid3.php');
-
-// Initialize getID3 engine
-$getID3 = new getID3;
-
-$DirectoryToScan = '/change/to/directory/you/want/to/scan'; // change to whatever directory you want to scan
-$dir = opendir($DirectoryToScan);
-echo '<table border="1" cellspacing="0" cellpadding="3">';
-echo '<tr><th>Filename</th><th>Artist</th><th>Title</th><th>Bitrate</th><th>Playtime</th></tr>';
-while (($file = readdir($dir)) !== false) {
-	$FullFileName = realpath($DirectoryToScan.'/'.$file);
-	if ((substr($FullFileName, 0, 1) != '.') && is_file($FullFileName)) {
-		set_time_limit(30);
-
-		$ThisFileInfo = $getID3->analyze($FullFileName);
-
-		getid3_lib::CopyTagsToComments($ThisFileInfo);
-
-		// output desired information in whatever format you want
-		echo '<tr>';
-		echo '<td>'.htmlentities($ThisFileInfo['filenamepath']).'</td>';
-		echo '<td>'              .htmlentities(!empty($ThisFileInfo['comments_html']['artist']) ? implode('<br>', $ThisFileInfo['comments_html']['artist'])         : chr(160)).'</td>';
-		echo '<td>'              .htmlentities(!empty($ThisFileInfo['comments_html']['title'])  ? implode('<br>', $ThisFileInfo['comments_html']['title'])          : chr(160)).'</td>';
-		echo '<td align="right">'.htmlentities(!empty($ThisFileInfo['audio']['bitrate'])        ?           round($ThisFileInfo['audio']['bitrate'] / 1000).' kbps' : chr(160)).'</td>';
-		echo '<td align="right">'.htmlentities(!empty($ThisFileInfo['playtime_string'])         ?                 $ThisFileInfo['playtime_string']                  : chr(160)).'</td>';
-		echo '</tr>';
-	}
-}
-echo '</table>';
-
-echo '</body></html>';
\ No newline at end of file
diff --git a/lib/getid3/demos/demo.simple.write.php b/lib/getid3/demos/demo.simple.write.php
deleted file mode 100644
index e1e47f38b..000000000
--- a/lib/getid3/demos/demo.simple.write.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                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.simple.write.php - part of getID3()              //
-// Sample script showing basic syntax for writing tags         //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-//die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-$TextEncoding = 'UTF-8';
-
-require_once('../getid3/getid3.php');
-// Initialize getID3 engine
-$getID3 = new getID3;
-$getID3->setOption(array('encoding'=>$TextEncoding));
-
-require_once('../getid3/write.php');
-// Initialize getID3 tag-writing module
-$tagwriter = new getid3_writetags;
-//$tagwriter->filename = '/path/to/file.mp3';
-$tagwriter->filename = 'c:/file.mp3';
-
-//$tagwriter->tagformats = array('id3v1', 'id3v2.3');
-$tagwriter->tagformats = array('id3v2.3');
-
-// set various options (optional)
-$tagwriter->overwrite_tags = true;
-$tagwriter->overwrite_tags = false;
-$tagwriter->tag_encoding = $TextEncoding;
-$tagwriter->remove_other_tags = true;
-
-// populate data array
-$TagData = array(
-	'title'         => array('My Song'),
-	'artist'        => array('The Artist'),
-	'album'         => array('Greatest Hits'),
-	'year'          => array('2004'),
-	'genre'         => array('Rock'),
-	'comment'       => array('excellent!'),
-	'track'         => array('04/16'),
-	'popularimeter' => array('email'=>'user@example.net', 'rating'=>128, 'data'=>0),
-);
-$tagwriter->tag_data = $TagData;
-
-// write tags
-if ($tagwriter->WriteTags()) {
-	echo 'Successfully wrote tags<br>';
-	if (!empty($tagwriter->warnings)) {
-		echo 'There were some warnings:<br>'.implode('<br><br>', $tagwriter->warnings);
-	}
-} else {
-	echo 'Failed to write tags!<br>'.implode('<br><br>', $tagwriter->errors);
-}
diff --git a/lib/getid3/demos/demo.write.php b/lib/getid3/demos/demo.write.php
deleted file mode 100644
index 859382e96..000000000
--- a/lib/getid3/demos/demo.write.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.write.php - part of getID3()                     //
-// sample script for demonstrating writing ID3v1 and ID3v2     //
-// tags for MP3, or Ogg comment tags for Ogg Vorbis            //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-die('Due to a security issue, this demo has been disabled. It can be enabled by removing line '.__LINE__.' in '.$_SERVER['PHP_SELF']);
-
-$TaggingFormat = 'UTF-8';
-
-header('Content-Type: text/html; charset='.$TaggingFormat);
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-echo '<html><head><title>getID3() - Sample tag writer</title></head><style type="text/css">BODY,TD,TH { font-family: sans-serif; font-size: 9pt;" }</style><body>';
-
-require_once('../getid3/getid3.php');
-// Initialize getID3 engine
-$getID3 = new getID3;
-$getID3->setOption(array('encoding'=>$TaggingFormat));
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.php', __FILE__, true);
-
-$browsescriptfilename = 'demo.browse.php';
-
-$Filename = (isset($_REQUEST['Filename']) ? $_REQUEST['Filename'] : '');
-
-
-
-if (isset($_POST['WriteTags'])) {
-
-	$TagFormatsToWrite = (isset($_POST['TagFormatsToWrite']) ? $_POST['TagFormatsToWrite'] : array());
-	if (!empty($TagFormatsToWrite)) {
-		echo 'starting to write tag(s)<BR>';
-
-		$tagwriter = new getid3_writetags;
-		$tagwriter->filename       = $Filename;
-		$tagwriter->tagformats     = $TagFormatsToWrite;
-		$tagwriter->overwrite_tags = false;
-		$tagwriter->tag_encoding   = $TaggingFormat;
-		if (!empty($_POST['remove_other_tags'])) {
-			$tagwriter->remove_other_tags = true;
-		}
-
-		$commonkeysarray = array('Title', 'Artist', 'Album', 'Year', 'Comment');
-		foreach ($commonkeysarray as $key) {
-			if (!empty($_POST[$key])) {
-				$TagData[strtolower($key)][] = $_POST[$key];
-			}
-		}
-		if (!empty($_POST['Genre'])) {
-			$TagData['genre'][] = $_POST['Genre'];
-		}
-		if (!empty($_POST['GenreOther'])) {
-			$TagData['genre'][] = $_POST['GenreOther'];
-		}
-		if (!empty($_POST['Track'])) {
-			$TagData['track'][] = $_POST['Track'].(!empty($_POST['TracksTotal']) ? '/'.$_POST['TracksTotal'] : '');
-		}
-
-		if (!empty($_FILES['userfile']['tmp_name'])) {
-			if (in_array('id3v2.4', $tagwriter->tagformats) || in_array('id3v2.3', $tagwriter->tagformats) || in_array('id3v2.2', $tagwriter->tagformats)) {
-				if (is_uploaded_file($_FILES['userfile']['tmp_name'])) {
-					ob_start();
-					if ($fd = fopen($_FILES['userfile']['tmp_name'], 'rb')) {
-						ob_end_clean();
-						$APICdata = fread($fd, filesize($_FILES['userfile']['tmp_name']));
-						fclose ($fd);
-
-						list($APIC_width, $APIC_height, $APIC_imageTypeID) = GetImageSize($_FILES['userfile']['tmp_name']);
-						$imagetypes = array(1=>'gif', 2=>'jpeg', 3=>'png');
-						if (isset($imagetypes[$APIC_imageTypeID])) {
-
-							$TagData['attached_picture'][0]['data']          = $APICdata;
-							$TagData['attached_picture'][0]['picturetypeid'] = $_POST['APICpictureType'];
-							$TagData['attached_picture'][0]['description']   = $_FILES['userfile']['name'];
-							$TagData['attached_picture'][0]['mime']          = 'image/'.$imagetypes[$APIC_imageTypeID];
-
-						} else {
-							echo '<b>invalid image format (only GIF, JPEG, PNG)</b><br>';
-						}
-					} else {
-						$errormessage = ob_get_contents();
-						ob_end_clean();
-						echo '<b>cannot open '.$_FILES['userfile']['tmp_name'].'</b><br>';
-					}
-				} else {
-					echo '<b>!is_uploaded_file('.$_FILES['userfile']['tmp_name'].')</b><br>';
-				}
-			} else {
-				echo '<b>WARNING:</b> Can only embed images for ID3v2<br>';
-			}
-		}
-
-		$tagwriter->tag_data = $TagData;
-		if ($tagwriter->WriteTags()) {
-			echo 'Successfully wrote tags<BR>';
-			if (!empty($tagwriter->warnings)) {
-				echo 'There were some warnings:<BLOCKQUOTE STYLE="background-color:#FFCC33; padding: 10px;">'.implode('<br><br>', $tagwriter->warnings).'</BLOCKQUOTE>';
-			}
-		} else {
-			echo 'Failed to write tags!<BLOCKQUOTE STYLE="background-color:#FF9999; padding: 10px;">'.implode('<br><br>', $tagwriter->errors).'</BLOCKQUOTE>';
-		}
-
-	} else {
-
-		echo 'WARNING: no tag formats selected for writing - nothing written';
-
-	}
-	echo '<HR>';
-
-}
-
-
-echo '<div style="font-size: 1.2em; font-weight: bold;">Sample tag editor/writer</div>';
-echo '<a href="'.htmlentities($browsescriptfilename.'?listdirectory='.rawurlencode(realpath(dirname($Filename))), ENT_QUOTES).'">Browse current directory</a><br>';
-if (!empty($Filename)) {
-	echo '<a href="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES).'">Start Over</a><br><br>';
-	echo '<form action="'.htmlentities($_SERVER['PHP_SELF'], ENT_QUOTES).'" method="post" enctype="multipart/form-data">';
-	echo '<table border="3" cellspacing="0" cellpadding="4">';
-	echo '<tr><th align="right">Filename:</th><td><input type="hidden" name="Filename" value="'.htmlentities($Filename, ENT_QUOTES).'"><a href="'.htmlentities($browsescriptfilename.'?filename='.rawurlencode($Filename), ENT_QUOTES).'" target="_blank">'.$Filename.'</a></td></tr>';
-	if (file_exists($Filename)) {
-
-		// Initialize getID3 engine
-		$getID3 = new getID3;
-		$OldThisFileInfo = $getID3->analyze($Filename);
-		getid3_lib::CopyTagsToComments($OldThisFileInfo);
-
-		switch ($OldThisFileInfo['fileformat']) {
-			case 'mp3':
-			case 'mp2':
-			case 'mp1':
-				$ValidTagTypes = array('id3v1', 'id3v2.3', 'ape');
-				break;
-
-			case 'mpc':
-				$ValidTagTypes = array('ape');
-				break;
-
-			case 'ogg':
-				if (!empty($OldThisFileInfo['audio']['dataformat']) && ($OldThisFileInfo['audio']['dataformat'] == 'flac')) {
-					//$ValidTagTypes = array('metaflac');
-					// metaflac doesn't (yet) work with OggFLAC files
-					$ValidTagTypes = array();
-				} else {
-					$ValidTagTypes = array('vorbiscomment');
-				}
-				break;
-
-			case 'flac':
-				$ValidTagTypes = array('metaflac');
-				break;
-
-			case 'real':
-				$ValidTagTypes = array('real');
-				break;
-
-			default:
-				$ValidTagTypes = array();
-				break;
-		}
-		echo '<tr><td align="right"><b>Title</b></td> <td><input type="text" size="40" name="Title"  value="'.htmlentities((!empty($OldThisFileInfo['comments']['title'])  ? implode(', ', $OldThisFileInfo['comments']['title'] ) : ''), ENT_QUOTES).'"></td></tr>';
-		echo '<tr><td align="right"><b>Artist</b></td><td><input type="text" size="40" name="Artist" value="'.htmlentities((!empty($OldThisFileInfo['comments']['artist']) ? implode(', ', $OldThisFileInfo['comments']['artist']) : ''), ENT_QUOTES).'"></td></tr>';
-		echo '<tr><td align="right"><b>Album</b></td> <td><input type="text" size="40" name="Album"  value="'.htmlentities((!empty($OldThisFileInfo['comments']['album'])  ? implode(', ', $OldThisFileInfo['comments']['album'] ) : ''), ENT_QUOTES).'"></td></tr>';
-		echo '<tr><td align="right"><b>Year</b></td>  <td><input type="text" size="4"  name="Year"   value="'.htmlentities((!empty($OldThisFileInfo['comments']['year'])   ? implode(', ', $OldThisFileInfo['comments']['year']  ) : ''), ENT_QUOTES).'"></td></tr>';
-
-		$TracksTotal = '';
-		$TrackNumber = '';
-		if (!empty($OldThisFileInfo['comments']['track_number']) && is_array($OldThisFileInfo['comments']['track_number'])) {
-			$RawTrackNumberArray = $OldThisFileInfo['comments']['track_number'];
-		} elseif (!empty($OldThisFileInfo['comments']['track']) && is_array($OldThisFileInfo['comments']['track'])) {
-			$RawTrackNumberArray = $OldThisFileInfo['comments']['track'];
-		} else {
-			$RawTrackNumberArray = array();
-		}
-		foreach ($RawTrackNumberArray as $key => $value) {
-			if (strlen($value) > strlen($TrackNumber)) {
-				// ID3v1 may store track as "3" but ID3v2/APE would store as "03/16"
-				$TrackNumber = $value;
-			}
-		}
-		if (strstr($TrackNumber, '/')) {
-			list($TrackNumber, $TracksTotal) = explode('/', $TrackNumber);
-		}
-		echo '<tr><td align="right"><b>Track</b></td><td><input type="text" size="2" name="Track" value="'.htmlentities($TrackNumber, ENT_QUOTES).'"> of <input type="text" size="2" name="TracksTotal" value="'.htmlentities($TracksTotal, ENT_QUOTES).'"></TD></TR>';
-
-		$ArrayOfGenresTemp = getid3_id3v1::ArrayOfGenres();   // get the array of genres
-		foreach ($ArrayOfGenresTemp as $key => $value) {      // change keys to match displayed value
-			$ArrayOfGenres[$value] = $value;
-		}
-		unset($ArrayOfGenresTemp);                            // remove temporary array
-		unset($ArrayOfGenres['Cover']);                       // take off these special cases
-		unset($ArrayOfGenres['Remix']);
-		unset($ArrayOfGenres['Unknown']);
-		$ArrayOfGenres['']      = '- Unknown -';              // Add special cases back in with renamed key/value
-		$ArrayOfGenres['Cover'] = '-Cover-';
-		$ArrayOfGenres['Remix'] = '-Remix-';
-		asort($ArrayOfGenres);                                // sort into alphabetical order
-		echo '<tr><th align="right">Genre</th><td><select name="Genre">';
-		$AllGenresArray = (!empty($OldThisFileInfo['comments']['genre']) ? $OldThisFileInfo['comments']['genre'] : array());
-		foreach ($ArrayOfGenres as $key => $value) {
-			echo '<option value="'.htmlentities($key, ENT_QUOTES).'"';
-			if (in_array($key, $AllGenresArray)) {
-				echo ' selected="selected"';
-				unset($AllGenresArray[array_search($key, $AllGenresArray)]);
-				sort($AllGenresArray);
-			}
-			echo '>'.htmlentities($value).'</option>';
-		}
-		echo '</select><input type="text" name="GenreOther" size="10" value="'.htmlentities((!empty($AllGenresArray[0]) ? $AllGenresArray[0] : ''), ENT_QUOTES).'"></td></tr>';
-
-		echo '<tr><td align="right"><b>Write Tags</b></td><td>';
-		foreach ($ValidTagTypes as $ValidTagType) {
-			echo '<input type="checkbox" name="TagFormatsToWrite[]" value="'.$ValidTagType.'"';
-			if (count($ValidTagTypes) == 1) {
-				echo ' checked="checked"';
-			} else {
-				switch ($ValidTagType) {
-					case 'id3v2.2':
-					case 'id3v2.3':
-					case 'id3v2.4':
-						if (isset($OldThisFileInfo['tags']['id3v2'])) {
-							echo ' checked="checked"';
-						}
-						break;
-
-					default:
-						if (isset($OldThisFileInfo['tags'][$ValidTagType])) {
-							echo ' checked="checked"';
-						}
-						break;
-				}
-			}
-			echo '>'.$ValidTagType.'<br>';
-		}
-		if (count($ValidTagTypes) > 1) {
-			echo '<hr><input type="checkbox" name="remove_other_tags" value="1"> Remove non-selected tag formats when writing new tag<br>';
-		}
-		echo '</td></tr>';
-
-		echo '<tr><td align="right"><b>Comment</b></td><td><textarea cols="30" rows="3" name="Comment" wrap="virtual">'.((isset($OldThisFileInfo['comments']['comment']) && is_array($OldThisFileInfo['comments']['comment'])) ? implode("\n", $OldThisFileInfo['comments']['comment']) : '').'</textarea></td></tr>';
-
-		echo '<tr><td align="right"><b>Picture</b><br>(ID3v2 only)</td><td><input type="file" name="userfile" accept="image/jpeg, image/gif, image/png"><br>';
-		echo '<select name="APICpictureType">';
-		$APICtypes = getid3_id3v2::APICPictureTypeLookup('', true);
-		foreach ($APICtypes as $key => $value) {
-			echo '<option value="'.htmlentities($key, ENT_QUOTES).'">'.htmlentities($value).'</option>';
-		}
-		echo '</select></td></tr>';
-		echo '<tr><td align="center" colspan="2"><input type="submit" name="WriteTags" value="Save Changes"> ';
-		echo '<input type="reset" value="Reset"></td></tr>';
-
-	} else {
-
-		echo '<tr><td align="right"><b>Error</b></td><td>'.htmlentities($Filename).' does not exist</td></tr>';
-
-	}
-	echo '</table>';
-	echo '</form>';
-
-}
-
-echo '</body></html>';
\ No newline at end of file
diff --git a/lib/getid3/demos/demo.zip.php b/lib/getid3/demos/demo.zip.php
deleted file mode 100644
index 138532d16..000000000
--- a/lib/getid3/demos/demo.zip.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /demo/demo.zip.php - part of getID3()                       //
-// Sample script how to use getID3() to decompress zip files   //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-function UnzipFileContents($filename, &$errors) {
-	$errors = array();
-	$DecompressedFileContents = array();
-	if (!class_exists('getID3')) {
-		$errors[] = 'class getID3 not defined, please include getid3.php';
-	} elseif (include_once('module.archive.zip.php')) {
-		$getid3 = new getID3();
-		$getid3->info['filesize'] = filesize($filename);
-		ob_start();
-		if ($getid3->fp = fopen($filename, 'rb')) {
-			ob_end_clean();
-			$getid3_zip = new getid3_zip($getid3);
-			$getid3_zip->analyze($filename);
-			if (($getid3->info['fileformat'] == 'zip') && !empty($getid3->info['zip']['files'])) {
-				if (!empty($getid3->info['zip']['central_directory'])) {
-					$ZipDirectoryToWalk = $getid3->info['zip']['central_directory'];
-				} elseif (!empty($getid3->info['zip']['entries'])) {
-					$ZipDirectoryToWalk = $getid3->info['zip']['entries'];
-				} else {
-					$errors[] = 'failed to parse ZIP attachment "'.$piece_filename.'" (no central directory)<br>';
-					fclose($getid3->fp);
-					return false;
-				}
-				foreach ($ZipDirectoryToWalk as $key => $valuearray) {
-					fseek($getid3->fp, $valuearray['entry_offset'], SEEK_SET);
-					$LocalFileHeader = $getid3_zip->ZIPparseLocalFileHeader($getid3->fp);
-					if ($LocalFileHeader['flags']['encrypted']) {
-						// password-protected
-						$DecompressedFileContents[$valuearray['filename']] = '';
-					} else {
-						fseek($getid3->fp, $LocalFileHeader['data_offset'], SEEK_SET);
-						$compressedFileData = '';
-						while ((strlen($compressedFileData) < $LocalFileHeader['compressed_size']) && !feof($getid3->fp)) {
-							$compressedFileData .= fread($getid3->fp, 32768);
-						}
-						switch ($LocalFileHeader['raw']['compression_method']) {
-							case 0: // store - great, just copy data unchanged
-								$uncompressedFileData = $compressedFileData;
-								break;
-
-							case 8: // deflate
-								ob_start();
-								$uncompressedFileData = gzinflate($compressedFileData);
-								$gzinflate_errors = trim(strip_tags(ob_get_contents()));
-								ob_end_clean();
-								if ($gzinflate_errors) {
-									$errors[] = 'gzinflate() failed for file ['.$LocalFileHeader['filename'].']: "'.$gzinflate_errors.'"';
-									continue 2;
-								}
-								break;
-
-							case 1:  // shrink
-							case 2:  // reduce-1
-							case 3:  // reduce-2
-							case 4:  // reduce-3
-							case 5:  // reduce-4
-							case 6:  // implode
-							case 7:  // tokenize
-							case 9:  // deflate64
-							case 10: // PKWARE Date Compression Library Imploding
-								$DecompressedFileContents[$valuearray['filename']] = '';
-								$errors[] = 'unsupported ZIP compression method ('.$LocalFileHeader['raw']['compression_method'].' = '.$getid3_zip->ZIPcompressionMethodLookup($LocalFileHeader['raw']['compression_method']).')';
-								continue 2;
-
-							default:
-								$DecompressedFileContents[$valuearray['filename']] = '';
-								$errors[] = 'unknown ZIP compression method ('.$LocalFileHeader['raw']['compression_method'].')';
-								continue 2;
-						}
-						$DecompressedFileContents[$valuearray['filename']] = $uncompressedFileData;
-						unset($compressedFileData);
-					}
-				}
-			} else {
-				$errors[] = $filename.' does not appear to be a zip file';
-			}
-		} else {
-			$error_message = ob_get_contents();
-			ob_end_clean();
-			$errors[] = 'failed to fopen('.$filename.', rb): '.$error_message;
-		}
-	} else {
-		$errors[] = 'failed to include_once(module.archive.zip.php)';
-	}
-	return $DecompressedFileContents;
-}
diff --git a/lib/getid3/demos/getid3.css b/lib/getid3/demos/getid3.css
deleted file mode 100644
index 0f5b730a2..000000000
--- a/lib/getid3/demos/getid3.css
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
-* Common elements
-*/
-
-body {
-	font: 12px Verdana, sans-serif;
-	background-color: white;
-	color:            black;
-	margin-top:    6px;
-	margin-bottom: 30px;
-	margin-left:   12px;
-	margin-right:  12px;
-}
-
-h1 {
-	font: bold 18px Verdana, sans-serif;
-	line-height:   26px;
-	margin-top:    12px;
-	margin-bottom: 15px;
-	margin-left:    0px;
-	margin-right:   7px;
-	background-color: #e6eaf6;
-	padding-left:   10px;
-	padding-top:    2px;
-	padding-bottom: 4px;
-}
-
-h3 {
-	font: bold 13px Verdana, sans-serif;
-	line-height:   26px;
-	margin-top:    12px;
-	margin-bottom:  0px;
-	margin-left:    0px;
-	margin-right:   7px;
-	padding-left:   4px;
-}
-
-ul {
-	margin-top: 0px;
-}
-
-p, li {
-	font: 9pt/135% sans-serif;
-	margin-top:    1x;
-	margin-bottom: 0x;
-}
-
-a, a:link, a:visited {
-	color: #0000cc;
-}
-
-hr {
-	height: 0;
-	border: solid gray 0;
-	border-top-width: thin;
-	width: 700px;
-}
-
-table.table td {
-	font: 9pt sans-serif;
-	padding-top:    1px;
-	padding-bottom: 1px;
-	padding-left:   5px;
-	padding-right:  5px;
-}
-
-table.table td.header {
-	background-color: #cccccc;
-	padding-top:    2px;
-	padding-bottom: 2px;
-	font-weight: bold;
-}
-
-table.table tr.even_files {
-	background-color: #fefefe;
-}
-
-table.table tr.odd_files {
-	background-color: #e9e9e9;
-}
-
-table.dump {
-	border-top:  solid 1px #cccccc;
-	border-left: solid 1px #cccccc;
-	margin: 2px;
-}
-
-table.dump td {
-	font: 9pt sans-serif;
-	padding-top:    1px;
-	padding-bottom: 1px;
-	padding-left:   5px;
-	padding-right:  5px;
-	border-right:  solid 1px #cccccc;
-	border-bottom: solid 1px #cccccc;
-}
-
-td.dump_string {
-	font-weight: bold;
-	color: #006600;
-	font-family: Zawgyi-One,sans-serif;
-}
-
-td.dump_integer {
-	color: #CC0000;
-	font-weight: bold;
-}
-
-td.dump_double {
-	color: #FF9900;
-	font-weight: bold;
-}
-
-td.dump_boolean {
-	color: #0000FF;
-	font-weight: bold;
-}
-
-.error {
-	color: red
-}
-
-
-/**
-* Tool Tips
-*/
-
-.tooltip {
-    font: 9pt sans-serif;
-    background: #ffffe1;
-    color: 	black;
-    border: 	black 1px solid;
-    margin: 	2px;
-    padding: 	7px;
-    position: 	absolute;
-    top: 	10px;
-    left: 	10px;
-    z-index: 	10000;
-    visibility: hidden;
-}
-
-.tooltip p {
-     margin-top:   -2px;
-     margin-bottom: 4px;
-}
-
-
-/**
-* Forms
-*/
-
-table.form td {
- 	font: 9pt/135% sans-serif;
- 	padding: 2px;
-}
-
-select, input {
-	font: 9pt/135% sans-serif;
-}
-
-.select, .field {
-	width: 260px;
-}
-
-#sel_field {
-	width: 85px;
-}
-
-.button {
-	margin-top: 10px;
-}
diff --git a/lib/getid3/demos/getid3.demo.dirscan.php b/lib/getid3/demos/getid3.demo.dirscan.php
deleted file mode 100644
index 83140ed22..000000000
--- a/lib/getid3/demos/getid3.demo.dirscan.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>                               //
-//  available at http://getid3.sourceforge.net                                 //
-//            or http://www.getid3.org                                        ///
-/////////////////////////////////////////////////////////////////////////////////
-///                                                                            //
-// getid3.dirscan.php - tool for batch media file processing with getID3()     //
-//                                                                            ///
-/////////////////////////////////////////////////////////////////////////////////
-///                                                                            //
-//  Directory Scanning and Caching CLI tool by Karl G. Holz <newaeonØmac*com>  //
-//                                                                            ///
-/////////////////////////////////////////////////////////////////////////////////
-/**
-* This is a directory scanning and caching cli tool for getID3().
-*
-* use like so for the default sqlite3 database, which is hidden:
-*
-* cd <path you want to start scanning from>
-* php <path to getid3 files>/getid3.dirscan.php
-*
-* or
-*
-* php <path to getid3 files>/getid3.dirscan.php <dir to scan> <file ext in csv list>
-*
-* Supported Cache Types    (this extension)
-*
-*   SQL Databases:
-*
-*   cache_type
-*   -------------------------------------------------------------------
-*    mysql
-
-$cache='mysql';
-$database['host']='';
-$database['database']='';
-$database['username']='';
-$database['password']='';
-$database['table']='';
-
-*    sqlite3
-
-$cache='sqlite3';
-$database['table']='getid3_cache';
-$database['hide']=true;
-
-*/
-$dir      = $_SERVER['PWD'];
-$media    = array('mp4', 'm4v', 'mov', 'mp3', 'm4a', 'jpg', 'png', 'gif');
-$database = array();
-/**
-* configure the database bellow
-*/
-// sqlite3
-$cache             = 'sqlite3';
-$database['table'] = 'getid3_cache';
-$database['hide']  = true;
-/**
- * mysql
-$cache                = 'mysql';
-$database['host']     = '';
-$database['database'] = '';
-$database['username'] = '';
-$database['password'] = '';
-$database['table']    = '';
-*/
-
-/**
-* id3 tags class file
-*/
-require_once(dirname(__FILE__).'/getid3.php');
-/**
-* dirscan scans all directories for files that match your selected filetypes into the cache database
-* this is useful for a lot of media files
-*
-*
-* @package dirscan
-* @author Karl Holz
-*
-*/
-
-class dirscan {
-	/**
-	* type_brace()  * Might not work on Solaris and other non GNU systems *
-	*
-	* Configures a filetype list for use with glob searches,
-	* will match uppercase or lowercase extensions only, no mixing
-	* @param string $dir directory to use
-	* @param mixed cvs list of extentions or an array
-	* @return string or null if checks fail
-	*/
-	private function type_brace($dir, $search=array()) {
-		$dir = str_replace(array('///', '//'), array('/', '/'), $dir);
-		if (!is_dir($dir)) {
-			return null;
-		}
-		if (!is_array($search)) {
-			$e = explode(',', $search);
-		} elseif (count($search) < 1) {
-			return null;
-		} else {
-			$e = $search;
-		}
-		$ext = array();
-		foreach ($e as $new) {
-			$ext[] = strtolower(trim($new));
-			$ext[] = strtoupper(trim($new));
-		}
-		$b = $dir.'/*.{'.implode(',', $ext).'}';
-		return $b;
-	}
-
-	/**
-	* this function will search 4 levels deep for directories
-	* will return null on failure
-	* @param string $root
-	* @return array return an array of dirs under root
-	* @todo figure out how to block tabo directories with ease
-	*/
-	private function getDirs($root) {
-		switch ($root) { // return null on tabo directories, add as needed -> case {dir to block }:   this is not perfect yet
-			case '/':
-			case '/var':
-			case '/etc':
-			case '/home':
-			case '/usr':
-			case '/root':
-			case '/private/etc':
-			case '/private/var':
-			case '/etc/apache2':
-			case '/home':
-			case '/tmp':
-			case '/var/log':
-				return null;
-				break;
-			default: // scan 4 directories deep
-				if (!is_dir($root)) {
-    				return null;
-				}
-				$dirs = array_merge(glob($root.'/*', GLOB_ONLYDIR), glob($root.'/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*/*/*', GLOB_ONLYDIR), glob($root.'/*/*/*/*/*/*/*', GLOB_ONLYDIR));
-				break;
-		}
-		if (count($dirs) < 1) {
-			$dirs = array($root);
-		}
-		return $dirs;
-	}
-
-	/**
-	*  file_check() check the number of file that are found that match the brace search
-	*
-	* @param string $search
-	* @return mixed
-	*/
-	private function file_check($search) {
-		$t = array();
-		$s = glob($search, GLOB_BRACE);
-		foreach ($s as $file) {
-			$t[] = str_replace(array('///', '//'), array('/', '/'), $file);
-		}
-		if (count($t) > 0) {
-			return $t;
-		}
-		return null;
-	}
-
-	function getTime() {
-		return microtime(true);
-		// old method for PHP < 5
-		//$a = explode(' ', microtime());
-		//return (double) $a[0] + $a[1];
-	}
-
-
-	/**
-	*
-	* @param type $dir
-	* @param type $match  search type name extentions, can be an array or csv list
-	* @param type $cache caching extention, select one of sqlite3, mysql, dbm
-	* @param array $opt database options,
-	*/
-	function scan_files($dir, $match, $cache='sqlite3', $opt=array('table'=>'getid3_cache', 'hide'=>true)) {
-		$Start = self::getTime();
-		switch ($cache) { // load the caching module
-			case 'sqlite3':
-				if (!class_exists('getID3_cached_sqlite3')) {
-					require_once(dirname(__FILE__)).'/extension.cache.sqlite3.php';
-				}
-				$id3 = new getID3_cached_sqlite3($opt['table'], $opt['hide']);
-				break;
-			case 'mysql':
-				if (!class_exists('getID3_cached_mysql')) {
-					require_once(dirname(__FILE__)).'/extension.cache.mysql.php';
-				}
-				$id3 = new getID3_cached_mysql($opt['host'], $opt['database'], $opt['username'], $opt['password'], $opt['table']);
-				break;
-		// I'll leave this for some one else
-			//case 'dbm':
-			//	if (!class_exists('getID3_cached_dbm')) {
-			//		require_once(dirname(__FILE__)).'/extension.cache.dbm.php';
-			//	}
-			//	die(' This has not be implemented, sorry for the inconvenience');
-			//	break;
-			default:
-				die(' You have selected an Invalid cache type, only "sqlite3" and "mysql" are valid'."\n");
-				break;
-		}
-		$count = array('dir'=>0, 'file'=>0);
-		$dirs = self::getDirs($dir);
-		if ($dirs !== null) {
-			foreach ($dirs as $d) {
-				echo ' Scanning: '.$d."\n";
-				$search = self::type_brace($d, $match);
-				if ($search !== null) {
-    				$files = self::file_check($search);
-					if ($files !== null) {
-						foreach ($files as $f) {
-							echo ' * Analyzing '.$f.' '."\n";
-							$id3->analyze($f);
-							$count['file']++;
-						}
-						$count['dir']++;
-					} else {
-						echo 'Failed to get files '."\n";
-					}
-				} else {
-					echo 'Failed to create match string '."\n";
-				}
-			}
-			echo '**************************************'."\n";
-			echo '* Finished Scanning your directories '."\n*\n";
-			echo '* Directories '.$count['dir']."\n";
-			echo '* Files '.$count['file']."\n";
-			$End = self::getTime();
-			$t = number_format(($End - $Start) / 60, 2);
-			echo '* Time taken to scan '.$dir.' '.$t.' min '."\n";
-			echo '**************************************'."\n";
-		} else {
-			echo ' failed to get directories '."\n";
-		}
-	}
-}
-
-if (PHP_SAPI === 'cli') {
-	if (count($argv) == 2) {
-		if (is_dir($argv[1])) {
-			$dir = $argv[1];
-		}
-		if (count(explode(',', $argv[2])) > 0) {
-			$media = $arg[2];
-		}
-	}
-	echo ' * Starting to scan directory: '.$dir."\n";
-	echo ' * Using default media types: '.implode(',', $media)."\n";
-	dirscan::scan_files($dir, $media, $cache, $database);
-}
diff --git a/lib/getid3/demos/index.php b/lib/getid3/demos/index.php
deleted file mode 100644
index 891207592..000000000
--- a/lib/getid3/demos/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><head><title>getID3 demos</title><style type="text/css">BODY, TD, TH { font-family: sans-serif; font-size: 10pt; }</style></head><body>
-
-In this directory are a number of examples of how to use <a href="http://www.getid3.org/">getID3()</a>.<br>
-If you don't know what to run, take a look at <a href="demo.browse.php"><b>demo.browse.php</b></a>
-<hr>
-Other demos:<ul>
-<?php
-if ($dh = opendir('.')) {
-	while ($file = readdir($dh)) {
-		if (preg_match('#^demo\\..+\\.php$#', $file)) {
-			echo '<li><a href="'.htmlentities($file, ENT_QUOTES).'">'.htmlentities($file).'</a></li>';
-		}
-	}
-}
-?>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/lib/getid3/dependencies.txt b/lib/getid3/dependencies.txt
deleted file mode 100644
index 34a72ba86..000000000
--- a/lib/getid3/dependencies.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// dependencies.txt - part of getID3()                         //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-lyrics3     depends on   apetag (optional)
-ogg         depends on   flac
-id3v2       depends on   id3v1
-apetag      depends on   id3v1 (optional, writing only)
-bonk        depends on   id3v2 (optional)
-riff        depends on   mp3
-mpeg        depends on   mp3
-quicktime   depends on   mp3
-flac        depends on   ogg
-optimfrog   depends on   riff
-la          depends on   riff
-lpac        depends on   riff
-asf         depends on   riff, id3v1 (optional)
diff --git a/lib/getid3/getID3-1.9.7.readme.txt b/lib/getid3/getID3-1.9.7.readme.txt
deleted file mode 100644
index 018ca78ff..000000000
--- a/lib/getid3/getID3-1.9.7.readme.txt
+++ /dev/null
@@ -1,603 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-
-*****************************************************************
-*****************************************************************
-
-   getID3() is released under multiple licenses. You may choose
-   from the following licenses, and use getID3 according to the
-   terms of the license most suitable to your project.
-
-GNU GPL: https://gnu.org/licenses/gpl.html                   (v3)
-         https://gnu.org/licenses/old-licenses/gpl-2.0.html  (v2)
-         https://gnu.org/licenses/old-licenses/gpl-1.0.html  (v1)
-
-GNU LGPL: https://gnu.org/licenses/lgpl.html                 (v3)
-
-Mozilla MPL: http://www.mozilla.org/MPL/2.0/                 (v2)
-
-getID3 Commercial License: http://getid3.org/#gCL (payment required)
-
-*****************************************************************
-*****************************************************************
-Copies of each of the above licenses are included in the 'licenses'
-directory of the getID3 distribution.
-
-
-       +---------------------------------------------+
-       | If you want to donate, there is a link on   |
-       | http://www.getid3.org for PayPal donations. |
-       +---------------------------------------------+
-
-
-Quick Start
-===========================================================================
-
-Q: How can I check that getID3() works on my server/files?
-A: Unzip getID3() to a directory, then access /demos/demo.browse.php
-
-
-
-Support
-===========================================================================
-
-Q: I have a question, or I found a bug. What do I do?
-A: The preferred method of support requests and/or bug reports is the
-   forum at http://support.getid3.org/
-
-
-
-Sourceforge Notification
-===========================================================================
-
-It's highly recommended that you sign up for notification from
-Sourceforge for when new versions are released. Please visit:
-http://sourceforge.net/project/showfiles.php?group_id=55859
-and click the little "monitor package" icon/link.  If you're
-previously signed up for the mailing list, be aware that it has
-been discontinued, only the automated Sourceforge notification
-will be used from now on.
-
-
-
-What does getID3() do?
-===========================================================================
-
-Reads & parses (to varying degrees):
- ¤ tags:
-  * APE (v1 and v2)
-  * ID3v1 (& ID3v1.1)
-  * ID3v2 (v2.4, v2.3, v2.2)
-  * Lyrics3 (v1 & v2)
-
- ¤ audio-lossy:
-  * MP3/MP2/MP1
-  * MPC / Musepack
-  * Ogg (Vorbis, OggFLAC, Speex)
-  * AAC / MP4
-  * AC3
-  * DTS
-  * RealAudio
-  * Speex
-  * DSS
-  * VQF
-
- ¤ audio-lossless:
-  * AIFF
-  * AU
-  * Bonk
-  * CD-audio (*.cda)
-  * FLAC
-  * LA (Lossless Audio)
-  * LiteWave
-  * LPAC
-  * MIDI
-  * Monkey's Audio
-  * OptimFROG
-  * RKAU
-  * Shorten
-  * TTA
-  * VOC
-  * WAV (RIFF)
-  * WavPack
-
- ¤ audio-video:
-  * ASF: ASF, Windows Media Audio (WMA), Windows Media Video (WMV)
-  * AVI (RIFF)
-  * Flash
-  * Matroska (MKV)
-  * MPEG-1 / MPEG-2
-  * NSV (Nullsoft Streaming Video)
-  * Quicktime (including MP4)
-  * RealVideo
-
- ¤ still image:
-  * BMP
-  * GIF
-  * JPEG
-  * PNG
-  * TIFF
-  * SWF (Flash)
-  * PhotoCD
-
- ¤ data:
-  * ISO-9660 CD-ROM image (directory structure)
-  * SZIP (limited support)
-  * ZIP (directory structure)
-  * TAR
-  * CUE
-
-
-Writes:
-  * ID3v1 (& ID3v1.1)
-  * ID3v2 (v2.3 & v2.4)
-  * VorbisComment on OggVorbis
-  * VorbisComment on FLAC (not OggFLAC)
-  * APE v2
-  * Lyrics3 (delete only)
-
-
-
-Requirements
-===========================================================================
-
-* PHP 4.2.0 up to 5.2.x for getID3() 1.7.x (and earlier)
-* PHP 5.0.5 (or higher) for getID3() 1.8.x (and up)
-* PHP 5.0.5 (or higher) for getID3() 2.0.x (and up)
-* at least 4MB memory for PHP. 8MB or more is highly recommended.
-  12MB is required with all modules loaded.
-
-
-
-Usage
-===========================================================================
-
-See /demos/demo.basic.php for a very basic use of getID3() with no
-fancy output, just scanning one file.
-
-See structure.txt for the returned data structure.
-
-*>  For an example of a complete directory-browsing,       <*
-*>  file-scanning implementation of getID3(), please run   <*
-*>  /demos/demo.browse.php                                 <*
-
-See /demos/demo.mysql.php for a sample recursive scanning code that
-scans every file in a given directory, and all sub-directories, stores
-the results in a database and allows various analysis / maintenance
-operations
-
-To analyze remote files over HTTP or FTP you need to copy the file
-locally first before running getID3(). Your code would look something
-like this:
-
-// Copy remote file locally to scan with getID3()
-$remotefilename = 'http://www.example.com/filename.mp3';
-if ($fp_remote = fopen($remotefilename, 'rb')) {
-    $localtempfilename = tempnam('/tmp', 'getID3');
-    if ($fp_local = fopen($localtempfilename, 'wb')) {
-        while ($buffer = fread($fp_remote, 8192)) {
-            fwrite($fp_local, $buffer);
-        }
-        fclose($fp_local);
-
-		// Initialize getID3 engine
-		$getID3 = new getID3;
-
-		$ThisFileInfo = $getID3->analyze($filename);
-
-        // Delete temporary file
-        unlink($localtempfilename);
-    }
-    fclose($fp_remote);
-}
-
-
-See /demos/demo.write.php for how to write tags.
-
-
-
-What does the returned data structure look like?
-===========================================================================
-
-See structure.txt
-
-It is recommended that you look at the output of
-/demos/demo.browse.php scanning the file(s) you're interested in to
-confirm what data is actually returned for any particular filetype in
-general, and your files in particular, as the actual data returned
-may vary considerably depending on what information is available in
-the file itself.
-
-
-
-Notes
-===========================================================================
-
-getID3() 1.x:
-If the format parser encounters a critical problem, it will return
-something in $fileinfo['error'], describing the encountered error. If
-a less critical error or notice is generated it will appear in
-$fileinfo['warning']. Both keys may contain more than one warning or
-error. If something is returned in ['error'] then the file was not
-correctly parsed and returned data may or may not be correct and/or
-complete. If something is returned in ['warning'] (and not ['error'])
-then the data that is returned is OK - usually getID3() is reporting
-errors in the file that have been worked around due to known bugs in
-other programs. Some warnings may indicate that the data that is
-returned is OK but that some data could not be extracted due to
-errors in the file.
-
-getID3() 2.x:
-See above except errors are thrown (so you will only get one error).
-
-
-
-Disclaimer
-===========================================================================
-
-getID3() has been tested on many systems, on many types of files,
-under many operating systems, and is generally believe to be stable
-and safe. That being said, there is still the chance there is an
-undiscovered and/or unfixed bug that may potentially corrupt your
-file, especially within the writing functions. By using getID3() you
-agree that it's not my fault if any of your files are corrupted.
-In fact, I'm not liable for anything :)
-
-
-
-License
-===========================================================================
-
-GNU General Public License - see license.txt
-
-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:
-Free Software Foundation, Inc.
-59 Temple Place - Suite 330
-Boston, MA  02111-1307, USA.
-
-FAQ:
-Q: Can I use getID3() in my program? Do I need a commercial license?
-A: You're generally free to use getID3 however you see fit. The only
-   case in which you would require a commercial license is if you're
-   selling your closed-source program that integrates getID3. If you
-   sell your program including a copy of getID3, that's fine as long
-   as you include a copy of the sourcecode when you sell it.  Or you
-   can distribute your code without getID3 and say "download it from
-   getid3.sourceforge.net"
-
-
-
-Why is it called "getID3()" if it does so much more than just that?
-===========================================================================
-
-v0.1 did in fact just do that. I don't have a copy of code that old, but I
-could essentially write it today with a one-line function:
-  function getID3($filename) { return unpack('a3TAG/a30title/a30artist/a30album/a4year/a28comment/c1track/c1genreid', substr(file_get_contents($filename), -128)); }
-
-
-Future Plans
-===========================================================================
-http://www.getid3.org/phpBB3/viewforum.php?f=7
-
-* Better support for MP4 container format
-* Scan for appended ID3v2 tag at end of file per ID3v2.4 specs (Section 5.0)
-* Support for JPEG-2000 (http://www.morgan-multimedia.com/jpeg2000_overview.htm)
-* Support for MOD (mod/stm/s3m/it/xm/mtm/ult/669)
-* Support for ACE (thanks Vince)
-* Support for Ogg other than Vorbis, Speex and OggFlac (ie. Ogg+Xvid)
-* Ability to create Xing/LAME VBR header for VBR MP3s that are missing VBR header
-* Ability to "clean" ID3v2 padding (replace invalid padding with valid padding)
-* Warn if MP3s change version mid-stream (in full-scan mode)
-* check for corrupt/broken mid-file MP3 streams in histogram scan
-* Support for lossless-compression formats
-  (http://www.firstpr.com.au/audiocomp/lossless/#Links)
-  (http://compression.ca/act-sound.html)
-  (http://web.inter.nl.net/users/hvdh/lossless/lossless.htm)
-* Support for RIFF-INFO chunks
-  * http://lotto.st-andrews.ac.uk/~njh/tag_interchange.html
-    (thanks Nick Humfrey <njhØsurgeradio*co*uk>)
-  * http://abcavi.narod.ru/sof/abcavi/infotags.htm
-    (thanks Kibi)
-* Better support for Bink video
-* http://www.hr/josip/DSP/AudioFile2.html
-* http://www.pcisys.net/~melanson/codecs/
-* Detect mp3PRO
-* Support for PSD
-* Support for JPC
-* Support for JP2
-* Support for JPX
-* Support for JB2
-* Support for IFF
-* Support for ICO
-* Support for ANI
-* Support for EXE (comments, author, etc) (thanks p*quaedackersØplanet*nl)
-* Support for DVD-IFO (region, subtitles, aspect ratio, etc)
-  (thanks p*quaedackersØplanet*nl)
-* More complete support for SWF - parsing encapsulated MP3 and/or JPEG content
-    (thanks n8n8Øyahoo*com)
-* Support for a2b
-* Optional scan-through-frames for AVI verification
-  (thanks rockcohenØmassive-interactive*nl)
-* Support for TTF (thanks infoØbutterflyx*com)
-* Support for DSS (http://www.getid3.org/phpBB3/viewtopic.php?t=171)
-* Support for SMAF (http://smaf-yamaha.com/what/demo.html)
-  http://www.getid3.org/phpBB3/viewtopic.php?t=182
-* Support for AMR (http://www.getid3.org/phpBB3/viewtopic.php?t=195)
-* Support for 3gpp (http://www.getid3.org/phpBB3/viewtopic.php?t=195)
-* Support for ID4 (http://www.wackysoft.cjb.net grizlyY2KØhotmail*com)
-* Parse XML data returned in Ogg comments
-* Parse XML data from Quicktime SMIL metafiles (klausrathØmac*com)
-* ID3v2 genre string creator function
-* More complete parsing of JPG
-* Support for all old-style ASF packets
-* ASF/WMA/WMV tag writing
-* Parse declared T??? ID3v2 text information frames, where appropriate
-    (thanks Christian Fritz for the idea)
-* Recognize encoder:
-  http://www.guerillasoft.com/EncSpot2/index.html
-  http://ff123.net/identify.html
-  http://www.hydrogenaudio.org/?act=ST&f=16&t=9414
-  http://www.hydrogenaudio.org/?showtopic=11785
-* Support for other OS/2 bitmap structures: Bitmap Array('BA'),
-  Color Icon('CI'), Color Pointer('CP'), Icon('IC'), Pointer ('PT')
-  http://netghost.narod.ru/gff/graphics/summary/os2bmp.htm
-* Support for WavPack RAW mode
-* ASF/WMA/WMV data packet parsing
-* ID3v2FrameFlagsLookupTagAlter()
-* ID3v2FrameFlagsLookupFileAlter()
-* obey ID3v2 tag alter/preserve/discard rules
-* http://www.geocities.com/SiliconValley/Sector/9654/Softdoc/Illyrium/Aolyr.htm
-* proper checking for LINK/LNK frame validity in ID3v2 writing
-* proper checking for ASPI-TLEN frame validity in ID3v2 writing
-* proper checking for COMR frame validity in ID3v2 writing
-* http://www.geocities.co.jp/SiliconValley-Oakland/3664/index.html
-* decode GEOB ID3v2 structure as encoded by RealJukebox,
-  decode NCON ID3v2 structure as encoded by MusicMatch
-  (probably won't happen - the formats are proprietary)
-
-
-
-Known Bugs/Issues in getID3() that may be fixed eventually
-===========================================================================
-http://www.getid3.org/phpBB3/viewtopic.php?t=25
-
-* Cannot determine bitrate for MPEG video with VBR video data
-  (need documentation)
-* Interlace/progressive cannot be determined for MPEG video
-  (need documentation)
-* MIDI playtime is sometimes inaccurate
-* AAC-RAW mode files cannot be identified
-* WavPack-RAW mode files cannot be identified
-* mp4 files report lots of "Unknown QuickTime atom type"
-   (need documentation)
-* Encrypted ASF/WMA/WMV files warn about "unhandled GUID
-  ASF_Content_Encryption_Object"
-* Bitrate split between audio and video cannot be calculated for
-  NSV, only the total bitrate. (need documentation)
-* All Ogg formats (Vorbis, OggFLAC, Speex) are affected by the
-  problem of large VorbisComments spanning multiple Ogg pages, but
-  but only OggVorbis files can be processed with vorbiscomment.
-* The version of "head" supplied with Mac OS 10.2.8 (maybe other
-  versions too) does only understands a single option (-n) and
-  therefore fails. getID3 ignores this and returns wrong md5_data.
-
-
-
-Known Bugs/Issues in getID3() that cannot be fixed
---------------------------------------------------
-http://www.getid3.org/phpBB3/viewtopic.php?t=25
-
-* 32-bit PHP installations only:
-  Files larger than 2GB cannot always be parsed fully by getID3()
-  due to limitations in the 32-bit PHP filesystem functions.
-  NOTE: Since v1.7.8b3 there is partial support for larger-than-
-  2GB files, most of which will parse OK, as long as no critical
-  data is located beyond the 2GB offset.
-  Known will-work:
-  * all file formats on 64-bit PHP
-  * ZIP  (format doesn't support files >2GB)
-  * FLAC (current encoders don't support files >2GB)
-  Known will-not-work:
-  * ID3v1 tags (always located at end-of-file)
-  * Lyrics3 tags (always located at end-of-file)
-  * APE tags (always located at end-of-file)
-  Maybe-will-work:
-  * Quicktime (will work if needed metadata is before 2GB offset,
-    that is if the file has been hinted/optimized for streaming)
-  * RIFF.WAV (should work fine, but gives warnings about not being
-    able to parse all chunks)
-  * RIFF.AVI (playtime will probably be wrong, is only based on
-    "movi" chunk that fits in the first 2GB, should issue error
-    to show that playtime is incorrect. Other data should be mostly
-    correct, assuming that data is constant throughout the file)
-
-
-
-Known Bugs/Issues in other programs
------------------------------------
-http://www.getid3.org/phpBB3/viewtopic.php?t=25
-
-* Windows Media Player (up to v11) and iTunes (up to v10+) do
-    not correctly handle ID3v2.3 tags with UTF-16BE+BOM
-    encoding (they assume the data is UTF-16LE+BOM and either
-    crash (WMP) or output Asian character set (iTunes)
-* Winamp (up to v2.80 at least) does not support ID3v2.4 tags,
-    only ID3v2.3
-    see: http://forums.winamp.com/showthread.php?postid=387524
-* Some versions of Helium2 (www.helium2.com) do not write
-    ID3v2.4-compliant Frame Sizes, even though the tag is marked
-    as ID3v2.4)  (detected by getID3())
-* MP3ext V3.3.17 places a non-compliant padding string at the end
-    of the ID3v2 header. This is supposedly fixed in v3.4b21 but
-    only if you manually add a registry key. This fix is not yet
-    confirmed.  (detected by getID3())
-* CDex v1.40 (fixed by v1.50b7) writes non-compliant Ogg comment
-    strings, supposed to be in the format "NAME=value" but actually
-    written just "value"  (detected by getID3())
-* Oggenc 0.9-rc3 flags the encoded file as ABR whether it's
-    actually ABR or VBR.
-* iTunes (versions "X v2.0.3", "v3.0.1" are known-guilty, probably
-    other versions are too) writes ID3v2.3 comment tags using a
-    frame name 'COM ' which is not valid for ID3v2.3+ (it's an
-    ID3v2.2-style frame name)  (detected by getID3())
-* MP2enc does not encode mono CBR MP2 files properly (half speed
-    sound and double playtime)
-* MP2enc does not encode mono VBR MP2 files properly (actually
-    encoded as stereo)
-* tooLAME does not encode mono VBR MP2 files properly (actually
-    encoded as stereo)
-* AACenc encodes files in VBR mode (actually ABR) even if CBR is
-   specified
-* AAC/ADIF - bitrate_mode = cbr for vbr files
-* LAME 3.90-3.92 prepends one frame of null data (space for the
-  LAME/VBR header, but it never gets written) when encoding in CBR
-  mode with the DLL
-* Ahead Nero encodes TwinVQF with a DSIZ value (which is supposed
-  to be the filesize in bytes) of "0" for TwinVQF v1.0 and "1" for
-  TwinVQF v2.0  (detected by getID3())
-* Ahead Nero encodes TwinVQF files 1 second shorter than they
-  should be
-* AAC-ADTS files are always actually encoded VBR, even if CBR mode
-  is specified (the CBR-mode switches on the encoder enable ABR
-  mode, not CBR as such, but it's not possible to tell the
-  difference between such ABR files and true VBR)
-* STREAMINFO.audio_signature in OggFLAC is always null. "The reason
-  it's like that is because there is no seeking support in
-  libOggFLAC yet, so it has no way to go back and write the
-  computed sum after encoding. Seeking support in Ogg FLAC is the
-  #1 item for the next release." - Josh Coalson (FLAC developer)
-  NOTE: getID3() will calculate md5_data in a method similar to
-  other file formats, but that value cannot be compared to the
-  md5_data value from FLAC data in a FLAC file format.
-* STREAMINFO.audio_signature is not calculated in FLAC v0.3.0 &
-  v0.4.0 - getID3() will calculate md5_data in a method similar to
-  other file formats, but that value cannot be compared to the
-  md5_data value from FLAC v0.5.0+
-* RioPort (various versions including 2.0 and 3.11) tags ID3v2 with
-  a WCOM frame that has no data portion
-* Earlier versions of Coolplayer adds illegal ID3 tags to Ogg Vorbis
-  files, thus making them corrupt.
-* Meracl ID3 Tag Writer v1.3.4 (and older) incorrectly truncates the
-  last byte of data from an MP3 file when appending a new ID3v1 tag.
-  (detected by getID3())
-* Lossless-Audio files encoded with and without the -noseek switch
-  do actually differ internally and therefore cannot match md5_data
-* iTunes has been known to append a new ID3v1 tag on the end of an
-  existing ID3v1 tag when ID3v2 tag is also present
-  (detected by getID3())
-* MediaMonkey may write a blank RGAD ID3v2 frame but put actual
-  replay gain adjustments in a series of user-defined TXXX frames
-  (detected and handled by getID3() since v1.9.2)
-
-
-
-
-Reference material:
-===========================================================================
-
-[www.id3.org material now mirrored at http://id3lib.sourceforge.net/id3/]
-* http://www.id3.org/id3v2.4.0-structure.txt
-* http://www.id3.org/id3v2.4.0-frames.txt
-* http://www.id3.org/id3v2.4.0-changes.txt
-* http://www.id3.org/id3v2.3.0.txt
-* http://www.id3.org/id3v2-00.txt
-* http://www.id3.org/mp3frame.html
-* http://minnie.tuhs.org/pipermail/mp3encoder/2001-January/001800.html <mathewhendry@hotmail.com>
-* http://www.dv.co.yu/mpgscript/mpeghdr.htm
-* http://www.mp3-tech.org/programmer/frame_header.html
-* http://users.belgacom.net/gc247244/extra/tag.html
-* http://gabriel.mp3-tech.org/mp3infotag.html
-* http://www.id3.org/iso4217.html
-* http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-1.TXT
-* http://www.xiph.org/ogg/vorbis/doc/framing.html
-* http://www.xiph.org/ogg/vorbis/doc/v-comment.html
-* http://leknor.com/code/php/class.ogg.php.txt
-* http://www.id3.org/iso639-2.html
-* http://www.id3.org/lyrics3.html
-* http://www.id3.org/lyrics3200.html
-* http://www.psc.edu/general/software/packages/ieee/ieee.html
-* http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee-expl.html
-* http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
-* http://www.jmcgowan.com/avi.html
-* http://www.wotsit.org/
-* http://www.herdsoft.com/ti/davincie/davp3xo2.htm
-* http://www.mathdogs.com/vorbis-illuminated/bitstream-appendix.html
-* "Standard MIDI File Format" by Dustin Caldwell (from www.wotsit.org)
-* http://midistudio.com/Help/GMSpecs_Patches.htm
-* http://www.xiph.org/archives/vorbis/200109/0459.html
-* http://www.replaygain.org/
-* http://www.lossless-audio.com/
-* http://download.microsoft.com/download/winmediatech40/Doc/1.0/WIN98MeXP/EN-US/ASF_Specification_v.1.0.exe
-* http://mediaxw.sourceforge.net/files/doc/Active%20Streaming%20Format%20(ASF)%201.0%20Specification.pdf
-* http://www.uni-jena.de/~pfk/mpp/sv8/ (archived at http://www.hydrogenaudio.org/musepack/klemm/www.personal.uni-jena.de/~pfk/mpp/sv8/)
-* http://jfaul.de/atl/
-* http://www.uni-jena.de/~pfk/mpp/ (archived at http://www.hydrogenaudio.org/musepack/klemm/www.personal.uni-jena.de/~pfk/mpp/)
-* http://www.libpng.org/pub/png/spec/png-1.2-pdg.html
-* http://www.real.com/devzone/library/creating/rmsdk/doc/rmff.htm
-* http://www.fastgraph.com/help/bmp_os2_header_format.html
-* http://netghost.narod.ru/gff/graphics/summary/os2bmp.htm
-* http://flac.sourceforge.net/format.html
-* http://www.research.att.com/projects/mpegaudio/mpeg2.html
-* http://www.audiocoding.com/wiki/index.php?page=AAC
-* http://libmpeg.org/mpeg4/doc/w2203tfs.pdf
-* http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
-* http://developer.apple.com/techpubs/quicktime/qtdevdocs/RM/frameset.htm
-* http://www.nullsoft.com/nsv/
-* http://www.wotsit.org/download.asp?f=iso9660
-* http://sandbox.mc.edu/~bennet/cs110/tc/tctod.html
-* http://www.cdroller.com/htm/readdata.html
-* http://www.speex.org/manual/node10.html
-* http://www.harmony-central.com/Computer/Programming/aiff-file-format.doc
-* http://www.faqs.org/rfcs/rfc2361.html
-* http://ghido.shelter.ro/
-* http://www.ebu.ch/tech_t3285.pdf
-* http://www.sr.se/utveckling/tu/bwf
-* http://ftp.aessc.org/pub/aes46-2002.pdf
-* http://cartchunk.org:8080/
-* http://www.broadcastpapers.com/radio/cartchunk01.htm
-* http://www.hr/josip/DSP/AudioFile2.html
-* http://home.attbi.com/~chris.bagwell/AudioFormats-11.html
-* http://www.pure-mac.com/extkey.html
-* http://cesnet.dl.sourceforge.net/sourceforge/bonkenc/bonk-binary-format-0.9.txt
-* http://www.headbands.com/gspot/
-* http://www.openswf.org/spec/SWFfileformat.html
-* http://j-faul.virtualave.net/
-* http://www.btinternet.com/~AnthonyJ/Atari/programming/avr_format.html
-* http://cui.unige.ch/OSG/info/AudioFormats/ap11.html
-* http://sswf.sourceforge.net/SWFalexref.html
-* http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
-* http://www-lehre.informatik.uni-osnabrueck.de/~fbstark/diplom/docs/swf/Flash_Uncovered.htm
-* http://developer.apple.com/quicktime/icefloe/dispatch012.html
-* http://www.csdn.net/Dev/Format/graphics/PCD.htm
-* http://tta.iszf.irk.ru/
-* http://www.atsc.org/standards/a_52a.pdf
-* http://www.alanwood.net/unicode/
-* http://www.freelists.org/archives/matroska-devel/07-2003/msg00010.html
-* http://www.its.msstate.edu/net/real/reports/config/tags.stats
-* http://homepages.slingshot.co.nz/~helmboy/quicktime/formats/qtm-layout.txt
-* http://brennan.young.net/Comp/LiveStage/things.html
-* http://www.multiweb.cz/twoinches/MP3inside.htm
-* http://www.geocities.co.jp/SiliconValley-Oakland/3664/alittle.html#GenreExtended
-* http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
-* http://www.unicode.org/unicode/faq/utf_bom.html
-* http://tta.corecodec.org/?menu=format
-* http://www.scvi.net/nsvformat.htm
-* http://pda.etsi.org/pda/queryform.asp
-* http://cpansearch.perl.org/src/RGIBSON/Audio-DSS-0.02/lib/Audio/DSS.pm
-* http://trac.musepack.net/trac/wiki/SV8Specification
-* http://wyday.com/cuesharp/specification.php
-* http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
diff --git a/lib/getid3/getid3/extension.cache.dbm.php b/lib/getid3/getid3/extension.cache.dbm.php
deleted file mode 100644
index 7eea33c0f..000000000
--- a/lib/getid3/getid3/extension.cache.dbm.php
+++ /dev/null
@@ -1,208 +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
-	public 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: destructor
-	public 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
-	public 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
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/extension.cache.mysql.php b/lib/getid3/getid3/extension.cache.mysql.php
deleted file mode 100644
index 771c8b031..000000000
--- a/lib/getid3/getid3/extension.cache.mysql.php
+++ /dev/null
@@ -1,171 +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
-	private $cursor;
-	private $connection;
-
-
-	// public: constructor - see top of this file for cache type and cache_options
-	public 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
-	public 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
-	public 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
-	private 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`)) ENGINE=MyISAM", $this->connection);
-		echo mysql_error($this->connection);
-	}
-}
diff --git a/lib/getid3/getid3/extension.cache.sqlite3.php b/lib/getid3/getid3/extension.cache.sqlite3.php
deleted file mode 100644
index d4d4f7781..000000000
--- a/lib/getid3/getid3/extension.cache.sqlite3.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>                               //
-//  available at http://getid3.sourceforge.net                                 //
-//            or http://www.getid3.org                                        ///
-/////////////////////////////////////////////////////////////////////////////////
-///                                                                            //
-// extension.cache.sqlite3.php - part of getID3()                              //
-// Please see readme.txt for more information                                  //
-//                                                                            ///
-/////////////////////////////////////////////////////////////////////////////////
-///                                                                            //
-// MySQL extension written by Allan Hansen <ahØartemis*dk>                     //
-// Table name mod by Carlo Capocasa <calroØcarlocapocasa*com>                  //
-// MySQL extension was reworked for SQLite3 by Karl G. Holz <newaeonØmac*com>  //
-//                                                                            ///
-/////////////////////////////////////////////////////////////////////////////////
-/**
-* This is a caching extension for getID3(). It works the exact same
-* way as the getID3 class, but return cached information much faster
-*
-*    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/extension.cache.sqlite3.php';
-*       // all parameters are optional, defaults are:
-*       $getID3 = new getID3_cached_sqlite3($table='getid3_cache', $hide=FALSE);
-*       $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
-*
-*   sqlite3             table='getid3_cache', hide=false        (PHP5)
-*
-
-***  database file will be stored in the same directory as this script,
-***  webserver must have write access to that directory!
-***  set $hide to TRUE to prefix db file with .ht to pervent access from web client
-***  this is a default setting in the Apache configuration:
-
-# The following lines prevent .htaccess and .htpasswd files from being viewed by Web clients.
-
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-    Satisfy all
-</Files>
-
-********************************************************************************
-*
-*   -------------------------------------------------------------------
-*   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
-********************************************************************************
-*
-* IMHO this is still a bit slow, I'm using this with MP4/MOV/ M4v files
-* there is a plan to add directory scanning and analyzing to make things work much faster
-*
-*
-*/
-class getID3_cached_sqlite3 extends getID3 {
-
-	/**
-	* __construct()
-	* @param string $table holds name of sqlite table
-	* @return type
-	*/
-	public function __construct($table='getid3_cache', $hide=false) {
-		$this->table = $table; // Set table
-		$file = dirname(__FILE__).'/'.basename(__FILE__, 'php').'sqlite';
-		if ($hide) {
-			$file = dirname(__FILE__).'/.ht.'.basename(__FILE__, 'php').'sqlite';
-		}
-		$this->db = new SQLite3($file);
-		$db = $this->db;
-		$this->create_table();   // Create cache table if not exists
-		$version = '';
-		$sql = $this->version_check;
-		$stmt = $db->prepare($sql);
-		$stmt->bindValue(':filename', getID3::VERSION, SQLITE3_TEXT);
-		$result = $stmt->execute();
-		list($version) = $result->fetchArray();
-		if ($version != getID3::VERSION) { // Check version number and clear cache if changed
-			$this->clear_cache();
-		}
-		return parent::__construct();
-	}
-
-	/**
-	* close the database connection
-	*/
-	public function __destruct() {
-		$db=$this->db;
-		$db->close();
-	}
-
-	/**
-	* hold the sqlite db
-	* @var SQLite Resource
-	*/
-	private $db;
-
-	/**
-	* table to use for caching
-	* @var string $table
-	*/
-	private $table;
-
-	/**
-	* clear the cache
-	* @access private
-	* @return type
-	*/
-	private function clear_cache() {
-		$db = $this->db;
-		$sql = $this->delete_cache;
-		$db->exec($sql);
-		$sql = $this->set_version;
-		$stmt = $db->prepare($sql);
-		$stmt->bindValue(':filename', getID3::VERSION, SQLITE3_TEXT);
-		$stmt->bindValue(':dirname', getID3::VERSION, SQLITE3_TEXT);
-		$stmt->bindValue(':val', getID3::VERSION, SQLITE3_TEXT);
-		return $stmt->execute();
-	}
-
-	/**
-	* analyze file and cache them, if cached pull from the db
-	* @param type $filename
-	* @return boolean
-	*/
-	public function analyze($filename) {
-		if (!file_exists($filename)) {
-			return false;
-		}
-		// items to track for caching
-		$filetime = filemtime($filename);
-		$filesize = filesize($filename);
-		// this will be saved for a quick directory lookup of analized files
-		// ... why do 50 seperate sql quries when you can do 1 for the same result
-		$dirname  = dirname($filename);
-		// Lookup file
-		$db = $this->db;
-		$sql = $this->get_id3_data;
-		$stmt = $db->prepare($sql);
-		$stmt->bindValue(':filename', $filename, SQLITE3_TEXT);
-		$stmt->bindValue(':filesize', $filesize, SQLITE3_INTEGER);
-		$stmt->bindValue(':filetime', $filetime, SQLITE3_INTEGER);
-		$res = $stmt->execute();
-		list($result) = $res->fetchArray();
-		if (count($result) > 0 ) {
-			return unserialize(base64_decode($result));
-		}
-		// if it hasn't been analyzed before, then do it now
-		$analysis = parent::analyze($filename);
-		// Save result
-		$sql = $this->cache_file;
-		$stmt = $db->prepare($sql);
-		$stmt->bindValue(':filename', $filename, SQLITE3_TEXT);
-		$stmt->bindValue(':dirname', $dirname, SQLITE3_TEXT);
-		$stmt->bindValue(':filesize', $filesize, SQLITE3_INTEGER);
-		$stmt->bindValue(':filetime', $filetime, SQLITE3_INTEGER);
-		$stmt->bindValue(':atime', time(), SQLITE3_INTEGER);
-		$stmt->bindValue(':val', base64_encode(serialize($analysis)), SQLITE3_TEXT);
-		$res = $stmt->execute();
-		return $analysis;
-	}
-
-	/**
-	* create data base table
-	* this is almost the same as MySQL, with the exception of the dirname being added
-	* @return type
-	*/
-	private function create_table() {
-		$db = $this->db;
-		$sql = $this->make_table;
-		return $db->exec($sql);
-	}
-
-	/**
-	* get cached directory
-	*
-	* This function is not in the MySQL extention, it's ment to speed up requesting multiple files
-	* which is ideal for podcasting, playlists, etc.
-	*
-	* @access public
-	* @param string $dir directory to search the cache database for
-	* @return array return an array of matching id3 data
-	*/
-	public function get_cached_dir($dir) {
-		$db = $this->db;
-		$rows = array();
-		$sql = $this->get_cached_dir;
-		$stmt = $db->prepare($sql);
-		$stmt->bindValue(':dirname', $dir, SQLITE3_TEXT);
-		$res = $stmt->execute();
-		while ($row=$res->fetchArray()) {
-			$rows[] = unserialize(base64_decode($row));
-		}
-		return $rows;
-	}
-
-	/**
-	* use the magical __get() for sql queries
-	*
-	* access as easy as $this->{case name}, returns NULL if query is not found
-	*/
-	public function __get($name) {
-		switch($name) {
-			case 'version_check':
-				return "SELECT val FROM $this->table WHERE filename = :filename AND filesize = '-1' AND filetime = '-1' AND analyzetime = '-1'";
-				break;
-			case 'delete_cache':
-				return "DELETE FROM $this->table";
-				break;
-			case 'set_version':
-				return "INSERT INTO $this->table (filename, dirname, filesize, filetime, analyzetime, val) VALUES (:filename, :dirname, -1, -1, -1, :val)";
-				break;
-			case 'get_id3_data':
-				return "SELECT val FROM $this->table WHERE filename = :filename AND filesize = :filesize AND filetime = :filetime";
-				break;
-			case 'cache_file':
-				return "INSERT INTO $this->table (filename, dirname, filesize, filetime, analyzetime, val) VALUES (:filename, :dirname, :filesize, :filetime, :atime, :val)";
-				break;
-			case 'make_table':
-				return "CREATE TABLE IF NOT EXISTS $this->table (filename VARCHAR(255) NOT NULL DEFAULT '', dirname 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', val text not null, PRIMARY KEY (filename, filesize, filetime))";
-				break;
-			case 'get_cached_dir':
-				return "SELECT val FROM $this->table WHERE dirname = :dirname";
-				break;
-		}
-		return null;
-	}
-
-}
diff --git a/lib/getid3/getid3/getid3.lib.php b/lib/getid3/getid3/getid3.lib.php
deleted file mode 100644
index 54008194a..000000000
--- a/lib/getid3/getid3/getid3.lib.php
+++ /dev/null
@@ -1,1342 +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
-{
-
-	public 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;
-	}
-
-	public 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 (self::intValueSupported($truncatednumber)) {
-			$truncatednumber = (int) $truncatednumber;
-		}
-		return $truncatednumber;
-	}
-
-
-	public static function safe_inc(&$variable, $increment=1) {
-		if (isset($variable)) {
-			$variable += $increment;
-		} else {
-			$variable = $increment;
-		}
-		return true;
-	}
-
-	public static function CastAsInt($floatnum) {
-		// convert to float if not already
-		$floatnum = (float) $floatnum;
-
-		// convert a float to type int, only if possible
-		if (self::trunc($floatnum) == $floatnum) {
-			// it's not floating point
-			if (self::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;
-	}
-
-	public static function DecimalizeFraction($fraction) {
-		list($numerator, $denominator) = explode('/', $fraction);
-		return $numerator / ($denominator ? $denominator : 1);
-	}
-
-
-	public static function DecimalBinary2Float($binarynumerator) {
-		$numerator   = self::Bin2Dec($binarynumerator);
-		$denominator = self::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
-		return ($numerator / $denominator);
-	}
-
-
-	public 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);
-	}
-
-
-	public 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   = self::trunc($floatvalue);
-		$floatpart = abs($floatvalue - $intpart);
-		$pointbitstring = '';
-		while (($floatpart != 0) && (strlen($pointbitstring) < $maxbits)) {
-			$floatpart *= 2;
-			$pointbitstring .= (string) self::trunc($floatpart);
-			$floatpart -= self::trunc($floatpart);
-		}
-		$binarypointnumber = decbin($intpart).'.'.$pointbitstring;
-		return $binarypointnumber;
-	}
-
-
-	public 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  = self::NormalizeBinaryPoint(self::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 self::BigEndian2String(self::Bin2Dec($signbit.$exponentbitstring.$fractionbitstring), $bits % 8, false);
-	}
-
-
-	public static function LittleEndian2Float($byteword) {
-		return self::BigEndian2Float(strrev($byteword));
-	}
-
-
-	public 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 = self::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, self::Bin2Dec($exponentstring) - 16383);
-				$fraction = $isnormalized + self::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 = self::Bin2Dec($exponentstring);
-		$fraction = self::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))) * self::DecimalBinary2Float($fractionstring);
-			if ($signbit == '1') {
-				$floatvalue *= -1;
-			}
-		} elseif ($exponent != 0) {
-			$floatvalue = pow(2, ($exponent - (pow(2, $exponentbits - 1) - 1))) * (1 + self::DecimalBinary2Float($fractionstring));
-			if ($signbit == '1') {
-				$floatvalue *= -1;
-			}
-		}
-		return (float) $floatvalue;
-	}
-
-
-	public 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 self::BigEndian2Int()');
-				break;
-			}
-		}
-		return self::CastAsInt($intvalue);
-	}
-
-
-	public static function LittleEndian2Int($byteword, $signed=false) {
-		return self::BigEndian2Int(strrev($byteword), false, $signed);
-	}
-
-
-	public 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;
-	}
-
-
-	public static function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
-		if ($number < 0) {
-			throw new Exception('ERROR: self::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 self::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);
-	}
-
-
-	public 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;
-	}
-
-
-	public 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 self::CastAsInt($decvalue * $signmult);
-	}
-
-
-	public static function Bin2String($binstring) {
-		// return 'hi' for input of '0110100001101001'
-		$string = '';
-		$binstringreversed = strrev($binstring);
-		for ($i = 0; $i < strlen($binstringreversed); $i += 8) {
-			$string = chr(self::Bin2Dec(strrev(substr($binstringreversed, $i, 8)))).$string;
-		}
-		return $string;
-	}
-
-
-	public 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);
-	}
-
-
-	public 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] = self::array_merge_clobber($newarray[$key], $val);
-			} else {
-				$newarray[$key] = $val;
-			}
-		}
-		return $newarray;
-	}
-
-
-	public 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] = self::array_merge_noclobber($newarray[$key], $val);
-			} elseif (!isset($newarray[$key])) {
-				$newarray[$key] = $val;
-			}
-		}
-		return $newarray;
-	}
-
-
-	public static function ksort_recursive(&$theArray) {
-		ksort($theArray);
-		foreach ($theArray as $key => $value) {
-			if (is_array($value)) {
-				self::ksort_recursive($theArray[$key]);
-			}
-		}
-		return true;
-	}
-
-	public 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 '';
-	}
-
-
-	public static function PlaytimeString($seconds) {
-		$sign = (($seconds < 0) ? '-' : '');
-		$seconds = round(abs($seconds));
-		$H = (int) floor( $seconds                            / 3600);
-		$M = (int) floor(($seconds - (3600 * $H)            ) /   60);
-		$S = (int) 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);
-	}
-
-
-	public static function DateMac2Unix($macdate) {
-		// Macintosh timestamp: seconds since 00:00h January 1, 1904
-		// UNIX timestamp:      seconds since 00:00h January 1, 1970
-		return self::CastAsInt($macdate - 2082844800);
-	}
-
-
-	public static function FixedPoint8_8($rawdata) {
-		return self::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (self::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
-	}
-
-
-	public static function FixedPoint16_16($rawdata) {
-		return self::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (self::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
-	}
-
-
-	public static function FixedPoint2_30($rawdata) {
-		$binarystring = self::BigEndian2Bin($rawdata);
-		return self::Bin2Dec(substr($binarystring, 0, 2)) + (float) (self::Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
-	}
-
-
-	public static function CreateDeepArray($ArrayPath, $Separator, $Value) {
-		// assigns $Value to a nested array path:
-		//   $foo = self::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';
-		$ArrayPath = ltrim($ArrayPath, $Separator);
-		if (($pos = strpos($ArrayPath, $Separator)) !== false) {
-			$ReturnedArray[substr($ArrayPath, 0, $pos)] = self::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
-		} else {
-			$ReturnedArray[$ArrayPath] = $Value;
-		}
-		return $ReturnedArray;
-	}
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-	public 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;
-	}
-
-	public 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>
-	// self::md5_data() - returns md5sum for a file from startuing position to absolute end position
-	public static function hash_data($file, $offset, $end, $algorithm) {
-		static $tempdir = '';
-		if (!self::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 self::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 2;
-					}
-				}
-				$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 {
-			self::CopyFileParts($file, $data_filename, $offset, $end - $offset);
-			$result = $hash_function($data_filename);
-		} catch (Exception $e) {
-			throw new Exception('self::CopyFileParts() failed in getid_lib::hash_data(): '.$e->getMessage());
-		}
-		unlink($data_filename);
-		return $result;
-	}
-
-	public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
-		if (!self::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;
-	}
-
-	public 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
-	public 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 .= self::iconv_fallback_int_utf8($charval);
-		}
-		return $newcharstring;
-	}
-
-	// ISO-8859-1 => UTF-16BE
-	public 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
-	public 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)
-	public static function iconv_fallback_iso88591_utf16($string) {
-		return self::iconv_fallback_iso88591_utf16le($string, true);
-	}
-
-	// UTF-8 => ISO-8859-1
-	public 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
-	public 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) ? self::BigEndian2String($charval, 2) : "\x00".'?');
-			}
-		}
-		return $newcharstring;
-	}
-
-	// UTF-8 => UTF-16LE
-	public 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) ? self::LittleEndian2String($charval, 2) : '?'."\x00");
-			}
-		}
-		return $newcharstring;
-	}
-
-	// UTF-8 => UTF-16LE (BOM)
-	public static function iconv_fallback_utf8_utf16($string) {
-		return self::iconv_fallback_utf8_utf16le($string, true);
-	}
-
-	// UTF-16BE => UTF-8
-	public 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 = self::BigEndian2Int(substr($string, $i, 2));
-			$newcharstring .= self::iconv_fallback_int_utf8($charval);
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16LE => UTF-8
-	public 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 = self::LittleEndian2Int(substr($string, $i, 2));
-			$newcharstring .= self::iconv_fallback_int_utf8($charval);
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16BE => ISO-8859-1
-	public 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 = self::BigEndian2Int(substr($string, $i, 2));
-			$newcharstring .= (($charval < 256) ? chr($charval) : '?');
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16LE => ISO-8859-1
-	public 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 = self::LittleEndian2Int(substr($string, $i, 2));
-			$newcharstring .= (($charval < 256) ? chr($charval) : '?');
-		}
-		return $newcharstring;
-	}
-
-	// UTF-16 (BOM) => ISO-8859-1
-	public static function iconv_fallback_utf16_iso88591($string) {
-		$bom = substr($string, 0, 2);
-		if ($bom == "\xFE\xFF") {
-			return self::iconv_fallback_utf16be_iso88591(substr($string, 2));
-		} elseif ($bom == "\xFF\xFE") {
-			return self::iconv_fallback_utf16le_iso88591(substr($string, 2));
-		}
-		return $string;
-	}
-
-	// UTF-16 (BOM) => UTF-8
-	public static function iconv_fallback_utf16_utf8($string) {
-		$bom = substr($string, 0, 2);
-		if ($bom == "\xFE\xFF") {
-			return self::iconv_fallback_utf16be_utf8(substr($string, 2));
-		} elseif ($bom == "\xFF\xFE") {
-			return self::iconv_fallback_utf16le_utf8(substr($string, 2));
-		}
-		return $string;
-	}
-
-	public 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 self::$ConversionFunction($string);
-		}
-		throw new Exception('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
-	}
-
-
-	public 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 = self::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 = self::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;
-	}
-
-
-
-	public 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] : '');
-	}
-
-
-	public 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] : '');
-	}
-
-
-	public static function RGADadjustmentLookup($rawadjustment, $signbit) {
-		$adjustment = $rawadjustment / 10;
-		if ($signbit == 1) {
-			$adjustment *= -1;
-		}
-		return (float) $adjustment;
-	}
-
-
-	public 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;
-	}
-
-	public static function RGADamplitude2dB($amplitude) {
-		return 20 * log10($amplitude);
-	}
-
-
-	public static function GetDataImageSize($imgData, &$imageinfo=array()) {
-		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;
-	}
-
-	public static function ImageExtFromMime($mime_type) {
-		// temporary way, works OK for now, but should be reworked in the future
-		return str_replace(array('image/', 'x-', 'jpeg'), array('', '', 'jpg'), $mime_type);
-	}
-
-	public 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] : '');
-	}
-
-	public 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;', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-
-	public 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] : '');
-	}
-
-	public 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");
-	}
-
-	public static function getFileSizeSyscall($path) {
-		$filesize = false;
-
-		if (GETID3_OS_ISWINDOWS) {
-			if (class_exists('COM')) { // From PHP 5.3.15 and 5.4.5, COM and DOTNET is no longer built into the php core.you have to add COM support in php.ini:
-				$filesystem = new COM('Scripting.FileSystemObject');
-				$file = $filesystem->GetFile($path);
-				$filesize = $file->Size();
-				unset($filesystem, $file);
-			} else {
-				$commandline = 'for %I in ('.escapeshellarg($path).') do @echo %~zI';
-			}
-		} else {
-			$commandline = 'ls -l '.escapeshellarg($path).' | awk \'{print $5}\'';
-		}
-		if (isset($commandline)) {
-			$output = trim(`$commandline`);
-			if (ctype_digit($output)) {
-				$filesize = (float) $output;
-			}
-		}
-		return $filesize;
-	}
-
-}
diff --git a/lib/getid3/getid3/getid3.php b/lib/getid3/getid3/getid3.php
deleted file mode 100644
index e5dd4df1f..000000000
--- a/lib/getid3/getid3/getid3.php
+++ /dev/null
@@ -1,1776 +0,0 @@
-<?php
-/////////////////////////////////////////////////////////////////
-/// 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                  //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-// define a constant rather than looking up every time it is needed
-if (!defined('GETID3_OS_ISWINDOWS')) {
-	define('GETID3_OS_ISWINDOWS', (stripos(PHP_OS, 'WIN') === 0));
-}
-// Get base path of getID3() - ONCE
-if (!defined('GETID3_INCLUDEPATH')) {
-	define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
-}
-
-// 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(PATH_SEPARATOR, $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);
-
-// 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.
-	public $tempdir = GETID3_TEMP_DIR;
-
-	// Protected variables
-	protected $startup_error   = '';
-	protected $startup_warning = '';
-	protected $memory_limit    = 0;
-
-	const VERSION           = '1.9.7-20130705';
-	const FREAD_BUFFER_SIZE = 32768;
-
-	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
-	public 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 = getid3_lib::getFileSizeSyscall($this->info['filenamepath']);
-
-						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->warning('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
-	public function analyze($filename) {
-		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);
-
-			// 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.');
-			}
-			$class = new $class_name($this);
-			$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 calc 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
-	public function error($message) {
-		$this->CleanUp();
-		if (!isset($this->info['error'])) {
-			$this->info['error'] = array();
-		}
-		$this->info['error'][] = $message;
-		return $this->info;
-	}
-
-
-	// private: warning handling
-	public function warning($message) {
-		$this->info['warning'][] = $message;
-		return true;
-	}
-
-
-	// private: CleanUp
-	private 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
-	public 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
-				'aa'   => 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]ds[s2]',
-							'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',
-						),
-
-				// 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
-						),
-
-				// 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',
-						),
-
-				// 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',
-						),
-
-				// TS - audio/video - MPEG-2 Transport Stream
-				'ts' => array(
-							'pattern'   => '^(\x47.{187}){10,}', // packets are 188 bytes long and start with 0x47 "G".  Check for at least 10 packets matching this pattern
-							'group'     => 'audio-video',
-							'module'    => 'ts',
-							'mime_type' => 'video/MP2T',
-						),
-
-
-				// 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)
-				'efax'  => 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;
-	}
-
-
-
-	public function GetFileFormat(&$filedata, $filename='') {
-		// 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)) {
-			// 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
-	public 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));
-			}
-		}
-	}
-
-
-	public 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'),
-				'flac'      => array('vorbiscomment' , 'UTF-8'),
-				'divxtag'   => array('divx'          , 'ISO-8859-1'),
-			);
-		}
-
-		// 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 ($tag_key == 'picture') {
-						unset($this->info[$comment_name]['comments'][$tag_key]);
-					}
-				}
-
-				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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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']);
-		}
-	}
-
-
-	public 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;
-	}
-
-
-	public function CalculateCompressionRatioAudio() {
-		if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate']) || !is_numeric($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;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function getid3_tempnam() {
-		return tempnam($this->tempdir, 'gI3');
-	}
-
-	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
-	protected $data_string_length   = 0;     // string length
-
-	private $dependency_to = null;
-
-
-	public function __construct(getID3 $getid3, $call_module=null) {
-		$this->getid3 = $getid3;
-
-		if ($call_module) {
-			$this->dependency_to = str_replace('getid3_', '', $call_module);
-		}
-	}
-
-
-	// Analyze from file pointer
-	abstract public function Analyze();
-
-
-	// Analyze from string instead
-	public function AnalyzeString($string) {
-		// Enter string mode
-	    $this->setStringMode($string);
-
-		// Save info
-		$saved_avdataoffset = $this->getid3->info['avdataoffset'];
-		$saved_avdataend    = $this->getid3->info['avdataend'];
-		$saved_filesize     = (isset($this->getid3->info['filesize']) ? $this->getid3->info['filesize'] : null); // may be not set if called as dependency without openfile() call
-
-		// Reset some info
-		$this->getid3->info['avdataoffset'] = 0;
-		$this->getid3->info['avdataend']    = $this->getid3->info['filesize'] = $this->data_string_length;
-
-		// 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;
-	}
-
-	public function setStringMode($string) {
-		$this->data_string_flag   = true;
-		$this->data_string        = $string;
-		$this->data_string_length = strlen($string);
-	}
-
-	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);
-		}
-	    $pos = $this->ftell() + $bytes;
-	    if (!getid3_lib::intValueSupported($pos)) {
-			throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().') because beyond PHP filesystem limit', 10);
-	    }
-		@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;
-					break;
-
-				case SEEK_CUR:
-					$this->data_string_position += $bytes;
-					break;
-
-				case SEEK_END:
-					$this->data_string_position = $this->data_string_length + $bytes;
-					break;
-			}
-			return 0;
-	    } else {
-	    	$pos = $bytes;
-	    	if ($whence == SEEK_CUR) {
-				$pos = $this->ftell() + $bytes;
-	    	} elseif ($whence == SEEK_END) {
-				$pos = $this->info['filesize'] + $bytes;
-	    	}
-	    	if (!getid3_lib::intValueSupported($pos)) {
-				throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
-			}
-		}
-		return fseek($this->getid3->fp, $bytes, $whence);
-	}
-
-	protected function feof() {
-		if ($this->data_string_flag) {
-			return $this->data_string_position >= $this->data_string_length;
-		}
-		return feof($this->getid3->fp);
-	}
-
-	final protected function isDependencyFor($module) {
-		return $this->dependency_to == $module;
-	}
-
-	protected function error($text)
-	{
-		$this->getid3->info['error'][] = $text;
-
-		return false;
-	}
-
-	protected function warning($text)
-	{
-		return $this->getid3->warning($text);
-	}
-
-	protected function notice($text)
-	{
-		// does nothing for now
-	}
-
-	public function saveAttachment($name, $offset, $length, $image_mime=null) {
-		try {
-
-			// do not extract at all
-			if ($this->getid3->option_save_attachments === getID3::ATTACHMENTS_NONE) {
-
-				$attachment = null; // do not set any
-
-			// extract to return array
-			} elseif ($this->getid3->option_save_attachments === getID3::ATTACHMENTS_INLINE) {
-
-				$this->fseek($offset);
-				$attachment = $this->fread($length); // get whole data in one pass, till it is anyway stored in memory
-				if ($attachment === false || strlen($attachment) != $length) {
-					throw new Exception('failed to read attachment data');
-				}
-
-			// assume directory path is given
-			} else {
-
-				// set up destination path
-				$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
-				if (!is_dir($dir) || !is_writable($dir)) { // check supplied directory
-					throw new Exception('supplied path ('.$dir.') does not exist, or is not writable');
-				}
-				$dest = $dir.DIRECTORY_SEPARATOR.$name.($image_mime ? '.'.getid3_lib::ImageExtFromMime($image_mime) : '');
-
-				// create dest file
-				if (($fp_dest = fopen($dest, 'wb')) == false) {
-					throw new Exception('failed to create file '.$dest);
-				}
-
-				// copy data
-				$this->fseek($offset);
-				$buffersize = ($this->data_string_flag ? $length : $this->getid3->fread_buffer_size());
-				$bytesleft = $length;
-				while ($bytesleft > 0) {
-					if (($buffer = $this->fread(min($buffersize, $bytesleft))) === false || ($byteswritten = fwrite($fp_dest, $buffer)) === false || ($byteswritten === 0)) {
-						throw new Exception($buffer === false ? 'not enough data to read' : 'failed to write to destination file, may be not enough disk space');
-					}
-					$bytesleft -= $byteswritten;
-				}
-
-				fclose($fp_dest);
-				$attachment = $dest;
-
-			}
-
-		} catch (Exception $e) {
-
-			// close and remove dest file if created
-			if (isset($fp_dest) && is_resource($fp_dest)) {
-				fclose($fp_dest);
-				unlink($dest);
-			}
-
-			// do not set any is case of error
-			$attachment = null;
-			$this->warning('Failed to extract attachment '.$name.': '.$e->getMessage());
-
-		}
-
-		// seek to the end of attachment
-		$this->fseek($offset + $length);
-
-		return $attachment;
-	}
-
-}
-
-
-class getid3_exception extends Exception
-{
-	public $message;
-}
diff --git a/lib/getid3/getid3/module.archive.gzip.php b/lib/getid3/getid3/module.archive.gzip.php
deleted file mode 100644
index 0631d1285..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.
-	public $option_gzip_parse_contents = false; // decode gzipped files, if possible, and parse recursively (.tar.gz for example)
-
-	public 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']) {
-				$thisInfo['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
-	public 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
-	public 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 e3155e40f..000000000
--- a/lib/getid3/getid3/module.archive.rar.php
+++ /dev/null
@@ -1,50 +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
-{
-
-	public $option_use_rar_extension = false;
-
-	public 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;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/module.archive.szip.php b/lib/getid3/getid3/module.archive.szip.php
deleted file mode 100644
index 6f41d2f37..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
-{
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		$this->fseek($info['avdataoffset']);
-		$SZIPHeader = $this->fread(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));
-$info['error'][] = 'SZIP parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-return false;
-
-		while (!$this->feof()) {
-			$NextBlockID = $this->fread(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.
-					$this->fseek(4, SEEK_CUR);
-					break;
-
-				case 'BH':
-					$BHheaderbytes  = getid3_lib::BigEndian2Int($this->fread(3));
-					$BHheaderdata   = $this->fread($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;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/module.archive.tar.php b/lib/getid3/getid3/module.archive.tar.php
deleted file mode 100644
index 0851aa1e9..000000000
--- a/lib/getid3/getid3/module.archive.tar.php
+++ /dev/null
@@ -1,176 +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
-{
-
-	public 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'     => self::display_perms($mode),
-				'uid'      => $uid,
-				'gid'      => $gid,
-				'size'     => $size,
-				'mtime'    => $mtime,
-				'chksum'   => $chksum,
-				'typeflag' => self::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
-	public 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
-	public 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] : '');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.archive.zip.php b/lib/getid3/getid3/module.archive.zip.php
deleted file mode 100644
index 296a7490e..000000000
--- a/lib/getid3/getid3/module.archive.zip.php
+++ /dev/null
@@ -1,512 +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
-{
-
-	public 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) { zero-byte files are valid
-						if (!empty($centraldirectoryentry['filename'])) {
-							$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';
-					}
-
-					// secondary check - we (should) already have all the info we NEED from the Central Directory above, but scanning each
-					// Local File Header entry will
-					foreach ($info['zip']['central_directory'] as $central_directory_entry) {
-						fseek($this->getid3->fp, $central_directory_entry['entry_offset'], SEEK_SET);
-						if ($fileentry = $this->ZIPparseLocalFileHeader()) {
-							$info['zip']['entries'][] = $fileentry;
-						} else {
-							$info['warning'][] = 'Error parsing Local File Header at offset '.$central_directory_entry['entry_offset'];
-						}
-					}
-
-					if (!empty($info['zip']['files']['[Content_Types].xml']) &&
-					    !empty($info['zip']['files']['_rels']['.rels'])      &&
-					    !empty($info['zip']['files']['docProps']['app.xml']) &&
-					    !empty($info['zip']['files']['docProps']['core.xml'])) {
-						   // http://technet.microsoft.com/en-us/library/cc179224.aspx
-						   $info['fileformat'] = 'zip.msoffice';
-						   if (!empty($ThisFileInfo['zip']['files']['ppt'])) {
-						      $info['mime_type'] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
-						   } elseif (!empty($ThisFileInfo['zip']['files']['xl'])) {
-						      $info['mime_type'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-						   } elseif (!empty($ThisFileInfo['zip']['files']['word'])) {
-						      $info['mime_type'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
-						   }
-					}
-
-					return true;
-				}
-			}
-		}
-
-		if (!$this->getZIPentriesFilepointer()) {
-			unset($info['zip']);
-			$info['fileformat'] = '';
-			$info['error'][] = 'Cannot find End Of Central Directory (truncated file?)';
-			return false;
-		}
-
-		// 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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) { // "PK\x03\x04"
-			// 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']);
-			}
-		}
-
-		if ($LocalFileHeader['compressed_size'] == 0) {
-			// *Could* be a zero-byte file
-			// But could also be a file written on the fly that didn't know compressed filesize beforehand.
-			// Correct compressed filesize should be in the data_descriptor located after this file data, and also in Central Directory (at end of zip file)
-			if (!empty($this->getid3->info['zip']['central_directory'])) {
-				foreach ($this->getid3->info['zip']['central_directory'] as $central_directory_entry) {
-					if ($central_directory_entry['entry_offset'] == $LocalFileHeader['offset']) {
-						if ($central_directory_entry['compressed_size'] > 0) {
-							// overwrite local zero value (but not ['raw']'compressed_size']) so that seeking for data_descriptor (and next file entry) works correctly
-							$LocalFileHeader['compressed_size'] = $central_directory_entry['compressed_size'];
-						}
-						break;
-					}
-				}
-			}
-
-		}
-		$LocalFileHeader['data_offset'] = ftell($this->getid3->fp);
-		fseek($this->getid3->fp, $LocalFileHeader['compressed_size'], SEEK_CUR); // this should (but may not) match value in $LocalFileHeader['raw']['compressed_size'] -- $LocalFileHeader['compressed_size'] could have been overwritten above with value from Central Directory
-
-		if ($LocalFileHeader['flags']['data_descriptor_used']) {
-			$DataDescriptor = fread($this->getid3->fp, 16);
-			$LocalFileHeader['data_descriptor']['signature']         = getid3_lib::LittleEndian2Int(substr($DataDescriptor,  0, 4));
-			if ($LocalFileHeader['data_descriptor']['signature'] != 0x08074B50) { // "PK\x07\x08"
-				$this->getid3->warning[] = 'invalid Local File Header Data Descriptor Signature at offset '.(ftell($this->getid3->fp) - 16).' - expecting 08 07 4B 50, found '.getid3_lib::PrintHexBytes($LocalFileHeader['data_descriptor']['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['data_descriptor']['crc_32']            = getid3_lib::LittleEndian2Int(substr($DataDescriptor,  4, 4));
-			$LocalFileHeader['data_descriptor']['compressed_size']   = getid3_lib::LittleEndian2Int(substr($DataDescriptor,  8, 4));
-			$LocalFileHeader['data_descriptor']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 12, 4));
-			if (!$LocalFileHeader['raw']['compressed_size'] && $LocalFileHeader['data_descriptor']['compressed_size']) {
-				foreach ($this->getid3->info['zip']['central_directory'] as $central_directory_entry) {
-					if ($central_directory_entry['entry_offset'] == $LocalFileHeader['offset']) {
-						if ($LocalFileHeader['data_descriptor']['compressed_size'] == $central_directory_entry['compressed_size']) {
-							// $LocalFileHeader['compressed_size'] already set from Central Directory
-						} else {
-							$this->getid3->info['warning'][] = 'conflicting compressed_size from data_descriptor ('.$LocalFileHeader['data_descriptor']['compressed_size'].') vs Central Directory ('.$central_directory_entry['compressed_size'].') for file at offset '.$LocalFileHeader['offset'];
-						}
-
-						if ($LocalFileHeader['data_descriptor']['uncompressed_size'] == $central_directory_entry['uncompressed_size']) {
-							$LocalFileHeader['uncompressed_size'] = $LocalFileHeader['data_descriptor']['uncompressed_size'];
-						} else {
-							$this->getid3->info['warning'][] = 'conflicting uncompressed_size from data_descriptor ('.$LocalFileHeader['data_descriptor']['uncompressed_size'].') vs Central Directory ('.$central_directory_entry['uncompressed_size'].') for file at offset '.$LocalFileHeader['offset'];
-						}
-						break;
-					}
-				}
-			}
-		}
-		return $LocalFileHeader;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-
-	public static function ZIPparseGeneralPurposeFlags($flagbytes, $compressionmethod) {
-		// https://users.cs.jmu.edu/buchhofp/forensics/formats/pkzip-printable.html
-		$ParsedFlags['encrypted']               = (bool) ($flagbytes & 0x0001);
-		//                                                             0x0002 -- see below
-		//                                                             0x0004 -- see below
-		$ParsedFlags['data_descriptor_used']    = (bool) ($flagbytes & 0x0008);
-		$ParsedFlags['enhanced_deflation']      = (bool) ($flagbytes & 0x0010);
-		$ParsedFlags['compressed_patched_data'] = (bool) ($flagbytes & 0x0020);
-		$ParsedFlags['strong_encryption']       = (bool) ($flagbytes & 0x0040);
-		//                                                             0x0080 - unused
-		//                                                             0x0100 - unused
-		//                                                             0x0200 - unused
-		//                                                             0x0400 - unused
-		$ParsedFlags['language_encoding']       = (bool) ($flagbytes & 0x0800);
-		//                                                             0x1000 - reserved
-		$ParsedFlags['mask_header_values']      = (bool) ($flagbytes & 0x2000);
-		//                                                             0x4000 - reserved
-		//                                                             0x8000 - reserved
-
-		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;
-		}
-
-		return $ParsedFlags;
-	}
-
-
-	public 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',
-			18 => 'OS/400',
-			19 => 'OS/X (Darwin)',
-		);
-
-		return (isset($ZIPversionOSLookup[$index]) ? $ZIPversionOSLookup[$index] : '[unknown]');
-	}
-
-	public static function ZIPcompressionMethodLookup($index) {
-		// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/ZIP.html
-		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 => 'Imploded (old IBM TERSE)',
-			11 => 'RESERVED[11]',
-			12 => 'BZIP2',
-			13 => 'RESERVED[13]',
-			14 => 'LZMA (EFS)',
-			15 => 'RESERVED[15]',
-			16 => 'RESERVED[16]',
-			17 => 'RESERVED[17]',
-			18 => 'IBM TERSE (new)',
-			19 => 'IBM LZ77 z Architecture (PFS)',
-			96 => 'JPEG recompressed',
-			97 => 'WavPack compressed',
-			98 => 'PPMd version I, Rev 1',
-		);
-
-		return (isset($ZIPcompressionMethodLookup[$index]) ? $ZIPcompressionMethodLookup[$index] : '[unknown]');
-	}
-
-	public 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);
-	}
-
-}
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 cfc60a780..000000000
--- a/lib/getid3/getid3/module.audio-video.asf.php
+++ /dev/null
@@ -1,2019 +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
-{
-
-	public 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));
-			}
-		}
-	}
-
-	public 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::parseWAVEFORMATex(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::parseWAVEFORMATex(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::fourccLookup($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;
-	}
-
-	public 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');
-	}
-
-	public 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;
-	}
-
-	public static function GUIDname($GUIDstring) {
-		static $GUIDarray = array();
-		if (empty($GUIDarray)) {
-			$GUIDarray = self::KnownGUIDs();
-		}
-		return array_search($GUIDstring, $GUIDarray);
-	}
-
-	public 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');
-	}
-
-	public 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;
-	}
-
-	public 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);
-	}
-
-	public 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;
-	}
-
-	public 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] : '');
-	}
-
-	public 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;
-	}
-
-
-	public 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');
-	}
-
-	public 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
-	public static function TrimConvert($string) {
-		return trim(getid3_lib::iconv_fallback('UTF-16LE', 'ISO-8859-1', self::TrimTerm($string)), ' ');
-	}
-
-
-	// Remove terminator 00 00
-	public 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;
-	}
-
-}
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 192627665..000000000
--- a/lib/getid3/getid3/module.audio-video.bink.php
+++ /dev/null
@@ -1,71 +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
-{
-
-	public 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;
-
-	}
-
-	public 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;
-	}
-
-	public function ParseSmacker() {
-		$info = &$this->getid3->info;
-		$info['fileformat']          = 'smacker';
-		$info['video']['dataformat'] = 'smacker';
-
-		return true;
-	}
-
-}
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 f9c4cf3ea..000000000
--- a/lib/getid3/getid3/module.audio-video.flv.php
+++ /dev/null
@@ -1,729 +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
-{
-	public $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
-
-	public 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;
-	}
-
-
-	public 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);
-	}
-
-	public function FLVaudioRate($id) {
-		$FLVaudioRate = array(
-			0 =>  5500,
-			1 => 11025,
-			2 => 22050,
-			3 => 44100,
-		);
-		return (isset($FLVaudioRate[$id]) ? $FLVaudioRate[$id] : false);
-	}
-
-	public function FLVaudioBitDepth($id) {
-		$FLVaudioBitDepth = array(
-			0 =>  8,
-			1 => 16,
-		);
-		return (isset($FLVaudioBitDepth[$id]) ? $FLVaudioBitDepth[$id] : false);
-	}
-
-	public 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 {
-	public $bytes;
-	public $pos;
-
-	public function AMFStream(&$bytes) {
-		$this->bytes =& $bytes;
-		$this->pos = 0;
-	}
-
-	public function readByte() {
-		return getid3_lib::BigEndian2Int(substr($this->bytes, $this->pos++, 1));
-	}
-
-	public function readInt() {
-		return ($this->readByte() << 8) + $this->readByte();
-	}
-
-	public function readLong() {
-		return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
-	}
-
-	public function readDouble() {
-		return getid3_lib::BigEndian2Float($this->read(8));
-	}
-
-	public function readUTF() {
-		$length = $this->readInt();
-		return $this->read($length);
-	}
-
-	public function readLongUTF() {
-		$length = $this->readLong();
-		return $this->read($length);
-	}
-
-	public function read($length) {
-		$val = substr($this->bytes, $this->pos, $length);
-		$this->pos += $length;
-		return $val;
-	}
-
-	public function peekByte() {
-		$pos = $this->pos;
-		$val = $this->readByte();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	public function peekInt() {
-		$pos = $this->pos;
-		$val = $this->readInt();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	public function peekLong() {
-		$pos = $this->pos;
-		$val = $this->readLong();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	public function peekDouble() {
-		$pos = $this->pos;
-		$val = $this->readDouble();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	public function peekUTF() {
-		$pos = $this->pos;
-		$val = $this->readUTF();
-		$this->pos = $pos;
-		return $val;
-	}
-
-	public function peekLongUTF() {
-		$pos = $this->pos;
-		$val = $this->readLongUTF();
-		$this->pos = $pos;
-		return $val;
-	}
-}
-
-class AMFReader {
-	public $stream;
-
-	public function AMFReader(&$stream) {
-		$this->stream =& $stream;
-	}
-
-	public 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;
-	}
-
-	public function readDouble() {
-		return $this->stream->readDouble();
-	}
-
-	public function readBoolean() {
-		return $this->stream->readByte() == 1;
-	}
-
-	public function readString() {
-		return $this->stream->readUTF();
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function readArray() {
-		$length = $this->stream->readLong();
-		$data = array();
-
-		for ($i = 0; $i < $length; $i++) {
-			$data[] = $this->readData();
-		}
-		return $data;
-	}
-
-	public function readDate() {
-		$timestamp = $this->stream->readDouble();
-		$timezone = $this->stream->readInt();
-		return $timestamp;
-	}
-
-	public function readLongString() {
-		return $this->stream->readLongUTF();
-	}
-
-	public function readXML() {
-		return $this->stream->readLongUTF();
-	}
-
-	public function readTypedObject() {
-		$className = $this->stream->readUTF();
-		return $this->readObject();
-	}
-}
-
-class AVCSequenceParameterSetReader {
-	public $sps;
-	public $start = 0;
-	public $currentBytes = 0;
-	public $currentBits = 0;
-	public $width;
-	public $height;
-
-	public function AVCSequenceParameterSetReader($sps) {
-		$this->sps = $sps;
-	}
-
-	public 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;
-	}
-
-	public function skipBits($bits) {
-		$newBits = $this->currentBits + $bits;
-		$this->currentBytes += (int)floor($newBits / 8);
-		$this->currentBits = $newBits % 8;
-	}
-
-	public function getBit() {
-		$result = (getid3_lib::BigEndian2Int(substr($this->sps, $this->currentBytes, 1)) >> (7 - $this->currentBits)) & 0x01;
-		$this->skipBits(1);
-		return $result;
-	}
-
-	public function getBits($bits) {
-		$result = 0;
-		for ($i = 0; $i < $bits; $i++) {
-			$result = ($result << 1) + $this->getBit();
-		}
-		return $result;
-	}
-
-	public 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;
-	}
-
-	public function expGolombSe() {
-		$result = $this->expGolombUe();
-		if (($result & 0x01) == 0) {
-			return -($result >> 1);
-		} else {
-			return ($result + 1) >> 1;
-		}
-	}
-
-	public function getWidth() {
-		return $this->width;
-	}
-
-	public function getHeight() {
-		return $this->height;
-	}
-}
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 d97550ba5..000000000
--- a/lib/getid3/getid3/module.audio-video.matroska.php
+++ /dev/null
@@ -1,1765 +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                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-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.
-define('EBML_ID_OLDSTEREOMODE',                 0x13B9); //         [53][B9] -- Bogus StereoMode value used in old versions of libmatroska. DO NOT USE. (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.
-
-
-/**
-* @tutorial http://www.matroska.org/technical/specs/index.html
-*
-* @todo Rewrite EBML parser to reduce it's size and honor default element values
-* @todo After rewrite implement stream size calculation, that will provide additional useful info and enable AAC/FLAC audio bitrate detection
-*/
-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::CodecIDtoCommonName($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'];
-						$track_info['display_unit'] = self::displayUnit(isset($trackarray['DisplayUnit']) ? $trackarray['DisplayUnit'] : 0);
-						$track_info['display_x']    = (isset($trackarray['DisplayWidth']) ? $trackarray['DisplayWidth'] : $trackarray['PixelWidth']);
-						$track_info['display_y']    = (isset($trackarray['DisplayHeight']) ? $trackarray['DisplayHeight'] : $trackarray['PixelHeight']);
-
-						if (isset($trackarray['PixelCropBottom'])) { $track_info['crop_bottom'] = $trackarray['PixelCropBottom']; }
-						if (isset($trackarray['PixelCropTop']))    { $track_info['crop_top']    = $trackarray['PixelCropTop']; }
-						if (isset($trackarray['PixelCropLeft']))   { $track_info['crop_left']   = $trackarray['PixelCropLeft']; }
-						if (isset($trackarray['PixelCropRight']))  { $track_info['crop_right']  = $trackarray['PixelCropRight']; }
-						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->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::fourccLookup($parsed['fourcc']);
-								$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $parsed;
-								break;
-
-							/*case 'V_MPEG4/ISO/AVC':
-								$h264['profile']    = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 1, 1));
-								$h264['level']      = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 3, 1));
-								$rn                 = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 4, 1));
-								$h264['NALUlength'] = ($rn & 3) + 1;
-								$rn                 = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 5, 1));
-								$nsps               = ($rn & 31);
-								$offset             = 6;
-								for ($i = 0; $i < $nsps; $i ++) {
-									$length        = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], $offset, 2));
-									$h264['SPS'][] = substr($trackarray['CodecPrivate'], $offset + 2, $length);
-									$offset       += 2 + $length;
-								}
-								$npps               = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], $offset, 1));
-								$offset            += 1;
-								for ($i = 0; $i < $npps; $i ++) {
-									$length        = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], $offset, 2));
-									$h264['PPS'][] = substr($trackarray['CodecPrivate'], $offset + 2, $length);
-									$offset       += 2 + $length;
-								}
-								$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $h264;
-								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_MPEG/L2':
-							case 'A_FLAC':
-								if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.($track_info['dataformat'] == 'mp2' ? 'mp3' : $track_info['dataformat']).'.php', __FILE__, false)) {
-									$this->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->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();
-								if ($track_info['dataformat'] != 'flac') {
-									$getid3_temp->openfile($this->getid3->filename);
-								}
-								$getid3_temp->info['avdataoffset'] = $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['offset'];
-								if ($track_info['dataformat'][0] == 'm' || $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'] == 'mp2' ? 'mp3' : $track_info['dataformat']);
-								$header_data_key = $track_info['dataformat'][0] == 'm' ? 'mpeg' : $track_info['dataformat'];
-								$getid3_audio = new $class($getid3_temp, __CLASS__);
-								if ($track_info['dataformat'] == 'flac') {
-									$getid3_audio->AnalyzeString($trackarray['CodecPrivate']);
-								}
-								else {
-									$getid3_audio->Analyze();
-								}
-								if (!empty($getid3_temp->info[$header_data_key])) {
-									$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->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->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->warning($class.'() says: ['.$newerror.']');
-									}
-								}
-								unset($getid3_temp, $getid3_audio);
-								break;
-
-							case 'A_AAC':
-							case 'A_AAC/MPEG2/LC':
-							case 'A_AAC/MPEG2/LC/SBR':
-							case 'A_AAC/MPEG4/LC':
-							case 'A_AAC/MPEG4/LC/SBR':
-							    $this->warning($trackarray['CodecID'].' audio data contains no header, audio/video bitrates can\'t be calculated');
-								break;
-
-							case 'A_VORBIS':
-								if (!isset($trackarray['CodecPrivate'])) {
-									$this->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->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->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.ogg.php"');
-									break;
-								}
-
-								// create temp instance
-								$getid3_temp = new getID3();
-
-								// 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->warning('getid3_ogg() says: ['.$newerror.']');
-									}
-								}
-								if (!empty($getid3_temp->info['warning'])) {
-									foreach ($getid3_temp->info['warning'] as $newerror) {
-										$this->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->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"');
-									break;
-								}
-
-								$parsed = getid3_riff::parseWAVEFORMATex($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->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']);
-			}
-		}
-
-		// process attachments
-		if (isset($info['matroska']['attachments']) && $this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE) {
-			foreach ($info['matroska']['attachments'] as $i => $entry) {
-				if (strpos($entry['FileMimeType'], 'image/') === 0 && !empty($entry['FileData'])) {
-					$info['matroska']['comments']['picture'][] = array('data' => $entry['FileData'], 'image_mime' => $entry['FileMimeType'], 'filename' => $entry['FileName']);
-				}
-			}
-		}
-
-		// 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;
-
-							default:
-								$this->unhandledElement('header', __LINE__, $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, EBML_ID_CODECPRIVATE))) {
-												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']] = $this->readEBMLelementData($subelement['length'], true);
-														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_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:
-																case EBML_ID_STEREOMODE:
-																case EBML_ID_OLDSTEREOMODE:
-																	$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_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:
-											$info_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
-											break;
-
-										case EBML_ID_SEGMENTFAMILY:
-											$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;
-
-										case EBML_ID_CHAPTERTRANSLATE:
-											$chaptertranslate_entry = array();
-
-											while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
-												switch ($sub_subelement['id']) {
-
-													case EBML_ID_CHAPTERTRANSLATEEDITIONUID:
-														$chaptertranslate_entry[$sub_subelement['id_name']][] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													case EBML_ID_CHAPTERTRANSLATECODEC:
-														$chaptertranslate_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
-														break;
-
-													case EBML_ID_CHAPTERTRANSLATEID:
-														$chaptertranslate_entry[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
-														break;
-
-													default:
-														$this->unhandledElement('info.chaptertranslate', __LINE__, $sub_subelement);
-												}
-											}
-											$info_entry[$subelement['id_name']] = $chaptertranslate_entry;
-											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::TargetTypeValue($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'];
-
-														$attachedfile_entry[$sub_subelement['id_name']] = $this->saveAttachment(
-															$attachedfile_entry['FileName'],
-															$attachedfile_entry['data_offset'],
-															$attachedfile_entry['data_length']);
-
-														$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);
-												}
-											}
-											$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'])) {
-											if (count($info['matroska']['track_data_offsets']) == count($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)) {
-			$read_bytes = max($min_data, $this->getid3->fread_buffer_size());
-
-			try {
-				$this->fseek($this->current_offset);
-				$this->EBMLbuffer_offset = $this->current_offset;
-				$this->EBMLbuffer        = $this->fread($read_bytes);
-				$this->EBMLbuffer_length = strlen($this->EBMLbuffer);
-			} catch (getid3_exception $e) {
-				$this->warning('EBML parser: '.$e->getMessage());
-				return false;
-			}
-
-			if ($this->EBMLbuffer_length == 0 && $this->feof()) {
-				return $this->error('EBML parser: ran out of file at offset '.$this->current_offset);
-			}
-		}
-		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, $check_buffer=false) {
-		if ($check_buffer && !$this->EnsureBufferHasEnoughData($length)) {
-			return false;
-		}
-		$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->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
-
-		$block_data = array();
-		$block_data['tracknumber'] = $this->readEBMLint();
-		$block_data['timecode']    = getid3_lib::BigEndian2Int($this->readEBMLelementData(2), false, true);
-		$block_data['flags_raw']   = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
-
-		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
-			$block_data['flags']['keyframe']  = (($block_data['flags_raw'] & 0x80) >> 7);
-			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0x70) >> 4);
-		}
-		else {
-			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0xF0) >> 4);
-		}
-		$block_data['flags']['invisible'] = (bool)(($block_data['flags_raw'] & 0x08) >> 3);
-		$block_data['flags']['lacing']    =       (($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) {
-			$block_data['flags']['discardable'] = (($block_data['flags_raw'] & 0x01));
-		}
-		else {
-			//$block_data['flags']['reserved2'] = (($block_data['flags_raw'] & 0x01) >> 0);
-		}
-		$block_data['flags']['lacing_type'] = self::BlockLacingType($block_data['flags']['lacing']);
-
-		// Lace (when lacing bit is set)
-		if ($block_data['flags']['lacing'] > 0) {
-			$block_data['lace_frames'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1)) + 1; // Number of frames in the lace-1 (uint8)
-			if ($block_data['flags']['lacing'] != 0x02) {
-				for ($i = 1; $i < $block_data['lace_frames']; $i ++) { // 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).
-					if ($block_data['flags']['lacing'] == 0x03) { // EBML lacing
-						$block_data['lace_frames_size'][$i] = $this->readEBMLint(); // 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.
-					}
-					else { // Xiph lacing
-						$block_data['lace_frames_size'][$i] = 0;
-						do {
-							$size = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
-							$block_data['lace_frames_size'][$i] += $size;
-						}
-						while ($size == 255);
-					}
-				}
-				if ($block_data['flags']['lacing'] == 0x01) { // calc size of the last frame only for Xiph lacing, till EBML sizes are now anyway determined incorrectly
-					$block_data['lace_frames_size'][] = $element['end'] - $this->current_offset - array_sum($block_data['lace_frames_size']);
-				}
-			}
-		}
-
-		if (!isset($info['matroska']['track_data_offsets'][$block_data['tracknumber']])) {
-			$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['offset'] = $this->current_offset;
-			$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['length'] = $element['end'] - $this->current_offset;
-			//$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['total_length'] = 0;
-		}
-		//$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['total_length'] += $info['matroska']['track_data_offsets'][$block_data['tracknumber']]['length'];
-		//$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['duration']      = $block_data['timecode'] * ((isset($info['matroska']['info'][0]['TimecodeScale']) ? $info['matroska']['info'][0]['TimecodeScale'] : 1000000) / 1000000000);
-
-		// set offset manually
-		$this->current_offset = $element['end'];
-
-		return $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 TargetTypeValue($target_type) {
-		// http://www.matroska.org/technical/specs/tagging/index.html
-		static $TargetTypeValue = array();
-		if (empty($TargetTypeValue)) {
-			$TargetTypeValue[10] = 'A: ~ V:shot';                                           // the lowest hierarchy found in music or movies
-			$TargetTypeValue[20] = 'A:subtrack/part/movement ~ V:scene';                    // corresponds to parts of a track for audio (like a movement)
-			$TargetTypeValue[30] = 'A:track/song ~ V:chapter';                              // the common parts of an album or a movie
-			$TargetTypeValue[40] = 'A:part/session ~ V:part/session';                       // when an album or episode has different logical parts
-			$TargetTypeValue[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)
-			$TargetTypeValue[60] = 'A:edition/issue/volume/opus ~ V:season/sequel/volume';  // a list of lower levels grouped together
-			$TargetTypeValue[70] = 'A:collection ~ V:collection';                           // the high hierarchy consisting of many different lower items
-		}
-		return (isset($TargetTypeValue[$target_type]) ? $TargetTypeValue[$target_type] : $target_type);
-	}
-
-	public static function BlockLacingType($lacingtype) {
-		// http://matroska.org/technical/specs/index.html#block_structure
-		static $BlockLacingType = array();
-		if (empty($BlockLacingType)) {
-			$BlockLacingType[0x00] = 'no lacing';
-			$BlockLacingType[0x01] = 'Xiph lacing';
-			$BlockLacingType[0x02] = 'fixed-size lacing';
-			$BlockLacingType[0x03] = 'EBML lacing';
-		}
-		return (isset($BlockLacingType[$lacingtype]) ? $BlockLacingType[$lacingtype] : $lacingtype);
-	}
-
-	public static function CodecIDtoCommonName($codecid) {
-		// http://www.matroska.org/technical/specs/codecid/index.html
-		static $CodecIDlist = array();
-		if (empty($CodecIDlist)) {
-			$CodecIDlist['A_AAC']            = 'aac';
-			$CodecIDlist['A_AAC/MPEG2/LC']   = 'aac';
-			$CodecIDlist['A_AC3']            = 'ac3';
-			$CodecIDlist['A_DTS']            = 'dts';
-			$CodecIDlist['A_FLAC']           = 'flac';
-			$CodecIDlist['A_MPEG/L1']        = 'mp1';
-			$CodecIDlist['A_MPEG/L2']        = 'mp2';
-			$CodecIDlist['A_MPEG/L3']        = 'mp3';
-			$CodecIDlist['A_PCM/INT/LIT']    = 'pcm';       // PCM Integer Little Endian
-			$CodecIDlist['A_PCM/INT/BIG']    = 'pcm';       // PCM Integer Big Endian
-			$CodecIDlist['A_QUICKTIME/QDMC'] = 'quicktime'; // Quicktime: QDesign Music
-			$CodecIDlist['A_QUICKTIME/QDM2'] = 'quicktime'; // Quicktime: QDesign Music v2
-			$CodecIDlist['A_VORBIS']         = 'vorbis';
-			$CodecIDlist['V_MPEG1']          = 'mpeg';
-			$CodecIDlist['V_THEORA']         = 'theora';
-			$CodecIDlist['V_REAL/RV40']      = 'real';
-			$CodecIDlist['V_REAL/RV10']      = 'real';
-			$CodecIDlist['V_REAL/RV20']      = 'real';
-			$CodecIDlist['V_REAL/RV30']      = 'real';
-			$CodecIDlist['V_QUICKTIME']      = 'quicktime'; // Quicktime
-			$CodecIDlist['V_MPEG4/ISO/AP']   = 'mpeg4';
-			$CodecIDlist['V_MPEG4/ISO/ASP']  = 'mpeg4';
-			$CodecIDlist['V_MPEG4/ISO/AVC']  = 'h264';
-			$CodecIDlist['V_MPEG4/ISO/SP']   = 'mpeg4';
-			$CodecIDlist['V_VP8']            = 'vp8';
-			$CodecIDlist['V_MS/VFW/FOURCC']  = 'riff';
-			$CodecIDlist['A_MS/ACM']         = 'riff';
-		}
-		return (isset($CodecIDlist[$codecid]) ? $CodecIDlist[$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_OLDSTEREOMODE]              = 'OldStereoMode';
-			$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));
-	}
-
-	public static function displayUnit($value) {
-		// http://www.matroska.org/technical/specs/index.html#DisplayUnit
-		static $units = array(
-			0 => 'pixels',
-			1 => 'centimeters',
-			2 => 'inches',
-			3 => 'Display Aspect Ratio');
-
-		return (isset($units[$value]) ? $units[$value] : 'unknown');
-	}
-
-	private static function getDefaultStreamInfo($streams)
-	{
-		foreach (array_reverse($streams) as $stream) {
-			if ($stream['default']) {
-				break;
-			}
-		}
-
-		$unset = array('default', 'name');
-		foreach ($unset as $u) {
-			if (isset($stream[$u])) {
-				unset($stream[$u]);
-			}
-		}
-
-		$info = $stream;
-		$info['streams'] = $streams;
-
-		return $info;
-	}
-
-}
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 999c5d9a5..000000000
--- a/lib/getid3/getid3/module.audio-video.mpeg.php
+++ /dev/null
@@ -1,296 +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
-{
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-	public 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] : '');
-	}
-
-}
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 3191eb3b2..000000000
--- a/lib/getid3/getid3/module.audio-video.nsv.php
+++ /dev/null
@@ -1,223 +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
-{
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-
-	public 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);
-	}
-
-}
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 31f28cf31..000000000
--- a/lib/getid3/getid3/module.audio-video.quicktime.php
+++ /dev/null
@@ -1,2221 +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                          //
-// dependencies: module.tag.id3v2.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); // needed for ISO 639-2 language code lookup
-
-class getid3_quicktime extends getid3_handler
-{
-
-	public $ReturnAtomData        = true;
-	public $ParseAllPossibleAtoms = false;
-
-	public 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;
-	}
-
-	public 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);
-		$atom_parent = end($atomHierarchy); // http://www.getid3.org/phpBB3/viewtopic.php?t=1717
-		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);
-							if ($boxsmallsize <= 1) {
-								$info['warning'][] = 'Invalid QuickTime atom smallbox size "'.$boxsmallsize.'" in atom "'.$atomname.'" at offset: '.($atom_structure['offset'] + $atomoffset);
-								$atom_structure['data'] = null;
-								$atomoffset = strlen($atom_data);
-								break;
-							}
-							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);
-							if ($boxsize <= 1) {
-								$info['warning'][] = 'Invalid QuickTime atom box size "'.$boxsize.'" in atom "'.$atomname.'" at offset: '.($atom_structure['offset'] + $atomoffset);
-								$atom_structure['data'] = null;
-								$atomoffset = strlen($atom_data);
-								break;
-							}
-							$atomoffset += $boxsize;
-
-							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;
-
-							}
-						}
-					}
-				}
-				$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 tracks
-							$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));
-
-							// video tracks
-							// http://developer.apple.com/library/mac/#documentation/QuickTime/QTFF/QTFFChap3/qtff3.html
-							$atom_structure['sample_description_table'][$i]['temporal_quality'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  8,  4));
-							$atom_structure['sample_description_table'][$i]['spatial_quality']  =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12,  4));
-							$atom_structure['sample_description_table'][$i]['width']            =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16,  2));
-							$atom_structure['sample_description_table'][$i]['height']           =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18,  2));
-							$atom_structure['sample_description_table'][$i]['resolution_x']     = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24,  4));
-							$atom_structure['sample_description_table'][$i]['resolution_y']     = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 28,  4));
-							$atom_structure['sample_description_table'][$i]['data_size']        =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32,  4));
-							$atom_structure['sample_description_table'][$i]['frame_count']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 36,  2));
-							$atom_structure['sample_description_table'][$i]['compressor_name']  =                             substr($atom_structure['sample_description_table'][$i]['data'], 38,  4);
-							$atom_structure['sample_description_table'][$i]['pixel_depth']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 42,  2));
-							$atom_structure['sample_description_table'][$i]['color_table_id']   =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 44,  2));
-
-							switch ($atom_structure['sample_description_table'][$i]['data_format']) {
-								case '2vuY':
-								case 'avc1':
-								case 'cvid':
-								case 'dvc ':
-								case 'dvcp':
-								case 'gif ':
-								case 'h263':
-								case 'jpeg':
-								case 'kpcd':
-								case 'mjpa':
-								case 'mjpb':
-								case 'mp4v':
-								case 'png ':
-								case 'raw ':
-								case 'rle ':
-								case 'rpza':
-								case 'smc ':
-								case 'SVQ1':
-								case 'SVQ3':
-								case 'tiff':
-								case 'v210':
-								case 'v216':
-								case 'v308':
-								case 'v408':
-								case 'v410':
-								case 'yuv2':
-									$info['fileformat'] = 'mp4';
-									$info['video']['fourcc'] = $atom_structure['sample_description_table'][$i]['data_format'];
-// http://www.getid3.org/phpBB3/viewtopic.php?t=1550
-//if ((!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($atom_structure['sample_description_table'][$i]['width'])) && (empty($info['video']['resolution_x']) || empty($info['video']['resolution_y']) || (number_format($info['video']['resolution_x'], 6) != number_format(round($info['video']['resolution_x']), 6)) || (number_format($info['video']['resolution_y'], 6) != number_format(round($info['video']['resolution_y']), 6)))) { // ugly check for floating point numbers
-if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($atom_structure['sample_description_table'][$i]['height'])) {
-	// assume that values stored here are more important than values stored in [tkhd] atom
-	$info['video']['resolution_x'] = $atom_structure['sample_description_table'][$i]['width'];
-	$info['video']['resolution_y'] = $atom_structure['sample_description_table'][$i]['height'];
-	$info['quicktime']['video']['resolution_x'] = $info['video']['resolution_x'];
-	$info['quicktime']['video']['resolution_y'] = $info['video']['resolution_y'];
-}
-									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));
-// http://developer.apple.com/library/mac/#documentation/QuickTime/RM/MovieBasics/MTEditing/K-Chapter/11MatrixFunctions.html
-// http://developer.apple.com/library/mac/#documentation/QuickTime/qtff/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-18737
-				$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::FixedPoint2_30(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::FixedPoint2_30(substr($atom_data, 60, 4));
-				$atom_structure['matrix_x']            = getid3_lib::FixedPoint16_16(substr($atom_data, 64, 4));
-				$atom_structure['matrix_y']            = getid3_lib::FixedPoint16_16(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 {
-					// see: http://www.getid3.org/phpBB3/viewtopic.php?t=1295
-					//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: "'.$atomname.'" ('.trim(getid3_lib::PrintHexBytes($atomname)).') at offset '.$baseoffset;
-				$atom_structure['data'] = $atom_data;
-				break;
-		}
-		array_pop($atomHierarchy);
-		return $atom_structure;
-	}
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public function QuicktimeLanguageLookup($languageid) {
-		// http://developer.apple.com/library/mac/#documentation/QuickTime/QTFF/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-34353
-		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';
-			$QuicktimeLanguageLookup[32767] = 'Unspecified';
-		}
-		if (($languageid > 138) && ($languageid < 32767)) {
-			/*
-			ISO Language Codes - http://www.loc.gov/standards/iso639-2/php/code_list.php
-			Because the language codes specified by ISO 639-2/T are three characters long, they must be packed to fit into a 16-bit field.
-			The packing algorithm must map each of the three characters, which are always lowercase, into a 5-bit integer and then concatenate
-			these integers into the least significant 15 bits of a 16-bit integer, leaving the 16-bit integer's most significant bit set to zero.
-			
-			One algorithm for performing this packing is to treat each ISO character as a 16-bit integer. Subtract 0x60 from the first character
-			and multiply by 2^10 (0x400), subtract 0x60 from the second character and multiply by 2^5 (0x20), subtract 0x60 from the third character,
-			and add the three 16-bit values. This will result in a single 16-bit value with the three codes correctly packed into the 15 least
-			significant bits and the most significant bit set to zero.
-			*/
-			$iso_language_id  = '';
-			$iso_language_id .= chr((($languageid & 0x7C00) >> 10) + 0x60);
-			$iso_language_id .= chr((($languageid & 0x03E0) >>  5) + 0x60);
-			$iso_language_id .= chr((($languageid & 0x001F) >>  0) + 0x60);
-			$QuicktimeLanguageLookup[$languageid] = getid3_id3v2::LanguageLookup($iso_language_id);
-		}
-		return (isset($QuicktimeLanguageLookup[$languageid]) ? $QuicktimeLanguageLookup[$languageid] : 'invalid');
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public function QuicktimeDCOMLookup($compressionid) {
-		static $QuicktimeDCOMLookup = array();
-		if (empty($QuicktimeDCOMLookup)) {
-			$QuicktimeDCOMLookup['zlib'] = 'ZLib Deflate';
-			$QuicktimeDCOMLookup['adec'] = 'Apple Compression';
-		}
-		return (isset($QuicktimeDCOMLookup[$compressionid]) ? $QuicktimeDCOMLookup[$compressionid] : '');
-	}
-
-	public 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');
-	}
-
-	public 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');
-	}
-
-	public 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');
-	}
-
-
-	public 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');
-	}
-
-
-	public 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');
-	}
-
-	public function QuicktimeStoreAccountTypeLookup($akid) {
-		static $QuicktimeStoreAccountTypeLookup = array();
-		if (empty($QuicktimeStoreAccountTypeLookup)) {
-			$QuicktimeStoreAccountTypeLookup[0] = 'iTunes';
-			$QuicktimeStoreAccountTypeLookup[1] = 'AOL';
-		}
-		return (isset($QuicktimeStoreAccountTypeLookup[$akid]) ? $QuicktimeStoreAccountTypeLookup[$akid] : 'invalid');
-	}
-
-	public 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');
-	}
-
-	public 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;
-	}
-
-
-	public 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';
-
-			// http://age.hobba.nl/audio/tag_frame_reference.html
-			$handyatomtranslatorarray['PLAY_COUNTER']                = 'play_counter'; // Foobar2000 - http://www.getid3.org/phpBB3/viewtopic.php?t=1355
-			$handyatomtranslatorarray['MEDIATYPE']                   = 'mediatype';    // Foobar2000 - http://www.getid3.org/phpBB3/viewtopic.php?t=1355
-			*/
-		}
-		$info = &$this->getid3->info;
-		$comment_key = '';
-		if ($boxname && ($boxname != $keyname)) {
-			$comment_key = (isset($handyatomtranslatorarray[$boxname]) ? $handyatomtranslatorarray[$boxname] : $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;
-	}
-
-	public 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;
-	}
-
-	public 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);
-	}
-
-}
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 0226ac499..000000000
--- a/lib/getid3/getid3/module.audio-video.real.php
+++ /dev/null
@@ -1,527 +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
-{
-
-	public 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::fourccLookup($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;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-}
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 8f431009c..000000000
--- a/lib/getid3/getid3/module.audio-video.riff.php
+++ /dev/null
@@ -1,2435 +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                          //
-//               module.audio.dts.php                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-/**
-* @todo Parse AC-3/DTS audio inside WAVE correctly
-* @todo Rewrite RIFF parser totally
-*/
-
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, true);
-getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.dts.php', __FILE__, true);
-
-class getid3_riff extends getid3_handler
-{
-
-	public 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'];
-
-		$this->fseek($info['avdataoffset']);
-		$RIFFheader = $this->fread(12);
-		$offset = $this->ftell();
-		$RIFFtype    = substr($RIFFheader, 0, 4);
-		$RIFFsize    = substr($RIFFheader, 4, 4);
-		$RIFFsubtype = substr($RIFFheader, 8, 4);
-
-		switch ($RIFFtype) {
-
-			case 'FORM':  // AIFF, AIFC
-				$info['fileformat']   = 'aiff';
-				$thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize);
-				$thisfile_riff[$RIFFsubtype]  = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4));
-				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($RIFFsize);
-				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($offset, ($offset + $thisfile_riff['header_size'] - 4));
-				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'])) {
-					try {
-						$this->fseek($nextRIFFoffset);
-					} catch (getid3_exception $e) {
-						if ($e->getCode() == 10) {
-							//$this->warning('RIFF parser: '.$e->getMessage());
-							$this->error('AVI extends beyond '.round(PHP_INT_MAX / 1073741824).'GB and PHP filesystem functions cannot read that far, playtime may be wrong');
-							$this->warning('[avdataend] value may be incorrect, multiple AVIX chunks may be present');
-							break;
-						} else {
-							throw $e;
-						}
-					}
-					$nextRIFFheader = $this->fread(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':
-							$chunkdata['chunks'] = $this->ParseRIFF($chunkdata['offset'] + 4, $nextRIFFoffset);
-
-							if (!isset($thisfile_riff[$nextRIFFtype])) {
-								$thisfile_riff[$nextRIFFtype] = array();
-							}
-							$thisfile_riff[$nextRIFFtype][] = $chunkdata;
-							break;
-
-						case 'JUNK':
-							// ignore
-							$thisfile_riff[$nextRIFFheaderID][] = $chunkdata;
-							break;
-
-						case 'IDVX':
-							$info['divxtag']['comments'] = self::ParseDIVXTAG($this->fread($chunkdata['size']));
-							break;
-
-						default:
-							if ($info['filesize'] == ($chunkdata['offset'] - 8 + 128)) {
-								$DIVXTAG = $nextRIFFheader.$this->fread(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
-									$this->warning('Found wrongly-structured DIVXTAG at offset '.($this->ftell() - 128).', parsing anyway');
-									$info['divxtag']['comments'] = self::ParseDIVXTAG($DIVXTAG);
-									break 2;
-								}
-							}
-							$this->warning('Expecting "RIFF|JUNK|IDVX" at '.$nextRIFFoffset.', found "'.$nextRIFFheaderID.'" ('.getid3_lib::PrintHexBytes($nextRIFFheaderID).') - skipping rest of file');
-							break 2;
-
-					}
-
-				}
-				if ($RIFFsubtype == 'WAVE') {
-					$thisfile_riff_WAVE = &$thisfile_riff['WAVE'];
-				}
-				break;
-
-			default:
-				$this->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;
-		}
-
-		$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] = self::parseWAVEFORMATex($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'];
-
-					if (empty($info['playtime_seconds'])) { // may already be set (e.g. DTS-WAV)
-						$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 = self::waveSNDMtagLookup($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'];
-
-					$this->fseek($info['avdataoffset'] - 44);
-					$RIFFdata = $this->fread(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);
-						$this->fseek($info['avdataend']);
-						$RIFFdata .= $this->fread($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']       = self::wFormatTagLookup($thisfile_audio['wformattag']);
-								$thisfile_audio['lossless']    = false;
-								$thisfile_audio['bitrate']     = $info['ac3']['bitrate'];
-								$thisfile_audio['sample_rate'] = $info['ac3']['sample_rate'];
-							}
-							if (!empty($info['dts'])) {
-								// Dolby DTS files masquerade as PCM-WAV, but they're not
-								$thisfile_audio['wformattag']  = 0x2001;
-								$thisfile_audio['codec']       = self::wFormatTagLookup($thisfile_audio['wformattag']);
-								$thisfile_audio['lossless']    = false;
-								$thisfile_audio['bitrate']     = $info['dts']['bitrate'];
-								$thisfile_audio['sample_rate'] = $info['dts']['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();
-							$riff_litewave     = &$thisfile_riff['litewave'];
-							$riff_litewave_raw = &$riff_litewave['raw'];
-
-							$flags = array(
-								'compression_method' => 1,
-								'compression_flags'  => 1,
-								'm_dwScale'          => 4,
-								'm_dwBlockSize'      => 4,
-								'm_wQuality'         => 2,
-								'm_wMarkDistance'    => 2,
-								'm_wReserved'        => 2,
-								'm_dwOrgSize'        => 4,
-								'm_bFactExists'      => 2,
-								'm_dwRiffChunkSize'  => 4,
-							);
-							$litewave_offset = 18;
-							foreach ($flags as $flag => $length) {
-								$riff_litewave_raw[$flag] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], $litewave_offset, $length));
-								$litewave_offset += $length;
-							}
-
-							//$riff_litewave['quality_factor'] = intval(round((2000 - $riff_litewave_raw['m_dwScale']) / 20));
-							$riff_litewave['quality_factor'] = $riff_litewave_raw['m_wQuality'];
-
-							$riff_litewave['flags']['raw_source']    = ($riff_litewave_raw['compression_flags'] & 0x01) ? false : true;
-							$riff_litewave['flags']['vbr_blocksize'] = ($riff_litewave_raw['compression_flags'] & 0x02) ? false : true;
-							$riff_litewave['flags']['seekpoints']    =        (bool) ($riff_litewave_raw['compression_flags'] & 0x04);
-
-							$thisfile_audio['lossless']        = (($riff_litewave_raw['m_wQuality'] == 100) ? true : false);
-							$thisfile_audio['encoder_options'] = '-q'.$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) {
-						$ahsisd = &$thisfile_riff['AVI ']['hdrl']['strl']['indx'][$streamnumber]['data'];
-
-						$thisfile_riff_raw['indx'][$streamnumber]['wLongsPerEntry'] = $this->EitherEndian2Int(substr($ahsisd,  0, 2));
-						$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType']  = $this->EitherEndian2Int(substr($ahsisd,  2, 1));
-						$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']     = $this->EitherEndian2Int(substr($ahsisd,  3, 1));
-						$thisfile_riff_raw['indx'][$streamnumber]['nEntriesInUse']  = $this->EitherEndian2Int(substr($ahsisd,  4, 4));
-						$thisfile_riff_raw['indx'][$streamnumber]['dwChunkId']      =                         substr($ahsisd,  8, 4);
-						$thisfile_riff_raw['indx'][$streamnumber]['dwReserved']     = $this->EitherEndian2Int(substr($ahsisd, 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($ahsisd);
-					}
-				}
-				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;
-					}
-
-					$flags = array(
-						'dwMaxBytesPerSec',       // max. transfer rate
-						'dwPaddingGranularity',   // pad to multiples of this size; normally 2K.
-						'dwFlags',                // the ever-present flags
-						'dwTotalFrames',          // # frames in file
-						'dwInitialFrames',        //
-						'dwStreams',              //
-						'dwSuggestedBufferSize',  //
-						'dwWidth',                //
-						'dwHeight',               //
-						'dwScale',                //
-						'dwRate',                 //
-						'dwStart',                //
-						'dwLength',               //
-					);
-					$avih_offset = 4;
-					foreach ($flags as $flag) {
-						$thisfile_riff_raw_avih[$flag] = $this->EitherEndian2Int(substr($avihData, $avih_offset, 4));
-						$avih_offset += 4;
-					}
-
-					$flags = array(
-						'hasindex'     => 0x00000010,
-						'mustuseindex' => 0x00000020,
-						'interleaved'  => 0x00000100,
-						'trustcktype'  => 0x00000800,
-						'capturedfile' => 0x00010000,
-						'copyrighted'  => 0x00020010,
-					);
-                    foreach ($flags as $flag => $value) {
-						$thisfile_riff_raw_avih['flags'][$flag] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & $value);
-					}
-
-					// 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] = self::parseWAVEFORMATex($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'] = self::fourccLookup($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']) && self::fourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
-												$thisfile_riff_video_current['codec'] = self::fourccLookup($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 = self::ParseBITMAPINFOHEADER(substr($strfData, 0, 40), ($info['fileformat'] == 'riff'));
-													$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 (self::fourccLookup($thisfile_video['fourcc'])) {
-									$thisfile_riff_video_current['codec'] = self::fourccLookup($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;
-		}
-
-		switch ($RIFFsubtype) {
-			case 'WAVE':
-			case 'AIFF':
-			case 'AIFC':
-				$ID3v2_key_good = 'id3 ';
-				$ID3v2_keys_bad = array('ID3 ', 'tag ');
-				foreach ($ID3v2_keys_bad as $ID3v2_key_bad) {
-					if (isset($thisfile_riff[$RIFFsubtype][$ID3v2_key_bad]) && !array_key_exists($ID3v2_key_good, $thisfile_riff[$RIFFsubtype])) {
-						$thisfile_riff[$RIFFsubtype][$ID3v2_key_good] = $thisfile_riff[$RIFFsubtype][$ID3v2_key_bad];
-						$info['warning'][] = 'mapping "'.$ID3v2_key_bad.'" chunk to "'.$ID3v2_key_good.'"';
-					}
-				}
-
-				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;
-		}
-
-		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'])) {
-			self::parseComments($thisfile_riff_WAVE['INFO'], $thisfile_riff['comments']);
-		}
-		if (isset($thisfile_riff['AVI ']['INFO']) && is_array($thisfile_riff['AVI ']['INFO'])) {
-			self::parseComments($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;
-	}
-
-	public function ParseRIFF($startoffset, $maxoffset) {
-		$info = &$this->getid3->info;
-
-		$RIFFchunk = false;
-		$FoundAllChunksWeNeed = false;
-
-		try {
-			$this->fseek($startoffset);
-			$maxoffset = min($maxoffset, $info['avdataend']);
-			while ($this->ftell() < $maxoffset) {
-				$chunknamesize = $this->fread(8);
-				//$chunkname =                          substr($chunknamesize, 0, 4);
-				$chunkname = str_replace("\x00", '_', substr($chunknamesize, 0, 4));  // note: chunk names of 4 null bytes do appear to be legal (has been observed inside INFO and PRMI chunks, for example), but makes traversing array keys more difficult
-				$chunksize =  $this->EitherEndian2Int(substr($chunknamesize, 4, 4));
-				//if (strlen(trim($chunkname, "\x00")) < 4) {
-				if (strlen($chunkname) < 4) {
-					$this->error('Expecting chunk name at offset '.($this->ftell() - 8).' but found nothing. Aborting RIFF parsing.');
-					break;
-				}
-				if (($chunksize == 0) && ($chunkname != 'JUNK')) {
-					$this->warning('Chunk ('.$chunkname.') size at offset '.($this->ftell() - 4).' is zero. Aborting RIFF parsing.');
-					break;
-				}
-				if (($chunksize % 2) != 0) {
-					// all structures are packed on word boundaries
-					$chunksize++;
-				}
-
-				switch ($chunkname) {
-					case 'LIST':
-						$listname = $this->fread(4);
-						if (preg_match('#^(movi|rec )$#i', $listname)) {
-							$RIFFchunk[$listname]['offset'] = $this->ftell() - 4;
-							$RIFFchunk[$listname]['size']   = $chunksize;
-
-							if (!$FoundAllChunksWeNeed) {
-								$WhereWeWere      = $this->ftell();
-								$AudioChunkHeader = $this->fread(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'] = $this->ftell() - 4;
-											$getid3_temp->info['avdataend']    = $this->ftell() + $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 (strpos($FirstFourBytes, getid3_ac3::syncword) === 0) {
-
-										// AC3
-										$getid3_temp = new getID3();
-										$getid3_temp->openfile($this->getid3->filename);
-										$getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
-										$getid3_temp->info['avdataend']    = $this->ftell() + $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;
-								$this->fseek($WhereWeWere);
-							}
-							$this->fseek($chunksize - 4, SEEK_CUR);
-
-						} else {
-
-							if (!isset($RIFFchunk[$listname])) {
-								$RIFFchunk[$listname] = array();
-							}
-							$LISTchunkParent    = $listname;
-							$LISTchunkMaxOffset = $this->ftell() - 4 + $chunksize;
-							if ($parsedChunk = $this->ParseRIFF($this->ftell(), $LISTchunkMaxOffset)) {
-								$RIFFchunk[$listname] = array_merge_recursive($RIFFchunk[$listname], $parsedChunk);
-							}
-
-						}
-						break;
-
-					default:
-						if (preg_match('#^[0-9]{2}(wb|pc|dc|db)$#', $chunkname)) {
-							$this->fseek($chunksize, SEEK_CUR);
-							break;
-						}
-						$thisindex = 0;
-						if (isset($RIFFchunk[$chunkname]) && is_array($RIFFchunk[$chunkname])) {
-							$thisindex = count($RIFFchunk[$chunkname]);
-						}
-						$RIFFchunk[$chunkname][$thisindex]['offset'] = $this->ftell() - 8;
-						$RIFFchunk[$chunkname][$thisindex]['size']   = $chunksize;
-						switch ($chunkname) {
-							case 'data':
-								$info['avdataoffset'] = $this->ftell();
-								$info['avdataend']    = $info['avdataoffset'] + $chunksize;
-
-								$testData = $this->fread(36);
-								if ($testData === '') {
-									break;
-								}
-								if (preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', substr($testData, 0, 4))) {
-
-									// Probably is MP3 data
-									if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($testData, 0, 4))) {
-										$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);
-										$getid3_mp3->getOnlyMPEGaudioInfo($info['avdataoffset'], false);
-										if (empty($getid3_temp->info['error'])) {
-											$info['audio'] = $getid3_temp->info['audio'];
-											$info['mpeg']  = $getid3_temp->info['mpeg'];
-										}
-										unset($getid3_temp, $getid3_mp3);
-									}
-
-								} elseif (($isRegularAC3 = (substr($testData, 0, 2) == getid3_ac3::syncword)) || substr($testData, 8, 2) == strrev(getid3_ac3::syncword)) {
-
-									// This is probably AC-3 data
-									$getid3_temp = new getID3();
-									if ($isRegularAC3) {
-										$getid3_temp->openfile($this->getid3->filename);
-										$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
-										$getid3_temp->info['avdataend']    = $info['avdataend'];
-									}
-									$getid3_ac3 = new getid3_ac3($getid3_temp);
-									if ($isRegularAC3) {
-										$getid3_ac3->Analyze();
-									} else {
-										// Dolby Digital WAV
-										// AC-3 content, but not encoded in same format as normal AC-3 file
-										// For one thing, byte order is swapped
-										$ac3_data = '';
-										for ($i = 0; $i < 28; $i += 2) {
-											$ac3_data .= substr($testData, 8 + $i + 1, 1);
-											$ac3_data .= substr($testData, 8 + $i + 0, 1);
-										}
-										$getid3_ac3->AnalyzeString($ac3_data);
-									}
-
-									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 $newerror) {
-												$this->warning('getid3_ac3() says: ['.$newerror.']');
-											}
-										}
-									}
-									unset($getid3_temp, $getid3_ac3);
-
-								} elseif (preg_match('/^('.implode('|', array_map('preg_quote', getid3_dts::$syncwords)).')/', $testData)) {
-
-									// This is probably DTS data
-									$getid3_temp = new getID3();
-									$getid3_temp->openfile($this->getid3->filename);
-									$getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
-									$getid3_dts = new getid3_dts($getid3_temp);
-									$getid3_dts->Analyze();
-									if (empty($getid3_temp->info['error'])) {
-										$info['audio']            = $getid3_temp->info['audio'];
-										$info['dts']              = $getid3_temp->info['dts'];
-										$info['playtime_seconds'] = $getid3_temp->info['playtime_seconds']; // may not match RIFF calculations since DTS-WAV often used 14/16 bit-word packing
-										if (!empty($getid3_temp->info['warning'])) {
-											foreach ($getid3_temp->info['warning'] as $newerror) {
-												$this->warning('getid3_dts() says: ['.$newerror.']');
-											}
-										}
-									}
-
-									unset($getid3_temp, $getid3_dts);
-
-								} elseif (substr($testData, 0, 4) == 'wvpk') {
-
-									// This is WavPack data
-									$info['wavpack']['offset'] = $info['avdataoffset'];
-									$info['wavpack']['size']   = getid3_lib::LittleEndian2Int(substr($testData, 4, 4));
-									$this->parseWavPackHeader(substr($testData, 8, 28));
-
-								} else {
-									// This is some other kind of data (quite possibly just PCM)
-									// do nothing special, just skip it
-								}
-								$nextoffset = $info['avdataend'];
-								$this->fseek($nextoffset);
-								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'] = $this->fread($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 {
-									$this->warning('Chunk "'.$chunkname.'" at offset '.$this->ftell().' is unexpectedly larger than 1MB (claims to be '.number_format($chunksize).' bytes), skipping data');
-									$this->fseek($chunksize, SEEK_CUR);
-								}
-								break;
-
-							//case 'IDVX':
-							//	$info['divxtag']['comments'] = self::ParseDIVXTAG($this->fread($chunksize));
-							//	break;
-
-							default:
-								if (!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'] = $this->fread($chunksize);
-								} elseif ($chunksize < 2048) {
-									// only read data in if smaller than 2kB
-									$RIFFchunk[$chunkname][$thisindex]['data'] = $this->fread($chunksize);
-								} else {
-									$this->fseek($chunksize, SEEK_CUR);
-								}
-								break;
-						}
-						break;
-				}
-			}
-
-		} catch (getid3_exception $e) {
-			if ($e->getCode() == 10) {
-				$this->warning('RIFF parser: '.$e->getMessage());
-			} else {
-				throw $e;
-			}
-		}
-
-		return $RIFFchunk;
-	}
-
-	public 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 parseComments(&$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',
-			'____'=>'comment',
-		);
-		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;
-	}
-
-	public static function parseWAVEFORMATex($WaveFormatExData) {
-		// shortcut
-		$WaveFormatEx['raw'] = array();
-		$WaveFormatEx_raw    = &$WaveFormatEx['raw'];
-
-		$WaveFormatEx_raw['wFormatTag']      = substr($WaveFormatExData,  0, 2);
-		$WaveFormatEx_raw['nChannels']       = substr($WaveFormatExData,  2, 2);
-		$WaveFormatEx_raw['nSamplesPerSec']  = substr($WaveFormatExData,  4, 4);
-		$WaveFormatEx_raw['nAvgBytesPerSec'] = substr($WaveFormatExData,  8, 4);
-		$WaveFormatEx_raw['nBlockAlign']     = substr($WaveFormatExData, 12, 2);
-		$WaveFormatEx_raw['wBitsPerSample']  = substr($WaveFormatExData, 14, 2);
-		if (strlen($WaveFormatExData) > 16) {
-			$WaveFormatEx_raw['cbSize']      = substr($WaveFormatExData, 16, 2);
-		}
-		$WaveFormatEx_raw = array_map('getid3_lib::LittleEndian2Int', $WaveFormatEx_raw);
-
-		$WaveFormatEx['codec']           = self::wFormatTagLookup($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;
-	}
-
-	public function parseWavPackHeader($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) {
-
-		$parsed['biSize']          = substr($BITMAPINFOHEADER,  0, 4); // number of bytes required by the BITMAPINFOHEADER structure
-		$parsed['biWidth']         = substr($BITMAPINFOHEADER,  4, 4); // width of the bitmap in pixels
-		$parsed['biHeight']        = 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']        = substr($BITMAPINFOHEADER, 12, 2); // number of color planes on the target device. In most cases this value must be set to 1
-		$parsed['biBitCount']      = substr($BITMAPINFOHEADER, 14, 2); // Specifies the number of bits per pixels
-		$parsed['biSizeImage']     = substr($BITMAPINFOHEADER, 20, 4); // size of the bitmap data section of the image (the actual pixel data, excluding BITMAPINFOHEADER and RGBQUAD structures)
-		$parsed['biXPelsPerMeter'] = substr($BITMAPINFOHEADER, 24, 4); // horizontal resolution, in pixels per metre, of the target device
-		$parsed['biYPelsPerMeter'] = substr($BITMAPINFOHEADER, 28, 4); // vertical resolution, in pixels per metre, of the target device
-		$parsed['biClrUsed']       = 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']  = 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
-		$parsed = array_map('getid3_lib::'.($littleEndian ? 'Little' : 'Big').'Endian2Int', $parsed);
-
-		$parsed['fourcc']          = substr($BITMAPINFOHEADER, 16, 4);  // compression identifier
-
-		return $parsed;
-	}
-
-	public static function ParseDIVXTAG($DIVXTAG, $raw=false) {
-		// 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',
-		),
-		$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']);
-
-		if (!$raw) {
-			unset($parsed['genre_id'], $parsed['rating_id']);
-			foreach ($parsed as $key => $value) {
-				if (!$value === '') {
-					unset($parsed['key']);
-				}
-			}
-		}
-
-		foreach ($parsed as $tag => $value) {
-			$parsed[$tag] = array($value);
-		}
-
-		return $parsed;
-	}
-
-	public static function waveSNDMtagLookup($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');
-	}
-
-	public static function wFormatTagLookup($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 fourccLookup($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');
-	}
-
-	private function EitherEndian2Int($byteword, $signed=false) {
-		if ($this->getid3->info['fileformat'] == 'riff') {
-			return getid3_lib::LittleEndian2Int($byteword, $signed);
-		}
-		return getid3_lib::BigEndian2Int($byteword, false, $signed);
-	}
-
-}
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 48491cbfa..000000000
--- a/lib/getid3/getid3/module.audio-video.swf.php
+++ /dev/null
@@ -1,139 +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
-{
-	public $ReturnAllTagData = false;
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio-video.ts.php b/lib/getid3/getid3/module.audio-video.ts.php
deleted file mode 100644
index 3fcf71ea3..000000000
--- a/lib/getid3/getid3/module.audio-video.ts.php
+++ /dev/null
@@ -1,78 +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.ts.php                                   //
-// module for analyzing MPEG Transport Stream (.ts) files      //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_ts extends getid3_handler
-{
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		fseek($this->getid3->fp, $info['avdataoffset'], SEEK_SET);
-		$TSheader = fread($this->getid3->fp, 19);
-		$magic = "\x47";
-		if (substr($TSheader, 0, 1) != $magic) {
-			$info['error'][] = 'Expecting "'.getid3_lib::PrintHexBytes($magic).'" at '.$info['avdataoffset'].', found '.getid3_lib::PrintHexBytes(substr($TSheader, 0, 1)).' instead.';
-			return false;
-		}
-		$info['fileformat'] = 'ts';
-
-		// http://en.wikipedia.org/wiki/.ts
-
-		$offset = 0;
-		$info['ts']['packet']['sync'] = getid3_lib::BigEndian2Int(substr($TSheader, $offset, 1)); $offset += 1;
-		$pid_flags_raw                = getid3_lib::BigEndian2Int(substr($TSheader, $offset, 2)); $offset += 2;
-		$SAC_raw                      = getid3_lib::BigEndian2Int(substr($TSheader, $offset, 1)); $offset += 1;
-		$info['ts']['packet']['flags']['transport_error_indicator']    =      (bool) ($pid_flags_raw & 0x8000);      // Set by demodulator if can't correct errors in the stream, to tell the demultiplexer that the packet has an uncorrectable error
-		$info['ts']['packet']['flags']['payload_unit_start_indicator'] =      (bool) ($pid_flags_raw & 0x4000);      // 1 means start of PES data or PSI otherwise zero only.
-		$info['ts']['packet']['flags']['transport_high_priority']      =      (bool) ($pid_flags_raw & 0x2000);      // 1 means higher priority than other packets with the same PID.
-		$info['ts']['packet']['packet_id']                             =             ($pid_flags_raw & 0x1FFF) >> 0;
-
-		$info['ts']['packet']['raw']['scrambling_control']             =                   ($SAC_raw &   0xC0) >> 6;
-		$info['ts']['packet']['flags']['adaption_field_exists']        =      (bool)       ($SAC_raw &   0x20);
-		$info['ts']['packet']['flags']['payload_exists']               =      (bool)       ($SAC_raw &   0x10);
-		$info['ts']['packet']['continuity_counter']                    =                   ($SAC_raw &   0x0F) >> 0; // Incremented only when a payload is present
-		$info['ts']['packet']['scrambling_control']                    = $this->TSscramblingControlLookup($info['ts']['packet']['raw']['scrambling_control']);
-
-		if ($info['ts']['packet']['flags']['adaption_field_exists']) {
-			$AdaptionField_raw        = getid3_lib::BigEndian2Int(substr($TSheader, $offset, 2)); $offset += 2;
-			$info['ts']['packet']['adaption']['field_length']           =        ($AdaptionField_raw & 0xFF00) >> 8;  // Number of bytes in the adaptation field immediately following this byte
-			$info['ts']['packet']['adaption']['flags']['discontinuity'] = (bool) ($AdaptionField_raw & 0x0080);       // Set to 1 if current TS packet is in a discontinuity state with respect to either the continuity counter or the program clock reference
-			$info['ts']['packet']['adaption']['flags']['random_access'] = (bool) ($AdaptionField_raw & 0x0040);       // Set to 1 if the PES packet in this TS packet starts a video/audio sequence
-			$info['ts']['packet']['adaption']['flags']['high_priority'] = (bool) ($AdaptionField_raw & 0x0020);       // 1 = higher priority
-			$info['ts']['packet']['adaption']['flags']['pcr']           = (bool) ($AdaptionField_raw & 0x0010);       // 1 means adaptation field does contain a PCR field
-			$info['ts']['packet']['adaption']['flags']['opcr']          = (bool) ($AdaptionField_raw & 0x0008);       // 1 means adaptation field does contain an OPCR field
-			$info['ts']['packet']['adaption']['flags']['splice_point']  = (bool) ($AdaptionField_raw & 0x0004);       // 1 means presence of splice countdown field in adaptation field
-			$info['ts']['packet']['adaption']['flags']['private_data']  = (bool) ($AdaptionField_raw & 0x0002);       // 1 means presence of private data bytes in adaptation field
-			$info['ts']['packet']['adaption']['flags']['extension']     = (bool) ($AdaptionField_raw & 0x0001);       // 1 means presence of adaptation field extension
-			if ($info['ts']['packet']['adaption']['flags']['pcr']) {
-				$info['ts']['packet']['adaption']['raw']['pcr'] = getid3_lib::BigEndian2Int(substr($TSheader, $offset, 6)); $offset += 6;
-			}
-			if ($info['ts']['packet']['adaption']['flags']['opcr']) {
-				$info['ts']['packet']['adaption']['raw']['opcr'] = getid3_lib::BigEndian2Int(substr($TSheader, $offset, 6)); $offset += 6;
-			}
-		}
-
-$info['error'][] = 'MPEG Transport Stream (.ts) parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-return false;
-
-	}
-
-
-	public function TSscramblingControlLookup($raw) {
-		$TSscramblingControlLookup = array(0x00=>'not scrambled', 0x01=>'reserved', 0x02=>'scrambled, even key', 0x03=>'scrambled, odd key');
-		return (isset($TSscramblingControlLookup[$raw]) ? $TSscramblingControlLookup[$raw] : 'invalid');
-	}
-}
diff --git a/lib/getid3/getid3/module.audio.aa.php b/lib/getid3/getid3/module.audio.aa.php
deleted file mode 100644
index dbf1b7c8c..000000000
--- a/lib/getid3/getid3/module.audio.aa.php
+++ /dev/null
@@ -1,58 +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
-{
-
-	public 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['error'][] = 'Audible Audiobook (.aa) parsing not enabled in this version of getID3() ['.$this->getid3->version().']';
-return false;
-		$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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.aac.php b/lib/getid3/getid3/module.audio.aac.php
deleted file mode 100644
index 06537abbf..000000000
--- a/lib/getid3/getid3/module.audio.aac.php
+++ /dev/null
@@ -1,512 +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
-{
-	public 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;
-	}
-
-
-
-	public 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;
-
-		}
-
-	}
-
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.ac3.php b/lib/getid3/getid3/module.audio.ac3.php
deleted file mode 100644
index 9834feb5b..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 = array();
-    private $BSIoffset = 0;
-
-    const syncword = "\x0B\x77";
-
-	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
-
-		// syncinfo() {
-		// 	 syncword    16
-		// 	 crc1        16
-		// 	 fscod        2
-		// 	 frmsizecod   6
-		// } /* end of syncinfo */
-
-		$this->fseek($info['avdataoffset']);
-		$this->AC3header['syncinfo'] = $this->fread(5);
-
-		if (strpos($this->AC3header['syncinfo'], self::syncword) === 0) {
-			$thisfile_ac3_raw['synchinfo']['synchword'] = self::syncword;
-			$offset = 2;
-		} else {
-			if (!$this->isDependencyFor('matroska')) {
-				unset($info['fileformat'], $info['ac3']);
-				return $this->error('Expecting "'.getid3_lib::PrintHexBytes(self::syncword).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($this->AC3header['syncinfo'], 0, 2)).'"');
-			}
-			$offset = 0;
-			$this->fseek(-2, SEEK_CUR);
-		}
-
-		$info['audio']['dataformat']   = 'ac3';
-		$info['audio']['bitrate_mode'] = 'cbr';
-		$info['audio']['lossless']     = false;
-
-		$thisfile_ac3_raw['synchinfo']['crc1']       = getid3_lib::LittleEndian2Int(substr($this->AC3header['syncinfo'], $offset, 2));
-		$ac3_synchinfo_fscod_frmsizecod              = getid3_lib::LittleEndian2Int(substr($this->AC3header['syncinfo'], ($offset + 2), 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'] = self::sampleRateCodeLookup($thisfile_ac3_raw['synchinfo']['fscod']);
-		if ($thisfile_ac3_raw['synchinfo']['fscod'] <= 3) {
-			$info['audio']['sample_rate'] = $thisfile_ac3['sample_rate'];
-		}
-
-		$thisfile_ac3['frame_length'] = self::frameSizeLookup($thisfile_ac3_raw['synchinfo']['frmsizecod'], $thisfile_ac3_raw['synchinfo']['fscod']);
-		$thisfile_ac3['bitrate']      = self::bitrateLookup($thisfile_ac3_raw['synchinfo']['frmsizecod']);
-		$info['audio']['bitrate'] = $thisfile_ac3['bitrate'];
-
-		$this->AC3header['bsi'] = getid3_lib::BigEndian2Bin($this->fread(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.
-			$this->error('Bit stream identification is version '.$thisfile_ac3_raw_bsi['bsid'].', but getID3() only understands up to version 8');
-		    unset($info['ac3']);
-			return false;
-		}
-
-		$thisfile_ac3_raw_bsi['bsmod'] = $this->readHeaderBSI(3);
-		$thisfile_ac3_raw_bsi['acmod'] = $this->readHeaderBSI(3);
-
-		$thisfile_ac3['service_type'] = self::serviceTypeLookup($thisfile_ac3_raw_bsi['bsmod'], $thisfile_ac3_raw_bsi['acmod']);
-		$ac3_coding_mode = self::audioCodingModeLookup($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'] = self::centerMixLevelLookup($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'] = self::surroundMixLevelLookup($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'] = self::dolbySurroundModeLookup($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'] = self::channelsEnabledLookup($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'] = self::heavyCompression($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']    = self::roomTypeLookup($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'] = self::heavyCompression($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']    = self::roomTypeLookup($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($this->fread($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 sampleRateCodeLookup($fscod) {
-		static $sampleRateCodeLookup = 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($sampleRateCodeLookup[$fscod]) ? $sampleRateCodeLookup[$fscod] : false);
-	}
-
-	public static function serviceTypeLookup($bsmod, $acmod) {
-		static $serviceTypeLookup = array();
-		if (empty($serviceTypeLookup)) {
-			for ($i = 0; $i <= 7; $i++) {
-				$serviceTypeLookup[0][$i] = 'main audio service: complete main (CM)';
-				$serviceTypeLookup[1][$i] = 'main audio service: music and effects (ME)';
-				$serviceTypeLookup[2][$i] = 'associated service: visually impaired (VI)';
-				$serviceTypeLookup[3][$i] = 'associated service: hearing impaired (HI)';
-				$serviceTypeLookup[4][$i] = 'associated service: dialogue (D)';
-				$serviceTypeLookup[5][$i] = 'associated service: commentary (C)';
-				$serviceTypeLookup[6][$i] = 'associated service: emergency (E)';
-			}
-
-			$serviceTypeLookup[7][1]      = 'associated service: voice over (VO)';
-			for ($i = 2; $i <= 7; $i++) {
-				$serviceTypeLookup[7][$i] = 'main audio service: karaoke';
-			}
-		}
-		return (isset($serviceTypeLookup[$bsmod][$acmod]) ? $serviceTypeLookup[$bsmod][$acmod] : false);
-	}
-
-	public static function audioCodingModeLookup($acmod) {
-		// array(channel configuration, # channels (not incl LFE), channel order)
-		static $audioCodingModeLookup = 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($audioCodingModeLookup[$acmod]) ? $audioCodingModeLookup[$acmod] : false);
-	}
-
-	public static function centerMixLevelLookup($cmixlev) {
-		static $centerMixLevelLookup;
-		if (empty($centerMixLevelLookup)) {
-			$centerMixLevelLookup = 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($centerMixLevelLookup[$cmixlev]) ? $centerMixLevelLookup[$cmixlev] : false);
-	}
-
-	public static function surroundMixLevelLookup($surmixlev) {
-		static $surroundMixLevelLookup;
-		if (empty($surroundMixLevelLookup)) {
-			$surroundMixLevelLookup = array(
-				0 => pow(2, -3.0 / 6),
-				1 => pow(2, -6.0 / 6),
-				2 => 0,
-				3 => 'reserved'
-			);
-		}
-		return (isset($surroundMixLevelLookup[$surmixlev]) ? $surroundMixLevelLookup[$surmixlev] : false);
-	}
-
-	public static function dolbySurroundModeLookup($dsurmod) {
-		static $dolbySurroundModeLookup = array(
-			0 => 'not indicated',
-			1 => 'Not Dolby Surround encoded',
-			2 => 'Dolby Surround encoded',
-			3 => 'reserved'
-		);
-		return (isset($dolbySurroundModeLookup[$dsurmod]) ? $dolbySurroundModeLookup[$dsurmod] : false);
-	}
-
-	public static function channelsEnabledLookup($acmod, $lfeon) {
-		$lookup = 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:
-				$lookup['surround_mono']  = true;
-				break;
-			case 6:
-			case 7:
-				$lookup['surround_left']  = true;
-				$lookup['surround_right'] = true;
-				break;
-		}
-		return $lookup;
-	}
-
-	public static function heavyCompression($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 roomTypeLookup($roomtyp) {
-		static $roomTypeLookup = array(
-			0 => 'not indicated',
-			1 => 'large room, X curve monitor',
-			2 => 'small room, flat monitor',
-			3 => 'reserved'
-		);
-		return (isset($roomTypeLookup[$roomtyp]) ? $roomTypeLookup[$roomtyp] : false);
-	}
-
-	public static function frameSizeLookup($frmsizecod, $fscod) {
-		$padding     = (bool) ($frmsizecod % 2);
-		$framesizeid =   floor($frmsizecod / 2);
-
-		static $frameSizeLookup = array();
-		if (empty($frameSizeLookup)) {
-			$frameSizeLookup = 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
-			$frameSizeLookup[$frmsizecod] += 2;
-		}
-		return (isset($frameSizeLookup[$framesizeid][$fscod]) ? $frameSizeLookup[$framesizeid][$fscod] : false);
-	}
-
-	public static function bitrateLookup($frmsizecod) {
-		$framesizeid =   floor($frmsizecod / 2);
-
-		static $bitrateLookup = 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($bitrateLookup[$framesizeid]) ? $bitrateLookup[$framesizeid] : false);
-	}
-
-
-}
diff --git a/lib/getid3/getid3/module.audio.au.php b/lib/getid3/getid3/module.audio.au.php
deleted file mode 100644
index 5951684ae..000000000
--- a/lib/getid3/getid3/module.audio.au.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.au.php                                         //
-// module for analyzing AU files                               //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_au extends getid3_handler
-{
-
-	public 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;
-	}
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.avr.php b/lib/getid3/getid3/module.audio.avr.php
deleted file mode 100644
index 77107eaea..000000000
--- a/lib/getid3/getid3/module.audio.avr.php
+++ /dev/null
@@ -1,124 +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
-{
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.bonk.php b/lib/getid3/getid3/module.audio.bonk.php
deleted file mode 100644
index e96be5b1f..000000000
--- a/lib/getid3/getid3/module.audio.bonk.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.audio.la.php                                         //
-// module for analyzing BONK audio files                       //
-// dependencies: module.tag.id3v2.php (optional)               //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_bonk extends getid3_handler
-{
-	public 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;
-
-	}
-
-	public 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;
-
-		}
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.dss.php b/lib/getid3/getid3/module.audio.dss.php
deleted file mode 100644
index 4719d53b4..000000000
--- a/lib/getid3/getid3/module.audio.dss.php
+++ /dev/null
@@ -1,77 +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
-{
-
-	public 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)ds[s2]#', $DSSheader)) {
-			$info['error'][] = 'Expecting "[02-03] 64 73 [73|32]" 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
-		$info['encoding']              = 'ISO-8859-1'; // not certain, but assumed
-		$info['dss'] = array();
-
-		$info['fileformat']            = 'dss';
-		$info['mime_type']             = 'audio/x-'.substr($DSSheader, 1, 3); // "audio/x-dss" or "audio/x-ds2"
-		$info['audio']['dataformat']   =            substr($DSSheader, 1, 3); //         "dss" or         "ds2"
-		$info['audio']['bitrate_mode'] = 'cbr';
-
-		$info['dss']['version']       =                            ord(substr($DSSheader,   0,   1));
-		$info['dss']['hardware']      =                           trim(substr($DSSheader,  12,  16)); // identification string for hardware used to create the file, e.g. "DPM 9600", "DS2400"
-		$info['dss']['unknown1']      =   getid3_lib::LittleEndian2Int(substr($DSSheader,  28,   4));
-		// 32-37 = "FE FF FE FF F7 FF" in all the sample files I've seen
-		$info['dss']['date_create']   = $this->DSSdateStringToUnixDate(substr($DSSheader,  38,  12));
-		$info['dss']['date_complete'] = $this->DSSdateStringToUnixDate(substr($DSSheader,  50,  12));
-		$info['dss']['playtime_sec']  = intval((substr($DSSheader,  62, 2) * 3600) + (substr($DSSheader,  64, 2) * 60) + substr($DSSheader,  66, 2)); // approximate file playtime in HHMMSS
-		$info['dss']['playtime_ms']   =   getid3_lib::LittleEndian2Int(substr($DSSheader, 512,   4)); // exact file playtime in milliseconds. Has also been observed at offset 530 in one sample file, with something else (unknown) at offset 512
-		$info['dss']['priority']      =                            ord(substr($DSSheader, 793,   1));
-		$info['dss']['comments']      =                           trim(substr($DSSheader, 798, 100));
-
-		//$info['audio']['bits_per_sample']  = ?;
-		//$info['audio']['sample_rate']      = ?;
-		$info['audio']['channels']     = 1;
-
-		$info['playtime_seconds'] = $info['dss']['playtime_ms'] / 1000;
-		if (floor($info['dss']['playtime_ms'] / 1000) != $info['dss']['playtime_sec']) {
-			// *should* just be playtime_ms / 1000 but at least one sample file has playtime_ms at offset 530 instead of offset 512, so safety check
-			$info['playtime_seconds'] = $info['dss']['playtime_sec'];
-			$this->getid3->warning('playtime_ms ('.number_format($info['dss']['playtime_ms'] / 1000, 3).') does not match playtime_sec ('.number_format($info['dss']['playtime_sec']).') - using playtime_sec value');
-		}
-		$info['audio']['bitrate'] = ($info['filesize'] * 8) / $info['playtime_seconds'];
-
-		return true;
-	}
-
-	public 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);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.dts.php b/lib/getid3/getid3/module.audio.dts.php
deleted file mode 100644
index 79982cccf..000000000
--- a/lib/getid3/getid3/module.audio.dts.php
+++ /dev/null
@@ -1,290 +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                                          //
-//                                                             //
-/////////////////////////////////////////////////////////////////
-
-
-/**
-* @tutorial http://wiki.multimedia.cx/index.php?title=DTS
-*/
-class getid3_dts extends getid3_handler
-{
-	/**
-	* Default DTS syncword used in native .cpt or .dts formats
-	*/
-    const syncword = "\x7F\xFE\x80\x01";
-
-	private $readBinDataOffset = 0;
-
-    /**
-    * Possible syncwords indicating bitstream encoding
-    */
-    public static $syncwords = array(
-    	0 => "\x7F\xFE\x80\x01",  // raw big-endian
-    	1 => "\xFE\x7F\x01\x80",  // raw little-endian
-    	2 => "\x1F\xFF\xE8\x00",  // 14-bit big-endian
-    	3 => "\xFF\x1F\x00\xE8"); // 14-bit little-endian
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-		$info['fileformat'] = 'dts';
-
-		$this->fseek($info['avdataoffset']);
-		$DTSheader = $this->fread(20); // we only need 2 words magic + 6 words frame header, but these words may be normal 16-bit words OR 14-bit words with 2 highest bits set to zero, so 8 words can be either 8*16/8 = 16 bytes OR 8*16*(16/14)/8 = 18.3 bytes
-
-		// check syncword
-		$sync = substr($DTSheader, 0, 4);
-        if (($encoding = array_search($sync, self::$syncwords)) !== false) {
-
-        	$info['dts']['raw']['magic'] = $sync;
-			$this->readBinDataOffset = 32;
-
-        } elseif ($this->isDependencyFor('matroska')) {
-
-			// Matroska contains DTS without syncword encoded as raw big-endian format
-			$encoding = 0;
-			$this->readBinDataOffset = 0;
-
-        } else {
-
-			unset($info['fileformat']);
-			return $this->error('Expecting "'.implode('| ', array_map('getid3_lib::PrintHexBytes', self::$syncwords)).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($sync).'"');
-
-		}
-
-		// decode header
-		$fhBS = '';
-		for ($word_offset = 0; $word_offset <= strlen($DTSheader); $word_offset += 2) {
-			switch ($encoding) {
-				case 0: // raw big-endian
-					$fhBS .=        getid3_lib::BigEndian2Bin(       substr($DTSheader, $word_offset, 2) );
-					break;
-				case 1: // raw little-endian
-					$fhBS .=        getid3_lib::BigEndian2Bin(strrev(substr($DTSheader, $word_offset, 2)));
-					break;
-				case 2: // 14-bit big-endian
-					$fhBS .= substr(getid3_lib::BigEndian2Bin(       substr($DTSheader, $word_offset, 2) ), 2, 14);
-					break;
-				case 3: // 14-bit little-endian
-					$fhBS .= substr(getid3_lib::BigEndian2Bin(strrev(substr($DTSheader, $word_offset, 2))), 2, 14);
-					break;
-			}
-		}
-
-		$info['dts']['raw']['frame_type']             =        $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['deficit_samples']        =        $this->readBinData($fhBS,  5);
-		$info['dts']['flags']['crc_present']          = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['pcm_sample_blocks']      =        $this->readBinData($fhBS,  7);
-		$info['dts']['raw']['frame_byte_size']        =        $this->readBinData($fhBS, 14);
-		$info['dts']['raw']['channel_arrangement']    =        $this->readBinData($fhBS,  6);
-		$info['dts']['raw']['sample_frequency']       =        $this->readBinData($fhBS,  4);
-		$info['dts']['raw']['bitrate']                =        $this->readBinData($fhBS,  5);
-		$info['dts']['flags']['embedded_downmix']     = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['dynamicrange']         = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['timestamp']            = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['auxdata']              = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['hdcd']                 = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['extension_audio']        =        $this->readBinData($fhBS,  3);
-		$info['dts']['flags']['extended_coding']      = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['audio_sync_insertion'] = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['lfe_effects']            =        $this->readBinData($fhBS,  2);
-		$info['dts']['flags']['predictor_history']    = (bool) $this->readBinData($fhBS,  1);
-		if ($info['dts']['flags']['crc_present']) {
-			$info['dts']['raw']['crc16']              =        $this->readBinData($fhBS, 16);
-		}
-		$info['dts']['flags']['mri_perfect_reconst']  = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['encoder_soft_version']   =        $this->readBinData($fhBS,  4);
-		$info['dts']['raw']['copy_history']           =        $this->readBinData($fhBS,  2);
-		$info['dts']['raw']['bits_per_sample']        =        $this->readBinData($fhBS,  2);
-		$info['dts']['flags']['surround_es']          = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['front_sum_diff']       = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['flags']['surround_sum_diff']    = (bool) $this->readBinData($fhBS,  1);
-		$info['dts']['raw']['dialog_normalization']   =        $this->readBinData($fhBS,  4);
-
-
-		$info['dts']['bitrate']              = self::bitrateLookup($info['dts']['raw']['bitrate']);
-		$info['dts']['bits_per_sample']      = self::bitPerSampleLookup($info['dts']['raw']['bits_per_sample']);
-		$info['dts']['sample_rate']          = self::sampleRateLookup($info['dts']['raw']['sample_frequency']);
-		$info['dts']['dialog_normalization'] = self::dialogNormalization($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::numChannelsLookup($info['dts']['raw']['channel_arrangement']);
-		$info['dts']['channel_arrangement']  = self::channelArrangementLookup($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']) && !empty($info['dts']['bitrate']) && is_numeric($info['dts']['bitrate'])) {
-			$info['playtime_seconds']         = ($info['avdataend'] - $info['avdataoffset']) / ($info['dts']['bitrate'] / 8);
-			if (($encoding == 2) || ($encoding == 3)) {
-				// 14-bit data packed into 16-bit words, so the playtime is wrong because only (14/16) of the bytes in the data portion of the file are used at the specified bitrate
-				$info['playtime_seconds'] *= (14 / 16);
-			}
-		}
-		return true;
-	}
-
-	private function readBinData($bin, $length) {
-		$data = substr($bin, $this->readBinDataOffset, $length);
-		$this->readBinDataOffset += $length;
-
-		return bindec($data);
-	}
-
-	public static function bitrateLookup($index) {
-		static $lookup = 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($lookup[$index]) ? $lookup[$index] : false);
-	}
-
-	public static function sampleRateLookup($index) {
-		static $lookup = 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($lookup[$index]) ? $lookup[$index] : false);
-	}
-
-	public static function bitPerSampleLookup($index) {
-		static $lookup = array(
-			0  => 16,
-			1  => 20,
-			2  => 24,
-			3  => 24,
-		);
-		return (isset($lookup[$index]) ? $lookup[$index] : false);
-	}
-
-	public static function numChannelsLookup($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;
-	}
-
-	public static function channelArrangementLookup($index) {
-		static $lookup = 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($lookup[$index]) ? $lookup[$index] : 'user-defined');
-	}
-
-	public static function dialogNormalization($index, $version) {
-		switch ($version) {
-			case 7:
-				return 0 - $index;
-				break;
-			case 6:
-				return 0 - 16 - $index;
-				break;
-		}
-		return false;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.flac.php b/lib/getid3/getid3/module.audio.flac.php
deleted file mode 100644
index 6b9598c74..000000000
--- a/lib/getid3/getid3/module.audio.flac.php
+++ /dev/null
@@ -1,442 +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);
-
-/**
-* @tutorial http://flac.sourceforge.net/format.html
-*/
-class getid3_flac extends getid3_handler
-{
-	const syncword = 'fLaC';
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		$this->fseek($info['avdataoffset']);
-		$StreamMarker = $this->fread(4);
-		if ($StreamMarker != self::syncword) {
-			return $this->error('Expecting "'.getid3_lib::PrintHexBytes(self::syncword).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($StreamMarker).'"');
-		}
-		$info['fileformat']            = 'flac';
-		$info['audio']['dataformat']   = 'flac';
-		$info['audio']['bitrate_mode'] = 'vbr';
-		$info['audio']['lossless']     = true;
-
-		// parse flac container
-		return $this->parseMETAdata();
-	}
-
-	public function parseMETAdata() {
-		$info = &$this->getid3->info;
-		do {
-			$BlockOffset   = $this->ftell();
-			$BlockHeader   = $this->fread(4);
-			$LBFBT         = getid3_lib::BigEndian2Int(substr($BlockHeader, 0, 1));
-			$LastBlockFlag = (bool) ($LBFBT & 0x80);
-			$BlockType     =        ($LBFBT & 0x7F);
-			$BlockLength   = getid3_lib::BigEndian2Int(substr($BlockHeader, 1, 3));
-			$BlockTypeText = self::metaBlockTypeLookup($BlockType);
-
-			if (($BlockOffset + 4 + $BlockLength) > $info['avdataend']) {
-				$this->error('METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$BlockTypeText.') at offset '.$BlockOffset.' extends beyond end of file');
-				break;
-			}
-			if ($BlockLength < 1) {
-				$this->error('METADATA_BLOCK_HEADER.BLOCK_LENGTH ('.$BlockLength.') at offset '.$BlockOffset.' is invalid');
-				break;
-			}
-
-			$info['flac'][$BlockTypeText]['raw'] = array();
-			$BlockTypeText_raw = &$info['flac'][$BlockTypeText]['raw'];
-
-			$BlockTypeText_raw['offset']          = $BlockOffset;
-			$BlockTypeText_raw['last_meta_block'] = $LastBlockFlag;
-			$BlockTypeText_raw['block_type']      = $BlockType;
-			$BlockTypeText_raw['block_type_text'] = $BlockTypeText;
-			$BlockTypeText_raw['block_length']    = $BlockLength;
-			if ($BlockTypeText_raw['block_type'] != 0x06) { // do not read attachment data automatically
-				$BlockTypeText_raw['block_data']  = $this->fread($BlockLength);
-			}
-
-			switch ($BlockTypeText) {
-				case 'STREAMINFO':     // 0x00
-					if (!$this->parseSTREAMINFO($BlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'PADDING':        // 0x01
-					unset($info['flac']['PADDING']); // ignore
-					break;
-
-				case 'APPLICATION':    // 0x02
-					if (!$this->parseAPPLICATION($BlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'SEEKTABLE':      // 0x03
-					if (!$this->parseSEEKTABLE($BlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'VORBIS_COMMENT': // 0x04
-					if (!$this->parseVORBIS_COMMENT($BlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'CUESHEET':       // 0x05
-					if (!$this->parseCUESHEET($BlockTypeText_raw['block_data'])) {
-						return false;
-					}
-					break;
-
-				case 'PICTURE':        // 0x06
-					if (!$this->parsePICTURE()) {
-						return false;
-					}
-					break;
-
-				default:
-					$this->warning('Unhandled METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$BlockType.') at offset '.$BlockOffset);
-			}
-
-			unset($info['flac'][$BlockTypeText]['raw']);
-			$info['avdataoffset'] = $this->ftell();
-		}
-		while ($LastBlockFlag === false);
-
-		// handle tags
-		if (!empty($info['flac']['VORBIS_COMMENT']['comments'])) {
-			$info['flac']['comments'] = $info['flac']['VORBIS_COMMENT']['comments'];
-		}
-		if (!empty($info['flac']['VORBIS_COMMENT']['vendor'])) {
-			$info['audio']['encoder'] = str_replace('reference ', '', $info['flac']['VORBIS_COMMENT']['vendor']);
-		}
-
-		// copy attachments to 'comments' array if nesesary
-		if (isset($info['flac']['PICTURE']) && ($this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE)) {
-			foreach ($info['flac']['PICTURE'] as $entry) {
-				if (!empty($entry['data'])) {
-					$info['flac']['comments']['picture'][] = array('image_mime'=>$entry['image_mime'], 'data'=>$entry['data']);
-				}
-			}
-		}
-
-		if (isset($info['flac']['STREAMINFO'])) {
-			if (!$this->isDependencyFor('matroska')) {
-				$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) {
-				return $this->error('Corrupt FLAC file: uncompressed_audio_bytes == zero');
-			}
-			if (!empty($info['flac']['compressed_audio_bytes'])) {
-				$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)) {
-                $this->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']);
-				}
-			}
-		}
-
-		if (isset($info['flac']['STREAMINFO']['bits_per_sample'])) {
-			$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
-				$this->warning('FLAC calculates MD5 data strangely on 8-bit audio, so the stored md5_data_source value will not match the decoded WAV file');
-			}
-		}
-
-		return true;
-	}
-
-	private function parseSTREAMINFO($BlockData) {
-		$info = &$this->getid3->info;
-
-		$info['flac']['STREAMINFO'] = array();
-		$streaminfo = &$info['flac']['STREAMINFO'];
-
-		$streaminfo['min_block_size']  = getid3_lib::BigEndian2Int(substr($BlockData, 0, 2));
-		$streaminfo['max_block_size']  = getid3_lib::BigEndian2Int(substr($BlockData, 2, 2));
-		$streaminfo['min_frame_size']  = getid3_lib::BigEndian2Int(substr($BlockData, 4, 3));
-		$streaminfo['max_frame_size']  = getid3_lib::BigEndian2Int(substr($BlockData, 7, 3));
-
-		$SRCSBSS                       = getid3_lib::BigEndian2Bin(substr($BlockData, 10, 8));
-		$streaminfo['sample_rate']     = getid3_lib::Bin2Dec(substr($SRCSBSS,  0, 20));
-		$streaminfo['channels']        = getid3_lib::Bin2Dec(substr($SRCSBSS, 20,  3)) + 1;
-		$streaminfo['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 23,  5)) + 1;
-		$streaminfo['samples_stream']  = getid3_lib::Bin2Dec(substr($SRCSBSS, 28, 36));
-
-		$streaminfo['audio_signature'] = substr($BlockData, 18, 16);
-
-		if (!empty($streaminfo['sample_rate'])) {
-
-			$info['audio']['bitrate_mode']    = 'vbr';
-			$info['audio']['sample_rate']     = $streaminfo['sample_rate'];
-			$info['audio']['channels']        = $streaminfo['channels'];
-			$info['audio']['bits_per_sample'] = $streaminfo['bits_per_sample'];
-			$info['playtime_seconds']         = $streaminfo['samples_stream'] / $streaminfo['sample_rate'];
-			if ($info['playtime_seconds'] > 0) {
-				if (!$this->isDependencyFor('matroska')) {
-					$info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
-				}
-				else {
-					$this->warning('Cannot determine audio bitrate because total stream size is unknown');
-				}
-			}
-
-		} else {
-			return $this->error('Corrupt METAdata block: STREAMINFO');
-		}
-
-		return true;
-	}
-
-	private function parseAPPLICATION($BlockData) {
-		$info = &$this->getid3->info;
-
-		$ApplicationID = getid3_lib::BigEndian2Int(substr($BlockData, 0, 4));
-		$info['flac']['APPLICATION'][$ApplicationID]['name'] = self::applicationIDLookup($ApplicationID);
-		$info['flac']['APPLICATION'][$ApplicationID]['data'] = substr($BlockData, 4);
-
-		return true;
-	}
-
-	private function parseSEEKTABLE($BlockData) {
-		$info = &$this->getid3->info;
-
-		$offset = 0;
-		$BlockLength = strlen($BlockData);
-		$placeholderpattern = str_repeat("\xFF", 8);
-		while ($offset < $BlockLength) {
-			$SampleNumberString = substr($BlockData, $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($BlockData, $offset, 8));
-				$offset += 8;
-				$info['flac']['SEEKTABLE'][$SampleNumber]['samples'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 2));
-				$offset += 2;
-
-			}
-		}
-
-		return true;
-	}
-
-	private function parseVORBIS_COMMENT($BlockData) {
-		$info = &$this->getid3->info;
-
-		$getid3_ogg = new getid3_ogg($this->getid3);
-		if ($this->isDependencyFor('matroska')) {
-			$getid3_ogg->setStringMode($this->data_string);
-		}
-		$getid3_ogg->ParseVorbisComments();
-		if (isset($info['ogg'])) {
-			unset($info['ogg']['comments_raw']);
-			$info['flac']['VORBIS_COMMENT'] = $info['ogg'];
-			unset($info['ogg']);
-		}
-
-		unset($getid3_ogg);
-
-		return true;
-	}
-
-	private function parseCUESHEET($BlockData) {
-		$info = &$this->getid3->info;
-		$offset = 0;
-		$info['flac']['CUESHEET']['media_catalog_number'] =                              trim(substr($BlockData, $offset, 128), "\0");
-		$offset += 128;
-		$info['flac']['CUESHEET']['lead_in_samples']      =         getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
-		$offset += 8;
-		$info['flac']['CUESHEET']['flags']['is_cd']       = (bool) (getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1)) & 0x80);
-		$offset += 1;
-
-		$offset += 258; // reserved
-
-		$info['flac']['CUESHEET']['number_tracks']        =         getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
-		$offset += 1;
-
-		for ($track = 0; $track < $info['flac']['CUESHEET']['number_tracks']; $track++) {
-			$TrackSampleOffset = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
-			$offset += 8;
-			$TrackNumber       = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
-			$offset += 1;
-
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['sample_offset']         = $TrackSampleOffset;
-
-			$info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc']                  =                           substr($BlockData, $offset, 12);
-			$offset += 12;
-
-			$TrackFlagsRaw                                                             = getid3_lib::BigEndian2Int(substr($BlockData, $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($BlockData, $offset, 1));
-			$offset += 1;
-
-			for ($index = 0; $index < $info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']; $index++) {
-				$IndexSampleOffset = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
-				$offset += 8;
-				$IndexNumber       = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
-				$offset += 1;
-
-				$offset += 3; // reserved
-
-				$info['flac']['CUESHEET']['tracks'][$TrackNumber]['indexes'][$IndexNumber] = $IndexSampleOffset;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Parse METADATA_BLOCK_PICTURE flac structure and extract attachment
-	* External usage: audio.ogg
-	*/
-	public function parsePICTURE() {
-		$info = &$this->getid3->info;
-
-		$picture['typeid']         = getid3_lib::BigEndian2Int($this->fread(4));
-		$picture['type']           = self::pictureTypeLookup($picture['typeid']);
-		$picture['image_mime']     = $this->fread(getid3_lib::BigEndian2Int($this->fread(4)));
-		$descr_length              = getid3_lib::BigEndian2Int($this->fread(4));
-		if ($descr_length) {
-			$picture['description'] = $this->fread($descr_length);
-		}
-		$picture['width']          = getid3_lib::BigEndian2Int($this->fread(4));
-		$picture['height']         = getid3_lib::BigEndian2Int($this->fread(4));
-		$picture['color_depth']    = getid3_lib::BigEndian2Int($this->fread(4));
-		$picture['colors_indexed'] = getid3_lib::BigEndian2Int($this->fread(4));
-		$data_length               = getid3_lib::BigEndian2Int($this->fread(4));
-
-		if ($picture['image_mime'] == '-->') {
-			$picture['data'] = $this->fread($data_length);
-		} else {
-			$picture['data'] = $this->saveAttachment(
-				str_replace('/', '_', $picture['type']).'_'.$this->ftell(),
-				$this->ftell(),
-				$data_length,
-				$picture['image_mime']);
-		}
-
-		$info['flac']['PICTURE'][] = $picture;
-
-		return true;
-	}
-
-	public static function metaBlockTypeLookup($blocktype) {
-		static $lookup = array(
-			0 => 'STREAMINFO',
-			1 => 'PADDING',
-			2 => 'APPLICATION',
-			3 => 'SEEKTABLE',
-			4 => 'VORBIS_COMMENT',
-			5 => 'CUESHEET',
-			6 => 'PICTURE',
-		);
-		return (isset($lookup[$blocktype]) ? $lookup[$blocktype] : 'reserved');
-	}
-
-	public static function applicationIDLookup($applicationid) {
-		// http://flac.sourceforge.net/id.html
-		static $lookup = array(
-			0x41544348 => 'FlacFile',                                                                           // "ATCH"
-			0x42534F4C => 'beSolo',                                                                             // "BSOL"
-			0x42554753 => 'Bugs Player',                                                                        // "BUGS"
-			0x43756573 => 'GoldWave cue points (specification)',                                                // "Cues"
-			0x46696361 => 'CUE Splitter',                                                                       // "Fica"
-			0x46746F6C => 'flac-tools',                                                                         // "Ftol"
-			0x4D4F5442 => 'MOTB MetaCzar',                                                                      // "MOTB"
-			0x4D505345 => 'MP3 Stream Editor',                                                                  // "MPSE"
-			0x4D754D4C => 'MusicML: Music Metadata Language',                                                   // "MuML"
-			0x52494646 => 'Sound Devices RIFF chunk storage',                                                   // "RIFF"
-			0x5346464C => 'Sound Font FLAC',                                                                    // "SFFL"
-			0x534F4E59 => 'Sony Creative Software',                                                             // "SONY"
-			0x5351455A => 'flacsqueeze',                                                                        // "SQEZ"
-			0x54745776 => 'TwistedWave',                                                                        // "TtWv"
-			0x55495453 => 'UITS Embedding tools',                                                               // "UITS"
-			0x61696666 => 'FLAC AIFF chunk storage',                                                            // "aiff"
-			0x696D6167 => 'flac-image application for storing arbitrary files in APPLICATION metadata blocks',  // "imag"
-			0x7065656D => 'Parseable Embedded Extensible Metadata (specification)',                             // "peem"
-			0x71667374 => 'QFLAC Studio',                                                                       // "qfst"
-			0x72696666 => 'FLAC RIFF chunk storage',                                                            // "riff"
-			0x74756E65 => 'TagTuner',                                                                           // "tune"
-			0x78626174 => 'XBAT',                                                                               // "xbat"
-			0x786D6364 => 'xmcd',                                                                               // "xmcd"
-		);
-		return (isset($lookup[$applicationid]) ? $lookup[$applicationid] : 'reserved');
-	}
-
-	public static function pictureTypeLookup($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');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.la.php b/lib/getid3/getid3/module.audio.la.php
deleted file mode 100644
index 4e4cf53c1..000000000
--- a/lib/getid3/getid3/module.audio.la.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                             //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// 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
-{
-
-	public 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']['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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.lpac.php b/lib/getid3/getid3/module.audio.lpac.php
deleted file mode 100644
index 3d45e0000..000000000
--- a/lib/getid3/getid3/module.audio.lpac.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.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
-{
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.midi.php b/lib/getid3/getid3/module.audio.midi.php
deleted file mode 100644
index 2ca258e70..000000000
--- a/lib/getid3/getid3/module.audio.midi.php
+++ /dev/null
@@ -1,529 +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
-{
-	public $scanwholefile = true;
-
-	public 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) {
-				if ($buffer = fread($this->getid3->fp, $this->getid3->fread_buffer_size())) {
-					$MIDIdata .= $buffer;
-				} else {
-					$info['warning'][] = 'only processed '.($i - 1).' of '.$thisfile_midi_raw['tracks'].' tracks';
-					$info['error'][] = 'Unabled to read more file data at '.ftell($this->getid3->fp).' (trying to seek to : '.$offset.'), was expecting at least 8 more bytes';
-					return false;
-				}
-			}
-			$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;
-	}
-
-	public 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');
-	}
-
-	public 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');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.mod.php b/lib/getid3/getid3/module.audio.mod.php
deleted file mode 100644
index 3bed8586c..000000000
--- a/lib/getid3/getid3/module.audio.mod.php
+++ /dev/null
@@ -1,98 +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
-{
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.monkey.php b/lib/getid3/getid3/module.audio.monkey.php
deleted file mode 100644
index 941a0b3e6..000000000
--- a/lib/getid3/getid3/module.audio.monkey.php
+++ /dev/null
@@ -1,203 +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
-{
-
-	public 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;
-	}
-
-	public 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');
-	}
-
-	public 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;
-		}
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.mp3.php b/lib/getid3/getid3/module.audio.mp3.php
deleted file mode 100644
index e6ffea947..000000000
--- a/lib/getid3/getid3/module.audio.mp3.php
+++ /dev/null
@@ -1,2009 +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
-{
-
-	public $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
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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       = self::MPEGaudioVersionArray();
-			$MPEGaudioLayerLookup         = self::MPEGaudioLayerArray();
-			$MPEGaudioBitrateLookup       = self::MPEGaudioBitrateArray();
-			$MPEGaudioFrequencyLookup     = self::MPEGaudioFrequencyArray();
-			$MPEGaudioChannelModeLookup   = self::MPEGaudioChannelModeArray();
-			$MPEGaudioModeExtensionLookup = self::MPEGaudioModeExtensionArray();
-			$MPEGaudioEmphasisLookup      = self::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 = self::MPEGaudioHeaderDecode($head4);
-			$MPEGaudioHeaderDecodeCache[$head4] = $MPEGheaderRawArray;
-		}
-
-		static $MPEGaudioHeaderValidCache = array();
-		if (!isset($MPEGaudioHeaderValidCache[$head4])) { // Not in cache
-			//$MPEGaudioHeaderValidCache[$head4] = self::MPEGaudioHeaderValid($MPEGheaderRawArray, false, true);  // allow badly-formatted freeformat (from LAME 3.90 - 3.93.1)
-			$MPEGaudioHeaderValidCache[$head4] = self::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'] = self::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 = self::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']     = self::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']         = self::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']  = self::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']     = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
-						$thisfile_mpeg_audio_lame['preset_used_id']    = ($PresetSurroundBytes & 0x07FF);
-						$thisfile_mpeg_audio_lame['preset_used']       = self::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'] = self::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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function getOnlyMPEGaudioInfoBruteForce() {
-		$MPEGaudioHeaderDecodeCache   = array();
-		$MPEGaudioHeaderValidCache    = array();
-		$MPEGaudioHeaderLengthCache   = array();
-		$MPEGaudioVersionLookup       = self::MPEGaudioVersionArray();
-		$MPEGaudioLayerLookup         = self::MPEGaudioLayerArray();
-		$MPEGaudioBitrateLookup       = self::MPEGaudioBitrateArray();
-		$MPEGaudioFrequencyLookup     = self::MPEGaudioFrequencyArray();
-		$MPEGaudioChannelModeLookup   = self::MPEGaudioChannelModeArray();
-		$MPEGaudioModeExtensionLookup = self::MPEGaudioModeExtensionArray();
-		$MPEGaudioEmphasisLookup      = self::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] = self::MPEGaudioHeaderDecode($head4);
-			}
-			if (!isset($MPEGaudioHeaderValidCache[$head4])) {
-				$MPEGaudioHeaderValidCache[$head4] = self::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] = self::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] = self::MPEGaudioHeaderDecode($next4);
-						}
-						if (!isset($MPEGaudioHeaderValidCache[$next4])) {
-							$MPEGaudioHeaderValidCache[$next4] = self::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;
-	}
-
-
-	public 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 = self::MPEGaudioVersionArray();
-		   $MPEGaudioLayerLookup   = self::MPEGaudioLayerArray();
-		   $MPEGaudioBitrateLookup = self::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;
-	}
-
-
-	public static function MPEGaudioVersionArray() {
-		static $MPEGaudioVersion = array('2.5', false, '2', '1');
-		return $MPEGaudioVersion;
-	}
-
-	public static function MPEGaudioLayerArray() {
-		static $MPEGaudioLayer = array(false, 3, 2, 1);
-		return $MPEGaudioLayer;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public static function MPEGaudioChannelModeArray() {
-		static $MPEGaudioChannelMode = array('stereo', 'joint stereo', 'dual channel', 'mono');
-		return $MPEGaudioChannelMode;
-	}
-
-	public 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;
-	}
-
-	public static function MPEGaudioEmphasisArray() {
-		static $MPEGaudioEmphasis = array('none', '50/15ms', false, 'CCIT J.17');
-		return $MPEGaudioEmphasis;
-	}
-
-	public static function MPEGaudioHeaderBytesValid($head4, $allowBitrate15=false) {
-		return self::MPEGaudioHeaderValid(self::MPEGaudioHeaderDecode($head4), false, $allowBitrate15);
-	}
-
-	public 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       = self::MPEGaudioVersionArray();
-			$MPEGaudioLayerLookup         = self::MPEGaudioLayerArray();
-			$MPEGaudioBitrateLookup       = self::MPEGaudioBitrateArray();
-			$MPEGaudioFrequencyLookup     = self::MPEGaudioFrequencyArray();
-			$MPEGaudioChannelModeLookup   = self::MPEGaudioChannelModeArray();
-			$MPEGaudioModeExtensionLookup = self::MPEGaudioModeExtensionArray();
-			$MPEGaudioEmphasisLookup      = self::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;
-	}
-
-	public 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;
-	}
-
-	public 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];
-	}
-
-	public 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];
-	}
-
-	public 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];
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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');
-	}
-
-	public 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');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.mpc.php b/lib/getid3/getid3/module.audio.mpc.php
deleted file mode 100644
index 8ab421ebe..000000000
--- a/lib/getid3/getid3/module.audio.mpc.php
+++ /dev/null
@@ -1,506 +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
-{
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-
-	public 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');
-	}
-
-	public function MPCfrequencyLookup($frequencyid) {
-		static $MPCfrequencyLookup = array(
-			0 => 44100,
-			1 => 48000,
-			2 => 37800,
-			3 => 32000
-		);
-		return (isset($MPCfrequencyLookup[$frequencyid]) ? $MPCfrequencyLookup[$frequencyid] : 'invalid');
-	}
-
-	public function MPCpeakDBLookup($intvalue) {
-		if ($intvalue > 0) {
-			return ((log10($intvalue) / log10(2)) - 15) * 6;
-		}
-		return false;
-	}
-
-	public 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';
-	}
-
-	public 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;
-	}
-
-	public 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);
-	}
-}
diff --git a/lib/getid3/getid3/module.audio.ogg.php b/lib/getid3/getid3/module.audio.ogg.php
deleted file mode 100644
index a2a35aadf..000000000
--- a/lib/getid3/getid3/module.audio.ogg.php
+++ /dev/null
@@ -1,671 +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
-{
-	// http://xiph.org/vorbis/doc/Vorbis_I_spec.html
-	public 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
-
-		$this->fseek($info['avdataoffset']);
-
-		$oggpageinfo = $this->ParseOggPageHeader();
-		$info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
-		if ($this->ftell() >= $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 = $this->fread($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 = $this->fread($oggpageinfo['page_length']);
-				$this->fseek($oggpageinfo['page_end_offset']);
-
-				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"));
-
-			$this->fseek($oggpageinfo['page_start_offset']);
-
-			$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 = $this->fread($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->ParseVorbisComments();
-				break;
-
-			case 'flac':
-				$flac = new getid3_flac($this->getid3);
-				if (!$flac->parseMETAdata()) {
-					$info['error'][] = 'Failed to parse FLAC headers';
-					return false;
-				}
-				unset($flac);
-				break;
-
-			case 'speex':
-				$this->fseek($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR);
-				$this->ParseVorbisComments();
-				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 {
-
-			$this->fseek(max($info['avdataend'] - $this->getid3->fread_buffer_size(), 0));
-			$LastChunkOfOgg = strrev($this->fread($this->getid3->fread_buffer_size()));
-			if ($LastOggSpostion = strpos($LastChunkOfOgg, 'SggO')) {
-				$this->fseek($info['avdataend'] - ($LastOggSpostion + strlen('SggO')));
-				$info['avdataend'] = $this->ftell();
-				$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;
-	}
-
-	public 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;
-	}
-
-	public function ParseOggPageHeader() {
-		// http://xiph.org/ogg/vorbis/doc/framing.html
-		$oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
-
-		$filedata = $this->fread($this->getid3->fread_buffer_size());
-		$filedataoffset = 0;
-		while ((substr($filedata, $filedataoffset++, 4) != 'OggS')) {
-			if (($this->ftell() - $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 ($this->feof() || (($filedata .= $this->fread($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'];
-		$this->fseek($oggheader['header_end_offset']);
-
-		return $oggheader;
-	}
-
-    // http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810005
-	public function ParseVorbisComments() {
-		$info = &$this->getid3->info;
-
-		$OriginalOffset = $this->ftell();
-		$commentdataoffset = 0;
-		$VorbisCommentPage = 1;
-
-		switch ($info['audio']['dataformat']) {
-			case 'vorbis':
-			case 'speex':
-				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset'];  // Second Ogg page, after header block
-				$this->fseek($CommentStartOffset);
-				$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
-				$commentdata = $this->fread(self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
-
-				if ($info['audio']['dataformat'] == 'vorbis') {
-					$commentdataoffset += (strlen('vorbis') + 1);
-				}
-				break;
-
-			case 'flac':
-				$CommentStartOffset = $info['flac']['VORBIS_COMMENT']['raw']['offset'] + 4;
-				$this->fseek($CommentStartOffset);
-				$commentdata = $this->fread($info['flac']['VORBIS_COMMENT']['raw']['block_length']);
-				break;
-
-			default:
-				return false;
-		}
-
-		$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 ($this->ftell() < ($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 .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-					$commentdata .= $this->fread($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 .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-				if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
-					$info['warning'][] = 'undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell();
-					break;
-				}
-				$readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
-				if ($readlength <= 0) {
-					$info['warning'][] = 'invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell();
-					break;
-				}
-				$commentdata .= $this->fread($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] : '');
-
-				if ($ThisFileInfo_ogg_comments_raw[$i]['key'] == 'METADATA_BLOCK_PICTURE') {
-
-					// http://wiki.xiph.org/VorbisComment#METADATA_BLOCK_PICTURE
-					// The unencoded format is that of the FLAC picture block. The fields are stored in big endian order as in FLAC, picture data is stored according to the relevant standard.
-					// http://flac.sourceforge.net/format.html#metadata_block_picture
-					$flac = new getid3_flac($this->getid3);
-					$flac->setStringMode(base64_decode($ThisFileInfo_ogg_comments_raw[$i]['value']));
-					$flac->parsePICTURE();
-					$info['ogg']['comments']['picture'][] = $flac->getid3->info['flac']['PICTURE'][0];
-					unset($flac);
-
-				} elseif ($ThisFileInfo_ogg_comments_raw[$i]['key'] == 'COVERART') {
-
-					$data = base64_decode($ThisFileInfo_ogg_comments_raw[$i]['value']);
-					$this->notice('Found deprecated COVERART tag, it should be replaced in honor of METADATA_BLOCK_PICTURE structure');
-					/** @todo use 'coverartmime' where available */
-					$imageinfo = getid3_lib::GetDataImageSize($data);
-					if ($imageinfo === false || !isset($imageinfo['mime'])) {
-						$this->warning('COVERART vorbiscomment tag contains invalid image');
-						continue;
-					}
-
-					$ogg = new self($this->getid3);
-					$ogg->setStringMode($data);
-					$info['ogg']['comments']['picture'][] = array(
-						'image_mime' => $imageinfo['mime'],
-						'data'       => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']),
-					);
-					unset($ogg);
-
-				} else {
-
-					$info['ogg']['comments'][strtolower($ThisFileInfo_ogg_comments_raw[$i]['key'])][] = $ThisFileInfo_ogg_comments_raw[$i]['value'];
-
-				}
-
-			} else {
-
-				$info['warning'][] = '[known problem with CDex >= v1.40, < v1.50b7] Invalid Ogg comment name/value pair ['.$i.']: '.$commentstring;
-
-			}
-			unset($ThisFileInfo_ogg_comments_raw[$i]);
-		}
-		unset($ThisFileInfo_ogg_comments_raw);
-
-
-		// 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;
-				}
-			}
-		}
-
-		$this->fseek($OriginalOffset);
-
-		return true;
-	}
-
-	public 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);
-	}
-
-
-	public 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;
-	}
-
-
-	public 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
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.optimfrog.php b/lib/getid3/getid3/module.audio.optimfrog.php
deleted file mode 100644
index 5df74b7b6..000000000
--- a/lib/getid3/getid3/module.audio.optimfrog.php
+++ /dev/null
@@ -1,426 +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
-{
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-	public static function OptimFROGchannelConfigurationLookup($ChannelConfiguration) {
-		static $OptimFROGchannelConfigurationLookup = array(
-			0 => 'mono',
-			1 => 'stereo'
-		);
-		return (isset($OptimFROGchannelConfigurationLookup[$ChannelConfiguration]) ? $OptimFROGchannelConfigurationLookup[$ChannelConfiguration] : false);
-	}
-
-	public 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);
-	// }
-
-
-	public 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).')').')';
-	}
-
-	public 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).')');
-	}
-
-	public 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));
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.rkau.php b/lib/getid3/getid3/module.audio.rkau.php
deleted file mode 100644
index 0ea051bc6..000000000
--- a/lib/getid3/getid3/module.audio.rkau.php
+++ /dev/null
@@ -1,92 +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
-{
-
-	public 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;
-
-	}
-
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.shorten.php b/lib/getid3/getid3/module.audio.shorten.php
deleted file mode 100644
index a047f16f1..000000000
--- a/lib/getid3/getid3/module.audio.shorten.php
+++ /dev/null
@@ -1,181 +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
-{
-
-	public 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::parseWAVEFORMATex(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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.tta.php b/lib/getid3/getid3/module.audio.tta.php
deleted file mode 100644
index a3056db69..000000000
--- a/lib/getid3/getid3/module.audio.tta.php
+++ /dev/null
@@ -1,106 +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
-{
-
-	public 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::wFormatTagLookup()
-				$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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.voc.php b/lib/getid3/getid3/module.audio.voc.php
deleted file mode 100644
index e38fa482b..000000000
--- a/lib/getid3/getid3/module.audio.voc.php
+++ /dev/null
@@ -1,204 +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
-{
-
-	public 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;
-	}
-
-	public 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');
-	}
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.vqf.php b/lib/getid3/getid3/module.audio.vqf.php
deleted file mode 100644
index 40c77d054..000000000
--- a/lib/getid3/getid3/module.audio.vqf.php
+++ /dev/null
@@ -1,159 +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
-{
-	public 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;
-	}
-
-	public function VQFchannelFrequencyLookup($frequencyid) {
-		static $VQFchannelFrequencyLookup = array(
-			11 => 11025,
-			22 => 22050,
-			44 => 44100
-		);
-		return (isset($VQFchannelFrequencyLookup[$frequencyid]) ? $VQFchannelFrequencyLookup[$frequencyid] : $frequencyid * 1000);
-	}
-
-	public 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);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.audio.wavpack.php b/lib/getid3/getid3/module.audio.wavpack.php
deleted file mode 100644
index 8daf60346..000000000
--- a/lib/getid3/getid3/module.audio.wavpack.php
+++ /dev/null
@@ -1,397 +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
-{
-
-	public 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::parseComments($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;
-	}
-
-
-	public 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] : '');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.bmp.php b/lib/getid3/getid3/module.graphic.bmp.php
deleted file mode 100644
index 5dabd9b07..000000000
--- a/lib/getid3/getid3/module.graphic.bmp.php
+++ /dev/null
@@ -1,687 +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
-{
-	public $ExtractPalette = false;
-	public $ExtractData    = false;
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-	public 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');
-	}
-
-	public 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');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.efax.php b/lib/getid3/getid3/module.graphic.efax.php
deleted file mode 100644
index dfedf6e6f..000000000
--- a/lib/getid3/getid3/module.graphic.efax.php
+++ /dev/null
@@ -1,50 +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
-{
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.gif.php b/lib/getid3/getid3/module.graphic.gif.php
deleted file mode 100644
index cd8457e33..000000000
--- a/lib/getid3/getid3/module.graphic.gif.php
+++ /dev/null
@@ -1,181 +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
-{
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.jpg.php b/lib/getid3/getid3/module.graphic.jpg.php
deleted file mode 100644
index 3db654382..000000000
--- a/lib/getid3/getid3/module.graphic.jpg.php
+++ /dev/null
@@ -1,344 +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
-{
-
-
-	public 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);
-		list($width, $height, $type) = getimagesize($info['filenamepath'], $imageinfo); // http://www.getid3.org/phpBB3/viewtopic.php?t=1474
-
-
-		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['warning'][] = 'known issue: https://bugs.php.net/bug.php?id=62523';
-//return false;
-							$info['jpg']['exif'] = exif_read_data($info['filenamepath'], null, 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']['GPSAltitudeRef'])) {
-				$info['jpg']['exif']['GPS']['GPSAltitudeRef'] = ord($info['jpg']['exif']['GPS']['GPSAltitudeRef']); // 0 = above sea level; 1 = below sea level
-			}
-			if (isset($info['jpg']['exif']['GPS']['GPSAltitude'])) {
-				$direction_multiplier = (!empty($info['jpg']['exif']['GPS']['GPSAltitudeRef']) ? -1 : 1);           // 0 = above sea level; 1 = below sea level
-				$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) {
-					if (strpos($key, ':')) {
-						list($subsection, $tagname) = explode(':', $key);
-						$info['xmp'][$subsection][$tagname] = $this->CastAsAppropriate($value);
-					} else {
-						$info['warning'][] = 'XMP: expecting "<subsection>:<tagname>", found "'.$key.'"';
-					}
-				}
-			}
-		}
-
-		if (!$returnOK) {
-			unset($info['fileformat']);
-			return false;
-		}
-		return true;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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] : '');
-	}
-
-
-	public 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);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.pcd.php b/lib/getid3/getid3/module.graphic.pcd.php
deleted file mode 100644
index 1f83a6730..000000000
--- a/lib/getid3/getid3/module.graphic.pcd.php
+++ /dev/null
@@ -1,132 +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
-{
-	public $ExtractData = 0;
-
-	public 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;
-
-		}
-
-	}
-
-	public 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']);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.png.php b/lib/getid3/getid3/module.graphic.png.php
deleted file mode 100644
index 250ca1b10..000000000
--- a/lib/getid3/getid3/module.graphic.png.php
+++ /dev/null
@@ -1,517 +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
-{
-
-	public 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;
-	}
-
-	public function PNGsRGBintentLookup($sRGB) {
-		static $PNGsRGBintentLookup = array(
-			0 => 'Perceptual',
-			1 => 'Relative colorimetric',
-			2 => 'Saturation',
-			3 => 'Absolute colorimetric'
-		);
-		return (isset($PNGsRGBintentLookup[$sRGB]) ? $PNGsRGBintentLookup[$sRGB] : 'invalid');
-	}
-
-	public function PNGcompressionMethodLookup($compressionmethod) {
-		static $PNGcompressionMethodLookup = array(
-			0 => 'deflate/inflate'
-		);
-		return (isset($PNGcompressionMethodLookup[$compressionmethod]) ? $PNGcompressionMethodLookup[$compressionmethod] : 'invalid');
-	}
-
-	public function PNGpHYsUnitLookup($unitid) {
-		static $PNGpHYsUnitLookup = array(
-			0 => 'unknown',
-			1 => 'meter'
-		);
-		return (isset($PNGpHYsUnitLookup[$unitid]) ? $PNGpHYsUnitLookup[$unitid] : 'invalid');
-	}
-
-	public function PNGoFFsUnitLookup($unitid) {
-		static $PNGoFFsUnitLookup = array(
-			0 => 'pixel',
-			1 => 'micrometer'
-		);
-		return (isset($PNGoFFsUnitLookup[$unitid]) ? $PNGoFFsUnitLookup[$unitid] : 'invalid');
-	}
-
-	public 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');
-	}
-
-	public function PNGsCALUnitLookup($unitid) {
-		static $PNGsCALUnitLookup = array(
-			0 => 'meter',
-			1 => 'radian'
-		);
-		return (isset($PNGsCALUnitLookup[$unitid]) ? $PNGsCALUnitLookup[$unitid] : 'invalid');
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.svg.php b/lib/getid3/getid3/module.graphic.svg.php
deleted file mode 100644
index 8b31167eb..000000000
--- a/lib/getid3/getid3/module.graphic.svg.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.graphic.svg.php                                      //
-// module for analyzing SVG Image files                        //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_svg extends getid3_handler
-{
-
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.graphic.tiff.php b/lib/getid3/getid3/module.graphic.tiff.php
deleted file mode 100644
index 25996f0e5..000000000
--- a/lib/getid3/getid3/module.graphic.tiff.php
+++ /dev/null
@@ -1,224 +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
-{
-
-	public 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;
-	}
-
-
-	public function TIFFendian2Int($bytestring, $byteorder) {
-		if ($byteorder == 'Intel') {
-			return getid3_lib::LittleEndian2Int($bytestring);
-		} elseif ($byteorder == 'Motorola') {
-			return getid3_lib::BigEndian2Int($bytestring);
-		}
-		return false;
-	}
-
-	public 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.')');
-	}
-
-	public 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.')');
-	}
-
-}
diff --git a/lib/getid3/getid3/module.misc.cue.php b/lib/getid3/getid3/module.misc.cue.php
deleted file mode 100644
index a4536289c..000000000
--- a/lib/getid3/getid3/module.misc.cue.php
+++ /dev/null
@@ -1,311 +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
-{
-	public $cuesheet = array();
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'cue';
-		$this->readCueSheetFilename($info['filenamepath']);
-		$info['cue'] = $this->cuesheet;
-		return true;
-	}
-
-
-
-	public 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.
-	*/
-	public 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.
-	*/
-	public 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.
-	*/
-	public 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..
-	*/
-	public 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.
-	*/
-	public 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.
-	*/
-	public 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.
-	*/
-	public 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;
-		}
-	}
-
-	public 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.
-	*/
-	public 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 15e786b43..000000000
--- a/lib/getid3/getid3/module.misc.exe.php
+++ /dev/null
@@ -1,58 +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
-{
-
-	public 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;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/module.misc.iso.php b/lib/getid3/getid3/module.misc.iso.php
deleted file mode 100644
index 39bd16af3..000000000
--- a/lib/getid3/getid3/module.misc.iso.php
+++ /dev/null
@@ -1,387 +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
-{
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-	public function ISOstripFilenameVersion($ISOfilename) {
-		// convert 'filename.ext;1' to 'filename.ext'
-		if (!strstr($ISOfilename, ';')) {
-			return $ISOfilename;
-		} else {
-			return substr($ISOfilename, 0, strpos($ISOfilename, ';'));
-		}
-	}
-
-	public 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);
-	}
-
-	public 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);
-	}
-
-	public 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;
-		}
-	}
-
-
-}
diff --git a/lib/getid3/getid3/module.misc.msoffice.php b/lib/getid3/getid3/module.misc.msoffice.php
deleted file mode 100644
index e488854c0..000000000
--- a/lib/getid3/getid3/module.misc.msoffice.php
+++ /dev/null
@@ -1,37 +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.msoffice.php                                    //
-// module for analyzing MS Office (.doc, .xls, etc) files      //
-// dependencies: NONE                                          //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-
-class getid3_msoffice extends getid3_handler
-{
-
-	public 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;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/module.misc.par2.php b/lib/getid3/getid3/module.misc.par2.php
deleted file mode 100644
index 80b47d295..000000000
--- a/lib/getid3/getid3/module.misc.par2.php
+++ /dev/null
@@ -1,30 +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
-{
-
-	public function Analyze() {
-		$info = &$this->getid3->info;
-
-		$info['fileformat'] = 'par2';
-
-		$info['error'][] = 'PAR2 parsing not enabled in this version of getID3()';
-		return false;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/module.misc.pdf.php b/lib/getid3/getid3/module.misc.pdf.php
deleted file mode 100644
index 3b8aaa146..000000000
--- a/lib/getid3/getid3/module.misc.pdf.php
+++ /dev/null
@@ -1,30 +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
-{
-
-	public 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;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/module.tag.apetag.php b/lib/getid3/getid3/module.tag.apetag.php
deleted file mode 100644
index afeede769..000000000
--- a/lib/getid3/getid3/module.tag.apetag.php
+++ /dev/null
@@ -1,370 +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
-{
-	public $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
-	public $overrideendoffset  = 0;
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function APEcontentTypeFlagLookup($contenttypeid) {
-		static $APEcontentTypeFlagLookup = array(
-			0 => 'utf-8',
-			1 => 'binary',
-			2 => 'external',
-			3 => 'reserved'
-		);
-		return (isset($APEcontentTypeFlagLookup[$contenttypeid]) ? $APEcontentTypeFlagLookup[$contenttypeid] : 'invalid');
-	}
-
-	public 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);
-	}
-
-}
diff --git a/lib/getid3/getid3/module.tag.id3v1.php b/lib/getid3/getid3/module.tag.id3v1.php
deleted file mode 100644
index fd9069e04..000000000
--- a/lib/getid3/getid3/module.tag.id3v1.php
+++ /dev/null
@@ -1,359 +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
-{
-
-	public 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;
-	}
-
-	public static function cutfield($str) {
-		return trim(substr($str, 0, strcspn($str, "\x00")));
-	}
-
-	public 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);
-	}
-
-	public 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 = self::ArrayOfGenres($allowSCMPXextended);
-		return (isset($GenreLookup[$genreid]) ? $GenreLookup[$genreid] : false);
-	}
-
-	public static function LookupGenreID($genre, $allowSCMPXextended=false) {
-		$GenreLookup = self::ArrayOfGenres($allowSCMPXextended);
-		$LowerCaseNoSpaceSearchTerm = strtolower(str_replace(' ', '', $genre));
-		foreach ($GenreLookup as $key => $value) {
-			if (strtolower(str_replace(' ', '', $value)) == $LowerCaseNoSpaceSearchTerm) {
-				return $key;
-			}
-		}
-		return false;
-	}
-
-	public static function StandardiseID3v1GenreName($OriginalGenre) {
-		if (($GenreID = self::LookupGenreID($OriginalGenre)) !== false) {
-			return self::LookupGenreName($GenreID);
-		}
-		return $OriginalGenre;
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/module.tag.id3v2.php b/lib/getid3/getid3/module.tag.id3v2.php
deleted file mode 100644
index b08f9f9a3..000000000
--- a/lib/getid3/getid3/module.tag.id3v2.php
+++ /dev/null
@@ -1,3414 +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
-{
-	public $StartingOffset = 0;
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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'])) {
-				// ID3v2.3 specs say that TPE1 (and others) can contain multiple artist values separated with /
-				// This of course breaks when an artist name contains slash character, e.g. "AC/DC"
-				// MP3tag (maybe others) implement alternative system where multiple artists are null-separated, which makes more sense
-				// getID3 will split null-separated artists into multiple artists and leave slash-separated ones to the user
-				switch ($parsedFrame['encoding']) {
-					case 'UTF-16':
-					case 'UTF-16BE':
-					case 'UTF-16LE':
-						$wordsize = 2;
-						break;
-					case 'ISO-8859-1':
-					case 'UTF-8':
-					default:
-						$wordsize = 1;
-						break;
-				}
-				$Txxx_elements = array();
-				$Txxx_elements_start_offset = 0;
-				for ($i = 0; $i < strlen($parsedFrame['data']); $i += $wordsize) {
-					if (substr($parsedFrame['data'], $i, $wordsize) == str_repeat("\x00", $wordsize)) {
-						$Txxx_elements[] = substr($parsedFrame['data'], $Txxx_elements_start_offset, $i - $Txxx_elements_start_offset);
-						$Txxx_elements_start_offset = $i + $wordsize;
-					}
-				}
-				$Txxx_elements[] = substr($parsedFrame['data'], $Txxx_elements_start_offset, $i - $Txxx_elements_start_offset);
-				foreach ($Txxx_elements as $Txxx_element) {
-					$string = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $Txxx_element);
-					if (!empty($string)) {
-						$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $string;
-					}
-				}
-				unset($string, $wordsize, $i, $Txxx_elements, $Txxx_element, $Txxx_elements_start_offset);
-			}
-
-		} 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)
-			// http://id3.org/id3v2.3.0#sec4.4
-			//   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_raw']   = (string) substr($parsedFrame['data'], $frame_offset);
-
-			// http://www.getid3.org/phpBB3/viewtopic.php?t=1369
-			// "this tag typically contains null terminated strings, which are associated in pairs"
-			// "there are users that use the tag incorrectly"
-			$IPLS_parts = array();
-			if (strpos($parsedFrame['data_raw'], "\x00") !== false) {
-				$IPLS_parts_unsorted = array();
-				if (((strlen($parsedFrame['data_raw']) % 2) == 0) && ((substr($parsedFrame['data_raw'], 0, 2) == "\xFF\xFE") || (substr($parsedFrame['data_raw'], 0, 2) == "\xFE\xFF"))) {
-					// UTF-16, be careful looking for null bytes since most 2-byte characters may contain one; you need to find twin null bytes, and on even padding
-					$thisILPS  = '';
-					for ($i = 0; $i < strlen($parsedFrame['data_raw']); $i += 2) {
-						$twobytes = substr($parsedFrame['data_raw'], $i, 2);
-						if ($twobytes === "\x00\x00") {
-							$IPLS_parts_unsorted[] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $thisILPS);
-							$thisILPS  = '';
-						} else {
-							$thisILPS .= $twobytes;
-						}
-					}
-					if (strlen($thisILPS) > 2) { // 2-byte BOM
-						$IPLS_parts_unsorted[] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $thisILPS);
-					}
-				} else {
-					// ISO-8859-1 or UTF-8 or other single-byte-null character set
-					$IPLS_parts_unsorted = explode("\x00", $parsedFrame['data_raw']);
-				}
-				if (count($IPLS_parts_unsorted) == 1) {
-					// just a list of names, e.g. "Dino Baptiste, Jimmy Copley, John Gordon, Bernie Marsden, Sharon Watson"
-					foreach ($IPLS_parts_unsorted as $key => $value) {
-						$IPLS_parts_sorted = preg_split('#[;,\\r\\n\\t]#', $value);
-						$position = '';
-						foreach ($IPLS_parts_sorted as $person) {
-							$IPLS_parts[] = array('position'=>$position, 'person'=>$person);
-						}
-					}
-				} elseif ((count($IPLS_parts_unsorted) % 2) == 0) {
-					$position = '';
-					$person   = '';
-					foreach ($IPLS_parts_unsorted as $key => $value) {
-						if (($key % 2) == 0) {
-							$position = $value;
-						} else {
-							$person   = $value;
-							$IPLS_parts[] = array('position'=>$position, 'person'=>$person);
-							$position = '';
-							$person   = '';
-						}
-					}
-				} else {
-					foreach ($IPLS_parts_unsorted as $key => $value) {
-						$IPLS_parts[] = array($value);
-					}
-				}
-
-			} else {
-				$IPLS_parts = preg_split('#[;,\\r\\n\\t]#', $parsedFrame['data_raw']);
-			}
-			$parsedFrame['data'] = $IPLS_parts;
-
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $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->getid3->option_save_attachments === false) {
-						// skip entirely
-						unset($parsedFrame['data']);
-						break;
-					}
-					if ($this->getid3->option_save_attachments === true) {
-						// great
-/*
-					} elseif (is_int($this->getid3->option_save_attachments)) {
-						if ($this->getid3->option_save_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->getid3->option_save_attachments)) {
-						$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
-						if (!is_dir($dir) || !is_writable($dir)) {
-							// cannot write, skip
-							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$dir.'" (not writable)';
-							unset($parsedFrame['data']);
-							break;
-						}
-					}
-					// if we get this far, must be OK
-					if (is_string($this->getid3->option_save_attachments)) {
-						$destination_filename = $dir.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;
-	}
-
-
-	public function DeUnsynchronise($data) {
-		return str_replace("\xFF\x00", "\xFF", $data);
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public function LookupExtendedHeaderRestrictionsImageEncoding($index) {
-		static $LookupExtendedHeaderRestrictionsImageEncoding = array(
-			0x00 => 'No restrictions',
-			0x01 => 'Images are encoded only with PNG or JPEG',
-		);
-		return (isset($LookupExtendedHeaderRestrictionsImageEncoding[$index]) ? $LookupExtendedHeaderRestrictionsImageEncoding[$index] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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');
-	}
-
-
-	public 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');
-	}
-
-
-
-	public 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');
-	}
-
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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] : '');
-	}
-
-	public 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
-	}
-
-
-	public 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	content_group_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');
-	}
-
-	public 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] : '');
-	}
-
-	public 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');
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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 108d7aeea..000000000
--- a/lib/getid3/getid3/module.tag.lyrics3.php
+++ /dev/null
@@ -1,294 +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
-{
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function Lyrics3Timestamp2Seconds($rawtimestamp) {
-		if (preg_match('#^\\[([0-9]{2}):([0-9]{2})\\]$#', $rawtimestamp, $regs)) {
-			return (int) (($regs[1] * 60) + $regs[2]);
-		}
-		return false;
-	}
-
-	public 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;
-	}
-
-	public function IntString2Bool($char) {
-		if ($char == '1') {
-			return true;
-		} elseif ($char == '0') {
-			return false;
-		}
-		return null;
-	}
-}
diff --git a/lib/getid3/getid3/module.tag.xmp.php b/lib/getid3/getid3/module.tag.xmp.php
deleted file mode 100644
index 366c4ec91..000000000
--- a/lib/getid3/getid3/module.tag.xmp.php
+++ /dev/null
@@ -1,767 +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()
-	*/
-	public $_sFilename = null;
-
-	/**
-	* @var array
-	* The XMP fields that were extracted from the image or updated by this class.
-	* @see getAllTags()
-	*/
-	public $_aXMP = array();
-
-	/**
-	* @var boolean
-	* True if an APP1 segment was found to contain XMP metadata.
-	* @see isValid()
-	*/
-	public $_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.
-	*/
-	public 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
-	*/
-	public 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
-	*/
-	public 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
-	*/
-	public 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
-	*/
-	public 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']))
-									if (true)
-									{
-										// 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']))
-					if (true)
-					{
-						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['attributes']) ? $xml_elem['attributes'] : (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.
-	*/
-	public 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',
-);
diff --git a/lib/getid3/getid3/write.apetag.php b/lib/getid3/getid3/write.apetag.php
deleted file mode 100644
index 68bd771d8..000000000
--- a/lib/getid3/getid3/write.apetag.php
+++ /dev/null
@@ -1,223 +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
-{
-
-	public $filename;
-	public $tag_data;
-	public $always_preserve_replaygain = true;    // ReplayGain / MP3gain tags will be copied from old tag even if not passed in data
-	public $warnings                   = array(); // any non-critical errors will be stored here
-	public $errors                     = array(); // any critical errors will be stored here
-
-	public function getid3_write_apetag() {
-		return true;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-
-	public 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);
-	}
-
-	public 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;
-	}
-
-	public 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]);
-	}
-
-	public 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;
-
-	}
-
-}
diff --git a/lib/getid3/getid3/write.id3v1.php b/lib/getid3/getid3/write.id3v1.php
deleted file mode 100644
index 86d509209..000000000
--- a/lib/getid3/getid3/write.id3v1.php
+++ /dev/null
@@ -1,136 +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
-{
-	public $filename;
-	public $filesize;
-	public $tag_data;
-	public $warnings = array(); // any non-critical errors will be stored here
-	public $errors   = array(); // any critical errors will be stored here
-
-	public function getid3_write_id3v1() {
-		return true;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/write.id3v2.php b/lib/getid3/getid3/write.id3v2.php
deleted file mode 100644
index 3d2bfecc4..000000000
--- a/lib/getid3/getid3/write.id3v2.php
+++ /dev/null
@@ -1,2049 +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
-{
-	public $filename;
-	public $tag_data;
-	public $fread_buffer_size           = 32768;    // read buffer size in bytes
-	public $paddedlength                = 4096;     // minimum length of ID3v2 tag in bytes
-	public $majorversion                = 3;        // ID3v2 major version (2, 3 (recommended), 4)
-	public $minorversion                = 0;        // ID3v2 minor version - always 0
-	public $merge_existing_data         = false;    // if true, merge new data with existing tags; if false, delete old tag data and only write new tags
-	public $id3v2_default_encodingid    = 0;        // default text encoding (ISO-8859-1) if not explicitly passed
-	public $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.
-	public $warnings                    = array();  // any non-critical errors will be stored here
-	public $errors                      = array();  // any critical errors will be stored here
-
-	public function getid3_write_id3v2() {
-		return true;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-
-	public 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));
-	}
-
-
-	public 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));
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function ID3v2FrameFlagsLookupTagAlter($framename) {
-		// unfinished
-		switch ($framename) {
-			case 'RGAD':
-				$allow = true;
-			default:
-				$allow = false;
-				break;
-		}
-		return $allow;
-	}
-
-	public function ID3v2FrameFlagsLookupFileAlter($framename) {
-		// unfinished
-		switch ($framename) {
-			case 'RGAD':
-				return false;
-				break;
-
-			default:
-				return false;
-				break;
-		}
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function ID3v2IsValidRVA2channeltype($channeltype) {
-		if (($channeltype >= 0) && ($channeltype <= 8) && ($this->majorversion == 4)) {
-			return true;
-		}
-		return false;
-	}
-
-	public function ID3v2IsValidAPICpicturetype($picturetype) {
-		if (($picturetype >= 0) && ($picturetype <= 0x14) && ($this->majorversion >= 2) && ($this->majorversion <= 4)) {
-			return true;
-		}
-		return false;
-	}
-
-	public 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;
-	}
-
-	public function ID3v2IsValidCOMRreceivedAs($receivedas) {
-		if (($this->majorversion >= 3) && ($receivedas >= 0) && ($receivedas <= 8)) {
-			return true;
-		}
-		return false;
-	}
-
-	public function ID3v2IsValidRGADname($RGADname) {
-		if (($RGADname >= 0) && ($RGADname <= 2)) {
-			return true;
-		}
-		return false;
-	}
-
-	public function ID3v2IsValidRGADoriginator($RGADoriginator) {
-		if (($RGADoriginator >= 0) && ($RGADoriginator <= 3)) {
-			return true;
-		}
-		return false;
-	}
-
-	public 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]);
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-		}
-	}
-
-	public function IsValidMIMEstring($mimestring) {
-		if ((strlen($mimestring) >= 3) && (strpos($mimestring, '/') > 0) && (strpos($mimestring, '/') < (strlen($mimestring) - 1))) {
-			return true;
-		}
-		return false;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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 1f85ebd0a..000000000
--- a/lib/getid3/getid3/write.lyrics3.php
+++ /dev/null
@@ -1,71 +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
-{
-	public $filename;
-	public $tag_data;
-	//public $lyrics3_version = 2;       // 1 or 2
-	public $warnings        = array(); // any non-critical errors will be stored here
-	public $errors          = array(); // any critical errors will be stored here
-
-	public function getid3_write_lyrics3() {
-		return true;
-	}
-
-	public function WriteLyrics3() {
-		$this->errors[] = 'WriteLyrics3() not yet functional - cannot write Lyrics3';
-		return false;
-	}
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/write.metaflac.php b/lib/getid3/getid3/write.metaflac.php
deleted file mode 100644
index f3ce505fc..000000000
--- a/lib/getid3/getid3/write.metaflac.php
+++ /dev/null
@@ -1,161 +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
-{
-
-	public $filename;
-	public $tag_data;
-	public $warnings = array(); // any non-critical errors will be stored here
-	public $errors   = array(); // any critical errors will be stored here
-
-	public function getid3_write_metaflac() {
-		return true;
-	}
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-
-	public 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)));
-
-	}
-
-}
diff --git a/lib/getid3/getid3/write.php b/lib/getid3/getid3/write.php
deleted file mode 100644
index 3a7f1974d..000000000
--- a/lib/getid3/getid3/write.php
+++ /dev/null
@@ -1,613 +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
-	public $filename;                            // absolute filename of file to write tags to
-	public $tagformats         = array();        // array of tag formats to write ('id3v1', 'id3v2.2', 'id2v2.3', 'id3v2.4', 'ape', 'vorbiscomment', 'metaflac', 'real')
-	public $tag_data           = array(array()); // 2-dimensional array of tag data (ex: $data['ARTIST'][0] = 'Elvis')
-	public $tag_encoding       = 'ISO-8859-1';   // text encoding used for tag data ('ISO-8859-1', 'UTF-8', 'UTF-16', 'UTF-16LE', 'UTF-16BE', )
-	public $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
-	public $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
-
-	public $id3v2_tag_language = 'eng';          // ISO-639-2 3-character language code needed for some ID3v2 frames (http://www.id3.org/iso639-2.html)
-	public $id3v2_paddedlength = 4096;           // minimum length of ID3v2 tags (will be padded to this length if tag data is shorter)
-
-	public $warnings           = array();        // any non-critical errors will be stored here
-	public $errors             = array();        // any critical errors will be stored here
-
-	// private
-	private $ThisFileInfo; // analysis of file before writing
-
-	public function getid3_writetags() {
-		return true;
-	}
-
-
-	public 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;
-
-	}
-
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public function FormatDataForMetaFLAC() {
-		// FLAC & OggFLAC use VorbisComments same as OggVorbis
-		// but require metaflac to do the writing rather than vorbiscomment
-		return $this->FormatDataForVorbisComment();
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/write.real.php b/lib/getid3/getid3/write.real.php
deleted file mode 100644
index 02b916528..000000000
--- a/lib/getid3/getid3/write.real.php
+++ /dev/null
@@ -1,273 +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
-{
-	public $filename;
-	public $tag_data          = array();
-	public $fread_buffer_size = 32768;   // read buffer size in bytes
-	public $warnings          = array(); // any non-critical errors will be stored here
-	public $errors            = array(); // any critical errors will be stored here
-	public $paddedlength      = 512;     // minimum length of CONT tag in bytes
-
-	public function getid3_write_real() {
-		return true;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-	public 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;
-	}
-
-}
diff --git a/lib/getid3/getid3/write.vorbiscomment.php b/lib/getid3/getid3/write.vorbiscomment.php
deleted file mode 100644
index 30b51ffb8..000000000
--- a/lib/getid3/getid3/write.vorbiscomment.php
+++ /dev/null
@@ -1,119 +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
-{
-
-	public $filename;
-	public $tag_data;
-	public $warnings = array(); // any non-critical errors will be stored here
-	public $errors   = array(); // any critical errors will be stored here
-
-	public function getid3_write_vorbiscomment() {
-		return true;
-	}
-
-	public 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;
-	}
-
-	public function DeleteVorbisComment() {
-		$this->tag_data = array(array());
-		return $this->WriteVorbisComment();
-	}
-
-	public 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)));
-
-	}
-
-}
diff --git a/lib/getid3/helperapps/cygwin1.dll b/lib/getid3/helperapps/cygwin1.dll
deleted file mode 100644
index 4f2596ce3..000000000
Binary files a/lib/getid3/helperapps/cygwin1.dll and /dev/null differ
diff --git a/lib/getid3/helperapps/head.exe b/lib/getid3/helperapps/head.exe
deleted file mode 100644
index 7f5ef8764..000000000
Binary files a/lib/getid3/helperapps/head.exe and /dev/null differ
diff --git a/lib/getid3/helperapps/md5sum.exe b/lib/getid3/helperapps/md5sum.exe
deleted file mode 100644
index 031312063..000000000
Binary files a/lib/getid3/helperapps/md5sum.exe and /dev/null differ
diff --git a/lib/getid3/helperapps/metaflac.exe b/lib/getid3/helperapps/metaflac.exe
deleted file mode 100644
index 6c7a639a6..000000000
Binary files a/lib/getid3/helperapps/metaflac.exe and /dev/null differ
diff --git a/lib/getid3/helperapps/readme.helperapps.txt b/lib/getid3/helperapps/readme.helperapps.txt
deleted file mode 100644
index c210a5985..000000000
--- a/lib/getid3/helperapps/readme.helperapps.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// /helperapps/readme.txt - part of getID3()                   //
-// List of binary files required under Windows for some        //
-// features and/or file formats                                //
-// See /readme.txt for more details                            //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-This directory should contain binaries of various helper applications
-that getID3() depends on to handle some file formats under Windows.
-
-The location of this directory is configurable in /getid3/getid3.php
-as GETID3_HELPERAPPSDIR
-
-If this directory is empty, or you are missing any files, please
-download the latest version of the "getID3()-WindowsSupport" package
-from the usual download location (http://getid3.sourceforge.net)
-
-
-
-Included files:
-=====================================================
-
-Taken from http://www.cygwin.com/
-* cygwin1.dll
-
-Taken from http://unxutils.sourceforge.net/
-* head.exe
-* md5sum.exe
-* tail.exe
-
-Taken from http://ebible.org/mpj/software.htm
-* sha1sum.exe
-
-Taken from http://www.vorbis.com/download.psp
-* vorbiscomment.exe
-
-Taken from http://flac.sourceforge.net/download.html
-* metaflac.exe
-
-Taken from http://www.etree.org/shncom.html
-* shorten.exe
-
-
-/////////////////////////////////////////////////////////////////
-
-Changelog:
-
-2003.12.29:
-  * Initial release
\ No newline at end of file
diff --git a/lib/getid3/helperapps/sha1sum.exe b/lib/getid3/helperapps/sha1sum.exe
deleted file mode 100644
index f1a521647..000000000
Binary files a/lib/getid3/helperapps/sha1sum.exe and /dev/null differ
diff --git a/lib/getid3/helperapps/shorten.exe b/lib/getid3/helperapps/shorten.exe
deleted file mode 100644
index b82d6c350..000000000
Binary files a/lib/getid3/helperapps/shorten.exe and /dev/null differ
diff --git a/lib/getid3/helperapps/tail.exe b/lib/getid3/helperapps/tail.exe
deleted file mode 100644
index 36c2abc22..000000000
Binary files a/lib/getid3/helperapps/tail.exe and /dev/null differ
diff --git a/lib/getid3/helperapps/vorbiscomment.exe b/lib/getid3/helperapps/vorbiscomment.exe
deleted file mode 100644
index 9e4e4b980..000000000
Binary files a/lib/getid3/helperapps/vorbiscomment.exe and /dev/null differ
diff --git a/lib/getid3/license.txt b/lib/getid3/license.txt
deleted file mode 100644
index 85f4356e8..000000000
--- a/lib/getid3/license.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-
-*****************************************************************
-*****************************************************************
-
-   getID3() is released under multiple licenses. You may choose
-   from the following licenses, and use getID3 according to the
-   terms of the license most suitable to your project.
-
-GNU GPL: https://gnu.org/licenses/gpl.html                   (v3)
-         https://gnu.org/licenses/old-licenses/gpl-2.0.html  (v2)
-         https://gnu.org/licenses/old-licenses/gpl-1.0.html  (v1)
-
-GNU LGPL: https://gnu.org/licenses/lgpl.html                 (v3)
-
-Mozilla MPL: http://www.mozilla.org/MPL/2.0/                 (v2)
-
-getID3 Commercial License: http://getid3.org/#gCL (payment required)
-
-*****************************************************************
-*****************************************************************
-
-Copies of each of the above licenses are included in the 'licenses'
-directory of the getID3 distribution.
diff --git a/lib/getid3/licenses/licence.gpl-10.txt b/lib/getid3/licenses/licence.gpl-10.txt
deleted file mode 100644
index 8de98afaa..000000000
--- a/lib/getid3/licenses/licence.gpl-10.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-
-                    GNU GENERAL PUBLIC LICENSE
-                     Version 1, February 1989
-
- Copyright (C) 1989 Free Software Foundation, Inc.
-                    51 Franklin St, 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 license agreements of most software companies try to keep users
-at the mercy of those companies.  By contrast, our 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.  The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, 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 a 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 tell them 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.
-
-  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 Agreement 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 work containing the
-Program or a portion of it, either verbatim or with modifications.  Each
-licensee is addressed as "you".
-
-  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
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program.  You may charge a fee for the physical act of
-transferring a copy.
-
-  2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating that
-    you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish, that
-    in whole or in part contains the Program or any part thereof, either
-    with or without modifications, to be licensed at no charge to all
-    third parties under the terms of this General Public License (except
-    that you may choose to grant warranty protection to some or all
-    third parties, at your option).
-
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use
-    in the simplest and most usual 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 General
-    Public License.
-
-    d) 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.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
-  3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 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
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal charge
-    for the cost of distribution) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it.  For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
-  4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License.  However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
-  5. By copying, distributing or modifying 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.
-
-  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.
-
-  7. 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 the 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
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
-  8. 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
-
-  9. 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.
-
-  10. 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
-
-        Appendix: 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 humanity, 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) 19yy  <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 1, 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) 19xx 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 a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program `Gnomovision' (a program to direct compilers to make passes
-  at assemblers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/lib/getid3/licenses/licence.gpl-20.txt b/lib/getid3/licenses/licence.gpl-20.txt
deleted file mode 100644
index d159169d1..000000000
--- a/lib/getid3/licenses/licence.gpl-20.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 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.
-
-    <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.,
-    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.
diff --git a/lib/getid3/licenses/licence.gpl-30.txt b/lib/getid3/licenses/licence.gpl-30.txt
deleted file mode 100644
index 94a9ed024..000000000
--- a/lib/getid3/licenses/licence.gpl-30.txt
+++ /dev/null
@@ -1,674 +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
-
-            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
-state 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 3 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program 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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU 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.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/lib/getid3/licenses/licence.lgpl-30.txt b/lib/getid3/licenses/licence.lgpl-30.txt
deleted file mode 100644
index 65c5ca88a..000000000
--- a/lib/getid3/licenses/licence.lgpl-30.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-                   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/getid3/licenses/licence.mpl-20.txt b/lib/getid3/licenses/licence.mpl-20.txt
deleted file mode 100644
index 14e2f777f..000000000
--- a/lib/getid3/licenses/licence.mpl-20.txt
+++ /dev/null
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
diff --git a/lib/getid3/licenses/license.commercial.txt b/lib/getid3/licenses/license.commercial.txt
deleted file mode 100644
index 416e5a146..000000000
--- a/lib/getid3/licenses/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/structure.txt b/lib/getid3/structure.txt
deleted file mode 100644
index a0651c609..000000000
--- a/lib/getid3/structure.txt
+++ /dev/null
@@ -1,2251 +0,0 @@
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org>               //
-//  available at http://getid3.sourceforge.net                 //
-//            or http://www.getid3.org                         //
-/////////////////////////////////////////////////////////////////
-//                                                             //
-// changelog.txt - part of getID3()                            //
-// See readme.txt for more details                             //
-//                                                            ///
-/////////////////////////////////////////////////////////////////
-
-What does the returned data structure look like?
-================================================
-
-Hint: If you take a look at the nicely-formatted output of
-/demos/demo.browse.php you can generally see where the data you want
-is returned.
-
-Note that what is described below is only a rough guide to what data
-is actually returned by getID3(), since the actual data returned
-depends entirely on what data is in your file, what type of file it
-is, what kind of data is in the tags, etc. In addition, some formats
-(Quicktime for example) use a freeform recursive structure that is
-impossible to document completely.
-
-In the vast majority of cases, all the data you'll need is located
-in the root of the array or the special arrays described below in
-Section 1 (['audio'], ['video'], ['tags_html'], ['replay_gain']).
-
-It is suggested that for most applications you should use tag data
-from the root ['tags_html'] array, as this is the only location
-where data is stored in a consistant format: HTML-compatible
-character entities (ie &#1234;) for characters outside the 0x20-0x7F
-range (printable ISO-8859-1 characters). This data can be used as-is
-for output in HTML, and can be converted to whatever character set
-you wish to use if the output is not HTML.
-
-If you want to merge all available tags (for example, ID3v2 + ID3v1)
-into one array, you can call
-getid3_lib::CopyTagsToComments($ThisFileInfo)
-and you'll then have ['comments'] and ['comments_html'] which are
-identical to ['tags'] and ['tags_html'] except the array is one
-dimension shorter (no tag type array keys). For example, artist is:
-['tags_html']['id3v1']['artist'][0] or ['comments_html']['artist'][0]
-
-
-Some commonly-used information is found in these locations:
-
-File type:        ['fileformat']                  // ex 'mp3'
-Song length:      ['playtime_string']             // ex '3:45'    (minutes:seconds)
-                  ['playtime_seconds']            // ex 225.13    (seconds)
-Overall bitrate:  ['bitrate']                     // ex 113485.71 (bits-per-second - divide by 1000 for kbps)
-Audio frequency:  ['audio']['sample_rate']        // ex 44100     (Hertz)
-Artist name:      ['comments_html']['artist'][0]  // ex 'Elvis'   (if CopyTagsToComments() is used - see above)
-                                                  //   more than one artist may be present, you may want to use implode:
-                                                  //   implode(' & ', ['comments_html']['artist'])
-
-
-/////////////////////////////////////////////////////////////////
-
-array() {
-                                         // SECTION 1: Values that are present for most or all file types
-
-    ['getID3version']=>string()          // version of getID3() that scanned this file (ex: '1.6.2')
-    ['error']=>array()                   // if present, contains one or more fatal error messages
-    ['warning']=>array()                 // if present, contains one or more non-fatal warning messages
-    ['exist']=>boolean()                 // does this file actually exist?
-    ['fileformat']=>string()             // one of the standard filetype abbreviations ('mp3', 'riff', 'quicktime', etc)
-    ['filename']=>string()               // filename only, no path
-    ['filenamepath']=>string()           // full filename with path
-    ['filepath']=>string()               // path to file, not including filename
-    ['filesize']=>integer()              // filesize in bytes
-    ['md5_file']=>string()               // md5 hash of entire file
-    ['md5_data']=>string()               // md5 hash of portion of file excluding prepended and appeneded metainformation tags (ID3, APE, etc) - may be identical to ['md5_file']
-    ['md5_data_source']=>string()        // md5 hash of original source file before compression (currently used by FLAC, OptimFROG, WavPack v4+)
-    ['sha1_file']=>string()              // sha1 hash of entire file
-    ['sha1_data']=>string()              // sha1 hash of portion of file excluding prepended and appeneded metainformation tags (ID3, APE, etc) - may be identical to ['md5_file']
-    ['avdataoffset']=>integer()          // offset in bytes where audio/video data starts and prepended tags end
-    ['avdataend']=>integer()             // offset in bytes where audio/video data ends and appended tags start
-    ['bitrate']=>double()                // average bitrate for entire file (all audio/video streams), in bits per second
-    ['mime_type']=>string()              // if present, MIME type of scanned file
-    ['playtime_seconds']=>double()       // playing time of file, in seconds
-    ['playtime_string']=>string()        // playing time of file, formatted as <minutes>:<seconds>
-    ['tags']=>array()                    // array of all metainformation tags present in file ('id3v1', 'id3v2', 'ape', 'riff', 'asf', etc)
-    ['audio']=>array() {
-        ['bitrate']=>double()            // average bitrate for audio portion of file (all audio streams), in bits per second
-        ['bitrate_mode']=>string()       // 'cbr' (Constant Bit Rate) or 'vbr' (Variable Bit Rate)
-        ['bits_per_sample']=>integer()   //
-        ['channelmode']=>string()        // 'mono' or 'stereo'
-        ['channels']=>integer()          // number of audio channels
-        ['codec']=>string()              // name of audio compression codec
-        ['compression_ratio']=>double()  // ratio of compressed byte size of audio to uncompressed size
-        ['dataformat']=>string()         // one of the standard filetype abbreviations ('mp3', 'wma', etc)
-        ['encoder']=>string()            // name and version of encoder used to create file, if known
-        ['lossless']=>boolean()          // true = lossless compression; false = lossy compression
-        ['sample_rate']=>integer()
-    }
-    ['video']=>array() {
-        ['bitrate']=>integer()           // average bitrate for video portion of file (all video streams), in bits per second
-        ['bitrate_mode']=>string()       // 'cbr' (Constant Bit Rate) or 'vbr' (Variable Bit Rate)
-        ['bits_per_sample']=>integer()   //
-        ['codec']=>string()              // name of video compression codec
-        ['compression_ratio']=>double()  // ratio of compressed byte size of video to uncompressed size
-        ['dataformat']=>string()         // one of the standard filetype abbreviations ('avi', 'mpeg', etc)
-        ['encoder']=>string()            // name and version of encoder used to create file, if known
-        ['frame_rate']=>double()         // frames per second
-        ['lossless']=>boolean()          // true = lossless compression; false = lossy compression
-        ['resolution_x']=>integer()      // horizontal dimension of video/image in pixels
-        ['resolution_y']=>integer()      // vertical dimension of video/image in pixels
-        ['pixel_aspect_ratio']=>double() // pixel display aspect ratio
-    }
-    ['tags']=>array() {                  // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-        [<key name>]=>array()            // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-    }
-    ['tags_html']=>array() {             // identical to ['tags'], but with all entries converted to HTML entities as appropriate from various source encodings
-        [<key name>]=>array()            //
-    }
-    ['replay_gain']=>array() {           // replay gain information combined from any source that contains this information (LAME, ID3v2, Vorbis, APE, etc)
-        ['audiophile']=>array() {
-            ['adjustment']=>double()
-            ['originator']=>string()
-            ['peak']=>double()
-        }
-        ['radio']=>array() {
-            ['adjustment']=>double()
-            ['originator']=>string()
-            ['peak']=>double()
-        }
-    }
-
-
-                                         // SECTION 2: Values that are present for specific file types only
-
-    ['aac']=>array() {                            // AAC - Advanced Audio Coding / MPEG-4
-        ['bitrate_distribution']=>array()         //
-        ['header']=>array() {                     //
-            ['channel_configuration']=>integer()  //
-            ['crc_present']=>boolean()            //
-            ['home']=>boolean()                   //
-            ['layer']=>integer()                  //
-            ['mpeg_version']=>integer()           //
-            ['original']=>boolean()               //
-            ['private']=>boolean()                //
-            ['profile_id']=>integer()             //
-            ['profile_text']=>string()            //
-            ['sample_frequency']=>integer()       //
-            ['sample_frequency_index']=>integer() //
-            ['synch']=>integer()                  //
-        }                                         //
-        ['header_type']=>string()                 //
-    }                                             //
-                                                  //
-    ['ape']=>array()                      //
-    {                                     //
-        ['comments']=>array() {           // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-            [<key name>]=>array()         // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-        }                                 //
-        ['footer']=>array()               //
-        {                                 //
-            ['flags']=>array()            //
-            ['raw']=>array()              //
-            ['tag_version']=>integer()    //
-        }                                 //
-        ['header']=>array()               //
-        {                                 //
-            ['flags']=>array()            //
-            ['raw']=>array()              //
-            ['tag_version']=>integer()    //
-        }                                 //
-        ['items']=>array() {              // array of array of strings containing metainformation
-            [<key name>]=>array() {       // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-                ['data']=>array() {       // array of one or more Unicode values
-                ['data_ascii']=>array() { // array of values converted approximately from Unicode to ASCII
-                ['flags']=>array()        //
-            }                             //
-        }                                 //
-        ['tag_offset_end']=>integer()     //
-        ['tag_offset_start']=>integer()   //
-    }                                     //
-
-
-    ['asf']=>array() {                               // ASF - Advanced Streaming Format (ASF, Windows Media Audio (WMA), Windows Media Video (WMV))
-        ['audio_media']=>array() {                   //
-            [<x>]=>array() {                         //
-                ['bitrate']=>integer()               //
-                ['bits_per_sample']=>integer()       //
-                ['channels']=>integer()              //
-                ['codec']=>string()                  //
-                ['codec_data']=>string()             //
-                ['codec_data_size']=>integer()       //
-                ['raw']=>array() {                   //
-                    ['nAvgBytesPerSec']=>integer()   //
-                    ['wBitsPerSample']=>integer()    //
-                    ['nBlockAlign']=>integer()       //
-                    ['nChannels']=>integer()         //
-                    ['nSamplesPerSec']=>integer()    //
-                    ['wFormatTag']=>integer()        //
-                }                                    //
-                ['sample_rate']=>integer()           //
-            }                                        //
-        }                                            //
-        ['codec_list']=>array() {                    //
-            ['codec_entries']=>array() {             //
-                [<x>]=>array() {                     //
-                    ['description']=>string()        //
-                    ['description_ascii']=>string()  //
-                    ['information']=>string()        //
-                    ['name']=>string()               //
-                    ['name_ascii']=>string()         //
-                    ['type']=>string()               //
-                    ['type_raw']=>integer()          //
-                }                                    //
-            }                                        //
-            ['codec_entries_count']=>integer()       //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['reserved']=>string()                   //
-            ['reserved_guid']=>string()              //
-        }                                            //
-        ['comments']=>array() {                      // array of comment values, derived from ['content_description']
-            ['album']=>string()                      //
-            ['artist']=>string()                     //
-            ['comment']=>string()                    //
-            ['copyright']=>string()                  //
-            ['genre']=>string()                      //
-            ['title']=>string()                      //
-            ['track']=>string()                      //
-            ['year']=>string()                       //
-        }                                            //
-        ['content_description']=>array() {           // raw values - should use values from ['comments'] instead
-            ['author']=>string()                     //
-            ['author_ascii']=>string()               //
-            ['author_length']=>integer()             //
-            ['copyright']=>string()                  //
-            ['copyright_ascii']=>string()            //
-            ['copyright_length']=>integer()          //
-            ['description']=>string()                //
-            ['description_ascii']=>string()          //
-            ['description_length']=>integer()        //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['rating']=>string()                     //
-            ['rating_ascii']=>string()               //
-            ['rating_length']=>integer()             //
-            ['title']=>string()                      //
-            ['title_ascii']=>string()                //
-            ['title_length']=>integer()              //
-        }                                            //
-        ['data_object']=>array() {                   //
-            ['fileid']=>string()                     //
-            ['fileid_guid']=>string()                //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['reserved']=>integer()                  //
-            ['total_data_packets']=>integer()        //
-        }                                            //
-        ['extended_content_description']=>array() {  //
-            ['content_descriptors']=>array() {       //
-                [<x>]=>array() {                     //
-                    ['name']=>string()               //
-                    ['name_ascii']=>string()         //
-                    ['name_length']=>integer()       //
-                    ['value']=>string()              //
-                    ['value_ascii']=>string()        //
-                    ['value_length']=>integer()      //
-                    ['value_type']=>integer()        //
-                }                                    //
-            }                                        //
-            ['content_descriptors_count']=>integer() //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-        }                                            //
-        ['file_properties_object']=>array() {        //
-            ['creation_date']=>double()              //
-            ['creation_date_unix']=>double()         //
-            ['data_packets']=>integer()              //
-            ['fileid']=>string()                     //
-            ['fileid_guid']=>string()                //
-            ['filesize']=>integer()                  //
-            ['flags']=>array() {                     //
-                ['broadcast']=>boolean()             //
-                ['seekable']=>boolean()              //
-            }                                        //
-            ['flags_raw']=>integer()                 //
-            ['max_bitrate']=>integer()               //
-            ['max_packet_size']=>integer()           //
-            ['min_packet_size']=>integer()           //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['play_duration']=>double()              //
-            ['preroll']=>integer()                   //
-            ['send_duration']=>double()              //
-        }                                            //
-        ['header_extension_object']=>array() {       //
-            ['extension_data']=>integer()            //
-            ['extension_data_size']=>integer()       //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['reserved_1']=>string()                 //
-            ['reserved_1_guid']=>string()            //
-            ['reserved_2']=>integer()                //
-        }                                            //
-        ['header_object']=>array() {                 //
-            ['headerobjects']=>integer()             //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['reserved1']=>integer()                 //
-            ['reserved2']=>integer()                 //
-        }                                            //
-        ['marker_object']=>array() {                 //
-            ['markers_count']=>integer()             //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-            ['reserved']=>string()                   //
-            ['reserved_2']=>integer()                //
-            ['reserved_guid']=>string()              //
-        }                                            //
-        ['stream_bitrate_properties']=>array() {     //
-            ['bitrate_records']=>array() {           //
-                [<x>]=>array() {                     //
-                    ['bitrate']=>integer()           //
-                    ['flags_raw']=>integer()         //
-                    ['flags']=>array() {             //
-                        ['stream_number']=>integer() //
-                    }                                //
-                }                                    //
-            }                                        //
-            ['bitrate_records_count']=>integer()     //
-            ['objectid']=>string()                   //
-            ['objectid_guid']=>string()              //
-            ['objectsize']=>integer()                //
-        }                                            //
-        ['stream_properties_object']=>array() {      //
-            [<x>]=>array() {                         //
-                ['error_correct_data']=>string()     //
-                ['error_correct_guid']=>string()     //
-                ['error_correct_type']=>string()     //
-                ['error_data_length']=>integer()     //
-                ['flags_raw']=>integer()             //
-                ['flags']=>array() {                 //
-                    ['encrypted']=>boolean()         //
-                }                                    //
-                ['objectid']=>string()               //
-                ['objectid_guid']=>string()          //
-                ['objectsize']=>integer()            //
-                ['stream_type']=>string()            //
-                ['stream_type_guid']=>string()       //
-                ['time_offset']=>integer()           //
-                ['type_data_length']=>integer()      //
-                ['type_specific_data']=>string()     //
-            }                                        //
-        }                                            //
-        ['video_media']=>array() {                   //
-            [<x>]=>array() {                         //
-                ['flags']=>integer()                 //
-                ['format_data']=>array() {           //
-                    ['bits_per_pixel']=>integer()    //
-                    ['codec']=>string()              //
-                    ['codec_data']=>boolean()        //
-                    ['codec_fourcc']=>string()       //
-                    ['colors_important']=>integer()  //
-                    ['colors_used']=>integer()       //
-                    ['format_data_size']=>integer()  //
-                    ['horizontal_pels']=>integer()   //
-                    ['image_height']=>integer()      //
-                    ['image_size']=>integer()        //
-                    ['image_width']=>integer()       //
-                    ['reserved']=>integer()          //
-                    ['vertical_pels']=>integer()     //
-                }                                    //
-                ['format_data_size']=>integer()      //
-                ['image_height']=>integer()          //
-                ['image_width']=>integer()           //
-            }                                        //
-        }                                            //
-    }                                                //
-
-
-    ['au']=>array() {                       // AU - Next/Sun AUdio format
-        ['bits_per_sample']=>integer()      //
-        ['channels']=>integer()             //
-        ['comment']=>string()               //
-        ['data_format']=>string()           //
-        ['data_format_id']=>integer()       //
-        ['data_size']=>integer()            //
-        ['header_length']=>integer()        //
-        ['sample_rate']=>integer()          //
-        ['used_bits_per_sample']=>integer() //
-    }                                       //
-
-
-    ['bmp']=>array() {                          // BMP - OS/2 or Windows BitMaP
-        ['header']=>array() {                   //
-            ['compression']=>string()           //
-            ['raw']=>array() {                  //
-                ['bits_per_pixel']=>integer()   //
-                ['bmp_data_size']=>integer()    //
-                ['colors_important']=>integer() //
-                ['colors_used']=>integer()      //
-                ['compression']=>integer()      //
-                ['data_offset']=>integer()      //
-                ['filesize']=>integer()         //
-                ['header_size']=>integer()      //
-                ['height']=>integer()           //
-                ['identifier']=>string()        //
-                ['planes']=>integer()           //
-                ['resolution_h']=>integer()     //
-                ['resolution_v']=>integer()     //
-                ['width']=>integer()            //
-            }                                   //
-        }                                       //
-        ['type_os']=>string()                   //
-        ['type_version']=>integer()             //
-    }                                           //
-
-
-    ['bonk']=>array() {                       // BONK - lossy/lossless audio compression (www.bonkenc.org)
-        ['BONK']=>array() {                   //
-            ['channels']=>integer()           //
-            ['downsampling_ratio']=>integer() //
-            ['joint_stereo']=>boolean()       //
-            ['lossless']=>boolean()           //
-            ['number_samples']=>integer()     //
-            ['number_taps']=>integer()        //
-            ['offset']=>integer()             //
-            ['sample_rate']=>integer()        //
-            ['samples_per_packet']=>integer() //
-            ['size']=>integer()               //
-            ['version']=>integer()            //
-        }                                     //
-        ['INFO']=>array() {                   //
-            ['size']=>integer()               //
-            ['offset']=>integer()             //
-            ['version']=>integer()            //
-            [<x>]=>array() {                  //
-                ['nextbit']=>integer()        //
-                ['offset']=>integer()         //
-            }                                 //
-        }                                     //
-        ['dataend']=>integer()                //
-        ['dataoffset']=>integer()             //
-    }                                         //
-
-
-    ['flac']=>array() {                         // FLAC - Free Lossless Audio Compressor
-        ['SEEKTABLE']=>array() {                //
-            [<x>]=>array() {                    //
-                ['offset']=>integer()           //
-                ['samples']=>integer()          //
-            }                                   //
-            ['placeholders']=>integer()         //
-            ['raw']=>array() {                  //
-                ['block_data']=>string()        //
-                ['block_length']=>integer()     //
-                ['block_type']=>integer()       //
-                ['block_type_text']=>string()   //
-                ['last_meta_block']=>boolean()  //
-                ['offset']=>integer()           //
-            }                                   //
-        }                                       //
-        ['STREAMINFO']=>array() {               //
-            ['audio_signature']=>string()       //
-            ['bits_per_sample']=>integer()      //
-            ['channels']=>integer()             //
-            ['max_block_size']=>integer()       //
-            ['max_frame_size']=>integer()       //
-            ['min_block_size']=>integer()       //
-            ['min_frame_size']=>integer()       //
-            ['raw']=>array() {                  //
-                ['block_data']=>string()        //
-                ['block_length']=>integer()     //
-                ['block_type']=>integer()       //
-                ['block_type_text']=>string()   //
-                ['last_meta_block']=>boolean()  //
-                ['offset']=>integer()           //
-            }                                   //
-            ['sample_rate']=>integer()          //
-            ['samples_stream']=>integer()       //
-        }                                       //
-        ['VORBIS_COMMENT']=>array() {           //
-            ['raw']=>array() {                  //
-                ['block_data']=>string()        //
-                ['block_length']=>integer()     //
-                ['block_type']=>integer()       //
-                ['block_type_text']=>string()   //
-                ['last_meta_block']=>boolean()  //
-                ['offset']=>integer()           //
-            }                                   //
-        }                                       //
-        ['compressed_audio_bytes']=>integer()   //
-        ['compression_ratio']=>double()         //
-        ['uncompressed_audio_bytes']=>integer() //
-    }                                           //
-
-
-    ['gif']=>array() {                             // GIF - Graphics Interchange Format
-        ['global_color_table']=>array() {          //
-            [<x>]=>integer()                       //
-        }                                          //
-        ['header']=>array() {                      //
-            ['bits_per_pixel']=>integer()          //
-            ['flags']=>array() {                   //
-                ['global_color_sorted']=>boolean() //
-                ['global_color_table']=>boolean()  //
-            }                                      //
-            ['global_color_size']=>integer()       //
-            ['raw']=>array() {                     //
-                ['aspect_ratio']=>integer()        //
-                ['bg_color_index']=>integer()      //
-                ['flags']=>integer()               //
-                ['height']=>integer()              //
-                ['identifier']=>string()           //
-                ['version']=>string()              //
-                ['width']=>integer()               //
-            }                                      //
-        }                                          //
-        ['version']=>string()                      //
-    }                                              //
-
-
-    ['id3v1']=>array() {                // ID3v1
-        ['album']=>string()             //
-        ['artist']=>string()            //
-        ['comment']=>string()           //
-        ['genre']=>string()             //
-        ['genreid']=>integer()          //
-        ['title']=>string()             //
-        ['track']=>integer()            //
-        ['year']=>string()              //
-        ['padding_valid']=>boolean()    //
-        ['comments']=>array()           //
-        ['tag_offset_start']=>integer() //
-        ['tag_offset_end']=>integer()   //
-    }                                   //
-
-
-    ['id3v2']=>array() {                                 // ID3v2 - www.id3.org
-        [<frame name>]=>array() {                        // <frame name> can be any of the 4-character (3-character in ID3v2.2) frame names allowed in the ID3v2 spec. Exact contents of returned array data varies with frame type.
-            [<x>]=>array() {                             // some frames types allow multiple values ('COMM' for example), others do not and do not have this array level
-                ['asciidata']=>boolean()                 //
-                ['asciidescription']=>string()           //
-                ['data']=>boolean()                      //
-                ['datalength']=>integer()                //
-                ['dataoffset']=>integer()                //
-                ['description']=>string()                //
-                ['encoding']=>string()                   //
-                ['encodingid']=>integer()                //
-                ['flags']=>array() {                     //
-                    ['Encryption']=>boolean()            //
-                    ['FileAlterPreservation']=>boolean() //
-                    ['GroupingIdentity']=>boolean()      //
-                    ['ReadOnly']=>boolean()              //
-                    ['TagAlterPreservation']=>boolean()  //
-                    ['compression']=>boolean()           //
-                }                                        //
-                ['framenamelong']=>string()              //
-                ['language']=>string()                   //
-                ['languagename']=>string()               //
-            }                                            //
-        }                                                //
-        ['comments']=>array() {                          // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-            [<key name>]=>array()                        // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-        }                                                //
-        ['flags']=>array() {                             //
-            ['experim']=>string()                        //
-            ['exthead']=>string()                        //
-            ['unsynch']=>string()                        //
-        }                                                //
-        ['header']=>boolean()                            //
-        ['headerlength']=>integer()                      //
-        ['majorversion']=>integer()                      //
-        ['minorversion']=>integer()                      //
-        ['padding']=>array() {                           //
-            ['length']=>integer()                        //
-            ['start']=>integer()                         //
-            ['valid']=>boolean()                         //
-        }                                                //
-        ['tag_offset_end']=>integer()                    //
-        ['tag_offset_start']=>integer()                  //
-    }                                                    //
-
-
-    ['iso']=>array() {                                           // ISO-9660 - CD-ROM Image
-        ['directories']=>array() {                               //
-            [<x>]=>array() {                                     //
-                [<x>]=>array() {                                 //
-                    ['file_flags']=>array() {                    //
-                        ['associated']=>boolean()                //
-                        ['directory']=>boolean()                 //
-                        ['extended']=>boolean()                  //
-                        ['hidden']=>boolean()                    //
-                        ['multiple']=>boolean()                  //
-                        ['permissions']=>boolean()               //
-                    }                                            //
-                    ['file_identifier_ascii']=>string()          //
-                    ['filename']=>string()                       //
-                    ['filesize']=>integer()                      //
-                    ['offset_bytes']=>integer()                  //
-                    ['raw']=>array() {                           //
-                        ['extended_attribute_length']=>integer() //
-                        ['file_flags']=>integer()                //
-                        ['file_identifier']=>string()            //
-                        ['file_identifier_length']=>integer()    //
-                        ['file_unit_size']=>integer()            //
-                        ['filesize']=>integer()                  //
-                        ['interleave_gap_size']=>integer()       //
-                        ['length']=>integer()                    //
-                        ['offset_logical']=>integer()            //
-                        ['recording_date_time']=>string()        //
-                        ['volume_sequence_number']=>integer()    //
-                    }                                            //
-                    ['recording_timestamp']=>integer()           //
-                }                                                //
-            }                                                    //
-        }                                                        //
-        ['files']=>array() {                                     // multidimensional tree-structure array listing of all files and directories in image
-            [<directory name>]=>array()                          // entries of type array are directories (key is directory name), may contain files and/or other subdirectories
-            [<file name>]=>integer()                             // entries of type integer are files (key is file name, value is file size in bytes)
-        }                                                        //
-        ['path_table']=>array() {                                //
-            ['directories']=>array() {                           //
-                [<x>]=>array() {                                 //
-                    ['extended_length']=>integer()               //
-                    ['full_path']=>string()                      //
-                    ['length']=>integer()                        //
-                    ['location_bytes']=>integer()                //
-                    ['location_logical']=>integer()              //
-                    ['name']=>string()                           //
-                    ['name_ascii']=>string()                     //
-                    ['parent_directory']=>integer()              //
-                }                                                //
-            }                                                    //
-            ['offset']=>integer()                                //
-            ['raw']=>string()                                    //
-        }                                                        //
-        ['primary_volume_descriptor']=>array() {                 //
-            ['abstract_file_identifier']=>string()               //
-            ['application_identifier']=>string()                 //
-            ['bibliographic_file_identifier']=>string()          //
-            ['copyright_file_identifier']=>string()              //
-            ['data_preparer_identifier']=>string()               //
-            ['offset']=>integer()                                //
-            ['publisher_identifier']=>string()                   //
-            ['raw']=>array() {                                   //
-                ['abstract_file_identifier']=>string()           //
-                ['application_data']=>string()                   //
-                ['application_identifier']=>string()             //
-                ['bibliographic_file_identifier']=>string()      //
-                ['copyright_file_identifier']=>string()          //
-                ['data_preparer_identifier']=>string()           //
-                ['file_structure_version']=>integer()            //
-                ['logical_block_size']=>integer()                //
-                ['path_table_l_location']=>integer()             //
-                ['path_table_l_opt_location']=>integer()         //
-                ['path_table_m_location']=>integer()             //
-                ['path_table_m_opt_location']=>integer()         //
-                ['path_table_size']=>integer()                   //
-                ['publisher_identifier']=>string()               //
-                ['root_directory_record']=>string()              //
-                ['standard_identifier']=>string()                //
-                ['system_identifier']=>string()                  //
-                ['unused_1']=>string()                           //
-                ['unused_2']=>string()                           //
-                ['unused_3']=>string()                           //
-                ['unused_4']=>integer()                          //
-                ['volume_creation_date_time']=>string()          //
-                ['volume_descriptor_type']=>integer()            //
-                ['volume_descriptor_version']=>integer()         //
-                ['volume_effective_date_time']=>string()         //
-                ['volume_expiration_date_time']=>string()        //
-                ['volume_identifier']=>string()                  //
-                ['volume_modification_date_time']=>string()      //
-                ['volume_sequence_number']=>integer()            //
-                ['volume_set_identifier']=>string()              //
-                ['volume_set_size']=>integer()                   //
-                ['volume_space_size']=>integer()                 //
-            }                                                    //
-            ['system_identifier']=>string()                      //
-            ['volume_creation_date_time']=>integer()             //
-            ['volume_effective_date_time']=>boolean()            //
-            ['volume_expiration_date_time']=>boolean()           //
-            ['volume_identifier']=>string()                      //
-            ['volume_modification_date_time']=>integer()         //
-            ['volume_set_identifier']=>string()                  //
-        }                                                        //
-        ['supplementary_volume_descriptor']=>array() {           //
-            ['abstract_file_identifier']=>string()               //
-            ['application_identifier']=>string()                 //
-            ['bibliographic_file_identifier']=>string()          //
-            ['copyright_file_identifier']=>string()              //
-            ['data_preparer_identifier']=>string()               //
-            ['offset']=>integer()                                //
-            ['publisher_identifier']=>string()                   //
-            ['raw']=>array() {                                   //
-                ['abstract_file_identifier']=>string()           //
-                ['application_data']=>string()                   //
-                ['application_identifier']=>string()             //
-                ['bibliographic_file_identifier']=>string()      //
-                ['copyright_file_identifier']=>string()          //
-                ['data_preparer_identifier']=>string()           //
-                ['file_structure_version']=>integer()            //
-                ['logical_block_size']=>integer()                //
-                ['path_table_l_location']=>integer()             //
-                ['path_table_l_opt_location']=>integer()         //
-                ['path_table_m_location']=>integer()             //
-                ['path_table_m_opt_location']=>integer()         //
-                ['path_table_size']=>integer()                   //
-                ['publisher_identifier']=>string()               //
-                ['root_directory_record']=>string()              //
-                ['standard_identifier']=>string()                //
-                ['system_identifier']=>string()                  //
-                ['unused_1']=>string()                           //
-                ['unused_2']=>string()                           //
-                ['unused_3']=>string()                           //
-                ['unused_4']=>integer()                          //
-                ['volume_creation_date_time']=>string()          //
-                ['volume_descriptor_type']=>integer()            //
-                ['volume_descriptor_version']=>integer()         //
-                ['volume_effective_date_time']=>string()         //
-                ['volume_expiration_date_time']=>string()        //
-                ['volume_identifier']=>string()                  //
-                ['volume_modification_date_time']=>string()      //
-                ['volume_sequence_number']=>integer()            //
-                ['volume_set_identifier']=>string()              //
-                ['volume_set_size']=>integer()                   //
-                ['volume_space_size']=>integer()                 //
-            }                                                    //
-            ['system_identifier']=>string()                      //
-            ['volume_creation_date_time']=>integer()             //
-            ['volume_effective_date_time']=>boolean()            //
-            ['volume_expiration_date_time']=>boolean()           //
-            ['volume_identifier']=>string()                      //
-            ['volume_modification_date_time']=>integer()         //
-            ['volume_set_identifier']=>string()                  //
-        }                                                        //
-    }                                                            //
-
-
-    ['jpg']=>array() {    // JPEG - still image
-        ['exif']=>array() // data returned from PHP's exif_read_data() function
-    }                     //
-
-
-    ['la']=>array() {                        // LA - Lossless Audio (www.lossless-audio.com)
-        ['raw']=>array() {
-            ['format']=>integer()            //
-            ['flags']=>integer()             //
-        }                                    //
-        ['flags']=>array() {                 //
-            ['seekable']=>boolean()          //
-            ['high_compression']=>boolean()  //
-        }                                    //
-        ['bits_per_sample']=>integer()       //
-        ['bytes_per_sample']=>integer()      //
-        ['bytes_per_second']=>integer()      //
-        ['channels']=>integer()              //
-        ['compression_ratio']=>double()      //
-        ['format_size']=>integer()           //
-        ['header_size']=>integer()           //
-        ['original_crc']=>double()           //
-        ['sample_rate']=>integer()           //
-        ['samples']=>integer()               //
-        ['uncompressed_size']=>integer()     //
-        ['version']=>double()                //
-        ['version_major']=>integer()         //
-        ['version_minor']=>integer()         //
-        ['footerstart']=>double()            //
-    }
-
-
-    ['lpac']=>array() {                               // LPAC - Lossless Predictive Audio Compressor
-        ['block_length']=>integer()                   //
-        ['file_version']=>integer()                   //
-        ['flags']=>array() {                          //
-            ['16_bit']=>boolean()                     //
-            ['24_bit']=>boolean()                     //
-            ['adaptive_prediction_order']=>boolean()  //
-            ['adaptive_quantization']=>boolean()      //
-            ['fast_compress']=>boolean()              //
-            ['is_wave']=>boolean()                    //
-            ['joint_stereo']=>boolean()               //
-            ['max_prediction_order']=>integer()       //
-            ['quantization']=>integer()               //
-            ['random_access']=>boolean()              //
-            ['stereo']=>boolean()                     //
-        }                                             //
-        ['raw']=>array() {                            //
-            ['audio_type']=>integer()                 //
-            ['parameters']=>double()                  //
-        }                                             //
-        ['total_samples']=>integer()                  //
-    }                                                 //
-
-
-    ['lyrics3']=>array() {                // Lyrics3 - metainformation tags
-        ['comments']=>array() {           //
-            ['album']=>string()           //
-            ['artist']=>string()          //
-            ['author']=>string()          //
-            ['comment']=>string()         //
-            ['title']=>string()           //
-        }                                 //
-        ['flags']=>array() {              //
-            ['lyrics']=>boolean()         //
-            ['timestamps']=>boolean()     //
-        }                                 //
-        ['images']=>array() {             //
-            [<x>]=>array() {              //
-                ['description']=>string() //
-                ['filename']=>string()    //
-                ['timestamp']=>integer()  //
-            }                             //
-        }                                 //
-        ['raw']=>array() {                //
-            ['offset_start']=>integer()   //
-            ['offset_end']=>integer()     //
-            ['AUT']=>string()             //
-            ['EAL']=>string()             //
-            ['EAR']=>string()             //
-            ['ETT']=>string()             //
-            ['IMG']=>string()             //
-            ['IND']=>string()             //
-            ['INF']=>string()             //
-            ['LYR']=>string()             //
-            ['lyrics3tagsize']=>integer() //
-            ['lyrics3version']=>integer() //
-            ['unparsed']=>string()        //
-        }                                 //
-        ['synchedlyrics']=>array() {      //
-            [<x>]=>string()               //
-        }                                 //
-        ['unsynchedlyrics']=>string()     //
-    }                                     //
-
-
-    ['midi']=>array() {                         // MIDI (Musical Instrument Digital Interface) - sequenced music
-        ['comments']=>array() {                 //
-            ['comment']=>string()               //
-            ['copyright']=>string()             //
-        }                                       //
-        ['keysignature']=>array() {             //
-            [<x>]=>string()                     //
-        }                                       //
-        ['raw']=>array() {                      //
-            ['events']=>array() {               //
-                [<x>]=>array() {                //
-                    [<x>]=>array() {            //
-                        ['us_qnote']=>integer() //
-                    }                           //
-                }                               //
-            }                                   //
-            ['fileformat']=>integer()           //
-            ['headersize']=>integer()           //
-            ['ticksperqnote']=>integer()        //
-            ['track']=>array() {                //
-                [<x>]=>array() {                //
-                    ['instrument']=>string()    //
-                    ['instrumentid']=>integer() //
-                    ['name']=>string()          //
-                }                               //
-            }                                   //
-            ['tracks']=>integer()               //
-        }                                       //
-        ['timesignature']=>array() {            //
-            [<x>]=>string()                     //
-        }                                       //
-        ['totalticks']=>integer()               //
-    }                                           //
-
-
-    ['monkeys_audio']=>array() {                // Monkey's Audio - lossless audio compression
-        ['bitrate']=>double()                   //
-        ['bits_per_sample']=>integer()          //
-        ['channels']=>integer()                 //
-        ['compressed_size']=>integer()          //
-        ['compression']=>string()               //
-        ['compression_ratio']=>double()         //
-        ['flags']=>array() {                    //
-            ['24-bit']=>boolean()               //
-            ['8-bit']=>boolean()                //
-            ['crc-32']=>boolean()               //
-            ['no_wav_header']=>boolean()        //
-            ['peak_level']=>boolean()           //
-            ['seek_elements']=>boolean()        //
-        }                                       //
-        ['frames']=>integer()                   //
-        ['peak_level']=>integer()               //
-        ['peak_ratio']=>double()                //
-        ['playtime']=>double()                  //
-        ['raw']=>array() {                      //
-            ['header_tag']=>string()            //
-            ['nChannels']=>integer()            //
-            ['nCompressionLevel']=>integer()    //
-            ['nFinalFrameSamples']=>integer()   //
-            ['nFormatFlags']=>integer()         //
-            ['nPeakLevel']=>integer()           //
-            ['nSampleRate']=>integer()          //
-            ['nSeekElements']=>integer()        //
-            ['nTotalFrames']=>integer()         //
-            ['nVersion']=>integer()             //
-            ['nWAVHeaderBytes']=>integer()      //
-            ['nWAVTerminatingBytes']=>integer() //
-        }                                       //
-        ['sample_rate']=>integer()              //
-        ['samples']=>integer()                  //
-        ['samples_per_frame']=>integer()        //
-        ['uncompressed_size']=>integer()        //
-        ['version']=>double()                   //
-    }                                           //
-
-
-    ['mpc']=>array() {                          // MPC (Musepack) - lossy audio compression
-        ['header']=>array() {                   //
-            ['album_gain_db']=>integer()        //
-            ['album_peak']=>integer()           //
-            ['album_peak_db']=>boolean()        //
-            ['title_gain_db']=>integer()        //
-            ['title_peak']=>integer()           //
-            ['title_peak_db']=>boolean()        //
-            ['begin_loud']=>boolean()           //
-            ['end_loud']=>boolean()             //
-            ['encoder_version']=>string()       //
-            ['frame_count']=>integer()          //
-            ['intensity_stereo']=>boolean()     //
-            ['last_frame_length']=>integer()    //
-            ['max_level']=>integer()            //
-            ['max_subband']=>integer()          //
-            ['mid_side_stereo']=>boolean()      //
-            ['profile']=>string()               //
-            ['sample_rate']=>integer()          //
-            ['samples']=>integer()              //
-            ['size']=>integer()                 //
-            ['stream_major_version']=>integer() //
-            ['stream_minor_version']=>integer() //
-            ['true_gapless']=>boolean()         //
-            ['raw']=>array() {                  //
-                ['album_gain']=>integer()       //
-                ['album_peak']=>integer()       //
-                ['encoder_version']=>integer()  //
-                ['preamble']=>string()          //
-                ['profile']=>integer()          //
-                ['sample_rate']=>integer()      //
-                ['title_gain']=>integer()       //
-                ['title_peak']=>integer()       //
-            }                                   //
-        }                                       //
-    }                                           //
-
-
-    ['mpeg']=>array() {                                // MPEG (Motion Picture Experts Group) - MPEG video and/or MPEG audio (MP3/MP2/MP1)
-        ['audio']=>array() {                           //
-            ['LAME']=>array() {                        //
-                ['RGAD']=>array() {                    //
-                    ['peak_amplitude']=>double()       //
-                }                                      //
-                ['ath_type']=>integer()                //
-                ['audio_bytes']=>integer()             //
-                ['bitrate_min']=>integer()             //
-                ['encoder_delay']=>integer()           //
-                ['encoding_flags']=>array() {          //
-                    ['nogap_next']=>boolean()          //
-                    ['nogap_prev']=>boolean()          //
-                    ['nspsytune']=>boolean()           //
-                    ['nssafejoint']=>boolean()         //
-                }                                      //
-                ['end_padding']=>integer()             //
-                ['lame_tag_crc']=>integer()            //
-                ['lowpass_frequency']=>integer()       //
-                ['mp3_gain_db']=>double()              //
-                ['mp3_gain_factor']=>double()          //
-                ['mp3_gain_raw']=>integer()            //
-                ['music_crc']=>integer()               //
-                ['noise_shaping']=>integer()           //
-                ['noise_shaping_raw']=>integer()       //
-                ['not_optimal_quality']=>boolean()     //
-                ['not_optimal_quality_raw']=>integer() //
-                ['preset_used_id']=>integer()          //
-                ['short_version']=>string()            // ex: "LAME 3.93"
-                ['long_version']=>string()             // (pre-v3.90 only) ex: "LAME 3.88 (alpha)"
-                ['source_sample_freq']=>string()       //
-                ['source_sample_freq_raw']=>integer()  //
-                ['stereo_mode']=>string()              //
-                ['stereo_mode_raw']=>integer()         //
-                ['surround_info']=>string()            //
-                ['surround_info_id']=>integer()        //
-                ['tag_revision']=>integer()            //
-                ['vbr_method']=>string()               //
-                ['vbr_method_raw']=>integer()          //
-            }                                          //
-            ['VBR_bitrate']=>double()                  //
-            ['VBR_bytes']=>integer()                   //
-            ['VBR_frames']=>integer()                  //
-            ['VBR_method']=>string()                   //
-            ['VBR_scale']=>integer()                   //
-            ['bitrate']=>integer()                     //
-            ['bitrate_distribution']=>array() {        //
-                ['free']=>integer()                    //
-                ['8']=>integer()                       //
-                ['16']=>integer()                      //
-                ['24']=>integer()                      //
-                ['32']=>integer()                      //
-                ['40']=>integer()                      //
-                ['48']=>integer()                      //
-                ['56']=>integer()                      //
-                ['64']=>integer()                      //
-                ['80']=>integer()                      //
-                ['96']=>integer()                      //
-                ['112']=>integer()                     //
-                ['128']=>integer()                     //
-                ['144']=>integer()                     //
-                ['160']=>integer()                     //
-            }                                          //
-            ['bitrate_mode']=>string()                 //
-            ['channelmode']=>string()                  //
-            ['channels']=>integer()                    //
-            ['copyright']=>boolean()                   //
-            ['crc']=>integer()                         //
-            ['emphasis']=>string()                     //
-            ['frame_count']=>integer()                 //
-            ['framelength']=>integer()                 //
-            ['layer']=>integer()                       //
-            ['modeextension']=>string()                //
-            ['original']=>boolean()                    //
-            ['padding']=>boolean()                     //
-            ['private']=>boolean()                     //
-            ['protection']=>boolean()                  //
-            ['raw']=>array() {                         //
-                ['bitrate']=>integer()                 //
-                ['channelmode']=>integer()             //
-                ['copyright']=>integer()               //
-                ['emphasis']=>integer()                //
-                ['layer']=>integer()                   //
-                ['modeextension']=>integer()           //
-                ['original']=>integer()                //
-                ['padding']=>integer()                 //
-                ['private']=>integer()                 //
-                ['protection']=>integer()              //
-                ['sample_rate']=>integer()             //
-                ['synch']=>integer()                   //
-                ['version']=>integer()                 //
-            }                                          //
-            ['sample_rate']=>integer()                 //
-            ['stereo_distribution']=>array() {         //
-                ['dual channel']=>integer()            //
-                ['joint stereo']=>integer()            //
-                ['mono']=>integer()                    //
-                ['stereo']=>integer()                  //
-            }                                          //
-            ['toc']=>array() {                         //
-                [<x>]=>integer()                       //
-            }                                          //
-            ['version']=>string()                      //
-            ['version_distribution']=>array() {        //
-                [<x>]=>integer()                       //
-                [<x>]=>integer()                       //
-                ['2.5']=>integer()                     //
-            }                                          //
-            ['xing_flags']=>array() {                  //
-                ['bytes']=>boolean()                   //
-                ['frames']=>boolean()                  //
-                ['toc']=>boolean()                     //
-                ['vbr_scale']=>boolean()               //
-            }                                          //
-            ['xing_flags_raw']=>string()               //
-        }                                              //
-        ['video']=>array() {                           //
-            ['bitrate']=>integer()                     //
-            ['bitrate_mode']=>string()                 //
-            ['frame_rate']=>double()                   //
-            ['framesize_horizontal']=>integer()        //
-            ['framesize_vertical']=>integer()          //
-            ['pixel_aspect_ratio']=>double()           //
-            ['pixel_aspect_ratio_text']=>string()      //
-            ['raw']=>array() {                         //
-                ['bitrate']=>integer()                 //
-                ['constrained_param_flag']=>integer()  //
-                ['frame_rate']=>integer()              //
-                ['framesize_horizontal']=>integer()    //
-                ['framesize_vertical']=>integer()      //
-                ['intra_quant_flag']=>integer()        //
-                ['marker_bit']=>integer()              //
-                ['pixel_aspect_ratio']=>integer()      //
-                ['vbv_buffer_size']=>integer()         //
-            }                                          //
-        }                                              //
-    }                                                  //
-
-
-    ['nsv']=>array() {                     // NSV - Nullsoft Streaming Video
-        ['NSVf']=>array() {                //
-            ['TOC_entries_1']=>integer()   //
-            ['TOC_entries_2']=>integer()   //
-            ['file_size']=>integer()       //
-            ['header_length']=>integer()   //
-            ['identifier']=>string()       //
-            ['meta_size']=>integer()       //
-            ['metadata']=>string()         //
-            ['playtime_ms']=>integer()     //
-        }                                  //
-        ['NSVs']=>array() {                //
-            ['audio_codec']=>string()      //
-            ['frame_rate']=>double()       //
-            ['framerate_index']=>integer() //
-            ['identifier']=>string()       //
-            ['offset']=>integer()          //
-            ['resolution_x']=>integer()    //
-            ['resolution_y']=>integer()    //
-            ['unknown1b']=>integer()       //
-            ['unknown1c']=>integer()       //
-            ['unknown1d']=>integer()       //
-            ['unknown2a']=>integer()       //
-            ['unknown2b']=>integer()       //
-            ['unknown2c']=>integer()       //
-            ['unknown2d']=>integer()       //
-            ['unknown3a']=>integer()       //
-            ['unknown3b']=>integer()       //
-            ['unknown3c']=>integer()       //
-            ['unknown3d']=>integer()       //
-            ['video_codec']=>string()      //
-        }                                  //
-        ['comments']=>array() {            //
-            ['aspect']=>string()           //
-            ['title']=>string()            //
-        }                                  //
-    }                                      //
-
-
-    ['ofr']=>array() {                                   // OFR (OptimFROG) - lossless audio compression
-        ['COMP']=>array() {                              //
-            [<x>]=>array() {                             //
-                ['channel_configuration']=>string()      //
-                ['crc_32']=>boolean()                    //
-                ['encoder']=>string()                    //
-                ['offset']=>integer()                    //
-                ['raw']=>array() {                       //
-                    ['algorithm_id']=>integer()          //
-                    ['channel_configuration']=>integer() //
-                    ['encoder_id']=>integer()            //
-                    ['sample_type']=>integer()           //
-                }                                        //
-                ['sample_count']=>integer()              //
-                ['sample_type']=>string()                //
-                ['size']=>integer()                      //
-            }                                            //
-        }                                                //
-        ['HEAD']=>array() {                              //
-            ['offset']=>integer()                        //
-            ['size']=>integer()                          //
-        }                                                //
-        ['OFR ']=>array() {                              //
-            ['channel_config']=>integer()                //
-            ['channels']=>integer()                      //
-            ['compression']=>string()                    //
-            ['encoder']=>string()                        //
-            ['offset']=>integer()                        //
-            ['raw']=>array() {                           //
-                ['compression']=>integer()               //
-                ['encoder_id']=>integer()                //
-                ['sample_type']=>integer()               //
-            }                                            //
-            ['sample_rate']=>integer()                   //
-            ['sample_type']=>string()                    //
-            ['size']=>integer()                          //
-            ['total_samples']=>integer()                 //
-        }                                                //
-        ['TAIL']=>array() {                              //
-            ['offset']=>integer()                        //
-            ['size']=>integer()                          //
-        }                                                //
-    }                                                    //
-
-
-    ['ogg']=>array() {                           // OGG - container format for Ogg Vorbis, OggFLAC, Speex, etc
-        ['bitrate_average']=>double()            //
-        ['bitrate_max']=>integer()               //
-        ['bitrate_min']=>integer()               //
-        ['bitrate_nominal']=>integer()           //
-        ['bitstreamversion']=>integer()          //
-        ['blocksize_large']=>integer()           //
-        ['blocksize_small']=>integer()           //
-        ['comments']=>array() {                  // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-            [<key name>]=>array()                // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-        }                                        //
-        ['comments_raw']=>array() {              //
-            [<x>]=>array() {                     //
-                ['dataoffset']=>integer()        //
-                ['key']=>string()                //
-                ['size']=>integer()              //
-                ['value']=>string()              //
-            }                                    //
-        }                                        //
-        ['numberofchannels']=>integer()          //
-        ['pageheader']=>array() {                //
-            [<x>]=>array() {                     //
-                ['flags']=>array() {             //
-                    ['bos']=>boolean()           //
-                    ['eos']=>boolean()           //
-                    ['fresh']=>boolean()         //
-                }                                //
-                ['flags_raw']=>integer()         //
-                ['header_end_offset']=>integer() //
-                ['packet_type']=>integer()       //
-                ['page_checksum']=>double()      //
-                ['page_end_offset']=>integer()   //
-                ['page_length']=>integer()       //
-                ['page_segments']=>integer()     //
-                ['page_seqno']=>integer()        //
-                ['page_start_offset']=>integer() //
-                ['pcm_abs_position']=>integer()  //
-                ['segment_table']=>array() {     //
-                    [<x>]=>integer()             //
-                }                                //
-                ['stream_serialno']=>integer()   //
-                ['stream_structver']=>integer()  //
-                ['stream_type']=>string()        //
-            }                                    //
-            ['eos']=>array() {                   //
-                ['flags']=>array() {             //
-                    ['bos']=>boolean()           //
-                    ['eos']=>boolean()           //
-                    ['fresh']=>boolean()         //
-                }                                //
-                ['flags_raw']=>integer()         //
-                ['header_end_offset']=>integer() //
-                ['page_checksum']=>double()      //
-                ['page_end_offset']=>integer()   //
-                ['page_length']=>integer()       //
-                ['page_segments']=>integer()     //
-                ['page_seqno']=>integer()        //
-                ['page_start_offset']=>integer() //
-                ['pcm_abs_position']=>integer()  //
-                ['segment_table']=>array() {     //
-                    [<x>]=>integer()             //
-                }                                //
-                ['stream_serialno']=>integer()   //
-                ['stream_structver']=>integer()  //
-            }                                    //
-        }                                        //
-        ['samplerate']=>integer()                //
-        ['samples']=>integer()                   //
-        ['stop_bit']=>integer()                  //
-        ['vendor']=>string()                     //
-    }                                            //
-
-
-    ['png']=>array() {                                // PNG (Portable Network Graphics) - still image
-        ['IDAT']=>array() {                           //
-            [<x>]=>array() {                          //
-                ['header']=>array() {                 //
-                    ['crc']=>integer()                //
-                    ['data_length']=>integer()        //
-                    ['flags']=>array() {              //
-                        ['ancilliary']=>boolean()     //
-                        ['private']=>boolean()        //
-                        ['reserved']=>boolean()       //
-                        ['safe_to_copy']=>boolean()   //
-                    }                                 //
-                    ['type_raw']=>double()            //
-                    ['type_text']=>string()           //
-                }                                     //
-            }                                         //
-        }                                             //
-        ['IEND']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-        }                                             //
-        ['IHDR']=>array() {                           //
-            ['color_type']=>array() {                 //
-                ['alpha']=>boolean()                  //
-                ['palette']=>boolean()                //
-                ['true_color']=>boolean()             //
-            }                                         //
-            ['compression_method_text']=>string()     //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['height']=>integer()                     //
-            ['raw']=>array() {                        //
-                ['bit_depth']=>integer()              //
-                ['color_type']=>integer()             //
-                ['compression_method']=>integer()     //
-                ['filter_method']=>integer()          //
-                ['interlace_method']=>integer()       //
-            }                                         //
-            ['width']=>integer()                      //
-        }                                             //
-        ['PLTE']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            [<x>]=>integer()                          //
-        }                                             //
-        ['comments']=>array() {                       // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-            [<key name>]=>array()                     // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-        }                                             //
-        ['gAMA']=>array() {                           //
-            ['gamma']=>double()                       //
-            ['header']=>array() {                     //
-                ['crc']=>integer()                    //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-        }                                             //
-        ['oFFs']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['position_x']=>integer()                 //
-            ['position_y']=>integer()                 //
-            ['unit']=>string()                        //
-            ['unit_specifier']=>integer()             //
-        }                                             //
-        ['pHYs']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>integer()                    //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['pixels_per_unit_x']=>integer()          //
-            ['pixels_per_unit_y']=>integer()          //
-            ['unit']=>string()                        //
-            ['unit_specifier']=>integer()             //
-        }                                             //
-        ['pcLb']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-        }                                             //
-        ['tEXt']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>integer()                    //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['keyword']=>string()                     //
-            ['text']=>string()                        //
-        }                                             //
-        ['tIME']=>array() {                           //
-            ['day']=>integer()                        //
-            ['header']=>array() {                     //
-                ['crc']=>integer()                    //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['hour']=>integer()                       //
-            ['minute']=>integer()                     //
-            ['month']=>integer()                      //
-            ['second']=>integer()                     //
-            ['unix']=>integer()                       //
-            ['year']=>integer()                       //
-        }                                             //
-        ['tRNS']=>array() {                           //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['transparent_color_blue']=>integer()     //
-            ['transparent_color_green']=>integer()    //
-            ['transparent_color_red']=>integer()      //
-        }                                             //
-        ['zTXt']=>array() {                           //
-            ['compressed_text']=>string()             //
-            ['compression_method']=>integer()         //
-            ['compression_method_text']=>string()     //
-            ['header']=>array() {                     //
-                ['crc']=>double()                     //
-                ['data']=>string()                    //
-                ['data_length']=>integer()            //
-                ['flags']=>array() {                  //
-                    ['ancilliary']=>boolean()         //
-                    ['private']=>boolean()            //
-                    ['reserved']=>boolean()           //
-                    ['safe_to_copy']=>boolean()       //
-                }                                     //
-                ['type_raw']=>double()                //
-                ['type_text']=>string()               //
-            }                                         //
-            ['keyword']=>string()                     //
-            ['text']=>string()                        //
-        }                                             //
-    }                                                 //
-
-
-    ['quicktime']=>array() {               // Quicktime - video/audio
-        ['']=>array() {                    //
-            ['name']=>boolean()            //
-            ['offset']=>integer()          //
-            ['size']=>integer()            //
-        }                                  //
-        ['audio']=>array() {               //
-            ['bit_depth']=>integer()       //
-            ['channels']=>integer()        //
-            ['codec']=>string()            //
-            ['sample_rate']=>double()      //
-        }                                  //
-        ['free']=>array() {                //
-            ['name']=>string()             //
-            ['offset']=>integer()          //
-            ['size']=>integer()            //
-        }                                  //
-        ['mdat']=>array() {                //
-            ['name']=>string()             //
-            ['offset']=>integer()          //
-            ['size']=>integer()            //
-        }                                  //
-        ['moov']=>array() {                //
-            ['hierarchy']=>string()        //
-            ['name']=>string()             //
-            ['offset']=>integer()          //
-            ['size']=>integer()            //
-            ['subatoms']=>array()          // This is an undocumentably-complex recursive array, typically containing a huge amount of seemingly disorganized data. Avoid this like the plague.
-        }                                  //
-        ['time_scale']=>integer()          //
-        ['display_scale']=>integer()       // 1 = normal; 0.5 = half; 2 = double
-        ['video']=>array() {               //
-            ['codec']=>string()            //
-            ['color_depth']=>integer()     //
-            ['color_depth_name']=>string() //
-            ['resolution_x']=>double()     //
-            ['resolution_y']=>double()     //
-        }                                  //
-        ['wide']=>array() {                //
-            ['name']=>string()             //
-            ['offset']=>integer()          //
-            ['size']=>integer()            //
-        }                                  //
-    }                                      //
-
-
-    ['real']=>array() {                           // Real (RealAudio / RealVideo) - audio/video
-        ['chunks']=>array() {                     //
-            [<x>]=>array() {                      //
-                ['file_version']=>integer()       //
-                ['headers_count']=>integer()      //
-                ['length']=>integer()             //
-                ['name']=>string()                //
-                ['object_version']=>integer()     //
-                ['offset']=>integer()             //
-            }                                     //
-            [<x>]=>array() {                      //
-                ['avg_bit_rate']=>integer()       //
-                ['avg_packet_size']=>integer()    //
-                ['data_offset']=>integer()        //
-                ['duration']=>integer()           //
-                ['flags']=>array() {              //
-                    ['live_broadcast']=>boolean() //
-                    ['perfect_play']=>boolean()   //
-                    ['save_enabled']=>boolean()   //
-                }                                 //
-                ['flags_raw']=>integer()          //
-                ['index_offset']=>integer()       //
-                ['length']=>integer()             //
-                ['max_bit_rate']=>integer()       //
-                ['max_packet_size']=>integer()    //
-                ['name']=>string()                //
-                ['num_packets']=>integer()        //
-                ['num_streams']=>integer()        //
-                ['object_version']=>integer()     //
-                ['offset']=>integer()             //
-                ['preroll']=>integer()            //
-            }                                     //
-        }                                         //
-        ['comments']=>array() {                   //
-            ['artist']=>string()                  //
-            ['comment']=>string()                 //
-            ['title']=>string()                   //
-        }                                         //
-    }                                             //
-
-
-    ['riff']=>array() {                                     // RIFF (Resource Interchange File Format) - audio/video container format (AVI, WAV, CDDA, etc)
-        ['AIFC']=>array() {                                 //
-            ['COMM']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['FVER']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['INST']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['MARK']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['SSND']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-        }                                                   //
-        ['AIFF']=>array() {                                 //
-            ['(c) ']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['COMM']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['SSND']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-        }                                                   //
-        ['AVI ']=>array() {                                 //
-            ['JUNK']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['hdrl']=>array() {                             //
-                ['avih']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['odml']=>array() {                         //
-                    ['dmlh']=>array() {                     //
-                        [<x>]=>array() {                    //
-                            ['data']=>string()              //
-                            ['offset']=>integer()           //
-                            ['size']=>integer()             //
-                        }                                   //
-                    }                                       //
-                }                                           //
-                ['strl']=>array() {                         //
-                    ['JUNK']=>array() {                     //
-                        [<x>]=>array() {                    //
-                            ['offset']=>integer()           //
-                            ['size']=>integer()             //
-                        }                                   //
-                    }                                       //
-                    ['strf']=>array() {                     //
-                        [<x>]=>array() {                    //
-                            ['data']=>string()              //
-                            ['offset']=>integer()           //
-                            ['size']=>integer()             //
-                        }                                   //
-                    }                                       //
-                    ['strh']=>array() {                     //
-                        [<x>]=>array() {                    //
-                            ['data']=>string()              //
-                            ['offset']=>integer()           //
-                            ['size']=>integer()             //
-                        }                                   //
-                    }                                       //
-                    ['strn']=>array() {                     //
-                        [<x>]=>array() {                    //
-                            ['data']=>string()              //
-                            ['offset']=>integer()           //
-                            ['size']=>integer()             //
-                        }                                   //
-                    }                                       //
-                }                                           //
-            }                                               //
-            ['idx1']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['movi']=>array() {                             //
-                ['offset']=>integer()                       //
-                ['size']=>integer()                         //
-            }                                               //
-        }                                                   //
-        ['CDDA']=>array() {                                 //
-            ['fmt ']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['disc_id']=>integer()                  //
-                    ['offset']=>integer()                   //
-                    ['playtime_frames']=>integer()          //
-                    ['playtime_seconds']=>double()          //
-                    ['size']=>integer()                     //
-                    ['start_offset_frame']=>integer()       //
-                    ['start_offset_seconds']=>double()      //
-                    ['track_num']=>integer()                //
-                    ['unknown1']=>integer()                 //
-                    ['unknown6']=>integer()                 //
-                    ['unknown7']=>integer()                 //
-                }                                           //
-            }                                               //
-        }                                                   //
-        ['WAVE']=>array() {                                 //
-            ['DISP']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['INFO']=>array() {                             //
-                ['IART']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ICMT']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ICOP']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['IENG']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['IGNR']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['IKEY']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['IMED']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['INAM']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ISBJ']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ISFT']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ISRC']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ISRF']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-                ['ITCH']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['data']=>string()                  //
-                        ['offset']=>integer()               //
-                        ['size']=>integer()                 //
-                    }                                       //
-                }                                           //
-            }                                               //
-            ['MEXT']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['anciliary_data_length']=>integer()    //
-                    ['data']=>string()                      //
-                    ['flags']=>array() {                    //
-                        ['anciliary_data_free']=>boolean()  //
-                        ['anciliary_data_left']=>boolean()  //
-                        ['anciliary_data_right']=>boolean() //
-                        ['homogenous']=>boolean()           //
-                    }                                       //
-                    ['offset']=>integer()                   //
-                    ['raw']=>array() {                      //
-                        ['anciliary_data_def']=>integer()   //
-                        ['sound_information']=>integer()    //
-                    }                                       //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['bext']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['author']=>string()                    //
-                    ['bwf_version']=>integer()              //
-                    ['coding_history']=>array() {           //
-                        [<x>]=>string()                     //
-                    }                                       //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['origin_date']=>string()               //
-                    ['origin_date_unix']=>integer()         //
-                    ['origin_time']=>string()               //
-                    ['reference']=>string()                 //
-                    ['reserved']=>integer()                 //
-                    ['size']=>integer()                     //
-                    ['time_reference']=>integer()           //
-                    ['title']=>string()                     //
-                }                                           //
-            }                                               //
-            ['cart']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['artist']=>string()                    //
-                    ['category']=>string()                  //
-                    ['classification']=>string()            //
-                    ['client_id']=>string()                 //
-                    ['cut_id']=>string()                    //
-                    ['data']=>string()                      //
-                    ['end_date']=>string()                  //
-                    ['end_time']=>string()                  //
-                    ['offset']=>integer()                   //
-                    ['out_cue']=>string()                   //
-                    ['post_time']=>array() {                //
-                        [<x>]=>array() {                    //
-                            ['timer_value']=>integer()      //
-                            ['usage_fourcc']=>string()      //
-                        }                                   //
-                    }                                       //
-                    ['producer_app_id']=>string()           //
-                    ['producer_app_version']=>string()      //
-                    ['size']=>integer()                     //
-                    ['start_date']=>string()                //
-                    ['start_time']=>string()                //
-                    ['tag_text']=>array() {                 //
-                        [<x>]=>string()                     //
-                    }                                       //
-                    ['title']=>string()                     //
-                    ['url']=>string()                       //
-                    ['user_defined_text']=>string()         //
-                    ['version']=>string()                   //
-                    ['zero_db_reference']=>integer()        //
-                }                                           //
-            }                                               //
-            ['data']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['fact']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['fmt ']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-            ['rgad']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['data']=>string()                      //
-                    ['offset']=>integer()                   //
-                    ['size']=>integer()                     //
-                }                                           //
-            }                                               //
-        }                                                   //
-        ['audio']=>array() {                                //
-            [<x>]=>array() {                                //
-                ['bitrate']=>integer()                      //
-                ['bits_per_sample']=>integer()              //
-                ['channels']=>integer()                     //
-                ['codec']=>string()                         //
-                ['sample_rate']=>integer()                  //
-            }                                               //
-            ['bits_per_sample']=>integer()                  //
-            ['channels']=>integer()                         //
-            ['codec_fourcc']=>string()                      //
-            ['codec_name']=>string()                        //
-            ['sample_rate']=>integer()                      //
-            ['total_samples']=>integer()                    //
-        }                                                   //
-        ['comments']=>array() {                             // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-            [<key name>]=>array()                           // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-        }                                                   //
-        ['header_size']=>integer()                          //
-        ['raw']=>array() {                                  //
-            ['avih']=>array() {                             //
-                ['dwFlags']=>integer()                      //
-                ['dwHeight']=>integer()                     //
-                ['dwInitialFrames']=>integer()              //
-                ['dwLength']=>integer()                     //
-                ['dwMaxBytesPerSec']=>integer()             //
-                ['dwMicroSecPerFrame']=>integer()           //
-                ['dwPaddingGranularity']=>integer()         //
-                ['dwRate']=>integer()                       //
-                ['dwScale']=>integer()                      //
-                ['dwStart']=>integer()                      //
-                ['dwStreams']=>integer()                    //
-                ['dwSuggestedBufferSize']=>integer()        //
-                ['dwTotalFrames']=>integer()                //
-                ['dwWidth']=>integer()                      //
-                ['flags']=>array() {                        //
-                    ['capturedfile']=>boolean()             //
-                    ['copyrighted']=>boolean()              //
-                    ['hasindex']=>boolean()                 //
-                    ['interleaved']=>boolean()              //
-                    ['mustuseindex']=>boolean()             //
-                    ['trustcktype']=>boolean()              //
-                }                                           //
-            }                                               //
-            ['fact']=>array() {                             //
-                ['NumberOfSamples']=>integer()              //
-            }                                               //
-            ['fmt ']=>array() {                             //
-                ['nAvgBytesPerSec']=>integer()              //
-                ['wBitsPerSample']=>integer()               //
-                ['nBlockAlign']=>integer()                  //
-                ['nChannels']=>integer()                    //
-                ['nSamplesPerSec']=>integer()               //
-                ['wFormatTag']=>integer()                   //
-            }                                               //
-            ['rgad']=>array() {                             //
-                ['audiophile']=>array() {                   //
-                    ['adjustment']=>integer()               //
-                    ['name']=>integer()                     //
-                    ['originator']=>integer()               //
-                    ['signbit']=>integer()                  //
-                }                                           //
-                ['fPeakAmplitude']=>double()                //
-                ['nAudiophileRgAdjust']=>integer()          //
-                ['nRadioRgAdjust']=>integer()               //
-                ['radio']=>array() {                        //
-                    ['adjustment']=>integer()               //
-                    ['name']=>integer()                     //
-                    ['originator']=>integer()               //
-                    ['signbit']=>integer()                  //
-                }                                           //
-            }                                               //
-            ['strf']=>array() {                             //
-                ['auds']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['nAvgBytesPerSec']=>integer()      //
-                        ['wBitsPerSample']=>integer()       //
-                        ['nBlockAlign']=>integer()          //
-                        ['nChannels']=>integer()            //
-                        ['nSamplesPerSec']=>integer()       //
-                        ['wFormatTag']=>integer()           //
-                    }                                       //
-                }                                           //
-                ['vids']=>array() {                         //
-                    [<x>]=>array() {                        //
-                        ['biBitCount']=>integer()           //
-                        ['biClrImportant']=>integer()       //
-                        ['biClrUsed']=>integer()            //
-                        ['biHeight']=>integer()             //
-                        ['biPlanes']=>integer()             //
-                        ['biSize']=>integer()               //
-                        ['biSizeImage']=>integer()          //
-                        ['biWidth']=>integer()              //
-                        ['biXPelsPerMeter']=>integer()      //
-                        ['biYPelsPerMeter']=>integer()      //
-                        ['fourcc']=>string()                //
-                    }                                       //
-                }                                           //
-            }                                               //
-            ['strh']=>array() {                             //
-                [<x>]=>array() {                            //
-                    ['dwFlags']=>integer()                  //
-                    ['dwInitialFrames']=>integer()          //
-                    ['dwLength']=>integer()                 //
-                    ['dwQuality']=>integer()                //
-                    ['dwRate']=>integer()                   //
-                    ['dwSampleSize']=>integer()             //
-                    ['dwScale']=>integer()                  //
-                    ['dwStart']=>integer()                  //
-                    ['dwSuggestedBufferSize']=>integer()    //
-                    ['fccHandler']=>string()                //
-                    ['fccType']=>string()                   //
-                    ['rcFrame']=>integer()                  //
-                    ['wLanguage']=>integer()                //
-                    ['wPriority']=>integer()                //
-                }                                           //
-            }                                               //
-        }                                                   //
-        ['rgad']=>array() {                                 //
-            ['audiophile']=>array() {                       //
-                ['adjustment']=>double()                    //
-                ['name']=>string()                          //
-                ['originator']=>string()                    //
-            }                                               //
-            ['peakamplitude']=>double()                     //
-            ['radio']=>array() {                            //
-                ['adjustment']=>double()                    //
-                ['name']=>string()                          //
-                ['originator']=>string()                    //
-            }                                               //
-        }                                                   //
-        ['video']=>array() {                                //
-            [<x>]=>array() {                                //
-                ['codec']=>string()                         //
-                ['frame_height']=>integer()                 //
-                ['frame_rate']=>double()                    //
-                ['frame_width']=>integer()                  //
-            }                                               //
-        }                                                   //
-        ['litewave']=>array() {                             // http://www.clearjump.com
-            ['raw']=>array() {                              //
-                ['compression_method']=>integer()           // 1=lossy; 2=lossless
-                ['compression_flags']=>integer()            //
-                ['m_dwScale']=>integer()                    // scalefactor for lossy compression - related to m_wQuality as: $m_wQuality = round((2000 - $m_dwScale) / 20)
-                ['m_dwBlockSize']=>integer()                // number of samples in encoded blocks
-                ['m_wQuality']=>integer()                   // quality factor (0=most compressed lossy; 99=best quality lossy; 100=lossless)
-                ['m_wMarkDistance']=>integer()              // distance between marks in bytes
-                ['m_wReserved']=>integer()                  //
-                ['m_dwOrgSize']=>integer()                  // original file size in bytes
-                ['m_bFactExists']=>integer()                // indicates if 'fact' chunk exists in the original file
-                ['m_dwRiffChunkSize']=>integer()            // riff chunk size in the original file
-            }                                               //
-            ['quality_factor']=>integer()                   // alias of ['raw']['m_wQuality']
-        }                                                   //
-    }                                                       //
-
-
-    ['shn']=>array() {             // Shorten - lossless audio compression
-        ['seektable']=>array() {   //
-            ['length']=>integer()  //
-            ['offset']=>integer()  //
-            ['present']=>boolean() //
-        }                          //
-        ['version']=>integer()     //
-    }                              //
-
-
-    ['swf']=>array() {                  // SWF - ShockWave Flash (www.openswf.org)
-        ['header']=>array() {           //
-            ['frame_count']=>integer()  //
-            ['frame_height']=>integer() //
-            ['frame_width']=>integer()  //
-            ['length']=>integer()       //
-            ['signature']=>string()     //
-            ['version']=>integer()      //
-        }                               //
-        ['bgcolor']=>string()           //
-        ['tags']=>array()               //
-    }                                   //
-
-
-    ['voc']=>array() {                            // VOC - SoundBlaster VOC audio format
-        ['blocks']=>array() {                     //
-            [<x>]=>array() {                      //
-                ['bits_per_sample']=>integer()    //
-                ['block_offset']=>integer()       //
-                ['block_size']=>integer()         //
-                ['block_type_id']=>integer()      //
-                ['channels']=>integer()           //
-                ['compression_name']=>string()    //
-                ['compression_type']=>integer()   //
-                ['pack_method']=>integer()        //
-                ['sample_rate']=>integer()        //
-                ['sample_rate_id']=>integer()     //
-                ['stereo']=>boolean()             //
-                ['time_constant']=>integer()      //
-                ['wFormat']=>integer()            //
-            }                                     //
-        }                                         //
-        ['compressed_bits_per_sample']=>integer() //
-        ['header']=>array() {                     //
-            ['datablock_offset']=>integer()       //
-            ['major_version']=>integer()          //
-            ['minor_version']=>integer()          //
-        }                                         //
-    }                                             //
-
-
-    ['vqf']=>array() {                    // VQF - transform-domain weighted interleave Vector Quantization Format (lossy audio)
-        ['COMM']=>array() {               //
-            ['bitrate']=>integer()        //
-            ['channel_mode']=>integer()   //
-            ['sample_rate']=>integer()    //
-            ['security_level']=>integer() //
-        }                                 //
-        ['DSIZ']=>integer()               //
-        ['comments']=>array() {           // array of array of strings containing best data from any available metainformation tag (APE, ID3v2, ID3v1, Lyrics3, Vorbis, ASF, RIFF, Real, etc.)
-            [<key name>]=>array()         // <key name> can be anything, usually 'artist', 'title', etc. Contains array of one or more values (eg: multiple artists are possible)
-        }                                 //
-        ['raw']=>array() {                //
-            ['header_tag']=>string()      //
-            ['size']=>integer()           //
-            ['version']=>string()         //
-        }                                 //
-    }                                     //
-
-
-    ['wavpack']=>array() {           // WavPack - lossless audio compression
-        ['bits']=>integer()          //
-        ['crc1']=>double()           //
-        ['crc2']=>integer()          //
-        ['extension']=>string()      //
-        ['extra_bc']=>string()       //
-        ['extras']=>string()         //
-        ['flags_raw']=>integer()     //
-        ['offset']=>integer()        //
-        ['shift']=>integer()         //
-        ['size']=>integer()          //
-        ['total_samples']=>integer() //
-        ['version']=>integer()       //
-    }                                //
-
-
-    ['zip']=>array() {                                           // ZIP - lossless data compression
-        ['central_directory']=>array() {                         //
-            [<x>]=>array() {                                     //
-                ['compressed_size']=>integer()                   //
-                ['compression_method']=>string()                 //
-                ['create_version']=>string()                     //
-                ['entry_offset']=>integer()                      //
-                ['extract_version']=>string()                    //
-                ['filename']=>string()                           //
-                ['flags']=>array() {                             //
-                    ['compression_speed']=>string()              //
-                    ['data_descriptor_used']=>boolean()          //
-                    ['encrypted']=>boolean()                     //
-                }                                                //
-                ['host_os']=>string()                            //
-                ['last_modified_timestamp']=>integer()           //
-                ['offset']=>integer()                            //
-                ['raw']=>array() {                               //
-                    ['compressed_size']=>integer()               //
-                    ['compression_method']=>integer()            //
-                    ['crc_32']=>double()                         //
-                    ['create_version']=>integer()                //
-                    ['disk_number_start']=>integer()             //
-                    ['external_file_attrib']=>double()           //
-                    ['extra_field_length']=>integer()            //
-                    ['extract_version']=>integer()               //
-                    ['file_comment_length']=>integer()           //
-                    ['filename_length']=>integer()               //
-                    ['general_flags']=>integer()                 //
-                    ['internal_file_attrib']=>integer()          //
-                    ['last_mod_file_date']=>integer()            //
-                    ['last_mod_file_time']=>integer()            //
-                    ['local_header_offset']=>integer()           //
-                    ['signature']=>integer()                     //
-                    ['uncompressed_size']=>integer()             //
-                }                                                //
-                ['uncompressed_size']=>integer()                 //
-            }                                                    //
-        }                                                        //
-        ['comments']=>array() {                                  //
-            ['comment']=>string()                                //
-        }                                                        //
-        ['compressed_size']=>integer()                           //
-        ['compression_method']=>string()                         //
-        ['compression_speed']=>string()                          //
-        ['end_central_directory']=>array() {                     //
-            ['comment']=>string()                                //
-            ['comment_length']=>integer()                        //
-            ['directory_entries_this_disk']=>integer()           //
-            ['directory_entries_total']=>integer()               //
-            ['directory_offset']=>integer()                      //
-            ['directory_size']=>integer()                        //
-            ['disk_number_current']=>integer()                   //
-            ['disk_number_start_directory']=>integer()           //
-            ['offset']=>integer()                                //
-            ['signature']=>integer()                             //
-        }                                                        //
-        ['entries']=>array() {                                   //
-            [<x>]=>array() {                                     //
-                ['compressed_size']=>integer()                   //
-                ['compression_method']=>string()                 //
-                ['extract_version']=>string()                    //
-                ['filename']=>string()                           //
-                ['flags']=>array() {                             //
-                    ['compression_speed']=>string()              //
-                    ['data_descriptor_used']=>boolean()          //
-                    ['encrypted']=>boolean()                     //
-                }                                                //
-                ['host_os']=>string()                            //
-                ['last_modified_timestamp']=>integer()           //
-                ['offset']=>integer()                            //
-                ['raw']=>array() {                               //
-                    ['compressed_size']=>integer()               //
-                    ['compression_method']=>integer()            //
-                    ['crc_32']=>integer()                        //
-                    ['extra_field_length']=>integer()            //
-                    ['extract_version']=>integer()               //
-                    ['filename_length']=>integer()               //
-                    ['general_flags']=>integer()                 //
-                    ['last_mod_file_date']=>integer()            //
-                    ['last_mod_file_time']=>integer()            //
-                    ['signature']=>integer()                     //
-                    ['uncompressed_size']=>integer()             //
-                }                                                //
-                ['uncompressed_size']=>integer()                 //
-            }                                                    //
-        }                                                        //
-        ['entries_count']=>integer()                             //
-        ['files']=>array() {                                     // multidimensional tree-structure array listing of all files and directories in image
-            [<directory name>]=>array()                          // entries of type array are directories (key is directory name), may contain files and/or other subdirectories
-            [<file name>]=>integer()                             // entries of type integer are files (key is file name, value is file size in bytes)
-        }                                                        //
-        ['uncompressed_size']=>integer()                         //
-    }                                                            //
-}                                                                //
diff --git a/lib/namefixer.php b/lib/namefixer.php
deleted file mode 100644
index 65b40b116..000000000
--- a/lib/namefixer.php
+++ /dev/null
@@ -1,1393 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../bin/config.php");
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR . "lib/category.php");
-require_once(WWW_DIR . "lib/Categorize.php");
-require_once(WWW_DIR . "lib/nzb.php");
-require_once(WWW_DIR . "lib/groups.php");
-require_once(WWW_DIR . "lib/nntp.php");
-require_once(WWW_DIR . "/lib/ReleaseSearch.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once (NN_LIB . 'SphinxSearch.php');
-require_once("ReleaseCleaner.php");
-require_once("nzbcontents.php");
-require_once("Info.php");
-require_once("Pprocess.php");
-require_once("Enzebe.php");
-
-
-//This script is ported from nZEDb and adapted for newznab
-
-/**
- * Class NameFixer
- */
-class NameFixer
-{
-	const PREDB_REGEX = '/([\w\(\)]+[\s\._-]([\w\(\)]+[\s\._-])+[\w\(\)]+-\w+)/';
-
-	// Constants for name fixing status
-	const PROC_NFO_NONE = 0;
-	const PROC_NFO_DONE = 1;
-	const PROC_FILES_NONE = 0;
-	const PROC_FILES_DONE = 1;
-	const PROC_PAR2_NONE = 0;
-	const PROC_PAR2_DONE = 1;
-
-	// Constants for overall rename status
-	const IS_RENAMED_NONE = 0;
-	const IS_RENAMED_DONE = 1;
-
-	/**
-	 * Has the current release found a new name?
-	 * @var bool
-	 */
-	public $matched;
-
-	/**
-	 * How many releases have got a new name?
-	 * @var int
-	 */
-	public $fixed;
-
-	/**
-	 * How many releases were checked.
-	 * @var int
-	 */
-	public $checked;
-
-	/**
-	 * Whether or not the check has completed
-	 * @var bool
-	 */
-	public $done;
-
-	/**
-	 * Whether or not to echo info to CLI
-	 * @var bool
-	 */
-	public $echooutput;
-
-	/**
-	 * Total releases we are working on.
-	 * @var int
-	 */
-	protected $_totalReleases;
-
-	/**
-	 * The cleaned filename we want to match
-	 * @var string
-	 */
-	protected $_fileName;
-
-	/**
-	 * The release id we are trying to rename
-	 * @var int
-	 */
-	protected $relid;
-
-	/**
-	 * @var string
-	 */
-	protected $timeother;
-
-	/**
-	 * @var string
-	 */
-	protected $timeall;
-
-	/**
-	 * @var string
-	 */
-	protected $fullother;
-
-	/**
-	 * @var string
-	 */
-	protected $fullall;
-
-	/**
-	 * @var DB
-	 */
-	public $pdo;
-
-	/**
-	 * @var object
-	 */
-	public $consoletools;
-
-	/**
-	 * @var object
-	 */
-	public $category;
-
-	/**
-	 * @var object
-	 */
-	public $utility;
-
-	/**
-	 * @var object
-	 */
-	public $_groups;
-
-	/**
-	 * @var object
-	 */
-	public $sphinx;
-
-	/**
-	 * @param array $options Class instances / Echo to cli.
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'         => true,
-			'Categorize'   => null,
-			'ConsoleTools' => null,
-			'Groups'       => null,
-			'Utility'      => null,
-			'Settings'     => null,
-			'SphinxSearch' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->relid = $this->fixed = $this->checked = 0;
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-		$this->timeother = ' AND rel.adddate > (NOW() - INTERVAL 0 HOUR) AND rel.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 8010) GROUP BY rel.id ORDER BY postdate DESC';
-		$this->timeall = ' AND rel.adddate > (NOW() - INTERVAL 6 HOUR) GROUP BY rel.id ORDER BY postdate DESC';
-		$this->fullother = ' AND rel.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 8010) GROUP BY rel.id';
-		$this->fullall = '';
-		$this->_fileName = '';
-		$this->done = $this->matched = false;
-		$this->consoletools = ($options['ConsoleTools'] instanceof ConsoleTools ? $options['ConsoleTools'] :new ConsoleTools(['ColorCLI' => $this->pdo->log]));
-		$this->category = ($options['Categorize'] instanceof Categorize ? $options['Categorize'] : new Categorize(['Settings' => $this->pdo]));
-		$this->utility = ($options['Utility'] instanceof Utility ? $options['Utility'] : new Utility());
-		$this->_groups = ($options['Groups'] instanceof Groups ? $options['Groups'] : new Groups(['Settings' => $this->pdo]));
-		$this->sphinx = ($options['SphinxSearch'] instanceof \SphinxSearch ? $options['SphinxSearch'] : new \SphinxSearch());
-	}
-
-	/**
-	 * Attempts to fix release names using the NFO.
-	 *
-	 * @param int $time    1: 24 hours, 2: no time limit
-	 * @param int $echo    1: change the name, anything else: preview of what could have been changed.
-	 * @param int $cats    1: other categories, 2: all categories
-	 * @param $nameStatus
-	 * @param $show
-	 */
-	public function fixNamesWithNfo($time, $echo, $cats, $nameStatus, $show)
-	{
-		$this->_echoStartMessage($time, '.nfo files');
-		$type = 'NFO, ';
-
-		// Only select releases we haven't checked here before
-		$preId = false;
-		if ($cats === 3) {
-			$query = sprintf('
-					SELECT rel.id AS releaseid
-					FROM releases rel
-					INNER JOIN releasenfo nfo ON (nfo.releaseid = rel.id)
-					WHERE nzbstatus = %d
-					AND prehashid = 0',
-				Enzebe::NZB_ADDED
-			);
-			$cats = 2;
-			$preId = true;
-		} else {
-			$query = sprintf('
-					SELECT rel.id AS releaseid
-					FROM releases rel
-					INNER JOIN releasenfo nfo ON (nfo.releaseid = rel.id)
-					WHERE (isrenamed = %d OR rel.categoryid = %d)
-					AND proc_nfo = %d',
-				self::IS_RENAMED_NONE,
-				Category::CAT_MISC_OTHER,
-				self::PROC_NFO_NONE
-			);
-		}
-
-		$releases = $this->_getReleases($time, $cats, $query);
-
-		if ($releases instanceof Traversable && $releases !== false) {
-			$total = $releases->rowCount();
-
-			if ($total > 0) {
-				$this->_totalReleases = $total;
-				echo $this->pdo->log->primary(number_format($total) . ' releases to process.');
-
-				foreach ($releases as $rel) {
-					$releaseRow = $this->pdo->queryOneRow(
-						sprintf('
-							SELECT nfo.releaseid AS nfoid, rel.groupid, rel.categoryid, rel.name, rel.searchname,
-								UNCOMPRESS(nfo) AS textstring, rel.id AS releaseid
-							FROM releases rel
-							INNER JOIN releasenfo nfo ON (nfo.releaseid = rel.id)
-							WHERE rel.id = %d',
-							$rel['releaseid']
-						)
-					);
-
-					$this->checked++;
-
-					// Ignore encrypted NFOs.
-					if (preg_match('/^=newz\[NZB\]=\w+/', $releaseRow['textstring'])) {
-						$this->_updateSingleColumn('proc_nfo', self::PROC_NFO_DONE, $rel['releaseid']);
-						continue;
-					}
-
-					$this->done = $this->matched = false;
-					$this->checkName($releaseRow, $echo, $type, $nameStatus, $show, $preId);
-					$this->_echoRenamed($show);
-				}
-				$this->_echoFoundCount($echo, ' NFO\'s');
-			} else {
-				echo $this->pdo->log->info('Nothing to fix.');
-			}
-		}
-	}
-
-	/**
-	 * Attempts to fix release names using the File name.
-	 *
-	 * @param int $time   1: 24 hours, 2: no time limit
-	 * @param int $echo   1: change the name, anything else: preview of what could have been changed.
-	 * @param int $cats   1: other categories, 2: all categories
-	 * @param $nameStatus
-	 * @param $show
-	 */
-	public function fixNamesWithFiles($time, $echo, $cats, $nameStatus, $show)
-	{
-		$this->_echoStartMessage($time, 'file names');
-		$type = 'Filenames, ';
-
-		$preId = false;
-		if ($cats === 3) {
-			$query = sprintf('
-					SELECT rf.name AS textstring, rel.categoryid, rel.name, rel.searchname, rel.groupid,
-						rf.releaseid AS fileid, rel.id AS releaseid
-					FROM releases rel
-					INNER JOIN releasefiles rf ON (rf.releaseid = rel.id)
-					WHERE nzbstatus = %d
-					AND prehashid = 0',
-				Enzebe::NZB_ADDED
-			);
-			$cats = 2;
-			$preId = true;
-		} else {
-			$query = sprintf('
-					SELECT rf.name AS textstring, rel.categoryid, rel.name, rel.searchname, rel.groupid,
-						rf.releaseid AS fileid, rel.id AS releaseid
-					FROM releases rel
-					INNER JOIN releasefiles rf ON (rf.releaseid = rel.id)
-					WHERE (isrenamed = %d OR rel.categoryid = %d)
-					AND proc_files = %d',
-				self::IS_RENAMED_NONE,
-				Category::CAT_MISC_OTHER,
-				self::PROC_FILES_NONE
-			);
-		}
-
-		$releases = $this->_getReleases($time, $cats, $query);
-		if ($releases instanceof Traversable && $releases !== false) {
-
-			$total = $releases->rowCount();
-			if ($total > 0) {
-				$this->_totalReleases = $total;
-				echo $this->pdo->log->primary(number_format($total) . ' file names to process.');
-
-				foreach ($releases as $release) {
-					$this->done = $this->matched = false;
-					$this->checkName($release, $echo, $type, $nameStatus, $show, $preId);
-					$this->checked++;
-					$this->_echoRenamed($show);
-				}
-
-				$this->_echoFoundCount($echo, ' files');
-			} else {
-				echo $this->pdo->log->info('Nothing to fix.');
-			}
-		}
-	}
-
-	/**
-	 * Attempts to fix release names using the Par2 File.
-	 *
-	 * @param int $time   1: 24 hours, 2: no time limit
-	 * @param int $echo   1: change the name, anything else: preview of what could have been changed.
-	 * @param int $cats   1: other categories, 2: all categories
-	 * @param $nameStatus
-	 * @param $show
-	 * @param NNTP $nntp
-	 */
-	public function fixNamesWithPar2($time, $echo, $cats, $nameStatus, $show, $nntp)
-	{
-		$this->_echoStartMessage($time, 'par2 files');
-
-		if ($cats === 3) {
-			$query = sprintf('
-					SELECT rel.id AS releaseid, rel.guid, rel.groupid
-					FROM releases rel
-					WHERE nzbstatus = %d
-					AND prehashid = 0',
-				Enzebe::NZB_ADDED
-			);
-			$cats = 2;
-		} else {
-			$query = sprintf('
-					SELECT rel.id AS releaseid, rel.guid, rel.groupid
-					FROM releases rel
-					WHERE (isrenamed = %d OR rel.categoryid = %d)
-					AND proc_par2 = %d',
-				self::IS_RENAMED_NONE,
-				Category::CAT_MISC_OTHER,
-				self::PROC_PAR2_NONE
-			);
-		}
-
-		$releases = $this->_getReleases($time, $cats, $query);
-
-		if ($releases instanceof Traversable && $releases !== false) {
-
-			$total = $releases->rowCount();
-			if ($total > 0) {
-				$this->_totalReleases = $total;
-
-				echo $this->pdo->log->primary(number_format($total) . ' releases to process.');
-				$Nfo = new Info(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
-				$nzbContents = new NZBContents(
-					[
-						'Echo'        => $this->echooutput,
-						'NNTP'        => $nntp,
-						'Nfo'         => $Nfo,
-						'Settings'    => $this->pdo,
-						'PostProcess' => new PProcess(['Settings' => $this->pdo, 'Nfo' => $Nfo])
-					]
-				);
-
-				foreach ($releases as $release) {
-					if (($nzbContents->checkPAR2($release['guid'], $release['releaseid'], $release['groupid'], $nameStatus, $show)) === true) {
-						$this->fixed++;
-					}
-
-					$this->checked++;
-					$this->_echoRenamed($show);
-				}
-				$this->_echoFoundCount($echo, ' files');
-			} else {
-				echo $this->pdo->log->alternate('Nothing to fix.');
-			}
-		}
-	}
-
-	/**
-	 * @param int    $time  1: 24 hours, 2: no time limit
-	 * @param int    $cats  1: other categories, 2: all categories
-	 * @param string $query Query to execute.
-	 *
-	 * @return PDOStatement|bool False on failure, PDOStatement with query results on success.
-	 */
-	protected function _getReleases($time, $cats, $query)
-	{
-		$releases = false;
-		// 24 hours, other cats
-		if ($time == 1 && $cats == 1) {
-			echo $this->pdo->log->header($query . $this->timeother . ";\n");
-			$releases = $this->pdo->queryDirect($query . $this->timeother);
-		} // 24 hours, all cats
-		else if ($time == 1 && $cats == 2) {
-			echo $this->pdo->log->header($query . $this->timeall . ";\n");
-			$releases = $this->pdo->queryDirect($query . $this->timeall);
-		} //other cats
-		else if ($time == 2 && $cats == 1) {
-			echo $this->pdo->log->header($query . $this->fullother . ";\n");
-			$releases = $this->pdo->queryDirect($query . $this->fullother);
-		}
-		// all cats
-		else if ($time == 2 && $cats == 2) {
-			echo $this->pdo->log->header($query . $this->fullall . ";\n");
-			$releases = $this->pdo->queryDirect($query . $this->fullall);
-		}
-		return $releases;
-	}
-
-	/**
-	 * Echo the amount of releases that found a new name.
-	 *
-	 * @param int    $echo 1: change the name, anything else: preview of what could have been changed.
-	 * @param string $type The function type that found the name.
-	 */
-	protected function _echoFoundCount($echo, $type)
-	{
-		if ($echo == 1) {
-			echo $this->pdo->log->header(
-				PHP_EOL .
-				number_format($this->fixed) .
-				' releases have had their names changed out of: ' .
-				number_format($this->checked) .
-				$type . '.'
-			);
-		} else {
-			echo $this->pdo->log->header(
-				PHP_EOL .
-				number_format($this->fixed) .
-				' releases could have their names changed. ' .
-				number_format($this->checked) .
-				$type . ' were checked.'
-			);
-		}
-	}
-
-	/**
-	 * @param int    $time 1: 24 hours, 2: no time limit
-	 * @param string $type The function type.
-	 */
-	protected function _echoStartMessage($time, $type)
-	{
-		echo $this->pdo->log->header(
-			sprintf(
-				'Fixing search names %s using %s.',
-				($time == 1 ? 'in the past 6 hours' : 'since the beginning'),
-				$type
-			)
-		);
-
-	}
-
-	/**
-	 * @param int $show
-	 */
-	protected function _echoRenamed($show)
-	{
-		if ($this->checked % 500 == 0 && $show === 1) {
-			echo $this->pdo->log->alternate(PHP_EOL . number_format($this->checked) . ' files processed.' . PHP_EOL);
-		}
-
-		if ($show === 2) {
-			$this->consoletools->overWritePrimary(
-				'Renamed Releases: [' .
-				number_format($this->fixed) .
-				'] ' .
-				$this->consoletools->percentString($this->checked, $this->_totalReleases)
-			);
-		}
-	}
-
-	/**
-	 * Update the release with the new information.
-	 *
-	 * @param array  $release
-	 * @param string $name
-	 * @param string $method
-	 * @param int    $echo
-	 * @param string $type
-	 * @param int    $nameStatus
-	 * @param int    $show
-	 * @param int    $preId
-	 */
-	public function updateRelease($release, $name, $method, $echo, $type, $nameStatus, $show, $preId = 0)
-	{
-		if ($this->relid !== $release['releaseid']) {
-			$releaseCleaning = new ReleaseCleaning($this->pdo);
-			$newName = $releaseCleaning->fixerCleaner($name);
-			if (strtolower($newName) != strtolower($release["searchname"])) {
-				$this->matched = true;
-				$this->relid = $release["releaseid"];
-
-				$determinedCategory = $this->category->determineCategory($release['groupid'], $newName);
-
-				if ($type === "PAR2, ") {
-					$newName = ucwords($newName);
-					if (preg_match('/(.+?)\.[a-z0-9]{2,3}(PAR2)?$/i', $name, $match)) {
-						$newName = $match[1];
-					}
-				}
-
-				$this->fixed++;
-
-				$newName = explode("\\", $newName);
-				$newName = preg_replace(array('/^[-=_\.:\s]+/', '/[-=_\.:\s]+$/'), '',  $newName[0]);
-
-				if ($this->echooutput === true && $show === 1) {
-					$groupName = $this->_groups->getByNameByID($release['groupid']);
-					$oldCatName = $this->category->getNameByID($release['categoryid']);
-					$newCatName = $this->category->getNameByID($determinedCategory);
-
-					if ($type === "PAR2, ") {
-						echo PHP_EOL;
-					}
-
-					echo
-						$this->pdo->log->headerOver("\nNew name:  ") .
-						$this->pdo->log->primary(substr($newName, 0, 255)) .
-						$this->pdo->log->headerOver("Old name:  ") .
-						$this->pdo->log->primary($release["searchname"]) .
-						$this->pdo->log->headerOver("Use name:  ") .
-						$this->pdo->log->primary($release["name"]) .
-						$this->pdo->log->headerOver("New cat:   ") .
-						$this->pdo->log->primary($newCatName) .
-						$this->pdo->log->headerOver("Old cat:   ") .
-						$this->pdo->log->primary($oldCatName) .
-						$this->pdo->log->headerOver("Group:     ") .
-						$this->pdo->log->primary($groupName) .
-						$this->pdo->log->headerOver("Method:    ") .
-						$this->pdo->log->primary($type . $method) .
-						$this->pdo->log->headerOver("ReleaseID: ") .
-						$this->pdo->log->primary($release["releaseid"]);
-					if (isset($release['filename']) && $release['filename'] != "") {
-						echo
-							$this->pdo->log->headerOver("Filename:  ") .
-							$this->pdo->log->primary($release["filename"]);
-					}
-
-					if ($type !== "PAR2, ") {
-						echo "\n";
-					}
-				}
-
-				$newTitle = $this->pdo->escapeString(substr($newName, 0, 255));
-
-				if ($echo == 1) {
-					if ($nameStatus == 1) {
-						$status = '';
-						switch ($type) {
-							case "NFO, ":
-								$status = "isrenamed = 1, iscategorized = 1, proc_nfo = 1,";
-								break;
-							case "PAR2, ":
-								$status = "isrenamed = 1, iscategorized = 1, proc_par2 = 1,";
-								break;
-							case "Filenames, ":
-							case "file matched source: ":
-								$status = "isrenamed = 1, iscategorized = 1, proc_files = 1,";
-								break;
-							case "SHA1, ":
-							case "MD5, ":
-								$status = "isrenamed = 1, iscategorized = 1, dehashstatus = 1,";
-								break;
-							case "PreDB FT Exact, ":
-								$status = "isrenamed = 1, iscategorized = 1,";
-								break;
-							case "sorter ":
-								$status = "isrenamed = 1, iscategorized = 1, proc_sorter = 1,";
-								break;
-						}
-						$this->pdo->queryExec(
-							sprintf('
-								UPDATE releases
-								SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL,
-									tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL,
-									consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL, prehashid = %d,
-									searchname = %s, %s categoryid = %d
-								WHERE id = %d',
-								$preId,
-								$newTitle,
-								$status,
-								$determinedCategory,
-								$release['releaseid']
-							)
-						);
-						$this->sphinx->updateReleaseSearchName($release['releaseid'], $newTitle);
-					} else {
-						$newTitle = $this->pdo->escapeString(substr($newName, 0, 255));
-						$this->pdo->queryExec(
-							sprintf('
-								UPDATE releases
-								SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL,
-									tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL,
-									consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL, prehashid = %d,
-									searchname = %s, iscategorized = 1, categoryid = %d
-								WHERE id = %d',
-								$preId,
-								$newTitle,
-								$determinedCategory,
-								$release['releaseid']
-							)
-						);
-						$this->sphinx->updateReleaseSearchName($release['releaseid'], $newTitle);
-					}
-				}
-			}
-		}
-		$this->done = true;
-	}
-
-	/**
-	 * Echo a updated release name to CLI.
-	 *
-	 * @param array $data
-	 *        array(
-	 *              'new_name'     => (string) The new release search name.
-	 *              'old_name'     => (string) The old release search name.
-	 *              'new_category' => (string) The new category name or id for the release.
-	 *              'old_category' => (string) The old category name or id for the release.
-	 *              'group'        => (string) The group name or id of the release.
-	 *              'release_id'   => (int)    The id of the release.
-	 *              'method'       => (string) The method used to rename the release.
-	 *        )
-	 *
-	 * @access public
-	 * @static
-	 * @void
-	 */
-	public static function echoChangedReleaseName(array $data =
-												  array(
-													  'new_name'     => '',
-													  'old_name'     => '',
-													  'new_category' => '',
-													  'old_category' => '',
-													  'group'        => '',
-													  'release_id'   => 0,
-													  'method'       => ''
-												  )
-	) {
-		echo
-			PHP_EOL .
-			ColorCLI::headerOver('New name:     ') . ColorCLI::primaryOver($data['new_name']) . PHP_EOL .
-			ColorCLI::headerOver('Old name:     ') . ColorCLI::primaryOver($data['old_name']) . PHP_EOL .
-			ColorCLI::headerOver('New category: ') . ColorCLI::primaryOver($data['new_category']) . PHP_EOL .
-			ColorCLI::headerOver('Old category: ') . ColorCLI::primaryOver($data['old_category']) . PHP_EOL .
-			ColorCLI::headerOver('Group:        ') . ColorCLI::primaryOver($data['group']) . PHP_EOL .
-			ColorCLI::headerOver('Release id:   ') . ColorCLI::primaryOver($data['release_id']) . PHP_EOL .
-			ColorCLI::headerOver('Method:       ') . ColorCLI::primaryOver($data['method']) . PHP_EOL;
-	}
-
-	// Match a PreDB title to a release name or searchname using an exact full-text match
-	public function matchPredbFT($pre, $echo, $namestatus, $echooutput, $show)
-	{
-		$matching = $total = 0;
-
-		$join = $this->_preFTsearchQuery($pre['title']);
-
-		//Find release matches with fulltext and then identify exact matches with cleaned LIKE string
-		$res = $this->pdo->queryDirect(
-			sprintf("
-							SELECT r.id AS releaseid, r.name, r.searchname,
-								r.groupid, r.categoryid
-							FROM releases r
-							%1\$s
-							AND (r.name %2\$s OR r.searchname %2\$s)
-							AND r.prehashid = 0
-							LIMIT 21",
-				$join,
-				$this->pdo->likeString($pre['title'], true, true)
-			)
-		);
-
-		if ($res !== false) {
-			$total = $res->rowCount();
-		}
-
-		// Run if row count is positive, but do not run if row count exceeds 10 (as this is likely a failed title match)
-		if ($total > 0 && $total <= 15 && $res instanceof Traversable) {
-			foreach ($res as $row) {
-				if ($pre['title'] !== $row['searchname']) {
-					$this->updateRelease($row, $pre['title'], $method = "Title Match source: " . $pre['source'], $echo, "PreDB FT Exact, ", $namestatus, $show, $pre['prehashid']);
-					$matching++;
-				} else {
-					$this->_updateSingleColumn('prehashid', $pre['prehashid'], $row['releaseid']);
-				}
-			}
-		} elseif ($total >= 16) {
-			$matching = -1;
-		}
-		return $matching;
-	}
-
-	protected function _preFTsearchQuery($preTitle)
-	{
-		switch (NN_RELEASE_SEARCH_TYPE) {
-			case \ReleaseSearch::SPHINX:
-				$titlematch = \SphinxSearch::escapeString($preTitle);
-				$join = sprintf(
-					'INNER JOIN releases_se rse ON rse.id = r.id
-						WHERE rse.query = "@(name,searchname) %s;mode=extended"',
-					$titlematch
-				);
-				break;
-			case ReleaseSearch::FULLTEXT:
-			default:
-				//Remove all non-printable chars from PreDB title
-				preg_match_all('#[a-zA-Z0-9]{3,}#', $preTitle, $matches, PREG_PATTERN_ORDER);
-				$titlematch = '+' . implode(' +', $matches[0]);
-				$join = sprintf(
-					"INNER JOIN releasesearch rs ON rs.releaseid = r.id
-					WHERE
-							(MATCH (rs.name) AGAINST ('%1\$s' IN BOOLEAN MODE)
-							OR MATCH (rs.searchname) AGAINST ('%1\$s' IN BOOLEAN MODE))",
-					$titlematch
-				);
-				break;
-		}
-		return $join;
-	}
-
-	public function getPreFileNames($args = array())
-	{
-		$timestart = time();
-		$counter = $counted = 0;
-		$limit = $orderby = '';
-		$show = (isset($args[2]) && $args[2] === 'show') ? 1 : 0;
-
-		if (isset($args[1]) && is_numeric($args[1])) {
-			$orderby = "ORDER BY r.id DESC";
-			$limit = "LIMIT " . $args[1];
-		}
-
-		echo $this->pdo->log->header("\nMatch PreFiles (${args[1]}) Started at " . date('g:i:s'));
-		echo $this->pdo->log->primary("Matching predb filename to cleaned releasefiles.name.\n");
-
-		$query = $this->pdo->queryDirect(
-			sprintf('
-							SELECT r.id AS releaseid, r.name, r.searchname,
-								r.groupid, r.categoryid,
-								rf.name AS filename
-							FROM releases r
-							INNER JOIN releasefiles rf ON r.id = rf.releaseid
-							AND rf.name IS NOT NULL
-							WHERE r.prehashid = 0
-							GROUP BY r.id
-							%s %s',
-				$orderby,
-				$limit
-			)
-		);
-
-		if ($query !== false){
-
-			$total = $query->rowCount();
-
-			if ($total > 0 && $query instanceof Traversable) {
-
-				echo $this->pdo->log->header("\n" . number_format($total) . ' releases to process.');
-
-				foreach ($query as $row) {
-					$success = $this->matchPredbFiles($row, 1, 1, true, $show);
-					if ($success === 1) {
-						$counted++;
-					}
-					if ($show === 0) {
-						$this->consoletools->overWritePrimary("Renamed Releases: [" . number_format($counted) . "] " . $this->consoletools->percentString(++$counter, $total));
-					}
-				}
-				echo $this->pdo->log->header("\nRenamed " . number_format($counted) . " releases in " . $this->consoletools->convertTime(TIME() - $timestart) . ".");
-			} else {
-				echo $this->pdo->log->info("\nNothing to do.");
-			}
-		}
-	}
-
-	// Match a release filename to a PreDB filename or title.
-	public function matchPredbFiles($release, $echo, $namestatus, $echooutput, $show)
-	{
-		$matching = 0;
-		$this->_fileName = $this->_cleanMatchFiles($release['filename']);
-		$pre = false;
-
-		if ($this->_fileName !== '') {
-			$pre = $this->pdo->queryOneRow(
-				sprintf('
-							SELECT id AS prehashid, title, source
-							FROM prehash
-							WHERE filename = %s
-							OR title = %1$s',
-					$this->pdo->escapeString($this->_fileName)
-				)
-			);
-		}
-
-		if (isset($pre) && $pre !== false) {
-			if ($pre['title'] !== $release['searchname']) {
-				$this->updateRelease($release, $pre['title'], $method = "file matched source: " . $pre['source'], $echo, "PreDB file match, ", $namestatus, $show, $pre['prehashid']);
-			} else {
-				$this->_updateSingleColumn('prehashid', $pre['prehashid'], $release['releaseid']);
-			}
-			$matching++;
-		}
-		return $matching;
-	}
-
-	// Cleans file names for PreDB Match
-	protected function _cleanMatchFiles($fileName = '')
-	{
-
-		// first strip all non-printing chars  from filename
-		$this->_fileName = $this->utility->stripNonPrintingChars($fileName);
-
-		if (strlen($this->_fileName) !== false && strlen($this->_fileName) > 0 && strpos($this->_fileName, '.') !== 0) {
-			switch (true) {
-
-				case strpos($this->_fileName, '.') !== false:
-					//some filenames start with a period that ends up creating bad matches so we don't process them
-					$this->_fileName = $this->utility->cutStringUsingLast('.', $this->_fileName, "left", false);
-					continue;
-
-				//if filename has a .part001, send it back to the function to cut the next period
-				case preg_match('/\.part\d+$/', $this->_fileName):
-					$this->_fileName = $this->utility->cutStringUsingLast('.', $this->_fileName, "left", false);
-					continue;
-
-				//if filename has a .vol001, send it back to the function to cut the next period
-				case preg_match('/\.vol\d+(\+\d+)?$/', $this->_fileName):
-					$this->_fileName = $this->utility->cutStringUsingLast('.', $this->_fileName, "left", false);
-					continue;
-
-				//if filename contains a slash, cut the string and keep string to the right of the last slash to remove dir
-				case strpos($this->_fileName, '\\') !== false:
-					$this->_fileName = $this->utility->cutStringUsingLast('\\', $this->_fileName, "right", false);
-					continue;
-
-				// A lot of obscured releases have one NFO file properly named with a track number (Audio) at the front of it
-				// This will strip out the track and match it to its pre title
-				case preg_match('/^\d{2}-/', $this->_fileName):
-					$this->_fileName = preg_replace('/^\d{2}-/', '', $this->_fileName);
-			}
-			return trim($this->_fileName);
-		}
-	}
-
-	// Match a Hash from the predb to a release.
-	public function matchPredbHash($hash, $release, $echo, $namestatus, $echooutput, $show)
-	{
-		$pdo = $this->pdo;
-		$matching = 0;
-		$this->matched = false;
-
-		// Determine MD5 or SHA1
-		if (strlen($hash) === 40) {
-			$hashtype = "SHA1, ";
-		} else {
-			$hashtype = "MD5, ";
-		}
-
-		$row = $pdo->queryOneRow(
-			sprintf("
-						SELECT p.id AS prehashid, p.title, p.source
-						FROM prehash p INNER JOIN predbhash h ON h.pre_id = p.id
-						WHERE MATCH (h.hashes) AGAINST (%s)
-						LIMIT 1",
-				$pdo->escapeString(strtolower($hash))
-			)
-		);
-
-		if ($row !== false) {
-			if ($row["title"] !== $release["searchname"]) {
-				$this->updateRelease($release, $row["title"], $method = "predb hash release name: " . $row["source"], $echo, $hashtype, $namestatus, $show, $row['prehashid']);
-				$matching++;
-			}
-		} else {
-			$this->_updateSingleColumn('dehashstatus', $release['dehashstatus'] - 1, $release['releaseid']);
-		}
-		return $matching;
-	}
-
-	//  Check the array using regex for a clean name.
-	public function checkName($release, $echo, $type, $namestatus, $show, $preid = false)
-	{
-		// Get pre style name from releases.name
-		if (preg_match_all(self::PREDB_REGEX, $release['textstring'], $matches) && !preg_match('/Source\s\:/i', $release['textstring'])) {
-			foreach ($matches as $match) {
-				foreach ($match as $val) {
-					$title = $this->pdo->queryOneRow("SELECT title, id from prehash WHERE title = " . $this->pdo->escapeString(trim($val)));
-					if ($title !== false) {
-						$this->updateRelease($release, $title['title'], $method = "preDB: Match", $echo, $type, $namestatus, $show, $title['id']);
-						$preid = true;
-					}
-				}
-			}
-		}
-
-		// if only processing for PreDB match skip to return
-		if ($preid !== true) {
-
-			switch ($type) {
-				case "PAR2, ":
-					$this->fileCheck($release, $echo, $type, $namestatus, $show);
-					break;
-				case "NFO, ":
-					$this->nfoCheckTV($release, $echo, $type, $namestatus, $show);
-					$this->nfoCheckMov($release, $echo, $type, $namestatus, $show);
-					$this->nfoCheckMus($release, $echo, $type, $namestatus, $show);
-					$this->nfoCheckTY($release, $echo, $type, $namestatus, $show);
-					$this->nfoCheckG($release, $echo, $type, $namestatus, $show);
-					continue;
-				case "Filenames, ":
-					$this->fileCheck($release, $echo, $type, $namestatus, $show);
-					continue;
-				default:
-					$this->tvCheck($release, $echo, $type, $namestatus, $show);
-					$this->movieCheck($release, $echo, $type, $namestatus, $show);
-					$this->gameCheck($release, $echo, $type, $namestatus, $show);
-					$this->appCheck($release, $echo, $type, $namestatus, $show);
-			}
-
-			// set NameFixer process flags after run
-			if ($namestatus == 1 && $this->matched === false) {
-				switch ($type) {
-					case  "NFO, ":
-						$this->_updateSingleColumn('proc_nfo', self::PROC_NFO_DONE, $release['releaseid']);
-						break;
-					case "Filenames, ":
-						$this->_updateSingleColumn('proc_files', self::PROC_FILES_DONE, $release['releaseid']);
-						break;
-					case "PAR2, ":
-						$this->_updateSingleColumn('proc_par2', self::PROC_FILES_DONE, $release['releaseid']);
-						break;
-				}
-			}
-		}
-
-		return $this->matched;
-	}
-
-	/** This function updates a single variable column in releases
-	 *  The first parameter is the column to update, the second is the value
-	 *  The final parameter is the id of the release to update
-	 *
-	 * @param string $column
-	 * @param string|int $status
-	 * @param int $id
-	 **/
-	private function _updateSingleColumn($column = '', $status = 0, $id = 0)
-	{
-		if ($column !== '' && $id !== 0) {
-			$this->pdo->queryExec(
-				sprintf('
-							UPDATE releases
-							SET %s = %s
-							WHERE id = %d',
-					$column,
-					(is_numeric($status) ? $status : $this->pdo->escapeString($status)),
-					$id
-				)
-			);
-		}
-	}
-
-	//  Look for a TV name.
-	public function tvCheck($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|(?<!\d)[S|]\d{1,2}[E|x]\d{1,}(?!\d)|ep[._ -]?\d{2})[-\w.\',;.()]+(BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -][-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.Text.source.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[-\w.\',;& ]+((19|20)\d\d)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.Text.year.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[-\w.\',;& ]+(480|720|1080)[ip][._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.Text.resolution.source.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.source.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](480|720|1080)[ip][._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.acodec.source.res.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[-\w.\',;& ]+((19|20)\d\d)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.SxxExx.resolution.source.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -]((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Title.year.###(season/episode).source.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w(19|20)\d\d[._ -]\d{2}[._ -]\d{2}[._ -](IndyCar|NBA|NCW(T|Y)S|NNS|NSCS?)([._ -](19|20)\d\d)?[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "tvCheck: Sports", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Look for a movie name.
-	public function movieCheck($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[-\w.\',;& ]+(480|720|1080)[ip][._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.Text.res.vcod.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[._ -](480|720|1080)[ip][-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.source.vcodec.res.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.source.vcodec.acodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+(Brazilian|Chinese|Croatian|Danish|Deutsch|Dutch|Estonian|English|Finnish|Flemish|Francais|French|German|Greek|Hebrew|Icelandic|Italian|Japenese|Japan|Japanese|Korean|Latin|Nordic|Norwegian|Polish|Portuguese|Russian|Serbian|Slovenian|Swedish|Spanisch|Spanish|Thai|Turkish)[._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.language.acodec.source.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -](480|720|1080)[ip][._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.resolution.source.acodec.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -](480|720|1080)[ip][._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.resolution.source.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](480|720|1080)[ip][._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.source.resolution.acodec.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -](480|720|1080)[ip][._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.resolution.acodec.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/[-\w.\',;& ]+((19|20)\d\d)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BR(RIP)?|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](480|720|1080)[ip][._ -][-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.source.res.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((19|20)\d\d)[._ -][-\w.\',;& ]+[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BR(RIP)?|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.year.eptitle.source.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+(480|720|1080)[ip][._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.resolution.source.acodec.vcodec.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+(480|720|1080)[ip][._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[-\w.\',;& ]+(BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -]((19|20)\d\d)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.resolution.acodec.eptitle.source.year.group", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+(Brazilian|Chinese|Croatian|Danish|Deutsch|Dutch|Estonian|English|Finnish|Flemish|Francais|French|German|Greek|Hebrew|Icelandic|Italian|Japenese|Japan|Japanese|Korean|Latin|Nordic|Norwegian|Polish|Portuguese|Russian|Serbian|Slovenian|Swedish|Spanisch|Spanish|Thai|Turkish)[._ -]((19|20)\d\d)[._ -](AAC( LC)?|AC-?3|DD5([._ -]1)?|(A_)?DTS-?(HD)?|Dolby( ?TrueHD)?|MP3|TrueHD)[._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "movieCheck: Title.language.year.acodec.src", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Look for a game name.
-	public function gameCheck($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/\w[-\w.\',;& ]+(ASIA|DLC|EUR|GOTY|JPN|KOR|MULTI\d{1}|NTSCU?|PAL|RF|Region[._ -]?Free|USA|XBLA)[._ -](DLC[._ -]Complete|FRENCH|GERMAN|MULTI\d{1}|PROPER|PSN|READ[._ -]?NFO|UMD)?[._ -]?(GC|NDS|NGC|PS3|PSP|WII|XBOX(360)?)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "gameCheck: Videogames 1", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+(GC|NDS|NGC|PS3|WII|XBOX(360)?)[._ -](DUPLEX|iNSOMNi|OneUp|STRANGE|SWAG|SKY)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "gameCheck: Videogames 2", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[\w.\',;-].+-OUTLAWS/i', $release["textstring"], $result)) {
-				$result = str_replace("OUTLAWS", "PC GAME OUTLAWS", $result['0']);
-				$this->updateRelease($release, $result["0"], $method = "gameCheck: PC Games -OUTLAWS", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[\w.\',;-].+\-ALiAS/i', $release["textstring"], $result)) {
-				$newresult = str_replace("-ALiAS", " PC GAME ALiAS", $result['0']);
-				$this->updateRelease($release, $newresult, $method = "gameCheck: PC Games -ALiAS", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Look for a app name.
-	public function appCheck($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/\w[-\w.\',;& ]+(\d{1,10}|Linux|UNIX)[._ -](RPM)?[._ -]?(X64)?[._ -]?(Incl)[._ -](Keygen)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "appCheck: Apps 1", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+\d{1,8}[._ -](winall-freeware)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "appCheck: Apps 2", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	/*
-	 * Just for NFOS.
-	 */
-
-	//  TV.
-	public function nfoCheckTV($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/:\s*.*[\\\\\/]([A-Z0-9].+?S\d+[.-_ ]?[ED]\d+.+?)\.\w{2,}\s+/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["1"], $method = "nfoCheck: Generic TV 1", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/(?:(\:\s{1,}))(.+?S\d{1,3}[.-_ ]?[ED]\d{1,3}.+?)(\s{2,}|\r|\n)/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["2"], $method = "nfoCheck: Generic TV 2", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Movies.
-	public function nfoCheckMov($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/(?:((?<!Source\s)\:\s{1,}))(.+?(19|20)\d\d.+?(BDRip|bluray|DVD(R|Rip)?|XVID).+?)(\s{2,}|\r|\n)/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["2"], $method = "nfoCheck: Generic Movies 1", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/(?:(\s{2,}))((?!Source).+?[\.\-_ ](19|20)\d\d.+?(BDRip|bluray|DVD(R|Rip)?|XVID).+?)(\s{2,}|\r|\n)/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["2"], $method = "nfoCheck: Generic Movies 2", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/(?:(\s{2,}))(.+?[\.\-_ ](NTSC|MULTi).+?(MULTi|DVDR)[\.\-_ ].+?)(\s{2,}|\r|\n)/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["2"], $method = "nfoCheck: Generic Movies 3", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Music.
-	public function nfoCheckMus($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/(?:\s{2,})(.+?-FM-\d{2}-\d{2})/i', $release["textstring"], $result)) {
-				$newname = str_replace('-FM-', '-FM-Radio-MP3-', $result["1"]);
-				$this->updateRelease($release, $newname, $method = "nfoCheck: Music FM RADIO", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Title (year)
-	public function nfoCheckTY($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-			if (preg_match('/(\w[-\w`~!@#$%^&*()_+={}|"<>?\[\]\\;\',.\/ ]+\s?\((19|20)\d\d\))/i', $release["textstring"], $result) && !preg_match('/\.pdf|Audio ?Book/i', $release["textstring"])) {
-				$releasename = $result[0];
-				if (preg_match('/(idiomas|lang|language|langue|sprache).*?\b(?P<lang>Brazilian|Chinese|Croatian|Danish|DE|Deutsch|Dutch|Estonian|ES|English|Englisch|Finnish|Flemish|Francais|French|FR|German|Greek|Hebrew|Icelandic|Italian|Japenese|Japan|Japanese|Korean|Latin|Nordic|Norwegian|Polish|Portuguese|Russian|Serbian|Slovenian|Swedish|Spanisch|Spanish|Thai|Turkish)\b/i', $release["textstring"], $result)) {
-
-					switch ($result['lang']) {
-						case 'DE':
-							$result['lang'] = 'DUTCH';
-							break;
-						case 'Englisch':
-							$result['lang'] = 'ENGLISH';
-							break;
-						case 'FR':
-							$result['lang'] = 'FRENCH';
-							break;
-						case 'ES':
-							$result['lang'] = 'SPANISH';
-							break;
-						default:
-							break;
-					}
-					$releasename = $releasename . "." . $result['lang'];
-				}
-				if (preg_match('/(frame size|(video )?res(olution)?|video).*?(?P<res>(272|336|480|494|528|608|\(?640|688|704|720x480|810|816|820|1 ?080|1280( \@)?|1 ?920(x1080)?))/i', $release["textstring"], $result)) {
-
-					switch ($result['res']) {
-						case '272':
-						case '336':
-						case '480':
-						case '494':
-						case '608':
-						case '640':
-						case '(640':
-						case '688':
-						case '704':
-						case '720x480':
-							$result['res'] = '480p';
-							break;
-						case '1280x720':
-						case '1280':
-						case '1280 @':
-							$result['res'] = '720p';
-							break;
-						case '810':
-						case '816':
-						case '820':
-						case '1920':
-						case '1 920':
-						case '1080':
-						case '1 080':
-						case '1920x1080':
-							$result['res'] = '1080p';
-							break;
-					}
-
-					$releasename = $releasename . "." . $result['res'];
-				}
-				else if (preg_match('/(largeur|width).*?(?P<res>(\(?640|688|704|720|1280( \@)?|1 ?920))/i', $release["textstring"], $result)) {
-
-					switch ($result['res']) {
-						case '640':
-						case '(640':
-						case '688':
-						case '704':
-						case '720':
-							$result['res'] = '480p';
-							break;
-						case '1280 @':
-						case '1280':
-							$result['res'] = '720p';
-							break;
-						case '1920':
-						case '1 920':
-							$result['res'] = '1080p';
-							break;
-					}
-
-					$releasename = $releasename . "." . $result['res'];
-				}
-				if (preg_match('/source.*?\b(?P<source>BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)\b/i', $release["textstring"], $result)) {
-
-					switch ($result['source']) {
-						case 'BD':
-							$result['source'] = 'Bluray.x264';
-							break;
-						case 'CAMRIP':
-							$result['source'] = 'CAM';
-							break;
-						case 'DBrip':
-							$result['source'] = 'BDRIP';
-							break;
-						case 'DVD R1':
-						case 'NTSC':
-						case 'PAL':
-						case 'VOD':
-							$result['source'] = 'DVD';
-							break;
-						case 'HD':
-							$result['source'] = 'HDTV';
-							break;
-						case 'Ripped ':
-							$result['source'] = 'DVDRIP';
-					}
-
-					$releasename = $releasename . "." . $result['source'];
-				}
-				else if (preg_match('/(codec( (name|code))?|(original )?format|res(olution)|video( (codec|format|res))?|tv system|type|writing library).*?\b(?P<video>AVC|AVI|DBrip|DIVX|\(Divx|DVD|[HX][._ -]?264|MPEG-4 Visual|NTSC|PAL|WMV|XVID)\b/i', $release["textstring"], $result)) {
-
-					switch ($result['video']) {
-						case 'AVI':
-							$result['video'] = 'DVDRIP';
-							break;
-						case 'DBrip':
-							$result['video'] = 'BDRIP';
-							break;
-						case '(Divx':
-							$result['video'] = 'DIVX';
-							break;
-						case 'h264':
-						case 'h-264':
-						case 'h.264':
-							$result['video'] = 'H264';
-							break;
-						case 'MPEG-4 Visual':
-						case 'x264':
-						case 'x-264':
-						case 'x.264':
-							$result['video'] = 'x264';
-							break;
-						case 'NTSC':
-						case 'PAL':
-							$result['video'] = 'DVD';
-							break;
-					}
-
-					$releasename = $releasename . "." . $result['video'];
-				}
-				if (preg_match('/(audio( format)?|codec( name)?|format).*?\b(?P<audio>0x0055 MPEG-1 Layer 3|AAC( LC)?|AC-?3|\(AC3|DD5(.1)?|(A_)?DTS-?(HD)?|Dolby(\s?TrueHD)?|TrueHD|FLAC|MP3)\b/i', $release["textstring"], $result)) {
-
-					switch ($result['audio']) {
-						case '0x0055 MPEG-1 Layer 3':
-							$result['audio'] = 'MP3';
-							break;
-						case 'AC-3':
-						case '(AC3':
-							$result['audio'] = 'AC3';
-							break;
-						case 'AAC LC':
-							$result['audio'] = 'AAC';
-							break;
-						case 'A_DTS':
-						case 'DTS-HD':
-						case 'DTSHD':
-							$result['audio'] = 'DTS';
-					}
-					$releasename = $releasename . "." . $result['audio'];
-				}
-				$releasename = $releasename . "-NoGroup";
-				$this->updateRelease($release, $releasename, $method = "nfoCheck: Title (Year)", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	//  Games.
-	public function nfoCheckG($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/ALiAS|BAT-TEAM|FAiRLiGHT|Game Type|Glamoury|HI2U|iTWINS|JAGUAR|(LARGE|MEDIUM)ISO|MAZE|nERv|PROPHET|PROFiT|PROCYON|RELOADED|REVOLVER|ROGUE|ViTALiTY/i', $release["textstring"])) {
-
-				if (preg_match('/\w[\w.+&*\/\()\',;: -]+\(c\)[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-					$releasename = str_replace(array("(c)", "(C)"), "(GAMES) (c)", $result['0']);
-					$this->updateRelease($release, $releasename, $method = "nfoCheck: PC Games (c)", $echo, $type, $namestatus, $show);
-				} else if (preg_match('/\w[\w.+&*\/()\',;: -]+\*ISO\*/i', $release["textstring"], $result)) {
-					$releasename = str_replace("*ISO*", "*ISO* (PC GAMES)", $result['0']);
-					$this->updateRelease($release, $releasename, $method = "nfoCheck: PC Games *ISO*", $echo, $type, $namestatus, $show);
-				}
-			}
-		}
-	}
-
-	//  Misc.
-	public function nfoCheckMisc($release, $echo, $type, $namestatus, $show)
-	{
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/Supplier.+?IGUANA/i', $release["textstring"])) {
-				$releasename = '';
-				$result = array();
-				if (preg_match('/\w[-\w`~!@#$%^&*()+={}|:"<>?\[\]\\;\',.\/ ]+\s\((19|20)\d\d\)/i', $release["textstring"], $result)) {
-					$releasename = $result[0];
-				} else if (preg_match('/\s\[\*\] (English|Dutch|French|German|Spanish)\b/i', $release["textstring"], $result)) {
-					$releasename = $releasename . "." . $result[1];
-				} else if (preg_match('/\s\[\*\] (DT?S [2567][._ -][0-2]( MONO)?)\b/i', $release["textstring"], $result)) {
-					$releasename = $releasename . "." . $result[2];
-				} else if (preg_match('/Format.+(DVD(5|9|R)?|[HX][._ -]?264)\b/i', $release["textstring"], $result)) {
-					$releasename = $releasename . "." . $result[1];
-				} else if (preg_match('/\[(640x.+|1280x.+|1920x.+)\] Resolution\b/i', $release["textstring"], $result)) {
-					if ($result[1] == '640x.+') {
-						$result[1] = '480p';
-					} else if ($result[1] == '1280x.+') {
-						$result[1] = '720p';
-					} else if ($result[1] == '1920x.+') {
-						$result[1] = '1080p';
-					}
-					$releasename = $releasename . "." . $result[1];
-				}
-				$result = $releasename . ".IGUANA";
-				$this->updateRelease($release, $result, $method = "nfoCheck: IGUANA", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-
-	/*
-	 * Just for filenames.
-	 */
-
-	public function fileCheck($release, $echo, $type, $namestatus, $show)
-	{
-		$result = array();
-
-		if ($this->done === false && $this->relid !== $release["releaseid"]) {
-
-			if (preg_match('/^(.+?(x264|XviD)\-TVP)\\\\/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["1"], $method = "fileCheck: TVP", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/^(\\\\|\/)?(.+(\\\\|\/))*(.+?S\d{1,3}[.-_ ]?[ED]\d{1,3}.+)\.(.+)$/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["4"], $method = "fileCheck: Generic TV", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/^(\\\\|\/)?(.+(\\\\|\/))*(.+?([\.\-_ ]\d{4}[\.\-_ ].+?(BDRip|bluray|DVDRip|XVID)).+)\.(.+)$/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["4"], $method = "fileCheck: Generic movie 1", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/^([a-z0-9\.\-_]+(19|20)\d\d[a-z0-9\.\-_]+[\.\-_ ](720p|1080p|BDRip|bluray|DVDRip|x264|XviD)[a-z0-9\.\-_]+)\.[a-z]{2,}$/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["1"], $method = "fileCheck: Generic movie 2", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/(.+?([\.\-_ ](CD|FM)|[\.\-_ ]\dCD|CDR|FLAC|SAT|WEB).+?(19|20)\d\d.+?)\\\\.+/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["1"], $method = "fileCheck: Generic music", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/^(.+?(19|20)\d\d\-([a-z0-9]{3}|[a-z]{2,}|C4))\\\\/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["1"], $method = "fileCheck: music groups", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/.+\\\\(.+\((19|20)\d\d\)\.avi)/i', $release["textstring"], $result)) {
-				$newname = str_replace('.avi', ' DVDRip XVID NoGroup', $result["1"]);
-				$this->updateRelease($release, $newname, $method = "fileCheck: Movie (year) avi", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/.+\\\\(.+\((19|20)\d\d\)\.iso)/i', $release["textstring"], $result)) {
-				$newname = str_replace('.iso', ' DVD NoGroup', $result["1"]);
-				$this->updateRelease($release, $newname, $method = "fileCheck: Movie (year) iso", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/^(.+?IMAGESET.+?)\\\\.+/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["1"], $method = "fileCheck: XXX Imagesets", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+1080i[._ -]DD5[._ -]1[._ -]MPEG2-R&C(?=\.ts)/i', $release["textstring"], $result)) {
-				$result = str_replace("MPEG2", "MPEG2.HDTV", $result["0"]);
-				$this->updateRelease($release, $result, $method = "fileCheck: R&C", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[._ -](480|720|1080)[ip][._ -](BD(-?(25|50|RIP))?|Blu-?Ray ?(3D)?|BRRIP|CAM(RIP)?|DBrip|DTV|DVD\-?(5|9|(R(IP)?|scr(eener)?))?|[HPS]D?(RIP|TV(RIP)?)?|NTSC|PAL|R5|Ripped |S?VCD|scr(eener)?|SAT(RIP)?|TS|VHS(RIP)?|VOD|WEB-DL)[._ -]nSD[._ -](DivX|[HX][._ -]?264|MPEG2|XviD(HD)?|WMV)[._ -]NhaNC3[-\w.\',;& ]+\w/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "fileCheck: NhaNc3", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\wtvp-[\w.\-\',;]+((s\d{1,2}[._ -]?[bde]\d{1,2})|\d{1,2}x\d{2}|ep[._ -]?\d{2})[._ -](720p|1080p|xvid)(?=\.(avi|mkv))/i', $release["textstring"], $result)) {
-				$result = str_replace("720p", "720p.HDTV.X264", $result['0']);
-				$result = str_replace("1080p", "1080p.Bluray.X264", $result['0']);
-				$result = str_replace("xvid", "XVID.DVDrip", $result['0']);
-				$this->updateRelease($release, $result, $method = "fileCheck: tvp", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+\d{3,4}\.hdtv-lol\.(avi|mp4|mkv|ts|nfo|nzb)/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "fileCheck: Title.211.hdtv-lol.extension", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w[-\w.\',;& ]+-S\d{1,2}[EX]\d{1,2}-XVID-DL.avi/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "fileCheck: Title-SxxExx-XVID-DL.avi", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\S.*[\w.\-\',;]+\s\-\ss\d{2}[ex]\d{2}\s\-\s[\w.\-\',;].+\./i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "fileCheck: Title - SxxExx - Eptitle", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w.+?\)\.nds/i', $release["textstring"], $result)) {
-				$this->updateRelease($release, $result["0"], $method = "fileCheck: ).nds Nintendo DS", $echo, $type, $namestatus, $show);
-			} else if (preg_match('/\w.+?\.(epub|mobi|azw|opf|fb2|prc|djvu|cb[rz])/i', $release["textstring"], $result)) {
-				$result = str_replace("." . $result["1"], " (" . $result["1"] . ")", $result['0']);
-				$this->updateRelease($release, $result, $method = "fileCheck: EBook", $echo, $type, $namestatus, $show);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/nzbcontents.php b/lib/nzbcontents.php
deleted file mode 100644
index d8ea29eff..000000000
--- a/lib/nzbcontents.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-require_once(WWW_DIR."/lib/framework/db.php");
-require_once(WWW_DIR."/lib/nntp.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR."/lib/Tmux.php");
-require_once(WWW_DIR . "/lib/util.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("Info.php");
-require_once("Pprocess.php");
-
-/**
- * Gets information contained within the NZB.
- *
- * Class NZBContents
- */
-Class NZBContents
-{
-	/**
-	 * @var DB
-	 * @access protected
-	 */
-	public $db;
-
-	/**
-	 * @var NNTP
-	 * @access protected
-	 */
-	protected $nntp;
-
-	/**
-	 * @var Info
-	 * @access protected
-	 */
-	protected $nfo;
-
-	/**
-	 * @var PProcess
-	 * @access protected
-	 */
-	protected $pp;
-
-	/**
-	 * @var NZB
-	 * @access protected
-	 */
-	protected $nzb;
-
-	/**
-	 * @var bool|stdClass
-	 * @access protected
-	 */
-	protected $site;
-
-	/**
-	 * @var bool
-	 * @access protected
-	 */
-	protected $lookuppar2;
-
-	/**
-	 * @var bool
-	 * @access protected
-	 */
-	protected $echooutput;
-
-	/**
-	 * Construct.
-	 *
-	 * @param array $options
-	 *     array(
-	 *         'Echo'        => bool        ; To echo to CLI or not.
-	 *         'NNTP'        => NNTP        ; Class NNTP.
-	 *         'Nfo'         => Nfo         ; Class Nfo.
-	 *         'NZB'         => NZB         ; Class NZB.
-	 *         'Settings'    => DB          ; Class DB.
-	 *         'PostProcess' => PostProcess ; Class PostProcess.
-	 *     )
-	 *
-	 * @access public
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'        => false,
-			'NNTP'        => null,
-			'Nfo'         => null,
-			'NZB'         => null,
-			'Settings'    => null,
-			'PostProcess' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo = ($options['Settings'] instanceof \DB ? $options['Settings'] : new \DB());
-		$this->nntp = ($options['NNTP'] instanceof \NNTP ? $options['NNTP'] : new \NNTP(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
-		$this->nfo = ($options['Nfo'] instanceof \Info ? $options['Nfo'] : new \Info(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
-		$this->pp = (
-		$options['PostProcess'] instanceof PProcess
-			? $options['PostProcess']
-			: new PProcess(['Echo' => $this->echooutput, 'Nfo' => $this->nfo, 'Settings' => $this->pdo])
-		);
-		$this->nzb = ($options['NZB'] instanceof \NZB ? $options['NZB'] : new \NZB($this->pdo));
-		$t = new Tmux();
-		$this->tmux = $t->get();
-		$s = new Sites();
-		$this->site = $s->get();
-		$this->lookuppar2 = ($this->tmux->lookuppar2 == 1 ? true : false);
-		$this->alternateNNTP = ($this->site->alternate_nntp == 1 ? true : false);
-	}
-
-	/**
-	 * Look for an .nfo file in the NZB, return the NFO message id.
-	 * Gets the NZB completion.
-	 * Looks for PAR2 files in the NZB.
-	 *
-	 * @param string $guid
-	 * @param string $relID
-	 * @param int    $groupID
-	 * @param string $groupName
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function getNfoFromNZB($guid, $relID, $groupID, $groupName)
-	{
-		$fetchedBinary = false;
-
-		$messageID = $this->parseNZB($guid, $relID, $groupID, true);
-		if ($messageID !== false) {
-			$fetchedBinary = $this->nntp->getMessages($groupName, $messageID['id'], $this->alternateNNTP);
-			if ($this->nntp->isError($fetchedBinary)) {
-				// NFO download failed, increment attempts.
-				$this->pdo->queryExec(sprintf('UPDATE releases SET nfostatus = nfostatus - 1 WHERE id = %d', $relID));
-				if ($this->echooutput) {
-					echo 'f';
-				}
-				return false;
-			}
-			if ($this->nfo->isNFO($fetchedBinary, $guid) === true) {
-				if ($this->echooutput) {
-					echo ($messageID['hidden'] === false ? '+' : '*');
-				}
-			} else {
-				if ($this->echooutput) {
-					echo '-';
-				}
-				$this->pdo->queryExec(sprintf('UPDATE releases SET nfostatus = %d WHERE id = %d', Info::NFO_NONFO, $relID));
-				$fetchedBinary = false;
-			}
-		} else {
-			if ($this->echooutput) {
-				echo '-';
-			}
-			$this->pdo->queryExec(sprintf('UPDATE releases SET nfostatus = %d WHERE id = %d', Info::NFO_NONFO, $relID));
-		}
-
-		return $fetchedBinary;
-	}
-
-	/**
-	 * Gets the completion from the NZB, optionally looks if there is an NFO/PAR2 file.
-	 *
-	 * @param string $guid
-	 * @param int    $relID
-	 * @param int    $groupID
-	 * @param bool   $nfoCheck
-	 *
-	 * @return array|bool
-	 *
-	 * @access public
-	 */
-	public function parseNZB($guid, $relID, $groupID, $nfoCheck = false)
-	{
-		$nzbFile = $this->LoadNZB($guid);
-		if ($nzbFile !== false) {
-			$messageID = $hiddenID = '';
-			$actualParts = $artificialParts = 0;
-			$foundPAR2 = ($this->lookuppar2 === false ? true : false);
-			$foundNFO = $hiddenNFO = ($nfoCheck === false ? true : false);
-
-			foreach ($nzbFile->file as $nzbcontents) {
-				foreach ($nzbcontents->segments->segment as $segment) {
-					$actualParts++;
-				}
-
-				$subject = (string)$nzbcontents->attributes()->subject;
-				if (preg_match('/(\d+)\)$/', $subject, $parts)) {
-					$artificialParts += $parts[1];
-				}
-
-				if ($foundNFO === false) {
-					if (preg_match('/\.\b(nfo|inf|ofn)\b(?![ .-])/i', $subject)) {
-						$messageID = (string)$nzbcontents->segments->segment;
-						$foundNFO = true;
-					}
-				}
-
-				if ($foundNFO === false && $hiddenNFO === false) {
-					if (preg_match('/\(1\/1\)$/i', $subject) &&
-						!preg_match('/\.(apk|bat|bmp|cbr|cbz|cfg|css|csv|cue|db|dll|doc|epub|exe|gif|htm|ico|idx|ini' .
-							'|jpg|lit|log|m3u|mid|mobi|mp3|nib|nzb|odt|opf|otf|par|par2|pdf|psd|pps|png|ppt|r\d{2,4}' .
-							'|rar|sfv|srr|sub|srt|sql|rom|rtf|tif|torrent|ttf|txt|vb|vol\d+\+\d+|wps|xml|zip)/i',
-							$subject))
-					{
-						$hiddenID = (string)$nzbcontents->segments->segment;
-						$hiddenNFO = true;
-					}
-				}
-
-				if ($foundPAR2 === false) {
-					if (preg_match('/\.(par[2" ]|\d{2,3}").+\(1\/1\)$/i', $subject)) {
-						if ($this->pp->parsePAR2((string)$nzbcontents->segments->segment, $relID, $groupID, $this->nntp, 1) === true) {
-							$this->pdo->queryExec(sprintf('UPDATE releases SET proc_par2 = 1 WHERE id = %d', $relID));
-							$foundPAR2 = true;
-						}
-					}
-				}
-			}
-
-			if ($artificialParts <= 0 || $actualParts <= 0) {
-				$completion = 0;
-			} else {
-				$completion = ($actualParts / $artificialParts) * 100;
-			}
-			if ($completion > 100) {
-				$completion = 100;
-			}
-
-			$this->pdo->queryExec(sprintf('UPDATE releases SET completion = %d WHERE id = %d', $completion, $relID));
-
-			if ($foundNFO === true && strlen($messageID) > 1) {
-				return array('hidden' => false, 'id' => $messageID);
-			} elseif ($hiddenNFO === true && strlen($hiddenID) > 1) {
-				return array('hidden' => true, 'id' => $hiddenID);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Decompress a NZB, load it into simplexml and return.
-	 *
-	 * @param string $guid Release guid.
-	 *
-	 * @return bool|SimpleXMLElement
-	 *
-	 * @access public
-	 */
-	public function LoadNZB($guid)
-	{
-		// Fetch the NZB location using the GUID.
-		$nzbPath = $this->nzb->getNZBPath($guid);
-		if ($nzbPath === false) {
-			if ($this->echooutput) {
-				echo PHP_EOL . $guid . ' appears to be missing the nzb file, skipping.' . PHP_EOL;
-			}
-			return false;
-		}
-		$utility = new Utility();
-		$nzbContents = $utility->unzipGzipFile($nzbPath);
-		if (!$nzbContents) {
-			if ($this->echooutput) {
-				echo
-					PHP_EOL .
-					'Unable to decompress: ' .
-					$nzbPath .
-					' - ' .
-					fileperms($nzbPath) .
-					' - may have bad file permissions, skipping.' .
-					PHP_EOL;
-			}
-			return false;
-		}
-
-		$nzbFile = @simplexml_load_string($nzbContents);
-		if (!$nzbFile) {
-			if ($this->echooutput) {
-				echo PHP_EOL . "Unable to load NZB: $guid appears to be an invalid NZB, skipping." . PHP_EOL;
-			}
-			return false;
-		}
-
-		return $nzbFile;
-	}
-
-	/**
-	 * Attempts to get the releasename from a par2 file
-	 *
-	 * @param string $guid
-	 * @param int    $relID
-	 * @param int    $groupID
-	 * @param int    $nameStatus
-	 * @param int    $show
-	 *
-	 * @return bool
-	 *
-	 * @access public
-	 */
-	public function checkPAR2($guid, $relID, $groupID, $nameStatus, $show)
-	{
-		$nzbFile = $this->LoadNZB($guid);
-		if ($nzbFile !== false) {
-			foreach ($nzbFile->file as $nzbContents) {
-				if (preg_match('/\.(par[2" ]|\d{2,3}").+\(1\/1\)$/i', (string)$nzbContents->attributes()->subject)) {
-					if ($this->pp->parsePAR2((string)$nzbContents->segments->segment, $relID, $groupID, $this->nntp, $show) === true && $nameStatus === 1) {
-						$this->pdo->queryExec(sprintf('UPDATE releases SET proc_par2 = 1 WHERE id = %d', $relID));
-
-						return true;
-					}
-				}
-			}
-		}
-		if ($nameStatus === 1) {
-			$this->pdo->queryExec(sprintf('UPDATE releases SET proc_par2 = 1 WHERE id = %d', $relID));
-		}
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/lib/postprocess_pre.php b/lib/postprocess_pre.php
deleted file mode 100644
index 1a56abcee..000000000
--- a/lib/postprocess_pre.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../bin/config.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("prehash.php");
-
-(new \PreHash(['Echo' => true]))->checkPre((isset($argv[1]) && is_numeric($argv[1]) ? $argv[1] : false));
\ No newline at end of file
diff --git a/lib/prehash.php b/lib/prehash.php
deleted file mode 100644
index ca3b30ea4..000000000
--- a/lib/prehash.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-require_once(WWW_DIR."lib/framework/db.php");
-require_once(WWW_DIR."lib/groups.php");
-require_once(WWW_DIR."lib/nfo.php");
-require_once(WWW_DIR."lib/site.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("nzbcontents.php");
-require_once("simple_html_dom.php");
-require_once("IRCScraper.php");
-require_once("Info.php");
-require_once("namefixer.php");
-
-/**
- * Class for inserting names/categories etc from PreDB sources into the DB,
- * also for matching names on files / subjects.
- *
- * Class PreDb
- */
-Class PreHash
-{
-	// Nuke status.
-	const PRE_NONUKE  = 0; // Pre is not nuked.
-	const PRE_UNNUKED = 1; // Pre was un nuked.
-	const PRE_NUKED   = 2; // Pre is nuked.
-	const PRE_MODNUKE = 3; // Nuke reason was modified.
-	const PRE_RENUKED = 4; // Pre was re nuked.
-	const PRE_OLDNUKE = 5; // Pre is nuked for being old.
-
-	/**
-	 * @var bool|stdClass
-	 */
-	protected $site;
-
-	/**
-	 * @var bool
-	 */
-	protected $echooutput;
-
-	/**
-	 * @var DB
-	 */
-	protected $pdo;
-
-	private $dateLimit;
-
-	/**
-	 * @param array $options
-	 */
-	public function __construct(array $options = array())
-	{
-		$defaults = [
-			'Echo'     => false,
-			'Settings' => null,
-		];
-		$options += $defaults;
-
-		$this->echooutput = ($options['Echo'] && NN_ECHOCLI);
-		$this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
-	}
-
-	/**
-	 * Attempts to match PreDB titles to releases.
-	 *
-	 * @param $dateLimit
-	 */
-	public function checkPre($dateLimit = false)
-	{
-		$this->dateLimit = $dateLimit;
-
-		$consoleTools = new ConsoleTools(['ColorCLI' => $this->pdo->log]);
-		$updated = 0;
-		$datesql = '';
-
-		if ($this->echooutput) {
-			echo $this->pdo->log->header('Querying DB for release search names not matched with PreDB titles.');
-		}
-
-		if ($this->dateLimit !== false && is_numeric($this->dateLimit)) {
-			$datesql = sprintf('AND DATEDIFF(NOW(), adddate) <= %d', $this->dateLimit);
-		}
-
-		$res = $this->pdo->queryDirect(
-			sprintf('
-							SELECT p.id AS prehashid, r.id AS releaseid
-							FROM prehash p
-							INNER JOIN releases r ON p.title = r.searchname
-							WHERE r.prehashid < 1 %s',
-				$datesql
-			)
-		);
-
-		if ($res !== false) {
-			$total = $res->rowCount();
-			echo $this->pdo->log->primary(number_format($total) . ' releases to match.');
-
-			if ($res instanceof Traversable) {
-				foreach ($res as $row) {
-					$this->pdo->queryExec(
-						sprintf('UPDATE releases SET prehashid = %d WHERE id = %d', $row['prehashid'], $row['releaseid'])
-					);
-
-					if ($this->echooutput) {
-						$consoleTools->overWritePrimary(
-							'Matching up preDB titles with release searchnames: ' . $consoleTools->percentString( ++$updated, $total)
-						);
-					}
-				}
-				if ($this->echooutput) {
-					echo PHP_EOL;
-				}
-			}
-
-			if ($this->echooutput) {
-				echo $this->pdo->log->header(
-					'Matched ' . number_format(($updated > 0) ? $updated : 0) . ' PreDB titles to release search names.'
-				);
-			}
-		}
-	}
-
-	/**
-	 * Try to match a single release to a PreDB title when the release is created.
-	 *
-	 * @param string $cleanerName
-	 *
-	 * @return array|bool Array with title/id from PreDB if found, bool False if not found.
-	 */
-	public function matchPre($cleanerName)
-	{
-		if ($cleanerName == '') {
-			return false;
-		}
-
-		$titleCheck = $this->pdo->queryOneRow(
-			sprintf('SELECT id FROM prehash WHERE title = %s LIMIT 1', $this->pdo->escapeString($cleanerName))
-		);
-
-		if ($titleCheck !== false) {
-			return array(
-				'title' => $cleanerName,
-				'prehashid' => $titleCheck['id']
-			);
-		}
-
-		// Check if clean name matches a PreDB filename.
-		$fileCheck = $this->pdo->queryOneRow(
-			sprintf('SELECT id, title FROM prehash WHERE filename = %s LIMIT 1', $this->pdo->escapeString($cleanerName))
-		);
-
-		if ($fileCheck !== false) {
-			return array(
-				'title' => $fileCheck['title'],
-				'prehashid' => $fileCheck['id']
-			);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Matches the hashes within the predb table to release files and subjects (names) which are hashed.
-	 *
-	 * @param $time
-	 * @param $echo
-	 * @param $cats
-	 * @param $namestatus
-	 * @param $show
-	 *
-	 * @return int
-	 */
-	public function parseTitles($time, $echo, $cats, $namestatus, $show)
-	{
-		$namefixer = new NameFixer(['Echo' => $this->echooutput, 'ConsoleTools' => $this->pdo->log, 'Settings' => $this->pdo]);
-		$consoletools = new ConsoleTools(['ColorCLI' => $this->pdo->log]);
-		$updated = $checked = 0;
-
-		$tq = '';
-		if ($time == 1) {
-			$tq = 'AND r.adddate > (NOW() - INTERVAL 3 HOUR) ORDER BY rf.releaseid, rf.size DESC';
-		}
-		$ct = '';
-		if ($cats == 1) {
-			$ct = 'AND r.categoryid IN (1090, 2020, 3050, 6050, 5050, 7050, 8010)';
-		}
-
-		if ($this->echooutput) {
-			$te = '';
-			if ($time == 1) {
-				$te = ' in the past 3 hours';
-			}
-			echo $this->pdo->log->header('Fixing search names' . $te . " using the predb hash.");
-		}
-		$regex = "AND (r.ishashed = 1 OR rf.ishashed = 1)";
-
-		if ($cats === 3) {
-			$query = sprintf('SELECT r.id AS releaseid, r.name, r.searchname, r.categoryid, r.groupid, '
-				. 'dehashstatus, rf.name AS filename FROM releases r '
-				. 'LEFT OUTER JOIN releasefiles rf ON r.id = rf.releaseid '
-				. 'WHERE nzbstatus = 1 AND dehashstatus BETWEEN -6 AND 0 AND prehashid = 0 %s', $regex);
-		} else {
-			$query = sprintf('SELECT r.id AS releaseid, r.name, r.searchname, r.categoryid, r.groupid, '
-				. 'dehashstatus, rf.name AS filename FROM releases r '
-				. 'LEFT OUTER JOIN releasefiles rf ON r.id = rf.releaseid '
-				. 'WHERE nzbstatus = 1 AND isrenamed = 0 AND dehashstatus BETWEEN -6 AND 0 %s %s %s', $regex, $ct, $tq);
-		}
-
-		$res = $this->pdo->queryDirect($query);
-		$total = $res->rowCount();
-		echo $this->pdo->log->primary(number_format($total) . " releases to process.");
-		if ($res instanceof Traversable) {
-			foreach ($res as $row) {
-				if (preg_match('/[a-fA-F0-9]{32,40}/i', $row['name'], $matches)) {
-					$updated = $updated + $namefixer->matchPredbHash($matches[0], $row, $echo, $namestatus, $this->echooutput, $show);
-				} else if (preg_match('/[a-fA-F0-9]{32,40}/i', $row['filename'], $matches)) {
-					$updated = $updated + $namefixer->matchPredbHash($matches[0], $row, $echo, $namestatus, $this->echooutput, $show);
-				}
-				if ($show === 2) {
-					$consoletools->overWritePrimary("Renamed Releases: [" . number_format($updated) . "] " . $consoletools->percentString(++$checked, $total));
-				}
-			}
-		}
-		if ($echo == 1) {
-			echo $this->pdo->log->header("\n" . $updated . " releases have had their names changed out of: " . number_format($checked) . " files.");
-		} else {
-			echo $this->pdo->log->header("\n" . $updated . " releases could have their names changed. " . number_format($checked) . " files were checked.");
-		}
-
-		return $updated;
-	}
-
-	/**
-	 * Get all PRE's in the DB.
-	 *
-	 * @param int    $offset  OFFSET
-	 * @param int    $offset2 LIMIT
-	 * @param string $search  Optional title search.
-	 *
-	 * @return array The row count and the query results.
-	 */
-	public function getAll($offset, $offset2, $search = '')
-	{
-		if ($search !== '') {
-			$search = explode(' ', trim($search));
-			if (count($search) > 1) {
-				$search = "LIKE '%" . implode("%' AND title LIKE '%", $search) . "%'";
-			} else {
-				$search = "LIKE '%" . $search[0] . "%'";
-			}
-			$search = 'WHERE title ' . $search;
-			$count = $this->pdo->queryOneRow(sprintf('SELECT COUNT(*) AS cnt FROM prehash %s', $search));
-			$count = $count['cnt'];
-		} else {
-			$count = $this->getCount();
-		}
-
-		$parr = $this->pdo->query(
-			sprintf('
-				SELECT p.*, r.guid
-				FROM prehash p
-				LEFT OUTER JOIN releases r ON p.id = r.prehashid %s
-				ORDER BY p.predate DESC LIMIT %d OFFSET %d',
-				$search,
-				$offset2,
-				$offset
-			)
-		);
-		return array('arr' => $parr, 'count' => $count);
-	}
-
-	/**
-	 * Get count of all PRE's.
-	 *
-	 * @return int
-	 */
-	public function getCount()
-	{
-		$count = $this->pdo->queryOneRow('SELECT COUNT(*) AS cnt FROM prehash');
-		return ($count === false ? 0 : $count['cnt']);
-	}
-
-	/**
-	 * Get all PRE's for a release.
-	 *
-	 * @param int $preID
-	 *
-	 * @return array
-	 */
-	public function getForRelease($preID)
-	{
-		return $this->pdo->query(sprintf('SELECT * FROM prehash WHERE id = %d', $preID));
-	}
-
-	/**
-	 * Return a single PRE for a release.
-	 *
-	 * @param int $preID
-	 *
-	 * @return array
-	 */
-	public function getOne($preID)
-	{
-		return $this->pdo->queryOneRow(sprintf('SELECT * FROM prehash WHERE id = %d', $preID));
-	}
-
-}
\ No newline at end of file
diff --git a/lib/removeCrapReleases.php b/lib/removeCrapReleases.php
deleted file mode 100644
index 973ba512d..000000000
--- a/lib/removeCrapReleases.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-// This script is adapted FROM nZEDb
-/*
- * This script deletes releases that match certain criteria, type php removeCrapReleases.php false for details.
- */
-
-require_once(dirname(__FILE__)."/../bin/config.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once("ReleaseRemover.php");
-
-$cli = new \ColorCLI();
-$n = PHP_EOL;
-
-$argCnt = count($argv);
-if ($argCnt === 1) {
-	exit(
-	$cli->error(
-		$n .
-		'Run fixReleaseNames.php first to attempt to fix release names.'. $n .
-		'This will miss some releases if you have not set fixReleaseNames to set the release as checked.' . $n . $n .
-		"php $argv[0] false Display full usage of this script." . $n .
-		"php $argv[0] true full Run this script with all options."
-	)
-	);
-}
-if ($argCnt === 2) {
-	if ($argv[1] === 'false') {
-		exit(
-			"php $argv[0] arg1 arg2 arg3 arg4" . $n . $n .
-			'arg1 (Required) = true/false' . $n .
-			'                  true   = Run this script and delete releases.' . $n .
-			'                  false  = Run this script and show what could be deleted.' . $n . $n .
-			'arg2 (Required) = full/number' . $n .
-			'                  full   = Run without a time limit.' . $n .
-			'                  number = Run on releases up to this old.' . $n . $n .
-			'arg3 (Optional) = blacklist | blfiles | executable | gibberish | hashed | installbin | passworded | passwordurl | sample | scr | short | size | wmv' . $n .
-			'                  blacklist   = Remove releases using the enabled blacklists in admin section of site.' . $n .
-			'                  blfiles     = Remove releases using the enabled blacklists in admin section of site against filenames.' . $n .
-			'                  executable  = Remove releases containing an exe file.' . $n .
-			'                  gibberish   = Remove releases where the name is letters/numbers only and 15 characters or longer.' . $n .
-			'                  hashed      = Remove releases where the name is letters/numbers only and 25 characters or longer.' . $n .
-			'                  installbin  = Remove releases which contain an install.bin file.' . $n .
-			'                  passworded  = Remove releases which contain the word password in the title.' . $n .
-			'                  passwordurl = Remove releases which contain a password.url file.' . $n .
-			'                  sample      = Remove releases that are smaller than 40MB more than 1 file and have sample in the title' . $n .
-			'                  scr         = Remove releases where .scr extension is found in the files or subject.' . $n .
-			'                  short       = Remove releases where the name is only numbers or letters and is 5 characters or less.' . $n .
-			'                  codec       = Remove releases where the release contains WMV file, x264 name, and Codec\Setup.exe file (Spammer).' . $n .
-			'                  size        = Remove releases smaller than 2MB and have only 1 file and not in books or mp3 section.' . $n .
-			'                  huge        = Remove releases bigger than 200MB with just a single file.' . $n . $n .
-			'arg4 (Optional) = blacklist regular expression id number.  Only works when blacklist is selected as third argument.' . $n .
-			'                  100001      = Remove releases where the Binary Blacklist id is 100001.' . $n . $n .
-			'examples:' . $n .
-			"php $argv[0] true 12 blacklist     = Remove releases up to 12 hours old using site blacklists." . $n .
-			"php $argv[0] false full            = Show what releases could have been removed." . $n .
-			"php $argv[0] true full installbin  = Remove releases which containing an install.bin file." . $n .
-			"php $argv[0] true full blacklist 1 = Remove releases matching blacklist id 1." . $n
-		);
-	} else {
-		exit ($cli->error("Wrong usage! Type php $argv[0] false"));
-	}
-}
-if ($argCnt < 3) {
-	exit ($cli->error("Wrong usage! Type php $argv[0] false"));
-}
-
-if (isset($argv[3]) && $argv[3] === 'blacklist' && isset($argv[4])) {
-	$blacklistID = $argv[4];
-}
-
-$RR = new \ReleaseRemover();
-$RR->removeCrap(($argv[1] === 'true' ? true : false), $argv[2], (isset($argv[3]) ? $argv[3] : ''), (isset($blacklistID) ? $argv[4] : ''));
\ No newline at end of file
diff --git a/lib/requestid.php b/lib/requestid.php
deleted file mode 100644
index 93698ae10..000000000
--- a/lib/requestid.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../bin/config.php");
-require_once (NN_LIB . 'ColorCLI.php');
-require_once (NN_LIB . 'RequestIDWeb.php');
-require_once (NN_LIB . 'RequestIDLocal.php');
-
-$cli = new \ColorCLI();
-
-if (!isset($argv[1]) || ($argv[1] != "all" && $argv[1] != "full" && $argv[1] != "web" && !is_numeric($argv[1])) || !isset($argv[2]) || !in_array($argv[2], ['true', 'false'])) {
-	exit ($cli->error(
-			PHP_EOL
-			. "This script tries to match a release request id by group to a PreDB request id by group doing local lookup only." . PHP_EOL
-			. "In addition an optional final argument is time, in minutes, to check releases that have previously been checked." . PHP_EOL . PHP_EOL
-			. "Argument 1: full|all|number|web => (mandatory)" . PHP_EOL
-			. "all does only requestid releases, full does full database, number limits to x amount of releases, web does web requestid's" . PHP_EOL
-			. "Argument 2: true|false          => (mandatory) Display full info on how the release was renamed or not." . PHP_EOL
-			. "Argument 3: number             => (optional)  This is to limit how old the releases to work on (in hours)." . PHP_EOL
-			. "php requestid.php 1000 true    => to limit to 1000 sorted by newest postdate and show renaming." . PHP_EOL . PHP_EOL
-			. "php requestid.php full true    => to run on full database and show renaming." . PHP_EOL
-			. "php requestid.php all true     => to run on all requestid releases (including previously renamed) and show renaming." . PHP_EOL
-			)
-		);
-}
-
-if ($argv[1] === 'web') {
-	(new \RequestIDWeb())->lookupRequestIDs(
-		['limit' => 1000, 'show' => $argv[2], 'time' => (isset($argv[3]) && is_numeric($argv[3]) && $argv[3] > 0 ? $argv[3] : 0)]
-	);
-} else {
-	(new \RequestIDLocal())->lookupRequestIDs(
-		['limit' => $argv[1], 'show' => $argv[2], 'time' => (isset($argv[3]) && is_numeric($argv[3]) && $argv[3] > 0 ? $argv[3] : 0)]
-	);
-}
diff --git a/lib/simple_html_dom.php b/lib/simple_html_dom.php
deleted file mode 100644
index 8aaaf0041..000000000
--- a/lib/simple_html_dom.php
+++ /dev/null
@@ -1,1854 +0,0 @@
-<?php
-/**
- * Website: http://sourceforge.net/projects/simplehtmldom/
- * Acknowledge: Jose Solorzano (https://sourceforge.net/projects/php-html/)
- * Contributions by:
- *     Yousuke Kumakura (Attribute filters)
- *     Vadim Voituk (Negative indexes supports of "find" method)
- *     Antcs (Constructor with automatically load contents either text or file/url)
- *
- * all affected sections have comments starting with "PaperG"
- *
- * Paperg - Added case insensitive testing of the value of the selector.
- * Paperg - Added tag_start for the starting index of tags - NOTE: This works but not accurately.
- *  This tag_start gets counted AFTER \r\n have been crushed out, and after the remove_noice calls so it will not reflect the REAL position of the tag in the source,
- *  it will almost always be smaller by some amount.
- *  We use this to determine how far into the file the tag in question is.  This "percentage will never be accurate as the $dom->size is the "real" number of bytes the dom was created from.
- *  but for most purposes, it's a really good estimation.
- * Paperg - Added the forceTagsClosed to the dom constructor.  Forcing tags closed is great for malformed html, but it CAN lead to parsing errors.
- * Allow the user to tell us how much they trust the html.
- * Paperg add the text and plaintext to the selectors for the find syntax.  plaintext implies text in the innertext of a node.  text implies that the tag is a text node.
- * This allows for us to find tags based on the text they contain.
- * Create find_ancestor_tag to see if a tag is - at any level - inside of another specific tag.
- * Paperg: added parse_charset so that we know about the character set of the source document.
- *  NOTE:  If the user's system has a routine called get_last_retrieve_url_contents_content_type availalbe, we will assume it's returning the content-type header from the
- *  last transfer or curl_exec, and we will parse that and use it in preference to any other method of charset detection.
- *
- * Found infinite loop in the case of broken html in restore_noise.  Rewrote to protect from that.
- * PaperG (John Schlick) Added get_display_size for "IMG" tags.
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @author     S.C. Chen <me578022@gmail.com>
- * @author     John Schlick
- * @author     Rus Carroll
- * @version    1.5 ($Rev: 196 $)
- * @package    PlaceLocalInclude
- * @subpackage simple_html_dom
- */
-
-/**
- * All of the Defines for the classes below.
- *
- * @author S.C. Chen <me578022@gmail.com>
- */
-define('HDOM_TYPE_ELEMENT', 1);
-define('HDOM_TYPE_COMMENT', 2);
-define('HDOM_TYPE_TEXT', 3);
-define('HDOM_TYPE_ENDTAG', 4);
-define('HDOM_TYPE_ROOT', 5);
-define('HDOM_TYPE_UNKNOWN', 6);
-define('HDOM_QUOTE_DOUBLE', 0);
-define('HDOM_QUOTE_SINGLE', 1);
-define('HDOM_QUOTE_NO', 3);
-define('HDOM_INFO_BEGIN', 0);
-define('HDOM_INFO_END', 1);
-define('HDOM_INFO_QUOTE', 2);
-define('HDOM_INFO_SPACE', 3);
-define('HDOM_INFO_TEXT', 4);
-define('HDOM_INFO_INNER', 5);
-define('HDOM_INFO_OUTER', 6);
-define('HDOM_INFO_ENDSPACE', 7);
-define('DEFAULT_TARGET_CHARSET', 'UTF-8');
-define('DEFAULT_BR_TEXT', "\r\n");
-define('DEFAULT_SPAN_TEXT', " ");
-define('MAX_FILE_SIZE', 600000);
-// helper functions
-// -----------------------------------------------------------------------------
-// get html dom from file
-// $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
-function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
-{
-	// We DO force the tags to be terminated.
-	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
-	// For sourceforge users: uncomment the next line and comment the retreive_url_contents line 2 lines down if it is not already done.
-	$contents = file_get_contents($url, $use_include_path, $context, $offset);
-	// Paperg - use our own mechanism for getting the contents as we want to control the timeout.
-	//$contents = retrieve_url_contents($url);
-	if (empty($contents) || strlen($contents) > MAX_FILE_SIZE) {
-		return false;
-	}
-	// The second parameter can force the selectors to all be lowercase.
-	$dom->load($contents, $lowercase, $stripRN);
-
-	return $dom;
-}
-
-// get html dom from string
-function str_get_html($str, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
-{
-	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
-	if (empty($str) || strlen($str) > MAX_FILE_SIZE) {
-		$dom->clear();
-
-		return false;
-	}
-	$dom->load($str, $lowercase, $stripRN);
-
-	return $dom;
-}
-
-// dump html dom tree
-function dump_html_tree($node, $show_attr = true, $deep = 0)
-{
-	$node->dump($node);
-}
-
-
-/**
- * simple html dom node
- * PaperG - added ability for "find" routine to lowercase the value of the selector.
- * PaperG - added $tag_start to track the start position of the tag in the total byte index
- *
- * @package PlaceLocalInclude
- */
-class simple_html_dom_node
-{
-	public $nodetype = HDOM_TYPE_TEXT;
-	public $tag = 'text';
-	public $attr = array();
-	public $children = array();
-	public $nodes = array();
-	public $parent = null;
-	// The "info" array - see HDOM_INFO_... for what each element contains.
-	public $_ = array();
-	public $tag_start = 0;
-	private $dom = null;
-
-	function __construct($dom)
-	{
-		$this->dom = $dom;
-		$dom->nodes[] = $this;
-	}
-
-	function __destruct()
-	{
-		$this->clear();
-	}
-
-	function __toString()
-	{
-		return $this->outertext();
-	}
-
-	// clean up memory due to php5 circular references memory leak...
-	function clear()
-	{
-		$this->dom = null;
-		$this->nodes = null;
-		$this->parent = null;
-		$this->children = null;
-	}
-
-	// dump node's tree
-	function dump($show_attr = true, $deep = 0)
-	{
-		$lead = str_repeat('    ', $deep);
-
-		echo $lead . $this->tag;
-		if ($show_attr && count($this->attr) > 0) {
-			echo '(';
-			foreach ($this->attr as $k => $v)
-				echo "[$k]=>\"" . $this->$k . '", ';
-			echo ')';
-		}
-		echo "\n";
-
-		if ($this->nodes) {
-			foreach ($this->nodes as $c) {
-				$c->dump($show_attr, $deep + 1);
-			}
-		}
-	}
-
-
-	// Debugging function to dump a single dom node with a bunch of information about it.
-	function dump_node($echo = true)
-	{
-
-		$string = $this->tag;
-		if (count($this->attr) > 0) {
-			$string .= '(';
-			foreach ($this->attr as $k => $v) {
-				$string .= "[$k]=>\"" . $this->$k . '", ';
-			}
-			$string .= ')';
-		}
-		if (count($this->_) > 0) {
-			$string .= ' $_ (';
-			foreach ($this->_ as $k => $v) {
-				if (is_array($v)) {
-					$string .= "[$k]=>(";
-					foreach ($v as $k2 => $v2) {
-						$string .= "[$k2]=>\"" . $v2 . '", ';
-					}
-					$string .= ")";
-				} else {
-					$string .= "[$k]=>\"" . $v . '", ';
-				}
-			}
-			$string .= ")";
-		}
-
-		if (isset($this->text)) {
-			$string .= " text: (" . $this->text . ")";
-		}
-
-		$string .= " HDOM_INNER_INFO: '";
-		if (isset($node->_[HDOM_INFO_INNER])) {
-			$string .= $node->_[HDOM_INFO_INNER] . "'";
-		} else {
-			$string .= ' NULL ';
-		}
-
-		$string .= " children: " . count($this->children);
-		$string .= " nodes: " . count($this->nodes);
-		$string .= " tag_start: " . $this->tag_start;
-		$string .= "\n";
-
-		if ($echo) {
-			echo $string;
-
-			return;
-		} else {
-			return $string;
-		}
-	}
-
-	// returns the parent of node
-	// If a node is passed in, it will reset the parent of the current node to that one.
-	function parent($parent = null)
-	{
-		// I am SURE that this doesn't work properly.
-		// It fails to unset the current node from it's current parents nodes or children list first.
-		if ($parent !== null) {
-			$this->parent = $parent;
-			$this->parent->nodes[] = $this;
-			$this->parent->children[] = $this;
-		}
-
-		return $this->parent;
-	}
-
-	// verify that node has children
-	function has_child()
-	{
-		return !empty($this->children);
-	}
-
-	// returns children of node
-	function children($idx = -1)
-	{
-		if ($idx === -1) {
-			return $this->children;
-		}
-		if (isset($this->children[$idx])) return $this->children[$idx];
-
-		return null;
-	}
-
-	// returns the first child of node
-	function first_child()
-	{
-		if (count($this->children) > 0) {
-			return $this->children[0];
-		}
-
-		return null;
-	}
-
-	// returns the last child of node
-	function last_child()
-	{
-		if (($count = count($this->children)) > 0) {
-			return $this->children[$count - 1];
-		}
-
-		return null;
-	}
-
-	// returns the next sibling of node
-	function next_sibling()
-	{
-		if ($this->parent === null) {
-			return null;
-		}
-
-		$idx = 0;
-		$count = count($this->parent->children);
-		while ($idx < $count && $this !== $this->parent->children[$idx]) {
-			++$idx;
-		}
-		if (++$idx >= $count) {
-			return null;
-		}
-
-		return $this->parent->children[$idx];
-	}
-
-	// returns the previous sibling of node
-	function prev_sibling()
-	{
-		if ($this->parent === null) return null;
-		$idx = 0;
-		$count = count($this->parent->children);
-		while ($idx < $count && $this !== $this->parent->children[$idx])
-			++$idx;
-		if (--$idx < 0) return null;
-
-		return $this->parent->children[$idx];
-	}
-
-	// function to locate a specific ancestor tag in the path to the root.
-	function find_ancestor_tag($tag)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		// Start by including ourselves in the comparison.
-		$returnDom = $this;
-
-		while (!is_null($returnDom)) {
-			if (is_object($debugObject)) {
-				$debugObject->debugLog(2, "Current tag is: " . $returnDom->tag);
-			}
-
-			if ($returnDom->tag == $tag) {
-				break;
-			}
-			$returnDom = $returnDom->parent;
-		}
-
-		return $returnDom;
-	}
-
-	// get dom node's inner html
-	function innertext()
-	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-
-		$ret = '';
-		foreach ($this->nodes as $n)
-			$ret .= $n->outertext();
-
-		return $ret;
-	}
-
-	// get dom node's outer text (with tag)
-	function outertext()
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$text = '';
-			if ($this->tag == 'text') {
-				if (!empty($this->text)) {
-					$text = " with text: " . $this->text;
-				}
-			}
-			$debugObject->debugLog(1, 'Innertext of tag: ' . $this->tag . $text);
-		}
-
-		if ($this->tag === 'root') return $this->innertext();
-
-		// trigger callback
-		if ($this->dom && $this->dom->callback !== null) {
-			call_user_func_array($this->dom->callback, array($this));
-		}
-
-		if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-
-		// render begin tag
-		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) {
-			$ret = $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]->makeup();
-		} else {
-			$ret = "";
-		}
-
-		// render inner text
-		if (isset($this->_[HDOM_INFO_INNER])) {
-			// If it's a br tag...  don't return the HDOM_INNER_INFO that we may or may not have added.
-			if ($this->tag != "br") {
-				$ret .= $this->_[HDOM_INFO_INNER];
-			}
-		} else {
-			if ($this->nodes) {
-				foreach ($this->nodes as $n) {
-					$ret .= $this->convert_text($n->outertext());
-				}
-			}
-		}
-
-		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
-			$ret .= '</' . $this->tag . '>';
-
-		return $ret;
-	}
-
-	// get dom node's plain text
-	function text()
-	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-		switch ($this->nodetype) {
-			case HDOM_TYPE_TEXT:
-				return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-			case HDOM_TYPE_COMMENT:
-				return '';
-			case HDOM_TYPE_UNKNOWN:
-				return '';
-		}
-		if (strcasecmp($this->tag, 'script') === 0) return '';
-		if (strcasecmp($this->tag, 'style') === 0) return '';
-
-		$ret = '';
-		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
-		// NOTE: This indicates that there is a problem where it's set to NULL without a clear happening.
-		// WHY is this happening?
-		if (!is_null($this->nodes)) {
-			foreach ($this->nodes as $n) {
-				$ret .= $this->convert_text($n->text());
-			}
-
-			// If this node is a span... add a space at the end of it so multiple spans don't run into each other.  This is plaintext after all.
-			if ($this->tag == "span") {
-				$ret .= $this->dom->default_span_text;
-			}
-
-
-		}
-
-		return $ret;
-	}
-
-	function xmltext()
-	{
-		$ret = $this->innertext();
-		$ret = str_ireplace('<![CDATA[', '', $ret);
-		$ret = str_replace(']]>', '', $ret);
-
-		return $ret;
-	}
-
-	// build node's text with tag
-	function makeup()
-	{
-		// text, comment, unknown
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-
-		$ret = '<' . $this->tag;
-		$i = -1;
-
-		foreach ($this->attr as $key => $val) {
-			++$i;
-
-			// skip removed attribute
-			if ($val === null || $val === false)
-				continue;
-
-			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
-			//no value attr: nowrap, checked selected...
-			if ($val === true)
-				$ret .= $key;
-			else {
-				switch ($this->_[HDOM_INFO_QUOTE][$i]) {
-					case HDOM_QUOTE_DOUBLE:
-						$quote = '"';
-						break;
-					case HDOM_QUOTE_SINGLE:
-						$quote = '\'';
-						break;
-					default:
-						$quote = '';
-				}
-				$ret .= $key . $this->_[HDOM_INFO_SPACE][$i][1] . '=' . $this->_[HDOM_INFO_SPACE][$i][2] . $quote . $val . $quote;
-			}
-		}
-		$ret = $this->dom->restore_noise($ret);
-
-		return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
-	}
-
-	// find elements by css selector
-	//PaperG - added ability for find to lowercase the value of the selector.
-	function find($selector, $idx = null, $lowercase = false)
-	{
-		$selectors = $this->parse_selector($selector);
-		if (($count = count($selectors)) === 0) return array();
-		$found_keys = array();
-
-		// find each selector
-		for ($c = 0; $c < $count; ++$c) {
-			// The change on the below line was documented on the sourceforge code tracker id 2788009
-			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle = count($selectors[$c])) === 0) return array();
-			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
-
-			$head = array($this->_[HDOM_INFO_BEGIN] => 1);
-
-			// handle descendant selectors, no recursive!
-			for ($l = 0; $l < $levle; ++$l) {
-				$ret = array();
-				foreach ($head as $k => $v) {
-					$n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k];
-					//PaperG - Pass this optional parameter on to the seek function.
-					$n->seek($selectors[$c][$l], $ret, $lowercase);
-				}
-				$head = $ret;
-			}
-
-			foreach ($head as $k => $v) {
-				if (!isset($found_keys[$k]))
-					$found_keys[$k] = 1;
-			}
-		}
-
-		// sort keys
-		ksort($found_keys);
-
-		$found = array();
-		foreach ($found_keys as $k => $v)
-			$found[] = $this->dom->nodes[$k];
-
-		// return nth-element or array
-		if (is_null($idx)) return $found;
-		else if ($idx < 0) $idx = count($found) + $idx;
-
-		return (isset($found[$idx])) ? $found[$idx] : null;
-	}
-
-	// seek for given conditions
-	// PaperG - added parameter to allow for case insensitive testing of the value of a selector.
-	protected function seek($selector, &$ret, $lowercase = false)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		list($tag, $key, $val, $exp, $no_key) = $selector;
-
-		// xpath index
-		if ($tag && $key && is_numeric($key)) {
-			$count = 0;
-			foreach ($this->children as $c) {
-				if ($tag === '*' || $tag === $c->tag) {
-					if (++$count == $key) {
-						$ret[$c->_[HDOM_INFO_BEGIN]] = 1;
-
-						return;
-					}
-				}
-			}
-
-			return;
-		}
-
-		$end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
-		if ($end == 0) {
-			$parent = $this->parent;
-			while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) {
-				$end -= 1;
-				$parent = $parent->parent;
-			}
-			$end += $parent->_[HDOM_INFO_END];
-		}
-
-		for ($i = $this->_[HDOM_INFO_BEGIN] + 1; $i < $end; ++$i) {
-			$node = $this->dom->nodes[$i];
-
-			$pass = true;
-
-			if ($tag === '*' && !$key) {
-				if (in_array($node, $this->children, true))
-					$ret[$i] = 1;
-				continue;
-			}
-
-			// compare tag
-			if ($tag && $tag != $node->tag && $tag !== '*') {
-				$pass = false;
-			}
-			// compare key
-			if ($pass && $key) {
-				if ($no_key) {
-					if (isset($node->attr[$key])) $pass = false;
-				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass = false;
-				}
-			}
-			// compare value
-			if ($pass && $key && $val && $val !== '*') {
-				// If they have told us that this is a "plaintext" search then we want the plaintext of the node - right?
-				if ($key == "plaintext") {
-					// $node->plaintext actually returns $node->text();
-					$nodeKeyValue = $node->text();
-				} else {
-					// this is a normal search, we want the value of that attribute of the tag.
-					$nodeKeyValue = $node->attr[$key];
-				}
-				if (is_object($debugObject)) {
-					$debugObject->debugLog(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);
-				}
-
-				//PaperG - If lowercase is set, do a case insensitive test of the value of the selector.
-				if ($lowercase) {
-					$check = $this->match($exp, strtolower($val), strtolower($nodeKeyValue));
-				} else {
-					$check = $this->match($exp, $val, $nodeKeyValue);
-				}
-				if (is_object($debugObject)) {
-					$debugObject->debugLog(2, "after match: " . ($check ? "true" : "false"));
-				}
-
-				// handle multiple class
-				if (!$check && strcasecmp($key, 'class') === 0) {
-					foreach (explode(' ', $node->attr[$key]) as $k) {
-						// Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form.
-						if (!empty($k)) {
-							if ($lowercase) {
-								$check = $this->match($exp, strtolower($val), strtolower($k));
-							} else {
-								$check = $this->match($exp, $val, $k);
-							}
-							if ($check) break;
-						}
-					}
-				}
-				if (!$check) $pass = false;
-			}
-			if ($pass) $ret[$i] = 1;
-			unset($node);
-		}
-		// It's passed by reference so this is actually what this function returns.
-		if (is_object($debugObject)) {
-			$debugObject->debugLog(1, "EXIT - ret: ", $ret);
-		}
-	}
-
-	protected function match($exp, $pattern, $value)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		switch ($exp) {
-			case '=':
-				return ($value === $pattern);
-			case '!=':
-				return ($value !== $pattern);
-			case '^=':
-				return preg_match("/^" . preg_quote($pattern, '/') . "/", $value);
-			case '$=':
-				return preg_match("/" . preg_quote($pattern, '/') . "$/", $value);
-			case '*=':
-				if ($pattern[0] == '/') {
-					return preg_match($pattern, $value);
-				}
-
-				return preg_match("/" . $pattern . "/i", $value);
-		}
-
-		return false;
-	}
-
-	protected function parse_selector($selector_string)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		// pattern of CSS selectors, modified from mootools
-		// Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does.
-		// Note: if you try to look at this attribute, yo MUST use getAttribute since $dom->x:y will fail the php syntax check.
-// Notice the \[ starting the attbute?  and the @? following?  This implies that an attribute can begin with an @ sign that is not captured.
-// This implies that an html attribute specifier may start with an @ sign that is NOT captured by the expression.
-// farther study is required to determine of this should be documented or removed.
-//        $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
-		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
-		preg_match_all($pattern, trim($selector_string) . ' ', $matches, PREG_SET_ORDER);
-		if (is_object($debugObject)) {
-			$debugObject->debugLog(2, "Matches Array: ", $matches);
-		}
-
-		$selectors = array();
-		$result = array();
-		//print_r($matches);
-
-		foreach ($matches as $m) {
-			$m[0] = trim($m[0]);
-			if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') continue;
-			// for browser generated xpath
-			if ($m[1] === 'tbody') continue;
-
-			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
-			if (!empty($m[2])) {
-				$key = 'id';
-				$val = $m[2];
-			}
-			if (!empty($m[3])) {
-				$key = 'class';
-				$val = $m[3];
-			}
-			if (!empty($m[4])) {
-				$key = $m[4];
-			}
-			if (!empty($m[5])) {
-				$exp = $m[5];
-			}
-			if (!empty($m[6])) {
-				$val = $m[6];
-			}
-
-			// convert to lowercase
-			if ($this->dom->lowercase) {
-				$tag = strtolower($tag);
-				$key = strtolower($key);
-			}
-			//elements that do NOT have the specified attribute
-			if (isset($key[0]) && $key[0] === '!') {
-				$key = substr($key, 1);
-				$no_key = true;
-			}
-
-			$result[] = array($tag, $key, $val, $exp, $no_key);
-			if (trim($m[7]) === ',') {
-				$selectors[] = $result;
-				$result = array();
-			}
-		}
-		if (count($result) > 0)
-			$selectors[] = $result;
-
-		return $selectors;
-	}
-
-	function __get($name)
-	{
-		if (isset($this->attr[$name])) {
-			return $this->convert_text($this->attr[$name]);
-		}
-		switch ($name) {
-			case 'outertext':
-				return $this->outertext();
-			case 'innertext':
-				return $this->innertext();
-			case 'plaintext':
-				return $this->text();
-			case 'xmltext':
-				return $this->xmltext();
-			default:
-				return array_key_exists($name, $this->attr);
-		}
-	}
-
-	function __set($name, $value)
-	{
-		switch ($name) {
-			case 'outertext':
-				return $this->_[HDOM_INFO_OUTER] = $value;
-			case 'innertext':
-				if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
-
-				return $this->_[HDOM_INFO_INNER] = $value;
-		}
-		if (!isset($this->attr[$name])) {
-			$this->_[HDOM_INFO_SPACE][] = array(' ', '', '');
-			$this->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-		}
-		$this->attr[$name] = $value;
-	}
-
-	function __isset($name)
-	{
-		switch ($name) {
-			case 'outertext':
-				return true;
-			case 'innertext':
-				return true;
-			case 'plaintext':
-				return true;
-		}
-		//no value attr: nowrap, checked selected...
-		return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]);
-	}
-
-	function __unset($name)
-	{
-		if (isset($this->attr[$name]))
-			unset($this->attr[$name]);
-	}
-
-	// PaperG - Function to convert the text from one character set to another if the two sets are not the same.
-	function convert_text($text)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		$converted_text = $text;
-
-		$sourceCharset = "";
-		$targetCharset = "";
-
-		if ($this->dom) {
-			$sourceCharset = strtoupper($this->dom->_charset);
-			$targetCharset = strtoupper($this->dom->_target_charset);
-		}
-		if (is_object($debugObject)) {
-			$debugObject->debugLog(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);
-		}
-
-		if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0)) {
-			// Check if the reported encoding could have been incorrect and the text is actually already UTF-8
-			if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text))) {
-				$converted_text = $text;
-			} else {
-				$converted_text = iconv($sourceCharset, $targetCharset, $text);
-			}
-		}
-
-		// Lets make sure that we don't have that silly BOM issue with any of the utf-8 text we output.
-		if ($targetCharset == 'UTF-8') {
-			if (substr($converted_text, 0, 3) == "\xef\xbb\xbf") {
-				$converted_text = substr($converted_text, 3);
-			}
-			if (substr($converted_text, -3) == "\xef\xbb\xbf") {
-				$converted_text = substr($converted_text, 0, -3);
-			}
-		}
-
-		return $converted_text;
-	}
-
-	/**
-	 * Returns true if $string is valid UTF-8 and false otherwise.
-	 *
-	 * @param mixed $str String to be tested
-	 *
-	 * @return boolean
-	 */
-	static function is_utf8($str)
-	{
-		$c = 0;
-		$b = 0;
-		$bits = 0;
-		$len = strlen($str);
-		for ($i = 0; $i < $len; $i++) {
-			$c = ord($str[$i]);
-			if ($c > 128) {
-				if (($c >= 254)) return false;
-				elseif ($c >= 252) $bits = 6;
-				elseif ($c >= 248) $bits = 5;
-				elseif ($c >= 240) $bits = 4;
-				elseif ($c >= 224) $bits = 3;
-				elseif ($c >= 192) $bits = 2;
-				else return false;
-				if (($i + $bits) > $len) return false;
-				while ($bits > 1) {
-					$i++;
-					$b = ord($str[$i]);
-					if ($b < 128 || $b > 191) return false;
-					$bits--;
-				}
-			}
-		}
-
-		return true;
-	}
-	/*
-	function is_utf8($string)
-	{
-		//this is buggy
-		return (utf8_encode(utf8_decode($string)) == $string);
-	}
-	*/
-
-	/**
-	 * Function to try a few tricks to determine the displayed size of an img on the page.
-	 * NOTE: This will ONLY work on an IMG tag. Returns FALSE on all other tag types.
-	 *
-	 * @author  John Schlick
-	 * @version April 19 2012
-	 * @return array an array containing the 'height' and 'width' of the image on the page or -1 if we can't figure it out.
-	 */
-	function get_display_size()
-	{
-		global $debugObject;
-
-		$width = -1;
-		$height = -1;
-
-		if ($this->tag !== 'img') {
-			return false;
-		}
-
-		// See if there is aheight or width attribute in the tag itself.
-		if (isset($this->attr['width'])) {
-			$width = $this->attr['width'];
-		}
-
-		if (isset($this->attr['height'])) {
-			$height = $this->attr['height'];
-		}
-
-		// Now look for an inline style.
-		if (isset($this->attr['style'])) {
-			// Thanks to user gnarf from stackoverflow for this regular expression.
-			$attributes = array();
-			preg_match_all("/([\w-]+)\s*:\s*([^;]+)\s*;?/", $this->attr['style'], $matches, PREG_SET_ORDER);
-			foreach ($matches as $match) {
-				$attributes[$match[1]] = $match[2];
-			}
-
-			// If there is a width in the style attributes:
-			if (isset($attributes['width']) && $width == -1) {
-				// check that the last two characters are px (pixels)
-				if (strtolower(substr($attributes['width'], -2)) == 'px') {
-					$proposed_width = substr($attributes['width'], 0, -2);
-					// Now make sure that it's an integer and not something stupid.
-					if (filter_var($proposed_width, FILTER_VALIDATE_INT)) {
-						$width = $proposed_width;
-					}
-				}
-			}
-
-			// If there is a width in the style attributes:
-			if (isset($attributes['height']) && $height == -1) {
-				// check that the last two characters are px (pixels)
-				if (strtolower(substr($attributes['height'], -2)) == 'px') {
-					$proposed_height = substr($attributes['height'], 0, -2);
-					// Now make sure that it's an integer and not something stupid.
-					if (filter_var($proposed_height, FILTER_VALIDATE_INT)) {
-						$height = $proposed_height;
-					}
-				}
-			}
-
-		}
-
-		// Future enhancement:
-		// Look in the tag to see if there is a class or id specified that has a height or width attribute to it.
-
-		// Far future enhancement
-		// Look at all the parent tags of this image to see if they specify a class or id that has an img selector that specifies a height or width
-		// Note that in this case, the class or id will have the img subselector for it to apply to the image.
-
-		// ridiculously far future development
-		// If the class or id is specified in a SEPARATE css file thats not on the page, go get it and do what we were just doing for the ones on the page.
-
-		$result = array('height' => $height,
-						'width'  => $width
-		);
-
-		return $result;
-	}
-
-	// camel naming conventions
-	function getAllAttributes()
-	{
-		return $this->attr;
-	}
-
-	function getAttribute($name)
-	{
-		return $this->__get($name);
-	}
-
-	function setAttribute($name, $value)
-	{
-		$this->__set($name, $value);
-	}
-
-	function hasAttribute($name)
-	{
-		return $this->__isset($name);
-	}
-
-	function removeAttribute($name)
-	{
-		$this->__set($name, null);
-	}
-
-	function getElementById($id)
-	{
-		return $this->find("#$id", 0);
-	}
-
-	function getElementsById($id, $idx = null)
-	{
-		return $this->find("#$id", $idx);
-	}
-
-	function getElementByTagName($name)
-	{
-		return $this->find($name, 0);
-	}
-
-	function getElementsByTagName($name, $idx = null)
-	{
-		return $this->find($name, $idx);
-	}
-
-	function parentNode()
-	{
-		return $this->parent();
-	}
-
-	function childNodes($idx = -1)
-	{
-		return $this->children($idx);
-	}
-
-	function firstChild()
-	{
-		return $this->first_child();
-	}
-
-	function lastChild()
-	{
-		return $this->last_child();
-	}
-
-	function nextSibling()
-	{
-		return $this->next_sibling();
-	}
-
-	function previousSibling()
-	{
-		return $this->prev_sibling();
-	}
-
-	function hasChildNodes()
-	{
-		return $this->has_child();
-	}
-
-	function nodeName()
-	{
-		return $this->tag;
-	}
-
-	function appendChild($node)
-	{
-		$node->parent($this);
-
-		return $node;
-	}
-
-}
-
-/**
- * simple html dom parser
- * Paperg - in the find routine: allow us to specify that we want case insensitive testing of the value of the selector.
- * Paperg - change $size from protected to public so we can easily access it
- * Paperg - added ForceTagsClosed in the constructor which tells us whether we trust the html or not.  Default is to NOT trust it.
- *
- * @package PlaceLocalInclude
- */
-class simple_html_dom
-{
-	public $root = null;
-	public $nodes = array();
-	public $callback = null;
-	public $lowercase = false;
-	// Used to keep track of how large the text was when we started.
-	public $original_size;
-	public $size;
-	protected $pos;
-	protected $doc;
-	protected $char;
-	protected $cursor;
-	protected $parent;
-	protected $noise = array();
-	protected $token_blank = " \t\r\n";
-	protected $token_equal = ' =/>';
-	protected $token_slash = " />\r\n\t";
-	protected $token_attr = ' >';
-	// Note that this is referenced by a child node, and so it needs to be public for that node to see this information.
-	public $_charset = '';
-	public $_target_charset = '';
-	protected $default_br_text = "";
-	public $default_span_text = "";
-
-	// use isset instead of in_array, performance boost about 30%...
-	protected $self_closing_tags = array('img' => 1, 'br' => 1, 'input' => 1, 'meta' => 1, 'link' => 1, 'hr' => 1, 'base' => 1, 'embed' => 1, 'spacer' => 1);
-	protected $block_tags = array('root' => 1, 'body' => 1, 'form' => 1, 'div' => 1, 'span' => 1, 'table' => 1);
-	// Known sourceforge issue #2977341
-	// B tags that are not closed cause us to return everything to the end of the document.
-	protected $optional_closing_tags = array(
-		'tr'     => array('tr' => 1, 'td' => 1, 'th' => 1),
-		'th'     => array('th' => 1),
-		'td'     => array('td' => 1),
-		'li'     => array('li' => 1),
-		'dt'     => array('dt' => 1, 'dd' => 1),
-		'dd'     => array('dd' => 1, 'dt' => 1),
-		'dl'     => array('dd' => 1, 'dt' => 1),
-		'p'      => array('p' => 1),
-		'nobr'   => array('nobr' => 1),
-		'b'      => array('b' => 1),
-		'option' => array('option' => 1),
-	);
-
-	function __construct($str = null, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
-	{
-		if ($str) {
-			if (preg_match("/^http:\/\//i", $str) || is_file($str)) {
-				$this->load_file($str);
-			} else {
-				$this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
-			}
-		}
-		// Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html.
-		if (!$forceTagsClosed) {
-			$this->optional_closing_array = array();
-		}
-		$this->_target_charset = $target_charset;
-	}
-
-	function __destruct()
-	{
-		$this->clear();
-	}
-
-	// load html from string
-	function load($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
-	{
-		global $debugObject;
-
-		// prepare
-		$this->prepare($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
-		// strip out comments
-		$this->remove_noise("'<!--(.*?)-->'is");
-		// strip out cdata
-		$this->remove_noise("'<!\[CDATA\[(.*?)\]\]>'is", true);
-		// Per sourceforge http://sourceforge.net/tracker/?func=detail&aid=2949097&group_id=218559&atid=1044037
-		// Script tags removal now preceeds style tag removal.
-		// strip out <script> tags
-		$this->remove_noise("'<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>'is");
-		$this->remove_noise("'<\s*script\s*>(.*?)<\s*/\s*script\s*>'is");
-		// strip out <style> tags
-		$this->remove_noise("'<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>'is");
-		$this->remove_noise("'<\s*style\s*>(.*?)<\s*/\s*style\s*>'is");
-		// strip out preformatted tags
-		$this->remove_noise("'<\s*(?:code)[^>]*>(.*?)<\s*/\s*(?:code)\s*>'is");
-		// strip out server side scripts
-		$this->remove_noise("'(<\?)(.*?)(\?>)'s", true);
-		// strip smarty scripts
-		$this->remove_noise("'(\{\w)(.*?)(\})'s", true);
-
-		// parsing
-		while ($this->parse()) ;
-		// end
-		$this->root->_[HDOM_INFO_END] = $this->cursor;
-		$this->parse_charset();
-
-		// make load function chainable
-		return $this;
-
-	}
-
-	// load html from file
-	function load_file()
-	{
-		$args = func_get_args();
-		$this->load(call_user_func_array('file_get_contents', $args), true);
-		// Throw an error if we can't properly load the dom.
-		if (($error = error_get_last()) !== null) {
-			$this->clear();
-
-			return false;
-		}
-	}
-
-	// set callback function
-	function set_callback($function_name)
-	{
-		$this->callback = $function_name;
-	}
-
-	// remove callback function
-	function remove_callback()
-	{
-		$this->callback = null;
-	}
-
-	// save dom as string
-	function save($filepath = '')
-	{
-		$ret = $this->root->innertext();
-		if ($filepath !== '') file_put_contents($filepath, $ret, LOCK_EX);
-
-		return $ret;
-	}
-
-	// find dom node by css selector
-	// Paperg - allow us to specify that we want case insensitive testing of the value of the selector.
-	function find($selector, $idx = null, $lowercase = false)
-	{
-		return $this->root->find($selector, $idx, $lowercase);
-	}
-
-	// clean up memory due to php5 circular references memory leak...
-	function clear()
-	{
-		foreach ($this->nodes as $n) {
-			$n->clear();
-			$n = null;
-		}
-		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {
-			$n->clear();
-			$n = null;
-		}
-		if (isset($this->parent)) {
-			$this->parent->clear();
-			unset($this->parent);
-		}
-		if (isset($this->root)) {
-			$this->root->clear();
-			unset($this->root);
-		}
-		unset($this->doc);
-		unset($this->noise);
-	}
-
-	function dump($show_attr = true)
-	{
-		$this->root->dump($show_attr);
-	}
-
-	// prepare HTML data and init everything
-	protected function prepare($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
-	{
-		$this->clear();
-
-		// set the length of content before we do anything to it.
-		$this->size = strlen($str);
-		// Save the original size of the html that we got in.  It might be useful to someone.
-		$this->original_size = $this->size;
-
-		//before we save the string as the doc...  strip out the \r \n's if we are told to.
-		if ($stripRN) {
-			$str = str_replace("\r", " ", $str);
-			$str = str_replace("\n", " ", $str);
-
-			// set the length of content since we have changed it.
-			$this->size = strlen($str);
-		}
-
-		$this->doc = $str;
-		$this->pos = 0;
-		$this->cursor = 1;
-		$this->noise = array();
-		$this->nodes = array();
-		$this->lowercase = $lowercase;
-		$this->default_br_text = $defaultBRText;
-		$this->default_span_text = $defaultSpanText;
-		$this->root = new simple_html_dom_node($this);
-		$this->root->tag = 'root';
-		$this->root->_[HDOM_INFO_BEGIN] = -1;
-		$this->root->nodetype = HDOM_TYPE_ROOT;
-		$this->parent = $this->root;
-		if ($this->size > 0) $this->char = $this->doc[0];
-	}
-
-	// parse html content
-	protected function parse()
-	{
-		if (($s = $this->copy_until_char('<')) === '') {
-			return $this->read_tag();
-		}
-
-		// text
-		$node = new simple_html_dom_node($this);
-		++$this->cursor;
-		$node->_[HDOM_INFO_TEXT] = $s;
-		$this->link_nodes($node, false);
-
-		return true;
-	}
-
-	// PAPERG - dkchou - added this to try to identify the character set of the page we have just parsed so we know better how to spit it out later.
-	// NOTE:  IF you provide a routine called get_last_retrieve_url_contents_content_type which returns the CURLINFO_CONTENT_TYPE from the last curl_exec
-	// (or the content_type header from the last transfer), we will parse THAT, and if a charset is specified, we will use it over any other mechanism.
-	protected function parse_charset()
-	{
-		global $debugObject;
-
-		$charset = null;
-
-		if (function_exists('get_last_retrieve_url_contents_content_type')) {
-			$contentTypeHeader = get_last_retrieve_url_contents_content_type();
-			$success = preg_match('/charset=(.+)/', $contentTypeHeader, $matches);
-			if ($success) {
-				$charset = $matches[1];
-				if (is_object($debugObject)) {
-					$debugObject->debugLog(2, 'header content-type found charset of: ' . $charset);
-				}
-			}
-
-		}
-
-		if (empty($charset)) {
-			$el = $this->root->find('meta[http-equiv=Content-Type]', 0);
-			if (!empty($el)) {
-				$fullvalue = $el->content;
-				if (is_object($debugObject)) {
-					$debugObject->debugLog(2, 'meta content-type tag found' . $fullvalue);
-				}
-
-				if (!empty($fullvalue)) {
-					$success = preg_match('/charset=(.+)/', $fullvalue, $matches);
-					if ($success) {
-						$charset = $matches[1];
-					} else {
-						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
-						if (is_object($debugObject)) {
-							$debugObject->debugLog(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');
-						}
-						$charset = 'ISO-8859-1';
-					}
-				}
-			}
-		}
-
-		// If we couldn't find a charset above, then lets try to detect one based on the text we got...
-		if (empty($charset)) {
-			// Have php try to detect the encoding from the text given to us.
-			$charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array("UTF-8", "CP1252"));
-			if (is_object($debugObject)) {
-				$debugObject->debugLog(2, 'mb_detect found: ' . $charset);
-			}
-
-			// and if this doesn't work...  then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need...
-			if ($charset === false) {
-				if (is_object($debugObject)) {
-					$debugObject->debugLog(2, 'since mb_detect failed - using default of utf-8');
-				}
-				$charset = 'UTF-8';
-			}
-		}
-
-		// Since CP1252 is a superset, if we get one of it's subsets, we want it instead.
-		if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1'))) {
-			if (is_object($debugObject)) {
-				$debugObject->debugLog(2, 'replacing ' . $charset . ' with CP1252 as its a superset');
-			}
-			$charset = 'CP1252';
-		}
-
-		if (is_object($debugObject)) {
-			$debugObject->debugLog(1, 'EXIT - ' . $charset);
-		}
-
-		return $this->_charset = $charset;
-	}
-
-	// read tag info
-	protected function read_tag()
-	{
-		if ($this->char !== '<') {
-			$this->root->_[HDOM_INFO_END] = $this->cursor;
-
-			return false;
-		}
-		$begin_tag_pos = $this->pos;
-		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-
-		// end tag
-		if ($this->char === '/') {
-			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-			// This represents the change in the simple_html_dom trunk from revision 180 to 181.
-			// $this->skip($this->token_blank_t);
-			$this->skip($this->token_blank);
-			$tag = $this->copy_until_char('>');
-
-			// skip attributes in end tag
-			if (($pos = strpos($tag, ' ')) !== false)
-				$tag = substr($tag, 0, $pos);
-
-			$parent_lower = strtolower($this->parent->tag);
-			$tag_lower = strtolower($tag);
-
-			if ($parent_lower !== $tag_lower) {
-				if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower])) {
-					$this->parent->_[HDOM_INFO_END] = 0;
-					$org_parent = $this->parent;
-
-					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
-						$this->parent = $this->parent->parent;
-
-					if (strtolower($this->parent->tag) !== $tag_lower) {
-						$this->parent = $org_parent; // restore origonal parent
-						if ($this->parent->parent) $this->parent = $this->parent->parent;
-						$this->parent->_[HDOM_INFO_END] = $this->cursor;
-
-						return $this->as_text_node($tag);
-					}
-				} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
-					$this->parent->_[HDOM_INFO_END] = 0;
-					$org_parent = $this->parent;
-
-					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
-						$this->parent = $this->parent->parent;
-
-					if (strtolower($this->parent->tag) !== $tag_lower) {
-						$this->parent = $org_parent; // restore origonal parent
-						$this->parent->_[HDOM_INFO_END] = $this->cursor;
-
-						return $this->as_text_node($tag);
-					}
-				} else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower) {
-					$this->parent->_[HDOM_INFO_END] = 0;
-					$this->parent = $this->parent->parent;
-				} else
-					return $this->as_text_node($tag);
-			}
-
-			$this->parent->_[HDOM_INFO_END] = $this->cursor;
-			if ($this->parent->parent) $this->parent = $this->parent->parent;
-
-			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-			return true;
-		}
-
-		$node = new simple_html_dom_node($this);
-		$node->_[HDOM_INFO_BEGIN] = $this->cursor;
-		++$this->cursor;
-		$tag = $this->copy_until($this->token_slash);
-		$node->tag_start = $begin_tag_pos;
-
-		// doctype, cdata & comments...
-		if (isset($tag[0]) && $tag[0] === '!') {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
-
-			if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') {
-				$node->nodetype = HDOM_TYPE_COMMENT;
-				$node->tag = 'comment';
-			} else {
-				$node->nodetype = HDOM_TYPE_UNKNOWN;
-				$node->tag = 'unknown';
-			}
-			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
-			$this->link_nodes($node, true);
-			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-			return true;
-		}
-
-		// text
-		if ($pos = strpos($tag, '<') !== false) {
-			$tag = '<' . substr($tag, 0, -1);
-			$node->_[HDOM_INFO_TEXT] = $tag;
-			$this->link_nodes($node, false);
-			$this->char = $this->doc[--$this->pos]; // prev
-			return true;
-		}
-
-		if (!preg_match("/^[\w-:]+$/", $tag)) {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
-			if ($this->char === '<') {
-				$this->link_nodes($node, false);
-
-				return true;
-			}
-
-			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
-			$this->link_nodes($node, false);
-			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-			return true;
-		}
-
-		// begin tag
-		$node->nodetype = HDOM_TYPE_ELEMENT;
-		$tag_lower = strtolower($tag);
-		$node->tag = ($this->lowercase) ? $tag_lower : $tag;
-
-		// handle optional closing tags
-		if (isset($this->optional_closing_tags[$tag_lower])) {
-			while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)])) {
-				$this->parent->_[HDOM_INFO_END] = 0;
-				$this->parent = $this->parent->parent;
-			}
-			$node->parent = $this->parent;
-		}
-
-		$guard = 0; // prevent infinity loop
-		$space = array($this->copy_skip($this->token_blank), '', '');
-
-		// attributes
-		do {
-			if ($this->char !== null && $space[0] === '') {
-				break;
-			}
-			$name = $this->copy_until($this->token_equal);
-			if ($guard === $this->pos) {
-				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-				continue;
-			}
-			$guard = $this->pos;
-
-			// handle endless '<'
-			if ($this->pos >= $this->size - 1 && $this->char !== '>') {
-				$node->nodetype = HDOM_TYPE_TEXT;
-				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = '<' . $tag . $space[0] . $name;
-				$node->tag = 'text';
-				$this->link_nodes($node, false);
-
-				return true;
-			}
-
-			// handle mismatch '<'
-			if ($this->doc[$this->pos - 1] == '<') {
-				$node->nodetype = HDOM_TYPE_TEXT;
-				$node->tag = 'text';
-				$node->attr = array();
-				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos - $begin_tag_pos - 1);
-				$this->pos -= 2;
-				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-				$this->link_nodes($node, false);
-
-				return true;
-			}
-
-			if ($name !== '/' && $name !== '') {
-				$space[1] = $this->copy_skip($this->token_blank);
-				$name = $this->restore_noise($name);
-				if ($this->lowercase) $name = strtolower($name);
-				if ($this->char === '=') {
-					$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-					$this->parse_attr($node, $name, $space);
-				} else {
-					//no value attr: nowrap, checked selected...
-					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
-					$node->attr[$name] = true;
-					if ($this->char != '>') $this->char = $this->doc[--$this->pos]; // prev
-				}
-				$node->_[HDOM_INFO_SPACE][] = $space;
-				$space = array($this->copy_skip($this->token_blank), '', '');
-			} else
-				break;
-		} while ($this->char !== '>' && $this->char !== '/');
-
-		$this->link_nodes($node, true);
-		$node->_[HDOM_INFO_ENDSPACE] = $space[0];
-
-		// check self closing
-		if ($this->copy_until_char_escape('>') === '/') {
-			$node->_[HDOM_INFO_ENDSPACE] .= '/';
-			$node->_[HDOM_INFO_END] = 0;
-		} else {
-			// reset parent
-			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
-		}
-		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-
-		// If it's a BR tag, we need to set it's text to the default text.
-		// This way when we see it in plaintext, we can generate formatting that the user wants.
-		// since a br tag never has sub nodes, this works well.
-		if ($node->tag == "br") {
-			$node->_[HDOM_INFO_INNER] = $this->default_br_text;
-		}
-
-		return true;
-	}
-
-	// parse attributes
-	protected function parse_attr($node, $name, &$space)
-	{
-		// Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
-		// If the attribute is already defined inside a tag, only pay atetntion to the first one as opposed to the last one.
-		if (isset($node->attr[$name])) {
-			return;
-		}
-
-		$space[2] = $this->copy_skip($this->token_blank);
-		switch ($this->char) {
-			case '"':
-				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
-				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-				break;
-			case '\'':
-				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
-				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
-				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-				break;
-			default:
-				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
-				$node->attr[$name] = $this->restore_noise($this->copy_until($this->token_attr));
-		}
-		// PaperG: Attributes should not have \r or \n in them, that counts as html whitespace.
-		$node->attr[$name] = str_replace("\r", "", $node->attr[$name]);
-		$node->attr[$name] = str_replace("\n", "", $node->attr[$name]);
-		// PaperG: If this is a "class" selector, lets get rid of the preceeding and trailing space since some people leave it in the multi class case.
-		if ($name == "class") {
-			$node->attr[$name] = trim($node->attr[$name]);
-		}
-	}
-
-	// link node's parent
-	protected function link_nodes(&$node, $is_child)
-	{
-		$node->parent = $this->parent;
-		$this->parent->nodes[] = $node;
-		if ($is_child) {
-			$this->parent->children[] = $node;
-		}
-	}
-
-	// as a text node
-	protected function as_text_node($tag)
-	{
-		$node = new simple_html_dom_node($this);
-		++$this->cursor;
-		$node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
-		$this->link_nodes($node, false);
-		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-		return true;
-	}
-
-	protected function skip($chars)
-	{
-		$this->pos += strspn($this->doc, $chars, $this->pos);
-		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-	}
-
-	protected function copy_skip($chars)
-	{
-		$pos = $this->pos;
-		$len = strspn($this->doc, $chars, $pos);
-		$this->pos += $len;
-		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len === 0) return '';
-
-		return substr($this->doc, $pos, $len);
-	}
-
-	protected function copy_until($chars)
-	{
-		$pos = $this->pos;
-		$len = strcspn($this->doc, $chars, $pos);
-		$this->pos += $len;
-		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
-		return substr($this->doc, $pos, $len);
-	}
-
-	protected function copy_until_char($char)
-	{
-		if ($this->char === null) return '';
-
-		if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
-			$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
-			$this->char = null;
-			$this->pos = $this->size;
-
-			return $ret;
-		}
-
-		if ($pos === $this->pos) return '';
-		$pos_old = $this->pos;
-		$this->char = $this->doc[$pos];
-		$this->pos = $pos;
-
-		return substr($this->doc, $pos_old, $pos - $pos_old);
-	}
-
-	protected function copy_until_char_escape($char)
-	{
-		if ($this->char === null) return '';
-
-		$start = $this->pos;
-		while (1) {
-			if (($pos = strpos($this->doc, $char, $start)) === false) {
-				$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
-				$this->char = null;
-				$this->pos = $this->size;
-
-				return $ret;
-			}
-
-			if ($pos === $this->pos) return '';
-
-			if ($this->doc[$pos - 1] === '\\') {
-				$start = $pos + 1;
-				continue;
-			}
-
-			$pos_old = $this->pos;
-			$this->char = $this->doc[$pos];
-			$this->pos = $pos;
-
-			return substr($this->doc, $pos_old, $pos - $pos_old);
-		}
-	}
-
-	// remove noise from html content
-	// save the noise in the $this->noise array.
-	protected function remove_noise($pattern, $remove_tag = false)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		$count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-
-		for ($i = $count - 1; $i > -1; --$i) {
-			$key = '___noise___' . sprintf('% 5d', count($this->noise) + 1000);
-			if (is_object($debugObject)) {
-				$debugObject->debugLog(2, 'key is: ' . $key);
-			}
-			$idx = ($remove_tag) ? 0 : 1;
-			$this->noise[$key] = $matches[$i][$idx][0];
-			$this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
-		}
-
-		// reset the length of content
-		$this->size = strlen($this->doc);
-		if ($this->size > 0) {
-			$this->char = $this->doc[0];
-		}
-	}
-
-	// restore noise to html content
-	function restore_noise($text)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		while (($pos = strpos($text, '___noise___')) !== false) {
-			// Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us...
-			if (strlen($text) > $pos + 15) {
-				$key = '___noise___' . $text[$pos + 11] . $text[$pos + 12] . $text[$pos + 13] . $text[$pos + 14] . $text[$pos + 15];
-				if (is_object($debugObject)) {
-					$debugObject->debugLog(2, 'located key of: ' . $key);
-				}
-
-				if (isset($this->noise[$key])) {
-					$text = substr($text, 0, $pos) . $this->noise[$key] . substr($text, $pos + 16);
-				} else {
-					// do this to prevent an infinite loop.
-					$text = substr($text, 0, $pos) . 'UNDEFINED NOISE FOR KEY: ' . $key . substr($text, $pos + 16);
-				}
-			} else {
-				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
-				$text = substr($text, 0, $pos) . 'NO NUMERIC NOISE KEY' . substr($text, $pos + 11);
-			}
-		}
-
-		return $text;
-	}
-
-	// Sometimes we NEED one of the noise elements.
-	function search_noise($text)
-	{
-		global $debugObject;
-		if (is_object($debugObject)) {
-			$debugObject->debugLogEntry(1);
-		}
-
-		foreach ($this->noise as $noiseElement) {
-			if (strpos($noiseElement, $text) !== false) {
-				return $noiseElement;
-			}
-		}
-	}
-
-	function __toString()
-	{
-		return $this->root->innertext();
-	}
-
-	function __get($name)
-	{
-		switch ($name) {
-			case 'outertext':
-				return $this->root->innertext();
-			case 'innertext':
-				return $this->root->innertext();
-			case 'plaintext':
-				return $this->root->text();
-			case 'charset':
-				return $this->_charset;
-			case 'target_charset':
-				return $this->_target_charset;
-		}
-	}
-
-	// camel naming conventions
-	function childNodes($idx = -1)
-	{
-		return $this->root->childNodes($idx);
-	}
-
-	function firstChild()
-	{
-		return $this->root->first_child();
-	}
-
-	function lastChild()
-	{
-		return $this->root->last_child();
-	}
-
-	function createElement($name, $value = null)
-	{
-		return @str_get_html("<$name>$value</$name>")->first_child();
-	}
-
-	function createTextNode($value)
-	{
-		return @end(str_get_html($value)->nodes);
-	}
-
-	function getElementById($id)
-	{
-		return $this->find("#$id", 0);
-	}
-
-	function getElementsById($id, $idx = null)
-	{
-		return $this->find("#$id", $idx);
-	}
-
-	function getElementByTagName($name)
-	{
-		return $this->find($name, 0);
-	}
-
-	function getElementsByTagName($name, $idx = -1)
-	{
-		return $this->find($name, $idx);
-	}
-
-	function loadFile()
-	{
-		$args = func_get_args();
-		$this->load_file($args);
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/DB/change_USP_provider.php b/lib/testing/DB/change_USP_provider.php
deleted file mode 100644
index 483606f31..000000000
--- a/lib/testing/DB/change_USP_provider.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/nntp.php");
-require_once(WWW_DIR . "/lib/binaries.php");
-
-
-/* This script will update the groups table to get the new article numbers for each group you have activated.
-  It will also truncate the parts, binaries, collections, and missed_parts tables.
- */
-// TODO: Make this threaded so it goes faster.
-
-$pdo = new DB();
-
-if (!isset($argv[1]) || $argv[1] != 'true') {
-	printf($pdo->log->setColor('Yellow') . "This script is used when you have switched UseNet Providers(USP) so you can pickup where you left off, rather than resetting all the groups.\nOnly use this script after you have updated your config.php file with your new USP info!!\nMake sure you " . $pdo->log->setColor('Red', 'Bold') . "DO NOT" . $pdo->log->setcolor('Yellow') . " have any update or postprocess scripts running when running this script!\n\n" . $pdo->log->setColor('Cyan') . "Usage: php change_USP_provider true\n");
-	exit();
-}
-
-
-$groups = $pdo->query("SELECT id, name, first_record_postdate, last_record_postdate FROM groups WHERE active = 1");
-$numofgroups = count($groups);
-$guesstime = $numofgroups * 2;
-$totalstart = microtime(true);
-
-echo "You have $numofgroups active, it takes about 2 minutes on average to processes each group.\n";
-foreach ($groups as $group) {
-	$starttime = microtime(true);
-	$nntp = new \NNTP(['Settings' => $pdo]);
-	if ($nntp->doConnect() !== true) {
-		return;
-	}
-	//printf("Updating group ".$group['name']."..\n");
-	$bfdays = daysOldstr($group['first_record_postdate']);
-	$currdays = daysOldstr($group['last_record_postdate']);
-	$bfartnum = daytopost($nntp, $group['name'], $bfdays, true, true);
-	echo "Our Current backfill postdate was: " . $pdo->log->setColor('Yellow') . date('r', strtotime($group['first_record_postdate'])) . $pdo->log->rsetcolor() . "\n";
-	$currartnum = daytopost($nntp, $group['name'], $currdays, true, false);
-	echo "Our Current current postdate was: " . $pdo->log->setColor('Yellow') . date('r', strtotime($group['last_record_postdate'])) . $pdo->log->rsetcolor() . "\n";
-	$pdo->queryExec(sprintf("UPDATE groups SET first_record = %s, last_record = %s WHERE id = %d", $pdo->escapeString($bfartnum), $pdo->escapeString($currartnum), $group['id']));
-	$endtime = microtime(true);
-	echo $pdo->log->setColor('Gray', 'Dim') . "This group took " . gmdate("H:i:s", $endtime - $starttime) . " to process.\n";
-	$numofgroups--;
-	echo "There are " . $numofgroups . " left to process.\n\n" . $pdo->log->rsetcolor() . "";
-}
-
-$totalend = microtime(true);
-echo $pdo->log->header('Total time to update all groups ' . gmdate("H:i:s", $totalend - $totalstart));
-
-// Truncate tables to complete the change to the new USP.
-$arr = array("parts", "partrepair", "binaries");
-foreach ($arr as &$value) {
-	$rel = $pdo->queryExec("TRUNCATE TABLE $value");
-	if ($rel !== false) {
-		echo $pdo->log->header("Truncating $value completed.");
-	}
-}
-unset($value);
-
-function daysOldstr($timestamp)
-{
-	return round((time() - strtotime($timestamp)) / 86400, 5);
-}
-
-function daysOld($timestamp)
-{
-	return round((time() - $timestamp) / 86400, 5);
-}
-
-// This function taken from lib/backfill.php, and modified to fit our needs.
-function daytopost($nntp, $group, $days, $debug = true, $bfcheck = true)
-{
-	global $pdo;
-
-	$st = false;
-	if ($debug && $bfcheck) {
-		echo $pdo->log->primary('Finding start and end articles for ' . $group . '.');
-	}
-
-	if (!isset($nntp)) {
-		$nntp = new \NNTP(['Settings' => $pdo]);
-		if ($nntp->doConnect(false) !== true) {
-			return;
-		}
-
-		$st = true;
-	}
-
-	$binaries = new \Binaries(['NNTP' => $nntp, 'Settings' => $pdo]);
-
-	$data = $nntp->selectGroup($group);
-	if ($nntp->isError($data)) {
-		$data = $nntp->dataError($nntp, $group, false);
-		if ($data === false) {
-			return;
-		}
-	}
-
-	// Goal timestamp.
-	$goaldate = date('U') - (86400 * $days);
-	$totalnumberofarticles = $data['last'] - $data['first'];
-	$upperbound = $data['last'];
-	$lowerbound = $data['first'];
-
-	if ($debug && $bfcheck) {
-		echo $pdo->log->header('Total Articles: ' . number_format($totalnumberofarticles) . ' Newest: ' . number_format($upperbound) . ' Oldest: ' . number_format($lowerbound));
-	}
-
-	if ($data['last'] == PHP_INT_MAX) {
-		exit($pdo->log->error("Group data is coming back as php's max value. You should not see this since we use a patched Net_NNTP that fixes this bug."));
-	}
-
-	$firstDate = $binaries->postdate($data['first'], $data);
-	$lastDate = $binaries->postdate($data['last'], $data);
-
-	if ($goaldate < $firstDate && $bfcheck) {
-		if ($st === true) {
-			$nntp->doQuit();
-		}
-		echo $pdo->log->warning("The oldest post indexed from $days day(s) ago is older than the first article stored on your news server.\nSetting to First available article of (date('r', $firstDate) or daysOld($firstDate) days).");
-		return $data['first'];
-	} else if ($goaldate > $lastDate && $bfcheck) {
-		if ($st === true) {
-			$nntp->doQuit();
-		}
-		echo $pdo->log->error("ERROR: The oldest post indexed from $days day(s) ago is newer than the last article stored on your news server.\nTo backfill this group you need to set Backfill Days to at least ceil(daysOld($lastDate)+1) days (date('r', $lastDate-86400).");
-		return '';
-	}
-
-	if ($debug && $bfcheck) {
-		echo $pdo->log->primary("Searching for postdates.\nGroup's Firstdate: " . $firstDate . ' (' . ((is_int($firstDate)) ? date('r', $firstDate) : 'n/a') . ").\nGroup's Lastdate: " . $lastDate . ' (' . date('r', $lastDate) . ").");
-	}
-
-	$interval = floor(($upperbound - $lowerbound) * 0.5);
-	$templowered = '';
-	$dateofnextone = $lastDate;
-	// Match on days not timestamp to speed things up.
-	while (daysOld($dateofnextone) < $days) {
-		while (($tmpDate = $binaries->postdate(($upperbound - $interval), $data)) > $goaldate) {
-			$upperbound = $upperbound - $interval;
-		}
-
-		if (!$templowered) {
-			$interval = ceil(($interval / 2));
-		}
-		$dateofnextone = $binaries->postdate(($upperbound - 1), $data);
-		while (!$dateofnextone) {
-			$dateofnextone = $binaries->postdate(($upperbound - 1), $data);
-		}
-	}
-	if ($st === true) {
-		$nntp->doQuit();
-	}
-	if ($bfcheck) {
-		echo $pdo->log->header("\nBackfill article determined to be " . $upperbound . " " . $pdo->log->setColor('Yellow') . "(" . date('r', $dateofnextone) . ")" . $pdo->log->rsetcolor());
-	} // which is '.daysOld($dateofnextone)." days old.\n";
-	else {
-		echo $pdo->log->header('Current article determined to be ' . $upperbound . " " . $pdo->log->setColor('Yellow') . "(" . date('r', $dateofnextone) . ")" . $pdo->log->rsetcolor());
-	} // which is '.daysOld($dateofnextone)." days old.\n";
-	return $upperbound;
-}
\ No newline at end of file
diff --git a/lib/testing/DB/convert_mysql_tables.php b/lib/testing/DB/convert_mysql_tables.php
deleted file mode 100644
index 2aebd9a5d..000000000
--- a/lib/testing/DB/convert_mysql_tables.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-//This script converts tables to myisam , innodb dynamic or innodb compressed. Run like this : php convert_mysql_tables.php dinnodb
-
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "lib/framework/db.php");
-
-$cli = new \ColorCLI();
-
-$pdo = new DB(['checkVersion' => true]);
-$ftinnodb = $pdo->isDbVersionAtLeast('5.6');
-
-if (isset($argv[1]) && isset($argv[2]) && $argv[2] == "fmyisam") {
-	$tbl = $argv[1];
-	printf($cli->header("Converting $tbl"));
-	$pdo->queryExec("ALTER TABLE $tbl ENGINE=MYISAM ROW_FORMAT=FIXED");
-} else if (isset($argv[1]) && isset($argv[2]) && $argv[2] == "dmyisam") {
-	$tbl = $argv[1];
-	printf($cli->header("Converting $tbl"));
-	$pdo->queryExec("ALTER TABLE $tbl ENGINE=MYISAM ROW_FORMAT=DYNAMIC");
-} else if (isset($argv[1]) && isset($argv[2]) && $argv[2] == "cinnodb") {
-	$tbl = $argv[1];
-	if ($ftinnodb || (!$ftinnodb && $tbl !== 'releasesearch' && $tbl !== 'predbhash')) {
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=COMPRESSED");
-	} else {
-		printf($cli->header("Not converting releasesearch / predbhash as your INNODB version does not support fulltext indexes"));
-	}
-} else if (isset($argv[1]) && isset($argv[2]) && $argv[2] == "dinnodb") {
-	$tbl = $argv[1];
-	if ($ftinnodb || (!$ftinnodb && $tbl !== 'releasesearch' && $tbl !== 'predbhash')) {
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=DYNAMIC");
-	} else {
-		printf($cli->header("Not converting releasesearch / predbhash as your INNODB version does not support fulltext indexes"));
-	}
-} else if (isset($argv[1]) && $argv[1] == "fmyisam") {
-	$sql = 'SHOW TABLE STATUS WHERE (Engine != "MyIsam" OR Row_format != "FIXED") AND Engine != "SPHINX"';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=MYISAM ROW_FORMAT=FIXED");
-	}
-} else if (isset($argv[1]) && $argv[1] == "dmyisam") {
-	$sql = 'SHOW TABLE STATUS WHERE (Engine != "MyIsam" OR Row_format != "Dynamic") AND Engine != "SPHINX"';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=MYISAM ROW_FORMAT=DYNAMIC");
-	}
-} else if (isset($argv[1]) && $argv[1] == "dinnodb") {
-	$sql = 'SHOW TABLE STATUS WHERE (Engine != "InnoDB" OR Row_format != "Dynamic") AND Engine != "SPHINX"';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		if ($tbl !== 'releasesearch' && $tbl !== 'predbhash') {
-			printf($cli->header("Converting $tbl"));
-			$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=DYNAMIC");
-		}
-	}
-	if ($ftinnodb) {
-		$sql = 'SHOW TABLE STATUS WHERE Name IN ("releasesearch", "predbhash") AND (Engine != "InnoDB" || Row_format != "Dynamic")';
-		$tables = $pdo->query($sql);
-		foreach ($tables as $row) {
-			$tbl = $row['name'];
-			printf($cli->header("Converting $tbl"));
-			$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=DYNAMIC");
-		}
-	} else {
-		printf($cli->header("Not converting releasesearch as your INNODB version does not support fulltext indexes"));
-	}
-} else if (isset($argv[1]) && $argv[1] == "cinnodb") {
-	$sql = 'SHOW TABLE STATUS WHERE (Engine != "InnoDB" OR Row_format != "Compressed") AND Engine != "SPHINX"';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		if ($tbl !== 'releasenfo' && $tbl !== 'releasesearch') {
-			printf($cli->header("Converting $tbl"));
-			$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=COMPRESSED");
-		}
-	}
-	$sql = 'SHOW TABLE STATUS WHERE Name = "releasenfo" AND (Engine != "InnoDB" || Row_format != "Dynamic")';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=DYNAMIC");
-	}
-	if ($ftinnodb) {
-		$sql = 'SHOW TABLE STATUS WHERE Name IN ("releasesearch", "predbhash") AND (Engine != "InnoDB" || Row_format != "Compressed")';
-		$tables = $pdo->query($sql);
-		foreach ($tables as $row) {
-			$tbl = $row['name'];
-			printf($cli->header("Converting $tbl"));
-			$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=COMPRESSED");
-		}
-	} else {
-		printf($cli->header("Not converting releasesearch / predbhash as your INNODB version does not support fulltext indexes"));
-	}
-} else if (isset($argv[1]) && $argv[1] == "cinnodb-noparts") {
-	$sql = 'SHOW TABLE STATUS WHERE (Engine != "InnoDB" OR Row_format != "Compressed") AND Engine != "SPHINX"';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		if ($tbl !== 'releasenfo' && $tbl !== 'releasesearch' && !preg_match('/parts/', $tbl)) {
-			printf($cli->header("Converting $tbl"));
-			$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=COMPRESSED");
-		}
-	}
-	$sql = 'SHOW TABLE STATUS WHERE Name = "releasenfo" AND (Engine != "InnoDB" || Row_format != "Dynamic")';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=DYNAMIC");
-	}
-	$sql = 'SHOW TABLE STATUS WHERE Name LIKE "parts%" AND (Engine != "MyISAM" || Row_format != "Dynamic")';
-	$tables = $pdo->query($sql);
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=MyISAM ROW_FORMAT=DYNAMIC");
-	}
-	if ($ftinnodb) {
-		$sql = 'SHOW TABLE STATUS WHERE Name IN ("releasesearch", "predbhash") AND (Engine != "InnoDB" || Row_format != "Compressed")';
-		$tables = $pdo->query($sql);
-		foreach ($tables as $row) {
-			$tbl = $row['name'];
-			printf($cli->header("Converting $tbl"));
-			$pdo->queryExec("ALTER TABLE $tbl ENGINE=INNODB ROW_FORMAT=COMPRESSED");
-		}
-	} else {
-		printf($cli->header("Not converting releasesearch / predbhash as your INNODB version does not support fulltext indexes"));
-	}
-} else if (isset($argv[1]) && $argv[1] == "binaries") {
-	$arr = array("parts", "binaries");
-	foreach ($arr as $row) {
-		$tbl = $row;
-		printf($cli->header("Converting $tbl"));
-		$pdo->queryExec("ALTER TABLE $tbl ENGINE=MYISAM ROW_FORMAT=FIXED");
-	}
-} else if (isset($argv[1]) && $argv[1] == "mariadb-tokudb") {
-	$tables = $pdo->query('SHOW TABLE STATUS WHERE (Engine != "TokuDB" OR Create_options != "`COMPRESSION`=tokudb_lzma") AND Engine != "SPHINX"');
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		if ($tbl !== 'releasesearch') {
-			printf($cli->header("Converting $tbl"));
-			$sql = "ALTER TABLE $tbl ENGINE=TokuDB Compression=tokudb_lzma";
-			$pdo->queryExec($sql);
-			$pdo->queryExec("OPTIMIZE TABLE $tbl");
-		}
-	}
-} else if (isset($argv[1]) && $argv[1] == "tokudb") {
-	$tables = $pdo->query('SHOW TABLE STATUS WHERE (Engine != "TokuDB" OR ROW_FORMAT="tokudb_lzma" OR Create_options != "`COMPRESSION`=tokudb_lzma") AND Engine != "SPHINX"');
-	foreach ($tables as $row) {
-		$tbl = $row['name'];
-		if ($tbl !== 'releasesearch') {
-			printf($cli->header("Converting $tbl"));
-			$sql = "ALTER TABLE $tbl ENGINE=TokuDB row_format=tokudb_lzma";
-			$pdo->queryExec($sql);
-			$pdo->queryExec("OPTIMIZE TABLE $tbl");
-		}
-	}
-} else {
-	exit($cli->error(
-		"\nThis script will convert your tables to a new engine/format. Only tables not meeting the new engine/format will be converted.\n"
-		. "A comparison of these, excluding TokuDB, https://github.com/nZEDb/nZEDb/wiki/MySQL-Storage-Engine-Comparison\n\n"
-		. "php convert_mysql_tables.php dmyisam                                        ...: Converts all the tables to Myisam Dynamic. This is the default and is recommended where ram is limited.\n"
-		. "php convert_mysql_tables.php fmyisam                                        ...: Converts all the tables to Myisam Fixed. This can be faster, but to fully convert all tables requires changing varchar columns to char.\n"
-		. "                                                                                 This will use much more space than dynamic.\n"
-		. "php convert_mysql_tables.php dinnodb                                        ...: Converts all the tables to InnoDB Dynamic. This is recommended when the total data and indexes can fit into the innodb_buffer_pool.\n"
-		. "                                                                                 NB if your innodb version < 5.6 releasesearch / predbhash will not be converted as fulltext indexes are not supported.\n"
-		. "php convert_mysql_tables.php cinnodb                                        ...: Converts all the tables to InnoDB Compressed. All tables except releasenfo will be converted to Compressed row format.\n"
-		. "                                                                                 This is recommended when the total data and indexes can not fit into the innodb_buffer_pool using DYNAMIC row format.\n"
-		. "                                                                                 NB if your innodb version < 5.6 releasesearch / predbhash will not be converted as fulltext indexes are not supported.\n"
-		. "php convert_mysql_tables.php cinnodb-noparts                                ...: Converts all the tables to InnoDB Compressed. All tables except parts and releasenfo will be converted to Compressed row format.\n"
-		. "                                                                                 Alls parts* will be converted to MyISAM Dynamic. This is recommended when using Table Per Group.\n"
-		. "                                                                                 NB if your innodb version < 5.6 releasesearch / predbhash will not be converted as fulltext indexes are not supported.\n"
-		. "php convert_mysql_tables.php binaries                                   	   ...: Converts binaries, parts to MyIsam.\n"
-		. "php convert_mysql_tables.php mariadb-tokudb                                 ...: Converts all the tables to MariaDB Tokutek DB. Use this is you installed mariadb-tokudb-engine. \n"
-		. "                                                                                 The TokuDB engine needs to be activated first.\n"
-		. "                                                                                 https://mariadb.com/kb/en/how-to-enable-tokudb-in-mariadb/\n"
-		. "                                                                                 NB releasesearch will not be converted as tokudb does not support fulltext indexes.\n"
-		. "php convert_mysql_tables.php tokudb                                         ...: Converts all the tables to Tokutek DB. Use this if you downloaded and installed the TokuDB binaries.\n"
-		. "                                                                                 http://www.tokutek.com/resources/support/gadownloads/\n"
-		. "                                                                                 NB releasesearch will not be converted as tokudb does not support fulltext indexes.\n"
-		. "php convert_mysql_tables.php table [ fmyisam, dmyisam, dinnodb, cinnodb ]   ...: Converts 1 table to Engine, row_format specified.\n"
-		. "                                                                                 NB if converting to innodb and your innodb version < 5.6 releasesearch / predbhash will not be converted as fulltext indexes are not supported.\n"
-	));
-}
\ No newline at end of file
diff --git a/lib/testing/DB/convert_to_tpg.php b/lib/testing/DB/convert_to_tpg.php
deleted file mode 100644
index a6685a581..000000000
--- a/lib/testing/DB/convert_to_tpg.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/site.php");
-
-
-/* This script will allow you to move from single collections/binaries/parts tables to TPG without having to run reset_truncate.
-  Please STOP all update scripts before running this script.
-
-  Use the following options to run:
-  php convert_to_tpg.php true               Convert c/b/p to tpg leaving current collections/binaries/parts tables in-tact.
-  php convert_to_tgp.php true delete        Convert c/b/p to tpg and TRUNCATE current collections/binaries/parts tables.
- */
-$debug = false;
-$pdo = new DB();
-$groups = new \Groups(['Settings' => $pdo]);
-$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-$s = new Sites();
-$site = $s->get();
-$DoPartRepair = ($site->partrepair == '0') ? false : true;
-
-if ((!isset($argv[1])) || $argv[1] != 'true') {
-	exit($pdo->log->error("\nMandatory argument missing\n\n"
-		. "This script will allow you to move from single collections/binaries/parts tables to TPG without having to run reset_truncate.\n"
-		. "Please STOP all update scripts before running this script.\n\n"
-		. "Use the following options to run:\n"
-		. "php $argv[0] true             ...: Convert b/p to tpg leaving current binaries/parts tables in-tact.\n"
-		. "php $argv[0] true delete      ...: Convert b/p to tpg and TRUNCATE current binaries/parts tables.\n"
-	));
-}
-
-$blen = $pdo->queryOneRow('SELECT COUNT(*) AS total FROM binaries;');
-$bdone = 0;
-$bcount = 1;
-$gdone = 1;
-$actgroups = $groups->getActive();
-$glen = count($actgroups);
-$newtables = $glen * 3;
-$begintime = time();
-
-echo "Creating new binaries, and parts tables for each active group...\n";
-
-foreach ($actgroups as $group) {
-	if ($groups->createNewTPGTables($group['id']) === false) {
-		exit($pdo->log->error("There is a problem creating new parts/files tables for group ${group['name']}."));
-	}
-	$consoletools->overWrite("Tables Created: " . $consoletools->percentString($gdone * 3, $newtables));
-	$gdone++;
-}
-$endtime = time();
-echo "\nTable creation took " . $consoletools->convertTime($endtime - $begintime) . ".\n";
-$starttime = time();
-echo "\nNew tables created, moving data from old tables to new tables.\nThis will take awhile....\n\n";
-while ($bdone < $blen['total']) {
-	// Only load 1000 binaries per loop to not overload memory.
-	$binaries = $pdo->queryAssoc('SELECT * FROM binaries LIMIT ' . $bdone . ',1000;');
-
-	if ($binaries instanceof \Traversable) {
-		foreach ($binaries as $binary) {
-			$binary['name'] = $pdo->escapeString($binary['name']);
-			$binary['fromname'] = $pdo->escapeString($binary['fromname']);
-			$binary['date'] = $pdo->escapeString($binary['date']);
-			$binary['binaryhash'] = $pdo->escapeString($binary['binarynhash']);
-			$binary['dateadded'] = $pdo->escapeString($binary['dateadded']);
-			$binary['xref'] = $pdo->escapeString($binary['xref']);
-			$binary['releaseid'] = $pdo->escapeString($binary['releaseid']);
-			$binary['categoryid'] = $pdo->escapeString($binary['categoryid']);
-			$binary['totalparts'] = $pdo->escapeString($binary['totalparts']);
-			$binary['relpart'] = $pdo->escapeString($binary['relpart']);
-			$binary['reltotalpart'] = $pdo->escapeString($binary['reltotalpart']);
-			$oldbid = array_shift($binary);
-
-			if ($debug) {
-				echo "\n\nBinaries insert:\n";
-				print_r($binary);
-				echo sprintf("\nINSERT INTO binaries_%d (name, fromname, date, xref, groupid,  dateadded, releaseid, categoryid, totalparts, binaryhash, relpart, reltotalpart) VALUES (%s)\n\n", $binary['groupid'], implode(', ', $binary));
-			}
-			$newbid = array('binaryid' => $pdo->queryInsert(sprintf('INSERT INTO binaries_%d (NAME, fromname, date, xref, groupid, dateadded, releaseid, categoryid, totalparts,  binaryhash, relpart, reltotalpart) VALUES (%s);', $binary['groupid'], implode(', ', $binarynew))));
-
-			//Get parts and split to correct group tables.
-			$parts = $pdo->queryAssoc('SELECT * FROM parts WHERE binaryid = ' . $oldbid . ';');
-			if ($parts instanceof \Traversable) {
-				$firstpart = true;
-				$partsnew = '';
-				foreach ($parts as $part) {
-					$oldpid = array_shift($part);
-					$partnew = array_replace($part, $newbid);
-
-					$partsnew .= '(\'' . implode('\', \'', $partnew) . '\'), ';
-				}
-				$partsnew = substr($partsnew, 0, -2);
-				if ($debug) {
-					echo "\n\nParts insert:\n";
-					echo sprintf("\nINSERT INTO parts_%d (binaryid, messageid, number, partnumber, size) VALUES %s;\n\n", $binary['groupid'], $partsnew);
-				}
-				$sql = sprintf('INSERT INTO parts_%d (binaryid, messageid, number, partnumber, size) VALUES %s;', $binary['groupid'], $partsnew);
-				$pdo->queryExec($sql);
-			}
-
-		}
-		$bcount++;
-	}
-	$bdone += 1000;
-}
-
-if ($DoPartRepair === true) {
-	foreach ($actgroups as $group) {
-		$pcount = 1;
-		$pdone = 0;
-		$sql = sprintf('SELECT COUNT(*) AS total FROM partrepair WHERE groupid = %d;', $group['id']);
-		$plen = $pdo->queryOneRow($sql);
-		while ($pdone < $plen['total']) {
-			// Only load 10000 partrepair records per loop to not overload memory.
-			$partrepairs = $pdo->queryAssoc(sprintf('SELECT * FROM partrepair WHERE groupid = %d LIMIT %d, 10000;', $group['id'], $pdone));
-			if ($partrepairs instanceof \Traversable) {
-				foreach ($partrepairs as $partrepair) {
-					$partrepair['numberid'] = $pdo->escapeString($partrepair['numberid']);
-					$partrepair['groupid'] = $pdo->escapeString($partrepair['groupid']);
-					$partrepair['attempts'] = $pdo->escapeString($partrepair['attempts']);
-					if ($debug) {
-						echo "\n\nPart Repair insert:\n";
-						print_r($partrepair);
-						echo sprintf("\nINSERT INTO partrepair_%d (numberid, groupid, attempts) VALUES (%s, %s, %s)\n\n", $group['id'], $partrepair['numberid'], $partrepair['groupid'], $partrepair['attempts']);
-					}
-					$pdo->queryExec(sprintf('INSERT INTO partrepair_%d (numberid, groupid, attempts) VALUES (%s, %s, %s);', $group['id'], $partrepair['numberid'], $partrepair['groupid'], $partrepair['attempts']));
-					$consoletools->overWrite('Part Repairs Completed for ' . $group['name'] . ':' . $consoletools->percentString($pcount, $plen['total']));
-					$pcount++;
-				}
-			}
-			$pdone += 10000;
-		}
-	}
-}
-
-$endtime = time();
-echo "\nTable population took " . $consoletools->convertTimer($endtime - $starttime) . ".\n";
-
-//Truncate old tables to save space.
-if (isset($argv[2]) && $argv[2] == 'delete') {
-	echo "Truncating old tables...\n";
-	$pdo->queryDirect('TRUNCATE TABLE binaries;');
-	$pdo->queryDirect('TRUNCATE TABLE parts');
-	$pdo->queryDirect('TRUNCATE TABLE partrepair');
-	echo "Complete.\n";
-}
-// Update TPG setting in site-edit.
-$pdo->queryExec('UPDATE site SET value = 1 WHERE setting = \'tablepergroup\';');
-$pdo->queryExec('UPDATE tmux SET value = 2 WHERE setting = \'releases\';');
-echo "New tables have been created.\nTable Per Group has been set to  to \"TRUE\" in site-edit.\nUpdate Releases has been set to Threaded in tmux-edit.\n";
-
-function multi_implode($array, $glue)
-{
-	$ret = '';
-
-	foreach ($array as $item) {
-		if (is_array($item)) {
-			$ret .= '(' . multi_implode($item, $glue) . '), ';
-		} else {
-			$ret .= $item . $glue;
-		}
-	}
-
-	$ret = substr($ret, 0, 0 - strlen($glue));
-
-	return $ret;
-}
\ No newline at end of file
diff --git a/lib/testing/DB/mysqldump_tables.php b/lib/testing/DB/mysqldump_tables.php
deleted file mode 100644
index a46d23d4d..000000000
--- a/lib/testing/DB/mysqldump_tables.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-
-//	This script can dump all tables or just collections/binaries/parts/partrepair/groups.
-
-$pdo = new DB();
-
-$exportopts = "";
-
-//determine mysql platform Percona or Other
-$mysqlplatform = exec('mysqladmin version | grep "Percona"');
-if (strlen($mysqlplatform) > 0) {
-	//Percona only has --innodb-optimize-keys
-	$exportopts = "--opt --innodb-optimize-keys --complete-insert --skip-quick";
-} else {
-	//generic (or unknown) instance of MySQL
-	$exportopts = "--opt --complete-insert --skip-quick";
-}
-
-
-function newname($filename)
-{
-	rename($filename, dirname($filename)."/".basename($filename,".gz")."_".date("Y_m_d_His", filemtime($filename)).".gz");
-}
-
-function builddefaultsfile()
-{
-	//generate file contents
-	$filetext = "[mysqldump]"
-				."\n"
-				."user = " . DB_USER
-				."\n"
-				."password = " . DB_PASSWORD
-				."\n[mysql]"
-				."\n"
-				."user = " . DB_USER
-				."\n"
-				."password = " . DB_PASSWORD;
-
-	$filehandle = fopen("mysql-defaults.txt", "w+");
-	if(!$filehandle) {
-		exit("Unable to write mysql defaults file! Exiting");
-	} else {
-		fwrite($filehandle, $filetext);
-		fclose($filehandle);
-		chmod("mysql-defaults.txt", 0600);
-	}
-}
-
-$dbhost = DB_HOST;
-$dbport = DB_PORT;
-$dbsocket = DB_SOCKET;
-$dbuser = DB_USER;
-$dbpass = DB_PASSWORD;
-$dbname = DB_NAME;
-
-if (DB_SOCKET != '') {
-	$use = "-S $dbsocket";
-} else {
-	$use = "-P$dbport";
-}
-
-//generate defaults file used to store database login information so it is not in cleartext in ps command for mysqldump
-builddefaultsfile();
-
-if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "dump") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$filename = $argv[3]."/".$dbname.".gz";
-	echo $pdo->log->header("Dumping $dbname.");
-	if (file_exists($filename)) {
-		newname($filename);
-	}
-	$command = "mysqldump --defaults-file=mysql-defaults.txt $exportopts -h$dbhost $use "."$dbname | gzip -9 > $filename";
-	system($command);
-} else if((isset($argv[1]) && $argv[1] == "db") && (isset($argv[2]) && $argv[2] == "restore") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$filename = $argv[3]."/".$dbname.".gz";
-	if (file_exists($filename)) {
-		echo $pdo->log->header("Restoring $dbname.");
-		$command = "zcat < $filename | mysql --defaults-file=mysql-defaults.txt -h$dbhost $use $dbname";
-		$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-		system($command);
-		$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-	}
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "dump") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	foreach($tables as $row) {
-		$tbl = $row['Tables_in_'.DB_NAME];
-		$filename = $argv[3]."/".$tbl.".gz";
-		echo $pdo->log->header("Dumping $tbl.");
-		if (file_exists($filename)) {
-			newname($filename);
-		}
-		$command = "mysqldump --defaults-file=mysql-defaults.txt $exportopts -h$dbhost $use "."$dbname $tbl | gzip -9 > $filename";
-		system($command);
-	}
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "restore") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-	foreach($tables as $row) {
-		$tbl = $row['Tables_in_'.DB_NAME];
-		$filename = $argv[3]."/".$tbl.".gz";
-		if (file_exists($filename)) {
-			echo $pdo->log->header("Restoring $tbl.");
-			$command = "zcat < $filename | mysql --defaults-file=mysql-defaults.txt -h$dbhost $use $dbname";
-			system($command);
-		}
-	}
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-} else if((isset($argv[1]) && $argv[1] == "test") && (isset($argv[2]) && $argv[2] == "dump") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$arr = array("parts", "binaries", "partrepair", "groups");
-	foreach ($arr as &$tbl) {
-		$filename = $argv[3]."/".$tbl.".gz";
-		echo $pdo->log->header("Dumping $tbl..");
-		if (file_exists($filename)) {
-			newname($filename);
-		}
-		$command = "mysqldump --defaults-file=mysql-defaults.txt $exportopts -h$dbhost $use "."$dbname $tbl | gzip -9 > $filename";
-		system($command);
-	}
-} else if((isset($argv[1]) && $argv[1] == "test") && (isset($argv[2]) && $argv[2] == "restore") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$arr = array("parts", "binaries", "partrepair", "groups");
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-	foreach ($arr as &$tbl) {
-		$filename = $argv[3]."/".$tbl.".gz";
-		if (file_exists($filename)) {
-			echo $pdo->log->header("Restoring $tbl.");
-			$command = "zcat < $filename | mysql --defaults-file=mysql-defaults.txt -h$dbhost $use $dbname";
-			system($command);
-		}
-	}
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "outfile") && (isset($argv[3]) && file_exists($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	foreach($tables as $row) {
-		$tbl = $row['Tables_in_'.DB_NAME];
-		$filename = $argv[3].$tbl.".csv";
-		echo $pdo->log->header("Dumping $tbl.");
-		if (file_exists($filename)) {
-			newname($filename);
-		}
-		$pdo->queryDirect(sprintf("SELECT * INTO OUTFILE %s FROM %s", $pdo->escapeString($filename), $tbl));
-	}
-} else if((isset($argv[1]) && $argv[1] == "all") && (isset($argv[2]) && $argv[2] == "infile") && (isset($argv[3]) && is_dir($argv[3]))) {
-	$sql = "SHOW tables";
-	$tables = $pdo->query($sql);
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=0");
-	foreach($tables as $row) {
-		$tbl = $row['Tables_in_'.DB_NAME];
-		$filename = $argv[3].$tbl.".csv";
-		if (file_exists($filename)) {
-			echo $pdo->log->header("Restoring $tbl.");
-			$pdo->queryExec(sprintf("LOAD DATA INFILE %s INTO TABLE %s", $pdo->escapeString($filename), $tbl));
-		}
-	}
-	$pdo->queryExec("SET FOREIGN_KEY_CHECKS=1");
-} else {
-	passthru("clear");
-	echo $pdo->log->error("\nThis script can dump/restore all tables, compressed or OUTFILE/INFILE, or just collections/binaries/parts.\n\n"
-	. "**Single File\n"
-	. "php $argv[0] db dump /path/to/save/to              ...: To dump the database.\n"
-	. "php $argv[0] db restore /path/to/restore/from      ...: To restore the database.\n\n"
-	. "**Individual Table Files\n"
-	. "php $argv[0] all dump /path/to/save/to             ...: To dump all tables.\n"
-	. "php $argv[0] all restore /path/to/restore/from     ...: To restore all tables.\n\n"
-	. "**Three Tables (collections, binaries, parts)\n"
-	. "php $argv[0] test dump /path/to/save/to            ...: To dump binaries and parts tables.\n"
-	. "php $argv[0] test restore /path/to/restore/from    ...: To restore binaries and parts tables.\n\n"
-	. "**Individal Files - OUTFILE/INFILE - No schema\n"
-	. "**MySQL MUST have write permissions to this path\n"
-	. "php $argv[0] all outfile /path/to/save/to          ...: To dump all tables, using OUTFILE.\n"
-	. "php $argv[0] all infile /path/to/restore/from      ...: To restore all tables, using INFILE.\n\n");
-}
-
-if(file_exists("mysql-defaults.txt")) {
-	@unlink("mysql-defaults.txt");
-}
\ No newline at end of file
diff --git a/lib/testing/DB/populate_nzb_guid.php b/lib/testing/DB/populate_nzb_guid.php
deleted file mode 100644
index 0ea19f9d7..000000000
--- a/lib/testing/DB/populate_nzb_guid.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-// This script updates all releases with the guid from the nzb file.
-
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/releases.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/util.php");
-
-$cli = new \ColorCLI();
-if (isset($argv[1])) {
-	$del = false;
-	if (isset($argv[2])) {
-		$del = $argv[2];
-	}
-	create_guids($argv[1], $del);
-} else {
-	exit($cli->error("\nThis script updates all releases with the guid (md5 hash of the first message-id) from the nzb file.\n\n"
-			. "php $argv[0] true         ...: To create missing nzb_guids.\n"
-			. "php $argv[0] true delete  ...: To create missing nzb_guids and delete invalid nzbs and releases.\n"));
-}
-
-function create_guids($live, $delete = false)
-{
-	$pdo = new DB();
-	$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-	$timestart = TIME();
-	$relcount = $deleted = $total = 0;
-
-	$relrecs = false;
-	if ($live == "true") {
-		$relrecs = $pdo->queryDirect(sprintf("SELECT id, guid FROM releases WHERE nzbstatus = 1 AND nzb_guid IS NULL ORDER BY id DESC"));
-	} else if ($live == "limited") {
-		$relrecs = $pdo->queryDirect(sprintf("SELECT id, guid FROM releases WHERE nzbstatus = 1 AND nzb_guid IS NULL ORDER BY id DESC LIMIT 10000"));
-	}
-	if ($relrecs) {
-		$total = $relrecs->rowCount();
-	}
-	if ($total > 0) {
-		echo $pdo->log->header("Creating nzb_guids for " . number_format($total) . " releases.");
-		$releases = new \Releases(['Settings' => $pdo]);
-		$nzb = new \NZB($pdo);
-		$releaseImage = new \ReleaseImage($pdo);
-		$reccnt = 0;
-		if ($relrecs instanceof \Traversable) {
-			foreach ($relrecs as $relrec) {
-				$reccnt++;
-				$nzbpath = $nzb->getNZBPath($relrec['guid']);
-				if ($nzbpath !== false) {
-					$nzbfile = Utility::unzipGzipFile($nzbpath);
-					if ($nzbfile) {
-						$nzbfile = @simplexml_load_string($nzbfile);
-					}
-					if (!$nzbfile) {
-						if (isset($delete) && $delete == 'delete') {
-							//echo "\n".$nzb->NZBPath($relrec['guid'])." is not a valid xml, deleting release.\n";
-							$releases->deleteSingle(['g' => $relrec['guid'], 'i' => $relrec['id']], $nzb, $releaseImage);
-							$deleted++;
-						}
-						continue;
-					}
-					$binary_names = array();
-					foreach ($nzbfile->file as $file) {
-						$binary_names[] = $file["subject"];
-					}
-					if (count($binary_names) == 0) {
-						if (isset($delete) && $delete == 'delete') {
-							//echo "\n".$nzb->NZBPath($relrec['guid'])." has no binaries, deleting release.\n";
-							$releases->deleteSingle(['g' => $relrec['guid'], 'i' => $relrec['id']], $nzb, $releaseImage);
-							$deleted++;
-						}
-						continue;
-					}
-
-					asort($binary_names);
-					foreach ($nzbfile->file as $file) {
-						if ($file["subject"] == $binary_names[0]) {
-							$segment = $file->segments->segment;
-							$nzb_guid = md5($segment);
-
-							$pdo->queryExec("UPDATE releases set nzb_guid = " . $pdo->escapestring($nzb_guid) . " WHERE id = " . $relrec["id"]);
-							$relcount++;
-							$consoletools->overWritePrimary("Created: [" . $deleted . "] " . $consoletools->percentString($reccnt, $total) . " Time:" . $consoletools->convertTimer(TIME() - $timestart));
-							break;
-						}
-					}
-				} else {
-					if (isset($delete) && $delete == 'delete') {
-						//echo $pdo->log->primary($nzb->NZBPath($relrec['guid']) . " does not have an nzb, deleting.");
-						$releases->deleteSingle(['g' => $relrec['guid'], 'i' => $relrec['id']], $nzb, $releaseImage);
-					}
-				}
-			}
-		}
-
-		if ($relcount > 0) {
-			echo "\n";
-		}
-		echo $pdo->log->header("Updated " . $relcount . " release(s). This script ran for " . $consoletools->convertTime(TIME() - $timestart));
-	} else {
-		echo $pdo->log->info('Query time: ' . $consoletools->convertTime(TIME() - $timestart));
-		exit($pdo->log->info("No releases are missing the guid."));
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/DB/rename_to_lower.php b/lib/testing/DB/rename_to_lower.php
deleted file mode 100644
index c72f28338..000000000
--- a/lib/testing/DB/rename_to_lower.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-passthru('clear');
-
-$pdo = new DB();
-
-if (!isset($argv[1]) || (isset($argv[1]) && $argv[1] !== 'true')) {
-	exit($pdo->log->error("\nThis script renames all table columns to lowercase, it can be dangerous. Please BACKUP your database before running this script.\n"
-		. "php rename_to_lower.php true      ...: To rename all table columns to lowercase.\n"));
-}
-
-echo $pdo->log->warning("This script renames all table colums to lowercase.");
-echo $pdo->log->header("Have you backed up your database? Type 'BACKEDUP' to continue:  \n");
-echo $pdo->log->warningOver("\n");
-$line = fgets(STDIN);
-if (trim($line) != 'BACKEDUP') {
-	exit($pdo->log->error("This script is dangerous you must type BACKEDUP for it function."));
-}
-
-echo "\n";
-echo $pdo->log->header("Thank you, continuing...\n\n");
-
-
-if ($argc == 1 || $argv[1] != 'true') {
-	exit($pdo->log->error("\nThis script will rename every table column to lowercase that is not already lowercase.\nTo run:\nphp $argv[0] true\n"));
-}
-
-$database = DB_NAME;
-
-$count = 0;
-$list = $pdo->query("SELECT TABLE_NAME, COLUMN_NAME, UPPER(COLUMN_TYPE), EXTRA FROM information_schema.columns WHERE table_schema = '" . $database . "'");
-if (count($list) == 0) {
-	echo $pdo->log->info("No table columns to rename");
-} else {
-	foreach ($list as $column) {
-		if ($column['column_name'] !== strtolower($column['column_name'])) {
-			echo $pdo->log->header("Renaming Table " . $column['table_name'] . " Column " . $column['column_name']);
-			if (isset($column['extra'])) {
-				$extra = strtoupper($column['extra']);
-			} else {
-				$extra = '';
-			}
-			$pdo->queryDirect("ALTER TABLE " . $column['table_name'] . " CHANGE " . $column['column_name'] . " " . strtolower($column['column_name']) . " " . $column['upper(column_type)'] . " " . $extra);
-			$count++;
-		}
-		if (strtolower($column['column_name']) === 'id' && strtolower($column['extra']) !== 'auto_increment') {
-			echo $pdo->log->header("Renaming Table " . $column['table_name'] . " Column " . $column['column_name']);
-			$extra = 'AUTO_INCREMENT';
-			if ($column['table_name'] != "releases_se") {
-				$placeholder = $pdo->queryDirect("SELECT MAX(id) FROM " . $column['table_name']);
-				$pdo->queryDirect("ALTER IGNORE TABLE " . $column['table_name'] . " CHANGE " . $column['column_name'] . " " . strtolower($column['column_name']) . " " . $column['upper(column_type)'] . " " . $extra);
-				$pdo->queryDirect("ALTER IGNORE TABLE " . $column['table_name'] . " AUTO_INCREMENT = " . $placeholder + 1);
-				$count++;
-			}
-		}
-	}
-}
-if ($count == 0) {
-	echo $pdo->log->info("All table column names are already lowercase");
-} else {
-	echo $pdo->log->header($count . " colums renamed");
-}
\ No newline at end of file
diff --git a/lib/testing/DB/reset_postprocessing.php b/lib/testing/DB/reset_postprocessing.php
deleted file mode 100644
index b759ba643..000000000
--- a/lib/testing/DB/reset_postprocessing.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-
-$pdo = new DB();
-$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-$ran = false;
-
-if (isset($argv[1]) && $argv[1] === "all") {
-	if (isset($argv[2]) && $argv[2] === "true") {
-		$ran = true;
-		$where = '';
-		if (isset($argv[3]) && $argv[3] === "truncate") {
-			echo "Truncating tables\n";
-			$pdo->queryExec("TRUNCATE TABLE consoleinfo");
-			$pdo->queryExec("TRUNCATE TABLE gamesinfo");
-			$pdo->queryExec("TRUNCATE TABLE movieinfo");
-			$pdo->queryExec("TRUNCATE TABLE releasevideo");
-			$pdo->queryExec("TRUNCATE TABLE musicinfo");
-			$pdo->queryExec("TRUNCATE TABLE bookinfo");
-			$pdo->queryExec("TRUNCATE TABLE releasenfo");
-			$pdo->queryExec("TRUNCATE TABLE releaseextrafull");
-			$pdo->queryExec("TRUNCATE TABLE xxxinfo");
-		}
-		echo $pdo->log->header("Resetting all postprocessing");
-		$qry = $pdo->queryDirect("SELECT id FROM releases");
-		$affected = 0;
-		if ($qry instanceof Traversable) {
-			$total = $qry->rowCount();
-			foreach ($qry as $releases) {
-				$pdo->queryExec(
-					sprintf("
-						UPDATE releases
-						SET consoleinfoid = NULL, gamesinfo_id = 0, imdbid = NULL, musicinfoid = NULL,
-							bookinfoid = NULL, rageid = -1, xxxinfo_id = 0, passwordstatus = -1, haspreview = -1,
-							jpgstatus = 0, videostatus = 0, audiostatus = 0, nfostatus = -1
-						WHERE id = %d",
-						$releases['id']
-					)
-				);
-				$consoletools->overWritePrimary("Resetting Releases:  " . $consoletools->percentString(++$affected, $total));
-			}
-		}
-	}
-}
-if (isset($argv[1]) && ($argv[1] === "consoles" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE consoleinfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all Console postprocessing");
-		$where = ' WHERE consoleinfoid IS NOT NULL';
-	} else {
-		echo $pdo->log->header("Resetting all failed Console postprocessing");
-		$where = " WHERE consoleinfoid IN (-2, 0) AND categoryid BETWEEN 1000 AND 1999";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	if ($qry !== false) {
-		$total = $qry->rowCount();
-	} else {
-		$total = 0;
-	}
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET consoleinfoid = NULL WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting Console Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " consoleinfoid's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "games" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE gamesinfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all Games postprocessing");
-		$where = ' WHERE gamesinfo_id != 0';
-	} else {
-		echo $pdo->log->header("Resetting all failed Games postprocessing");
-		$where = " WHERE gamesinfo_id IN (-2, 0) AND categoryid = 4050";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	if ($qry !== false) {
-		$total = $qry->rowCount();
-	} else {
-		$total = 0;
-	}
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET gamesinfo_id = 0 WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting Games Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-		echo $pdo->log->header("\n" . number_format($concount) . " gameinfo_ID's reset.");
-	}
-}
-if (isset($argv[1]) && ($argv[1] === "movies" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE movieinfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all Movie postprocessing");
-		$where = ' WHERE imdbid IS NOT NULL';
-	} else {
-		echo $pdo->log->header("Resetting all failed Movie postprocessing");
-		$where = " WHERE imdbid IN (-2, 0) AND categoryid BETWEEN 2000 AND 2999";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	if ($qry !== false) {
-		$total = $qry->rowCount();
-	} else {
-		$total = 0;
-	}
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET imdbid = NULL WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting Movie Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " imdbid's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "music" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE musicinfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all Music postprocessing");
-		$where = ' WHERE musicinfoid IS NOT NULL';
-	} else {
-		echo $pdo->log->header("Resetting all failed Music postprocessing");
-		$where = " WHERE musicinfoid IN (-2, 0) AND categoryid BETWEEN 3000 AND 3999";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	$total = $qry->rowCount();
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET musicinfoid = NULL WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting Music Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " musicinfoid's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "misc" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all Additional postprocessing");
-		$where = ' WHERE (haspreview != -1 AND haspreview != 0) OR (passwordstatus != -1 AND passwordstatus != 0) OR jpgstatus != 0 OR videostatus != 0 OR audiostatus != 0';
-	} else {
-		echo $pdo->log->header("Resetting all failed Additional postprocessing");
-		$where = " WHERE haspreview < -1 OR haspreview = 0 OR passwordstatus < -1 OR passwordstatus = 0 OR jpgstatus < 0 OR videostatus < 0 OR audiostatus < 0";
-	}
-
-	echo $pdo->log->primary("SELECT id FROM releases" . $where);
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	if ($qry !== false) {
-		$total = $qry->rowCount();
-	} else {
-		$total = 0;
-	}
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET passwordstatus = -1, haspreview = -1, jpgstatus = 0, videostatus = 0, audiostatus = 0 WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " Release's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "tv" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE tvrage");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all TV postprocessing");
-		$where = '  WHERE rageid != -1';
-	} else {
-		echo $pdo->log->header("Resetting all failed TV postprocessing");
-		$where = " WHERE rageid IN (-2, 0) OR rageid IS NULL AND categoryid BETWEEN 5000 AND 5999";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	if ($qry !== false) {
-		$total = $qry->rowCount();
-	} else {
-		$total = 0;
-	}
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET rageid = -1 WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting TV Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " rageid's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "books" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE bookinfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all Book postprocessing");
-		$where = ' WHERE bookinfoid IS NOT NULL';
-	} else {
-		echo $pdo->log->header("Resetting all failed Book postprocessing");
-		$where = " WHERE bookinfoid IN (-2, 0) AND categoryid BETWEEN 7000 AND 7899";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	$total = $qry->rowCount();
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET bookinfoid = NULL WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting Book Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " bookinfoid's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "xxx" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE xxxinfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all XXX postprocessing");
-		$where = ' WHERE xxxinfo_id != 0';
-	} else {
-		echo $pdo->log->header("Resetting all failed XXX postprocessing");
-		$where = " WHERE xxxinfo_id IN (-2, 0) AND categoryid BETWEEN 6000 AND 6040";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		$total = $qry->rowCount();
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET xxxinfo_id = 0 WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting XXX Releases:  " . $consoletools->percentString(++$concount,
-					$total
-				)
-			);
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " xxxinfo_ID's reset.");
-}
-if (isset($argv[1]) && ($argv[1] === "nfos" || $argv[1] === "all")) {
-	$ran = true;
-	if (isset($argv[3]) && $argv[3] === "truncate") {
-		$pdo->queryExec("TRUNCATE TABLE releasenfo");
-	}
-	if (isset($argv[2]) && $argv[2] === "true") {
-		echo $pdo->log->header("Resetting all NFO postprocessing");
-		$where = ' WHERE nfostatus != -1';
-	} else {
-		echo $pdo->log->header("Resetting all failed NFO postprocessing");
-		$where = " WHERE nfostatus < -1";
-	}
-
-	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
-	$concount = 0;
-	if ($qry instanceof Traversable) {
-		$total = $qry->rowCount();
-		foreach ($qry as $releases) {
-			$pdo->queryExec("UPDATE releases SET nfostatus = -1 WHERE id = " . $releases['id']);
-			$consoletools->overWritePrimary("Resetting NFO Releases:  " . $consoletools->percentString(++$concount, $total));
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($concount) . " NFO's reset.");
-}
-
-if ($ran === false) {
-	exit(
-	$pdo->log->error(
-		"\nThis script will reset postprocessing per category. It can also truncate the associated tables."
-		. "\nTo reset only those that have previously failed, those without covers, samples, previews, etc. use the "
-		. "second argument false.\n"
-		. "To reset even those previously post processed, use the second argument true.\n"
-		. "To truncate the associated table, use the third argument truncate.\n\n"
-		. "php reset_postprocessing.php consoles true    ...: To reset all consoles.\n"
-		. "php reset_postprocessing.php games true       ...: To reset all games.\n"
-		. "php reset_postprocessing.php movies true      ...: To reset all movies.\n"
-		. "php reset_postprocessing.php music true       ...: To reset all music.\n"
-		. "php reset_postprocessing.php misc true        ...: To reset all misc.\n"
-		. "php reset_postprocessing.php tv true          ...: To reset all tv.\n"
-		. "php reset_postprocessing.php books true       ...: To reset all books.\n"
-		. "php reset_postprocessing.php xxx true         ...: To reset all xxx.\n"
-		. "php reset_postprocessing.php nfos true        ...: To reset all nfos.\n"
-		. "php reset_postprocessing.php all true         ...: To reset everything.\n"
-	)
-	);
-} else {
-	echo "\n";
-}
\ No newline at end of file
diff --git a/lib/testing/DB/reset_truncate.php b/lib/testing/DB/reset_truncate.php
deleted file mode 100644
index b5587cb12..000000000
--- a/lib/testing/DB/reset_truncate.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-// This script removes releases with no NZBs, resets all groups, truncates article tables. All other releases are left alone.
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/site.php");
-
-$pdo = new DB();
-$s = new Sites();
-$site = $s->get();
-
-if (isset($argv[1]) && ($argv[1] == "true" || $argv[1] == "drop")) {
-	$pdo->queryExec("UPDATE groups SET first_record = 0, first_record_postdate = NULL, last_record = 0, last_record_postdate = NULL, last_updated = NULL");
-	echo $pdo->log->primary("Reseting all groups completed.");
-
-	$arr = array("parts", "partrepair", "binaries");
-	foreach ($arr as &$value) {
-		$rel = $pdo->queryExec("TRUNCATE TABLE $value");
-		if ($rel !== false) {
-			echo $pdo->log->primary("Truncating ${value} completed.");
-		}
-	}
-	unset($value);
-
-	$tpg = $site->tablepergroup;
-	$tablepergroup = (!empty($tpg)) ? $tpg : 0;
-
-	if ($tablepergroup == 1) {
-		$sql = 'SHOW table status';
-
-		$tables = $pdo->query($sql);
-		foreach ($tables as $row) {
-			$tbl = $row['name'];
-			if (preg_match('/binaries_\d+/', $tbl) || preg_match('/parts_\d+/', $tbl) || preg_match('/partrepair_\d+/', $tbl) || preg_match('/\d+_binaries/', $tbl) || preg_match('/\d+_parts/', $tbl) || preg_match('/\d+_partrepair_\d+/', $tbl)) {
-				if ($argv[1] == "drop") {
-					$rel = $pdo->queryDirect(sprintf('DROP TABLE %s', $tbl));
-					if ($rel !== false) {
-						echo $pdo->log->primary("Dropping ${tbl} completed.");
-					}
-				} else {
-					$rel = $pdo->queryDirect(sprintf('TRUNCATE TABLE %s', $tbl));
-					if ($rel !== false) {
-						echo $pdo->log->primary("Truncating ${tbl} completed.");
-					}
-				}
-			}
-		}
-	}
-
-	$delcount = $pdo->queryDirect("DELETE FROM releases WHERE nzbstatus = 0");
-	echo $pdo->log->primary($delcount->rowCount() . " releases had no nzb, deleted.");
-} else {
-	exit($pdo->log->error("\nThis script removes releases with no NZBs, resets all groups, truncates or drops(tpg) \n"
-		. "article tables. All other releases are left alone.\n"
-		. "php $argv[0] [true, drop]   ...: To reset all groups and truncate/drop the tables.\n"
-	));
-}
\ No newline at end of file
diff --git a/lib/testing/DB/resetdb.php b/lib/testing/DB/resetdb.php
deleted file mode 100644
index 11e21ef6a..000000000
--- a/lib/testing/DB/resetdb.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/releaseimage.php");
-require_once(WWW_DIR . "/lib/nzb.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/SphinxSearch.php");
-
-passthru('clear');
-$pdo = new DB();
-
-if (!isset($argv[1]) || (isset($argv[1]) && $argv[1] !== 'true'))
-	exit($pdo->log->error("\nThis script removes all releases and release related files. To run:\nphp resetdb.php true\n"));
-
-echo $pdo->log->warning("This script removes all releases, nzb files, samples, previews , nfos, truncates all article tables and resets all groups.");
-echo $pdo->log->header("Are you sure you want reset the DB?  Type 'DESTROY' to continue:  \n");
-echo $pdo->log->warningOver("\n");
-$line = fgets(STDIN);
-if (trim($line) != 'DESTROY')
-	exit($pdo->log->error("This script is dangerous you must type DESTROY for it function."));
-
-echo "\n";
-echo $pdo->log->header("Thank you, continuing...\n\n");
-
-$timestart = time();
-$relcount = 0;
-$ri = new \ReleaseImage($pdo);
-$nzb = new \NZB($pdo);
-$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-
-$pdo->queryExec("UPDATE groups SET first_record = 0, first_record_postdate = NULL, last_record = 0, last_record_postdate = NULL, last_updated = NULL");
-echo $pdo->log->primary("Reseting all groups completed.");
-
-$arr = [
-		"tvrage", "releasenfo", "releasecomment", 'sharing', 'sharing_sites',
-		"usercart", "usermovies", "userseries", "movieinfo", "musicinfo", "releasefiles",
-		"releaseaudio", "releasesubs", "releasevideo", "releaseextrafull", "parts",
-		"partrepair", "binaries", "releases"
-];
-foreach ($arr as &$value) {
-	$rel = $pdo->queryExec("TRUNCATE TABLE $value");
-	if ($rel !== false)
-		echo $pdo->log->primary("Truncating ${value} completed.");
-}
-unset($value);
-
-$sql = "SHOW table status";
-
-$tables = $pdo->query($sql);
-foreach ($tables as $row) {
-	$tbl = $row['name'];
-	if (preg_match('/binaries_\d+/', $tbl) || preg_match('/parts_\d+/', $tbl) || preg_match('/partrepair_\d+/', $tbl) || preg_match('/\d+_binaries/', $tbl) || preg_match('/\d+_parts/', $tbl) || preg_match('/\d+_partrepair_\d+/', $tbl)) {
-		$rel = $pdo->queryDirect(sprintf('DROP TABLE %s', $tbl));
-		if ($rel !== false)
-			echo $pdo->log->primary("Dropping ${tbl} completed.");
-	}
-}
-
-(new \SphinxSearch())->truncateRTIndex('releases_rt');
-
-$pdo->optimise(false, 'full');
-$s = new Sites();
-$site = $s->get();
-
-echo $pdo->log->header("Deleting nzbfiles subfolders.");
-try {
-	$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($site->nzbpath, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST);
-	foreach ($files as $file) {
-		if (basename($file) != '.gitignore' && basename($file) != 'tmpunrar') {
-			$todo = ($file->isDir() ? 'rmdir' : 'unlink');
-			@$todo($file);
-		}
-	}
-} catch (UnexpectedValueException $e) {
-	echo $pdo->log->error($e->getMessage());
-}
-
-echo $pdo->log->header("Deleting all images, previews and samples that still remain.");
-try {
-	$dirItr = new \RecursiveDirectoryIterator(NN_COVERS);
-	$itr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::LEAVES_ONLY);
-	foreach ($itr as $filePath) {
-		if (basename($filePath) != '.gitignore' && basename($filePath) != 'no-cover.jpg' && basename($filePath) != 'no-backdrop.jpg') {
-			@unlink($filePath);
-		}
-	}
-} catch (UnexpectedValueException $e) {
-	echo $pdo->log->error($e->getMessage());
-}
-
-echo $pdo->log->header("Getting Updated List of TV Shows from TVRage.");
-$tvshows = @simplexml_load_file('http://services.tvrage.com/feeds/show_list.php');
-if ($tvshows !== false) {
-	foreach ($tvshows->show as $rage) {
-		if (isset($rage->id) && isset($rage->name) && !empty($rage->id) && !empty($rage->name))
-			$pdo->queryInsert(sprintf('INSERT INTO tvrage (rageid, releasetitle, country) VALUES (%s, %s, %s)', $pdo->escapeString($rage->id), $pdo->escapeString($rage->name), $pdo->escapeString($rage->country)));
-	}
-} else {
-	echo $pdo->log->error("TVRage site has a hard limit of 400 concurrent api requests. At the moment, they have reached that limit. Please wait before retrying again.");
-}
-
-echo $pdo->log->header("Deleted all releases, images, previews and samples. This script ran for " . $consoletools->convertTime(TIME() - $timestart));
\ No newline at end of file
diff --git a/lib/testing/Dev/renametopre.php b/lib/testing/Dev/renametopre.php
deleted file mode 100644
index 24dd03638..000000000
--- a/lib/testing/Dev/renametopre.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-// TODO: bunch of if/elses need converting to switches
-
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/groups.php");
-require_once(WWW_DIR . "/lib/Categorize.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-require_once(WWW_DIR . "/lib/releasefiles.php");
-require_once(NN_TMUX . 'lib' . DS . 'ReleaseCleaner.php');
-
-/*
- *
- * This was added because I starting writing this before
- * all of the regexes were converted to by group in ReleaseCleaning.php
- * and I do not want to convert these regexes to run per group.
- * ReleaseCleaning.php is where the regexes should go
- * so that all new releases can be effected by them
- * instead of having to run this script to rename after the
- * release has been created
- *
- */
-$pdo = new DB();
-
-if (!(isset($argv[1]) && ($argv[1] == "all" || $argv[1] == "full" || $argv[1] == "preid" || is_numeric($argv[1])))) {
-	exit($pdo->log->error(
-		"\nThis script will attempt to rename releases using regexes first from ReleaseCleaning.php and then from this file.\n"
-		. "An optional last argument, show, will display the release name changes.\n\n"
-		. "php $argv[0] full                    ...: To process all releases not previously renamed.\n"
-		. "php $argv[0] 2                       ...: To process all releases added in the previous 2 hours not previously renamed.\n"
-		. "php $argv[0] all                     ...: To process all releases.\n"
-		. "php $argv[0] full 155                ...: To process all releases in groupid 155 not previously renamed.\n"
-		. "php $argv[0] all 155                 ...: To process all releases in groupid 155.\n"
-		. "php $argv[0] all '(155, 140)'        ...: To process all releases in group_ids 155 and 140.\n"
-		. "php $argv[0] preid                   ...: To process all releases where not matched to predb.\n"
-	));
-}
-preName($argv, $argc);
-
-function preName($argv, $argc)
-{
-	global $pdo;
-	$groups = new \Groups(['Settings' => $pdo]);
-	$category = new \Categorize(['Settings' => $pdo]);
-	$internal = $external = $pre = 0;
-	$show = 2;
-	if ($argv[$argc - 1] === 'show') {
-		$show = 1;
-	} else if ($argv[$argc - 1] === 'bad') {
-		$show = 3;
-	}
-	$counter = 0;
-	$pdo->log = new \ColorCLI();
-	$full = $all = $usepre = false;
-	$what = $where = '';
-	if ($argv[1] === 'full') {
-		$full = true;
-	} else if ($argv[1] === 'all') {
-		$all = true;
-	} else if ($argv[1] === 'preid') {
-		$usepre = true;
-	} else if (is_numeric($argv[1])) {
-		$what = ' AND adddate > NOW() - INTERVAL ' . $argv[1] . ' HOUR';
-	}
-	if ($usepre === true) {
-		$where = '';
-		$why = ' WHERE prehashid = 0 AND nzbstatus = 1';
-	} else if (isset($argv[1]) && is_numeric($argv[1])) {
-		$where = '';
-		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
-	} else if (isset($argv[2]) && is_numeric($argv[2]) && $full === true) {
-		$where = ' AND groupid = ' . $argv[2];
-		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
-	} else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $full === true) {
-		$where = ' AND groupid IN ' . $argv[2];
-		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
-	} else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $all === true) {
-		$where = ' AND groupid IN ' . $argv[2];
-		$why = ' WHERE nzbstatus = 1';
-	} else if (isset($argv[2]) && is_numeric($argv[2]) && $all === true) {
-		$where = ' AND groupid = ' . $argv[2];
-		$why = ' WHERE nzbstatus = 1 and prehashid = 0';
-	} else if (isset($argv[2]) && is_numeric($argv[2])) {
-		$where = ' AND groupid = ' . $argv[2];
-		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
-	} else if ($full === true) {
-		$why = ' WHERE nzbstatus = 1 AND (isrenamed = 0 OR categoryid between 8000 AND 8999)';
-	} else if ($all === true) {
-		$why = ' WHERE nzbstatus = 1';
-	} else {
-		$why = ' WHERE 1=1';
-	}
-	resetSearchnames();
-	echo $pdo->log->header(
-		"SELECT id, name, searchname, fromname, size, groupid, categoryid FROM releases" . $why . $what .
-		$where . ";\n"
-	);
-	$res = $pdo->queryDirect("SELECT id, name, searchname, fromname, size, groupid, categoryid FROM releases" . $why . $what . $where);
-	$total = $res->rowCount();
-	if ($total > 0) {
-		$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-		foreach ($res as $row) {
-			$groupname = $groups->getByNameByID($row['groupid']);
-			$cleanerName = releaseCleaner($row['name'], $row['fromname'], $groupname, $usepre);
-			$preid = 0;
-			$predb = $predbfile = $increment = false;
-			if (!is_array($cleanerName)) {
-				$cleanName = trim((string)$cleanerName);
-				$propername = $increment = true;
-				if ($cleanName != '' && $cleanerName != false) {
-					$run = $pdo->queryOneRow("SELECT id FROM prehash WHERE title = " . $pdo->escapeString($cleanName));
-					if (isset($run['id'])) {
-						$preid = $run['id'];
-						$predb = true;
-					}
-				}
-			} else {
-				$cleanName = trim($cleanerName["cleansubject"]);
-				$propername = $cleanerName["properlynamed"];
-				if (isset($cleanerName["increment"])) {
-					$increment = $cleanerName["increment"];
-				}
-				if (isset($cleanerName["predb"])) {
-					$preid = $cleanerName["predb"];
-					$predb = true;
-				}
-			}
-			if ($cleanName != '') {
-				if (preg_match('/alt\.binaries\.e\-?book(\.[a-z]+)?/', $groupname)) {
-					if (preg_match('/^[0-9]{1,6}-[0-9]{1,6}-[0-9]{1,6}$/', $cleanName, $match)) {
-						$rf = new \ReleaseFiles($pdo);
-						$files = $rf->get($row['id']);
-						foreach ($files as $f) {
-							if (preg_match(
-								'/^(?P<title>.+?)(\\[\w\[\]\(\). -]+)?\.(pdf|htm(l)?|epub|mobi|azw|tif|doc(x)?|lit|txt|rtf|opf|fb2|prc|djvu|cb[rz])/', $f["name"],
-								$match
-							)
-							) {
-								$cleanName = $match['title'];
-								break;
-							}
-						}
-					}
-				}
-					//try to match clean name against predb filename
-					$prefile = $pdo->queryOneRow("SELECT id, title FROM prehash WHERE filename = " . $pdo->escapeString($cleanName));
-					if (isset($prefile['id'])) {
-						$preid = $prefile['id'];
-						$cleanName = $prefile['title'];
-						$predbfile = true;
-						$propername = true;
-					}
-				if ($cleanName != $row['name'] && $cleanName != $row['searchname']) {
-					if (strlen(utf8_decode($cleanName)) <= 3) {
-					} else {
-						$determinedcat = $category->determineCategory($row["groupid"], $cleanName);
-						if ($propername == true) {
-							$pdo->queryExec(
-								sprintf(
-									"UPDATE releases SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL, tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL, consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL, "
-									. "iscategorized = 1, isrenamed = 1, searchname = %s, categoryid = %d, prehashid = " . $preid . " WHERE id = %d", $pdo->escapeString($cleanName), $determinedcat, $row['id']
-								)
-							);
-						} else {
-							$pdo->queryExec(
-								sprintf(
-									"UPDATE releases SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL, tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL, consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL,  "
-									. "iscategorized = 1, searchname = %s, categoryid = %d, prehashid = " . $preid . " WHERE id = %d", $pdo->escapeString($cleanName), $determinedcat, $row['id']
-								)
-							);
-						}
-						if ($increment === true) {
-							$internal++;
-						} else if ($predb === true) {
-							$pre++;
-						} else if ($predbfile === true) {
-							$pre++;
-						} else if ($propername === true) {
-							$external++;
-						}
-						if ($show === 1) {
-							$oldcatname = $category->getNameByID($row["categoryid"]);
-							$newcatname = $category->getNameByID($determinedcat);
-
-							\NameFixer::echoChangedReleaseName(array(
-									'new_name'     => $cleanName,
-									'old_name'     => $row["searchname"],
-									'new_category' => $newcatname,
-									'old_category' => $oldcatname,
-									'group'        => $groupname,
-									'release_id'   => $row["id"],
-									'method'       => 'lib/testing/Dev/renametopre.php'
-								)
-							);
-						}
-					}
-				} else if ($show === 3 && preg_match('/^\[?\d*\].+?yEnc/i', $row['name'])) {
-					echo $pdo->log->primary($row['name']);
-				}
-			}
-			if ($cleanName == $row['name']) {
-				$pdo->queryExec(sprintf("UPDATE releases SET isrenamed = 1, iscategorized = 1 WHERE id = %d", $row['id']));
-			}
-			if ($show === 2 && $usepre === false) {
-				$consoletools->overWritePrimary("Renamed Releases:  [Internal=" . number_format($internal) . "][External=" . number_format($external) . "][Predb=" . number_format($pre) . "] " . $consoletools->percentString(++$counter, $total));
-			} else if ($show === 2 && $usepre === true) {
-				$consoletools->overWritePrimary("Renamed Releases:  [" . number_format($pre) . "] " . $consoletools->percentString(++$counter, $total));
-			}
-		}
-	}
-	echo $pdo->log->header("\n" . number_format($pre) . " renamed using preDB Match\n" . number_format($external) . " renamed using ReleaseCleaning.php\n" . number_format($internal) . " using renametopre.php\nout of " . number_format($total) . " releases.\n");
-	if (isset($argv[1]) && is_numeric($argv[1]) && !isset($argv[2])) {
-		echo $pdo->log->header("Categorizing all releases using searchname from the last ${argv[1]} hours. This can take a while, be patient.");
-	} else if (isset($argv[1]) && $argv[1] !== "all" && isset($argv[2]) && !is_numeric($argv[2]) && !preg_match('/\([\d, ]+\)/', $argv[2])) {
-		echo $pdo->log->header("Categorizing all non-categorized releases in other->misc using searchname. This can take a while, be patient.");
-	} else if (isset($argv[1]) && isset($argv[2]) && (is_numeric($argv[2]) || preg_match('/\([\d, ]+\)/', $argv[2]))) {
-		echo $pdo->log->header("Categorizing all non-categorized releases in ${argv[2]} using searchname. This can take a while, be patient.");
-	} else {
-		echo $pdo->log->header("Categorizing all releases using searchname. This can take a while, be patient.");
-	}
-	$timestart = TIME();
-	if (isset($argv[1]) && is_numeric($argv[1])) {
-		$relcount = catRelease("searchname", "WHERE (iscategorized = 0 OR categoryid = 8010) AND adddate > NOW() - INTERVAL " . $argv[1] . " HOUR", true);
-	} else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $full === true) {
-		$relcount = catRelease("searchname", str_replace(" AND", "WHERE", $where) . " AND iscategorized = 0 ", true);
-	} else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $all === true) {
-		$relcount = catRelease("searchname", str_replace(" AND", "WHERE", $where), true);
-	} else if (isset($argv[2]) && is_numeric($argv[2]) && $argv[1] == "full") {
-		$relcount = catRelease("searchname", str_replace(" AND", "WHERE", $where) . " AND iscategorized = 0 ", true);
-	} else if (isset($argv[2]) && is_numeric($argv[2]) && $argv[1] == "all") {
-		$relcount = catRelease("searchname", str_replace(" AND", "WHERE", $where), true);
-	} else if (isset($argv[1]) && $argv[1] == "full") {
-		$relcount = catRelease("searchname", "WHERE categoryid = 8010 OR iscategorized = 0", true);
-	} else if (isset($argv[1]) && $argv[1] == "all") {
-		$relcount = catRelease("searchname", "", true);
-	} else if (isset($argv[1]) && $argv[1] == "preid") {
-		$relcount = catRelease("searchname", "WHERE prehashid = 0 AND nzbstatus = 1", true);
-	} else {
-		$relcount = catRelease("searchname", "WHERE (iscategorized = 0 OR categoryid = 8010) AND adddate > NOW() - INTERVAL " . $argv[1] . " HOUR", true);
-	}
-	$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-	$time = $consoletools->convertTime(TIME() - $timestart);
-	echo $pdo->log->header("Finished categorizing " . number_format($relcount) . " releases in " . $time . " seconds, using the usenet subject.\n");
-	resetSearchnames();
-}
-
-function resetSearchnames()
-{
-	global $pdo;
-	echo $pdo->log->header("Resetting blank searchnames.");
-	$bad = $pdo->queryDirect(
-		"UPDATE releases SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL, tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL, consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL, "
-		. "prehashid = 0, searchname = name, isrenamed = 0, iscategorized = 0 WHERE searchname = ''"
-	);
-	$tot = $bad->rowCount();
-	if ($tot > 0) {
-		echo $pdo->log->primary(number_format($tot) . " Releases had no searchname.");
-	}
-	echo $pdo->log->header("Resetting searchnames that are 8 characters or less.");
-	$run = $pdo->queryDirect(
-		"UPDATE releases SET rageid = -1, seriesfull = NULL, season = NULL, episode = NULL, tvtitle = NULL, tvairdate = NULL, imdbid = NULL, musicinfoid = NULL, consoleinfoid = NULL, bookinfoid = NULL, anidbid = NULL, "
-		. "prehashid = 0, searchname = name, isrenamed = 0, iscategorized = 0 WHERE LENGTH(searchname) <= 8 AND LENGTH(name) > 8"
-	);
-	$total = $run->rowCount();
-	if ($total > 0) {
-		echo $pdo->log->primary(number_format($total) . " Releases had searchnames that were 8 characters or less.");
-	}
-}
-
-// Categorizes releases.
-// $type = name or searchname
-// Returns the quantity of categorized releases.
-function catRelease($type, $where, $echooutput = false)
-{
-	global $pdo;
-	$cat = new \Categorize(['Settings' => $pdo]);
-	$consoletools = new \ConsoleTools(['ColorCLI' => $pdo->log]);
-	$relcount = 0;
-	echo $pdo->log->primary("SELECT id, " . $type . ", groupid FROM releases " . $where);
-	$resrel = $pdo->queryDirect("SELECT id, " . $type . ", groupid FROM releases " . $where);
-	$total = $resrel->rowCount();
-	if ($total > 0) {
-		foreach ($resrel as $rowrel) {
-			$catId = $cat->determineCategory($rowrel['groupid'], $rowrel[$type]);
-			$pdo->queryExec(sprintf("UPDATE releases SET iscategorized = 1, categoryid = %d WHERE id = %d", $catId, $rowrel['id']));
-			$relcount++;
-			if ($echooutput) {
-				$consoletools->overWritePrimary("Categorizing: " . $consoletools->percentString($relcount, $total));
-			}
-		}
-	}
-	if ($echooutput !== false && $relcount > 0) {
-		echo "\n";
-	}
-	return $relcount;
-}
-
-function releaseCleaner($subject, $fromName, $groupname, $usepre)
-{
-	$groups = new \Groups();
-	$releaseCleaning = new \ReleaseCleaning($groups->pdo);
-	$cleanerName = $releaseCleaning->releaseCleaner($subject, $fromName, $groupname, $usepre);
-	if (!is_array($cleanerName) && $cleanerName != false) {
-		return array("cleansubject" => $cleanerName, "properlynamed" => true, "increment" => false);
-	} else {
-		return $cleanerName;
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/getConsole.php b/lib/testing/PostProc/getConsole.php
deleted file mode 100644
index baecdd0d5..000000000
--- a/lib/testing/PostProc/getConsole.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-//This script will update all records in the consoleinfo table
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(NN_TMUX . 'lib' . DS . 'Konsole.php');
-
-
-
-$pdo = new DB();
-$console = new \Konsole(['Echo' => true, 'Settings' => $pdo]);
-
-$res = $pdo->queryDirect(sprintf("SELECT searchname, id FROM releases WHERE consoleinfoid IS NULL AND categoryid BETWEEN 1000 AND 1999 ORDER BY id DESC" ));
-if ($res instanceof \Traversable) {
-	echo $pdo->log->header("Updating console info for " . number_format($res->rowCount()) . " releases.");
-
-	foreach ($res as $arr) {
-		$starttime = microtime(true);
-		$gameInfo = $console->parseTitle($arr['searchname']);
-		if ($gameInfo !== false) {
-			$game = $console->updateConsoleInfo($gameInfo);
-			if ($game === false) {
-				echo $pdo->log->primary($gameInfo['release'] . ' not found');
-			}
-		}
-
-		// amazon limits are 1 per 1 sec
-		$diff = floor((microtime(true) - $starttime) * 1000000);
-		if (1000000 - $diff > 0) {
-			echo $pdo->log->alternate("Sleeping");
-			usleep(1000000 - $diff);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/getGameCovers.php b/lib/testing/PostProc/getGameCovers.php
deleted file mode 100644
index b818a8f98..000000000
--- a/lib/testing/PostProc/getGameCovers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-//This script will update all records in the gamesinfo table
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/Games.php");
-
-$pdo = new DB();
-$game = new \Games(['Echo' => true, 'Settings' => $pdo]);
-
-$res = $pdo->query(
-	sprintf("SELECT id, title FROM gamesinfo WHERE cover = 0 ORDER BY id DESC LIMIT 100")
-);
-$total = count($res);
-if ($total > 0) {
-	echo $pdo->log->header("Updating game covers for " . number_format($total) . " releases.");
-
-	foreach ($res as $arr) {
-		$starttime = microtime(true);
-		$gameInfo = $game->parseTitle($arr['title']);
-		if ($gameInfo !== false) {
-			echo $pdo->log->primary('Looking up: ' . $gameInfo['release']);
-			$gameData = $game->updateGamesInfo($gameInfo);
-			if ($gameData === false) {
-				echo $pdo->log->primary($gameInfo['release'] . ' not found');
-			} else {
-				if (file_exists(NN_COVERS . 'games' . DS . $gameData . '.jpg')) {
-					$pdo->queryExec(sprintf('UPDATE gamesinfo SET cover = 1 WHERE id = %d',	$arr['id']));
-				}
-			}
-		}
-
-		// amazon limits are 1 per 1 sec
-		$diff = floor((microtime(true) - $starttime) * 1000000);
-		if (1000000 - $diff > 0) {
-			echo $pdo->log->alternate("Sleeping");
-			usleep(1000000 - $diff);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/getImdb.php b/lib/testing/PostProc/getImdb.php
deleted file mode 100644
index 4d74cce4a..000000000
--- a/lib/testing/PostProc/getImdb.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-//This script will update all records in the movieinfo table
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(NN_TMUX . 'lib' . DS . 'Film.php');
-
-
-
-$pdo = new DB();
-$c = new \ColorCLI();
-$movie = new \Film(['Echo' => true, 'Settings' => $pdo]);
-
-
-$movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE tmdbID IS NULL ORDER BY id ASC");
-if ($movies instanceof \Traversable) {
-	echo $pdo->log->header("Updating movie info for " . number_format($movies->rowCount()) . " movies.");
-
-	foreach ($movies as $mov) {
-		$starttime = microtime(true);
-		$mov = $movie->updateMovieInfo($mov['imdbid']);
-
-		// tmdb limits are 30 per 10 sec, not certain for imdb
-		$diff = floor((microtime(true) - $starttime) * 1000000);
-		if (333333 - $diff > 0) {
-			echo "sleeping\n";
-			usleep(333333 - $diff);
-		}
-	}
-	echo "\n";
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/getMovieCovers.php b/lib/testing/PostProc/getMovieCovers.php
deleted file mode 100644
index 1590dc890..000000000
--- a/lib/testing/PostProc/getMovieCovers.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-//This script will update all records in the movieinfo table where there is no cover
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(NN_TMUX . 'lib' . DS. 'Film.php');
-
-
-
-$pdo = new DB();
-
-$movie = new \Film(array('Echo' => true, 'Settings' => $pdo));
-
-$movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE cover = 0 ORDER BY year ASC, id DESC");
-if ($movies instanceof \Traversable) {
-	echo $pdo->log->primary("Updating " . number_format($movies->rowCount()) . " movie covers.");
-	foreach ($movies as $mov) {
-		$starttime = microtime(true);
-		$mov = $movie->updateMovieInfo($mov['imdbid']);
-
-		// tmdb limits are 30 per 10 sec, not certain for imdb
-		$diff = floor((microtime(true) - $starttime) * 1000000);
-		if (333333 - $diff > 0) {
-			echo "\nsleeping\n";
-			usleep(333333 - $diff);
-		}
-	}
-	echo "\n";
-}
diff --git a/lib/testing/PostProc/getXXXCovers.php b/lib/testing/PostProc/getXXXCovers.php
deleted file mode 100644
index 944bf00af..000000000
--- a/lib/testing/PostProc/getXXXCovers.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-//This script will update all records in the xxxinfo table where there is no cover
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/XXX.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-
-$pdo = new DB();
-$movie = new XXX();
-$c = new ColorCLI();
-
-$movies = $pdo->queryDirect("SELECT title FROM xxxinfo WHERE cover = 0");
-if ($movies instanceof Traversable) {
-	echo $c->primary("Updating " . number_format($movies->rowCount()) . " XXX movie covers.");
-	foreach ($movies as $mov) {
-		$starttime = microtime(true);
-		$mov = $movie->updateXXXInfo($mov['title']);
-
-		// sleep so that it's not ddos' the site
-		$diff = floor((microtime(true) - $starttime) * 1000000);
-		if (333333 - $diff > 0) {
-			echo "\nsleeping\n";
-			usleep(333333 - $diff);
-		}
-	}
-	echo "\n";
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/populate_tvrage.php b/lib/testing/PostProc/populate_tvrage.php
deleted file mode 100644
index fb812b5a7..000000000
--- a/lib/testing/PostProc/populate_tvrage.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-
-
-$pdo = new DB();
-
-if (!isset($argv[1]) || $argv[1] != 'true') {
-	exit($pdo->log->error("\nThis script will download all tvrage shows and insert into the db.\n\n"
-			. "php $argv[0] true    ...: To run.\n"));
-}
-
-$newnames = $updated = 0;
-
-echo "Attempting to fetch data file from TVRage...\n";
-$tvshows = @simplexml_load_file('http://services.tvrage.com/feeds/show_list.php');
-if ($tvshows !== false) {
-	echo "Starting to process file entries...\n";
-	foreach ($tvshows->show as $rage) {
-		echo "RageID: " . $rage->id . ", name: " . $rage->name . " - ";
-		$dupecheck = $pdo->queryOneRow(sprintf('SELECT COUNT(id) AS count FROM tvrage WHERE rageid = %s', $pdo->escapeString($rage->id)));
-		if (isset($rage->id) && isset($rage->name) && !empty($rage->id) && !empty($rage->name) &&
-			$dupecheck !== false && $dupecheck['count'] == 0) {
-			$pdo->queryInsert(sprintf('INSERT INTO tvrage (rageid, releasetitle, country) VALUES (%s, %s, %s)', $pdo->escapeString($rage->id), $pdo->escapeString($rage->name), $pdo->escapeString($rage->country)));
-			$updated++;
-			echo "added\n";
-		} elseif (isset($rage->id) && isset($rage->name) && !empty($rage->id) && !empty($rage->name) &&
-			$dupecheck !== false && $dupecheck['count'] > 0) {
-			echo "Up to date\n";
-		} else {
-			echo "FAILED\n";
-		}
-	}
-} else {
-	exit($pdo->log->info("TVRage site has a hard limit of 400 concurrent API requests. At the moment, they have reached that limit. Please wait before retrying\n"));
-}
-if ($updated != 0) {
-	echo $pdo->log->info("Inserted " . $updated . " new shows into the TvRage table.  To fill out the newly populated TvRage table\n"
-	. "php misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateTvRage.php\n");
-} else {
-	echo "\n";
-	echo $pdo->log->info("TvRage database is already up to date!\n");
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateBookImages.php b/lib/testing/PostProc/updateBookImages.php
deleted file mode 100644
index 96e07f7ed..000000000
--- a/lib/testing/PostProc/updateBookImages.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-
-$pdo = new DB();
-$covers = $updated = $deleted = 0;
-
-if ($argc == 1 || $argv[1] != 'true') {
-    exit($pdo->log->error("\nThis script will check all images in covers/book and compare to db->bookinfo.\nTo run:\nphp $argv[0] true\n"));
-}
-
-
-$path2covers = NN_COVERS . 'book' . DS;
-
-$dirItr = new \RecursiveDirectoryIterator($path2covers);
-$itr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::LEAVES_ONLY);
-foreach ($itr as $filePath) {
-    if (is_file($filePath) && preg_match('/\d+\.jpg/', $filePath)) {
-        preg_match('/(\d+)\.jpg/', basename($filePath), $match);
-        if (isset($match[1])) {
-            $run = $pdo->queryDirect("UPDATE bookinfo SET cover = 1 WHERE cover = 0 AND id = " . $match[1]);
-            if ($run->rowCount() >= 1) {
-                $covers++;
-            } else {
-                $run = $pdo->queryDirect("SELECT id FROM bookinfo WHERE id = " . $match[1]);
-                if ($run->rowCount() == 0) {
-                    echo $pdo->log->info($filePath . " not found in db.");
-                }
-            }
-        }
-    }
-}
-
-$qry = $pdo->queryDirect("SELECT id FROM bookinfo WHERE cover = 1");
-if ($qry instanceof \Traversable) {
-	foreach ($qry as $rows) {
-		if (!is_file($path2covers . $rows['id'] . '.jpg')) {
-			$pdo->queryDirect("UPDATE bookinfo SET cover = 0 WHERE cover = 1 AND id = " . $rows['id']);
-			echo $pdo->log->info($path2covers . $rows['id'] . ".jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-echo $pdo->log->header($covers . " covers set.");
-echo $pdo->log->header($deleted . " books unset.");
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateConsoleImages.php b/lib/testing/PostProc/updateConsoleImages.php
deleted file mode 100644
index de87c3f76..000000000
--- a/lib/testing/PostProc/updateConsoleImages.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-
-$pdo = new DB();
-$covers = $updated = $deleted = 0;
-
-if ($argc == 1 || $argv[1] != 'true') {
-    exit($pdo->log->error("\nThis script will check all images in covers/console and compare to db->consoleinfo.\nTo run:\nphp $argv[0] true\n"));
-}
-
-
-$path2covers = NN_COVERS . 'console' . DS;
-
-$dirItr = new \RecursiveDirectoryIterator($path2covers);
-$itr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::LEAVES_ONLY);
-foreach ($itr as $filePath) {
-    if (is_file($filePath) && preg_match('/\d+\.jpg/', $filePath)) {
-        preg_match('/(\d+)\.jpg/', basename($filePath), $match);
-        if (isset($match[1])) {
-            $run = $pdo->queryDirect("UPDATE consoleinfo SET cover = 1 WHERE cover = 0 AND id = " . $match[1]);
-            if ($run->rowCount() >= 1) {
-                $covers++;
-            } else {
-                $run = $pdo->queryDirect("SELECT id FROM consoleinfo WHERE id = " . $match[1]);
-                if ($run->rowCount() == 0) {
-                    echo $pdo->log->info($filePath . " not found in db.");
-                }
-            }
-        }
-    }
-}
-
-$qry = $pdo->queryDirect("SELECT id FROM consoleinfo WHERE cover = 1");
-if ($qry instanceof \Traversable) {
-	foreach ($qry as $rows) {
-		if (!is_file($path2covers . $rows['id'] . '.jpg')) {
-			$pdo->queryDirect("UPDATE consoleinfo SET cover = 0 WHERE cover = 1 AND id = " . $rows['id']);
-			echo $pdo->log->info($path2covers . $rows['id'] . ".jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-echo $pdo->log->header($covers . " covers set.");
-echo $pdo->log->header($deleted . " consoles unset.");
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateGamesImages.php b/lib/testing/PostProc/updateGamesImages.php
deleted file mode 100644
index 4bc5fa256..000000000
--- a/lib/testing/PostProc/updateGamesImages.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-$pdo = new DB();
-$covers = $updated = $deleted = 0;
-$c = new ColorCLI();
-
-if ($argc == 1 || $argv[1] != 'true') {
-	exit($c->error("\nThis script will check all images in covers/games and compare to db->gamesinfo.\nTo run:\nphp $argv[0] true\n"));
-}
-$path2covers = WWW_DIR . 'covers/games' . '/';
-
-$dirItr = new RecursiveDirectoryIterator($path2covers);
-$itr = new RecursiveIteratorIterator($dirItr, RecursiveIteratorIterator::LEAVES_ONLY);
-foreach ($itr as $filePath) {
-	if (is_file($filePath) && preg_match('/\d+\.jpg/', $filePath)) {
-		preg_match('/(\d+)\.jpg/', basename($filePath), $match);
-		if (isset($match[1])) {
-			$run = $pdo->queryDirect("UPDATE gamesinfo SET cover = 1 WHERE cover = 0 AND id = " . $match[1]);
-			if ($run !== false) {
-				if ($run->rowCount() >= 1) {
-					$covers++;
-				} else {
-					$run = $pdo->queryDirect("SELECT id FROM gamesinfo WHERE id = " . $match[1]);
-					if ($run !== false && $run->rowCount() == 0) {
-						echo $c->info($filePath . " not found in db.");
-					}
-				}
-			}
-		}
-	}
-}
-
-$qry = $pdo->queryDirect("SELECT id FROM gamesinfo WHERE cover = 1");
-foreach ($qry as $rows) {
-	if (!is_file($path2covers . $rows['id'] . '.jpg')) {
-		$pdo->queryDirect("UPDATE gamesinfo SET cover = 0 WHERE cover = 1 AND id = " . $rows['id']);
-		echo $c->info($path2covers . $rows['id'] . ".jpg does not exist.");
-		$deleted++;
-	}
-}
-echo $c->header($covers . " covers set.");
-echo $c->header($deleted . " games unset.");
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateMovieImages.php b/lib/testing/PostProc/updateMovieImages.php
deleted file mode 100644
index 0984415aa..000000000
--- a/lib/testing/PostProc/updateMovieImages.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/util.php");
-
-
-$pdo = new DB();
-$covers = $updated = $deleted = 0;
-
-if ($argc == 1 || $argv[1] != 'true') {
-	exit($pdo->log->error("\nThis script will check all images in covers/movies and compare to db->movieinfo.\nTo run:\nphp $argv[0] true\n"));
-}
-
-$path2covers = NN_COVERS . 'movies' . DS;
-
-$dirItr = new \RecursiveDirectoryIterator($path2covers);
-$itr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::LEAVES_ONLY);
-foreach ($itr as $filePath) {
-	if (is_file($filePath) && preg_match('/-cover\.jpg/', $filePath)) {
-		preg_match('/(\d+)-cover\.jpg/', basename($filePath), $match);
-		if (isset($match[1])) {
-			$run = $pdo->queryDirect("UPDATE movieinfo SET cover = 1 WHERE cover = 0 AND imdbid = " . $match[1]);
-			if ($run->rowCount() >= 1) {
-				$covers++;
-			} else {
-				$run = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE imdbid = " . $match[1]);
-				if ($run->rowCount() == 0) {
-					echo $pdo->log->info($filePath . " not found in db.");
-				}
-			}
-		}
-	}
-	if (is_file($filePath) && preg_match('/-backdrop\.jpg/', $filePath)) {
-		preg_match('/(\d+)-backdrop\.jpg/', basename($filePath), $match1);
-		if (isset($match1[1])) {
-			$run = $pdo->queryDirect("UPDATE movieinfo SET backdrop = 1 WHERE backdrop = 0 AND imdbid = " . $match1[1]);
-			if ($run->rowCount() >= 1) {
-				$updated++;
-				printf("UPDATE movieinfo SET backdrop = 1 WHERE backdrop = 0 AND imdbid = " . $match1[1] . "\n");
-			} else {
-				$run = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE imdbid = " . $match1[1]);
-				if ($run->rowCount() == 0) {
-					echo $pdo->log->info($filePath . " not found in db.");
-				}
-			}
-		}
-	}
-}
-
-$qry = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE cover = 1");
-if ($qry instanceof \Traversable) {
-	foreach ($qry as $rows) {
-		if (!is_file($path2covers . $rows['imdbid'] . '-cover.jpg')) {
-			$pdo->queryDirect("UPDATE movieinfo SET cover = 0 WHERE cover = 1 AND imdbid = " . $rows['imdbid']);
-			echo $pdo->log->info($path2covers . $rows['imdbid'] . "-cover.jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-$qry1 = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE backdrop = 1");
-if ($qry1 instanceof \Traversable) {
-	foreach ($qry1 as $rows) {
-		if (!is_file($path2covers . $rows['imdbid'] . '-backdrop.jpg')) {
-			$pdo->queryDirect("UPDATE movieinfo SET backdrop = 0 WHERE backdrop = 1 AND imdbid = " . $rows['imdbid']);
-			echo $pdo->log->info($path2covers . $rows['imdbid'] . "-backdrop.jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-echo $pdo->log->header($covers . " covers set.");
-echo $pdo->log->header($updated . " backdrops set.");
-echo $pdo->log->header($deleted . " movies unset.");
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateMusicImages.php b/lib/testing/PostProc/updateMusicImages.php
deleted file mode 100644
index d69bd5786..000000000
--- a/lib/testing/PostProc/updateMusicImages.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-
-
-$pdo = new DB();
-$covers = $updated = $deleted = 0;
-
-if ($argc == 1 || $argv[1] != 'true') {
-    exit($pdo->log->error("\nThis script will check all images in covers/music and compare to db->musicinfo.\nTo run:\nphp $argv[0] true\n"));
-}
-
-$path2covers = NN_COVERS . 'music' . DS;
-
-$dirItr = new \RecursiveDirectoryIterator($path2covers);
-$itr = new \RecursiveIteratorIterator($dirItr, \RecursiveIteratorIterator::LEAVES_ONLY);
-foreach ($itr as $filePath) {
-    if (is_file($filePath) && preg_match('/\d+\.jpg/', $filePath)) {
-        preg_match('/(\d+)\.jpg/', basename($filePath), $match);
-        if (isset($match[1])) {
-            $run = $pdo->queryDirect("UPDATE musicinfo SET cover = 1 WHERE cover = 0 AND id = " . $match[1]);
-            if ($run->rowCount() >= 1) {
-                $covers++;
-            } else {
-                $run = $pdo->queryDirect("SELECT id FROM musicinfo WHERE id = " . $match[1]);
-                if ($run->rowCount() == 0) {
-                    echo $pdo->log->info($filePath . " not found in db.");
-                }
-            }
-        }
-    }
-}
-
-$qry = $pdo->queryDirect("SELECT id FROM musicinfo WHERE cover = 1");
-if ($qry instanceof \Traversable) {
-	foreach ($qry as $rows) {
-		if (!is_file($path2covers . $rows['id'] . '.jpg')) {
-			$pdo->queryDirect("UPDATE musicinfo SET cover = 0 WHERE cover = 1 AND id = " . $rows['id']);
-			echo $pdo->log->info($path2covers . $rows['id'] . ".jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-echo $pdo->log->header($covers . " covers set.");
-echo $pdo->log->header($deleted . " music unset.");
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateTvRage.php b/lib/testing/PostProc/updateTvRage.php
deleted file mode 100644
index 588646af6..000000000
--- a/lib/testing/PostProc/updateTvRage.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-//This script downloads covert art for Tv Shows -- it is intended to be run at interval, generally after the TvRage database is populated
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once (NN_LIB . 'framework' . DS . 'db.php');
-require_once (NN_TMUX . 'lib' . DS . 'TvAnger.php');
-require_once (NN_LIB . 'util.php');
-
-
-$pdo = new DB();
-$tvrage = new \TvAnger(['Settings' => $pdo, 'Echo' => true]);
-
-$shows = $pdo->queryDirect("SELECT rageid FROM tvrage WHERE imgdata IS NULL ORDER BY rageid DESC LIMIT 2000");
-if ($shows->rowCount() > 0) {
-	echo "\n";
-	echo $pdo->log->header("Updating " . number_format($shows->rowCount()) . " tv shows.\n");
-} else {
-	echo "\n";
-	echo $pdo->log->info("All shows in TvRage database have been updated.\n");
-	usleep(5000000);
-}
-$loop = 0;
-if ($shows instanceof \Traversable) {
-	foreach ($shows as $show) {
-		$starttime = microtime(true);
-		$rageid = $show['rageid'];
-		$tvrShow = $tvrage->getRageInfoFromService($rageid);
-		$genre = '';
-		if (isset($tvrShow['genres']) && is_array($tvrShow['genres']) && !empty($tvrShow['genres'])) {
-			if (is_array($tvrShow['genres']['genre'])) {
-				$genre = @implode('|', $tvrShow['genres']['genre']);
-			} else {
-				$genre = $tvrShow['genres']['genre'];
-			}
-		}
-		$country = '';
-		if (isset($tvrShow['country']) && !empty($tvrShow['country'])) {
-			$country = $tvrage->countryCode($tvrShow['country']);
-		}
-
-		$rInfo = $tvrage->getRageInfoFromPage($rageid);
-		$desc = '';
-		if (isset($rInfo['desc']) && !empty($rInfo['desc'])) {
-			$desc = $rInfo['desc'];
-		}
-
-		$imgbytes = '';
-		if (isset($rInfo['imgurl']) && !empty($rInfo['imgurl'])) {
-			$img =Utility::getUrl(['url' => $rInfo['imgurl']]);
-			if ($img !== false) {
-				$im = @imagecreatefromstring($img);
-				if ($im !== false) {
-					$imgbytes = $img;
-				}
-			}
-		}
-		$pdo->queryDirect(sprintf("UPDATE tvrage SET description = %s, genre = %s, country = %s, imgdata = %s WHERE rageid = %d", $pdo->escapeString(substr($desc, 0, 10000)), $pdo->escapeString(substr($genre, 0, 64)), $pdo->escapeString($country), $pdo->escapeString($imgbytes), $rageid));
-		$name = $pdo->query("Select releasetitle from tvrage where rageid = " . $rageid);
-		echo $pdo->log->primary("Updated: " . $name[0]['releasetitle']);
-		$diff = floor((microtime(true) - $starttime) * 1000000);
-		if (1000000 - $diff > 0) {
-			echo $pdo->log->alternate("Sleeping");
-			usleep(1000000 - $diff);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/PostProc/updateXXXImages.php b/lib/testing/PostProc/updateXXXImages.php
deleted file mode 100644
index 18c8faa07..000000000
--- a/lib/testing/PostProc/updateXXXImages.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-$pdo = new DB();
-$c = new ColorCLI();
-$covers = $updated = $deleted = 0;
-
-if ($argc == 1 || $argv[1] != 'true') {
-	exit($c->error("\nThis script will check all images in covers/xxx and compare to db->xxxinfo.\nTo run:\nphp $argv[0] true\n"));
-}
-
-$path2covers = WWW_DIR . 'covers/xxx/';
-
-$dirItr = new RecursiveDirectoryIterator($path2covers);
-$itr = new RecursiveIteratorIterator($dirItr, RecursiveIteratorIterator::LEAVES_ONLY);
-foreach ($itr as $filePath) {
-	if (is_file($filePath) && preg_match('/-cover\.jpg/', $filePath)) {
-		preg_match('/(\d+)-cover\.jpg/', basename($filePath), $match);
-		if (isset($match[1])) {
-			$run = $pdo->queryDirect("UPDATE xxxinfo SET cover = 1 WHERE cover = 0 AND id = " . $match[1]);
-			if ($run->rowCount() >= 1) {
-				$covers++;
-			} else {
-				$run = $pdo->queryDirect("SELECT id FROM xxxinfo WHERE id = " . $match[1]);
-				if ($run->rowCount() == 0) {
-					echo $c->info($filePath . " not found in db.");
-				}
-			}
-		}
-	}
-	if (is_file($filePath) && preg_match('/-backdrop\.jpg/', $filePath)) {
-		preg_match('/(\d+)-backdrop\.jpg/', basename($filePath), $match1);
-		if (isset($match1[1])) {
-			$run = $pdo->queryDirect("UPDATE xxxinfo SET backdrop = 1 WHERE backdrop = 0 AND id = " . $match1[1]);
-			if ($run->rowCount() >= 1) {
-				$updated++;
-				printf("UPDATE xxxinfo SET backdrop = 1 WHERE backdrop = 0 AND id = " . $match1[1] . "\n");
-			} else {
-				$run = $pdo->queryDirect("SELECT id FROM xxxinfo WHERE id = " . $match1[1]);
-				if ($run->rowCount() == 0) {
-					echo $c->info($filePath . " not found in db.");
-				}
-			}
-		}
-	}
-}
-
-$qry = $pdo->queryDirect("SELECT id FROM xxxinfo WHERE cover = 1");
-if ($qry instanceof Traversable) {
-	foreach ($qry as $rows) {
-		if (!is_file($path2covers . $rows['id'] . '-cover.jpg')) {
-			$pdo->queryDirect("UPDATE xxxinfo SET cover = 0 WHERE cover = 1 AND id = " . $rows['id']);
-			echo $c->info($path2covers . $rows['id'] . "-cover.jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-$qry1 = $pdo->queryDirect("SELECT id FROM xxxinfo WHERE backdrop = 1");
-if ($qry1 instanceof Traversable) {
-	foreach ($qry1 as $rows) {
-		if (!is_file($path2covers . $rows['id'] . '-backdrop.jpg')) {
-			$pdo->queryDirect("UPDATE xxxinfo SET backdrop = 0 WHERE backdrop = 1 AND id = " . $rows['id']);
-			echo $c->info($path2covers . $rows['id'] . "-backdrop.jpg does not exist.");
-			$deleted++;
-		}
-	}
-}
-echo $c->header($covers . " covers set.");
-echo $c->header($updated . " backdrops set.");
-echo $c->header($deleted . " movies unset.");
\ No newline at end of file
diff --git a/lib/testing/Releases/delete_releases.php b/lib/testing/Releases/delete_releases.php
deleted file mode 100644
index d0ef4f754..000000000
--- a/lib/testing/Releases/delete_releases.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-// New line for CLI.
-$n = PHP_EOL;
-
-// Include config.php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(NN_TMUX. 'lib' . DS . 'ReleaseRemover.php');
-
-// ColorCLI class.
-$cli = new \ColorCLI();
-
-// Print arguments/usage.
-$totalArgs = count($argv);
-if ($totalArgs < 2) {
-	exit($cli->info($n .
-		'This deletes releases based on a list of criteria you pass.' . $n .
-		'Usage:' . $n . $n.
-		'List of supported criteria:' . $n .
-		'fromname   : Look for names of people who posted releases (the poster name). (modifiers: equals, like)' . $n .
-		'groupname  : Look in groups. (modifiers: equals, like)' . $n .
-		'guid       : Look for a specific guid. (modifiers: equals)' . $n .
-		'name       : Look for a name (the usenet name). (modifiers: equals, like)' . $n .
-		'searchname : Look for a name (the search name). (modifiers: equals, like)' . $n .
-		'size       : Release must be (bigger than |smaller than |exactly) this size.(bytes) (modifiers: equals,bigger,smaller)' . $n .
-		'adddate    : Look for releases added to our DB (older than|newer than) x hours. (modifiers: bigger,smaller)' . $n .
-		'postdate   : Look for posted to usenet (older than|newer than) x hours. (modifiers: bigger,smaller)' . $n .
-		'completion : Look for completion (less than) (modifiers: smaller)' . $n .
-		'categoryid : Look for releases within specified category (modifiers: equals)' . $n .
-		'imdbid     : Look for releases with imdbid (modifiers: equals)' . $n .
-		'rageid     : Look for releases with rageid (modifiers: equals)' . $n .
-		'totalpart  : Look for releases with certain number of parts (modifiers: equals,bigger,smaller)' . $n .
-		'nzbstatus  : Look for releases with nzbstatus (modifiers: equals)' . $n . $n .
-		'List of Modifiers:' . $n .
-		'equals     : Match must be exactly this. (fromname=equals="john" will only look for "john", not "johndoe")' . $n .
-		'like       : Match can be similar to this. Separate words using spaces(ie:"cars hdtv x264").' . $n .
-		'             (fromname=like="john" will look for any posters with john in it (ie:john@smith.com)' . $n .
-		'bigger     : Match must be bigger than this. (postdate=bigger="3" means older than 3 hours ago)' . $n .
-		'smaller    : Match must be smaller than this (postdate=smaller="3" means between now and 3 hours ago.' . $n . $n .
-		'Extra:' . $n .
-		'ignore     : Ignore the user check. (before running we ask you if you want to run the query to delete)' . $n . $n .
-		'Examples:' . $n .
-		$_SERVER['_'] . ' ' . $argv[0] . ' groupname=equals="alt.binaries.teevee" searchname=like="olympics 2014" postdate=bigger="5"' . $n .
-		$_SERVER['_'] . ' ' . $argv[0] . ' guid=equals="8fb5956bae3de4fb94edcc69da44d6883d586fd0"' . $n .
-		$_SERVER['_'] . ' ' . $argv[0] . ' size=smaller="104857600" size=bigger="2048" groupname=like="movies"' . $n .
-		$_SERVER['_'] . ' ' . $argv[0] . ' fromname=like="@XviD.net" groupname=equals="alt.binaries.movies.divx" ignore' .$n .
-		$_SERVER['_'] . ' ' . $argv[0] . ' imdbid=equals=NULL categoryid=equals=2020 nzbstatus=equals=1 adddate=bigger=2880 # Remove other movie releases with non-cleaned names added > 120 days ago'
-	));
-}
-
-$RR = new \ReleaseRemover();
-// Remove argv[0] and send the array.
-$RR->removeByCriteria(array_slice($argv, 1, $totalArgs-1));
diff --git a/lib/testing/_run_once/tpg_fixes.php b/lib/testing/_run_once/tpg_fixes.php
deleted file mode 100644
index 19e083c17..000000000
--- a/lib/testing/_run_once/tpg_fixes.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * 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 3 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 (see LICENSE.txt in the base directory.  If
- * not, see:
- *
- * @link <http://www.gnu.org/licenses/>.
- * @author niel / kevin
- * @copyright 2014 nZEDb
- */
-
-if (!isset($argv[1]) || !in_array($argv[1], ['1'])) {
-	exit(
-		'Options: (enter a number, it\'s not recommended to rerun the same fix)' . PHP_EOL .
-		'1: 2014-07-28: Add unique key to binaryhash to be able to do multiple updates in 1 statement.' . PHP_EOL
-	);
-}
-
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/site.php");
-
-$pdo = new DB();
-$s = new Sites();
-$site = $s->get();
-
-if (!$site->tablepergroup) {
-	exit("Tables per groups is not enabled, quitting!");
-}
-
-$groups = $pdo->queryDirect('SELECT id FROM groups WHERE active = 1 OR backfill = 1');
-
-if ($groups === false) {
-	echo "No active groups. Fix not needed.\n";
-} else {
-
-	$queries = array();
-
-	switch ($argv[1]) {
-		case 1:
-			// Drop this index, as we will recreate it as a unique.
-			$queries[] = ['t' => 1, 'q' => 'ALTER TABLE binaries_%d DROP INDEX ix_binary_binaryhash'];
-			// Recreate the index as unique so we can use on duplicate key update, saving select / update query.
-			$queries[] = ['t' => 1, 'q' => 'ALTER IGNORE TABLE binaries_%d ADD UNIQUE INDEX ix_binary_binaryhash(binaryhash)'];
-			break;
-		default:
-			exit();
-	}
-
-	$groupCount = $groups->rowCount();
-	if ($groups instanceof \Traversable && count($queries) && $groupCount) {
-		foreach ($groups as $group) {
-			echo 'Fixing group ' . $group['id'] . PHP_EOL;
-			foreach ($queries as $query) {
-				switch ($query['t']) {
-					// Queries needing 1 group id.
-					case 1:
-						$pdo->queryExec(sprintf($query['q'], $group['id']), true);
-						break;
-					// Queries needing 2 group IDs.
-					case 2:
-						$pdo->queryExec(sprintf($query['q'], $group['id'], $group['id']), true);
-						break;
-					// Queries needing 3 group IDs.
-					case 3:
-						$pdo->queryExec(sprintf($query['q'], $group['id'], $group['id'], $group['id']), true);
-						break;
-				}
-			}
-			echo 'Finished fixing group ' . $group['id'] . ', ' . (--$groupCount) . ' to go!' .PHP_EOL;
-		}
-	}
-	echo 'All done!' . PHP_EOL;
-}
diff --git a/lib/testing/nzb-import.php b/lib/testing/nzb-import.php
deleted file mode 100644
index cc7978181..000000000
--- a/lib/testing/nzb-import.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../bin/config.php");
-require_once(WWW_DIR . "/lib/NZBImport.php");
-$n = PHP_EOL;
-
-// Print usage.
-if (count($argv) !== 6) {
-	exit(
-		'This will import NZB files(.nzb or .nzb.gz), into your newznab site from a folder recursively(it will go down into sub-folders).'. $n .
-		'Please use arg5, something sensible like 100k, if you have millions of NZB files the initial scan will be VERY slow otherwise.' . $n . $n .
-		'Usage: ' . $n .
-		$_SERVER['_'] . ' ' . __FILE__ . ' arg1 arg2 arg3 arg4 arg5' . $n . $n .
-		'arg1 : Path to folder where NZB files are stored.                | a folder path' . $n .
-		'arg2 : Delete NZB when successfully imported.(recommended)       | true/false' . $n .
-		'arg3 : Delete NZB when unsuccessfully imported.(not recommended) | true/false' . $n .
-		'arg4 : Use NZB file name as release name.(not recommended)       | true/false' . $n .
-		'arg5 : Import this many NZB files. (RECOMMENDED 100,000)         | a number' . $n . $n .
-		'ie: ' . $_SERVER['_'] . ' ' . __FILE__ . ' ' . NN_ROOT . 'nzbToImport' . DS . ' true false false 1000' . $n
-	);
-}
-
-// Verify arguments.
-if (!is_dir($argv[1])) {
-	exit('Error: arg1 must be a path (you might not have read access to this path)' . $n);
-}
-if (!in_array($argv[2], array('true', 'false'))) {
-	exit('Error: arg2 must be true or false' . $n);
-}
-if (!in_array($argv[3], array('true', 'false'))) {
-	exit('Error: arg3 must be true or false' . $n);
-}
-if (!in_array($argv[4], array('true', 'false'))) {
-	exit('Error: arg4 must be true or false' . $n);
-}
-if (!is_numeric($argv[5])) {
-	exit('Error: arg5 must be a number' . $n);
-}
-if ($argv[5] < 0) {
-	exit('Error: arg5 must be 0 or higher' . $n);
-}
-
-$path = $argv[1];
-// Check if path ends with dir separator.
-if (substr($path, -1) !== DS) {
-	$path .= DS;
-}
-
-$files = new \RegexIterator(
-	new \RecursiveIteratorIterator(
-		new \RecursiveDirectoryIterator($argv[1])
-	),
-	'/^.+\.nzb(\.gz)?$/i',
-	\RecursiveRegexIterator::GET_MATCH
-);
-
-$i = 1;
-$nzbFiles = array();
-foreach ($files as $file) {
-	$nzbFiles[] = $file[0];
-	if ($i++ >= $argv[5]) {
-		break;
-	}
-}
-
-if ($i > 1) {
-
-	unset($files);
-
-	// Check these user argument values, convert them to bool.
-	$deleteNZB = ($argv[2] == 'true') ? true : false;
-	$deleteFailedNZB = ($argv[3] == 'true') ? true : false;
-	$useNzbName = ($argv[4] == 'true') ? true : false;
-
-	// Create a new instance of NZBImport and send it the file locations.
-	$NZBImport = new \NZBImport();
-
-	$NZBImport->beginImport($nzbFiles, $useNzbName, $deleteNZB, $deleteFailedNZB);
-} else {
-	echo 'Nothing found to import!' . $n;
-}
diff --git a/lib/testing/populate_anidb.php b/lib/testing/populate_anidb.php
deleted file mode 100644
index bd6b825de..000000000
--- a/lib/testing/populate_anidb.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/* This script is designed to gather all show data from anidb and add it to the anidb table for newznab, as part of this process we need the number of PI queries that can be executed max and whether or not we want debuging the first argument if unset will try to do the entire list (a good way to get banned), the second option can be blank or true for debugging.
-* IF you are using this script then then you also want to edit anidb.php in www/lib and locate "604800" and replace it with 1204400, this will make sure it never tries to connect to anidb as this will fail
-*/
-require_once(dirname(__FILE__) . "/../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/populate/AniDB.php");
-
-$pdo = new DB();
-
-if ($argc > 1 && $argv[1] == true) {
-	(new \PopulateAniDB(['Settings' => $pdo, 'Echo' => true]))->populateTable('full');
-} else {
-	$pdo->log->doEcho(PHP_EOL . $pdo->log->error(
-			"To execute this script you must provide a boolean argument." . PHP_EOL .
-			"Argument1: true|false to run this script or not"), true
-	);
-}
\ No newline at end of file
diff --git a/lib/testing/predb_import_daily_batch.php b/lib/testing/predb_import_daily_batch.php
deleted file mode 100644
index a39acd93d..000000000
--- a/lib/testing/predb_import_daily_batch.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-/* TODO better tune the queries for performance, including using prepared statements and
-   pre-fetching groupid and other data for faster inclusion in the main query.
-*/
-
-require_once(dirname(__FILE__) . "/../../bin/config.php");
-require_once(WWW_DIR."/lib/util.php");
-require_once(WWW_DIR."/lib/framework/db.php");
-
-$config = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR .
-		  'config.php';
-
-
-if (!is_file($config)) {
-	exit('Place this script in the lib/testing folder of tmux.' . PHP_EOL);
-}
-require_once $config;
-unset($config);
-
-if (!Utility::isWin()) {
-	$fullPath = DS;
-	$paths    = preg_split('#/#', NN_RES);
-	foreach ($paths as $path) {
-		if ($path !== '') {
-			$fullPath .= $path . DS;
-			if (!is_readable($fullPath) || !is_executable($fullPath)) {
-				exit('The (' . $fullPath . ') folder must be readable and executable by all.' .
-					 PHP_EOL);
-			}
-		}
-	}
-	unset($fullPath, $paths, $path);
-}
-
-if (!is_writable(NN_RES)) {
-	exit('The (' . NN_RES . ') folder must be writable.' . PHP_EOL);
-}
-
-$progress = rw_progress(settings_array());
-
-if (!isset($argv[1]) || !is_numeric($argv[1]) && $argv[1] != 'progress' || !isset($argv[2]) ||
-	!in_array($argv[2], ['local', 'remote']) || !isset($argv[3]) ||
-	!in_array($argv[3], ['true', 'false'])
-) {
-	exit('This script quickly imports the daily PreDB dumps.' . PHP_EOL .
-		 'Argument 1: Enter the unix time of the patch to start at.' . PHP_EOL .
-		 'You can find the unix time in the file name of the patch, it\'s the long number.' .
-		 PHP_EOL .
-		 'You can put in 0 to import all the daily PreDB dumps.' . PHP_EOL .
-		 'You can put in progress to track progress of the imports and only import newer ones.' .
-		 PHP_EOL .
-		 'Argument 2: If your MySQL server is local, type local else type remote.' . PHP_EOL .
-		 'Argument 3: Show output of dump_predb.php or not, true | false' . PHP_EOL
-	);
-}
-$fileName         = '_predb_dump.csv.gz';
-$innerUrl         = 'fb2pffwwriruyco';
-$baseUrl          = 'https://www.dropbox.com/sh/' . $innerUrl;
-$folderUrl['url'] = $baseUrl . '/AACy9Egno_v2kcziVHuvWbbxa';
-
-$result = Utility::getUrl($folderUrl);
-
-if (!$result) {
-	exit('Error connecting to dropbox.com, try again later?' . PHP_EOL);
-}
-
-$result = preg_match_all('/<a href="https:\/\/www.dropbox.com\/sh\/' . $innerUrl . '\/(\S+\/\d+' .
-						 $fileName . '\?dl=0)"/',
-						 $result,
-						 $all_matches);
-if ($result) {
-	exec('clear');
-	$all_matches = array_unique($all_matches[1]);
-	$total       = count($all_matches);
-	$pdo         = new \DB();
-
-	if ($argv[1] != 'progress') {
-		$progress['last'] = !is_numeric($argv[1]) ? time() : $argv[1];
-	}
-
-	$pdo->queryExec('DROP TABLE IF EXISTS tmp_pre');
-	$pdo->queryExec('CREATE TABLE tmp_pre LIKE prehash');
-
-	// Drop id as it is not needed and incurs overhead creating each id.
-	$pdo->queryExec('ALTER TABLE tmp_pre DROP COLUMN id');
-
-	// Add a column for the group's name which is included instead of the groupid, which may be
-	// different between individual databases
-	$pdo->queryExec('ALTER TABLE tmp_pre ADD COLUMN groupname VARCHAR (255)');
-
-	// Drop indexes on tmp_pre
-	$pdo->queryExec('ALTER TABLE tmp_pre DROP INDEX `ix_prehash_nfo`, DROP INDEX `ix_prehash_predate`, DROP INDEX `ix_prehash_source`, DROP INDEX `ix_prehash_title`, DROP INDEX `ix_prehash_requestid`');
-
-	foreach ($all_matches as $matches) {
-		if (preg_match('#^(.+)/(\d+)_#', $matches, $match)) {
-			$timematch = -1 + $progress['last'];
-
-			// Skip patches the user does not want.
-			if ($match[2] < $timematch) {
-				echo 'Skipping dump ' . $match[2] . ', as your minimum unix time argument is ' .
-					 $timematch . PHP_EOL;
-				--$total;
-				continue;
-			}
-
-			// Download the dump.
-			$file['url'] = $baseUrl . '/' . $match[1] . '/' . $match[2] . $fileName . '?dl=1';
-			$dump        = Utility::getUrl($file);
-
-			if (!$dump) {
-				echo 'Error downloading dump ' . $match[2] . ' you can try manually importing it.' .
-					 PHP_EOL;
-				continue;
-			}
-
-			// Make sure we didn't get a HTML page.
-			if (strlen($dump) < 5000 && strpos($dump, '<!DOCTYPE html>') !== false) {
-				echo 'The dump file ' . $match[2] . ' might be missing from dropbox.' . PHP_EOL;
-				continue;
-			}
-
-			// Decompress.
-			$dump = gzdecode($dump);
-
-			if (!$dump) {
-				echo 'Error decompressing dump ' . $match[2] . '.' . PHP_EOL;
-				continue;
-			}
-
-			// Store the dump.
-			$dumpFile = NN_RES . $match[2] . '_predb_dump.csv';
-			$fetched  = file_put_contents($dumpFile, $dump);
-			if (!$fetched) {
-				echo 'Error storing dump file ' . $match[2] . ' in (' . NN_RES . ').' . PHP_EOL;
-				continue;
-			}
-
-			// Make sure it's readable by all.
-			chmod($dumpFile, 0777);
-			$local   = strtolower($argv[2]) == 'local' ? true : false;
-			$verbose = $argv[3] == true ? true : false;
-			importDump($dumpFile, $local, $verbose);
-
-			// Delete the dump.
-			//			unlink($dumpFile);
-
-			$progress = rw_progress(settings_array($match[2] + 1, $progress), false);
-			echo 'Successfully imported PreDB dump ' . $match[2] . ' ' . (--$total) .
-				 ' dumps remaining to import.' . PHP_EOL;
-		}
-	}
-
-	// Drop tmp_pre table
-	$pdo->queryExec('DROP TABLE IF EXISTS tmp_pre');
-}
-
-function settings_array($last = null, $settings = null)
-{
-	if (is_null($settings)) {
-		$settings['last'] = 0;
-	}
-
-	if (!is_null($last)) {
-		$settings['last'] = $last;
-	}
-
-	return $settings;
-}
-
-function rw_progress($settings, $read = true)
-{
-	if (!$read || !is_file(__DIR__ . DS . 'prehash_progress.txt')) {
-		file_put_contents(__DIR__ . DS . 'prehash_progress.txt', base64_encode(serialize($settings)));
-	} else {
-		$settings = unserialize(base64_decode(file_get_contents(__DIR__ . DS .
-																'prehash_progress.txt')));
-	}
-
-	return $settings;
-}
-
-// This function duplicates how dump_predb works but does not drop the hashes/triggers as recreating
-// potentially millions for the small addition that dailies add, isn't worth it.
-function importDump($path, $local, $verbose = true, $table = 'prehash')
-{
-	global $pdo;
-
-	// Create temp table to allow updating
-	if ($verbose) {
-		echo $pdo->log->info("Creating temporary table");
-	}
-
-	// TRuncate to clear any old data
-	$pdo->queryDirect("TRUNCATE TABLE tmp_pre");
-
-	// Import file into tmp_pre
-	$sqlLoad = sprintf(
-		"LOAD DATA %s INFILE '%s' IGNORE INTO TABLE tmp_pre FIELDS TERMINATED BY '\\t\\t' ENCLOSED BY \"'\" LINES TERMINATED BY '\\r\\n' (title, nfo, size, files, filename, nuked, nukereason, category, predate, source, requestid, groupname);",
-		($local === false ? 'LOCAL' : ''),
-		$path
-	);
-	if (NN_DEBUG) {
-		echo $pdo->log->header($sqlLoad);
-	}
-	$pdo->queryDirect($sqlLoad);
-
-	// Remove any titles where length <=8
-	if ($verbose) {
-		echo $pdo->log->info("Deleting any records where title <=8 from Temporary Table");
-	}
-	$pdo->queryDirect("DELETE FROM tmp_pre WHERE LENGTH(title) <= 8");
-
-	// Add any groups that do not currently exist
-	$sqlAddGroups = <<<SQL_ADD_GROUPS
-INSERT IGNORE INTO groups (`name`, description)
-	SELECT groupname, 'Added by predb import script'
-	FROM tmp_pre AS t LEFT JOIN groups AS g ON t.`groupname` = g.`name`
-	WHERE t.`groupname` IS NOT NULL AND g.`name` IS NULL
-	GROUP BY groupname;
-SQL_ADD_GROUPS;
-
-	$pdo->queryDirect($sqlAddGroups);
-
-	// Fill the groupid
-	$pdo->queryDirect("UPDATE tmp_pre AS t SET groupid = (SELECT id FROM groups WHERE name = t.groupname) WHERE groupname IS NOT NULL");
-
-	// Insert and update table
-	$sqlInsert = <<<SQL_INSERT
-INSERT INTO $table (title, nfo, size, files, filename, nuked, nukereason, category, predate, SOURCE, requestid, groupid)
-  SELECT t.title, t.nfo, t.size, t.files, t.filename, t.nuked, t.nukereason, t.category, t.predate, t.source, t.requestid, t.groupid
-    FROM tmp_pre AS t
-  ON DUPLICATE KEY UPDATE prehash.nfo = IF(prehash.nfo IS NULL, t.nfo, prehash.nfo),
-	  prehash.size = IF(prehash.size IS NULL, t.size, prehash.size),
-	  prehash.files = IF(prehash.files IS NULL, t.files, prehash.files),
-	  prehash.filename = IF(prehash.filename = '', t.filename, prehash.filename),
-	  prehash.nuked = IF(t.nuked > 0, t.nuked, prehash.nuked),
-	  prehash.nukereason = IF(t.nuked > 0, t.nukereason, prehash.nukereason),
-	  prehash.category = IF(prehash.category IS NULL, t.category, prehash.category),
-	  prehash.requestid = IF(prehash.requestid = 0, t.requestid, prehash.requestid),
-	  prehash.groupid = IF(prehash.groupid = 0, t.groupid, prehash.groupid);
-SQL_INSERT;
-
-	echo $pdo->log->info("Inserting records from temporary table into $table");
-	if (NN_DEBUG) {
-		echo $pdo->log->primary($sqlInsert);
-	}
-	if ($pdo->queryDirect($sqlInsert) === false) {
-		echo "FAILED\n";
-	}
-}
\ No newline at end of file
diff --git a/lib/testing/recategorize.php b/lib/testing/recategorize.php
deleted file mode 100644
index 59be61686..000000000
--- a/lib/testing/recategorize.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../bin/config.php");
-require_once(WWW_DIR . "/lib/framework/db.php");
-require_once(WWW_DIR . "/lib/category.php");
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-require_once(WWW_DIR . "/lib/ConsoleTools.php");
-
-
-$c = new ColorCLI();
-if (!(isset($argv[1]) && ($argv[1] == "all" || $argv[1] == "misc" || preg_match('/\([\d, ]+\)/', $argv[1]) || is_numeric($argv[1])))) {
-	exit($c->error(
-		"\nThis script will attempt to re-categorize releases and is useful if changes have been made to Category.php.\n"
-		. "No updates will be done unless the category changes\n"
-		. "An optional last argument, test, will display the number of category changes that would be made\n"
-		. "but will not update the database.\n\n"
-		. "php $argv[0] all                     ...: To process all releases.\n"
-		. "php $argv[0] misc                    ...: To process all releases in misc categories.\n"
-		. "php $argv[0] 155                     ...: To process all releases in groupid 155.\n"
-		. "php $argv[0] '(155, 140)'            ...: To process all releases in group_ids 155 and 140.\n"
-	));
-}
-
-reCategorize($argv);
-
-function reCategorize($argv)
-{
-	$c = new ColorCLI();
-	$where = '';
-	$update = true;
-	if (isset($argv[1]) && is_numeric($argv[1])) {
-		$where = ' AND groupid = ' . $argv[1];
-	} else if (isset($argv[1]) && preg_match('/\([\d, ]+\)/', $argv[1])) {
-		$where = ' AND groupid IN ' . $argv[1];
-	} else if (isset($argv[1]) && $argv[1] === 'misc') {
-		$where = ' AND categoryid IN (1090, 2020, 3050, 4040, 5050, 6050, 7050, 8010)';
-	}
-	if (isset($argv[2]) && $argv[2] === 'test') {
-		$update = false;
-	}
-
-	if (isset($argv[1]) && (is_numeric($argv[1]) || preg_match('/\([\d, ]+\)/', $argv[1]))) {
-		echo $c->header("Categorizing all releases in ${argv[1]} using searchname. This can take a while, be patient.");
-	} else if (isset($argv[1]) && $argv[1] == "misc") {
-		echo $c->header("Categorizing all releases in misc categories using searchname. This can take a while, be patient.");
-	} else {
-		echo $c->header("Categorizing all releases using searchname. This can take a while, be patient.");
-	}
-	$timestart = TIME();
-	if (isset($argv[1]) && (is_numeric($argv[1]) || preg_match('/\([\d, ]+\)/', $argv[1])) || $argv[1] === 'misc') {
-		$chgcount = categorizeRelease($update, str_replace(" AND", "WHERE", $where), true);
-	} else {
-		$chgcount = categorizeRelease($update, "", true);
-	}
-	$consoletools = new ConsoleTools();
-	$time = $consoletools->convertTime(TIME() - $timestart);
-	if ($update === true) {
-		echo $c->header("Finished re-categorizing " . number_format($chgcount) . " releases in " . $time . " , 	using the searchname.\n");
-	} else {
-		echo $c->header("Finished re-categorizing in " . $time . " , using the searchname.\n"
-			. "This would have changed " . number_format($chgcount) . " releases but no updates were done.\n"
-		);
-	}
-}
-
-// Categorizes releases.
-// Returns the quantity of categorized releases.
-function categorizeRelease($update = true, $where, $echooutput = false)
-{
-	$pdo = new DB();
-	$cat = new Categorize();
-	$consoletools = new consoleTools();
-	$relcount = $chgcount = 0;
-	$c = new ColorCLI();
-	echo $c->primary("SELECT id, searchname, groupid, categoryid FROM releases " . $where);
-	$resrel = $pdo->queryDirect("SELECT id, searchname, groupid, categoryid FROM releases " . $where);
-	$total = $resrel->rowCount();
-	if ($total > 0) {
-		foreach ($resrel as $rowrel) {
-			$catId = $cat->determineCategory($rowrel['groupid'], $rowrel['searchname']);
-			if ($rowrel['categoryid'] != $catId) {
-				if ($update === true) {
-					$pdo->queryExec(
-						sprintf("
-							UPDATE releases
-							SET iscategorized = 1,
-								rageid = -1,
-								seriesfull = NULL,
-								season = NULL,
-								episode = NULL,
-								tvtitle = NULL,
-								tvairdate = NULL,
-								imdbid = NULL,
-								musicinfoid = NULL,
-								consoleinfoid = NULL,
-								gamesinfo_id = 0,
-								xxxinfo_id = 0,
-								bookinfoid = NULL,
-								anidbid = NULL,
-								categoryid = %d
-							WHERE id = %d",
-							$catId,
-							$rowrel['id']
-						)
-					);
-				}
-				$chgcount++;
-			}
-			$relcount++;
-			if ($echooutput) {
-				$consoletools->overWritePrimary("Re-Categorized: [" . number_format($chgcount) . "] " . $consoletools->percentString($relcount, $total));
-			}
-		}
-	}
-	if ($echooutput !== false && $relcount > 0) {
-		echo "\n";
-	}
-
-	return $chgcount;
-}
\ No newline at end of file
diff --git a/run.php b/run.php
deleted file mode 100644
index 2f7e72710..000000000
--- a/run.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/bin/config.php");
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once (WWW_DIR.'/lib/site.php');
-require_once (WWW_DIR.'/lib/util.php');
-require_once(WWW_DIR. '/lib/Tmux.php');
-require_once(WWW_DIR . "/lib/ColorCLI.php");
-
-$db = new DB();
-$DIR = NN_TMUX;
-$c = new ColorCLI();
-$s = new Sites();
-$site = $s->get();
-$t = new Tmux();
-$tmux = $t->get();
-$patch = (isset($tmux->sqlpatch)) ? $tmux->sqlpatch : 0;
-$import = (isset($tmux->import)) ? $tmux->import : 0;
-$tmux_session = (isset($tmux->tmux_session)) ? $tmux->tmux_session : 0;
-$seq = (isset($tmux->sequential)) ? $tmux->sequential : 0;
-$powerline = (isset($tmux->powerline)) ? $tmux->powerline : 0;
-$colors = (isset($tmux->colors)) ? $tmux->colors : 0;
-$nntpproxy = $site->nntpproxy;
-$tablepergroup = $site->tablepergroup;
-$tablepergroup = ($tablepergroup != '') ? $tablepergroup : 0;
-
-Utility::clearScreen();
-
-echo "Starting Tmux...\n";
-// Create a placeholder session so tmux commands do not throw server not found errors.
-exec('tmux new-session -ds placeholder 2>/dev/null');
-// Search for NNTPProxy session that might be running from a user threaded.php run. Setup a clean environment to run in.
-exec("tmux list-session | grep NNTPProxy", $nntpkill);
-if (count($nntpkill) !== 0) {
-	exec("tmux kill-session -t NNTPProxy");
-	echo $pdo->log->notice("Found NNTPProxy tmux session and killing it.");
-} else {
-	exec("tmux list-session", $session);
-}
-
-// Check database patch version
-if ($patch < 116) {
-	exit($c->error("\nYour database is not up to date. Please update.\nphp ${DIR}lib/DB/patchDB.php\n"));
-}
-
-//check if session exists
-$session = shell_exec("tmux list-session | grep $tmux_session");
-// Kill the placeholder
-exec('tmux kill-session -t placeholder');
-if (count($session) !== 0) {
-	exit($pdo->log->error("tmux session: '" . $tmux_session . "' is already running, aborting.\n"));
-}
-
-$nntpproxy = $site->nntpproxy;
-if ($nntpproxy == '1') {
-	$modules = ["nntp", "socketpool"];
-	foreach ($modules as &$value) {
-		if (!python_module_exist($value)) {
-			exit($pdo->log->error("\nNNTP Proxy requires " . $value .
-				" python module but it's not installed. Aborting.\n"));
-		}
-	}
-}
-
-function writelog($pane)
-{
-	$path = dirname(__FILE__) . "/bin/logs";
-	$getdate = gmDate("Ymd");
-	$tmux = new Tmux();
-	$logs = $tmux->get()->write_logs;
-	if ($logs == 1) {
-		return "2>&1 | tee -a $path/$pane-$getdate.log";
-	} else {
-		return "";
-	}
-}
-
-//remove folders from tmpunrar
-if (isset($site->tmpunrarpath)) {
-	$tmpunrar = $site->tmpunrarpath;
-	if ((count(glob("$tmpunrar/*", GLOB_ONLYDIR))) > 0) {
-		echo $c->info("Removing dead folders from " . $tmpunrar);
-		exec("rm -r " . $tmpunrar . "/*");
-	}
-}
-
-function command_exist($cmd)
-{
-	$returnVal = exec("which $cmd 2>/dev/null");
-	return (empty($returnVal) ? false : true);
-}
-
-//check for apps
-$apps = array("time", "tmux", "nice", "python", "tee");
-foreach ($apps as &$value) {
-	if (!command_exist($value)) {
-		exit($c->error("Tmux scripts require " . $value . " but it's not installed. Aborting.\n"));
-	}
-}
-
-function python_module_exist($module)
-{
-	$output = $returnCode = '';
-	exec("python -c \"import $module\"", $output, $returnCode);
-	return ($returnCode == 0 ? true : false);
-}
-
-$nntpproxy = $site->nntpproxy;
-if ($nntpproxy == '1') {
-	$modules = array("nntp", "socketpool");
-	foreach ($modules as &$value) {
-		if (!python_module_exist($value)) {
-			exit($db->log->error("\nNNTP Proxy requires " . $value . " python module but it's not installed. Aborting.\n"));
-		}
-	}
-}
-
-function start_apps($tmux_session)
-{
-	$t = new Tmux();
-	$tmux = $t->get();
-	$htop = $tmux->htop;
-	$vnstat = $tmux->vnstat;
-	$vnstat_args = $tmux->vnstat_args;
-	$tcptrack = $tmux->tcptrack;
-	$tcptrack_args = $tmux->tcptrack_args;
-	$nmon = $tmux->nmon;
-	$bwmng = $tmux->bwmng;
-	$mytop = $tmux->mytop;
-	$showprocesslist = $tmux->showprocesslist;
-	$processupdate = $tmux->processupdate;
-	$console_bash = $tmux->console;
-
-	if ($htop == 1 && command_exist("htop")) {
-		exec("tmux new-window -t $tmux_session -n htop 'printf \"\033]2;htop\033\" && htop'");
-	}
-
-	if ($nmon == 1 && command_exist("nmon")) {
-		exec("tmux new-window -t $tmux_session -n nmon 'printf \"\033]2;nmon\033\" && nmon -t'");
-	}
-
-	if ($vnstat == 1 && command_exist("vnstat")) {
-		exec("tmux new-window -t $tmux_session -n vnstat 'printf \"\033]2;vnstat\033\" && watch -n10 \"vnstat ${vnstat_args}\"'");
-	}
-
-	if ($tcptrack == 1 && command_exist("tcptrack")) {
-		exec("tmux new-window -t $tmux_session -n tcptrack 'printf \"\033]2;tcptrack\033\" && tcptrack ${tcptrack_args}'");
-	}
-
-	if ($bwmng == 1 && command_exist("bwm-ng")) {
-		exec("tmux new-window -t $tmux_session -n bwm-ng 'printf \"\033]2;bwm-ng\033\" && bwm-ng'");
-	}
-
-	if ($mytop == 1 && command_exist("mytop")) {
-		exec("tmux new-window -t $tmux_session -n mytop 'printf \"\033]2;mytop\033\" && mytop -u'");
-	}
-
-	if ($showprocesslist == 1) {
-		exec("tmux new-window -t $tmux_session -n showprocesslist 'printf \"\033]2;showprocesslist\033\" && watch -n .5 \"mysql -e \\\"SELECT time, state, info FROM information_schema.processlist WHERE command != \\\\\\\"Sleep\\\\\\\" AND time >= $processupdate ORDER BY time DESC \\\G\\\"\"'");
-	}
-	//exec("tmux new-window -t $tmux_session -n showprocesslist 'printf \"\033]2;showprocesslist\033\" && watch -n .2 \"mysql -e \\\"SELECT time, state, rows_examined, info FROM information_schema.processlist WHERE command != \\\\\\\"Sleep\\\\\\\" AND time >= $processupdate ORDER BY time DESC \\\G\\\"\"'");
-
-	if ($console_bash == 1) {
-		exec("tmux new-window -t $tmux_session -n bash 'printf \"\033]2;Bash\033\" && bash -i'");
-	}
-}
-
-function window_proxy($tmux_session, $window)
-{
-	global $site;
-	$nntpproxy = $site->nntpproxy;
-	if ($nntpproxy === '1') {
-		$DIR = NN_MISC;
-		$nntpproxypy = $DIR . "update_scripts/nix_scripts/tmux/python/nntpproxy.py";
-		if (file_exists($DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf")) {
-			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf";
-			exec("tmux new-window -t $tmux_session -n nntpproxy 'printf \"\033]2;NNTPProxy\033\" && python $nntpproxypy $nntpproxyconf'");
-		}
-	}
-
-	if ($nntpproxy === '1' && ($site->alternate_nntp == '1')) {
-		$DIR = NN_TMUX;
-		$nntpproxypy = $DIR . "python/nntpproxy.py";
-		if (file_exists($DIR . "python/lib/nntpproxy_a.conf")) {
-			$nntpproxyconf = $DIR . "python/lib/nntpproxy_a.conf";
-			exec("tmux selectp -t $tmux_session:$window.0; tmux splitw -t $tmux_session:$window -h -p 50 'printf \"\033]2;NNTPProxy\033\" && python $nntpproxypy $nntpproxyconf'");
-		}
-	}
-}
-
-function window_utilities($tmux_session)
-{
-	exec("tmux new-window -t $tmux_session -n utils 'printf \"\033]2;fixReleaseNames\033\"'");
-	exec("tmux splitw -t $tmux_session:1 -v -p 50 'printf \"\033]2;updateTVandTheaters\033\"'");
-	exec("tmux selectp -t $tmux_session:1.0; tmux splitw -t $tmux_session:1 -h -p 50 'printf \"\033]2;removeCrapReleases\033\"'");
-	exec("tmux selectp -t $tmux_session:1.2; tmux splitw -t $tmux_session:1 -h -p 50 'printf \"\033]2;decryptHashes\033\"'");
-}
-
-function window_stripped_utilities($tmux_session)
-{
-	exec("tmux new-window -t $tmux_session -n utils 'printf \"\033]2;updateTVandTheaters\033\"'");
-	exec("tmux selectp -t $tmux_session:1.0; tmux splitw -t $tmux_session:1 -h -p 50 'printf \"\033]2;postprocessing_amazon\033\"'");
-}
-
-function window_ircscraper($tmux_session)
-{
-	exec("tmux new-window -t $tmux_session -n IRCScraper 'printf \"\033]2;scrapeIRC\033\"'");
-}
-
-function window_post($tmux_session)
-{
-	exec("tmux new-window -t $tmux_session -n post 'printf \"\033]2;postprocessing_additional\033\"'");
-	exec("tmux splitw -t $tmux_session:2 -v -p 67 'printf \"\033]2;postprocessing_non_amazon\033\"'");
-	exec("tmux splitw -t $tmux_session:2 -v -p 50 'printf \"\033]2;postprocessing_amazon\033\"'");
-}
-
-function window_optimize($tmux_session)
-{
-	exec("tmux new-window -t $tmux_session -n optimize 'printf \"\033]2;update_Tmux\033\"'");
-	exec("tmux splitw -t $tmux_session:3 -v -p 50 'printf \"\033]2;optimize\033\"'");
-}
-
-function window_sharing($tmux_session)
-{
-	$pdo = new DB();
-	$sharing = $pdo->queryOneRow('SELECT enabled, posting, fetching FROM sharing');
-	$t = new \Tmux();
-	$tmux = $t->get();
-	$tmux_share = (isset($tmux->run_sharing)) ? $tmux->run_sharing : 0;
-
-	if ($tmux_share && $sharing['enabled'] == 1 && ($sharing['posting'] == 1 || $sharing['fetching'] == 1)) {
-		exec("tmux new-window -t $tmux_session -n Sharing 'printf \"\033]2;comment_sharing\033\"'");
-	}
-}
-
-function attach($DIR, $tmux_session)
-{
-	if (command_exist("php5")) {
-		$PHP = "php5";
-	} else {
-		$PHP = "php";
-	}
-
-	//get list of panes by name
-	$panes_win_1 = exec("echo `tmux list-panes -t $tmux_session:0 -F '#{pane_title}'`");
-	$panes0 = str_replace("\n", '', explode(" ", $panes_win_1));
-	$log = writelog($panes0[0]);
-	exec("tmux respawnp -t $tmux_session:0.0 '$PHP " . $DIR . "bin/monitor.php $log'");
-	exec("tmux select-window -t $tmux_session:0; tmux attach-session -d -t $tmux_session");
-}
-
-//create tmux session
-if ($powerline == 1) {
-	$tmuxconfig = $DIR . "powerline/tmux.conf";
-} else {
-	$tmuxconfig = $DIR . "conf/tmux.conf";
-}
-
-if ($seq == 1) {
-	exec("cd ${DIR}; tmux -f $tmuxconfig new-session -d -s $tmux_session -n Monitor 'printf \"\033]2;\"Monitor\"\033\"'");
-	exec("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -p 67 'printf \"\033]2;update_releases\033\"'");
-	exec("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -p 25 'printf \"\033]2;nzb-import\033\"'");
-
-	window_utilities($tmux_session);
-	window_post($tmux_session);
-	if ($nntpproxy == 1) {
-		window_ircscraper($tmux_session);
-		window_proxy($tmux_session, 4);
-		window_sharing($tmux_session);
-	} else {
-		window_ircscraper($tmux_session);
-		window_sharing($tmux_session);
-	}
-	start_apps($tmux_session);
-	attach($DIR, $tmux_session);
-} else if ($seq == 2) {
-	exec("cd ${DIR}; tmux -f $tmuxconfig new-session -d -s $tmux_session -n Monitor 'printf \"\033]2;\"Monitor\"\033\"'");
-	exec("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -p 67 'printf \"\033]2;sequential\033\"'");
-	exec("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -p 25 'printf \"\033]2;nzb-import\033\"'");
-
-	window_stripped_utilities($tmux_session);
-	if ($nntpproxy == 1) {
-		window_ircscraper($tmux_session);
-		window_proxy($tmux_session, 3);
-		window_sharing($tmux_session);
-	} else {
-		window_ircscraper($tmux_session);
-		window_sharing($tmux_session);
-	}
-
-	start_apps($tmux_session);
-	attach($DIR, $tmux_session);
-} else {
-	exec("cd ${DIR}; tmux -f $tmuxconfig new-session -d -s $tmux_session -n Monitor 'printf \"\033]2;Monitor\033\"'");
-	exec("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -p 67 'printf \"\033]2;update_binaries\033\"'");
-	exec("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -p 25 'printf \"\033]2;nzb-import\033\"'");
-	exec("tmux selectp -t $tmux_session:0.2; tmux splitw -t $tmux_session:0 -v -p 67 'printf \"\033]2;backfill\033\"'");
-	exec("tmux splitw -t $tmux_session -v -p 50 'printf \"\033]2;update_releases\033\"'");
-
-	window_utilities($tmux_session);
-	window_post($tmux_session);
-	if ($nntpproxy == 1) {
-		window_ircscraper($tmux_session);
-		window_proxy($tmux_session, 4);
-		window_sharing($tmux_session);
-	} else {
-		window_ircscraper($tmux_session);
-		window_sharing($tmux_session);
-	}
-	start_apps($tmux_session);
-	attach($DIR, $tmux_session);
-}
\ No newline at end of file
diff --git a/start.php b/start.php
deleted file mode 100644
index 53b6a41b4..000000000
--- a/start.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * This file makes the tmux monitoring script activate the processing cycle.
- * It does so by changing the running setting in the database, so that the monitor script knows to
- * (re)start applicable scripts.
- *
- * It will start the tmux server and monitoring scripts if needed.
- */
-require_once(dirname(__FILE__)."/bin/config.php");
-require_once(WWW_DIR . "lib/framework/db.php");
-require_once(WWW_DIR. '/lib/Tmux.php');
-
-
-
-
-$pdo = new DB();
-
-$tmux = new \Tmux();
-$tmux_settings = $tmux->get();
-$tmux_session = (isset($tmux_settings->tmux_session)) ? $tmux_settings->tmux_session : 0;
-$path = __DIR__;
-
-// Set running value to on.
-$tmux->startRunning();
-
-// Create a placeholder session so tmux commands do not throw server not found errors.
-exec('tmux new-session -ds placeholder 2>/dev/null');
-
-//check if session exists
-$session = shell_exec("tmux list-session | grep $tmux_session");
-// Kill the placeholder
-exec('tmux kill-session -t placeholder');
-if (count($session) == 0) {
-	echo $pdo->log->info("Starting the tmux server and monitor script.\n");
-	passthru("php $path/run.php");
-}
diff --git a/stop.php b/stop.php
deleted file mode 100644
index 246035411..000000000
--- a/stop.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__)."/bin/config.php");
-require_once(WWW_DIR. '/lib/Tmux.php');
-
-$restart = (new \Tmux())->stopIfRunning();
diff --git a/tmux-ui.php b/tmux-ui.php
deleted file mode 100644
index d7a11c49f..000000000
--- a/tmux-ui.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * 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 3 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 (see LICENSE.txt in the base directory.  If
- * not, see:
- *
- * @link <http://www.gnu.org/licenses/>.
- * @author niel
- * @copyright 2014 nZEDb
- */
-
-$start = ['start', 'run', 'resume', 'continue'];
-$stop  = ['stop', 'end', 'finish', 'halt'];
-
-$message = <<<HELP_TEXT
-  Usage: {$argv[0]} [$options]
-Start or stop the processing of tmux scripts. This is functionally equivalent to (un)setting the
-'tmux running' setting in admin.
-HELP_TEXT;
-
-if ($argc == 1) {
-	$options = implode(' | ', $start) . ' | ' . implode(' | ', $stop);
-	exit($message);
-}
-
-if (in_array($argv[1], $start)) {
-	passthru('php start.php');
-} else if (in_array($argv[1], $stop)) {
-	passthru('php stop.php');
-} else {
-	echo "Unrecognised command '{$argv[1]}''\n";
-	exit($message);
-}
-
-?>