NNTmux / newznab-tmux

nntmux/ReleaseCleaning.php

Doc Comments +8 added lines

@@ -366,6 +366,10 @@ 
 			"cleansubject" => $this->releaseCleanerHelper($this->subject), "properlynamed" => false
 		);
 	}
+
+	/**
+	 * @param string $subject
+	 */
 	public function releaseCleanerHelper($subject)
 	{
 		$cleanerName = preg_replace('/(- )?yEnc$/', '', $subject);
@@ -374,6 +378,10 @@ 
 	//
 	//	Cleans release name for the namefixer class.
 	//
+
+	/**
+	 * @param string $name
+	 */
 	public function fixerCleaner($name)
 	{
 		//Extensions.

nntmux/ReleaseExtra.php

Doc Comments +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
 
 	/**
 	 * @param $releaseID
-	 * @param $uniqueid
+	 * @param string $uniqueid
 	 */
 	public function addUID($releaseID, $uniqueid)
 	{

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 							$overallbitrate = $track['Overall_bit_rate'];
 						}
 						if (isset($track['Unique_ID'])) {
-							if(preg_match('/\(0x(?P<hash>[0-9a-f]{32})\)/i', $track['Unique_ID'], $matches)){
+							if (preg_match('/\(0x(?P<hash>[0-9a-f]{32})\)/i', $track['Unique_ID'], $matches)) {
 								$uniqueid = $matches['hash'];
 								$this->addUID($releaseID, $uniqueid);
 							}

Braces +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 							$overallbitrate = $track['Overall_bit_rate'];
 						}
 						if (isset($track['Unique_ID'])) {
-							if(preg_match('/\(0x(?P<hash>[0-9a-f]{32})\)/i', $track['Unique_ID'], $matches)){
+							if(preg_match('/\(0x(?P<hash>[0-9a-f]{32})\)/i', $track['Unique_ID'], $matches)) {
 								$uniqueid = $matches['hash'];
 								$this->addUID($releaseID, $uniqueid);
 							}

nntmux/ReleaseImage.php

Doc Comments +1 added lines

@@ -49,6 +49,7 @@
 	/**
 	 * Construct.
 	 * @param \DB()
+	 * @param db\DB $pdo
 	 */
 	public function __construct(&$pdo = null)
 	{

Spacing +10 added lines, -10 removed lines

@@ -58,10 +58,10 @@ 
 		}
 		//                                                            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
+		$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
@@ -112,7 +112,7 @@ 
 	 *
 	 * @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)
+	public function saveImage($imgName, $imgLoc, $imgSavePath, $imgMaxWidth = '', $imgMaxHeight = '', $saveThumb = false)
 	{
 		// Try to get the image as a string.
 		$cover = $this->fetchImage($imgLoc);
@@ -125,10 +125,10 @@ 
 			$im = @imagecreatefromstring($cover);
 			$width = @imagesx($im);
 			$height = @imagesy($im);
-			$ratio = min($imgMaxHeight/$height, $imgMaxWidth/$width);
+			$ratio = min($imgMaxHeight / $height, $imgMaxWidth / $width);
 			// New dimensions
-			$new_width = intval($ratio*$width);
-			$new_height = intval($ratio*$height);
+			$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);
@@ -138,7 +138,7 @@ 
 				@imagedestroy($new_image);
 
 				if ($saveThumb) {
-					@file_put_contents($imgSavePath.$imgName.'_thumb.jpg', $thumb);
+					@file_put_contents($imgSavePath . $imgName . '_thumb.jpg', $thumb);
 				} else {
 					$cover = $thumb;
 				}
@@ -148,7 +148,7 @@ 
 			@imagedestroy($im);
 		}
 		// Store it on the hard drive.
-		$coverPath = $imgSavePath.$imgName.'.jpg';
+		$coverPath = $imgSavePath . $imgName . '.jpg';
 		$coverSave = @file_put_contents($coverPath, $cover);
 
 		// Check if it's on the drive.

nntmux/Releases.php

Doc Comments +2 added lines, -2 removed lines

@@ -192,7 +192,7 @@ 
 	 * @param string $orderBy
 	 * @param int    $maxAge
 	 * @param array  $excludedCats
-	 * @param mixed $groupName
+	 * @param integer $groupName
 	 * @param int    $minSize
 	 *
 	 * @return array
@@ -1307,7 +1307,7 @@ 
 	/**
 	 * @param string $guid
 	 *
-	 * @return array|bool
+	 * @return string
 	 */
 	public function getByGuid($guid)
 	{

Spacing +4 added lines, -4 removed lines

@@ -279,7 +279,7 @@ 
 			true, NN_CACHE_EXPIRY_LONG
 		);
 		switch ((isset($setting[0]['value']) && is_numeric($setting[0]['value']) ? $setting[0]['value'] : 10)) {
-			case 0: // Hide releases with a password or a potential password (Hide unprocessed releases).
+			case 0 : // Hide releases with a password or a potential password (Hide unprocessed releases).
 				return ('= ' . Releases::PASSWD_NONE);
 			case 1: // Show releases with no password or a potential password (Show unprocessed releases).
 				return ('<= ' . Releases::PASSWD_POTENTIAL);
@@ -1057,7 +1057,7 @@ 
 		if (!empty($name) && $showSql === '') {
 			if (!empty($series) && (int)$series < 1900) {
 				$name .= sprintf(' S%s', str_pad($series, 2, '0', STR_PAD_LEFT));
-				if (!empty($episode)  && strpos($episode, '/') === false) {
+				if (!empty($episode) && strpos($episode, '/') === false) {
 					$name .= sprintf('E%s', str_pad($episode, 2, '0', STR_PAD_LEFT));
 				}
 			} else if (!empty($airdate)) {
@@ -1647,7 +1647,7 @@ 
 			FROM releases r
 			INNER JOIN musicinfo m ON r.musicinfo_id = m.id
 			WHERE r.categories_id BETWEEN " . Category::MUSIC_ROOT . " AND " . Category::MUSIC_OTHER . "
-			AND r.categories_id != " . Category::MUSIC_AUDIOBOOK ."
+			AND r.categories_id != " . Category::MUSIC_AUDIOBOOK . "
 			AND m.id > 0
 			AND m.cover > 0
 			AND r.id in (select max(id) from releases where musicinfo_id > 0 group by musicinfo_id)
@@ -1670,7 +1670,7 @@ 
 			FROM releases r
 			INNER JOIN bookinfo b ON r.bookinfo_id = b.id
 			WHERE r.categories_id BETWEEN " . Category::BOOKS_ROOT . " AND " . Category::BOOKS_UNKNOWN . "
-			OR r.categories_id = " . Category::MUSIC_AUDIOBOOK ."
+			OR r.categories_id = " . Category::MUSIC_AUDIOBOOK . "
 			AND b.id > 0
 			AND b.cover > 0
 			AND r.id in (select max(id) from releases where bookinfo_id > 0 group by bookinfo_id)

Braces +1 added lines, -2 removed lines

@@ -1005,8 +1005,7 @@
 	public function searchShows(
 		$siteIdArr = [], $series = '', $episode = '', $airdate = '', $offset = 0,
 		$limit = 100, $name = '', $cat = [-1], $maxAge = -1, $minSize = 0
-	)
-	{
+	) {
 		$siteSQL = [];
 		$showSql = '';
 

nntmux/Sites.php

Doc Comments +3 added lines

@@ -162,6 +162,9 @@
 		return $missingpatch;
 	}
 
+	/**
+	 * @param string $setting
+	 */
 	public function updateItem($setting, $value)
 	{
 		$sql = sprintf("update settings set value = %s where setting = %s", $this->_db->escapeString($value), $this->_db->escapeString($setting));

Braces +42 added lines, -28 removed lines

@@ -63,35 +63,44 @@ 
 	{
 		$site = $this->row2Object($form);
 
-		if (substr($site->nzbpath, strlen($site->nzbpath) - 1) != '/')
-			$site->nzbpath = $site->nzbpath . "/";
+		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->mediainfopath != "" && !is_file($site->mediainfopath)) {
+					return Sites::ERR_BADMEDIAINFOPATH;
+		}
 
-		if ($site->ffmpegpath != "" && !is_file($site->ffmpegpath))
-			return Sites::ERR_BADFFMPEGPATH;
+		if ($site->ffmpegpath != "" && !is_file($site->ffmpegpath)) {
+					return Sites::ERR_BADFFMPEGPATH;
+		}
 
-		if ($site->unrarpath != "" && !is_file($site->unrarpath))
-			return Sites::ERR_BADUNRARPATH;
+		if ($site->unrarpath != "" && !is_file($site->unrarpath)) {
+					return Sites::ERR_BADUNRARPATH;
+		}
 
-		if ($site->nzbpath != "" && !file_exists($site->nzbpath))
-			return Sites::ERR_BADNZBPATH;
+		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->checkpasswordedrar == 2 && !is_file($site->unrarpath)) {
+					return Sites::ERR_DEEPNOUNRAR;
+		}
 
-		if ($site->tmpunrarpath != "" && !file_exists($site->tmpunrarpath))
-			return Sites::ERR_BADTMPUNRARPATH;
+		if ($site->tmpunrarpath != "" && !file_exists($site->tmpunrarpath)) {
+					return Sites::ERR_BADTMPUNRARPATH;
+		}
 
-		if ($site->lamepath != "" && !file_exists($site->lamepath))
-			return Sites::ERR_BADLAMEPATH;
+		if ($site->lamepath != "" && !file_exists($site->lamepath)) {
+					return Sites::ERR_BADLAMEPATH;
+		}
 
-		if ($site->sabcompletedir != "" && !file_exists($site->sabcompletedir))
-			return Sites::ERR_SABCOMPLETEPATH;
+		if ($site->sabcompletedir != "" && !file_exists($site->sabcompletedir)) {
+					return Sites::ERR_SABCOMPLETEPATH;
+		}
 
 		$sql = $sqlKeys = [];
 		foreach ($form as $settingK => $settingV) {
@@ -115,8 +124,9 @@ 
 
 		$rows = $this->_db->query($sql, true, NN_CACHE_EXPIRY_MEDIUM);
 
-		if ($rows === false)
-			return false;
+		if ($rows === false) {
+					return false;
+		}
 
 		return $this->rows2Object($rows);
 	}
@@ -124,8 +134,9 @@ 
 	public function rows2Object($rows)
 	{
 		$obj = new \stdClass;
-		foreach ($rows as $row)
-			$obj->{$row['setting']} = $row['value'];
+		foreach ($rows as $row) {
+					$obj->{$row['setting']} = $row['value'];
+		}
 
 		$obj->{'version'} = $this->version();
 
@@ -136,8 +147,9 @@ 
 	{
 		$obj = new \stdClass;
 		$rowKeys = array_keys($row);
-		foreach ($rowKeys as $key)
-			$obj->{$key} = $row[$key];
+		foreach ($rowKeys as $key) {
+					$obj->{$key} = $row[$key];
+		}
 
 		return $obj;
 	}
@@ -154,8 +166,9 @@ 
 			$filecontents = file_get_contents($file);
 			if (preg_match("/Rev\: (\d+)/", $filecontents, $matches)) {
 				$patchrev = $matches[1];
-				if ($patchrev > $currentrev)
-					$missingpatch[] = $file;
+				if ($patchrev > $currentrev) {
+									$missingpatch[] = $file;
+				}
 			}
 		}
 
@@ -177,8 +190,9 @@ 
 	public function getLicense($html = false)
 	{
 		$n = "\r\n";
-		if ($html)
-			$n = "<br/>";
+		if ($html) {
+					$n = "<br/>";
+		}
 
 		return $n . "newznab " . $this->version() . " Copyright (C) " . date("Y") . " newznab.com" . $n . "
 

nntmux/SpotNab.php

Doc Comments +8 added lines

@@ -1869,6 +1869,10 @@ 
 	}
 
 	// ***********************************************************************
+
+	/**
+	 * @param integer $len
+	 */
 	public function getRandomStr($len) {
 		// Valid Characters
 		static $vc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
@@ -2183,6 +2187,10 @@ 
 	}
 
 	// ***********************************************************************
+
+	/**
+	 * @param string $source
+	 */
 	public function encrypt ($source, $prvkey = NULL, $passphrase = NULL){
 		// Encryption performed using private key
 		if($prvkey === NULL)

Spacing +353 added lines, -353 removed lines

@@ -6,7 +6,7 @@ 
 use app\extensions\util\Yenc;
 
 // Help out those who don't have SSL enabled
-if(!defined('OPENSSL_KEYTYPE_RSA')) {
+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)
@@ -17,11 +17,11 @@ 
 define('OPENSSL_CFG_PATH', NN_LIB . '/config/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);
+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);
 
 class SpotNab {
 	// Segment Identifier domain is used to help build segments
@@ -137,7 +137,7 @@ 
 	public function __construct($post_user = NULL, $post_email = NULL, $post_group = NULL) {
 		$this->_pdo = new Settings();
 		$this->_nntp = new NNTP(['Settings' => $this->_pdo]);
-		$this->releaseImage =  new ReleaseImage($this->_pdo);
+		$this->releaseImage = new ReleaseImage($this->_pdo);
 		$this->nzb = new NZB($this->_pdo);
 		$this->releases = new Releases(['Settings' => $this->_pdo]);
 
@@ -146,55 +146,55 @@ 
 		$this->_post_group = $post_group;
 
 		// Fetch Meta information
-		$this->_post_code = trim($this->_pdo->getSetting('code'))?
-			$this->_pdo->getSetting('code'):NULL;
-		$this->_post_title = trim($this->_pdo->getSetting('title'))?
-			$this->_pdo->getSetting('title'):NULL;
+		$this->_post_code = trim($this->_pdo->getSetting('code')) ?
+			$this->_pdo->getSetting('code') : NULL;
+		$this->_post_title = trim($this->_pdo->getSetting('title')) ?
+			$this->_pdo->getSetting('title') : NULL;
 
-		if ($this->_post_user === NULL){
+		if ($this->_post_user === NULL) {
 			// Fetch the SpotNab UserID
-			$this->_post_user = trim($this->_pdo->getSetting('spotnabuser'))?
-				$this->_pdo->getSetting('spotnabuser'):NULL;
+			$this->_post_user = trim($this->_pdo->getSetting('spotnabuser')) ?
+				$this->_pdo->getSetting('spotnabuser') : NULL;
 		}
 
-		if ($this->_post_email === NULL){
+		if ($this->_post_email === NULL) {
 			// Fetch the SpotNab EmailID
-			$this->_post_email = trim($this->_pdo->getSetting('spotnabemail'))?
-				$this->_pdo->getSetting('spotnabemail'):NULL;
+			$this->_post_email = trim($this->_pdo->getSetting('spotnabemail')) ?
+				$this->_pdo->getSetting('spotnabemail') : NULL;
 		}
 
-		if ($this->_post_group === NULL){
+		if ($this->_post_group === NULL) {
 			// Fetch the SpotNab Usenet Group
-			$this->_post_group = trim($this->_pdo->getSetting('spotnabgroup'))?
-				$this->_pdo->getSetting('spotnabgroup'):NULL;
+			$this->_post_group = trim($this->_pdo->getSetting('spotnabgroup')) ?
+				$this->_pdo->getSetting('spotnabgroup') : NULL;
 		}
 
 		// Public Key
-		$this->_ssl_pubkey = trim($this->_pdo->getSetting('spotnabsitepubkey'))?
-			$this->_pdo->getSetting('spotnabsitepubkey'):false;
-		if($this->_ssl_pubkey)
+		$this->_ssl_pubkey = trim($this->_pdo->getSetting('spotnabsitepubkey')) ?
+			$this->_pdo->getSetting('spotnabsitepubkey') : false;
+		if ($this->_ssl_pubkey)
 			$this->_ssl_pubkey = $this->decompstr($this->_ssl_pubkey);
 
 		// Private Key
-		$this->_ssl_prvkey = trim($this->_pdo->getSetting('spotnabsiteprvkey'))?
-			$this->_pdo->getSetting('spotnabsiteprvkey'):false;
-		if($this->_ssl_prvkey)
+		$this->_ssl_prvkey = trim($this->_pdo->getSetting('spotnabsiteprvkey')) ?
+			$this->_pdo->getSetting('spotnabsiteprvkey') : false;
+		if ($this->_ssl_prvkey)
 			$this->_ssl_prvkey = $this->decompstr($this->_ssl_prvkey);
 
 		// Track Discovery Article
 		$this->_discovery_lastarticle = intval($this->_pdo->getSetting('spotnablastarticle'));
 
 		// Posting Flag
-		$this->_can_post = (trim($this->_pdo->getSetting('spotnabpost')) == 1)?
-			true:false;
+		$this->_can_post = (trim($this->_pdo->getSetting('spotnabpost')) == 1) ?
+			true : false;
 
 		// Auto Enable Flag
-		$this->_auto_enable = (trim($this->_pdo->getSetting('spotnabautoenable')) == 1)?
-			true:false;
+		$this->_auto_enable = (trim($this->_pdo->getSetting('spotnabautoenable')) == 1) ?
+			true : false;
 
 		// Spotnab Privacy Posting
-		$this->_post_privacy = (trim($this->_pdo->getSetting('spotnabprivacy')) == 1)?
-			true:false;
+		$this->_post_privacy = (trim($this->_pdo->getSetting('spotnabprivacy')) == 1) ?
+			true : false;
 
 		// Auto-Discovery Private Key (used for Posting)
 		$this->_ssl_auto_prvkey = "eJxtk7mOo0AARHO+YnI0Moe5woYGppv7PjLABmzAgDFg"
@@ -222,14 +222,14 @@ 
 			."LVDl";
 
 		// Auto-Discovery Flags
-		$this->_can_broadcast = (trim($this->_pdo->getSetting('spotnabbroadcast')) == 1)?
-			true:false;
+		$this->_can_broadcast = (trim($this->_pdo->getSetting('spotnabbroadcast')) == 1) ?
+			true : false;
 		$this->_can_broadcast = ($this->_can_broadcast && $this->_can_post);
 
-		$this->_can_discover = (trim($this->_pdo->getSetting('spotnabdiscover')) == 1)?
-			true:false;
+		$this->_can_discover = (trim($this->_pdo->getSetting('spotnabdiscover')) == 1) ?
+			true : false;
 
-		if (!$this->has_openssl()){
+		if (!$this->has_openssl()) {
 			// Can SpotNab even work; if not, we disable all flags
 			$this->_can_broadcast = false;
 			$this->_can_post = false;
@@ -237,14 +237,14 @@ 
 	}
 
 	// ***********************************************************************
-	public function has_openssl(){
+	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){
+	public function auto_clean($max_days = 90) {
 		// 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 "
@@ -254,7 +254,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function orphan_comment_clean($max_days=1, $batch=500)
+	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
@@ -269,29 +269,29 @@ 
 		$sql_rel = "SELECT gid FROM releases WHERE gid IN ('%s') ";
 		$sql_del = "DELETE FROM release_comments WHERE gid IN ('%s')";
 		$total_delcnt = 0;
-		while(1) {
+		while (1) {
 			$res = $this->_pdo->query(sprintf($sql, $offset, $batch));
-			if(!$res) {
+			if (!$res) {
 				break;
 			}
 
 			# Assemble results into list
 			$gids_found = [];
 			$gids_matched = [];
-			foreach($res as $item) {
+			foreach ($res as $item) {
 				$gids_found[] = $item['gid'];
 			}
 
 			#echo 'B:'.sprintf($sql_rel, implode("','", $gids_found))."\n";
 			$res2 = $this->_pdo->query(sprintf($sql_rel, implode("','", $gids_found)));
-			foreach($res2 as $item) {
+			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)) {
+			if (count($gids_missing)) {
 				$s_gids_missing = implode("','", $gids_missing);
 				$dresc = $this->_pdo->queryExec(sprintf($sql_del, $s_gids_missing));
 				$total_delcnt += count($gids_missing);
@@ -302,7 +302,7 @@ 
 			# make noise
 			echo '.';
 
-			if(!count($res)) {
+			if (!count($res)) {
 				break;
 			}
 		}
@@ -310,7 +310,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function soft_reset(){
+	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
@@ -334,7 +334,7 @@ 
 		// 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));
+			time() - (SpotNab::POST_BROADCAST_INTERVAL));
 		$discovery_b = "Update settings SET "
 			."updateddate = '1980-01-01 00:00:00' "
 			."WHERE setting = 'spotnabdiscover'";
@@ -350,7 +350,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function fetch_discovery($reftime = NULL, $retries=3){
+	public function fetch_discovery($reftime = NULL, $retries = 3) {
 		$last = $first = NULL;
 
 		// Return Value; Initialize it to Okay
@@ -361,31 +361,31 @@ 
 		$inserted = 0;
 		$updated = 0;
 
-		if (!$this->_can_discover){
+		if (!$this->_can_discover) {
 			// discovery disabled
 			return false;
 		}
 
-		if($reftime === NULL){
+		if ($reftime === NULL) {
 			$q = "SELECT updateddate FROM settings WHERE "
 				."setting = 'spotnabdiscover'";
 			$res = $this->_pdo->queryOneRow($q);
-			if($res){
+			if ($res) {
 				$reftime = $res['updateddate'];
-			}else{
+			} 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)));
+				$reftime = $this->utc2local((time() - (SpotNab::POST_BROADCAST_INTERVAL)));
 			}
 		}
 
 		// Connect to server
-		try{
+		try {
 			if (($this->_pdo->getSetting('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){
+		catch (\Exception $e) {
 			printf("Failed to connect to Usenet\n");
 			return false;
 		}
@@ -395,7 +395,7 @@ 
 			SpotNab::AUTODISCOVER_POST_GROUP);
 
 		$first = $this->_discovery_lastarticle;
-		if($first <= 0 || $first > $summary['last'] ){
+		if ($first <= 0 || $first > $summary['last']) {
 			// Look back until reftime
 			$first = $this->_first_article_by_date(
 				SpotNab::AUTODISCOVER_POST_GROUP,
@@ -403,7 +403,7 @@ 
 			);
 		}
 
-		if($first === false){
+		if ($first === false) {
 			// Fail
 			echo "Failed\n";
 			return false;
@@ -412,10 +412,10 @@ 
 		// Group Processing Initialization
 		$processed = 0;
 		$batch = $last = intval($summary['last']);
-		$total = abs($last-$first);
+		$total = abs($last - $first);
 
 		// Select Group
-		while($fetch_okay && $processed < $total)
+		while ($fetch_okay && $processed < $total)
 		{
 			try
 			{
@@ -429,7 +429,7 @@ 
 					$headers = $this->_get_headers(SpotNab::AUTODISCOVER_POST_GROUP,
 						"$first-$batch", $retries);
 
-					if($headers === false){
+					if ($headers === false) {
 						// Retry Atempts exausted
 						$fetch_okay = false;
 						break;
@@ -437,33 +437,33 @@ 
 
 					// Process the header batch
 					$saved = $this->process_discovery_headers($headers);
-					if($saved !== false)
+					if ($saved !== false)
 					{
 						$inserted += $saved[0];
 						$updated += $saved[1];
 					}
 
-					$processed += ($batch-$first);
+					$processed += ($batch - $first);
 					// Increment starting index
-					$first += ($batch-$first);
+					$first += ($batch - $first);
 
-					if ($last-$first >= SpotNab::FETCH_USENET_BATCH){
+					if ($last - $first >= SpotNab::FETCH_USENET_BATCH) {
 						// Fetch next batch
 						$batch = $first + SpotNab::FETCH_USENET_BATCH;
-					}else{
+					} else {
 						$batch = $last;
 					}
 					//echo "$first-$batch, processed=$processed\n";
 					//print_r($headers);
 				}
 
-			}catch(\Exception $e){
+			} catch (\Exception $e) {
 				// Reset Connection
 				$fetch_okay = $this->_nntpReset(SpotNab::AUTODISCOVER_POST_GROUP);
 
 				// Track retry attempts
 				$retries--;
-				if($retries <= 0){
+				if ($retries <= 0) {
 					// Retry Atempts exausted
 					$fetch_okay = false;
 					break;
@@ -485,16 +485,16 @@ 
 	}
 
 	// ***********************************************************************
-	public function auto_post_discovery($repost_sec = SpotNab::POST_BROADCAST_INTERVAL){
+	public function auto_post_discovery($repost_sec = SpotNab::POST_BROADCAST_INTERVAL) {
 		// performs a post discovery once the time in seconds has elapsed
 		$q = "SELECT updateddate FROM settings WHERE "
 			."setting = 'spotnabbroadcast'";
 		$res = $this->_pdo->queryOneRow($q);
 		$then = strtotime($res['updateddate']);
 		$now = time();
-		if(($now - $then) > $repost_sec){
+		if (($now - $then) > $repost_sec) {
 			// perform a post
-			if($this->post_discovery())
+			if ($this->post_discovery())
 			{
 				// Update post time
 				$q = "Update settings SET updateddate = NOW() WHERE "
@@ -505,30 +505,30 @@ 
 	}
 
 	// ***********************************************************************
-	public function post_discovery($reftime = NULL, $retries=3){
+	public function post_discovery($reftime = NULL, $retries = 3) {
 		$reftime_local = $reftime;
 		$article = NULL;
 		$rc = new ReleaseComments();
 		$us = new Users();
 
-		if($reftime_local === NULL){
+		if ($reftime_local === NULL) {
 			// Fetch local time
 			$reftime_local = $this->utc2local();
 		}
 		// some error checking....
-		if(!$this->_can_broadcast){
+		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)
+		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){
+		if (!$prvkey) {
 			// This is a serious problem because the hard-coded discovery
 			// key should always decrypt!
 			return false;
@@ -537,9 +537,9 @@ 
 		printf("Spotnab : Broadcast ...");
 
 		// Fetch some date ranges
-		$last_month = date("Y-m-d",strtotime(
+		$last_month = date("Y-m-d", strtotime(
 			date("Y-m-d", time()) . " - 30 day"));
-		$last_year = date('Y-m-d',strtotime(
+		$last_year = date('Y-m-d', strtotime(
 			date("Y-m-d", time()) . " - 365 day"));
 
 		// Header
@@ -576,7 +576,7 @@ 
 			SpotNab::AUTODISCOVER_POST_GROUP
 		);
 
-		if($article === false){
+		if ($article === false) {
 			echo "Failed.\n";
 			return false;
 		}
@@ -615,16 +615,16 @@ 
 
 		// We set a cap on how many days in the past we look
 		$_max_age = time() - SpotNab::FETCH_MAXIMUM_AGE;
-		if($reftime === NULL){
+		if ($reftime === NULL) {
 			// Fetch local time (but look back X days)
 			$reftime = $this->utc2local($_max_age);
-		}else{
+		} else {
 			// Someone specified a date range to query from
 			$backfill = true;
 
-			if(is_string($reftime)){
+			if (is_string($reftime)) {
 				$reftime = date("Y-m-d H:i:s", strtotime($reftime));
-			}else if(is_int($reftime)){
+			} else if (is_int($reftime)) {
 				$reftime = date("Y-m-d H:i:s", $reftime);
 			}
 			$_max_age = strtotime($reftime);
@@ -637,12 +637,12 @@ 
 		$group_article_start = [];
 		$id_hash = [];
 
-		if(!count($res))
+		if (!count($res))
 			return true;
 
-		foreach($res as $source){
+		foreach ($res as $source) {
 			$ghash = trim($source['usenetgroup']);
-			if(!array_key_exists($ghash, $group_hash)){
+			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] = [];
@@ -662,9 +662,9 @@ 
 
 			// 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'];
+			$ref = $backfill ? date("Y-m-d H:i:s", $_max_age) : $source['lastupdate'];
 
-			if(!$ref){
+			if (!$ref) {
 				// We've never fetched from the group before, so we'll use
 				// the reftime passed to the function
 				$ref = $reftime;
@@ -673,12 +673,12 @@ 
 			// 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)
+			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];
+					$group_article_start[$ghash] = ($article < $group_article_start[$ghash]) ?
+						$article : $group_article_start[$ghash];
 			}
 
 			// Store id
@@ -702,15 +702,15 @@ 
 		// 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){
+		foreach (array_keys($group_hash) as $key) {
 			$_ref = [];
-			foreach($group_hash[$key] as $id => $source){
+			foreach ($group_hash[$key] as $id => $source) {
 				# Source Time (within reason)
-				if($backfill)
+				if ($backfill)
 					$_ref[$id] = $_max_age;
 				else
 					$_ref[$id] =
-						($source['ref'] < $_max_age)?$_max_age:$source['ref'];
+						($source['ref'] < $_max_age) ? $_max_age : $source['ref'];
 			}
 			// Sort results (oldest in time first)
 			array_multisort($_ref, SORT_ASC, $group_hash[$key]);
@@ -719,12 +719,12 @@ 
 		// Now we fetch headers
 
 		// Connect to server
-		try{
+		try {
 			if (($this->_pdo->getSetting('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){
+		catch (\Exception $e) {
 			printf("Failed to connect to Usenet");
 			return false;
 		}
@@ -733,18 +733,18 @@ 
 		$inserted = 0;
 		$updated = 0;
 
-		foreach($group_hash as $group => $hash){
+		foreach ($group_hash as $group => $hash) {
 			printf("Spotnab : %d source(s)...", count($hash));
 
 			$summary = $this->_nntp->selectGroup($group);
 			// Get our article id
-			$first = ($backfill)?0:$group_article_start[$group];
-			if($first == 0){
+			$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){
+				if ($first === false) {
 					continue;
 				}
 			}
@@ -752,10 +752,10 @@ 
 			// Group Processing Initialization
 			$processed = 0;
 			$batch = $last = intval($summary['last']);
-			$total = abs($last-$first);
+			$total = abs($last - $first);
 
 			// Select Group
-			while($fetch_okay && $processed < $total)
+			while ($fetch_okay && $processed < $total)
 			{
 				try
 				{
@@ -764,12 +764,12 @@ 
 						$batch = $first + SpotNab::FETCH_USENET_BATCH;
 
 					// Batch Processing
-					while ($processed>=0 && $processed < $total)
+					while ($processed >= 0 && $processed < $total)
 					{
 						$headers = $this->_get_headers($group,
 							"$first-$batch", $retries);
 
-						if($headers === false){
+						if ($headers === false) {
 							// Retry Atempts exausted
 							$fetch_okay = false;
 							break;
@@ -777,33 +777,33 @@ 
 
 						// Process the header batch
 						$saved = $this->process_comment_headers($headers, $hash);
-						if($saved !== false)
+						if ($saved !== false)
 						{
 							$inserted += $saved[0];
 							$updated += $saved[1];
 						}
 
-						$processed += ($batch-$first);
+						$processed += ($batch - $first);
 						// Increment starting index
-						$first += ($batch-$first);
+						$first += ($batch - $first);
 
-						if ($last-$first >= SpotNab::FETCH_USENET_BATCH){
+						if ($last - $first >= SpotNab::FETCH_USENET_BATCH) {
 							// Fetch next batch
 							$batch = $first + SpotNab::FETCH_USENET_BATCH;
-						}else{
+						} else {
 							$batch = $last;
 						}
 						//echo "$first-$batch, processed=$processed\n";
 						//print_r($headers);
 					}
 
-				}catch(\Exception $e){
+				} catch (\Exception $e) {
 					// Reset Connection
 					$fetch_okay = $this->_nntpReset($group);
 
 					// Track retry attempts
 					$retries--;
-					if($retries <= 0){
+					if ($retries <= 0) {
 						// Retry Atempts exausted
 						$fetch_okay = false;
 						break;
@@ -818,14 +818,14 @@ 
 		}
 
 		// Ensure We're not connected
-		try{$this->_nntp->doQuit();}
-		catch(\Exception $e)
+		try {$this->_nntp->doQuit(); }
+		catch (\Exception $e)
 		{/* do nothing */}
 
 		return $inserted + $updated;
 	}
 
-	public function processGID($limit=500, $batch=5000, $delete_broken_releases = false){
+	public function processGID($limit = 500, $batch = 5000, $delete_broken_releases = false) {
 		// Process until someone presses cntrl-c
 
 		$nzb = new NZB();
@@ -839,30 +839,30 @@ 
 			.'WHERE gid IS NULL ORDER BY adddate DESC LIMIT %d,%d';
 		$usql = "UPDATE releases SET gid = '%s' WHERE id = %d";
 
-		while(1){
+		while (1) {
 			// finish
-			if($limit > 0 && $processed >= $limit)
+			if ($limit > 0 && $processed >= $limit)
 				break;
-			$batch=($limit > 0 && $batch > $limit)?$limit:$batch;
+			$batch = ($limit > 0 && $batch > $limit) ? $limit : $batch;
 			$res = $this->_pdo->query(sprintf($fsql, $offset, $batch));
-			if(!$res)break;
-			if(count($res) <= 0)break;
+			if (!$res)break;
+			if (count($res) <= 0)break;
 			$offset += $batch;
 
-			foreach ($res as $r){
+			foreach ($res as $r) {
 				$nzbfile = $nzb->getNZBPath($r["guid"]);
-				if($nzbfile === NULL){
+				if ($nzbfile === NULL) {
 					continue;
 				}
 
 				$nzbInfo = new NZBInfo();
 				if (!$nzbInfo->loadFromFile($nzbfile))
 				{
-					if($delete_broken_releases){
+					if ($delete_broken_releases) {
 						$this->releases->deleteSingle(['g' => $r['guid'], 'i' => $r['id']], $this->nzb, $this->releaseImage);
 						// Free the variable in an attempt to recover memory
 						echo '-';
-					}else{
+					} else {
 						// Skip over this one for future fetches
 						$offset++;
 					}
@@ -874,11 +874,11 @@ 
 				// Free the variable in an attempt to recover memory
 				unset($nzbInfo);
 
-				if(!$gid){
-					if($delete_broken_releases){
+				if (!$gid) {
+					if ($delete_broken_releases) {
 						$this->releases->deleteSingle(['g' => $r['guid'], 'i' => $r['id']], $this->nzb, $this->releaseImage);
 						echo '-';
-					}else{
+					} else {
 						// Skip over this one for future fetches
 						$offset++;
 					}
@@ -887,7 +887,7 @@ 
 
 				// Update DB With Global Identifer
 				$ures = $this->_pdo->queryExec(sprintf("UPDATE releases SET gid = %s WHERE id = %d", $this->_pdo->escapeString($gid), $r['id']));
-				if($ures->rowCount() == 0){
+				if ($ures->rowCount() == 0) {
 					printf("\nPostPrc : Failed to update: %s\n", $r['name']);
 				}
 				// make noise...
@@ -906,13 +906,13 @@ 
 			)
 		);
 		$rows = $affected->rowCount();
-		if($rows > 0)
+		if ($rows > 0)
 			$processed += $rows;
 		return $processed;
 	}
 
 	// ***********************************************************************
-	public function keygen($print = true, $force_regen = false){
+	public function keygen($print = true, $force_regen = false) {
 		// Simply generate a Public/Private Key pair if they don't already
 		// exist
 
@@ -920,17 +920,17 @@ 
 		// a few checks first to make sure it's safe to do so
 		$do_keygen = true;
 
-		if($force_regen === false){
+		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){
+			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){
+				if ($str_in != $str_out) {
 					// Our key isn't good for nothin...
 					// regen a new one
 					$do_keygen = true;
@@ -938,15 +938,15 @@ 
 			}
 		}
 
-		if($do_keygen)
+		if ($do_keygen)
 		{
 			// Set new Key
 			$keys = $this->_keygen();
-			if(is_array($keys)){
+			if (is_array($keys)) {
 				// Force New Username
 				$sql = sprintf("Update settings SET value = %s "
 					."WHERE setting = 'spotnabuser'",
-					$this->_pdo->escapeString(sprintf("nntp-%s",substr(md5($keys['pubkey']), 0, 4))));
+					$this->_pdo->escapeString(sprintf("nntp-%s", substr(md5($keys['pubkey']), 0, 4))));
 				$this->_pdo->queryExec($sql);
 				// Force New Email
 				$sql = sprintf("Update settings SET value = %s "
@@ -957,13 +957,13 @@ 
 					)));
 				$this->_pdo->queryExec($sql);
 				// Save Keys
-				$sql = sprintf("Update settings SET value = %s ".
+				$sql = sprintf("Update settings SET value = %s " .
 					"WHERE setting = 'spotnabsitepubkey'",
 					$this->_pdo->escapeString($keys['pubkey']));
 				$this->_pdo->queryExec($sql);
 				//echo $keys['pubkey']."\n";
 
-				$sql = sprintf("Update settings SET value = %s ".
+				$sql = sprintf("Update settings SET value = %s " .
 					"WHERE setting = 'spotnabsiteprvkey'",
 					$this->_pdo->escapeString($keys['prvkey']));
 				$this->_pdo->queryExec($sql);
@@ -973,13 +973,13 @@ 
 				$this->_post_email = trim($this->_pdo->getSetting('spotnabemail'));
 				$this->_ssl_pubkey = $this->decompstr($this->_pdo->getSetting('spotnabsitepubkey'));
 				$this->_ssl_prvkey = $this->decompstr($this->_pdo->getSetting('spotnabsiteprvkey'));
-			}else{
+			} else {
 				// echo "Failed.";
 				return false;
 			}
 		}
 
-		if($print){
+		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);
@@ -994,7 +994,7 @@ 
 	}
 
 	// ***********************************************************************
-	protected function _first_article_by_date($group, $refdate, $limit = SpotNab::FETCH_MAXIMUM_HEADERS, $retries=3){
+	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.
 		//
@@ -1021,12 +1021,12 @@ 
 		// no one is perfect right?
 		$curfew = 10;
 
-		if(is_string($refdate)){
+		if (is_string($refdate)) {
 			// Convert to Integer (Local Time)
 			$refdate = strtotime($refdate);
 		}
 
-		while(($retries > 0) && ($interval > 0)){
+		while (($retries > 0) && ($interval > 0)) {
 			$summary = $this->_nntp->selectGroup($group);
 
 			$_last = $last = intval($summary['last']);
@@ -1035,56 +1035,56 @@ 
 			$curdate = $lastdate = NULL;
 			$curid = $lastid = $first;
 			$interval = 0;
-			while($retries > 0){
+			while ($retries > 0) {
 
 				// Save Last Interval
 				$lastinterval = $interval;
 
 				// Adjust Interval
-				if(($last - $first) > 3)
-					$interval = floor(($last - $first)/2);
+				if (($last - $first) > 3)
+					$interval = floor(($last - $first) / 2);
 				else
 					$interval = 1;
 
-				if($misses >= SpotNab::FETCH_MAX_MISSES){
+				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){
+					$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.";
+						echo " " . (abs($last - $lastid)) . " record(s) back.";
 						return $lastid;
-					}else{
-						if (($_last-$last) > $limit){
+					} else {
+						if (($_last - $last) > $limit) {
 							// We exceeded our maximum header limit
 							// adjust accordingly
 							$last = $_last - $limit;
 						}
-						echo " ".(abs($_last-$last))." record(s) back.";
+						echo " " . (abs($_last - $last)) . " record(s) back.";
 						return $last;
 					}
 				}
 
 				// Swap
 				$lastdate = $curdate;
-				if($curid > 0)
+				if ($curid > 0)
 					$lastid = $curid;
 
 				$msgs = $this->_get_headers(
-					$group, ($last-$interval), $retries);
+					$group, ($last - $interval), $retries);
 
-				if($msgs === false){
-					if (($_last-$last) > $limit){
+				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.";
+					echo " " . (abs($_last - $last)) . " record(s) back.";
 					return $last;
 				}
 
@@ -1094,72 +1094,72 @@ 
 				// 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){
+				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.";
+						echo " " . (abs($_last - $lastid)) . " record(s) back.";
 						return $lastid;
-					}else{
-						if (($_last-$last) > $limit){
+					} else {
+						if (($_last - $last) > $limit) {
 							// We exceeded our maximum header limit
 							// adjust accordingly
 							$last = $_last - $limit;
 						}
-						echo " ".(abs($_last-$last))." record(s) back.";
+						echo " " . (abs($_last - $last)) . " record(s) back.";
 						return $last;
 					}
 				}
 
-				if($interval == 1){
+				if ($interval == 1) {
 					// We're soo close now...
-					$curfew --;
-					if($curfew <= 0)
+					$curfew--;
+					if ($curfew <= 0)
 					{
-						if (($_last-$curid) > $limit){
+						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.";
+						echo " " . ($_last - $curid) . " record(s) back.";
 						return $curid;
 					}
 
-					if($refdate > $curdate && $refdate > $lastdate){
-						if (($_last-$curid) > $limit){
+					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.";
+						echo " " . ($_last - $curid) . " record(s) back.";
 						return $curid;
-					}else if($refdate > $curdate && $refdate > $lastdate){
+					} else if ($refdate > $curdate && $refdate > $lastdate) {
 						// Close... Shuffle forward a bit
-						$first+=2;
-					}else{
+						$first += 2;
+					} else {
 						// Slide window and try again
-						$last-=2;
+						$last -= 2;
 					}
-					$interval=2;
+					$interval = 2;
 					continue;
 				}
 
 				// Make some noise
-				if($interval%2)echo ".";
+				if ($interval % 2)echo ".";
 
 				// Adjust Boundaries
-				if($curdate > $refdate){
+				if ($curdate > $refdate) {
 					// We need to look further forward
-					$last = $curid+1;
-				}else if ($curdate <= $refdate){
+					$last = $curid + 1;
+				} else if ($curdate <= $refdate) {
 					// We need To look further back
-					$first = $curid-1;
+					$first = $curid - 1;
 				}
 			}
 		}
@@ -1168,7 +1168,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function process_comment_headers($headers, $group_hash, $save = true){
+	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
@@ -1209,7 +1209,7 @@ 
 		*		)
 		*/
 
-		if(!count($group_hash)){
+		if (!count($group_hash)) {
 			// Nothing to process
 			return [];
 		}
@@ -1220,49 +1220,49 @@ 
 
 
 		// Comments
-		$sql_new_cmt = "INSERT INTO release_comments (".
-			"id, sourceid, username, users_id, gid, cid, isvisible, ".
-			"releases_id, text, createddate, issynced, nzb_guid) VALUES (".
+		$sql_new_cmt = "INSERT INTO release_comments (" .
+			"id, sourceid, username, users_id, gid, cid, isvisible, " .
+			"releases_id, text, createddate, issynced, nzb_guid) VALUES (" .
 			"NULL, %d, %s, 0, %s, %s, %d, 0, %s, %s, 1, UNHEX(%s))";
-		$sql_upd_cmt = "UPDATE release_comments SET ".
-			"isvisible = %d, text = %s".
+		$sql_upd_cmt = "UPDATE release_comments SET " .
+			"isvisible = %d, text = %s" .
 			"WHERE sourceid = %d AND gid = %s AND cid = %s AND nzb_guid = UNHEX(%s)";
-		$sql_fnd_cmt = "SELECT count(id) as cnt FROM release_comments ".
+		$sql_fnd_cmt = "SELECT count(id) as cnt FROM release_comments " .
 			"WHERE sourceid = %d AND gid = %s AND cid = %s";
 
 		// Sync Times
-		$sql_sync = "UPDATE spotnabsources SET lastupdate = %s ".
+		$sql_sync = "UPDATE spotnabsources SET lastupdate = %s " .
 			"WHERE id = %d";
 
 		$matches = NULL;
 		$processed = 0;
 		$updates = 0;
 		$inserts = 0;
-		foreach ($headers as $header){
+		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)){
+			if (!preg_match(SpotNab::FETCH_MSGID_REGEX,
+				$header['Message-ID'], $matches)) {
 				continue;
 			}
-			if($matches['domain'] != SpotNab::SEGID_DOMAIN)
+			if ($matches['domain'] != SpotNab::SEGID_DOMAIN)
 				continue;
 
-			if($matches['type'] != SpotNab::FETCH_COMMENT_TYPE)
+			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)){
+			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){
+			$refdate_epoch = @strtotime($matches['utcref'] . " UTC");
+			if ($refdate_epoch === false || $refdate_epoch < 0) {
 				// Bad time specified
 				continue;
 			}
@@ -1271,26 +1271,26 @@ 
 			// assume the body will decode too (and won't be a waste of
 			// time to download it)
 
-			foreach($group_hash as $hash){
+			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']){
+				if ($refdate_epoch <= $hash['ref']) {
 					continue;
 				}
 
 				// Scan header information for supported matches
-				if(!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
+				if (!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
 					$header['From'], $matches))
 					continue;
 
 				// Match against our sources posts
-				if(trim($matches['user']) != $hash['user']) {
+				if (trim($matches['user']) != $hash['user']) {
 					continue;
 				}
-				if(trim($matches['email']) != $hash['email']) {
+				if (trim($matches['email']) != $hash['email']) {
 					continue;
 				}
 
@@ -1302,55 +1302,55 @@ 
 				// within the body matches that of the header... then we
 				// can start processing the guts of the body.
 
-				if($save) {
+				if ($save) {
 					// Download Body
 					$body = $this->_get_body($header['Group'], $header['Message-ID']);
-					if($body === false) {
+					if ($body === false) {
 						continue;
 					}
 
 					// Decode Body
 					$body = $this->decodePost($body, $hash['key']);
-					if($body === false) {
+					if ($body === false) {
 						continue; // Decode failed
 					}
 
 					// Verify Body
-					if(!is_array($body)) {
+					if (!is_array($body)) {
 						continue; // not any array
 					}
 
-					if(!(bool)count(array_filter(array_keys($body), 'is_string'))) {
+					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))) {
+					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) {
+					if (preg_replace('/[^0-9]/', '', $body['postdate_utc']) != $refdate) {
 						continue;
 					}
 
 					// Comment Handling
-					if(array_key_exists('comments',$body) && is_array($body['comments'])) {
+					if (array_key_exists('comments', $body) && is_array($body['comments'])) {
 						$rc = new ReleaseComments();
 
-						foreach($body['comments'] as $comment){
+						foreach ($body['comments'] as $comment) {
 
 							// Verify Comment is parseable
-							if(!is_array($comment)) {
+							if (!is_array($comment)) {
 								continue; // not an array
 							}
-							if(!count(array_filter(array_keys($comment)))) {
+							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)) {
+							if (array_key_exists('is_visible', $comment)) {
 								$is_visible = (intval($comment['is_visible']) > 0) ? 1 : 0;
 							}
 
@@ -1362,7 +1362,7 @@ 
 								$this->_pdo->escapeString($comment['cid'])));
 
 							// Store Results in DB
-							if($res && intval($res['cnt'])>0) {
+							if ($res && intval($res['cnt']) > 0) {
 								// Make some noise
 								echo '.';
 								$updates += ($this->_pdo->queryExec(sprintf($sql_upd_cmt,
@@ -1372,7 +1372,7 @@ 
 										$this->_pdo->escapeString($comment['gid']),
 										$this->_pdo->escapeString($comment['cid']),
 										$this->_pdo->escapeString($comment['gid'])
-									))>0)?1:0;
+									)) > 0) ? 1 : 0;
 							} else {
 								// Make some noise
 								echo '+';
@@ -1402,7 +1402,7 @@ 
 							$hash['id']
 						)
 					);
-				}else{
+				} else {
 					// Debug non/save mode; mark update
 					$updates += 1;
 				}
@@ -1418,7 +1418,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function process_discovery_headers($headers, $save = true){
+	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
@@ -1444,51 +1444,51 @@ 
 		//
 
 		// Auto Enable Flag (used for inserts only)
-		$auto_enable = ($this->_auto_enable)?"1":"0";
+		$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 (".
+		$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 ".
+		$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 ".
+		$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){
+		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)){
+			if (!preg_match(SpotNab::FETCH_MSGID_REGEX,
+				$header['Message-ID'], $matches)) {
 				continue;
 			}
-			if($matches['domain'] != SpotNab::SEGID_DOMAIN)
+			if ($matches['domain'] != SpotNab::SEGID_DOMAIN)
 				continue;
 
-			if($matches['type'] != SpotNab::FETCH_DISCOVERY_TYPE)
+			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)){
+			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){
+			$refdate_epoch = @strtotime($matches['utcref'] . " UTC");
+			if ($refdate_epoch === false || $refdate_epoch < 0) {
 				// Bad time specified
 				continue;
 			}
@@ -1501,14 +1501,14 @@ 
 			$processed++;
 
 			// Scan header information for supported matches
-			if(!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
+			if (!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
 				$header['From'], $matches))
 				continue;
 
 			// Match against our sources posts
-			if(trim($matches['user']) != SpotNab::AUTODISCOVER_POST_USER)
+			if (trim($matches['user']) != SpotNab::AUTODISCOVER_POST_USER)
 				continue;
-			if(trim($matches['email']) != SpotNab::AUTODISCOVER_POST_EMAIL)
+			if (trim($matches['email']) != SpotNab::AUTODISCOVER_POST_EMAIL)
 				continue;
 
 			// If we reach here, we've found a header we can process
@@ -1519,11 +1519,11 @@ 
 			// within the body matches that of the header... then we
 			// can start processing the guts of the body.
 
-			if($save){
+			if ($save) {
 				// Download Body
 				$body = $this->_get_body($header['Group'],
 					$header['Message-ID']);
-				if($body === false){
+				if ($body === false) {
 					continue;
 				}
 
@@ -1532,17 +1532,17 @@ 
 					$body,
 					$this->decompstr($this->_ssl_auto_pubkey)
 				);
-				if($body === false)
+				if ($body === false)
 					continue; // Decode failed
 
 				// Verify Body
-				if(!is_array($body))
+				if (!is_array($body))
 					continue; // not any array
 
-				if(!(bool)count(array_filter(array_keys($body), 'is_string')))
+				if (!(bool)count(array_filter(array_keys($body), 'is_string')))
 					continue; // not an associative array
 
-				if(!(array_key_exists('site', $body) &&
+				if (!(array_key_exists('site', $body) &&
 					array_key_exists('posts', $body) &&
 					array_key_exists('comments', $body) &&
 					array_key_exists('postdate_utc', $body)))
@@ -1550,22 +1550,22 @@ 
 
 				// Compare postdate_utc and ensure it matches header
 				// timestamp
-				if(preg_replace('/[^0-9]/', '',
+				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;
+				$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))
+				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)
+				if ($p_user == $this->_post_user && $p_email == $this->_post_email)
 					continue;
 
 				// Check that comment doesn't already exist
@@ -1575,12 +1575,12 @@ 
 						$this->_pdo->escapeString($p_group))
 				);
 
-				if(!$res)
+				if (!$res)
 					// Uh oh
 					continue;
 
 				// Store Results in DB
-				if(intval($res['cnt'])==0){
+				if (intval($res['cnt']) == 0) {
 					// Make some noise
 					echo '+';
 					// Perform Insert
@@ -1594,7 +1594,7 @@ 
 							$this->_pdo->escapeString($this->utc2local($refdate)))
 					);
 					$inserts += 1;
-				}else{
+				} else {
 					echo '.';
 					$res = $this->_pdo->queryExec(sprintf($sql_upd_cmt,
 						$this->_pdo->escapeString($this->utc2local($refdate)),
@@ -1609,14 +1609,14 @@ 
 	}
 
 	// ***********************************************************************
-	protected function _get_body($group, $id, $retries=3){
+	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))
+		if (preg_match("/^\s*<(.*)>\s*$/", $id, $matches))
 			// Ensure we're always dealing with a properly
 			// formatted id
 			$id = $matches[1];
@@ -1625,16 +1625,16 @@ 
 		$raw = NULL;
 		do
 		{
-			$raw = $this->_nntp->getBody("<".$id.">", true);
+			$raw = $this->_nntp->getBody("<" . $id . ">", true);
 			// Retrieved Data
 			return $raw;
-		} while($retries > 0);
+		} while ($retries > 0);
 		// Fail
 		return false;
 	}
 
 	// ***********************************************************************
-	protected function _get_headers($group, $range, $retries=3, $sort = true){
+	protected function _get_headers($group, $range, $retries = 3, $sort = true) {
 		/*
 		*
 		*	There is to much involved with fetching article headers
@@ -1665,30 +1665,30 @@ 
 			// just report what it found.. (nothing). We do this because
 			// NNTP::isError() never threw, so the response has to be valid
 			// even though it's inconsistent
-			if(!$msgs)return [];
-			if(!is_array($msgs))return [];
+			if (!$msgs)return [];
+			if (!is_array($msgs))return [];
 
 			// 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'))){
+			if ((bool)count(array_filter(array_keys($msgs), 'is_string'))) {
 				// convert to an array of assocative array
 				$msgs = [$msgs];
 			}
 
-			for($i=0;$i<count($msgs);$i++){
+			for ($i = 0; $i < count($msgs); $i++) {
 				$skip = false;
-				foreach($min_headers as $key){
-					if(!array_key_exists($key, $msgs[$i])){
+				foreach ($min_headers as $key) {
+					if (!array_key_exists($key, $msgs[$i])) {
 						unset($msgs[$i]);
 						$i--;
 						$skip = true;
 						break;
 					}
 				}
-				if($skip)continue;
+				if ($skip)continue;
 
 				// Update Record With Epoch Value (# of sec from Jan, 1980)
 				$epoch[$i] = $msgs[$i]['Epoch'] = strtotime($msgs[$i]['Date']);
@@ -1697,7 +1697,7 @@ 
 				$epoch[$i] = $msgs[$i]['Group'] = $group;
 			}
 
-			if($sort && count($msgs)>1)
+			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
@@ -1705,13 +1705,13 @@ 
 
 			return $msgs;
 
-		}while($retries >0);
+		} while ($retries > 0);
 
 		return false;
 	}
 
 	// ***********************************************************************
-	public function post($reftime = NULL, $retries=3){
+	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.
@@ -1720,14 +1720,14 @@ 
 		*/
 
 		// Make sure we can post
-		if(!$this->_can_post){
+		if (!$this->_can_post) {
 			// Disabled
 			return false;
 		}
 
 		$reftime_local = $reftime;
 		$article = NULL;
-		if($reftime_local === NULL){
+		if ($reftime_local === NULL) {
 			// Fetch local time
 			$reftime_local = $this->utc2local();
 		}
@@ -1742,7 +1742,7 @@ 
 		];
 
 		// Store Comments
-		while(($data = $this->unPostedComments()) !== NULL)
+		while (($data = $this->unPostedComments()) !== NULL)
 		{
 			$message['comments'] = $data['comments'];
 			$sql = sprintf("UPDATE release_comments "
@@ -1750,9 +1750,9 @@ 
 				implode(",", $data['ids']));
 
 			// Generate keys if one doesn't exist
-			if(!($this->_ssl_prvkey && $this->_ssl_pubkey))
+			if (!($this->_ssl_prvkey && $this->_ssl_pubkey))
 			{
-				if($this->keygen(false, true) !== false)
+				if ($this->keygen(false, true) !== false)
 					// Post a discovery message if enabled
 					$this->post_discovery();
 				else
@@ -1761,7 +1761,7 @@ 
 
 			// Encode Message so it can be posted
 			$article = $this->encodePost($message, $reftime_local);
-			if($article === false){
+			if ($article === false) {
 				echo "Failed.\n";
 				return false;
 			}
@@ -1786,10 +1786,10 @@ 
 	}
 
 	// ***********************************************************************
-	private function _postArticle ($article, $retries=3)
+	private function _postArticle($article, $retries = 3)
 	{
 		// Extract message id
-		if(!preg_match('/Message-ID: <(?P<id>[^>]+)>/', $article[0], $matches)){
+		if (!preg_match('/Message-ID: <(?P<id>[^>]+)>/', $article[0], $matches)) {
 			// we couldn't extract the message id
 			return false;
 		}
@@ -1800,12 +1800,12 @@ 
 		if (($this->_pdo->getSetting('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)
+		while ($retries > 0)
 		{
 			try
 			{
 				$summary = $this->_nntp->selectGroup($this->_post_group);
-				if(NNTP::isError($summary)){
+				if (NNTP::isError($summary)) {
 					$summary = $this->_nntpReset($this->_post_group);
 					$retries--;
 					continue;
@@ -1821,10 +1821,10 @@ 
 				// Actually send the article
 				$_err = $this->_nntp->cmdPost2($article);
 
-			}catch(\Exception $e){
+			} catch (\Exception $e) {
 				// Ensure We're not connected
-				try{$this->_nntp->doQuit();}
-				catch(\Exception $e)
+				try {$this->_nntp->doQuit(); }
+				catch (\Exception $e)
 				{/* do nothing */}
 
 				// Post failed
@@ -1847,11 +1847,11 @@ 
 	}
 
 	// ***********************************************************************
-	private function _nntpReset ($group = NULL)
+	private function _nntpReset($group = NULL)
 	{
 		// Reset Connection
-		try{$this->_nntp->doQuit();}
-		catch(\Exception $e)
+		try {$this->_nntp->doQuit(); }
+		catch (\Exception $e)
 		{/* do nothing */}
 
 		// Attempt to reconnect
@@ -1859,7 +1859,7 @@ 
 			exit($this->_pdo->log->error("Unable to connect to usenet." . PHP_EOL));
 		}
 
-		if($group !== NULL)
+		if ($group !== NULL)
 		{
 			// Reselect group if specified
 			$summary = $this->_nntp->selectGroup($this->_post_group);
@@ -1874,7 +1874,7 @@ 
 		static $vc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
 
 		$unique = '';
-		for($i = 0; $i < $len; $i++)
+		for ($i = 0; $i < $len; $i++)
 			$unique .= $vc[mt_rand(0, strlen($vc) - 1)];
 
 		return $unique;
@@ -1893,23 +1893,23 @@ 
 			$key = $this->_ssl_pubkey;
 
 		// Decrypt Message
-		if($decrypt){
+		if ($decrypt) {
 			$message = $this->decrypt($message, $key);
-			if($message === false){
+			if ($message === false) {
 				// fail
 				return false;
 			}
-		}else{
+		} else {
 			// Convert from base64
 			$message = base64_decode($message);
-			if($message === false){
+			if ($message === false) {
 				// Fail
 				return false;
 			}
 		}
 
 		$message = json_decode($message, true);
-		if($message === false){
+		if ($message === false) {
 			// Fail
 			return false;
 		}
@@ -1948,13 +1948,13 @@ 
 			SpotNab::SEGID_DOMAIN
 		);
 
-		if(!is_string($message)){
+		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){
+			$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;
 			}
@@ -1966,14 +1966,14 @@ 
 		//		[1] => 'Message	Body'
 		//	);
 
-		if($encrypt){
+		if ($encrypt) {
 			// Encrypt Message
 			$message = $this->encrypt($message, $prvkey, $passphrase);
-			if($message === false){
+			if ($message === false) {
 				// fail
 				return false;
 			}
-		}else{
+		} else {
 			// Convert to base64
 			$message = base64_encode($message);
 		}
@@ -1999,11 +1999,11 @@ 
 			$reftime
 		);
 
-		if($user === NULL)
+		if ($user === NULL)
 			$user = trim($this->_post_user);
-		if($email === NULL)
+		if ($email === NULL)
 			$email = trim($this->_post_email);
-		if($group === NULL)
+		if ($group === NULL)
 			$group = trim($this->_post_group);
 
 		$header  = "Subject: " . $subject . "\r\n";
@@ -2012,7 +2012,7 @@ 
 		$header .= "X-Newsreader: NewzNab v 0.4.1" . "\r\n";
 		$header .= "X-No-Archive: yes\r\n";
 
-		$header .= "From: ".$user. " <" . $email . ">\r\n";
+		$header .= "From: " . $user . " <" . $email . ">\r\n";
 
 		// Binary Content
 		$header .= 'Content-Type: text/plain; charset=ISO-8859-1' . "\r\n";
@@ -2021,7 +2021,7 @@ 
 		// Assemble Article in structure NNTP expects
 		$article = [$header, $message];
 
-		if($debug){
+		if ($debug) {
 			// Append some debug data to the article
 			$article[] = [
 				'Number' => 1234,
@@ -2060,32 +2060,32 @@ 
 			."LIMIT %d", $limit);
 
 		$res = $this->_pdo->query($sql);
-		if(!$res)
+		if (!$res)
 			return NULL;
 
 		// Now we prepare a comments array to return with
 		$comments = [];
 		$ids = [];
 
-		foreach($res as $comment){
+		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']))
+			if (empty($comment['gid']))
 				continue;
 
 			// Privacy options (scramble username or not)
 			if ($this->_post_privacy)
 				$username = sprintf(
 					"sn-%s",
-					substr(md5($comment['username'].$this->_pdo->getSetting('siteseed')), 0, 6)
+					substr(md5($comment['username'] . $this->_pdo->getSetting('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']);
+			$cid = md5($comment['id'] . $comment['username'] . $comment['createddate'] . $comment['host']);
 
 			// Keep list of IDs (required for cleanup)
 			$ids[] = $comment['id'];
@@ -2108,45 +2108,45 @@ 
 		}
 
 		// Return Results if they are present
-		return (count($comments)>0)?
-			['comments' => $comments, 'ids' => $ids] :NULL;
+		return (count($comments) > 0) ?
+			['comments' => $comments, 'ids' => $ids] : NULL;
 	}
 
 	// ***********************************************************************
-	public function utc2local($utc = NULL, $format="Y-m-d H:i:s") {
+	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"));
+		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") {
+	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)) {
+		if (is_string($local)) {
 			return gmdate($format, strtotime($local));
-		} else if(is_int($local)) {
+		} else if (is_int($local)) {
 			return gmdate($format, $local);
 		}
 		return gmdate($format);
 	}
 
 	// ***********************************************************************
-	private function _keygen($passphrase = NULL, $bits=1024,
-							 $type=OPENSSL_KEYTYPE_RSA)
+	private function _keygen($passphrase = NULL, $bits = 1024,
+							 $type = OPENSSL_KEYTYPE_RSA)
 	{
-		if(!function_exists('openssl_pkey_new')) {
+		if (!function_exists('openssl_pkey_new')) {
 			return false;
 		}
 
@@ -2171,7 +2171,7 @@ 
 
 		// Get Public Key
 		$details = openssl_pkey_get_details($res);
-		if($details === false) {
+		if ($details === false) {
 			return false;
 		}
 		$pubkey = $details['key'];
@@ -2183,23 +2183,23 @@ 
 	}
 
 	// ***********************************************************************
-	public function encrypt ($source, $prvkey = NULL, $passphrase = NULL){
+	public function encrypt($source, $prvkey = NULL, $passphrase = NULL) {
 		// Encryption performed using private key
-		if($prvkey === NULL)
+		if ($prvkey === NULL)
 			// Default Key if none is specified
 			$prvkey = $this->_ssl_prvkey;
 
-		if(!$prvkey)
+		if (!$prvkey)
 			// Still no key...
 			return false;
 
-		if(!function_exists('openssl_get_privatekey'))
+		if (!function_exists('openssl_get_privatekey'))
 			return false;
 
 		// Load Public Key into array
-		$crypttext='';
+		$crypttext = '';
 		$pkey = openssl_get_privatekey($prvkey, $passphrase);
-		if($pkey === false)
+		if ($pkey === false)
 			// bad key
 			return false;
 
@@ -2207,17 +2207,17 @@ 
 		$ptr = 0;
 		$encrypted = '';
 
-		while($len > 0){
+		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) {
+			if ($res === false) {
 				// Encryption failed
 				openssl_free_key($pkey);
 				return false;
 			}
-			$encrypted .=  base64_encode($crypttext) . SpotNab::SSL_BUF_DELIMITER;
+			$encrypted .= base64_encode($crypttext) . SpotNab::SSL_BUF_DELIMITER;
 			$len -= $batch;
 			$ptr += $batch;
 		}
@@ -2226,21 +2226,21 @@ 
 	}
 
 	// ***********************************************************************
-	public function decrypt ($source, $pubkey = NULL){
+	public function decrypt($source, $pubkey = NULL) {
 		// Decryption performed using public key
-		if($pubkey === NULL)
+		if ($pubkey === NULL)
 			// Default Key if none is specified
 			$pubkey = $this->_ssl_pubkey;
 
-		if(!$pubkey)
+		if (!$pubkey)
 			// Still no key...
 			return false;
 
-		if(!function_exists('openssl_get_publickey'))
+		if (!function_exists('openssl_get_publickey'))
 			return false;
 
 		$pkey = openssl_get_publickey($pubkey);
-		if($pkey === false){
+		if ($pkey === false) {
 			// bad key
 			//echo openssl_error_string();
 			return false;
@@ -2249,16 +2249,16 @@ 
 		$cryptlist = explode(SpotNab::SSL_BUF_DELIMITER, $source);
 
 		$decrypted = '';
-		foreach($cryptlist as $crypt){
-			if(!strlen($crypt))break;
+		foreach ($cryptlist as $crypt) {
+			if (!strlen($crypt))break;
 			$_crypt = base64_decode($crypt);
-			if($_crypt === false){
+			if ($_crypt === false) {
 				// Fail
 				return false;
 			}
 
 			$res = openssl_public_decrypt($_crypt, $out, $pkey, OPENSSL_PKCS1_PADDING);
-			if($res === false){
+			if ($res === false) {
 				// Decryption failed
 				//echo "DEBUG: ".openssl_error_string()."\n";
 				openssl_free_key($pkey);
@@ -2272,7 +2272,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function compstr ($str){
+	public function compstr($str) {
 		/*
 		*	Compress a string
 		*/
@@ -2281,7 +2281,7 @@ 
 	}
 
 	// ***********************************************************************
-	public function decompstr ($str){
+	public function decompstr($str) {
 		/*
 		*	De-compress a string
 		*/
@@ -2302,7 +2302,7 @@ 
 		return $this->_pdo->queryOneRow($sql);
 	}
 
-	public function addSource($description,$username,$usermail,$usenetgroup,$publickey)
+	public function addSource($description, $username, $usermail, $usenetgroup, $publickey)
 	{
 		$sql = sprintf("INSERT INTO spotnabsources "
 			."(description, username, useremail,"
@@ -2314,7 +2314,7 @@ 
 		return $this->_pdo->queryInsert($sql);
 	}
 
-	public function updateSource($id, $description,$username,$usermail,$usenetgroup,$publickey)
+	public function updateSource($id, $description, $username, $usermail, $usenetgroup, $publickey)
 	{
 		return $this->_pdo->queryExec(
 			sprintf("UPDATE spotnabsources SET "
@@ -2335,7 +2335,7 @@ 
 		return $this->_pdo->queryExec(sprintf("update spotnabsources SET active = %d WHERE id = %d", $active, $id));
 	}
 
-	public function getDefaultValue($table,$field)
+	public function getDefaultValue($table, $field)
 	{
 		return $this->_pdo->query(sprintf("SHOW COLUMNS FROM %s WHERE field = %s", $table, $this->_pdo->escapeString($field)));
 	}

Braces +398 added lines, -321 removed lines

@@ -17,13 +17,24 @@ 
 define('OPENSSL_CFG_PATH', NN_LIB . '/config/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);
+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);
+}
 
-class SpotNab {
+class SpotNab
+{
 	// Segment Identifier domain is used to help build segments
 	// prior to them being posted.
 	const SEGID_DOMAIN = 'sample.com';
@@ -134,7 +145,8 @@ 
 	/* Track the last article scanned when preforming a discovery */
 	private $_discovery_lastarticle;
 
-	public function __construct($post_user = NULL, $post_email = NULL, $post_group = NULL) {
+	public function __construct($post_user = NULL, $post_email = NULL, $post_group = NULL)
+	{
 		$this->_pdo = new Settings();
 		$this->_nntp = new NNTP(['Settings' => $this->_pdo]);
 		$this->releaseImage =  new ReleaseImage($this->_pdo);
@@ -151,19 +163,19 @@ 
 		$this->_post_title = trim($this->_pdo->getSetting('title'))?
 			$this->_pdo->getSetting('title'):NULL;
 
-		if ($this->_post_user === NULL){
+		if ($this->_post_user === NULL) {
 			// Fetch the SpotNab UserID
 			$this->_post_user = trim($this->_pdo->getSetting('spotnabuser'))?
 				$this->_pdo->getSetting('spotnabuser'):NULL;
 		}
 
-		if ($this->_post_email === NULL){
+		if ($this->_post_email === NULL) {
 			// Fetch the SpotNab EmailID
 			$this->_post_email = trim($this->_pdo->getSetting('spotnabemail'))?
 				$this->_pdo->getSetting('spotnabemail'):NULL;
 		}
 
-		if ($this->_post_group === NULL){
+		if ($this->_post_group === NULL) {
 			// Fetch the SpotNab Usenet Group
 			$this->_post_group = trim($this->_pdo->getSetting('spotnabgroup'))?
 				$this->_pdo->getSetting('spotnabgroup'):NULL;
@@ -172,14 +184,16 @@ 
 		// Public Key
 		$this->_ssl_pubkey = trim($this->_pdo->getSetting('spotnabsitepubkey'))?
 			$this->_pdo->getSetting('spotnabsitepubkey'):false;
-		if($this->_ssl_pubkey)
-			$this->_ssl_pubkey = $this->decompstr($this->_ssl_pubkey);
+		if($this->_ssl_pubkey) {
+					$this->_ssl_pubkey = $this->decompstr($this->_ssl_pubkey);
+		}
 
 		// Private Key
 		$this->_ssl_prvkey = trim($this->_pdo->getSetting('spotnabsiteprvkey'))?
 			$this->_pdo->getSetting('spotnabsiteprvkey'):false;
-		if($this->_ssl_prvkey)
-			$this->_ssl_prvkey = $this->decompstr($this->_ssl_prvkey);
+		if($this->_ssl_prvkey) {
+					$this->_ssl_prvkey = $this->decompstr($this->_ssl_prvkey);
+		}
 
 		// Track Discovery Article
 		$this->_discovery_lastarticle = intval($this->_pdo->getSetting('spotnablastarticle'));
@@ -229,7 +243,7 @@ 
 		$this->_can_discover = (trim($this->_pdo->getSetting('spotnabdiscover')) == 1)?
 			true:false;
 
-		if (!$this->has_openssl()){
+		if (!$this->has_openssl()) {
 			// Can SpotNab even work; if not, we disable all flags
 			$this->_can_broadcast = false;
 			$this->_can_post = false;
@@ -237,14 +251,16 @@ 
 	}
 
 	// ***********************************************************************
-	public function has_openssl(){
+	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){
+	public function auto_clean($max_days=90)
+	{
 		// 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 "
@@ -310,7 +326,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function soft_reset(){
+	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
@@ -350,7 +367,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function fetch_discovery($reftime = NULL, $retries=3){
+	public function fetch_discovery($reftime = NULL, $retries=3)
+	{
 		$last = $first = NULL;
 
 		// Return Value; Initialize it to Okay
@@ -361,18 +379,18 @@ 
 		$inserted = 0;
 		$updated = 0;
 
-		if (!$this->_can_discover){
+		if (!$this->_can_discover) {
 			// discovery disabled
 			return false;
 		}
 
-		if($reftime === NULL){
+		if($reftime === NULL) {
 			$q = "SELECT updateddate FROM settings WHERE "
 				."setting = 'spotnabdiscover'";
 			$res = $this->_pdo->queryOneRow($q);
-			if($res){
+			if($res) {
 				$reftime = $res['updateddate'];
-			}else{
+			} 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)));
@@ -380,12 +398,11 @@ 
 		}
 
 		// Connect to server
-		try{
+		try {
 			if (($this->_pdo->getSetting('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){
+		} catch(\Exception $e) {
 			printf("Failed to connect to Usenet\n");
 			return false;
 		}
@@ -395,7 +412,7 @@ 
 			SpotNab::AUTODISCOVER_POST_GROUP);
 
 		$first = $this->_discovery_lastarticle;
-		if($first <= 0 || $first > $summary['last'] ){
+		if($first <= 0 || $first > $summary['last'] ) {
 			// Look back until reftime
 			$first = $this->_first_article_by_date(
 				SpotNab::AUTODISCOVER_POST_GROUP,
@@ -403,7 +420,7 @@ 
 			);
 		}
 
-		if($first === false){
+		if($first === false) {
 			// Fail
 			echo "Failed\n";
 			return false;
@@ -415,21 +432,19 @@ 
 		$total = abs($last-$first);
 
 		// Select Group
-		while($fetch_okay && $processed < $total)
-		{
-			try
-			{
+		while($fetch_okay && $processed < $total) {
+			try {
 				// Prepare Initial Batch
-				if ($total > SpotNab::FETCH_USENET_BATCH)
-					$batch = $first + SpotNab::FETCH_USENET_BATCH;
+				if ($total > SpotNab::FETCH_USENET_BATCH) {
+									$batch = $first + SpotNab::FETCH_USENET_BATCH;
+				}
 
 				// Batch Processing
-				while ($processed < $total)
-				{
+				while ($processed < $total) {
 					$headers = $this->_get_headers(SpotNab::AUTODISCOVER_POST_GROUP,
 						"$first-$batch", $retries);
 
-					if($headers === false){
+					if($headers === false) {
 						// Retry Atempts exausted
 						$fetch_okay = false;
 						break;
@@ -437,8 +452,7 @@ 
 
 					// Process the header batch
 					$saved = $this->process_discovery_headers($headers);
-					if($saved !== false)
-					{
+					if($saved !== false) {
 						$inserted += $saved[0];
 						$updated += $saved[1];
 					}
@@ -447,23 +461,23 @@ 
 					// Increment starting index
 					$first += ($batch-$first);
 
-					if ($last-$first >= SpotNab::FETCH_USENET_BATCH){
+					if ($last-$first >= SpotNab::FETCH_USENET_BATCH) {
 						// Fetch next batch
 						$batch = $first + SpotNab::FETCH_USENET_BATCH;
-					}else{
+					} else {
 						$batch = $last;
 					}
 					//echo "$first-$batch, processed=$processed\n";
 					//print_r($headers);
 				}
 
-			}catch(\Exception $e){
+			} catch(\Exception $e) {
 				// Reset Connection
 				$fetch_okay = $this->_nntpReset(SpotNab::AUTODISCOVER_POST_GROUP);
 
 				// Track retry attempts
 				$retries--;
-				if($retries <= 0){
+				if($retries <= 0) {
 					// Retry Atempts exausted
 					$fetch_okay = false;
 					break;
@@ -485,17 +499,17 @@ 
 	}
 
 	// ***********************************************************************
-	public function auto_post_discovery($repost_sec = SpotNab::POST_BROADCAST_INTERVAL){
+	public function auto_post_discovery($repost_sec = SpotNab::POST_BROADCAST_INTERVAL)
+	{
 		// performs a post discovery once the time in seconds has elapsed
 		$q = "SELECT updateddate FROM settings WHERE "
 			."setting = 'spotnabbroadcast'";
 		$res = $this->_pdo->queryOneRow($q);
 		$then = strtotime($res['updateddate']);
 		$now = time();
-		if(($now - $then) > $repost_sec){
+		if(($now - $then) > $repost_sec) {
 			// perform a post
-			if($this->post_discovery())
-			{
+			if($this->post_discovery()) {
 				// Update post time
 				$q = "Update settings SET updateddate = NOW() WHERE "
 					."setting = 'spotnabbroadcast'";
@@ -505,30 +519,32 @@ 
 	}
 
 	// ***********************************************************************
-	public function post_discovery($reftime = NULL, $retries=3){
+	public function post_discovery($reftime = NULL, $retries=3)
+	{
 		$reftime_local = $reftime;
 		$article = NULL;
 		$rc = new ReleaseComments();
 		$us = new Users();
 
-		if($reftime_local === NULL){
+		if($reftime_local === NULL) {
 			// Fetch local time
 			$reftime_local = $this->utc2local();
 		}
 		// some error checking....
-		if(!$this->_can_broadcast){
+		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)
+		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){
+		if (!$prvkey) {
 			// This is a serious problem because the hard-coded discovery
 			// key should always decrypt!
 			return false;
@@ -576,14 +592,13 @@ 
 			SpotNab::AUTODISCOVER_POST_GROUP
 		);
 
-		if($article === false){
+		if($article === false) {
 			echo "Failed.\n";
 			return false;
 		}
 
 		// Post message
-		if ($this->_postArticle($article, $retries))
-		{
+		if ($this->_postArticle($article, $retries)) {
 			// Post is good; update database
 			//echo "Done.\n";
 			return true;
@@ -604,7 +619,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function fetch($reftime = NULL, $retries = 3) {
+	public function fetch($reftime = NULL, $retries = 3)
+	{
 
 		$first = NULL;
 
@@ -615,16 +631,16 @@ 
 
 		// We set a cap on how many days in the past we look
 		$_max_age = time() - SpotNab::FETCH_MAXIMUM_AGE;
-		if($reftime === NULL){
+		if($reftime === NULL) {
 			// Fetch local time (but look back X days)
 			$reftime = $this->utc2local($_max_age);
-		}else{
+		} else {
 			// Someone specified a date range to query from
 			$backfill = true;
 
-			if(is_string($reftime)){
+			if(is_string($reftime)) {
 				$reftime = date("Y-m-d H:i:s", strtotime($reftime));
-			}else if(is_int($reftime)){
+			} else if(is_int($reftime)) {
 				$reftime = date("Y-m-d H:i:s", $reftime);
 			}
 			$_max_age = strtotime($reftime);
@@ -637,12 +653,13 @@ 
 		$group_article_start = [];
 		$id_hash = [];
 
-		if(!count($res))
-			return true;
+		if(!count($res)) {
+					return true;
+		}
 
-		foreach($res as $source){
+		foreach($res as $source) {
 			$ghash = trim($source['usenetgroup']);
-			if(!array_key_exists($ghash, $group_hash)){
+			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] = [];
@@ -664,7 +681,7 @@ 
 			// UTC for processing.
 			$ref = $backfill?date("Y-m-d H:i:s", $_max_age):$source['lastupdate'];
 
-			if(!$ref){
+			if(!$ref) {
 				// We've never fetched from the group before, so we'll use
 				// the reftime passed to the function
 				$ref = $reftime;
@@ -673,12 +690,13 @@ 
 			// 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])?
+			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
@@ -702,15 +720,16 @@ 
 		// 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){
+		foreach(array_keys($group_hash) as $key) {
 			$_ref = [];
-			foreach($group_hash[$key] as $id => $source){
+			foreach($group_hash[$key] as $id => $source) {
 				# Source Time (within reason)
-				if($backfill)
-					$_ref[$id] = $_max_age;
-				else
-					$_ref[$id] =
+				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]);
@@ -719,12 +738,11 @@ 
 		// Now we fetch headers
 
 		// Connect to server
-		try{
+		try {
 			if (($this->_pdo->getSetting('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){
+		} catch(\Exception $e) {
 			printf("Failed to connect to Usenet");
 			return false;
 		}
@@ -733,18 +751,18 @@ 
 		$inserted = 0;
 		$updated = 0;
 
-		foreach($group_hash as $group => $hash){
+		foreach($group_hash as $group => $hash) {
 			printf("Spotnab : %d source(s)...", count($hash));
 
 			$summary = $this->_nntp->selectGroup($group);
 			// Get our article id
 			$first = ($backfill)?0:$group_article_start[$group];
-			if($first == 0){
+			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){
+				if($first === false) {
 					continue;
 				}
 			}
@@ -755,21 +773,19 @@ 
 			$total = abs($last-$first);
 
 			// Select Group
-			while($fetch_okay && $processed < $total)
-			{
-				try
-				{
+			while($fetch_okay && $processed < $total) {
+				try {
 					// Prepare Initial Batch
-					if ($total > SpotNab::FETCH_USENET_BATCH)
-						$batch = $first + SpotNab::FETCH_USENET_BATCH;
+					if ($total > SpotNab::FETCH_USENET_BATCH) {
+											$batch = $first + SpotNab::FETCH_USENET_BATCH;
+					}
 
 					// Batch Processing
-					while ($processed>=0 && $processed < $total)
-					{
+					while ($processed>=0 && $processed < $total) {
 						$headers = $this->_get_headers($group,
 							"$first-$batch", $retries);
 
-						if($headers === false){
+						if($headers === false) {
 							// Retry Atempts exausted
 							$fetch_okay = false;
 							break;
@@ -777,8 +793,7 @@ 
 
 						// Process the header batch
 						$saved = $this->process_comment_headers($headers, $hash);
-						if($saved !== false)
-						{
+						if($saved !== false) {
 							$inserted += $saved[0];
 							$updated += $saved[1];
 						}
@@ -787,23 +802,23 @@ 
 						// Increment starting index
 						$first += ($batch-$first);
 
-						if ($last-$first >= SpotNab::FETCH_USENET_BATCH){
+						if ($last-$first >= SpotNab::FETCH_USENET_BATCH) {
 							// Fetch next batch
 							$batch = $first + SpotNab::FETCH_USENET_BATCH;
-						}else{
+						} else {
 							$batch = $last;
 						}
 						//echo "$first-$batch, processed=$processed\n";
 						//print_r($headers);
 					}
 
-				}catch(\Exception $e){
+				} catch(\Exception $e) {
 					// Reset Connection
 					$fetch_okay = $this->_nntpReset($group);
 
 					// Track retry attempts
 					$retries--;
-					if($retries <= 0){
+					if($retries <= 0) {
 						// Retry Atempts exausted
 						$fetch_okay = false;
 						break;
@@ -818,14 +833,14 @@ 
 		}
 
 		// Ensure We're not connected
-		try{$this->_nntp->doQuit();}
-		catch(\Exception $e)
-		{/* do nothing */}
+		try{$this->_nntp->doQuit();} catch(\Exception $e) {
+/* do nothing */}
 
 		return $inserted + $updated;
 	}
 
-	public function processGID($limit=500, $batch=5000, $delete_broken_releases = false){
+	public function processGID($limit=500, $batch=5000, $delete_broken_releases = false)
+	{
 		// Process until someone presses cntrl-c
 
 		$nzb = new NZB();
@@ -839,46 +854,51 @@ 
 			.'WHERE gid IS NULL ORDER BY adddate DESC LIMIT %d,%d';
 		$usql = "UPDATE releases SET gid = '%s' WHERE id = %d";
 
-		while(1){
+		while(1) {
 			// finish
-			if($limit > 0 && $processed >= $limit)
-				break;
+			if($limit > 0 && $processed >= $limit) {
+							break;
+			}
 			$batch=($limit > 0 && $batch > $limit)?$limit:$batch;
 			$res = $this->_pdo->query(sprintf($fsql, $offset, $batch));
-			if(!$res)break;
-			if(count($res) <= 0)break;
+			if(!$res) {
+				break;
+			}
+			if(count($res) <= 0) {
+				break;
+			}
 			$offset += $batch;
 
-			foreach ($res as $r){
+			foreach ($res as $r) {
 				$nzbfile = $nzb->getNZBPath($r["guid"]);
-				if($nzbfile === NULL){
+				if($nzbfile === NULL) {
 					continue;
 				}
 
 				$nzbInfo = new NZBInfo();
-				if (!$nzbInfo->loadFromFile($nzbfile))
-				{
-					if($delete_broken_releases){
+				if (!$nzbInfo->loadFromFile($nzbfile)) {
+					if($delete_broken_releases) {
 						$this->releases->deleteSingle(['g' => $r['guid'], 'i' => $r['id']], $this->nzb, $this->releaseImage);
 						// Free the variable in an attempt to recover memory
 						echo '-';
-					}else{
+					} else {
 						// Skip over this one for future fetches
 						$offset++;
 					}
 					continue;
 				}
 				$gid = false;
-				if (!empty($nzbInfo->gid))
-					$gid = $nzbInfo->gid;
+				if (!empty($nzbInfo->gid)) {
+									$gid = $nzbInfo->gid;
+				}
 				// Free the variable in an attempt to recover memory
 				unset($nzbInfo);
 
-				if(!$gid){
-					if($delete_broken_releases){
+				if(!$gid) {
+					if($delete_broken_releases) {
 						$this->releases->deleteSingle(['g' => $r['guid'], 'i' => $r['id']], $this->nzb, $this->releaseImage);
 						echo '-';
-					}else{
+					} else {
 						// Skip over this one for future fetches
 						$offset++;
 					}
@@ -887,7 +907,7 @@ 
 
 				// Update DB With Global Identifer
 				$ures = $this->_pdo->queryExec(sprintf("UPDATE releases SET gid = %s WHERE id = %d", $this->_pdo->escapeString($gid), $r['id']));
-				if($ures->rowCount() == 0){
+				if($ures->rowCount() == 0) {
 					printf("\nPostPrc : Failed to update: %s\n", $r['name']);
 				}
 				// make noise...
@@ -906,13 +926,15 @@ 
 			)
 		);
 		$rows = $affected->rowCount();
-		if($rows > 0)
-			$processed += $rows;
+		if($rows > 0) {
+					$processed += $rows;
+		}
 		return $processed;
 	}
 
 	// ***********************************************************************
-	public function keygen($print = true, $force_regen = false){
+	public function keygen($print = true, $force_regen = false)
+	{
 		// Simply generate a Public/Private Key pair if they don't already
 		// exist
 
@@ -920,17 +942,17 @@ 
 		// a few checks first to make sure it's safe to do so
 		$do_keygen = true;
 
-		if($force_regen === false){
+		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){
+			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){
+				if($str_in != $str_out) {
 					// Our key isn't good for nothin...
 					// regen a new one
 					$do_keygen = true;
@@ -938,11 +960,10 @@ 
 			}
 		}
 
-		if($do_keygen)
-		{
+		if($do_keygen) {
 			// Set new Key
 			$keys = $this->_keygen();
-			if(is_array($keys)){
+			if(is_array($keys)) {
 				// Force New Username
 				$sql = sprintf("Update settings SET value = %s "
 					."WHERE setting = 'spotnabuser'",
@@ -973,13 +994,13 @@ 
 				$this->_post_email = trim($this->_pdo->getSetting('spotnabemail'));
 				$this->_ssl_pubkey = $this->decompstr($this->_pdo->getSetting('spotnabsitepubkey'));
 				$this->_ssl_prvkey = $this->decompstr($this->_pdo->getSetting('spotnabsiteprvkey'));
-			}else{
+			} else {
 				// echo "Failed.";
 				return false;
 			}
 		}
 
-		if($print){
+		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);
@@ -994,7 +1015,8 @@ 
 	}
 
 	// ***********************************************************************
-	protected function _first_article_by_date($group, $refdate, $limit = SpotNab::FETCH_MAXIMUM_HEADERS, $retries=3){
+	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.
 		//
@@ -1021,12 +1043,12 @@ 
 		// no one is perfect right?
 		$curfew = 10;
 
-		if(is_string($refdate)){
+		if(is_string($refdate)) {
 			// Convert to Integer (Local Time)
 			$refdate = strtotime($refdate);
 		}
 
-		while(($retries > 0) && ($interval > 0)){
+		while(($retries > 0) && ($interval > 0)) {
 			$summary = $this->_nntp->selectGroup($group);
 
 			$_last = $last = intval($summary['last']);
@@ -1035,32 +1057,33 @@ 
 			$curdate = $lastdate = NULL;
 			$curid = $lastid = $first;
 			$interval = 0;
-			while($retries > 0){
+			while($retries > 0) {
 
 				// Save Last Interval
 				$lastinterval = $interval;
 
 				// Adjust Interval
-				if(($last - $first) > 3)
-					$interval = floor(($last - $first)/2);
-				else
-					$interval = 1;
+				if(($last - $first) > 3) {
+									$interval = floor(($last - $first)/2);
+				} else {
+									$interval = 1;
+				}
 
-				if($misses >= SpotNab::FETCH_MAX_MISSES){
+				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){
+					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){
+					} else {
+						if (($_last-$last) > $limit) {
 							// We exceeded our maximum header limit
 							// adjust accordingly
 							$last = $_last - $limit;
@@ -1072,14 +1095,15 @@ 
 
 				// Swap
 				$lastdate = $curdate;
-				if($curid > 0)
-					$lastid = $curid;
+				if($curid > 0) {
+									$lastid = $curid;
+				}
 
 				$msgs = $this->_get_headers(
 					$group, ($last-$interval), $retries);
 
-				if($msgs === false){
-					if (($_last-$last) > $limit){
+				if($msgs === false) {
+					if (($_last-$last) > $limit) {
 						// We exceeded our maximum header limit
 						// adjust accordingly
 						$last = $_last - $limit;
@@ -1094,18 +1118,18 @@ 
 				// Save Tracker
 				$curdate = strtotime($msgs[0]['Date']);
 				$curid = intval($msgs[0]['Number']);
-				if($curid <= 0){
+				if($curid <= 0) {
 					$lastid = ($lastid=== false)?$first:$lastid;
-					if($lastid >0){
-						if (($_last-$lastid) > $limit){
+					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){
+					} else {
+						if (($_last-$last) > $limit) {
 							// We exceeded our maximum header limit
 							// adjust accordingly
 							$last = $_last - $limit;
@@ -1115,12 +1139,11 @@ 
 					}
 				}
 
-				if($interval == 1){
+				if($interval == 1) {
 					// We're soo close now...
 					$curfew --;
-					if($curfew <= 0)
-					{
-						if (($_last-$curid) > $limit){
+					if($curfew <= 0) {
+						if (($_last-$curid) > $limit) {
 							// We exceeded our maximum header limit
 							// adjust accordingly
 							$curid = $_last - $limit;
@@ -1130,8 +1153,8 @@ 
 						return $curid;
 					}
 
-					if($refdate > $curdate && $refdate > $lastdate){
-						if (($_last-$curid) > $limit){
+					if($refdate > $curdate && $refdate > $lastdate) {
+						if (($_last-$curid) > $limit) {
 							// We exceeded our maximum header limit
 							// adjust accordingly
 							$curid = $_last - $limit;
@@ -1139,10 +1162,10 @@ 
 						// Found content
 						echo " ".($_last-$curid)." record(s) back.";
 						return $curid;
-					}else if($refdate > $curdate && $refdate > $lastdate){
+					} else if($refdate > $curdate && $refdate > $lastdate) {
 						// Close... Shuffle forward a bit
 						$first+=2;
-					}else{
+					} else {
 						// Slide window and try again
 						$last-=2;
 					}
@@ -1151,13 +1174,15 @@ 
 				}
 
 				// Make some noise
-				if($interval%2)echo ".";
+				if($interval%2) {
+					echo ".";
+				}
 
 				// Adjust Boundaries
-				if($curdate > $refdate){
+				if($curdate > $refdate) {
 					// We need to look further forward
 					$last = $curid+1;
-				}else if ($curdate <= $refdate){
+				} else if ($curdate <= $refdate) {
 					// We need To look further back
 					$first = $curid-1;
 				}
@@ -1168,7 +1193,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function process_comment_headers($headers, $group_hash, $save = true){
+	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
@@ -1209,7 +1235,7 @@ 
 		*		)
 		*/
 
-		if(!count($group_hash)){
+		if(!count($group_hash)) {
 			// Nothing to process
 			return [];
 		}
@@ -1238,23 +1264,25 @@ 
 		$processed = 0;
 		$updates = 0;
 		$inserts = 0;
-		foreach ($headers as $header){
+		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)){
+				$header['Message-ID'], $matches)) {
 				continue;
 			}
-			if($matches['domain'] != SpotNab::SEGID_DOMAIN)
-				continue;
+			if($matches['domain'] != SpotNab::SEGID_DOMAIN) {
+							continue;
+			}
 
-			if($matches['type'] != SpotNab::FETCH_COMMENT_TYPE)
-				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)){
+				$header['Subject'], $matches)) {
 				continue;
 			}
 
@@ -1262,7 +1290,7 @@ 
 			$checksum = $matches['checksum'];
 			$refdate = $matches['utcref'];
 			$refdate_epoch = @strtotime($matches['utcref']. " UTC");
-			if($refdate_epoch === false || $refdate_epoch < 0){
+			if($refdate_epoch === false || $refdate_epoch < 0) {
 				// Bad time specified
 				continue;
 			}
@@ -1271,20 +1299,21 @@ 
 			// assume the body will decode too (and won't be a waste of
 			// time to download it)
 
-			foreach($group_hash as $hash){
+			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']){
+				if($refdate_epoch <= $hash['ref']) {
 					continue;
 				}
 
 				// Scan header information for supported matches
 				if(!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
-					$header['From'], $matches))
-					continue;
+					$header['From'], $matches)) {
+									continue;
+				}
 
 				// Match against our sources posts
 				if(trim($matches['user']) != $hash['user']) {
@@ -1338,7 +1367,7 @@ 
 					if(array_key_exists('comments',$body) && is_array($body['comments'])) {
 						$rc = new ReleaseComments();
 
-						foreach($body['comments'] as $comment){
+						foreach($body['comments'] as $comment) {
 
 							// Verify Comment is parseable
 							if(!is_array($comment)) {
@@ -1402,7 +1431,7 @@ 
 							$hash['id']
 						)
 					);
-				}else{
+				} else {
 					// Debug non/save mode; mark update
 					$updates += 1;
 				}
@@ -1418,7 +1447,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function process_discovery_headers($headers, $save = true){
+	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
@@ -1461,26 +1491,28 @@ 
 		$processed = 0;
 		$inserts = 0;
 		$updates = 0;
-		foreach ($headers as $header){
+		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)){
+				$header['Message-ID'], $matches)) {
 				continue;
 			}
-			if($matches['domain'] != SpotNab::SEGID_DOMAIN)
-				continue;
+			if($matches['domain'] != SpotNab::SEGID_DOMAIN) {
+							continue;
+			}
 
-			if($matches['type'] != SpotNab::FETCH_DISCOVERY_TYPE)
-				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)){
+				$header['Subject'], $matches)) {
 				continue;
 			}
 
@@ -1488,7 +1520,7 @@ 
 			$checksum = $matches['checksum'];
 			$refdate = $matches['utcref'];
 			$refdate_epoch = @strtotime($matches['utcref']. " UTC");
-			if($refdate_epoch === false || $refdate_epoch < 0){
+			if($refdate_epoch === false || $refdate_epoch < 0) {
 				// Bad time specified
 				continue;
 			}
@@ -1502,14 +1534,17 @@ 
 
 			// Scan header information for supported matches
 			if(!preg_match('/^(?P<user>[^<]+)<(?P<email>[^>]+)>$/',
-				$header['From'], $matches))
-				continue;
+				$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(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
@@ -1519,11 +1554,11 @@ 
 			// within the body matches that of the header... then we
 			// can start processing the guts of the body.
 
-			if($save){
+			if($save) {
 				// Download Body
 				$body = $this->_get_body($header['Group'],
 					$header['Message-ID']);
-				if($body === false){
+				if($body === false) {
 					continue;
 				}
 
@@ -1532,27 +1567,36 @@ 
 					$body,
 					$this->decompstr($this->_ssl_auto_pubkey)
 				);
-				if($body === false)
-					continue; // Decode failed
+				if($body === false) {
+									continue;
+				}
+				// Decode failed
 
 				// Verify Body
-				if(!is_array($body))
-					continue; // not any array
+				if(!is_array($body)) {
+									continue;
+				}
+				// not any array
 
-				if(!(bool)count(array_filter(array_keys($body), 'is_string')))
-					continue; // not an associative 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
+					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;
+						$body['postdate_utc']) != $refdate) {
+									continue;
+				}
 
 				$posts = $body['posts'];
 				$p_user = array_key_exists('user', $posts)?trim($posts['user']):NULL;
@@ -1560,13 +1604,15 @@ 
 				$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
+				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;
+				if($p_user == $this->_post_user && $p_email == $this->_post_email) {
+									continue;
+				}
 
 				// Check that comment doesn't already exist
 				$res = $this->_pdo->queryOneRow(sprintf($sql_fnd_cmt,
@@ -1575,12 +1621,13 @@ 
 						$this->_pdo->escapeString($p_group))
 				);
 
-				if(!$res)
-					// Uh oh
+				if(!$res) {
+									// Uh oh
 					continue;
+				}
 
 				// Store Results in DB
-				if(intval($res['cnt'])==0){
+				if(intval($res['cnt'])==0) {
 					// Make some noise
 					echo '+';
 					// Perform Insert
@@ -1594,7 +1641,7 @@ 
 							$this->_pdo->escapeString($this->utc2local($refdate)))
 					);
 					$inserts += 1;
-				}else{
+				} else {
 					echo '.';
 					$res = $this->_pdo->queryExec(sprintf($sql_upd_cmt,
 						$this->_pdo->escapeString($this->utc2local($refdate)),
@@ -1609,22 +1656,23 @@ 
 	}
 
 	// ***********************************************************************
-	protected function _get_body($group, $id, $retries=3){
+	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
+		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
-		{
+		do {
 			$raw = $this->_nntp->getBody("<".$id.">", true);
 			// Retrieved Data
 			return $raw;
@@ -1634,7 +1682,8 @@ 
 	}
 
 	// ***********************************************************************
-	protected function _get_headers($group, $range, $retries=3, $sort = true){
+	protected function _get_headers($group, $range, $retries=3, $sort = true)
+	{
 		/*
 		*
 		*	There is to much involved with fetching article headers
@@ -1656,8 +1705,7 @@ 
 		$min_headers = ['Number', 'Subject', 'From', 'Date',
 							 'Message-ID', 'Bytes', 'Lines'
 		];
-		do
-		{
+		do {
 			$msgs = $this->_nntp->getOverview($range, true, false);
 			// If we get here, then we fetched the header block okay
 
@@ -1665,30 +1713,36 @@ 
 			// just report what it found.. (nothing). We do this because
 			// NNTP::isError() never threw, so the response has to be valid
 			// even though it's inconsistent
-			if(!$msgs)return [];
-			if(!is_array($msgs))return [];
+			if(!$msgs) {
+				return [];
+			}
+			if(!is_array($msgs)) {
+				return [];
+			}
 
 			// 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'))){
+			if((bool)count(array_filter(array_keys($msgs), 'is_string'))) {
 				// convert to an array of assocative array
 				$msgs = [$msgs];
 			}
 
-			for($i=0;$i<count($msgs);$i++){
+			for($i=0;$i<count($msgs);$i++) {
 				$skip = false;
-				foreach($min_headers as $key){
-					if(!array_key_exists($key, $msgs[$i])){
+				foreach($min_headers as $key) {
+					if(!array_key_exists($key, $msgs[$i])) {
 						unset($msgs[$i]);
 						$i--;
 						$skip = true;
 						break;
 					}
 				}
-				if($skip)continue;
+				if($skip) {
+					continue;
+				}
 
 				// Update Record With Epoch Value (# of sec from Jan, 1980)
 				$epoch[$i] = $msgs[$i]['Epoch'] = strtotime($msgs[$i]['Date']);
@@ -1697,11 +1751,12 @@ 
 				$epoch[$i] = $msgs[$i]['Group'] = $group;
 			}
 
-			if($sort && count($msgs)>1)
-				// Content is already sorted by articles, but if the
+			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;
 
@@ -1711,7 +1766,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function post($reftime = NULL, $retries=3){
+	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.
@@ -1720,14 +1776,14 @@ 
 		*/
 
 		// Make sure we can post
-		if(!$this->_can_post){
+		if(!$this->_can_post) {
 			// Disabled
 			return false;
 		}
 
 		$reftime_local = $reftime;
 		$article = NULL;
-		if($reftime_local === NULL){
+		if($reftime_local === NULL) {
 			// Fetch local time
 			$reftime_local = $this->utc2local();
 		}
@@ -1742,26 +1798,25 @@ 
 		];
 
 		// Store Comments
-		while(($data = $this->unPostedComments()) !== NULL)
-		{
+		while(($data = $this->unPostedComments()) !== NULL) {
 			$message['comments'] = $data['comments'];
 			$sql = sprintf("UPDATE release_comments "
 				."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
+			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;
+				} else {
+									return false;
+				}
 			}
 
 			// Encode Message so it can be posted
 			$article = $this->encodePost($message, $reftime_local);
-			if($article === false){
+			if($article === false) {
 				echo "Failed.\n";
 				return false;
 			}
@@ -1769,8 +1824,7 @@ 
 
 			// Post message
 			printf("Spotnab : %d posting ...\n", count($message['comments']));
-			if (!$this->_postArticle($article, $retries))
-			{
+			if (!$this->_postArticle($article, $retries)) {
 				// Post is good; update database
 				$res = $this->_pdo->queryExec($sql);
 				echo "Failed.\n";
@@ -1789,7 +1843,7 @@ 
 	private function _postArticle ($article, $retries=3)
 	{
 		// Extract message id
-		if(!preg_match('/Message-ID: <(?P<id>[^>]+)>/', $article[0], $matches)){
+		if(!preg_match('/Message-ID: <(?P<id>[^>]+)>/', $article[0], $matches)) {
 			// we couldn't extract the message id
 			return false;
 		}
@@ -1800,12 +1854,10 @@ 
 		if (($this->_pdo->getSetting('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
-			{
+		while($retries > 0) {
+			try {
 				$summary = $this->_nntp->selectGroup($this->_post_group);
-				if(NNTP::isError($summary)){
+				if(NNTP::isError($summary)) {
 					$summary = $this->_nntpReset($this->_post_group);
 					$retries--;
 					continue;
@@ -1821,11 +1873,10 @@ 
 				// Actually send the article
 				$_err = $this->_nntp->cmdPost2($article);
 
-			}catch(\Exception $e){
+			} catch(\Exception $e) {
 				// Ensure We're not connected
-				try{$this->_nntp->doQuit();}
-				catch(\Exception $e)
-				{/* do nothing */}
+				try{$this->_nntp->doQuit();} catch(\Exception $e) {
+/* do nothing */}
 
 				// Post failed
 				$retries--;
@@ -1850,17 +1901,15 @@ 
 	private function _nntpReset ($group = NULL)
 	{
 		// Reset Connection
-		try{$this->_nntp->doQuit();}
-		catch(\Exception $e)
-		{/* do nothing */}
+		try{$this->_nntp->doQuit();} catch(\Exception $e) {
+/* do nothing */}
 
 		// Attempt to reconnect
 		if (($this->_pdo->getSetting('alternate_nntp') == 1 ? $this->_nntp->doConnect(true, true) : $this->_nntp->doConnect()) !== true) {
 			exit($this->_pdo->log->error("Unable to connect to usenet." . PHP_EOL));
 		}
 
-		if($group !== NULL)
-		{
+		if($group !== NULL) {
 			// Reselect group if specified
 			$summary = $this->_nntp->selectGroup($this->_post_group);
 			return $summary;
@@ -1869,19 +1918,22 @@ 
 	}
 
 	// ***********************************************************************
-	public function getRandomStr($len) {
+	public function getRandomStr($len)
+	{
 		// Valid Characters
 		static $vc = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
 
 		$unique = '';
-		for($i = 0; $i < $len; $i++)
-			$unique .= $vc[mt_rand(0, strlen($vc) - 1)];
+		for($i = 0; $i < $len; $i++) {
+					$unique .= $vc[mt_rand(0, strlen($vc) - 1)];
+		}
 
 		return $unique;
 	}
 
 	// ***********************************************************************
-	public function decodePost($message, $key = NULL, $decrypt = true) {
+	public function decodePost($message, $key = NULL, $decrypt = true)
+	{
 
 		// Decode Yenc
 		$message = Yenc::decode($message);
@@ -1889,27 +1941,28 @@ 
 		// Decompress Messsage
 		$message = @gzuncompress($message);
 
-		if ($key === NULL)
-			$key = $this->_ssl_pubkey;
+		if ($key === NULL) {
+					$key = $this->_ssl_pubkey;
+		}
 
 		// Decrypt Message
-		if($decrypt){
+		if($decrypt) {
 			$message = $this->decrypt($message, $key);
-			if($message === false){
+			if($message === false) {
 				// fail
 				return false;
 			}
-		}else{
+		} else {
 			// Convert from base64
 			$message = base64_decode($message);
-			if($message === false){
+			if($message === false) {
 				// Fail
 				return false;
 			}
 		}
 
 		$message = json_decode($message, true);
-		if($message === false){
+		if($message === false) {
 			// Fail
 			return false;
 		}
@@ -1921,7 +1974,8 @@ 
 	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) {
+							   $user = NULL, $email = NULL, $group = NULL)
+	{
 		/*
 
 		Assembles and encodes a message ready to be posted onto
@@ -1948,13 +2002,13 @@ 
 			SpotNab::SEGID_DOMAIN
 		);
 
-		if(!is_string($message)){
+		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){
+			if($message === false) {
 				// Fail
 				return false;
 			}
@@ -1966,14 +2020,14 @@ 
 		//		[1] => 'Message	Body'
 		//	);
 
-		if($encrypt){
+		if($encrypt) {
 			// Encrypt Message
 			$message = $this->encrypt($message, $prvkey, $passphrase);
-			if($message === false){
+			if($message === false) {
 				// fail
 				return false;
 			}
-		}else{
+		} else {
 			// Convert to base64
 			$message = base64_encode($message);
 		}
@@ -1999,12 +2053,15 @@ 
 			$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);
+		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";
@@ -2021,7 +2078,7 @@ 
 		// Assemble Article in structure NNTP expects
 		$article = [$header, $message];
 
-		if($debug){
+		if($debug) {
 			// Append some debug data to the article
 			$article[] = [
 				'Number' => 1234,
@@ -2040,7 +2097,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function unPostedComments($limit = SpotNab::POST_MAXIMUM_COMMENTS) {
+	public function unPostedComments($limit = SpotNab::POST_MAXIMUM_COMMENTS)
+	{
 		/*
 		*	This function returns a list of comments that have not been
 		*	otherwise posted to usenet.
@@ -2060,29 +2118,32 @@ 
 			."LIMIT %d", $limit);
 
 		$res = $this->_pdo->query($sql);
-		if(!$res)
-			return NULL;
+		if(!$res) {
+					return NULL;
+		}
 
 		// Now we prepare a comments array to return with
 		$comments = [];
 		$ids = [];
 
-		foreach($res as $comment){
+		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;
+			if(empty($comment['gid'])) {
+							continue;
+			}
 
 			// Privacy options (scramble username or not)
-			if ($this->_post_privacy)
-				$username = sprintf(
+			if ($this->_post_privacy) {
+							$username = sprintf(
 					"sn-%s",
 					substr(md5($comment['username'].$this->_pdo->getSetting('siteseed')), 0, 6)
 				);
-			else
-				$username = $comment['username'];
+			} else {
+							$username = $comment['username'];
+			}
 
 			// Hash a unique Comment id to associate with this message
 			$cid = md5($comment['id'].$comment['username'].$comment['createddate'].$comment['host']);
@@ -2113,7 +2174,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function utc2local($utc = NULL, $format="Y-m-d H:i:s") {
+	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
@@ -2128,7 +2190,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function local2utc($local = NULL, $format="Y-m-d H:i:s") {
+	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
@@ -2183,31 +2246,36 @@ 
 	}
 
 	// ***********************************************************************
-	public function encrypt ($source, $prvkey = NULL, $passphrase = NULL){
+	public function encrypt ($source, $prvkey = NULL, $passphrase = NULL)
+	{
 		// Encryption performed using private key
-		if($prvkey === NULL)
-			// Default Key if none is specified
+		if($prvkey === NULL) {
+					// Default Key if none is specified
 			$prvkey = $this->_ssl_prvkey;
+		}
 
-		if(!$prvkey)
-			// Still no key...
+		if(!$prvkey) {
+					// Still no key...
 			return false;
+		}
 
-		if(!function_exists('openssl_get_privatekey'))
-			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
+		if($pkey === false) {
+					// bad key
 			return false;
+		}
 
 		$batch = $len = strlen($source);
 		$ptr = 0;
 		$encrypted = '';
 
-		while($len > 0){
+		while($len > 0) {
 			// Prepare batch size
 			$batch = (($len - SpotNab::SSL_MAX_BUF_LEN) > 0) ? SpotNab::SSL_MAX_BUF_LEN : $len;
 
@@ -2226,21 +2294,25 @@ 
 	}
 
 	// ***********************************************************************
-	public function decrypt ($source, $pubkey = NULL){
+	public function decrypt ($source, $pubkey = NULL)
+	{
 		// Decryption performed using public key
-		if($pubkey === NULL)
-			// Default Key if none is specified
+		if($pubkey === NULL) {
+					// Default Key if none is specified
 			$pubkey = $this->_ssl_pubkey;
+		}
 
-		if(!$pubkey)
-			// Still no key...
+		if(!$pubkey) {
+					// Still no key...
 			return false;
+		}
 
-		if(!function_exists('openssl_get_publickey'))
-			return false;
+		if(!function_exists('openssl_get_publickey')) {
+					return false;
+		}
 
 		$pkey = openssl_get_publickey($pubkey);
-		if($pkey === false){
+		if($pkey === false) {
 			// bad key
 			//echo openssl_error_string();
 			return false;
@@ -2249,16 +2321,18 @@ 
 		$cryptlist = explode(SpotNab::SSL_BUF_DELIMITER, $source);
 
 		$decrypted = '';
-		foreach($cryptlist as $crypt){
-			if(!strlen($crypt))break;
+		foreach($cryptlist as $crypt) {
+			if(!strlen($crypt)) {
+				break;
+			}
 			$_crypt = base64_decode($crypt);
-			if($_crypt === false){
+			if($_crypt === false) {
 				// Fail
 				return false;
 			}
 
 			$res = openssl_public_decrypt($_crypt, $out, $pkey, OPENSSL_PKCS1_PADDING);
-			if($res === false){
+			if($res === false) {
 				// Decryption failed
 				//echo "DEBUG: ".openssl_error_string()."\n";
 				openssl_free_key($pkey);
@@ -2272,7 +2346,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function compstr ($str){
+	public function compstr ($str)
+	{
 		/*
 		*	Compress a string
 		*/
@@ -2281,7 +2356,8 @@ 
 	}
 
 	// ***********************************************************************
-	public function decompstr ($str){
+	public function decompstr ($str)
+	{
 		/*
 		*	De-compress a string
 		*/
@@ -2342,6 +2418,7 @@ 
 }
 
 // Create a NNTP \Exception type so we can identify it from others
-class SpotNabException extends \Exception {
+class SpotNabException extends \Exception
+{
 
 }

nntmux/Users.php

Doc Comments +24 added lines

@@ -331,6 +331,9 @@ 
 		return self::SUCCESS;
 	}
 
+	/**
+	 * @param string $userName
+	 */
 	public function isValidUsername($userName)
 	{
 		return preg_match("/^[a-z][a-z0-9_]{2,}$/i", $userName);
@@ -348,11 +351,17 @@ 
 		return (bool)preg_match('/^([\w\+-]+)(\.[\w\+-]+)*@([a-z0-9-]+\.)+[a-z]{2,6}$/i', $email);
 	}
 
+	/**
+	 * @param string $userName
+	 */
 	public function getByUsername($userName)
 	{
 		return $this->pdo->queryOneRow(sprintf("SELECT users.*, user_roles.name as rolename, user_roles.apirequests, user_roles.downloadrequests FROM users INNER JOIN user_roles on user_roles.id = users.role WHERE username = %s ", $this->pdo->escapeString($userName)));
 	}
 
+	/**
+	 * @param string $email
+	 */
 	public function getByEmail($email)
 	{
 		return $this->pdo->queryOneRow(sprintf("SELECT * FROM users WHERE lower(email) = %s ", $this->pdo->escapeString(strtolower($email))));
@@ -419,6 +428,9 @@ 
 		return password_hash($password, PASSWORD_DEFAULT, ['cost' => $this->password_hash_cost]);
 	}
 
+	/**
+	 * @param string $string
+	 */
 	public static function hashSHA1($string)
 	{
 		return sha1($string);
@@ -564,6 +576,9 @@ 
 		return $this->add($userName, $password, $email, $role, $notes, $host, $invites, $invitedBy);
 	}
 
+	/**
+	 * @param string $password
+	 */
 	public function isValidPassword($password)
 	{
 		return (strlen($password) > 5);
@@ -588,6 +603,9 @@ 
 		return $invite["users_id"];
 	}
 
+	/**
+	 * @param integer $inviteToken
+	 */
 	public function getInvite($inviteToken)
 	{
 
@@ -605,6 +623,9 @@ 
 		);
 	}
 
+	/**
+	 * @param integer $inviteToken
+	 */
 	public function deleteInvite($inviteToken)
 	{
 
@@ -893,6 +914,9 @@ 
 		return $url;
 	}
 
+	/**
+	 * @param string $inviteToken
+	 */
 	public function addInvite($uid, $inviteToken)
 	{
 		$this->pdo->queryInsert(sprintf("INSERT INTO invitations (guid, users_id, createddate) VALUES (%s, %d, now())", $this->pdo->escapeString($inviteToken), $uid));

Spacing +5 added lines, -5 removed lines

@@ -720,7 +720,7 @@ 
 		$user = $this->getById($userID);
 		$secure_cookie = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? '1' : '0');
 		setcookie('uid', $userID, (time() + 2592000), '/', null, $secure_cookie, true);
-		setcookie('idh', ($this->hashSHA1($user['userseed'] . $userID)), (time() + 2592000), '/', null, $secure_cookie, true);	}
+		setcookie('idh', ($this->hashSHA1($user['userseed'] . $userID)), (time() + 2592000), '/', null, $secure_cookie, true); }
 
 	/**
 	 * Return the User ID of the user.
@@ -1139,7 +1139,7 @@ 
 				$userID
 			)
 		);
-		return ($value === false ? 0 : (int) $value['num']);
+		return ($value === false ? 0 : (int)$value['num']);
 	}
 
 	public function getDownloadRequestsForUser($userID)
@@ -1205,7 +1205,7 @@ 
 			)
 		);
 
-		return ((integer)$result['role'] == (integer) $roleID) ? true : false;
+		return ((integer)$result['role'] == (integer)$roleID) ? true : false;
 	}
 
 	/**
@@ -1215,7 +1215,7 @@ 
 	 * @return bool
 	 */
 	public function isAdmin($userID) {
-		return $this->roleCheck(self::ROLE_ADMIN, (integer) $userID);
+		return $this->roleCheck(self::ROLE_ADMIN, (integer)$userID);
 	}
 
 	/**
@@ -1225,6 +1225,6 @@ 
 	 * @return bool
 	 */
 	public function isModerator($userId) {
-		return $this->roleCheck(self::ROLE_MODERATOR, (integer) $userId);
+		return $this->roleCheck(self::ROLE_MODERATOR, (integer)$userId);
 	}
 }

Braces +42 added lines, -27 removed lines

@@ -258,21 +258,25 @@ 
 		$userName = trim($userName);
 		$email = trim($email);
 
-		if (!$this->isValidUsername($userName))
-			return Users::ERR_SIGNUP_BADUNAME;
+		if (!$this->isValidUsername($userName)) {
+					return Users::ERR_SIGNUP_BADUNAME;
+		}
 
-		if (!$this->isValidEmail($email))
-			return Users::ERR_SIGNUP_BADEMAIL;
+		if (!$this->isValidEmail($email)) {
+					return Users::ERR_SIGNUP_BADEMAIL;
+		}
 
 		$res = $this->getByUsername($userName);
-		if ($res)
-			if ($res["id"] != $id)
+		if ($res) {
+					if ($res["id"] != $id)
 				return Users::ERR_SIGNUP_UNAMEINUSE;
+		}
 
 		$res = $this->getByEmail($email);
-		if ($res)
-			if ($res["id"] != $id)
+		if ($res) {
+					if ($res["id"] != $id)
 				return Users::ERR_SIGNUP_EMAILINUSE;
+		}
 
 		$sql = [];
 
@@ -530,23 +534,27 @@ 
 		$password = trim($password);
 		$email = trim($email);
 
-		if (!$this->isValidUsername($userName))
-			return Users::ERR_SIGNUP_BADUNAME;
+		if (!$this->isValidUsername($userName)) {
+					return Users::ERR_SIGNUP_BADUNAME;
+		}
 
-		if (!$this->isValidPassword($password))
-			return Users::ERR_SIGNUP_BADPASS;
+		if (!$this->isValidPassword($password)) {
+					return Users::ERR_SIGNUP_BADPASS;
+		}
 
 		if (!$this->isValidEmail($email)) {
 			return self::ERR_SIGNUP_BADEMAIL;
 		}
 
 		$res = $this->getByUsername($userName);
-		if ($res)
-			return Users::ERR_SIGNUP_UNAMEINUSE;
+		if ($res) {
+					return Users::ERR_SIGNUP_UNAMEINUSE;
+		}
 
 		$res = $this->getByEmail($email);
-		if ($res)
-			return Users::ERR_SIGNUP_EMAILINUSE;
+		if ($res) {
+					return Users::ERR_SIGNUP_EMAILINUSE;
+		}
 
 		// Make sure this is the last check, as if a further validation check failed, the invite would still have been used up.
 		$invitedBy = 0;
@@ -761,8 +769,9 @@ 
 	public function getCart($uid, $releaseid = "")
 	{
 
-		if ($releaseid != "")
-			$releaseid = " AND releases.id = " . $this->pdo->escapeString($releaseid);
+		if ($releaseid != "") {
+					$releaseid = " AND releases.id = " . $this->pdo->escapeString($releaseid);
+		}
 
 		return $this->pdo->query(sprintf("SELECT users_releases.*, releases.searchname,releases.guid FROM users_releases INNER JOIN releases on releases.id = users_releases.releases_id WHERE users_id = %d %s", $uid, $releaseid));
 	}
@@ -791,8 +800,9 @@ 
 	public function delCartByUserAndRelease($guid, $uid)
 	{
 		$rel = $this->pdo->queryOneRow(sprintf("SELECT id FROM releases WHERE guid = %s", $this->pdo->escapeString($guid)));
-		if ($rel)
-			$this->pdo->queryExec(sprintf("DELETE FROM users_releases WHERE users_id = %d AND releases_id = %d", $uid, $rel["id"]));
+		if ($rel) {
+					$this->pdo->queryExec(sprintf("DELETE FROM users_releases WHERE users_id = %d AND releases_id = %d", $uid, $rel["id"]));
+		}
 	}
 
 	public function delCartForRelease($rid)
@@ -814,8 +824,9 @@ 
 	{
 		$ret = [];
 		$data = $this->pdo->query(sprintf("SELECT categories_id FROM roleexcat WHERE role = %d", $role));
-		foreach ($data as $d)
-			$ret[] = $d["categories_id"];
+		foreach ($data as $d) {
+					$ret[] = $d["categories_id"];
+		}
 
 		return $ret;
 	}
@@ -1025,8 +1036,9 @@ 
 		$res = $this->pdo->query(sprintf("SELECT id FROM users WHERE role = %d", $id));
 		if (sizeof($res) > 0) {
 			$userids = [];
-			foreach ($res as $user)
-				$userids[] = $user['id'];
+			foreach ($res as $user) {
+							$userids[] = $user['id'];
+			}
 			$defaultrole = $this->getDefaultRole();
 			$this->pdo->queryExec(sprintf("UPDATE users SET role=%d WHERE id IN (%s)", $defaultrole['id'], implode(',', $userids)));
 		}
@@ -1187,7 +1199,8 @@ 
 	 * @param string|int $user
 	 * @return bool
 	 */
-	public function roleCheck($roleID, $user) {
+	public function roleCheck($roleID, $user)
+	{
 
 		if (is_string($user) && strlen($user) > 0) {
 			$user = $this->pdo->escapeString($user);
@@ -1214,7 +1227,8 @@ 
 	 * @param int $userID
 	 * @return bool
 	 */
-	public function isAdmin($userID) {
+	public function isAdmin($userID)
+	{
 		return $this->roleCheck(self::ROLE_ADMIN, (integer) $userID);
 	}
 
@@ -1224,7 +1238,8 @@ 
 	 * @param int $userId
 	 * @return bool
 	 */
-	public function isModerator($userId) {
+	public function isModerator($userId)
+	{
 		return $this->roleCheck(self::ROLE_MODERATOR, (integer) $userId);
 	}
 }

nntmux/utility/Git.php

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	}
 
 	/**
-	 * @param $gitObject
+	 * @param string $gitObject
 	 *
 	 * @return bool
 	 * @throws \Exception

nntmux/utility/SmartyUtils.php

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
  * @param string $text	Text to match against.
  * @param string $page	Type of page. browse or search.
  *
- *@return bool|string
+ *@return string|false
  */
 function release_flag($text, $page)
 {