mikelynn2 / blacklistmonitor

service/blacklistmonitor.php

Spacing +18 added lines, -18 removed lines

@@ -2,7 +2,7 @@ 
 <?php
 
 //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');
@@ -29,10 +29,10 @@ 
 }
 
 
-function main(){
+function main() {
 	// start process watch
 	$parentProcessId = getmypid();
-	if($parentProcessId == false || $parentProcessId == 0) {
+	if ($parentProcessId==false || $parentProcessId==0) {
 		_Logging::appLog("Parent process couldnt get pid");
 	}
 
@@ -43,11 +43,11 @@ 
 
 	// control
 	while (true) {
-		try{
+		try {
 			$mysql->connect(Setup::$connectionArray);
-			if(!Utilities::is_process_running($userProcessId)){
+			if (!Utilities::is_process_running($userProcessId)) {
 				$userCheck = $mysql->runQueryReturnVar("select username from users where beenChecked = 0");
-				if($userCheck!==false){
+				if ($userCheck!==false) {
 					$cmd = 'php '.dirname(__FILE__).'/userJob.php -i '.$parentProcessId;
 					$userProcessId = Utilities::run_in_background($cmd);
 				}
@@ -55,16 +55,16 @@ 
 		} catch (Exception $e) {
 			_Logging::appLog($e->getMessage());
 		}
-		if(!Utilities::is_process_running($monitorProcessesId)){
+		if (!Utilities::is_process_running($monitorProcessesId)) {
 			$cmd = 'php '.dirname(__FILE__).'/blacklistmonitor.php -p monitorProcessWatch -i '.$parentProcessId;
 			$monitorProcessesId = Utilities::run_in_background($cmd);
 		}
-		sleep(15);//15 seconds
+		sleep(15); //15 seconds
 	}
 
 }
 
-function monitorProcessWatch($parentProcessId){
+function monitorProcessWatch($parentProcessId) {
 
 	$m = new _MeasurePerformance();
 	$mysql = new _MySQL();
@@ -79,14 +79,14 @@ 
 
 	while (true) {
 		// are we still running?
-		if(!Utilities::is_process_running($parentProcessId)){
+		if (!Utilities::is_process_running($parentProcessId)) {
 				_Logging::appLog("Parent Stopped - monitorStartWatch exited");
 				exit();
 		}
 
 		$processCountMonitors = count($monitorProcesses);
 
-		if ($processCountMonitors < $parallelProcessesMonitors){
+		if ($processCountMonitors < $parallelProcessesMonitors) {
 				$ipDomain = Utilities::getNextMonitor($mysql);
 				if ($ipDomain!==false) {
 						// start it
@@ -98,16 +98,16 @@ 
 		}
 
 		// was there any work?
-		if($ipDomain===false){
-				sleep(10);//10 seconds
-		}else{
-				usleep(10000);//ideal time 10ms
+		if ($ipDomain===false) {
+				sleep(10); //10 seconds
+		}else {
+				usleep(10000); //ideal time 10ms
 		}
 
 		// delete finished processes
 		for ($x = 0; $x < $processCountMonitors; $x++) {
-				if(isset($monitorProcesses[$x])){
-						if(!Utilities::is_process_running($monitorProcesses[$x])){
+				if (isset($monitorProcesses[$x])) {
+						if (!Utilities::is_process_running($monitorProcesses[$x])) {
 								unset($monitorProcesses[$x]);
 						}
 				}
@@ -119,7 +119,7 @@ 
 		$processCountMonitors = count($monitorProcesses);
 
 		//randomly reset counter every now and then
-		if(mt_rand(1,2000)==1){
+		if (mt_rand(1, 2000)==1) {
 			$m->endWork();
 			_Logging::appLog("App Avg Hosts/sec: {$m->avgPerformance}\tMonitor Threads: $processCountMonitors/$parallelProcessesMonitors");
 			$m = new _MeasurePerformance();

Braces +4 added lines, -2 removed lines

@@ -2,7 +2,9 @@ 
 <?php
 
 //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');
@@ -100,7 +102,7 @@ 
 		// was there any work?
 		if($ipDomain===false){
 				sleep(10);//10 seconds
-		}else{
+		} else{
 				usleep(10000);//ideal time 10ms
 		}
 

service/cron.php

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 set_time_limit(0);
 
 //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');
@@ -17,32 +17,32 @@ 
 $mysql = new _MySQL();
 $mysql->connect(Setup::$connectionArray);
 
-if($options['r']=='blockListStats'){
+if ($options['r']=='blockListStats') {
 	$mysql->runQuery("update blockLists set blocksYesterday = blocksToday, cleanYesterday = cleanToday; ");
 	$mysql->runQuery("update blockLists set blocksToday = 0, cleanToday = 0; ");
 	_Logging::appLog("block list stats updated");
 }
-if($options['r']=='weekly'){
+if ($options['r']=='weekly') {
 	$mysql->runQuery("update users set beenChecked = 0 where checkFrequency = 'weekly';");
 	_Logging::appLog("weekly reset");
 }
-if($options['r']=='daily'){
+if ($options['r']=='daily') {
 	$mysql->runQuery("update users set beenChecked = 0 where checkFrequency = 'daily';");
 	_Logging::appLog("daily reset");
 }
-if($options['r']=='8hour'){
+if ($options['r']=='8hour') {
 	$mysql->runQuery("update users set beenChecked = 0 where checkFrequency = '8hour';");
 	_Logging::appLog("8 hour reset");
 }
-if($options['r']=='2hour'){
+if ($options['r']=='2hour') {
 	$mysql->runQuery("update users set beenChecked = 0 where checkFrequency = '2hour';");
 	_Logging::appLog("2 hour reset");
 }
-if($options['r']=='1hour'){
+if ($options['r']=='1hour') {
 	$mysql->runQuery("update users set beenChecked = 0 where checkFrequency = '1hour';");
 	_Logging::appLog("1 hour reset");
 }
-if($options['r']=='deleteOld'){
+if ($options['r']=='deleteOld') {
 	//clear orphan status
 	$mysql->runQuery("
 		delete mh
@@ -53,7 +53,7 @@ 
 
 	$days = isset(Setup::$settings['history_keep_days']) ? (int)Setup::$settings['history_keep_days'] : 0;
 
-	if($days > 0){
+	if ($days > 0) {
 		$mysql->runQuery("
 			delete from monitorHistory
 			where monitorTime <= DATE_SUB(NOW(), INTERVAL $days day)

Braces +3 added lines, -1 removed lines

@@ -3,7 +3,9 @@
 set_time_limit(0);
 
 //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');

service/monitorJob.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
 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');

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,

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

Braces +4 added lines, -2 removed lines

@@ -4,7 +4,9 @@ 
 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');
@@ -63,7 +65,7 @@ 
 	$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{
+	} else{
 		break;
 	}
 }

header.inc.php

Spacing +6 added lines, -6 removed lines

@@ -4,7 +4,7 @@ 
 <html lang="en">
 	<head>
 	<meta charset="utf-8">
-	<title><?php if(isset($titlePreFix)) echo("$titlePreFix | ");?>Open Source Blacklist Monitoring</title>
+	<title><?php if (isset($titlePreFix)) echo("$titlePreFix | "); ?>Open Source Blacklist Monitoring</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 	<script type="text/javascript" src="//www.google.com/jsapi"></script>
@@ -22,16 +22,16 @@ 
 	<div class="container">
 		<div class="header">
 			<ul class="nav nav-pills pull-right">
-			<?php $pageName = basename($_SERVER['PHP_SELF']);?>
+			<?php $pageName = basename($_SERVER['PHP_SELF']); ?>
 			<?php
-			if(Utilities::isLoggedIn()!==false){
+			if (Utilities::isLoggedIn()!==false) {
 			?>
-				<li <?php if(in_array($pageName,array('account.php','hosts.php','blockLists.php','apiDocumentation.php','hostHistory.php'))) echo('class="active"');?>><a href="account.php">Profile</a></li>
+				<li <?php if (in_array($pageName, array('account.php', 'hosts.php', 'blockLists.php', 'apiDocumentation.php', 'hostHistory.php'))) echo('class="active"'); ?>><a href="account.php">Profile</a></li>
 				<li><a href="login.php?logout=1">Logout</a></li>
 			<?php
-			}else{
+			}else {
 			?>
-				<li <?php if($pageName=='login.php' || $pageName=='index.php' ) echo('class="active"');?>><a href="login.php">Login</a><li>
+				<li <?php if ($pageName=='login.php' || $pageName=='index.php') echo('class="active"'); ?>><a href="login.php">Login</a><li>
 			<?php
 			}
 			?>

Braces +13 added lines, -4 removed lines

@@ -4,7 +4,10 @@ 
 <html lang="en">
 	<head>
 	<meta charset="utf-8">
-	<title><?php if(isset($titlePreFix)) echo("$titlePreFix | ");?>Open Source Blacklist Monitoring</title>
+	<title><?php if(isset($titlePreFix)) {
+	echo("$titlePreFix | ");
+}
+?>Open Source Blacklist Monitoring</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 	<script type="text/javascript" src="//www.google.com/jsapi"></script>
@@ -26,12 +29,18 @@ 
 			<?php
 			if(Utilities::isLoggedIn()!==false){
 			?>
-				<li <?php if(in_array($pageName,array('account.php','hosts.php','blockLists.php','apiDocumentation.php','hostHistory.php'))) echo('class="active"');?>><a href="account.php">Profile</a></li>
+				<li <?php if(in_array($pageName,array('account.php','hosts.php','blockLists.php','apiDocumentation.php','hostHistory.php'))) {
+	echo('class="active"');
+}
+?>><a href="account.php">Profile</a></li>
 				<li><a href="login.php?logout=1">Logout</a></li>
 			<?php
-			}else{
+			} else{
 			?>
-				<li <?php if($pageName=='login.php' || $pageName=='index.php' ) echo('class="active"');?>><a href="login.php">Login</a><li>
+				<li <?php if($pageName=='login.php' || $pageName=='index.php' ) {
+	echo('class="active"');
+}
+?>><a href="login.php">Login</a><li>
 			<?php
 			}
 			?>

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="editHostGroup.php?id='.$row['id'].'"><div class="glyphicon glyphicon-pencil glyphicon-pencil-lg"></div></a> &nbsp; <a href="hosts.php?monitorGroupId='.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();