Service Watchdog package code style

5 files changed, 121 insertions, 88 deletions

diff --git a/config/servicewatchdog/services_servicewatchdog.php b/config/servicewatchdog/services_servicewatchdog.php
index bd4d4442..6c91b98e 100644
--- a/config/servicewatchdog/services_servicewatchdog.php
+++ b/config/servicewatchdog/services_servicewatchdog.php
@@ -41,14 +41,16 @@ require_once("functions.inc");
 require_once("service-utils.inc");
 require_once("servicewatchdog.inc");
 
-if (!is_array($config['installedpackages']['servicewatchdog']['item']))
+if (!is_array($config['installedpackages']['servicewatchdog']['item'])) {
 	$config['installedpackages']['servicewatchdog']['item'] = array();
+}
 
 $a_pwservices = &$config['installedpackages']['servicewatchdog']['item'];
 
 /* if a custom message has been passed along, lets process it */
-if ($_GET['savemsg'])
+if ($_GET['savemsg']) {
 	$savemsg = $_GET['savemsg'];
+}
 
 if ($_GET['act'] == "del") {
 	if ($a_pwservices[$_GET['id']]) {
@@ -65,13 +67,15 @@ if (isset($_POST['Update'])) {
 	if (is_array($_POST['notifies']) && count($_POST['notifies'])) {
 		/* Check each service and set the notify flag only for those chosen, remove those that are unset. */
 		foreach ($a_pwservices as $idx => $thisservice) {
-			if (!is_array($thisservice))
+			if (!is_array($thisservice)) {
 				continue;
+			}
 			if (in_array($idx, $_POST['notifies'])) {
 				$a_pwservices[$idx]['notify'] = true;
 			} else {
-				if (isset($a_pwservices[$idx]['notify']))
+				if (isset($a_pwservices[$idx]['notify'])) {
 					unset($a_pwservices[$idx]['notify']);
+				}
 			}
 		}
 	} else { /* No notifies selected, remove them all. */
@@ -111,26 +115,31 @@ if (isset($_POST['del_x'])) {
 
 		/* copy all services < $movebtn and not selected */
 		for ($i = 0; $i < $movebtn; $i++) {
-			if (!in_array($i, $_POST['pwservices']))
+			if (!in_array($i, $_POST['pwservices'])) {
 				$a_pwservices_new[] = $a_pwservices[$i];
+			}
 		}
 
 		/* copy all selected services */
 		for ($i = 0; $i < count($a_pwservices); $i++) {
-			if ($i == $movebtn)
+			if ($i == $movebtn) {
 				continue;
-			if (in_array($i, $_POST['pwservices']))
+			}
+			if (in_array($i, $_POST['pwservices'])) {
 				$a_pwservices_new[] = $a_pwservices[$i];
+			}
 		}
 
 		/* copy $movebtn service */
-		if ($movebtn < count($a_pwservices))
+		if ($movebtn < count($a_pwservices)) {
 			$a_pwservices_new[] = $a_pwservices[$movebtn];
+		}
 
 		/* copy all services > $movebtn and not selected */
 		for ($i = $movebtn+1; $i < count($a_pwservices); $i++) {
-			if (!in_array($i, $_POST['pwservices']))
+			if (!in_array($i, $_POST['pwservices'])) {
 				$a_pwservices_new[] = $a_pwservices[$i];
+			}
 		}
 		$a_pwservices = $a_pwservices_new;
 		servicewatchdog_cron_job();
@@ -141,7 +150,7 @@ if (isset($_POST['del_x'])) {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("Service Watchdog"));
+$pgtitle = array(gettext("Services"), gettext("Service Watchdog"));
 include("head.inc");
 
 ?>
@@ -160,83 +169,99 @@ include("head.inc");
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="services to monitor">
 <tr><td><div id="mainarea">
 <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
-<tr><td colspan="8" align="center">
-<?php echo gettext("This page allows you to select services to be monitored so that they may be automatically restarted if they crash or are stopped."); ?>
-<br/><br/>
-</td></tr>
-<tr id="frheader">
-<td width="5%" class="list">&nbsp;</td>
-<td width="5%" class="listhdrr">Notify</td>
-<td width="30%" class="listhdrr"><?=gettext("Service Name");?></td>
-<td width="60%" class="listhdrr"><?=gettext("Description");?></td>
-<td width="5%" class="list">
-<table border="0" cellspacing="0" cellpadding="1" summary="buttons">
-	<tr><td width="17">
-	<?php if (count($a_pwservices) == 0): ?>
-		<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected services");?>" border="0" alt="delete" />
-	<?php else: ?>
-		<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected services"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected services?");?>')" />
-	<?php endif; ?>
-	</td>
-	<td><a href="services_servicewatchdog_add.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new service"); ?>" alt="add" /></a></td>
+	<tr>
+		<td colspan="8" align="center">
+			<?php echo gettext("This page allows you to select services to be monitored so that they may be automatically restarted if they crash or are stopped."); ?>
+			<br/><br/>
+		</td>
+	</tr>
+	<tr id="frheader">
+		<td width="5%" class="list">&nbsp;</td>
+		<td width="5%" class="listhdrr">Notify</td>
+		<td width="30%" class="listhdrr"><?=gettext("Service Name");?></td>
+		<td width="60%" class="listhdrr"><?=gettext("Description");?></td>
+		<td width="5%" class="list">
+			<table border="0" cellspacing="0" cellpadding="1" summary="buttons">
+				<tr>
+					<td width="17">
+					<?php if (count($a_pwservices) == 0): ?>
+						<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected services");?>" border="0" alt="delete" />
+					<?php else: ?>
+						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected services"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected services?");?>')" />
+					<?php endif; ?>
+					</td>
+					<td><a href="services_servicewatchdog_add.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new service"); ?>" alt="add" /></a></td>
+				</tr>
+			</table>
+		</td>
 	</tr>
-</table>
-</td>
-</tr>
 
 <?php
 $nservices = $i = 0;
 foreach ($a_pwservices as $thisservice):
 ?>
 	<tr valign="top" id="fr<?=$nservices;?>">
-	<td class="listt"><input type="checkbox" id="frc<?=$nservices;?>" name="pwservices[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nservices;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;" /></td>
-	<td class="listlr"><input type="checkbox" id="notify<?=$nservices;?>" name="notifies[]" value="<?=$i;?>" style="margin: 0; padding: 0; width: 15px; height: 15px;" <?PHP if (isset($thisservice['notify'])) echo 'checked="CHECKED"';?>/></td>
-	<td class="listr" onclick="fr_toggle(<?=$nservices;?>)" id="frd<?=$nservices;?>" ondblclick="document.location='services_servicewatchdog_add.php?id=<?=$nservices;?>';">
-		<?=$thisservice['name'];?>
-	</td>
-	<td class="listr" onclick="fr_toggle(<?=$nservices;?>)" id="frd<?=$nservices;?>" ondblclick="document.location='services_servicewatchdog_add.php?id=<?=$nservices;?>';">
-		<?=$thisservice['description'];?>
-	</td>
-	<td valign="middle" class="list" nowrap>
-		<table border="0" cellspacing="0" cellpadding="1" summary="add">
-		<tr>
-		<td><input onmouseover="fr_insline(<?=$nservices;?>, true)" onmouseout="fr_insline(<?=$nservices;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected services before this service");?>" height="17" type="image" width="17" border="0" /></td>
-		<td align="center" valign="middle"><a href="services_servicewatchdog.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this service?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete service");?>" alt="delete" /></a></td>
-		</tr>
-		</table>
-	</td></tr>
-<?php $i++; $nservices++; endforeach; ?>
-	<tr>
-	<td class="list" colspan="4"></td>
-	<td class="list" valign="middle" nowrap>
-	<table border="0" cellspacing="0" cellpadding="1" summary="add">
+		<td class="listt"><input type="checkbox" id="frc<?=$nservices;?>" name="pwservices[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nservices;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;" /></td>
+		<td class="listlr"><input type="checkbox" id="notify<?=$nservices;?>" name="notifies[]" value="<?=$i;?>" style="margin: 0; padding: 0; width: 15px; height: 15px;" <?PHP if (isset($thisservice['notify'])) echo 'checked="CHECKED"';?>/></td>
+		<td class="listr" onclick="fr_toggle(<?=$nservices;?>)" id="frd<?=$nservices;?>" ondblclick="document.location='services_servicewatchdog_add.php?id=<?=$nservices;?>';">
+			<?=$thisservice['name'];?>
+		</td>
+		<td class="listr" onclick="fr_toggle(<?=$nservices;?>)" id="frd<?=$nservices;?>" ondblclick="document.location='services_servicewatchdog_add.php?id=<?=$nservices;?>';">
+			<?=$thisservice['description'];?>
+		</td>
+		<td valign="middle" class="list" nowrap>
+			<table border="0" cellspacing="0" cellpadding="1" summary="add">
+				<tr>
+					<td><input onmouseover="fr_insline(<?=$nservices;?>, true)" onmouseout="fr_insline(<?=$nservices;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected services before this service");?>" height="17" type="image" width="17" border="0" /></td>
+					<td align="center" valign="middle"><a href="services_servicewatchdog.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this service?");?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete service");?>" alt="delete" /></a></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+<?php
+	$i++;
+	$nservices++;
+endforeach;
+?>
 	<tr>
-	<td><?php if ($nservices == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected services to end"); ?>" border="0" alt="move" /><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected services to end");?>" border="0" alt="move" /><?php endif; ?></td>
+		<td class="list" colspan="4"></td>
+		<td class="list" valign="middle" nowrap>
+			<table border="0" cellspacing="0" cellpadding="1" summary="add">
+				<tr>
+					<td><?php if ($nservices == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected services to end"); ?>" border="0" alt="move" /><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected services to end");?>" border="0" alt="move" /><?php endif; ?></td>
+				</tr>
+				<tr>
+					<td width="17">
+					<?php if (count($a_pwservices) == 0): ?>
+						<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected services");?>" border="0" alt="delete" />
+					<?php else: ?>
+						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected services"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected services?");?>')" />
+					<?php endif; ?>
+					</td>
+					<td><a href="services_servicewatchdog_add.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new service"); ?>" alt="add" /></a></td>
+				</tr>
+			</table>
+		</td>
 	</tr>
 	<tr>
-	<td width="17">
-	<?php if (count($a_pwservices) == 0): ?>
-		<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected services");?>" border="0" alt="delete" />
-	<?php else: ?>
-		<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected services"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected services?");?>')" />
-	<?php endif; ?>
-	</td>
-	<td><a href="services_servicewatchdog_add.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new service"); ?>" alt="add" /></a></td>
+		<td></td>
+		<td colspan="4">
+			<?php echo gettext("Check Notify next to services to perform an e-mail notification when the service is restarted. Configure e-mail notifications to receive the alerts."); ?>
+			<br/>
+			<input name="Update" type="submit" class="formbtn" value="<?=gettext("Update Notification Settings"); ?>" />
+			<br/>
+			<br/>
+		</td>
+		<td></td>
 	</tr>
-	</table>
-	</td>
+	<tr>
+		<td></td>
+		<td colspan="4">
+			<?php echo gettext("Click to select a service and use the arrows to re-order them in the list. Higher services are checked first."); ?>
+		</td>
+		<td></td>
 	</tr>
-	<tr><td></td><td colspan="4">
-	<?php echo gettext("Check Notify next to services to perform an e-mail notification when the service is restarted. Configure e-mail notifications to receive the alerts."); ?>
-	<br/>
-	<input name="Update" type="submit" class="formbtn" value="<?=gettext("Update Notification Settings"); ?>" />
-	<br/>
-	<br/>
-	</td><td></td></tr>
-	<tr><td></td><td colspan="4">
-	<?php echo gettext("Click to select a service and use the arrows to re-order them in the list. Higher services are checked first."); ?>
-	</td><td></td></tr>
-	</table>
+</table>
 </div></td></tr>
 </table>
 </form>
diff --git a/config/servicewatchdog/services_servicewatchdog_add.php b/config/servicewatchdog/services_servicewatchdog_add.php
index 11e5e284..8773a367 100644
--- a/config/servicewatchdog/services_servicewatchdog_add.php
+++ b/config/servicewatchdog/services_servicewatchdog_add.php
@@ -55,7 +55,7 @@ unset($input_errors);
 
 if ($_POST) {
 	if (!is_numeric($_POST['svcid']))
-		
+
 
 	if (!isset($system_services[$_POST['svcid']])) {
 		$input_errors[] = gettext("The supplied service appears to be invalid.");
@@ -72,7 +72,7 @@ if ($_POST) {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"),gettext("servicewatchdog"), gettext("Add"));
+$pgtitle = array(gettext("Services"), gettext("servicewatchdog"), gettext("Add"));
 include("head.inc");
 
 ?>
diff --git a/config/servicewatchdog/servicewatchdog.inc b/config/servicewatchdog/servicewatchdog.inc
index 5b638836..817b92e0 100644
--- a/config/servicewatchdog/servicewatchdog.inc
+++ b/config/servicewatchdog/servicewatchdog.inc
@@ -7,23 +7,27 @@ require_once("notices.inc");
 
 function servicewatchdog_service_matches($svc1, $svc2) {
 	/* If the arrays are equal, it must be the same service. */
-	if ($svc1 == $svc2)
+	if ($svc1 == $svc2) {
 		return true;
+	}
 	/* If the names are different, they must not be the same. */
-	if ($svc1['name'] != $svc2['name'])
+	if ($svc1['name'] != $svc2['name']) {
 		return false;
+	}
 	switch ($svc1['name']) {
 		case "openvpn":
-			if (($svc1['mode'] == $svc2['mode']) && ($svc1['vpnid'] == $svc2['vpnid']))
+			if (($svc1['mode'] == $svc2['mode']) && ($svc1['vpnid'] == $svc2['vpnid'])) {
 				return true;
-			else
+			} else {
 				return false;
+			}
 			break;
 		case "captiveportal":
-			if ($svc1['zone'] == $svc2['zone'])
+			if ($svc1['zone'] == $svc2['zone']) {
 				return true;
-			else
+			} else {
 				return false;
+			}
 			break;
 		default:
 			/* Other services must be the same if the name matches. */
@@ -39,12 +43,14 @@ function servicewatchdog_is_service_watched($svc) {
 	$a_pwservices = &$config['installedpackages']['servicewatchdog']['item'];
 	$blacklisted_services = array("cron");
 
-	if (empty($svc['name']) || in_array($svc['name'], $blacklisted_services))
+	if (empty($svc['name']) || in_array($svc['name'], $blacklisted_services)) {
 		return true;
+	}
 
 	foreach ($a_pwservices as $a_svc) {
-		if (servicewatchdog_service_matches($svc, $a_svc))
+		if (servicewatchdog_service_matches($svc, $a_svc)) {
 			return true;
+		}
 	}
 	return false;
 }
@@ -77,8 +83,9 @@ function servicewatchdog_check_services() {
 			$descr = strlen($svc['description']) > 50 ? substr($svc['description'], 0, 50) . "..." : $svc['description'];
 			$error_message = "Service Watchdog detected service {$svc['name']} stopped. Restarting {$svc['name']} ({$descr})";
 			log_error($error_message);
-			if (isset($svc['notify']))
+			if (isset($svc['notify'])) {
 				notify_via_smtp($error_message);
+			}
 			service_control_start($svc['name'], $svc);
 		}
 	}
diff --git a/config/servicewatchdog/servicewatchdog.xml b/config/servicewatchdog/servicewatchdog.xml
index 685ba997..5a1aebbb 100644
--- a/config/servicewatchdog/servicewatchdog.xml
+++ b/config/servicewatchdog/servicewatchdog.xml
@@ -40,7 +40,7 @@
 	<requirements>None</requirements>
 	<faq>Monitors for stopped services and restarts them.</faq>
 	<name>Service Watchdog</name>
-	<version>1.6</version>
+	<version>1.7</version>
 	<title>Services: Service Watchdog</title>
 	<include_file>/usr/local/pkg/servicewatchdog.inc</include_file>
 	<menu>
diff --git a/config/servicewatchdog/servicewatchdog_cron.php b/config/servicewatchdog/servicewatchdog_cron.php
index 004afd97..9979917e 100644
--- a/config/servicewatchdog/servicewatchdog_cron.php
+++ b/config/servicewatchdog/servicewatchdog_cron.php
@@ -6,8 +6,9 @@ require_once("servicewatchdog.inc");
 global $g;
 
 /* Do nothing at bootup. */
-if ($g['booting'] || file_exists("{$g['varrun_path']}/booting"))
+if ($g['booting'] || file_exists("{$g['varrun_path']}/booting")) {
 	return;
+}
 
 servicewatchdog_check_services();
 ?>
\ No newline at end of file