tinc - pfSense 2.2.x fixes, code style and improvements

- Add copyright header
- XHTML valid code
- Fix code style, whitespace and indentation
- Removed the useless checks for clog location on pfSense <2.1.2

1 files changed, 69 insertions, 50 deletions

diff --git a/config/tinc/status_tinc.php b/config/tinc/status_tinc.php
index f50ea640..59a1cb6e 100644
--- a/config/tinc/status_tinc.php
+++ b/config/tinc/status_tinc.php
@@ -1,88 +1,107 @@
 <?php
+/*
+	status_tinc.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2012-2015 ESF, LLC
+	All rights reserved.
 
-$pgtitle = array(gettext("Status"), "tinc");
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
 require("guiconfig.inc");
 
-function tinc_status_1() {
-        exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR1");
+function tinc_status_usr1() {
+	exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR1");
 	usleep(500000);
-	$clog_path = "";
+	$clog_path = "/usr/local/sbin/clog";
 	$result = array();
-	if (is_executable("/usr/local/sbin/clog")) {
-		$clog_path = "/usr/local/sbin/clog";
-	} elseif (is_executable("/usr/sbin/clog")) {
-		$clog_path = "/usr/sbin/clog";
-	}
 
-	if (!empty($clog_path))
-		exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result);
-	$i=0;
-	foreach($result as $line)
-	{
-		if(preg_match("/Connections:/",$line))
-			$begin=$i;
-		if(preg_match("/End of connections./",$line))
-			$end=$i;
+	exec("{$clog_path} /var/log/tinc.log | /usr/bin/sed -e 's/.*tinc\[.*\]: //'", $result);
+	$i = 0;
+	foreach ($result as $line) {
+		if (preg_match("/Connections:/", $line)) {
+			$begin = $i;
+		}
+		if (preg_match("/End of connections./", $line)) {
+			$end = $i;
+		}
 		$i++;
 	}
-	$output="";
-	$i=0;
-	foreach($result as $line)
-	{
-		if($i >= $begin && $i<= $end)
+	$output = "";
+	$i = 0;
+	foreach ($result as $line) {
+		if ($i >= $begin && $i<= $end) {
 			$output .= $line . "\n";
+		}
 		$i++;
 	}
 	return $output;
 }
 
-function tinc_status_2() {
-        exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR2");
+function tinc_status_usr2() {
+	exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR2");
 	usleep(500000);
-	$clog_path = "";
+	$clog_path = "/usr/local/sbin/clog";
 	$result = array();
-	if (is_executable("/usr/local/sbin/clog")) {
-		$clog_path = "/usr/local/sbin/clog";
-	} elseif (is_executable("/usr/sbin/clog")) {
-		$clog_path = "/usr/sbin/clog";
-	}
 
-	if (!empty($clog_path))
-		exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result);
-	$i=0;
-	foreach($result as $line)
-	{
-		if(preg_match("/Statistics for Generic BSD tun device/",$line))
-			$begin=$i;
-		if(preg_match("/End of subnet list./",$line))
-			$end=$i;
+	exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result);
+	$i = 0;
+	foreach ($result as $line) {
+		if (preg_match("/Statistics for Generic BSD tun device/",$line)) {
+			$begin = $i;
+		}
+		if (preg_match("/End of subnet list./",$line)) {
+			$end = $i;
+		}
 		$i++;
 	}
 	$output="";
-	$i=0;
-	foreach($result as $line)
-	{
-		if($i >= $begin && $i<= $end)
+	$i = 0;
+	foreach ($result as $line) {
+		if ($i >= $begin && $i<= $end) {
 			$output .= $line . "\n";
+		}
 		$i++;
 	}
 	return $output;
 }
 
 $shortcut_section = "tinc";
-include("head.inc"); ?>
+$pgtitle = array(gettext("Status"), "tinc");
+include("head.inc");
+?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?=$jsevents["body"]["onload"];?>">
 <?php include("fbegin.inc"); ?>
 
-Connection list:<BR>
+<strong>Connection list:</strong><br />
 <pre>
-<?php print tinc_status_1(); ?>
+<?php print tinc_status_usr1(); ?>
 </pre>
-<BR>
-Virtual network device statistics, all known nodes, edges and subnets:<BR>
+<br />
+<strong>Virtual network device statistics, all known nodes, edges and subnets:</strong><br />
 <pre>
-<?php print tinc_status_2(); ?>
+<?php print tinc_status_usr2(); ?>
 </pre>
 
 <?php include("fend.inc"); ?>
+</body>
+</html>