mikelynn2 / blacklistmonitor

classes/_FileCache.class.php

Doc Comments +8 added lines

@@ -39,6 +39,10 @@ 
 	//     $key: The cache key.
 	// Returns:
 	//     The object which was previously stored, or false if a cache miss occurred.
+
+	/**
+	 * @param string $key
+	 */
 	public function get($key) {
 //return false;
 		if (($this->cleanInterval == 1) ||
@@ -59,6 +63,10 @@ 
 	// Parameters:
 	//     $key: The cache key.
 	//     $value: The object to store.
+
+	/**
+	 * @param string $key
+	 */
 	public function set($key, $value) {
 		if (($this->cleanInterval == 1) ||
 			(rand(1, $this->cleanInterval) == $this->cleanInterval)) {

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
 		if ($cleanInterval < 1) $cleanInterval = 1;
 		$this->cleanInterval = (int)$cleanInterval;
 
-		if ($directoryDepth<1) $directoryDepth=1; else if ($directoryDepth>10) $directoryDepth=10;
+		if ($directoryDepth < 1) $directoryDepth = 1; else if ($directoryDepth > 10) $directoryDepth = 10;
 		$this->directoryDepth = (int)$directoryDepth;
 	}
 
@@ -41,8 +41,8 @@ 
 	//     The object which was previously stored, or false if a cache miss occurred.
 	public function get($key) {
 //return false;
-		if (($this->cleanInterval == 1) ||
-			(rand(1, $this->cleanInterval) == $this->cleanInterval)) {
+		if (($this->cleanInterval==1) ||
+			(rand(1, $this->cleanInterval)==$this->cleanInterval)) {
 			$this->clean();
 		}
 		$val = false;
@@ -60,12 +60,12 @@ 
 	//     $key: The cache key.
 	//     $value: The object to store.
 	public function set($key, $value) {
-		if (($this->cleanInterval == 1) ||
-			(rand(1, $this->cleanInterval) == $this->cleanInterval)) {
+		if (($this->cleanInterval==1) ||
+			(rand(1, $this->cleanInterval)==$this->cleanInterval)) {
 			$this->clean();
 		}
 		$fn = $this->getCacheFilename($key, true);
-		$fileData = file_put_contents($fn,serialize($value));
+		$fileData = file_put_contents($fn, serialize($value));
 	}
 
 	// Delete an object from the cache.
@@ -97,11 +97,11 @@ 
 		foreach (@glob($path.'/*', GLOB_NOSORT) as $fn) {
 			if (@is_dir($fn)) {
 				$this->cleanPath($fn);
-			} else if (@filemtime($fn) <= $exptime) {
+			}else if (@filemtime($fn) <= $exptime) {
 				@unlink($fn);
 			}
 		}
-		if ($path != $this->path) {
+		if ($path!=$this->path) {
 			@rmdir($path);
 		}
 	}
@@ -118,7 +118,7 @@ 
 	}
 
 	public function fixPermissions($user) {
-		$cmd = escapeshellcmd('chown -R '.$user.':'.$user. ' ' . $this->path);
+		$cmd = escapeshellcmd('chown -R '.$user.':'.$user.' '.$this->path);
 		exec($cmd);
 	}
 

Braces +17 added lines, -5 removed lines

@@ -24,13 +24,21 @@ 
 
 		$this->path = '/tmp/_FileCache_/'.(string)$path;
 
-		if ($expirationTimeInSeconds < 1) $expirationTimeInSeconds = 1;
+		if ($expirationTimeInSeconds < 1) {
+			$expirationTimeInSeconds = 1;
+		}
 		$this->expirationTimeInSeconds = (int)$expirationTimeInSeconds;
 
-		if ($cleanInterval < 1) $cleanInterval = 1;
+		if ($cleanInterval < 1) {
+			$cleanInterval = 1;
+		}
 		$this->cleanInterval = (int)$cleanInterval;
 
-		if ($directoryDepth<1) $directoryDepth=1; else if ($directoryDepth>10) $directoryDepth=10;
+		if ($directoryDepth<1) {
+			$directoryDepth=1;
+		} else if ($directoryDepth>10) {
+			$directoryDepth=10;
+		}
 		$this->directoryDepth = (int)$directoryDepth;
 	}
 
@@ -80,7 +88,9 @@ 
 			$refPath = rtrim($this->path, "/\\");
 			$dir = rtrim(dirname($fn), "/\\");
 			for ($i = 0; $i < $this->directoryDepth; $i++) {
-				if (!@rmdir($dir)) break;
+				if (!@rmdir($dir)) {
+					break;
+				}
 				$dir = rtrim(dirname($dir), "/\\");
 			}
 		}
@@ -112,7 +122,9 @@ 
 		for ($i = 0, $idx = 0; $i < $this->directoryDepth; $i++, $idx += 2) {
 			$path .= '/'.substr($hash, $idx, 2);
 		}
-		if ($autoCreateDirectory) @mkdir($path, 0777, true);
+		if ($autoCreateDirectory) {
+			@mkdir($path, 0777, true);
+		}
 		$path .= '/'.$hash;
 		return $path;
 	}

classes/Utilities.class.php

Doc Comments +22 added lines

@@ -174,6 +174,10 @@ 
 		return trim($test);
 	}
 
+	/**
+	 * @param string $monitorType
+	 * @param boolean $isBlocked
+	 */
 	public static function logBlockListStats($server, $monitorType, $isBlocked){
 		if(Setup::$settings['log_rbl_stats']==0) return true;
 		$mysql = new _MySQL();
@@ -403,6 +407,12 @@ 
 			);
 	}
 
+	/**
+	 * @param string $host
+	 * @param boolean $isBlocked
+	 * @param string $rDNS
+	 * @param string $status
+	 */
 	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
 		if(substr($url,0,4)!='http') return false;
 
@@ -438,6 +448,10 @@ 
 		return false;
 	}
 
+	 /**
+	  * @param string $beginText
+	  * @param string $endText
+	  */
 	 public static function parseBetweenText(
 		$text,
 		$beginText,
@@ -471,6 +485,11 @@ 
 		return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
 	 }
 
+	/**
+	 * @param _MySQL $mysql
+	 *
+	 * @return string
+	 */
 	public static function getNextMonitor($mysql){
 		$ipDomain = $mysql->runQueryReturnVar("select ipDomain from monitors where beenChecked = 0");
 		$mysql->runQuery("update monitors set beenChecked = 1 where ipDomain = '".$mysql->escape($ipDomain)."'");
@@ -518,6 +537,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $command
+	 */
 	public static function run_in_background($command, $priority = 0) {
 		$log = Setup::$settings['log_path'];
 		if($priority !=0){

Spacing +122 added lines, -122 removed lines

@@ -12,12 +12,12 @@ 
 	public static $frequencyCheckOptions = array('1hour', '2hour', '8hour', 'daily', 'weekly');
 	public static $mysql = false;
 
-	public static function setBlockLists(){
+	public static function setBlockLists() {
 		$localCache = new _FileCache('blacklistmonitor-Utilities-BlockLists', 60);
 		$cacheKey = 'bl';
 		$cacheData = $localCache->get($cacheKey);
-		if ($cacheData !== false) {
-			if(isset($cacheData['domains']) && isset($cacheData['ips']) ) {
+		if ($cacheData!==false) {
+			if (isset($cacheData['domains']) && isset($cacheData['ips'])) {
 				self::$domainBlacklists = $cacheData['domains'];
 				self::$ipBlacklists = $cacheData['ips'];
 				return true;
@@ -29,10 +29,10 @@ 
 		$rs = $mysql->runQuery($sql);
 		$cacheData['domains'] = array();
 		$cacheData['ips'] = array();
-		while($row = mysqli_fetch_array($rs)){
-			if($row['monitorType']=='ip'){
+		while ($row = mysqli_fetch_array($rs)) {
+			if ($row['monitorType']=='ip') {
 				$cacheData['ips'][] = $row['host'];
-			}else{
+			}else {
 				$cacheData['domains'][] = $row['host'];
 			}
 		}
@@ -43,46 +43,46 @@ 
 		return false;
 	}
 
-	public static function randomDNSServer(){
-		return Setup::$settings['dns_servers'][mt_rand(0,(count(Setup::$settings['dns_servers'])-1))];
+	public static function randomDNSServer() {
+		return Setup::$settings['dns_servers'][mt_rand(0, (count(Setup::$settings['dns_servers'])-1))];
 	}
 
 	public static $isBlocked = 0;
 	
-	public static function checkBlacklists($domainOrIp, $reportClean=false){
+	public static function checkBlacklists($domainOrIp, $reportClean = false) {
 		self::$isBlocked = 0;
 		$return = array();
-		if(_IpAddresses::isIPAddress($domainOrIp)){
-			foreach(self::$ipBlacklists as $server){
+		if (_IpAddresses::isIPAddress($domainOrIp)) {
+			foreach (self::$ipBlacklists as $server) {
 				$r = self::ipCheck($domainOrIp, $server);
-				if($r!='') {
+				if ($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'ip', true);
-				}else{
+				}else {
 					self::logBlockListStats($server, 'ip', false);
 				}
-				if($r!='' || $reportClean==true) {
-					$return[] = array(trim($server),$r);
+				if ($r!='' || $reportClean==true) {
+					$return[] = array(trim($server), $r);
 				}
 			}
-		}else{
-			foreach(self::$domainBlacklists as $server){
+		}else {
+			foreach (self::$domainBlacklists as $server) {
 				$r = self::domainCheck($domainOrIp, $server);
-				if($r!='') {
+				if ($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'domain', true);
-				}else{
+				}else {
 					self::logBlockListStats($server, 'domain', false);
 				}
-				if($r!='' || $reportClean==true) {
-					$return[] = array(trim($server),$r);
+				if ($r!='' || $reportClean==true) {
+					$return[] = array(trim($server), $r);
 				}
 			}
 		}
 		return $return;
 	}
 
-	public static function domainCheck($domain, $server){
+	public static function domainCheck($domain, $server) {
 		$server = trim($server);
 		$host = escapeshellarg("$domain.$server");
 		$t = "dig @".self::randomDNSServer()." +time=".Setup::$settings['dns_request_timeout']." $host";
@@ -98,8 +98,8 @@ 
 		$testArray = explode("\t", $test);
 		$test = end($testArray);
 
-		if(trim($test)!=''){
-			if(Setup::$settings['rbl_txt_extended_status']){
+		if (trim($test)!='') {
+			if (Setup::$settings['rbl_txt_extended_status']) {
 				$t = "dig @".self::randomDNSServer()." +time=".Setup::$settings['dns_request_timeout']." $host txt";
 		//		echo("$t</br>");
 				$text = shell_exec($t);
@@ -112,18 +112,18 @@ 
 					true);
 				$testArray = explode("\t", $test);
 				$test = end($testArray);
-				$test = str_replace(array('\'','"'),'',$test);
-			}else{
+				$test = str_replace(array('\'', '"'), '', $test);
+			}else {
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if (strripos($test, 'not found')!==false) return '';
+		if (strripos($test, 'SERVFAIL')!==false) return '';
 		return trim($test);
 	}
 
-	public static function ipCheck($ip, $server){
-		if(_IpAddresses::isIPAddress($ip)===false) return '';
+	public static function ipCheck($ip, $server) {
+		if (_IpAddresses::isIPAddress($ip)===false) return '';
 		$server = trim($server);
 
 		$parts = explode('.', $ip);
@@ -143,8 +143,8 @@ 
 		$testArray = preg_split("/IN\s+A\s+/i", $test);
 		$test = trim(end($testArray));
 		//		echo "<pre>$test</pre>\n";
-		if(trim($test)!=''){
-			if(Setup::$settings['rbl_txt_extended_status']){
+		if (trim($test)!='') {
+			if (Setup::$settings['rbl_txt_extended_status']) {
 				$t = "dig @".self::randomDNSServer()." +time=".Setup::$settings['dns_request_timeout']." $host txt";
 		//		echo("$t</br>");
 				$text = shell_exec($t);
@@ -157,41 +157,41 @@ 
 					true);
 				$testArray = preg_split("/IN\s+TXT\s+/i", $test2);
 				$test2 = trim(end($testArray));
-				$test2 = str_replace(array('\'','"'),'',$test2);
-				switch($server){
+				$test2 = str_replace(array('\'', '"'), '', $test2);
+				switch ($server) {
 					case 'bl.mailspike.net':
-						$a = explode("|",$test2);
-						$test = (isset($a[1])) ? 'Listed ' . $a[1] : $test2;
+						$a = explode("|", $test2);
+						$test = (isset($a[1])) ? 'Listed '.$a[1] : $test2;
 					break;
 				}
-				if($test2!='') $test = $test2;
-			}else{
+				if ($test2!='') $test = $test2;
+			}else {
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if (strripos($test, 'not found')!==false) return '';
+		if (strripos($test, 'SERVFAIL')!==false) return '';
 		return trim($test);
 	}
 
-	public static function logBlockListStats($server, $monitorType, $isBlocked){
-		if(Setup::$settings['log_rbl_stats']==0) return true;
+	public static function logBlockListStats($server, $monitorType, $isBlocked) {
+		if (Setup::$settings['log_rbl_stats']==0) return true;
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
-		if($isBlocked){
+		if ($isBlocked) {
 			$sql = "update blockLists set blocksToday=(blocksToday+1), lastBlockReport=now() where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
-		}else{
+		}else {
 			$sql = "update blockLists set cleanToday=(cleanToday+1) where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
 		}
 		$mysql->runQuery($sql);
 		$mysql->close();
 	}
 
-	public static function ensureGroupExists($groupName){
+	public static function ensureGroupExists($groupName) {
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$id = $mysql->runQueryReturnVar("select id from monitorGroup where groupName = '".$mysql->escape($groupName)."'");
-		if($id===false){
+		if ($id===false) {
 			$mysql->runQuery("insert into monitorGroup set groupName = '".$mysql->escape($groupName)."'");
 			$id = $mysql->identity;
 		}
@@ -199,23 +199,23 @@ 
 		return $id;
 	}
 
-	public static function updateDomains($domains, $monitorGroupId){
+	public static function updateDomains($domains, $monitorGroupId) {
 		$domains = trim($domains);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if ($monitorGroupId===0) return false;
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 1 and monitorGroupId = $monitorGroupId");
 		$mysql->runQuery("update users set lastUpdate = '".$mysql->escape(date('Y-m-d H:i:s'))."'");
 		$mysql->runQuery("update monitorGroup set domains = '".$mysql->escape($domains)."' where id = $monitorGroupId");
 		$domainArray = preg_split('/\s+/', $domains);
-		foreach($domainArray as $d){
+		foreach ($domainArray as $d) {
 			$d = trim($d);
 			$d = str_ireplace('http://', '', $d);
 			$d = str_ireplace('https://', '', $d);
 			$d = str_ireplace('/', '', $d);
 			$d = preg_replace('/[[:^print:]]/', '', $d);
-			if($d != ''){
+			if ($d!='') {
 				$mysql->runQuery("
 					update monitors set
 						keepOnUpdate = 1
@@ -224,7 +224,7 @@ 
 						and ipDomain = '".$mysql->escape($d)."'
 						and isDomain = 1
 				");
-				if($mysql->affectedRows == 0){
+				if ($mysql->affectedRows==0) {
 					$mysql->runQuery("insert ignore into monitors set
 					monitorGroupId = $monitorGroupId,
 					ipDomain = '".$mysql->escape($d)."',
@@ -238,19 +238,19 @@ 
 		$mysql->close();
 	}
 
-	public static function updateIPs($ips, $monitorGroupId){
+	public static function updateIPs($ips, $monitorGroupId) {
 		$ips = trim($ips);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if ($monitorGroupId===0) return false;
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 0 and monitorGroupId = $monitorGroupId");
 		$mysql->runQuery("update users set lastUpdate = '".$mysql->escape(date('Y-m-d H:i:s'))."'");
 		$mysql->runQuery("update monitorGroup set ips = '".$mysql->escape($ips)."' where id = $monitorGroupId");
-		$ipsArray  = preg_split('/\s+/', $ips);
-		foreach($ipsArray as $i){
+		$ipsArray = preg_split('/\s+/', $ips);
+		foreach ($ipsArray as $i) {
 			// ip checks
-			if(_IpAddresses::isIPAddress($i)){
+			if (_IpAddresses::isIPAddress($i)) {
 				$mysql->runQuery("
 					update monitors set
 					keepOnUpdate = 1
@@ -259,7 +259,7 @@ 
 						and ipDomain = '".$mysql->escape($i)."'
 						and isDomain = 0
 					");
-				if($mysql->affectedRows == 0){
+				if ($mysql->affectedRows==0) {
 					$mysql->runQuery("insert ignore into monitors set
 						monitorGroupId = $monitorGroupId,
 						ipDomain = '".$mysql->escape($i)."', 
@@ -267,19 +267,19 @@ 
 						keepOnUpdate = 1
 						");
 				}
-			}else{
+			}else {
 				//cidr /24's max...
-				if(trim($i)!=''){
-					if(strpos($i, ' ')!==false) continue;
-					if(strpos($i, ':')!==false) continue;
+				if (trim($i)!='') {
+					if (strpos($i, ' ')!==false) continue;
+					if (strpos($i, ':')!==false) continue;
 					$range = _IpAddresses::cidrToRange($i);
-					if($range===false) continue;
+					if ($range===false) continue;
 					$start = explode('.', $range[0]);
 					$end = explode('.', $range[1]);
-					if($range[0]==0) continue;// starts with 0
-					for($i = $start[3]; $i <= $end[3]; $i++){
+					if ($range[0]==0) continue; // starts with 0
+					for ($i = $start[3]; $i <= $end[3]; $i++) {
 						$host = "{$start[0]}.{$start[1]}.{$start[2]}.$i";
-						if(_IpAddresses::isIPAddress($host)){
+						if (_IpAddresses::isIPAddress($host)) {
 							$mysql->runQuery("
 								update monitors set
 									keepOnUpdate = 1
@@ -288,7 +288,7 @@ 
 										and ipDomain = '".$mysql->escape($host)."'
 										and isDomain = 0
 								");
-							if($mysql->affectedRows == 0){
+							if ($mysql->affectedRows==0) {
 								$mysql->runQuery("insert ignore into monitors set
 									monitorGroupId = $monitorGroupId,
 									ipDomain = '".$mysql->escape($host)."',
@@ -305,15 +305,15 @@ 
 		$mysql->close();
 	}
 
-	public static function isLoggedIn(){
-		if(isset($_SESSION['id']) && (int)$_SESSION['id'] > 0){
+	public static function isLoggedIn() {
+		if (isset($_SESSION['id']) && (int)$_SESSION['id'] > 0) {
 			return $_SESSION['id'];
-		}else{
+		}else {
 			return false;
 		}
 	}
 
-	public static function getAccount(){
+	public static function getAccount() {
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$ret = false;
@@ -330,12 +330,12 @@ 
 				apiCallbackURL,
 				checkFrequency
 			from users limit 1");
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			$ret = $row;
 		}
 		$mysql->close();
 
-		if(!$ret){
+		if (!$ret) {
 			//account
 			_Logging::appLog("no user account");
 			exit();
@@ -344,44 +344,44 @@ 
 		return $ret;
 	}
 
-	public static function validateLogin($userName, $passwd, $api = false, $apiKey = ''){
+	public static function validateLogin($userName, $passwd, $api = false, $apiKey = '') {
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$sql = "
 		select username
 		from users
 		where ";
-		if(trim($apiKey) != ''){
+		if (trim($apiKey)!='') {
 			$sql .= " apiKey = '".$mysql->escape($apiKey)."'";
-		}else{
+		}else {
 			$sql .= " passwd = '".$mysql->escape(md5($passwd))."' 
 			and username = '".$mysql->escape($userName)."'";
 		}
 		$rs = $mysql->runQuery($sql);
 		$id = 0;
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			$id = 1;
 		}
 		$mysql->close();
 		return $id;
 	}
 
-	public static function lookupHostDNS($host){
-		if(_IpAddresses::isIPAddress($host)){
+	public static function lookupHostDNS($host) {
+		if (_IpAddresses::isIPAddress($host)) {
 			return _IpAddresses::getHostByIp($host);
-		}else{
+		}else {
 			$host = escapeshellarg($host);
 			exec('host -t a -W 2 '.$host, $output, $return);
-			if ($return !== 0) {
+			if ($return!==0) {
 				return '';
-			}else{
+			}else {
 				$output = implode($output);
 				$ips = _IpAddresses::getAllIPsFromString($output, true);
 				$ir = "";
-				foreach($ips as $ip){
+				foreach ($ips as $ip) {
 					$ir .= "$ip,";
 				}
-				return trim($ir,',');
+				return trim($ir, ',');
 			}
 
 			/*
@@ -394,7 +394,7 @@ 
 		}
 	}
 
-	public static function testAPICallback($url){
+	public static function testAPICallback($url) {
 		return self::makeAPICallback($url,
 			'samplehosttest.com', 
 			true, 
@@ -403,8 +403,8 @@ 
 			);
 	}
 
-	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
-		if(substr($url,0,4)!='http') return false;
+	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status) {
+		if (substr($url, 0, 4)!='http') return false;
 
 		$vars = json_encode(
 			array(
@@ -415,14 +415,14 @@ 
 			)
 		);
 		$err = true;
-		try{
+		try {
 			$ch = curl_init();
-			curl_setopt($ch,CURLOPT_URL,$url);
-			curl_setopt($ch,CURLOPT_POST,true);
-			curl_setopt($ch,CURLOPT_FAILONERROR,true);
-			curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
-			curl_setopt($ch,CURLOPT_POSTFIELDS,$vars);
-			curl_setopt($ch,CURLOPT_HTTPHEADER, array('Content-Type: application/json')); 
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_POST, true);
+			curl_setopt($ch, CURLOPT_FAILONERROR, true);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $vars);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json')); 
 			curl_exec($ch);
 			if (curl_errno($ch)) $err = false;
 		} catch (Exception $e) {
@@ -431,7 +431,7 @@ 
 		return $err;
 	}
 
-	public static function isValidEmail($emailAddress){
+	public static function isValidEmail($emailAddress) {
 		if (filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
 			return true;
 		}
@@ -442,36 +442,36 @@ 
 		$text,
 		$beginText,
 		$endText,
-		$removeSpace=true,
-		$removeHtmlTags=true,
-		$firstResultOnlyNoArray=false) {
+		$removeSpace = true,
+		$removeHtmlTags = true,
+		$firstResultOnlyNoArray = false) {
 		$results = array();
 		$endPos = 0;
-		while(true) {
+		while (true) {
 				$beginPos = stripos($text, $beginText, $endPos);
-				if($beginPos===false) break;
+				if ($beginPos===false) break;
 				$beginPos = $beginPos+strlen($beginText);
 				$endPos = stripos($text, $endText, $beginPos);
-				if($endPos===false) break;
+				if ($endPos===false) break;
 				$result = substr($text, $beginPos, $endPos-$beginPos);
-				if($removeSpace){
-						$result = str_replace("\t","",$result);
-						$result = str_replace("\n","",$result);
-						$result = preg_replace("/  /"," ",$result);
-						$result = preg_replace("~[\s]{2}?[\t]?~i"," ",$result);
-						$result = str_replace("  "," ",$result);
+				if ($removeSpace) {
+						$result = str_replace("\t", "", $result);
+						$result = str_replace("\n", "", $result);
+						$result = preg_replace("/  /", " ", $result);
+						$result = preg_replace("~[\s]{2}?[\t]?~i", " ", $result);
+						$result = str_replace("  ", " ", $result);
 						$result = trim($result);
 				}
-				if($removeHtmlTags){
+				if ($removeHtmlTags) {
 						$result = strip_tags($result);
 				}
-				if($firstResultOnlyNoArray) return $result;
-				if($result != '') $results[] = $result;
+				if ($firstResultOnlyNoArray) return $result;
+				if ($result!='') $results[] = $result;
 		}
 		return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
 	 }
 
-	public static function getNextMonitor($mysql){
+	public static function getNextMonitor($mysql) {
 		$ipDomain = $mysql->runQueryReturnVar("select ipDomain from monitors where beenChecked = 0");
 		$mysql->runQuery("update monitors set beenChecked = 1 where ipDomain = '".$mysql->escape($ipDomain)."'");
 		return $ipDomain;
@@ -480,49 +480,49 @@ 
 	public static function getHostChangeCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if ($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where lastStatusChanged = 1 $sql");
 	}
 
 	public static function getHostErrorCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if ($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if ($onlyNew) $sql .= " and lastStatusChanged = 1 ";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 1 $sql");
 	}
 
 	public static function getHostCleanCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if ($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if ($onlyNew) $sql .= " and lastStatusChanged = 1 ";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 0 $sql");
 	}
 
 	public static function getHostCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
+		if ($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors $sql");
 	}
 
 	//CREDIT: http://braincrafted.com/php-background-processes/
-	public static function is_process_running($pid){
+	public static function is_process_running($pid) {
 		$pid = (int)$pid;
-		if($pid == 0) return false;
-		if(file_exists('/proc/'.$pid)){
+		if ($pid==0) return false;
+		if (file_exists('/proc/'.$pid)) {
 			return true;
-		}else{
+		}else {
 			return false;
 		}
 	}
 
 	public static function run_in_background($command, $priority = 0) {
 		$log = Setup::$settings['log_path'];
-		if($priority !=0){
+		if ($priority!=0) {
 			$pid = shell_exec("nohup nice -n $priority $command >> $log 2>&1 & echo $!");
-		}else{
+		}else {
 			$pid = shell_exec("nohup $command >> $log 2>&1 & echo $!");
 		}
 		return($pid);

Braces +93 added lines, -40 removed lines

@@ -32,7 +32,7 @@ 
 		while($row = mysqli_fetch_array($rs)){
 			if($row['monitorType']=='ip'){
 				$cacheData['ips'][] = $row['host'];
-			}else{
+			} else{
 				$cacheData['domains'][] = $row['host'];
 			}
 		}
@@ -58,20 +58,20 @@ 
 				if($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'ip', true);
-				}else{
+				} else{
 					self::logBlockListStats($server, 'ip', false);
 				}
 				if($r!='' || $reportClean==true) {
 					$return[] = array(trim($server),$r);
 				}
 			}
-		}else{
+		} else{
 			foreach(self::$domainBlacklists as $server){
 				$r = self::domainCheck($domainOrIp, $server);
 				if($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'domain', true);
-				}else{
+				} else{
 					self::logBlockListStats($server, 'domain', false);
 				}
 				if($r!='' || $reportClean==true) {
@@ -113,17 +113,23 @@ 
 				$testArray = explode("\t", $test);
 				$test = end($testArray);
 				$test = str_replace(array('\'','"'),'',$test);
-			}else{
+			} else{
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if(strripos($test,'not found')!==false) {
+			return '';
+		}
+		if(strripos($test,'SERVFAIL')!==false) {
+			return '';
+		}
 		return trim($test);
 	}
 
 	public static function ipCheck($ip, $server){
-		if(_IpAddresses::isIPAddress($ip)===false) return '';
+		if(_IpAddresses::isIPAddress($ip)===false) {
+			return '';
+		}
 		$server = trim($server);
 
 		$parts = explode('.', $ip);
@@ -164,23 +170,31 @@ 
 						$test = (isset($a[1])) ? 'Listed ' . $a[1] : $test2;
 					break;
 				}
-				if($test2!='') $test = $test2;
-			}else{
+				if($test2!='') {
+					$test = $test2;
+				}
+			} else{
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if(strripos($test,'not found')!==false) {
+			return '';
+		}
+		if(strripos($test,'SERVFAIL')!==false) {
+			return '';
+		}
 		return trim($test);
 	}
 
 	public static function logBlockListStats($server, $monitorType, $isBlocked){
-		if(Setup::$settings['log_rbl_stats']==0) return true;
+		if(Setup::$settings['log_rbl_stats']==0) {
+			return true;
+		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		if($isBlocked){
 			$sql = "update blockLists set blocksToday=(blocksToday+1), lastBlockReport=now() where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
-		}else{
+		} else{
 			$sql = "update blockLists set cleanToday=(cleanToday+1) where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
 		}
 		$mysql->runQuery($sql);
@@ -202,7 +216,9 @@ 
 	public static function updateDomains($domains, $monitorGroupId){
 		$domains = trim($domains);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if($monitorGroupId===0) {
+			return false;
+		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 1 and monitorGroupId = $monitorGroupId");
@@ -241,7 +257,9 @@ 
 	public static function updateIPs($ips, $monitorGroupId){
 		$ips = trim($ips);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if($monitorGroupId===0) {
+			return false;
+		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 0 and monitorGroupId = $monitorGroupId");
@@ -267,16 +285,25 @@ 
 						keepOnUpdate = 1
 						");
 				}
-			}else{
+			} else{
 				//cidr /24's max...
 				if(trim($i)!=''){
-					if(strpos($i, ' ')!==false) continue;
-					if(strpos($i, ':')!==false) continue;
+					if(strpos($i, ' ')!==false) {
+						continue;
+					}
+					if(strpos($i, ':')!==false) {
+						continue;
+					}
 					$range = _IpAddresses::cidrToRange($i);
-					if($range===false) continue;
+					if($range===false) {
+						continue;
+					}
 					$start = explode('.', $range[0]);
 					$end = explode('.', $range[1]);
-					if($range[0]==0) continue;// starts with 0
+					if($range[0]==0) {
+						continue;
+					}
+					// starts with 0
 					for($i = $start[3]; $i <= $end[3]; $i++){
 						$host = "{$start[0]}.{$start[1]}.{$start[2]}.$i";
 						if(_IpAddresses::isIPAddress($host)){
@@ -308,7 +335,7 @@ 
 	public static function isLoggedIn(){
 		if(isset($_SESSION['id']) && (int)$_SESSION['id'] > 0){
 			return $_SESSION['id'];
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -353,7 +380,7 @@ 
 		where ";
 		if(trim($apiKey) != ''){
 			$sql .= " apiKey = '".$mysql->escape($apiKey)."'";
-		}else{
+		} else{
 			$sql .= " passwd = '".$mysql->escape(md5($passwd))."' 
 			and username = '".$mysql->escape($userName)."'";
 		}
@@ -369,12 +396,12 @@ 
 	public static function lookupHostDNS($host){
 		if(_IpAddresses::isIPAddress($host)){
 			return _IpAddresses::getHostByIp($host);
-		}else{
+		} else{
 			$host = escapeshellarg($host);
 			exec('host -t a -W 2 '.$host, $output, $return);
 			if ($return !== 0) {
 				return '';
-			}else{
+			} else{
 				$output = implode($output);
 				$ips = _IpAddresses::getAllIPsFromString($output, true);
 				$ir = "";
@@ -404,7 +431,9 @@ 
 	}
 
 	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
-		if(substr($url,0,4)!='http') return false;
+		if(substr($url,0,4)!='http') {
+			return false;
+		}
 
 		$vars = json_encode(
 			array(
@@ -424,7 +453,9 @@ 
 			curl_setopt($ch,CURLOPT_POSTFIELDS,$vars);
 			curl_setopt($ch,CURLOPT_HTTPHEADER, array('Content-Type: application/json')); 
 			curl_exec($ch);
-			if (curl_errno($ch)) $err = false;
+			if (curl_errno($ch)) {
+				$err = false;
+			}
 		} catch (Exception $e) {
 			$err = false;
 		}
@@ -449,10 +480,14 @@ 
 		$endPos = 0;
 		while(true) {
 				$beginPos = stripos($text, $beginText, $endPos);
-				if($beginPos===false) break;
+				if($beginPos===false) {
+					break;
+				}
 				$beginPos = $beginPos+strlen($beginText);
 				$endPos = stripos($text, $endText, $beginPos);
-				if($endPos===false) break;
+				if($endPos===false) {
+					break;
+				}
 				$result = substr($text, $beginPos, $endPos-$beginPos);
 				if($removeSpace){
 						$result = str_replace("\t","",$result);
@@ -465,8 +500,12 @@ 
 				if($removeHtmlTags){
 						$result = strip_tags($result);
 				}
-				if($firstResultOnlyNoArray) return $result;
-				if($result != '') $results[] = $result;
+				if($firstResultOnlyNoArray) {
+					return $result;
+				}
+				if($result != '') {
+					$results[] = $result;
+				}
 		}
 		return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
 	 }
@@ -480,40 +519,54 @@ 
 	public static function getHostChangeCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if($monitorGroupId > 0) {
+			$sql = " and monitorGroupId = $monitorGroupId";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where lastStatusChanged = 1 $sql");
 	}
 
 	public static function getHostErrorCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if($monitorGroupId > 0) {
+			$sql = " and monitorGroupId = $monitorGroupId";
+		}
+		if($onlyNew) {
+			$sql .= " and lastStatusChanged = 1 ";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 1 $sql");
 	}
 
 	public static function getHostCleanCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if($monitorGroupId > 0) {
+			$sql = " and monitorGroupId = $monitorGroupId";
+		}
+		if($onlyNew) {
+			$sql .= " and lastStatusChanged = 1 ";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 0 $sql");
 	}
 
 	public static function getHostCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
+		if($monitorGroupId > 0) {
+			$sql = " where monitorGroupId = $monitorGroupId";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors $sql");
 	}
 
 	//CREDIT: http://braincrafted.com/php-background-processes/
 	public static function is_process_running($pid){
 		$pid = (int)$pid;
-		if($pid == 0) return false;
+		if($pid == 0) {
+			return false;
+		}
 		if(file_exists('/proc/'.$pid)){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -522,7 +575,7 @@ 
 		$log = Setup::$settings['log_path'];
 		if($priority !=0){
 			$pid = shell_exec("nohup nice -n $priority $command >> $log 2>&1 & echo $!");
-		}else{
+		} else{
 			$pid = shell_exec("nohup $command >> $log 2>&1 & echo $!");
 		}
 		return($pid);

account.php

Spacing +40 added lines, -40 removed lines

@@ -5,7 +5,7 @@ 
 class_exists('_MySQL', false) or include('classes/_MySQL.class.php');
 class_exists('PHPMailer', false) or include('classes/class.phpmailer.php');
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php');
 	exit();
 }
@@ -13,17 +13,17 @@ 
 $titlePreFix = "account";
 $message = array();
 
-$username = array_key_exists('username', $_POST) ? substr(trim($_POST['username']),0,100) : '';
-$noticeEmailAddresses = array_key_exists('noticeEmailAddresses', $_POST) ? substr($_POST['noticeEmailAddresses'],0,8000) : '';
-$textMessageEmails = array_key_exists('textMessageEmails', $_POST) ? substr($_POST['textMessageEmails'],0,8000) : '';
-$passwd = array_key_exists('passwd', $_POST) ? substr($_POST['passwd'],0,32) : '';
-$passwdOld = array_key_exists('passwdOld', $_POST) ? substr($_POST['passwdOld'],0,32) : '';
-$apiKey = array_key_exists('apiKey', $_POST) ? substr($_POST['apiKey'],0,32) : '';
+$username = array_key_exists('username', $_POST) ? substr(trim($_POST['username']), 0, 100) : '';
+$noticeEmailAddresses = array_key_exists('noticeEmailAddresses', $_POST) ? substr($_POST['noticeEmailAddresses'], 0, 8000) : '';
+$textMessageEmails = array_key_exists('textMessageEmails', $_POST) ? substr($_POST['textMessageEmails'], 0, 8000) : '';
+$passwd = array_key_exists('passwd', $_POST) ? substr($_POST['passwd'], 0, 32) : '';
+$passwdOld = array_key_exists('passwdOld', $_POST) ? substr($_POST['passwdOld'], 0, 32) : '';
+$apiKey = array_key_exists('apiKey', $_POST) ? substr($_POST['apiKey'], 0, 32) : '';
 $disableEmailNotices = array_key_exists('disableEmailNotices', $_POST) ? (int)$_POST['disableEmailNotices'] : 0;
 $beenChecked = array_key_exists('beenChecked', $_POST) ? (int)$_POST['beenChecked'] : 0;
-$twitterHandle = array_key_exists('twitterHandle', $_POST) ? substr(trim($_POST['twitterHandle']),0,15) : '';
-$twitterHandle = str_replace('@','',$twitterHandle);
-$apiCallbackURL = array_key_exists('apiCallbackURL', $_POST) ? substr(trim($_POST['apiCallbackURL']),0,2000) : '';
+$twitterHandle = array_key_exists('twitterHandle', $_POST) ? substr(trim($_POST['twitterHandle']), 0, 15) : '';
+$twitterHandle = str_replace('@', '', $twitterHandle);
+$apiCallbackURL = array_key_exists('apiCallbackURL', $_POST) ? substr(trim($_POST['apiCallbackURL']), 0, 2000) : '';
 $testUrl = array_key_exists('testUrl', $_GET) ? $_GET['testUrl'] : '';
 
 $mysql = new _MySQL();
@@ -32,40 +32,40 @@ 
 // audit check frequency
 $checkFrequency = array_key_exists('checkFrequency', $_POST) ? $_POST['checkFrequency'] : '';
 
-if($testUrl!=''){
-	if(Utilities::testAPICallback($testUrl)){
+if ($testUrl!='') {
+	if (Utilities::testAPICallback($testUrl)) {
 		echo('true');
-	}else{
+	}else {
 		echo('false');
 	}
 	exit();
 }
 
 if (isset($_POST["submit"])) {
-	if($passwd=='') $message[] = 'You must select a password.';
+	if ($passwd=='') $message[] = 'You must select a password.';
 
-	if($passwdOld != $passwd){
+	if ($passwdOld!=$passwd) {
 		$passwdOld = md5($passwd);
 	}
 
-	$ta = explode("\n",$noticeEmailAddresses);
+	$ta = explode("\n", $noticeEmailAddresses);
 	$noticeEmailAddresses = "";
-	foreach($ta as $e){
+	foreach ($ta as $e) {
 		$e = trim($e);
-		if(Utilities::isValidEmail($e)){
+		if (Utilities::isValidEmail($e)) {
 			$noticeEmailAddresses .= "$e\n";
 		}
 	}
-	$ta = explode("\n",$textMessageEmails);
+	$ta = explode("\n", $textMessageEmails);
 	$textMessageEmails = "";
-	foreach($ta as $e){
+	foreach ($ta as $e) {
 		$e = trim($e);
-		if(Utilities::isValidEmail($e)){
+		if (Utilities::isValidEmail($e)) {
 			$textMessageEmails .= "$e\n";
 		}
 	}
 	//TODO: make sure blacklists are domains with an ip address on them
-	if(count($message) == 0){
+	if (count($message)==0) {
 		//update
 		$mysql->runQuery("
 			update users set username = '".$mysql->escape($username)."',
@@ -81,11 +81,11 @@ 
 			checkFrequency = '".$mysql->escape($checkFrequency)."',
 			disableEmailNotices = $disableEmailNotices
 			");
-		if($beenChecked==1){
+		if ($beenChecked==1) {
 			$mysql->runQuery("update users set beenChecked = 0");
 				$message[] = "Check scheduled.";
 		}
-		if($twitterHandle!=''){
+		if ($twitterHandle!='') {
 			$t = new Twitter();
 			$t->follow($twitterHandle);
 		}
@@ -93,7 +93,7 @@ 
 	}
 }
 $user = Utilities::getAccount();
-if(!$user){
+if (!$user) {
 	//invalid account
 	echo("<script>window.location='login.php?logout=1';</script>");
 	exit();
@@ -106,8 +106,8 @@ 
 <div class="row">
 	<div class="col-md-3">
 	<ul class="nav nav-pills nav-stacked">
-		<li>Hosts Total <span class="badge pull-right"><?php echo(number_format(Utilities::getHostCount($mysql)));?></span></li>
-		<li>Hosts Blocked <span class="badge pull-right"><?php echo(number_format(Utilities::getHostErrorCount($mysql)));?></span></li>
+		<li>Hosts Total <span class="badge pull-right"><?php echo(number_format(Utilities::getHostCount($mysql))); ?></span></li>
+		<li>Hosts Blocked <span class="badge pull-right"><?php echo(number_format(Utilities::getHostErrorCount($mysql))); ?></span></li>
 	</ul>
 	</div>
 </div>
@@ -136,7 +136,7 @@ 
 </script>
 
 <?php
-foreach($message as $m){
+foreach ($message as $m) {
 	echo("<div class=\"alert alert-info alert-dismissable\"><button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-hidden=\"true\">&times;</button>$m</div>");
 }
 ?>
@@ -145,30 +145,30 @@ 
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="username">Login Username</label>
 		<div class="col-sm-6">
-			<input class="form-control" type="text" id="username" name="username" value="<?php echo($user['username']);?>" placeholder="username">
+			<input class="form-control" type="text" id="username" name="username" value="<?php echo($user['username']); ?>" placeholder="username">
 		</div>
 	</div>
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="passwd">Password</label>
 		<div class="col-sm-6">
-			<input class="form-control" type="password" name="passwd" id="passwd" value="<?php echo($user['passwd']);?>" class="form-control" placeholder="Password">
+			<input class="form-control" type="password" name="passwd" id="passwd" value="<?php echo($user['passwd']); ?>" class="form-control" placeholder="Password">
 		</div>
 	</div>
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="apiKey">API Key</label>
 		<div class="col-sm-6">
-			<input class="form-control" maxlength="32" type="text" id="apiKey" name="apiKey" value="<?php echo($user['apiKey']);?>" placeholder="api key">
+			<input class="form-control" maxlength="32" type="text" id="apiKey" name="apiKey" value="<?php echo($user['apiKey']); ?>" placeholder="api key">
 		</div>
 	</div>
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="checkFrequency">Check Frequency</label>
 		<div class="col-sm-6">
 			<select id="checkFrequency" name="checkFrequency" class="form-control">
-				<option value="weekly"<?php if($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
-				<option value="daily"<?php if($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
-				<option value="8hour"<?php if($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
-				<option value="2hour"<?php if($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
-				<option value="1hour"<?php if($user['checkFrequency']=='1hour') echo ' selected'?>>Hourly</option>
+				<option value="weekly"<?php if ($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
+				<option value="daily"<?php if ($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
+				<option value="8hour"<?php if ($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
+				<option value="2hour"<?php if ($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
+				<option value="1hour"<?php if ($user['checkFrequency']=='1hour') echo ' selected'?>>Hourly</option>
 			</select>
 		</div>
 	</div>
@@ -190,7 +190,7 @@ 
 		<div class="col-sm-6">
 			<div class="input-group">
 				<span class="input-group-addon">@</span>
-				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);?>" placeholder="twitter username">
+				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']); ?>" placeholder="twitter username">
 			</div>
 		</div>
 	</div>
@@ -200,7 +200,7 @@ 
 		</label>
 		<div class="col-sm-6">
 			<div class="input-group">
-				<input class="form-control" type="text" id="apiCallbackURL" name="apiCallbackURL" value="<?php echo($user['apiCallbackURL']);?>" placeholder="api callback url">
+				<input class="form-control" type="text" id="apiCallbackURL" name="apiCallbackURL" value="<?php echo($user['apiCallbackURL']); ?>" placeholder="api callback url">
 				<span class="input-group-btn">
 					<button class="btn btn-default" type="button" onclick="testAPIUrl()">Test Callback</button>
 				</span>
@@ -209,7 +209,7 @@ 
 		</div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) echo(' checked');?>></label>
+		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if ($user['disableEmailNotices']==1) echo(' checked'); ?>></label>
 		<div class="col-sm-6">
 			Disable Notices<br/><small>You can pause receiving email/text alerts when your status changes.  Useful if you have a frequently changing network.  This does not pause api call backs.</small>
 		</div>
@@ -225,7 +225,7 @@ 
 			<button type="submit" name="submit" value="submit" class="btn btn-primary">Save changes</button>
 		</div>
 	</div>
-	<input type="hidden" value="<?php echo($user['passwd']);?>" name="passwdOld"/>
+	<input type="hidden" value="<?php echo($user['passwd']); ?>" name="passwdOld"/>
 </form>
 
 <br/><br/><br/><br/>

Braces +13 added lines, -5 removed lines

@@ -35,14 +35,16 @@ 
 if($testUrl!=''){
 	if(Utilities::testAPICallback($testUrl)){
 		echo('true');
-	}else{
+	} else{
 		echo('false');
 	}
 	exit();
 }
 
 if (isset($_POST["submit"])) {
-	if($passwd=='') $message[] = 'You must select a password.';
+	if($passwd=='') {
+		$message[] = 'You must select a password.';
+	}
 
 	if($passwdOld != $passwd){
 		$passwdOld = md5($passwd);
@@ -164,7 +166,8 @@ 
 		<label class="col-sm-3 control-label" for="checkFrequency">Check Frequency</label>
 		<div class="col-sm-6">
 			<select id="checkFrequency" name="checkFrequency" class="form-control">
-				<option value="weekly"<?php if($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
+				<option value="weekly"<?php if($user['checkFrequency']=='weekly') {
+	echo ' selected'?>>Weekly</option>
 				<option value="daily"<?php if($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
 				<option value="8hour"<?php if($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
 				<option value="2hour"<?php if($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
@@ -190,7 +193,9 @@ 
 		<div class="col-sm-6">
 			<div class="input-group">
 				<span class="input-group-addon">@</span>
-				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);?>" placeholder="twitter username">
+				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);
+}
+?>" placeholder="twitter username">
 			</div>
 		</div>
 	</div>
@@ -209,7 +214,10 @@ 
 		</div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) echo(' checked');?>></label>
+		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) {
+	echo(' checked');
+}
+?>></label>
 		<div class="col-sm-6">
 			Disable Notices<br/><small>You can pause receiving email/text alerts when your status changes.  Useful if you have a frequently changing network.  This does not pause api call backs.</small>
 		</div>

accountSubnav.inc.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <div id="accountSubnav">
 	<ul class="nav nav-tabs">
-		<li <?php if($pageName=='account.php') echo('class="active"');?>><a href="account.php">Profile</a></li>
-		<li <?php if($pageName=='monitorGroup.php') echo('class="active"');?>><a href="monitorGroup.php">Monitor Groups</a></li>
-		<li <?php if($pageName=='blockLists.php') echo('class="active"');?>><a href="blockLists.php">Block Lists</a></li>
-		<li <?php if($pageName=='apiDocumentation.php') echo('class="active"');?>><a href="apiDocumentation.php">API Documentation</a></li>
+		<li <?php if ($pageName=='account.php') echo('class="active"'); ?>><a href="account.php">Profile</a></li>
+		<li <?php if ($pageName=='monitorGroup.php') echo('class="active"'); ?>><a href="monitorGroup.php">Monitor Groups</a></li>
+		<li <?php if ($pageName=='blockLists.php') echo('class="active"'); ?>><a href="blockLists.php">Block Lists</a></li>
+		<li <?php if ($pageName=='apiDocumentation.php') echo('class="active"'); ?>><a href="apiDocumentation.php">API Documentation</a></li>
 	</ul>
 </div>
\ No newline at end of file

Braces +16 added lines, -4 removed lines

@@ -1,8 +1,20 @@
 <div id="accountSubnav">
 	<ul class="nav nav-tabs">
-		<li <?php if($pageName=='account.php') echo('class="active"');?>><a href="account.php">Profile</a></li>
-		<li <?php if($pageName=='monitorGroup.php') echo('class="active"');?>><a href="monitorGroup.php">Monitor Groups</a></li>
-		<li <?php if($pageName=='blockLists.php') echo('class="active"');?>><a href="blockLists.php">Block Lists</a></li>
-		<li <?php if($pageName=='apiDocumentation.php') echo('class="active"');?>><a href="apiDocumentation.php">API Documentation</a></li>
+		<li <?php if($pageName=='account.php') {
+	echo('class="active"');
+}
+?>><a href="account.php">Profile</a></li>
+		<li <?php if($pageName=='monitorGroup.php') {
+	echo('class="active"');
+}
+?>><a href="monitorGroup.php">Monitor Groups</a></li>
+		<li <?php if($pageName=='blockLists.php') {
+	echo('class="active"');
+}
+?>><a href="blockLists.php">Block Lists</a></li>
+		<li <?php if($pageName=='apiDocumentation.php') {
+	echo('class="active"');
+}
+?>><a href="apiDocumentation.php">API Documentation</a></li>
 	</ul>
 </div>
\ No newline at end of file

api.php

Switch Indentation +42 added lines, -42 removed lines

@@ -24,51 +24,51 @@ 
 }
 
 switch($type){
-	case 'updateDomains':
-		if($groupName=='') {
-			$result['status'] = 'groupName is required';
+		case 'updateDomains':
+			if($groupName=='') {
+				$result['status'] = 'groupName is required';
+				break;
+			}
+			$id = Utilities::ensureGroupExists($groupName);
+			Utilities::updateDomains($data, $id);
+			$result['status'] = 'success';
 			break;
-		}
-		$id = Utilities::ensureGroupExists($groupName);
-		Utilities::updateDomains($data, $id);
-		$result['status'] = 'success';
-		break;
 
-	case 'updateIPs':
-		if($groupName=='') {
-			$result['status'] = 'groupName is required';
+		case 'updateIPs':
+			if($groupName=='') {
+				$result['status'] = 'groupName is required';
+				break;
+			}
+			$id = Utilities::ensureGroupExists($groupName);
+			Utilities::updateIPs($data, $id);
+			$result['status'] = 'success';
 			break;
-		}
-		$id = Utilities::ensureGroupExists($groupName);
-		Utilities::updateIPs($data, $id);
-		$result['status'] = 'success';
-		break;
 
-	case 'checkHostStatus':
-		$result['status'] = 'success';
-		Utilities::setBlockLists();
-		$result['result'] = Utilities::checkBlacklists($data);
-		break;
+		case 'checkHostStatus':
+			$result['status'] = 'success';
+			Utilities::setBlockLists();
+			$result['result'] = Utilities::checkBlacklists($data);
+			break;
 
-	case 'clearAllHostAndGroupData':
-		$mysql = new _MySQL();
-		$mysql->connect(Setup::$connectionArray);
-		$mysql->runQuery("truncate table monitors");
-		$mysql->runQuery("truncate table monitorGroup");
-		$result['status'] = 'success';
-		break;
+		case 'clearAllHostAndGroupData':
+			$mysql = new _MySQL();
+			$mysql->connect(Setup::$connectionArray);
+			$mysql->runQuery("truncate table monitors");
+			$mysql->runQuery("truncate table monitorGroup");
+			$result['status'] = 'success';
+			break;
 
-	case 'blacklistStatus':
-		$localCache = new _FileCache('blacklistmonitor-api', 90);
-		$cacheKey = md5("$username|$passwd|$apiKey|$type|$data");
-		$cacheData = $localCache->get($cacheKey);
-		if ($cacheData !== false) {
-			output($cacheData);
-		}
-		$mysql = new _MySQL();
-		$mysql->connect(Setup::$connectionArray);
-		$searchSQL = '';
-		switch($data){
+		case 'blacklistStatus':
+			$localCache = new _FileCache('blacklistmonitor-api', 90);
+			$cacheKey = md5("$username|$passwd|$apiKey|$type|$data");
+			$cacheData = $localCache->get($cacheKey);
+			if ($cacheData !== false) {
+				output($cacheData);
+			}
+			$mysql = new _MySQL();
+			$mysql->connect(Setup::$connectionArray);
+			$searchSQL = '';
+			switch($data){
 			case 'changed':
 				$searchSQL .= " and lastStatusChanged = 1 ";
 				break;
@@ -79,7 +79,7 @@ 
 				break;
 			case 'all':
 			default:
-		}
+			}
 
 		$rs = $mysql->runQuery("
 			select ipDomain,isBlocked,rDNS,status,lastStatusChangeTime,lastUpdate
@@ -101,8 +101,8 @@ 
 		$localCache->set($cacheKey, $result);
 		break;
 
-	default:
-		$result['status'] = 'no such method';
+		default:
+			$result['status'] = 'no such method';
 }
 
 output();

Braces +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
 	global $result;
 	if($data!==false){
 		echo(json_encode($data));
-	}else{
+	} else{
 		echo(json_encode($result));
 	}
 	exit();

Spacing +10 added lines, -10 removed lines

@@ -18,14 +18,14 @@ 
 );
 
 $id = Utilities::validateLogin($username, $passwd, true, $apiKey);
-if($id == 0) {
+if ($id==0) {
 	$result['status'] = 'invalid login';
 	output();
 }
 
-switch($type){
+switch ($type) {
 	case 'updateDomains':
-		if($groupName=='') {
+		if ($groupName=='') {
 			$result['status'] = 'groupName is required';
 			break;
 		}
@@ -35,7 +35,7 @@ 
 		break;
 
 	case 'updateIPs':
-		if($groupName=='') {
+		if ($groupName=='') {
 			$result['status'] = 'groupName is required';
 			break;
 		}
@@ -62,13 +62,13 @@ 
 		$localCache = new _FileCache('blacklistmonitor-api', 90);
 		$cacheKey = md5("$username|$passwd|$apiKey|$type|$data");
 		$cacheData = $localCache->get($cacheKey);
-		if ($cacheData !== false) {
+		if ($cacheData!==false) {
 			output($cacheData);
 		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$searchSQL = '';
-		switch($data){
+		switch ($data) {
 			case 'changed':
 				$searchSQL .= " and lastStatusChanged = 1 ";
 				break;
@@ -87,7 +87,7 @@ 
 			where 1=1 $searchSQL");
 		$result['status'] = 'success';
 		$result['result'] = array();
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			$result['result'][] = array(
 				'host'=>$row['ipDomain'],
 				'isBlocked'=>$row['isBlocked'],
@@ -107,11 +107,11 @@ 
 
 output();
 
-function output($data = false){
+function output($data = false) {
 	global $result;
-	if($data!==false){
+	if ($data!==false) {
 		echo(json_encode($data));
-	}else{
+	}else {
 		echo(json_encode($result));
 	}
 	exit();

apiDocumentation.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 class_exists('Setup', false) or include('classes/Setup.class.php');
 class_exists('Utilities', false) or include('classes/Utilities.class.php');
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php');
 	exit();
 }
@@ -28,7 +28,7 @@ 
 	</tr>
 	<tr>
 		<td>apiKey</td>
-		<td>Your api key: <?php echo $user['apiKey'];?></td>
+		<td>Your api key: <?php echo $user['apiKey']; ?></td>
 	</tr>
 	<tr>
 		<td>type</td>
@@ -65,7 +65,7 @@ 
 <br/>
 <pre>
 &lt;?php
-$apiKey = '<?php echo $user['apiKey'];?>';
+$apiKey = '<?php echo $user['apiKey']; ?>';
 
 $requestBody =
 	&quot;apiKey=&quot;.urlencode($apiKey).

blockLists.php

Braces +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 			update blockLists
 			set isActive = '0'
 			where md5(host) = '".$mysql->escape($host)."'");
-	}else{
+	} else{
 		$mysql->runQuery("
 			update blockLists
 			set isActive = '1'
@@ -103,7 +103,7 @@ 
 			echo('<td style="text-align: center;">');
 			if($row['isActive']==0){
 				echo('<a data-blstatus="0" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-remove" href="#"></a></td>');
-			}else{
+			} else{
 				echo('<a data-blstatus="1" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-ok" href="#"></a></td>');
 			}
 			echo('<td style="white-space: nowrap"><a target="_blank" href="'.$row['website'].'">'.$row['host'].'</a></td>');

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 class_exists('Utilities', false) or include('classes/Utilities.class.php');
 class_exists('_MySQL', false) or include('classes/_MySQL.class.php');
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php?location='.urlencode('hosts.php'));
 	exit();
 }
@@ -15,13 +15,13 @@ 
 $user = Utilities::getAccount();
 $mysql = new _MySQL();
 $mysql->connect(Setup::$connectionArray);
-if($host != ''){
-	if($toggle==0){
+if ($host!='') {
+	if ($toggle==0) {
 		$mysql->runQuery("
 			update blockLists
 			set isActive = '0'
 			where md5(host) = '".$mysql->escape($host)."'");
-	}else{
+	}else {
 		$mysql->runQuery("
 			update blockLists
 			set isActive = '1'
@@ -98,28 +98,28 @@ 
 		</thead>
 		<tbody>
 		<?php
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			echo('<tr>');
 			echo('<td style="text-align: center;">');
-			if($row['isActive']==0){
+			if ($row['isActive']==0) {
 				echo('<a data-blstatus="0" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-remove" href="#"></a></td>');
-			}else{
+			}else {
 				echo('<a data-blstatus="1" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-ok" href="#"></a></td>');
 			}
 			echo('<td style="white-space: nowrap"><a target="_blank" href="'.$row['website'].'">'.$row['host'].'</a></td>');
 			echo('<td style="white-space: nowrap">'.($row['monitorType']=='ip' ? 'IP' : 'Domain').'</td>');
 			echo('<td>'.$row['description'].'</td>');
 			echo('<td style="text-align: center;">');
-			switch($row['importance']){
+			switch ($row['importance']) {
 				case 3: echo('<span class="label label-primary">High</span>'); break;
 				case 2: echo('<span class="label label-info">Medium</span>'); break;
 				case 1: echo('<span class="label label-default">Low</span>'); break;
 			}
 			echo('</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['blocksToday'],0).'</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['cleanToday'],0).'</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['blocksYesterday'],0).'</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['cleanYesterday'],0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['blocksToday'], 0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['cleanToday'], 0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['blocksYesterday'], 0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['cleanYesterday'], 0).'</td>');
 			echo('</tr>');
 		}
 		$mysql->close();

classes/Setup.class.php

Spacing +7 added lines, -7 removed lines

@@ -9,22 +9,22 @@ 
 
 	public function __construct() {
 
-		if(self::$instance===null){
+		if (self::$instance===null) {
 
-			if(!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
+			if (!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
 			ini_set('error_reporting', E_ALL | E_STRICT | E_NOTICE);
 			$cfg = parse_ini_file('/etc/blacklistmonitor.cfg', false);
 			ini_set('display_errors', $cfg['display_errors']);
 			ini_set('error_log', $cfg['log_path']);
 
 			self::$settings = $cfg;
-			self::$settings['dns_servers'] = explode(',',$cfg['dns_servers']);
+			self::$settings['dns_servers'] = explode(',', $cfg['dns_servers']);
 
 			// clean up
-			if(Setup::$settings['rbl_txt_extended_status']=='true' ||
-			  Setup::$settings['rbl_txt_extended_status']=='1'){
+			if (Setup::$settings['rbl_txt_extended_status']=='true' ||
+			  Setup::$settings['rbl_txt_extended_status']=='1') {
 				Setup::$settings['rbl_txt_extended_status'] = true;
-			}else{
+			}else {
 				Setup::$settings['rbl_txt_extended_status'] = false;
 			}
 
@@ -44,6 +44,6 @@ 
 }
 
 Setup::$instance = new Setup();
-if(php_sapi_name()!=='cli'){
+if (php_sapi_name()!=='cli') {
 	session_start();
 }
\ No newline at end of file

Braces +4 added lines, -2 removed lines

@@ -11,7 +11,9 @@ 
 
 		if(self::$instance===null){
 
-			if(!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
+			if(!file_exists('/etc/blacklistmonitor.cfg')) {
+				echo('no config file in /etc/blacklistmonitor.cfg');
+			}
 			ini_set('error_reporting', E_ALL | E_STRICT | E_NOTICE);
 			$cfg = parse_ini_file('/etc/blacklistmonitor.cfg', false);
 			ini_set('display_errors', $cfg['display_errors']);
@@ -24,7 +26,7 @@ 
 			if(Setup::$settings['rbl_txt_extended_status']=='true' ||
 			  Setup::$settings['rbl_txt_extended_status']=='1'){
 				Setup::$settings['rbl_txt_extended_status'] = true;
-			}else{
+			} else{
 				Setup::$settings['rbl_txt_extended_status'] = false;
 			}
 

classes/Twitter.class.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 
 	public $twitter = null;
 
-	public function __construct(){
+	public function __construct() {
 			$this->settings = array(
 			'oauth_access_token' => Setup::$settings['twitter_oauth_access_token'],
 			'oauth_access_token_secret' => Setup::$settings['twitter_access_token_secret'],
@@ -19,7 +19,7 @@ 
 		$this->twitter = new TwitterAPIExchange($this->settings);
 	}
 
-	public function follow($user){
+	public function follow($user) {
 		$postfields = array(
 			'screen_name'=>$user,
 			'follow'=>'true'
@@ -29,7 +29,7 @@ 
 			->performRequest();
 	}
 
-	public function message($user, $message){
+	public function message($user, $message) {
 		$message = trim($message);
 		$postfields = array(
 			'screen_name'=>$user,