mikelynn2 / blacklistmonitor

editHostGroup.php

Spacing +9 added lines, -9 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();
 }
@@ -14,7 +14,7 @@ 
 
 $params = array_merge($_GET, $_POST);
 $id = array_key_exists('id', $params) ? (int)$params['id'] : 0;
-$groupName = array_key_exists('groupName', $params) ? substr(trim($params['groupName']),0,100) : '';
+$groupName = array_key_exists('groupName', $params) ? substr(trim($params['groupName']), 0, 100) : '';
 $domains = array_key_exists('domains', $params) ? trim(strtolower($params['domains'])) : '';
 $ips = array_key_exists('ips', $params) ? trim($params['ips']) : '';
 $deleteGroup = array_key_exists('deleteGroup', $params) ? trim($params['deleteGroup']) : '';
@@ -24,7 +24,7 @@ 
 $mysql->connect(Setup::$connectionArray);
 
 
-if($deleteGroup!=''){
+if ($deleteGroup!='') {
 	$mysql->runQuery("delete from monitorGroup where id = $id");
 	$mysql->runQuery("delete from monitors where monitorGroupId = $id");
 	echo("<script>window.location='monitorGroup.php';</script>");
@@ -34,7 +34,7 @@ 
 if (isset($_POST["submit"])) {
 
 	//TODO: make sure blacklists are domains with an ip address on them
-	if($id !== 0){
+	if ($id!==0) {
 		//update
 		$mysql->runQuery("
 			update monitorGroup set groupName = '".$mysql->escape($groupName)."',
@@ -42,7 +42,7 @@ 
 				domains = '".$mysql->escape($domains)."'
 			where id = $id
 			");
-	}else{
+	}else {
 		$mysql->runQuery("
 			insert into monitorGroup set groupName = '".$mysql->escape($groupName)."',
 				ips = '".$mysql->escape($ips)."',
@@ -62,7 +62,7 @@ 
 	'domains'=>'',
 );
 $rs = $mysql->runQuery("select * from monitorGroup where id = $id");
-while($row = mysqli_fetch_array($rs)){
+while ($row = mysqli_fetch_array($rs)) {
 	$group = $row;
 }
 
@@ -86,7 +86,7 @@ 
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="username">Group Name</label>
 		<div class="col-sm-6">
-			<input class="form-control" required="true" type="text" id="groupName" name="groupName" value="<?php echo($group['groupName']);?>" placeholder="group name">
+			<input class="form-control" required="true" type="text" id="groupName" name="groupName" value="<?php echo($group['groupName']); ?>" placeholder="group name">
 		</div>
 	</div>
 	<div class="form-group">
@@ -104,10 +104,10 @@ 
 	<div class="form-group">
 		<div class="col-sm-offset-3 col-sm-6">
 			<button type="submit" name="submit" value="submit" class="btn btn-primary">Save changes</button>
-			<?php	if($id>0) { ?>		<button type="submit" onclick="return clickDelete();" name="deleteGroup" value="deleteGroup" class="btn btn-danger">Delete Group</button><?php } ?>
+			<?php	if ($id > 0) { ?>		<button type="submit" onclick="return clickDelete();" name="deleteGroup" value="deleteGroup" class="btn btn-danger">Delete Group</button><?php } ?>
 		</div>
 	</div>
-	<input type="hidden" value="<?php echo($id);?>" name="id"/>
+	<input type="hidden" value="<?php echo($id); ?>" name="id"/>
 </form>
 
 <br/><br/><br/><br/>

api.php

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();

hosts.php

Spacing +34 added lines, -34 removed lines

@@ -9,7 +9,7 @@ 
 $monitorGroupId = array_key_exists('monitorGroupId', $_GET) ? (int)$_GET['monitorGroupId'] : 0;
 $limit = array_key_exists('l', $_GET) ? (int)$_GET['l'] : 100;
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php?location='.urlencode('hosts.php'));
 	exit();
 }
@@ -23,7 +23,7 @@ 
 $hostTypeSQL = "";
 $orderSQL = " order by ";
 $limitSQL = ($limit > 0) ? " limit $limit " : '';
-switch($oc){
+switch ($oc) {
 	case 1:
 		$searchSQL .= " and lastStatusChanged = 1 ";
 		$orderSQL .= " lastStatusChangeTime desc ";
@@ -42,9 +42,9 @@ 
 		break;
 }
 
-if($monitorGroupId != 0) $searchSQL .= " and monitorGroupId = $monitorGroupId ";
+if ($monitorGroupId!=0) $searchSQL .= " and monitorGroupId = $monitorGroupId ";
 
-switch($hostType){
+switch ($hostType) {
 	case 'domains':
 		$hostTypeSQL .= " and isDomain = 1 ";
 		break;
@@ -53,7 +53,7 @@ 
 		break;
 }
 
-if($searchS != ''){
+if ($searchS!='') {
 	$searchSQL .= " and (
 		ipDomain like '%".$mysql->escape($searchS)."%' 
 		or rDNS like '%".$mysql->escape($searchS)."%'
@@ -101,11 +101,11 @@ 
 	function drawChart() {
 	var data = google.visualization.arrayToDataTable([
 		['Hosts', 'Status'],
-		['Blocked',<?php echo($hostsCountError);?>],
-		['Clean',<?php echo($hostsCount-$hostsCountError);?>]
+		['Blocked',<?php echo($hostsCountError); ?>],
+		['Clean',<?php echo($hostsCount-$hostsCountError); ?>]
 	]);
-	data.setFormattedValue(0, 0, data.getValue(0, 0) + ' ' + (<?php echo($hostsCountError);?>));
-	data.setFormattedValue(1, 0, data.getValue(1, 0) + ' ' + (<?php echo($hostsCount-$hostsCountError);?>));
+	data.setFormattedValue(0, 0, data.getValue(0, 0) + ' ' + (<?php echo($hostsCountError); ?>));
+	data.setFormattedValue(1, 0, data.getValue(1, 0) + ' ' + (<?php echo($hostsCount-$hostsCountError); ?>));
 	var options = {
 		title: 'Current Network Status',
 		is3D: true,
@@ -125,39 +125,39 @@ 
 <div style="margin-bottom:5px;">
 	<form class="form-inline" id="reportForm" role="form">
 		<label class="radio-inline">
-			<input class="reportType" type="radio" name="oc" value="1"<?php if($oc==1) echo(' checked');?>>Last Status Changed
+			<input class="reportType" type="radio" name="oc" value="1"<?php if ($oc==1) echo(' checked'); ?>>Last Status Changed
 		</label>
 		<label class="radio-inline">
-			<input class="reportType" type="radio" name="oc" value="2"<?php if($oc==2) echo(' checked');?>>Blocked
+			<input class="reportType" type="radio" name="oc" value="2"<?php if ($oc==2) echo(' checked'); ?>>Blocked
 		</label>
 		<label class="radio-inline">
-			<input class="reportType" type="radio" name="oc" value="3"<?php if($oc==3) echo(' checked');?>>Clean
+			<input class="reportType" type="radio" name="oc" value="3"<?php if ($oc==3) echo(' checked'); ?>>Clean
 		</label>
 		<label class="radio-inline">
-			<input class="reportType" type="radio" name="oc" value="4"<?php if($oc==4) echo(' checked');?>>All
+			<input class="reportType" type="radio" name="oc" value="4"<?php if ($oc==4) echo(' checked'); ?>>All
 		</label>
 		<div class="form-group">
 			<div class="col-md-6">
 				<select id="l" name="l" class="form-control recentFilter input-sm">
-					<option value="0"<?php if($limit==0) echo(' selected');?>>all</option>
-					<option value="20"<?php if($limit==20) echo(' selected');?>>20 most recent</option>
-					<option value="100"<?php if($limit==100) echo(' selected');?>>100 most recent</option>
-					<option value="500"<?php if($limit==500) echo(' selected');?>>500 most recent</option>
+					<option value="0"<?php if ($limit==0) echo(' selected'); ?>>all</option>
+					<option value="20"<?php if ($limit==20) echo(' selected'); ?>>20 most recent</option>
+					<option value="100"<?php if ($limit==100) echo(' selected'); ?>>100 most recent</option>
+					<option value="500"<?php if ($limit==500) echo(' selected'); ?>>500 most recent</option>
 				</select>
 			</div>
 		</div>
 		<div class="form-group">
 			<div class="col-md-6">
 				<select id="ht" name="ht" class="form-control hostType input-sm">
-					<option value="all"<?php if($hostType=='all') echo(' selected');?>>all</option>
-					<option value="ips"<?php if($hostType=='ips') echo(' selected');?>>ips</option>
-					<option value="domain"<?php if($hostType=='domains') echo(' selected');?>>domains</option>
+					<option value="all"<?php if ($hostType=='all') echo(' selected'); ?>>all</option>
+					<option value="ips"<?php if ($hostType=='ips') echo(' selected'); ?>>ips</option>
+					<option value="domain"<?php if ($hostType=='domains') echo(' selected'); ?>>domains</option>
 				</select>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="sr-only" for="searchS">Search</label>
-			<input type="text" class="form-control input-sm" id="searchS" name="searchS" placeholder="search" value="<?php echo($searchS);?>">
+			<input type="text" class="form-control input-sm" id="searchS" name="searchS" placeholder="search" value="<?php echo($searchS); ?>">
 		</div>
 		<button type="submit" class="btn btn-default">Go</button>
 		<input type="hidden" name="monitorGroupId" value="<?php echo($monitorGroupId); ?>">
@@ -178,37 +178,37 @@ 
 		</thead>
 		<tbody>
 		<?php
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			echo('<tr>');
 			echo('<td><a href="hostHistory.php?host='.urlencode($row['ipDomain']).'">'.$row['ipDomain'].'</a></td>');
 			echo('<td><a href="editHostGroup.php?id='.$row['id'].'">'.$row['groupName'].'</a></td>');
-			if('0000-00-00 00:00:00'==$row['lastUpdate']){
+			if ('0000-00-00 00:00:00'==$row['lastUpdate']) {
 				echo('<td style="white-space: nowrap">'.Utilities::$hostNotCheckedMessage.'</td>');
 				echo('<td style="white-space: nowrap">'.Utilities::$hostNotCheckedMessage.'</td>');
 				echo('<td style="white-space: nowrap">'.Utilities::$hostNotCheckedMessage.'</td>');
 				echo('<td style="white-space: nowrap">'.Utilities::$hostNotCheckedMessage.'</td>');
-			}else{
+			}else {
 				echo('<td style="white-space: nowrap">');
-				echo(date("Y-n-j g:i a",strtotime($row['lastUpdate'])));
+				echo(date("Y-n-j g:i a", strtotime($row['lastUpdate'])));
 				echo('</td>');
-				if('0000-00-00 00:00:00'==$row['lastStatusChangeTime']){
+				if ('0000-00-00 00:00:00'==$row['lastStatusChangeTime']) {
 					echo('<td style="white-space: nowrap">n/a</td>');
-				}else{
+				}else {
 					echo('<td style="white-space: nowrap">');
-					echo(date("Y-n-j g:i a",strtotime($row['lastStatusChangeTime'])));
+					echo(date("Y-n-j g:i a", strtotime($row['lastStatusChangeTime'])));
 					echo('</td>');
 				}
 				echo('<td>'.$row['rDNS'].'</td>');
 				echo('<td>');
-				if($row['isBlocked']==1){
+				if ($row['isBlocked']==1) {
 					$s = unserialize($row['status']);
-					foreach($s as $r){
-						if($r[1] == false || $r[1] == ''){
-						}else{
-							echo htmlentities($r[0]) . " - " . htmlentities($r[1])."<br>\n";
+					foreach ($s as $r) {
+						if ($r[1]==false || $r[1]=='') {
+						}else {
+							echo htmlentities($r[0])." - ".htmlentities($r[1])."<br>\n";
 						}
 					}
-				}else{
+				}else {
 					echo('OK');
 				}
 				echo('</td>');

monitorGroup.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
 
 $groupName = array_key_exists('searchS', $_GET) ? trim($_GET['searchS']) : '';
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php?location='.urlencode('monitorGroup.php'));
 	exit();
 }
@@ -57,13 +57,13 @@ 
 		</thead>
 		<tbody>
 		<?php
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			echo('<tr>');
 			echo('<td><a href="hosts.php?monitorGroupId='.$row['id'].'"><div class="glyphicon glyphicon-stats glyphicon-stats-lg"></div></a> &nbsp; <a href="editHostGroup.php?id='.urlencode($row['id']).'">'.$row['groupName'].'</a></td>');
-			echo('<td>'.number_format($row['hostCount'],0).'</td>');
-			echo('<td>'.number_format($row['hostCountError'],0).'</td>');
-			echo('<td>'.number_format($row['hostRecentBlock'],0).'</td>');
-			echo('<td>'.number_format((($row['hostCount']>0) ? ($row['hostCountError']/$row['hostCount']*100) : 0),1).'</td>');
+			echo('<td>'.number_format($row['hostCount'], 0).'</td>');
+			echo('<td>'.number_format($row['hostCountError'], 0).'</td>');
+			echo('<td>'.number_format($row['hostRecentBlock'], 0).'</td>');
+			echo('<td>'.number_format((($row['hostCount'] > 0) ? ($row['hostCountError']/$row['hostCount']*100) : 0), 1).'</td>');
 			echo('</tr>');
 		}
 		$mysql->close();

classes/Utilities.class.php

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);

classes/_MySQL.class.php

Braces +6 added lines, -2 removed lines

@@ -62,14 +62,18 @@
 			) {
 			$this->affectedRows = mysqli_affected_rows($this->mysqlCon);
 		}
-		if (stripos($query, 'INSERT')!==false) $this->identity = mysqli_insert_id($this->mysqlCon);
+		if (stripos($query, 'INSERT')!==false) {
+			$this->identity = mysqli_insert_id($this->mysqlCon);
+		}
 		return $result;
 	}
 
 	public function runQueryReturnVar($query) {
 		$result = false;
 		$rs = $this->runQuery($query." limit 1;");
-		while ($row = mysqli_fetch_array($rs)) $result = $row[0];
+		while ($row = mysqli_fetch_array($rs)) {
+			$result = $row[0];
+		}
 		mysqli_free_result($rs);
 		return $result;
 	}

service/userJob.php

Spacing +23 added lines, -23 removed lines

@@ -4,7 +4,7 @@ 
 ini_set('memory_limit', '1024M');
 
 //prevent non cli access
-if(php_sapi_name()!=='cli') exit();
+if (php_sapi_name()!=='cli') exit();
 
 $dir = dirname(dirname(__FILE__));
 class_exists('Setup', false) or include($dir.'/classes/Setup.class.php');
@@ -19,7 +19,7 @@ 
 $options = getopt("i:");
 $parentProcessId = isset($options['i']) ? (int)$options['i'] : 0;
 
-if($parentProcessId == 0){
+if ($parentProcessId==0) {
 	_Logging::appLog("userJob called without all params");
 	exit();
 }
@@ -37,7 +37,7 @@ 
 // get the accounts blacklists
 Utilities::setBlockLists();
 
-if( (empty(Utilities::$domainBlacklists)===true) && (empty(Utilities::$ipBlacklists)===true) ){
+if ((empty(Utilities::$domainBlacklists)===true) && (empty(Utilities::$ipBlacklists)===true)) {
 	_Logging::appLog("no blacklists configured");
 	// mark this one as ran
 	$mysql->runQuery("update users set beenChecked = 1, lastChecked = '".date('Y-m-d H:i:s')."'");
@@ -46,7 +46,7 @@ 
 
 //anything to monitor?
 $monitorCount = Utilities::getHostCount($mysql);
-if($monitorCount==0){
+if ($monitorCount==0) {
 	_Logging::appLog("nothing to monitor");
 	exit();
 }
@@ -55,15 +55,15 @@ 
 $mysql->runQuery("update monitors set beenChecked = 0");
 
 // wait for results
-while(true){
-	if(!Utilities::is_process_running($parentProcessId)){
+while (true) {
+	if (!Utilities::is_process_running($parentProcessId)) {
 		_Logging::appLog("parent died - userJob exited");
 		exit();
 	}
 	$rs = $mysql->runQuery("select ipDomain from monitors where beenChecked = 0 limit 1;");
-	if($row = mysqli_fetch_array($rs)){
-		sleep(4);//wait 4 seconds for them to finish
-	}else{
+	if ($row = mysqli_fetch_array($rs)) {
+		sleep(4); //wait 4 seconds for them to finish
+	}else {
 		break;
 	}
 }
@@ -82,7 +82,7 @@ 
 $newCleanHosts = Utilities::getHostCleanCount($mysql, 0, true);
 
 
-if($hostsChanged > 0 && $user['disableEmailNotices']==0){
+if ($hostsChanged > 0 && $user['disableEmailNotices']==0) {
 	$table = "";
 	$summary = "";
 	$summaryText = "";
@@ -100,13 +100,13 @@ 
 
 	$summary .= "<br><div><a href='$url/m.php'>Monitor Groups</a></div><br>";
 
-	if( (isset(Setup::$settings['email_report_detailed_host_changes']))
-		&& (Setup::$settings['email_report_detailed_host_changes']==true) ){
+	if ((isset(Setup::$settings['email_report_detailed_host_changes']))
+		&& (Setup::$settings['email_report_detailed_host_changes']==true)) {
 			$table .= '<hr>';
 			$table .= '<strong>New Blocks</strong><br>';
 			$rs = $mysql->runQuery("select m.ipDomain, mg.groupName FROM monitors m inner join monitorGroup mg on mg.id = m.monitorGroupId where m.isBlocked = 1 and m.lastStatusChanged = 1 order by m.isDomain desc, m.ipDomain");
 			$table .= '<table width="100%">';
-			while($row = mysqli_fetch_array($rs)){
+			while ($row = mysqli_fetch_array($rs)) {
 				$table .= '<tr>';
 				$table .= '<td><a href="'.$url.'"/hostHistory.php?host='.urlencode($row['ipDomain']).'">'.$row['ipDomain'].'</a></td><td>'.$row['groupName'].'</td>';
 				$table .= '</tr>';
@@ -117,7 +117,7 @@ 
 			$table .= '<strong>New Clean</strong><br>';
 			$rs = $mysql->runQuery("select m.ipDomain, mg.groupName FROM monitors m inner join monitorGroup mg on mg.id = m.monitorGroupId where m.isBlocked = 0 and m.lastStatusChanged = 1 order by m.isDomain desc, m.ipDomain");
 			$table .= '<table width="100%">';
-			while($row = mysqli_fetch_array($rs)){
+			while ($row = mysqli_fetch_array($rs)) {
 				$table .= '<tr>';
 				$table .= '<td><a href="'.$url.'"/hostHistory.php?host='.urlencode($row['ipDomain']).'">'.$row['ipDomain'].'</a></td><td>'.$row['groupName'].'</td>';
 				$table .= '</tr>';
@@ -133,16 +133,16 @@ 
 	$summaryText .= "New Blocked: ".number_format($newErrorHosts)."\n";
 	$summaryText .= "New Clean: ".number_format($newCleanHosts)."\n";
 
-	$e = explode("\n",$user['noticeEmailAddresses']);
-	if( (count($e) > 0) && (Setup::$settings['smtp_server']!='') ){
+	$e = explode("\n", $user['noticeEmailAddresses']);
+	if ((count($e) > 0) && (Setup::$settings['smtp_server']!='')) {
 		// regular email
 		$mail = new PHPMailer();
 		$mail->IsSMTP();
 		$mail->Host = Setup::$settings['smtp_server'];
 		$mail->From = Setup::$settings['from_email'];
 		$mail->FromName = Setup::$settings['from_name'];
-		foreach($e as $a){
-			if(trim($a)!=''){
+		foreach ($e as $a) {
+			if (trim($a)!='') {
 				$mail->AddAddress($a);
 			}
 		}
@@ -153,15 +153,15 @@ 
 	}
 	
 	// text message
-	$e = explode("\n",$user['textMessageEmails']);
-	if( (count($e) > 0) && (Setup::$settings['smtp_server']!='') ){
+	$e = explode("\n", $user['textMessageEmails']);
+	if ((count($e) > 0) && (Setup::$settings['smtp_server']!='')) {
 		$mail = new PHPMailer();
 		$mail->IsSMTP();
 		$mail->Host = Setup::$settings['smtp_server'];
 		$mail->From = Setup::$settings['from_email'];
 		$mail->FromName = Setup::$settings['from_name'];
-		foreach($e as $a){
-			if(trim($a)!=''){
+		foreach ($e as $a) {
+			if (trim($a)!='') {
 				$mail->AddAddress($a);
 			}
 		}
@@ -171,7 +171,7 @@ 
 		$mail->Send();
 	}
 	
-	if($user['twitterHandle']!=''){
+	if ($user['twitterHandle']!='') {
 		$t = new Twitter();
 		$t->message($user['twitterHandle'], $summaryText);
 	}

service/monitorJob.php

Spacing +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
 ini_set('memory_limit', '64M');
 
 //prevent non cli access
-if(php_sapi_name()!=='cli') exit();
+if (php_sapi_name()!=='cli') exit();
 
 $dir = dirname(dirname(__FILE__));
 class_exists('Setup', false) or include($dir.'/classes/Setup.class.php');
@@ -16,7 +16,7 @@ 
 $options = getopt("h:");
 $options['h'] = isset($options['h']) ? trim($options['h']) : '';
 
-if($options['h'] == ''){
+if ($options['h']=='') {
 	_Logging::appLog("monitorJob called without params");
 	exit();
 }
@@ -28,14 +28,14 @@ 
 	select *
 	from monitors
 	where ipDomain = '".$mysql->escape($options['h'])."'");
-while($row = mysqli_fetch_array($rs)) {
+while ($row = mysqli_fetch_array($rs)) {
 	$monitor = $row;
 }
 
 // get blacklists
 Utilities::setBlockLists();
 
-if( (empty(Utilities::$domainBlacklists)===true) && (empty(Utilities::$ipBlacklists)===true) ){
+if ((empty(Utilities::$domainBlacklists)===true) && (empty(Utilities::$ipBlacklists)===true)) {
 	_Logging::appLog("no blacklists configured");
 	exit();
 }
@@ -59,7 +59,7 @@ 
 
 
 // status change on this host
-if(strcasecmp($result, $monitor['status']) != 0){
+if (strcasecmp($result, $monitor['status'])!=0) {
 	//update current status
 	$mysql->runQuery("
 		update monitors
@@ -82,7 +82,7 @@ 
 
 	//make api callback
 	$user = Utilities::getAccount();
-	if($user['apiCallbackURL']!=''){
+	if ($user['apiCallbackURL']!='') {
 		Utilities::makeAPICallback($user['apiCallbackURL'],
 			$monitor['ipDomain'],
 			$isBlocked,

blockLists.php

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();