From 81714335cddd6a59c21cd1b48fb1c07286722d9c Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Wed, 14 May 2014 19:26:52 +0200 Subject: tinc, as commented on previous commit removed {...} block around the for-loops + whitespace changed to tabs --- config/tinc/status_tinc.php | 70 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 36 deletions(-) (limited to 'config/tinc') diff --git a/config/tinc/status_tinc.php b/config/tinc/status_tinc.php index 86ad5b29..f50ea640 100644 --- a/config/tinc/status_tinc.php +++ b/config/tinc/status_tinc.php @@ -14,25 +14,24 @@ function tinc_status_1() { $clog_path = "/usr/sbin/clog"; } - if (!empty($clog_path)) { + 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; - $i++; - } - $output=""; - $i=0; - foreach($result as $line) - { - if($i >= $begin && $i<= $end) - $output .= $line . "\n"; - $i++; - } + $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 .= $line . "\n"; + $i++; } return $output; } @@ -48,25 +47,24 @@ function tinc_status_2() { $clog_path = "/usr/sbin/clog"; } - if (!empty($clog_path)) { + 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; - $i++; - } - $output=""; - $i=0; - foreach($result as $line) - { - if($i >= $begin && $i<= $end) - $output .= $line . "\n"; - $i++; - } + $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) + $output .= $line . "\n"; + $i++; } return $output; } -- cgit v1.2.3