From 925f4b84ff6155d34c87631765a487e95646d31e Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Thu, 5 Mar 2015 14:02:38 +0100
Subject: [PATCH] Cleanup and category fixes.

---
 lib/Enzebe.php                       | 3 ++-
 lib/ProcessAdditional.php            | 2 +-
 lib/copy_this/www/lib/TmuxOutput.php | 2 +-
 lib/copy_this/www/lib/nzb.php        | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Enzebe.php b/lib/Enzebe.php
index 4ee183c3a..8ba418cb9 100644
--- a/lib/Enzebe.php
+++ b/lib/Enzebe.php
@@ -317,7 +317,8 @@ class Enzebe
 			return $result;
 		}
 
-		$xml = @simplexml_load_string(str_replace("\x0F", '', $nzb));
+		$nzb = str_replace("\x0F", '', $nzb);
+		$xml = @simplexml_load_string($nzb);
 		if (!$xml || strtolower($xml->getName()) !== 'nzb') {
 			return $result;
 		}
diff --git a/lib/ProcessAdditional.php b/lib/ProcessAdditional.php
index e5fac2fa9..4f976473c 100644
--- a/lib/ProcessAdditional.php
+++ b/lib/ProcessAdditional.php
@@ -718,7 +718,7 @@ Class ProcessAdditional
 		}
 
 		// Get a list of files in the nzb.
-		$this->_nzbContents = $this->nnnzb->nzbFileList($nzbContents);
+		$this->_nzbContents = $this->_nzb->nzbFileList($nzbContents);
 		if (count($this->_nzbContents) === 0) {
 
 			$this->_echo('NZB is potentially broken for GUID: ' . $this->_release['guid'], 'warning');
diff --git a/lib/copy_this/www/lib/TmuxOutput.php b/lib/copy_this/www/lib/TmuxOutput.php
index b101a9120..18dda780f 100644
--- a/lib/copy_this/www/lib/TmuxOutput.php
+++ b/lib/copy_this/www/lib/TmuxOutput.php
@@ -117,7 +117,7 @@ class TmuxOutput extends Tmux
 		$buffer = '';
 		$state = ($this->runVar['settings']['is_running'] == 1) ? 'Running' : 'Disabled';
 		//$version = $this->_tvers . 'r' . $this->_vers;
-		$tversion = '0.5r01147';
+		$tversion = '0.5r01150';
 
 		$buffer .= sprintf($this->tmpMasks[2],
 					"Monitor $state v$tversion @ $this->_tvers [" . $this->_vers ."]: ",
diff --git a/lib/copy_this/www/lib/nzb.php b/lib/copy_this/www/lib/nzb.php
index 220ccb500..9fc1da929 100644
--- a/lib/copy_this/www/lib/nzb.php
+++ b/lib/copy_this/www/lib/nzb.php
@@ -146,8 +146,9 @@ class NZB
 	{
 		$result = array();
 
-		$xml = @simplexml_load_string(str_replace("\x0F", '', $nzb));
+		$nzb = str_replace("\x0F", "", $nzb);
 		$num_pars = 0;
+		$xml = @simplexml_load_string($nzb);
 		if (!$xml || strtolower($xml->getName()) != 'nzb')
 			return false;