NNTmux / newznab-tmux

nntmux/NZBContents.php

Doc Comments +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 	 * @param int    $groupID
 	 * @param string $groupName
 	 *
-	 * @return bool
+	 * @return false|string
 	 *
 	 * @access public
 	 */
@@ -161,7 +161,7 @@ 
 	 * @param int    $groupID
 	 * @param bool   $nfoCheck
 	 *
-	 * @return array|bool
+	 * @return string
 	 *
 	 * @access public
 	 */

Braces +1 added lines, -2 removed lines

@@ -197,8 +197,7 @@
 						!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))
-					{
+							$subject)) {
 						$hiddenID = (string)$nzbcontents->segments->segment;
 						$hiddenNFO = true;
 					}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  *
  * Class NZBContents
  */
-Class NZBContents
+class NZBContents
 {
 	/**
 	 * @var \nntmux\db\Settings

nntmux/NZBGet.php

Doc Comments +3 added lines, -3 removed lines

@@ -346,7 +346,7 @@ 
 	 *
 	 * @param int $limit The speed to limit it to.
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 *
 	 * @access public
 	 */
@@ -399,7 +399,7 @@ 
 	/**
 	 * Request for current status (summary) information. Parts of informations returned by this method can be printed by command "nzbget -L".
 	 *
-	 * @return array The status.
+	 * @return boolean The status.
 	 *
 	 * @access public
 	 */
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param string $url NZBGet URL to verify.
 	 *
-	 * @return bool|string
+	 * @return string|false
 	 *
 	 * @access public
 	 */

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
 		$this->rsstoken = $page->userdata['rsstoken'];
 
 		if (!empty($page->userdata['nzbgeturl'])) {
-			$this->url  = $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']);
 		}
@@ -381,7 +381,7 @@ 
 			if ($xml) {
 				$retVal = [];
 				$i = 0;
-				foreach($xml->params->param->value->array->data->value as $value) {
+				foreach ($xml->params->param->value->array->data->value as $value) {
 					foreach ($value->struct->member as $member) {
 						$value = (array)$member->value;
 						$value = array_shift($value);
@@ -410,7 +410,7 @@ 
 		if ($data) {
 			$xml = simplexml_load_string($data);
 			if ($xml) {
-				foreach($xml->params->param->value->struct->member as $member) {
+				foreach ($xml->params->param->value->struct->member as $member) {
 					$value = (array)$member->value;
 					$value = array_shift($value);
 					if (!is_object($value)) {
@@ -432,7 +432,7 @@ 
 	 *
 	 * @access public
 	 */
-	public function verifyURL ($url)
+	public function verifyURL($url)
 	{
 		if (preg_match('/(?P<protocol>https?):\/\/(?P<url>.+?)(:(?P<port>\d+\/)|\/)$/i', $url, $matches)) {
 			return

nntmux/NZBInfo.php

Doc Comments +3 added lines

@@ -68,6 +68,9 @@
 		return $this->isLoaded;
 	}
 
+    /**
+     * @param string $loc
+     */
     public function loadFromFile($loc, $loadAllVars=false)
     {
         $this->source = $loc;

Indentation +138 added lines, -138 removed lines

@@ -12,10 +12,10 @@ 
 	public $zipcount = 0;
 	public $videocount = 0;
 	public $audiocount = 0;
-    public $imgcount = 0;
-    public $srrcount = 0;
-    public $txtcount = 0;
-    public $sfvcount = 0;
+	public $imgcount = 0;
+	public $srrcount = 0;
+	public $txtcount = 0;
+	public $sfvcount = 0;
 	public $filesize = 0;
 	public $poster	= '';
 	public $postedfirst = 0;
@@ -31,27 +31,27 @@ 
 	public $mediafiles = [];
 	public $audiofiles = [];
 	public $rarfiles = [];
-    public $imgfiles = [];
-    public $srrfiles = [];
-    public $txtfiles = [];
-    public $sfvfiles = [];
+	public $imgfiles = [];
+	public $srrfiles = [];
+	public $txtfiles = [];
+	public $sfvfiles = [];
 	public $segmentfiles = [];
-    public $parfiles = [];
+	public $parfiles = [];
 
-    private $isLoaded = false;
+	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';
-    }
+		$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)
 	{
@@ -68,39 +68,39 @@ 
 		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 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()
 	{
@@ -129,7 +129,7 @@ 
 		$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->sfvcount.' sfvs';
 		$out[] = '       -'.$this->zipcount.' zips';
 		$out[] = '       -'.$this->videocount.' videos';
 		$out[] = '       -'.$this->audiocount.' audios';
@@ -146,7 +146,7 @@ 
 		if (!$xmlObj || strtolower($xmlObj->getName()) != 'nzb' || !isset($xmlObj->file))
 			return false;
 
-        return true;
+		return true;
 	}
 
 	private function parseNzb($xmlObj)
@@ -216,27 +216,27 @@ 
 				$fileArr['filesize'] += $bytes;
 				$fileArr['segmentactual']++;
 				$fileArr['segments'][$number] = (string) $segment;
-                $fileArr['segmentbytes'][$number] = $bytes;
+				$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);
 
-            $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)));
-            }
+				$fileArr['subject'] = utf8_encode(trim(preg_replace('|\('.$msgPart.'[\/]'.$msgTotalParts.'\)|i', '', $subject)));
+			}
 
 			//file counts
 			$this->filecount++;
@@ -268,36 +268,36 @@ 
 				$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($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++;
@@ -319,40 +319,40 @@ 
 		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";
+	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 .= "<!-- nntmux ".date("Y-m-d H:i:s")." -->\n</nzb>";
-
-        return $nzb;
-    }
+			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 .= "<!-- nntmux ".date("Y-m-d H:i:s")." -->\n</nzb>";
+
+		return $nzb;
+	}
 }

Spacing +52 added lines, -52 removed lines

@@ -17,7 +17,7 @@ 
     public $txtcount = 0;
     public $sfvcount = 0;
 	public $filesize = 0;
-	public $poster	= '';
+	public $poster = '';
 	public $postedfirst = 0;
 	public $postedlast = 0;
 	public $completion = 0;
@@ -53,7 +53,7 @@ 
         $this->sfvfileregex = '/\.(sfv)[ "\)\]]/iS';
     }
 
-	public function loadFromString($str, $loadAllVars=false)
+	public function loadFromString($str, $loadAllVars = false)
 	{
 		if (empty($this->source))
 			$this->source = 'string';
@@ -68,7 +68,7 @@ 
 		return $this->isLoaded;
 	}
 
-    public function loadFromFile($loc, $loadAllVars=false)
+    public function loadFromFile($loc, $loadAllVars = false)
     {
         $this->source = $loc;
         $this->loadAllVars = $loadAllVars;
@@ -77,17 +77,17 @@ 
         {
             if (preg_match('/\.(gz|zip)$/i', $loc, $ext))
             {
-                switch(strtolower($ext[1]))
+                switch (strtolower($ext[1]))
                 {
                     case 'gz':
-                        $loc = 'compress.zlib://'.$loc;
+                        $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;
+                            $loc = 'zip://' . $loc;
                         break;
                 }
             }
@@ -105,7 +105,7 @@ 
 	public function summarize()
 	{
 		$out = [];
-		$out[] = 'Reading from '.basename($this->source).'...';
+		$out[] = 'Reading from ' . basename($this->source) . '...';
 		if (!empty($this->nfofiles))
 			$out[] = ' -nfo detected';
 		if (!empty($this->samplefiles))
@@ -118,23 +118,23 @@ 
 		if (!empty($this->metadata))
 		{
 			$out[] = ' -metadata:';
-			foreach($this->metadata as $mk=>$mv)
-				$out[] = '       -'.$mk.': '.$mv;
+			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[] = ' -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[] = '';
 
@@ -154,27 +154,27 @@ 
 		//Metadata
 		if (isset($xmlObj->head->meta))
 		{
-			foreach($xmlObj->head->meta as $meta)
+			foreach ($xmlObj->head->meta as $meta)
 			{
 				if (isset($meta->attributes()->type))
 				{
-					$metaKey = (string) $meta->attributes()->type;
-					$this->metadata[$metaKey] = (string) $meta;
+					$metaKey = (string)$meta->attributes()->type;
+					$this->metadata[$metaKey] = (string)$meta;
 				}
 			}
 		}
 
 		//NZB GID = first segment of first file
-		$gid = (string) $xmlObj->file->segments->segment;
+		$gid = (string)$xmlObj->file->segments->segment;
 		if (!empty($gid))
 			$this->gid = md5($gid);
 
-		foreach($xmlObj->file as $file)
+		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['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;
@@ -200,22 +200,22 @@ 
 			//groups
 			foreach ($file->groups->group as $group)
 			{
-				$this->groups[] = (string) $group;
-				$fileArr['groups'][] = (string) $group;
+				$this->groups[] = (string)$group;
+				$fileArr['groups'][] = (string)$group;
 			}
 
 			//file segments
-			foreach($file->segments->segment as $segment)
+			foreach ($file->segments->segment as $segment)
 			{
-				$bytes = (int) $segment->attributes()->bytes;
-				$number = (int) $segment->attributes()->number;
+				$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['segments'][$number] = (string)$segment;
                 $fileArr['segmentbytes'][$number] = $bytes;
 			}
 
@@ -223,19 +223,19 @@ 
             preg_match_all($pattern, $subject, $matches, PREG_PATTERN_ORDER);
             $matchcnt = sizeof($matches[0]);
             $msgPart = $msgTotalParts = 0;
-            for ($i=0; $i<$matchcnt; $i++)
+            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)
+            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);
+                $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)));
+                $fileArr['subject'] = utf8_encode(trim(preg_replace('|\(' . $msgPart . '[\/]' . $msgTotalParts . '\)|i', '', $subject)));
             }
 
 			//file counts
@@ -311,7 +311,7 @@ 
 		$this->groups = array_unique($this->groups);
 
 		if ($this->segmenttotal > 0)
-			$this->completion = number_format(($this->segmentactual/$this->segmenttotal)*100, 0);
+			$this->completion = number_format(($this->segmentactual / $this->segmenttotal) * 100, 0);
 
 		if (is_array($this->nzb) && !empty($this->nzb))
 			$this->isLoaded = true;
@@ -331,27 +331,27 @@ 
         {
             $nzb .= "<head>\n";
 			$out = [];
-            foreach($this->metadata as $mk=>$mv)
-                $out[] = ' <meta type="'.$mk.'">'.$mv."</meta>\n";
+            foreach ($this->metadata as $mk=>$mv)
+                $out[] = ' <meta type="' . $mk . '">' . $mv . "</meta>\n";
             $nzb .= "</head>\n";
         }
-        foreach($this->nzb as $postFile)
+        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 .= "<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)
+            foreach ($postFile['groups'] as $fileGroup)
             {
-                $nzb .= "  <group>".$fileGroup."</group>\n";
+                $nzb .= "  <group>" . $fileGroup . "</group>\n";
             }
             $nzb .= " </groups>\n";
             $nzb .= " <segments>\n";
-            foreach($postFile['segments'] as $fileSegmentNum=>$fileSegment)
+            foreach ($postFile['segments'] as $fileSegmentNum=>$fileSegment)
             {
-                $nzb .= "  <segment bytes=\"".$postFile['segmentbytes'][$fileSegmentNum]."\" number=\"".$fileSegmentNum."\">".htmlspecialchars($fileSegment, ENT_QUOTES, 'utf-8')."</segment>\n";
+                $nzb .= "  <segment bytes=\"" . $postFile['segmentbytes'][$fileSegmentNum] . "\" number=\"" . $fileSegmentNum . "\">" . htmlspecialchars($fileSegment, ENT_QUOTES, 'utf-8') . "</segment>\n";
             }
             $nzb .= " </segments>\n</file>\n";
         }
-        $nzb .= "<!-- nntmux ".date("Y-m-d H:i:s")." -->\n</nzb>";
+        $nzb .= "<!-- nntmux " . date("Y-m-d H:i:s") . " -->\n</nzb>";
 
         return $nzb;
     }

Braces +103 added lines, -101 removed lines

@@ -55,13 +55,15 @@ 
 
 	public function loadFromString($str, $loadAllVars=false)
 	{
-		if (empty($this->source))
-			$this->source = 'string';
+		if (empty($this->source)) {
+					$this->source = 'string';
+		}
 		$this->loadAllVars = $loadAllVars;
 
 		$xmlObj = @simplexml_load_string($str);
-		if ($this->isValidNzb($xmlObj))
-			$this->parseNzb($xmlObj);
+		if ($this->isValidNzb($xmlObj)) {
+					$this->parseNzb($xmlObj);
+		}
 
 		unset($xmlObj);
 
@@ -73,29 +75,28 @@ 
         $this->source = $loc;
         $this->loadAllVars = $loadAllVars;
 
-        if (file_exists($loc))
-        {
-            if (preg_match('/\.(gz|zip)$/i', $loc, $ext))
-            {
-                switch(strtolower($ext[1]))
-                {
+        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;
+                        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);
+            if ($this->isValidNzb($xmlObj)) {
+                            $this->parseNzb($xmlObj);
+            }
 
             unset($xmlObj);
         }
@@ -106,20 +107,24 @@ 
 	{
 		$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))
-		{
+		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;
+			foreach($this->metadata as $mk=>$mv) {
+							$out[] = '       -'.$mk.': '.$mv;
+			}
 		}
 
 		$out[] = ' -sngl: '.sizeof($this->segmentfiles);
@@ -143,8 +148,9 @@ 
 
 	private function isValidNzb($xmlObj)
 	{
-		if (!$xmlObj || strtolower($xmlObj->getName()) != 'nzb' || !isset($xmlObj->file))
-			return false;
+		if (!$xmlObj || strtolower($xmlObj->getName()) != 'nzb' || !isset($xmlObj->file)) {
+					return false;
+		}
 
         return true;
 	}
@@ -152,12 +158,9 @@ 
 	private function parseNzb($xmlObj)
 	{
 		//Metadata
-		if (isset($xmlObj->head->meta))
-		{
-			foreach($xmlObj->head->meta as $meta)
-			{
-				if (isset($meta->attributes()->type))
-				{
+		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;
 				}
@@ -166,11 +169,11 @@ 
 
 		//NZB GID = first segment of first file
 		$gid = (string) $xmlObj->file->segments->segment;
-		if (!empty($gid))
-			$this->gid = md5($gid);
+		if (!empty($gid)) {
+					$this->gid = md5($gid);
+		}
 
-		foreach($xmlObj->file as $file)
-		{
+		foreach($xmlObj->file as $file) {
 			$fileArr = [];
 			$fileArr['subject'] = (string) $file->attributes()->subject;
 			$fileArr['poster'] = (string) $file->attributes()->poster;
@@ -190,23 +193,23 @@ 
 
 			//dates
 			$date = $fileArr['posted'];
-			if ($date > $this->postedlast || $this->postedlast == 0)
-				$this->postedlast = $date;
+			if ($date > $this->postedlast || $this->postedlast == 0) {
+							$this->postedlast = $date;
+			}
 
-			if ($date < $this->postedfirst || $this->postedfirst == 0)
-				$this->postedfirst = $date;
+			if ($date < $this->postedfirst || $this->postedfirst == 0) {
+							$this->postedfirst = $date;
+			}
 
 
 			//groups
-			foreach ($file->groups->group as $group)
-			{
+			foreach ($file->groups->group as $group) {
 				$this->groups[] = (string) $group;
 				$fileArr['groups'][] = (string) $group;
 			}
 
 			//file segments
-			foreach($file->segments->segment as $segment)
-			{
+			foreach($file->segments->segment as $segment) {
 				$bytes = (int) $segment->attributes()->bytes;
 				$number = (int) $segment->attributes()->number;
 
@@ -223,14 +226,12 @@ 
             preg_match_all($pattern, $subject, $matches, PREG_PATTERN_ORDER);
             $matchcnt = sizeof($matches[0]);
             $msgPart = $msgTotalParts = 0;
-            for ($i=0; $i<$matchcnt; $i++)
-            {
+            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)
-            {
+            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);
@@ -241,112 +242,113 @@ 
 			//file counts
 			$this->filecount++;
 
-			if ($fileArr['segmenttotal'] == 1)
-				$this->segmentfiles[] = $fileArr;
+			if ($fileArr['segmenttotal'] == 1) {
+							$this->segmentfiles[] = $fileArr;
+			}
 
-			if (preg_match($this->nfofileregex, $subject))
-				$this->nfofiles[] = $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->samplefiles[] = $fileArr;
+			}
 
-			if (preg_match($this->mediafileregex, $subject) && !preg_match('/sample[\.\-]/i', $subject) && !preg_match('/\.par2|\.srs/i', $subject))
-			{
+			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('/\.(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->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))
-			{
+			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))
-            {
+            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))
-            {
+            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))
-            {
+            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))
-            {
+            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))
-            {
+            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('/(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 (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'];
+			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 ($this->segmenttotal > 0) {
+					$this->completion = number_format(($this->segmentactual/$this->segmenttotal)*100, 0);
+		}
 
-		if (is_array($this->nzb) && !empty($this->nzb))
-			$this->isLoaded = true;
+		if (is_array($this->nzb) && !empty($this->nzb)) {
+					$this->isLoaded = true;
+		}
 
 		return $this->isLoaded;
 	}
 
     public function toNzb()
     {
-        if ($this->loadAllVars === false)
-            return false;
+        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))
-        {
+        if (!empty($this->metadata)) {
             $nzb .= "<head>\n";
 			$out = [];
-            foreach($this->metadata as $mk=>$mv)
-                $out[] = ' <meta type="'.$mk.'">'.$mv."</meta>\n";
+            foreach($this->metadata as $mk=>$mv) {
+                            $out[] = ' <meta type="'.$mk.'">'.$mv."</meta>\n";
+            }
             $nzb .= "</head>\n";
         }
-        foreach($this->nzb as $postFile)
-        {
+        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)
-            {
+            foreach($postFile['groups'] as $fileGroup) {
                 $nzb .= "  <group>".$fileGroup."</group>\n";
             }
             $nzb .= " </groups>\n";
             $nzb .= " <segments>\n";
-            foreach($postFile['segments'] as $fileSegmentNum=>$fileSegment)
-            {
+            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";

nntmux/NZBVortex.php

Doc Comments +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
     /**
      * sendRequest()
      *
-     * @param       $path
+     * @param       string $path
      * @param array $params
      *
      * @return array

Indentation +317 added lines, -317 removed lines

@@ -3,321 +3,321 @@
 
 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 (finished/unfinished) 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)
-        {
-            # file/(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()
-     *
-     * @param       $path
-     * @param array $params
-     *
-     * @return array
-     * @throws \Exception
-     */
-    protected function sendRequest($path, $params = [])
-    {
-        $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;
-        }
-    }
+	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 (finished/unfinished) 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)
+		{
+			# file/(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()
+	 *
+	 * @param       $path
+	 * @param array $params
+	 *
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function sendRequest($path, $params = [])
+	{
+		$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;
+		}
+	}
 }

Spacing +3 added lines, -6 removed lines

@@ -22,8 +22,7 @@ 
      */
     public function getState($code = 0)
     {
-        $states = array
-        (
+        $states = array(
             0  => 'Waiting',
             1  => 'Downloading',
             2  => 'Waiting for save',
@@ -89,8 +88,7 @@ 
             $data     = $user->getById($user->currentUserId());
             $url      = sprintf("%sgetnzb/%s.nzb&i=%s&r=%s", $host, $nzb, $data['id'], $data['rsstoken']);
 
-            $params   = array
-            (
+            $params   = array(
                 'sessionid' => $this->session,
                 'url'       => $url
             );
@@ -252,8 +250,7 @@ 
         $hash     = hash('sha256', sprintf("%s:%s:%s", $this->nonce, $cnonce, $data['nzbvortex_api_key']), true);
         $hash     = base64_encode($hash);
 
-        $params   = array
-        (
+        $params   = array(
             'nonce'  => $this->nonce,
             'cnonce' => $cnonce,
             'hash'   => $hash

Braces +15 added lines, -26 removed lines

@@ -8,8 +8,7 @@ 
 
     public function __construct()
     {
-        if (is_null($this->session))
-        {
+        if (is_null($this->session)) {
             $this->getNonce();
             $this->login();
         }
@@ -63,8 +62,7 @@ 
     {
         $params   = array('sessionid' => $this->session);
         $response = $this->sendRequest(sprintf('app/webUpdate'), $params);
-        foreach ($response['nzbs'] as &$nzb)
-        {
+        foreach ($response['nzbs'] as &$nzb) {
             $nzb['original_state'] = $nzb['state'];
             $nzb['state'] = (1 == $nzb['isPaused']) ? 'Paused' : $this->getState($nzb['state']);
         }
@@ -80,8 +78,7 @@ 
      */
     public function addQueue($nzb = '')
     {
-        if (!empty($nzb))
-        {
+        if (!empty($nzb)) {
             $page = new Page;
             $user = new Users;
 
@@ -107,8 +104,7 @@ 
      */
     public function resume($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # /nzb/(id)/resume
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/resume', $id), $params);
@@ -123,8 +119,7 @@ 
      */
     public function pause($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # /nzb/(id)/pause
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/pause', $id), $params);
@@ -139,8 +134,7 @@ 
      */
     public function moveUp($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # nzb/(nzbid)/moveup
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/moveup', $id), $params);
@@ -155,8 +149,7 @@ 
      */
     public function moveDown($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # nzb/(nzbid)/movedown
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/movedown', $id), $params);
@@ -171,8 +164,7 @@ 
      */
     public function moveBottom($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # nzb/(nzbid)/movebottom
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/movebottom', $id), $params);
@@ -187,8 +179,7 @@ 
      */
     public function delete($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # nzb/(nzbid)/movebottom
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/cancelDelete', $id), $params);
@@ -203,8 +194,7 @@ 
      */
     public function moveTop($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # nzb/(nzbid)/movebottom
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('nzb/%s/movetop', $id), $params);
@@ -219,8 +209,7 @@ 
      */
     public function getFilelist($id = 0)
     {
-        if ($id > 0)
-        {
+        if ($id > 0) {
             # file/(nzbid)
             $params   = array('sessionid' => $this->session);
             $response = $this->sendRequest(sprintf('file/%s', $id), $params);
@@ -261,8 +250,9 @@ 
 
         $response = $this->sendRequest('auth/login', $params);
 
-        if ('successful' == $response['loginResult'])
-            $this->session = $response['sessionID'];
+        if ('successful' == $response['loginResult']) {
+                    $this->session = $response['sessionID'];
+        }
 
         if ('failed' == $response['loginResult']) { }
     }
@@ -301,8 +291,7 @@ 
 
         curl_close($ch);
 
-        switch ($status)
-        {
+        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;

nntmux/processing/PostProcess.php

Doc Comments +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 	/**
 	 * Go through every type of post proc.
 	 *
-	 * @param $nntp
+	 * @param \nntmux\NNTP $nntp
 	 *
 	 * @return void
 	 */
@@ -254,7 +254,7 @@ 
 	 *
 	 * @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,
+	 * @param integer $processTV (Optional) 0 Don't process, 1 process all releases,
 	 *                                         2 process renamed releases only, '' check site setting
 	 *
 	 * @return void

nntmux/processing/tv/TraktTv.php

Doc Comments +2 added lines, -2 removed lines

@@ -91,8 +91,8 @@
 	 * Main processing director function for scrapers
 	 * Calls work query function and initiates processing
 	 *
-	 * @param      $groupID
-	 * @param      $guidChar
+	 * @param      string $groupID
+	 * @param      string $guidChar
 	 * @param      $process
 	 * @param bool $local
 	 */

nntmux/processing/tv/TV.php

Doc Comments +1 added lines, -1 removed lines

@@ -379,7 +379,7 @@
 	/**
 	 * Sets the TV show's image column to found (1)
 	 *
-	 * @param $videoId
+	 * @param integer $videoId
 	 */
 	public function setCoverFound($videoId)
 	{

Indentation +10 added lines, -10 removed lines

@@ -127,16 +127,16 @@
 	abstract protected function formatEpisodeInfo($episode);
 
 		/**
-	 * Retrieve releases for TV processing
-	 * Returns a PDO Object of rows or false if none found
-	 *
-	 * @param string $groupID -- ID of the usenet group to process
-	 * @param string $guidChar -- threading method by first guid character
-	 * @param int    $lookupSetting -- whether or not to use the API
-	 * @param int    $status -- release processing status of tv_episodes_id
-	 *
-	 * @return false|int|\PDOStatement
-	 */
+		 * Retrieve releases for TV processing
+		 * Returns a PDO Object of rows or false if none found
+		 *
+		 * @param string $groupID -- ID of the usenet group to process
+		 * @param string $guidChar -- threading method by first guid character
+		 * @param int    $lookupSetting -- whether or not to use the API
+		 * @param int    $status -- release processing status of tv_episodes_id
+		 *
+		 * @return false|int|\PDOStatement
+		 */
 	public function getTvReleases($groupID = '', $guidChar = '', $lookupSetting = 1, $status = 0)
 	{
 		$ret = 0;

Spacing +17 added lines, -17 removed lines

@@ -13,25 +13,25 @@ 
 abstract class TV extends Videos
 {
 	// Television Sources
-	const SOURCE_NONE    = 0;   // No Scrape source
-	const SOURCE_TVDB    = 1;   // Scrape source was TVDB
-	const SOURCE_TVMAZE  = 2;   // Scrape source was TVMAZE
-	const SOURCE_TMDB    = 3;   // Scrape source was TMDB
-	const SOURCE_TRAKT   = 4;   // Scrape source was Trakt
-	const SOURCE_IMDB    = 5;   // Scrape source was IMDB
-	const SOURCE_TVRAGE  = 6;   // Scrape source was TvRage
+	const SOURCE_NONE    = 0; // No Scrape source
+	const SOURCE_TVDB    = 1; // Scrape source was TVDB
+	const SOURCE_TVMAZE  = 2; // Scrape source was TVMAZE
+	const SOURCE_TMDB    = 3; // Scrape source was TMDB
+	const SOURCE_TRAKT   = 4; // Scrape source was Trakt
+	const SOURCE_IMDB    = 5; // Scrape source was IMDB
+	const SOURCE_TVRAGE  = 6; // Scrape source was TvRage
 
 	// Anime Sources
-	const SOURCE_ANIDB   = 10;   // Scrape source was AniDB
+	const SOURCE_ANIDB   = 10; // Scrape source was AniDB
 
 	// Processing signifiers
-	const PROCESS_TVDB   =  0;   // Process TVDB First
-	const PROCESS_TVMAZE = -1;   // Process TVMaze Second
-	const PROCESS_TMDB   = -2;   // Process TMDB Third
-	const PROCESS_TRAKT  = -3;   // Process Trakt Fourth
-	const PROCESS_IMDB   = -4;   // Process IMDB Fifth
-	const PROCESS_TVRAGE = -5;   // Process TvRage Sixth
-	const NO_MATCH_FOUND = -6;   // Failed All Methods
+	const PROCESS_TVDB   = 0; // Process TVDB First
+	const PROCESS_TVMAZE = -1; // Process TVMaze Second
+	const PROCESS_TMDB   = -2; // Process TMDB Third
+	const PROCESS_TRAKT  = -3; // Process Trakt Fourth
+	const PROCESS_IMDB   = -4; // Process IMDB Fifth
+	const PROCESS_TVRAGE = -5; // Process TvRage Sixth
+	const NO_MATCH_FOUND = -6; // Failed All Methods
 	const FAILED_PARSE   = -100; // Failed Parsing
 
 	/**
@@ -535,7 +535,7 @@ 
 	{
 		$showName = '';
 
-		$following = 	'[^a-z0-9](\d\d-\d\d|\d{1,3}x\d{2,3}|\(?(19|20)\d{2}\)?|(480|720|1080)[ip]|AAC2?|BD-?Rip|Blu-?Ray|D0?\d' .
+		$following = '[^a-z0-9](\d\d-\d\d|\d{1,3}x\d{2,3}|\(?(19|20)\d{2}\)?|(480|720|1080)[ip]|AAC2?|BD-?Rip|Blu-?Ray|D0?\d' .
 				'|DD5|DiVX|DLMux|DTS|DVD(-?Rip)?|E\d{2,3}|[HX][-_. ]?26[45]|ITA(-ENG)?|HEVC|[HPS]DTV|PROPER|REPACK|Season|Episode|' .
 				'S\d+[^a-z0-9]?((E\d+)[abr]?)*|WEB[-_. ]?(DL|Rip)|XViD)[^a-z0-9]?';
 
@@ -804,7 +804,7 @@ 
 
 		if (is_array($required)) {
 			foreach ($required as $req) {
-				if (!in_array($type, ['tmdbS', 'tmdbE', 'traktS', 'traktE'])){
+				if (!in_array($type, ['tmdbS', 'tmdbE', 'traktS', 'traktE'])) {
 					if (!isset($array->$req)) {
 						return false;
 					}

Braces +3 added lines, -2 removed lines

@@ -174,7 +174,8 @@ 
 	 * @param     $releaseId
 	 * @param int $episodeId
 	 */
-	public function setVideoIdFound($videoId, $releaseId, $episodeId) {
+	public function setVideoIdFound($videoId, $releaseId, $episodeId)
+	{
 		$this->pdo->queryExec(
 			sprintf('
 				UPDATE releases
@@ -804,7 +805,7 @@ 
 
 		if (is_array($required)) {
 			foreach ($required as $req) {
-				if (!in_array($type, ['tmdbS', 'tmdbE', 'traktS', 'traktE'])){
+				if (!in_array($type, ['tmdbS', 'tmdbE', 'traktS', 'traktE'])) {
 					if (!isset($array->$req)) {
 						return false;
 					}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 
 		// Check if video already exists based on site ID info
 		// if that fails be sure we're not inserting duplicates by checking the title
-		foreach ($this->siteColumns AS $column) {
+		foreach ($this->siteColumns as $column) {
 			if ($show[$column] > 0) {
 				$videoId = $this->getVideoIDFromSiteID($column, $show[$column]);
 			}

nntmux/processing/tv/TVMaze.php

Doc Comments +3 added lines, -3 removed lines

@@ -55,8 +55,8 @@ 
 	 * Main processing director function for scrapers
 	 * Calls work query function and initiates processing
 	 *
-	 * @param      $groupID
-	 * @param      $guidChar
+	 * @param      string $groupID
+	 * @param      string $guidChar
 	 * @param      $process
 	 * @param bool $local
 	 */
@@ -264,7 +264,7 @@ 
 
 	/**
 	 * @param $shows
-	 * @param $cleanName
+	 * @param string $cleanName
 	 *
 	 * @return array|bool
 	 */

Indentation -1 removed lines

@@ -203,7 +203,6 @@
 	/**
 	 * Calls the API to lookup the TvMaze info for a given TVDB or TVRage ID
 	 * Returns a formatted array of show data or false if no match
-
 	 * @param $site
 	 * @param $siteId
 	 *

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 		$return = false;
 		$highestMatch = 0;
 
-		foreach ($shows AS $show) {
+		foreach ($shows as $show) {
 			if ($this->checkRequiredAttr($show, 'tvmazeS')) {
 				// Check for exact title match first and then terminate if found
 				if (strtolower($show->name) === strtolower($cleanName)) {

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	 * @param      $process
 	 * @param bool $local
 	 */
-	public function processSite ($groupID, $guidChar, $process, $local = false)
+	public function processSite($groupID, $guidChar, $process, $local = false)
 	{
 		$res = $this->getTvReleases($groupID, $guidChar, $process, parent::PROCESS_TMDB);
 
@@ -182,7 +182,7 @@ 
 						$this->setVideoNotFound(parent::PROCESS_TRAKT, $row['id']);
 						$this->titleCache[] = $release['cleanname'];
 					}
-				} else{
+				} else {
 					//Processing failed, set the episode ID to the next processing group
 					$this->setVideoNotFound(parent::PROCESS_TRAKT, $row['id']);
 					$this->titleCache[] = $release['cleanname'];

Braces +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
 						$this->setVideoNotFound(parent::PROCESS_TRAKT, $row['id']);
 						$this->titleCache[] = $release['cleanname'];
 					}
-				} else{
+				} else {
 					//Processing failed, set the episode ID to the next processing group
 					$this->setVideoNotFound(parent::PROCESS_TRAKT, $row['id']);
 					$this->titleCache[] = $release['cleanname'];

nntmux/processing/tv/TvRage.php

Doc Comments +1 added lines, -1 removed lines

@@ -448,7 +448,7 @@
 	 *
 	 * @param $episode
 	 *
-	 * @return array
+	 * @return boolean
 	 */
 	protected function formatEpisodeInfo($episode)
 	{

Spacing +7 added lines, -7 removed lines

@@ -17,27 +17,27 @@ 
 	/**
 	 * @var string
 	 */
-	public $showInfoUrl         = 'http://www.tvrage.com/shows/id-';
+	public $showInfoUrl = 'http://www.tvrage.com/shows/id-';
 
 	/**
 	 * @var string
 	 */
-	public $showQuickInfoURL    = 'http://services.tvrage.com/tools/quickinfo.php?show=';
+	public $showQuickInfoURL = 'http://services.tvrage.com/tools/quickinfo.php?show=';
 
 	/**
 	 * @var string
 	 */
-	public $xmlFullSearchUrl    = 'http://services.tvrage.com/feeds/full_search.php?show=';
+	public $xmlFullSearchUrl = 'http://services.tvrage.com/feeds/full_search.php?show=';
 
 	/**
 	 * @var string
 	 */
-	public $xmlShowInfoUrl      = 'http://services.tvrage.com/feeds/showinfo.php?sid=';
+	public $xmlShowInfoUrl = 'http://services.tvrage.com/feeds/showinfo.php?sid=';
 
 	/**
 	 * @var string
 	 */
-	public $xmlFullShowInfoUrl  = 'http://services.tvrage.com/feeds/full_show_info.php?sid=';
+	public $xmlFullShowInfoUrl = 'http://services.tvrage.com/feeds/full_show_info.php?sid=';
 
 	/**
 	 * @var string
@@ -70,7 +70,7 @@ 
 	public function __construct(array $options = [])
 	{
 		parent::__construct($options);
-		$this->xmlEpisodeInfoUrl    =  "http://services.tvrage.com/myfeeds/episodeinfo.php?key=" . TvRage::APIKEY;
+		$this->xmlEpisodeInfoUrl = "http://services.tvrage.com/myfeeds/episodeinfo.php?key=" . TvRage::APIKEY;
 		$this->imgSavePath = NN_COVERS . 'tvrage' . DS;
 	}
 
@@ -128,7 +128,7 @@ 
 								 $this->pdo->log->headerOver($show['cleanname']) .
 								 $this->pdo->log->primary(" found in local db, setting tvrage ID and attempting episode lookup.");
 						}
-						$episodeId = $this->getBySeasonEp($this->videoId,  $show['season'], $show['episode']);
+						$episodeId = $this->getBySeasonEp($this->videoId, $show['season'], $show['episode']);
 						if ($episodeId === false) {
 							$epinfo = $this->getEpisodeInfo($this->rageId, $show['season'], $show['episode']);
 							if ($epinfo !== false && isset($epinfo['airdate']) && !empty($epinfo['title'])) {