From a9038c8009754693948ba92155e61529dd6d3fb7 Mon Sep 17 00:00:00 2001
From: k-paulius <k.dash.paulius@gmail.com>
Date: Mon, 13 Jul 2015 21:12:24 -0500
Subject: vnstat2 XML file whitespace cleanup

---
 config/vnstat2/vnstat2.xml      | 69 ++++++++++++++++++++---------------------
 config/vnstat2/vnstati.xml      |  9 +++---
 config/vnstat2/vnstatoutput.xml |  9 +++---
 3 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 94b7cfc1..f696850a 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
 <packagegui>
-    <copyright></copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	<copyright></copyright>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
 	<name>vnstat2</name>
 	<version>11.2,3</version>
 	<title>Vnstat2</title>
@@ -203,36 +203,36 @@
 			<type>select</type>
 			<size>3</size>
 			<default_value>1</default_value>
-                        <options>
-                                 <option><name>1</name><value>1</value></option>
-                                 <option><name>2</name><value>2</value></option>
-                                 <option><name>3</name><value>3</value></option>
-                                 <option><name>4</name><value>4</value></option>
-                                 <option><name>5</name><value>5</value></option>
-                                 <option><name>6</name><value>6</value></option>
-                                 <option><name>7</name><value>7</value></option>
-                                 <option><name>8</name><value>8</value></option>
-                                 <option><name>9</name><value>9</value></option>
-                                 <option><name>10</name><value>10</value></option>
-                                 <option><name>11</name><value>11</value></option>
-                                 <option><name>12</name><value>12</value></option>
-                                 <option><name>13</name><value>13</value></option>
-                                 <option><name>14</name><value>14</value></option>
-                                 <option><name>15</name><value>15</value></option>
-                                 <option><name>16</name><value>16</value></option>
-                                 <option><name>17</name><value>17</value></option>
-                                 <option><name>18</name><value>18</value></option>
-                                 <option><name>19</name><value>19</value></option>
-                                 <option><name>20</name><value>20</value></option>
-                                 <option><name>21</name><value>21</value></option>
-                                 <option><name>22</name><value>22</value></option>
-                                 <option><name>23</name><value>23</value></option>
-                                 <option><name>24</name><value>24</value></option>
-                                 <option><name>25</name><value>25</value></option>
-                                 <option><name>26</name><value>26</value></option>
-                                 <option><name>27</name><value>27</value></option>
-                                 <option><name>28</name><value>28</value></option>
-                        </options>
+			<options>
+				<option><name>1</name><value>1</value></option>
+				<option><name>2</name><value>2</value></option>
+				<option><name>3</name><value>3</value></option>
+				<option><name>4</name><value>4</value></option>
+				<option><name>5</name><value>5</value></option>
+				<option><name>6</name><value>6</value></option>
+				<option><name>7</name><value>7</value></option>
+				<option><name>8</name><value>8</value></option>
+				<option><name>9</name><value>9</value></option>
+				<option><name>10</name><value>10</value></option>
+				<option><name>11</name><value>11</value></option>
+				<option><name>12</name><value>12</value></option>
+				<option><name>13</name><value>13</value></option>
+				<option><name>14</name><value>14</value></option>
+				<option><name>15</name><value>15</value></option>
+				<option><name>16</name><value>16</value></option>
+				<option><name>17</name><value>17</value></option>
+				<option><name>18</name><value>18</value></option>
+				<option><name>19</name><value>19</value></option>
+				<option><name>20</name><value>20</value></option>
+				<option><name>21</name><value>21</value></option>
+				<option><name>22</name><value>22</value></option>
+				<option><name>23</name><value>23</value></option>
+				<option><name>24</name><value>24</value></option>
+				<option><name>25</name><value>25</value></option>
+				<option><name>26</name><value>26</value></option>
+				<option><name>27</name><value>27</value></option>
+				<option><name>28</name><value>28</value></option>
+			</options>
 		</field>
 		<field>
 			<description>Enable vnstat php frontend (Note that no login will be needed)</description>
@@ -246,4 +246,3 @@
 	<custom_php_install_command>vnstat_install_config();</custom_php_install_command>
 	<custom_php_deinstall_command>vnstat_install_deinstall();</custom_php_deinstall_command>
 </packagegui>
-
diff --git a/config/vnstat2/vnstati.xml b/config/vnstat2/vnstati.xml
index 7cd3f3be..84a104dd 100644
--- a/config/vnstat2/vnstati.xml
+++ b/config/vnstat2/vnstati.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
 <packagegui>
-    <copyright></copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	<copyright></copyright>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
 	<name>vnstat2</name>
 	<version>1.0</version>
 	<title>Vnstat2</title>
@@ -54,4 +54,3 @@
 	<custom_php_install_command>vnstat_install_config();</custom_php_install_command>
 	<custom_php_deinstall_command>vnstat_install_deinstall();</custom_php_deinstall_command>
 </packagegui>
-
diff --git a/config/vnstat2/vnstatoutput.xml b/config/vnstat2/vnstatoutput.xml
index 9d2e3d05..5062be1f 100644
--- a/config/vnstat2/vnstatoutput.xml
+++ b/config/vnstat2/vnstatoutput.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
 <packagegui>
-    <copyright></copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	<copyright></copyright>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
 	<name>vnstat2</name>
 	<version>1.0</version>
 	<title>Vnstat2</title>
@@ -54,4 +54,3 @@
 	<custom_php_install_command>vnstat_install_config();</custom_php_install_command>
 	<custom_php_deinstall_command>vnstat_install_deinstall();</custom_php_deinstall_command>
 </packagegui>
-
-- 
cgit v1.2.3


From 1d8944e08c21254c9e81b46c1edc64e9fde7da8e Mon Sep 17 00:00:00 2001
From: k-paulius <k.dash.paulius@gmail.com>
Date: Mon, 13 Jul 2015 22:15:10 -0500
Subject: formatted vnstat2 php code

---
 config/vnstat2/vnstat2.inc          | 273 ++++++++++++++++++------------------
 config/vnstat2/www/diag_vnstat.php  |  84 +++++------
 config/vnstat2/www/diag_vnstat2.php | 106 +++++++-------
 config/vnstat2/www/vnstati.php      |   1 -
 4 files changed, 234 insertions(+), 230 deletions(-)

diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index c875be52..afbf270a 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -1,15 +1,16 @@
 <?php
+
 require_once("util.inc");
+
 function vnstat_install_deinstall() {
 	conf_mount_rw();
 	global $config;
-// Remove Vnstat package and files 
+	// Remove Vnstat package and files
 	exec("rm -d -R /usr/local/www/vnstat2");
 	exec("rm -d -R /usr/local/www/vnstati");
 	exec("rm -d -R /usr/local/pkg/vnstat2");
 	exec("rm /usr/local/etc/vnstat.conf");
-
-// Remove vnstat cron entry from config.xml
+	// Remove vnstat cron entry from config.xml
 	vnstat2_install_cron(false);
 	conf_mount_ro();
 }
@@ -17,11 +18,12 @@ function vnstat_install_deinstall() {
 function vnstat2_install_cron($vnstat_cron_value) {
 	global $config;
 	$is_installed = false;
-	if(!$config['cron']['item'])
+	if (!$config['cron']['item']) {
 		return;
+	}
 	$x=0;
 	foreach($config['cron']['item'] as $item) {
-		if(strstr($item['command'], "/usr/local/pkg/vnstat2/vnstat2.sh")) {
+		if (strstr($item['command'], "/usr/local/pkg/vnstat2/vnstat2.sh")) {
 			$is_installed = true;
 			break;
 		}
@@ -29,23 +31,23 @@ function vnstat2_install_cron($vnstat_cron_value) {
 	}
 	switch($vnstat_cron_value) {
 		case true:
-			if(!$is_installed) {
+			if (!$is_installed) {
 				$cron_item = array();
 				$cron_item['minute']    = "*/1";
-	        		$cron_item['hour']      = "*";
-	        		$cron_item['mday']      = "*";
-	        		$cron_item['month']     = "*";
-	        		$cron_item['wday']      = "*";
-	        		$cron_item['who']       = "root";
-	        		$cron_item['command']   = "/usr/local/pkg/vnstat2/vnstat2.sh";
-	        		$config['cron']['item'][] = $cron_item;		
+				$cron_item['hour']      = "*";
+				$cron_item['mday']      = "*";
+				$cron_item['month']     = "*";
+				$cron_item['wday']      = "*";
+				$cron_item['who']       = "root";
+				$cron_item['command']   = "/usr/local/pkg/vnstat2/vnstat2.sh";
+				$config['cron']['item'][] = $cron_item;
 				write_config();
 				configure_cron();
 			}
 		break;
 		case false:
-			if($is_installed == true) {
-				if($x > 0) {
+			if ($is_installed == true) {
+				if ($x > 0) {
 					unset($config['cron']['item'][$x]);
 					write_config();
 				}
@@ -55,8 +57,7 @@ function vnstat2_install_cron($vnstat_cron_value) {
 	}
 }
 
-
-function change_vnstat_conf(){
+function change_vnstat_conf() {
 	conf_mount_rw();
 	global $config;
 	$config['installedpackages']['vnstat2']['config'][0]['monthrotate'] = $_POST['monthrotate'];
@@ -64,21 +65,19 @@ function change_vnstat_conf(){
 	write_conf_f();
 	write_config();
 
-	if ($config['installedpackages']['vnstat2']['config'][0]['vnstat_phpfrontend'] == "on"){
- 		vnstat_php_frontend();
-		}
-	else {
-	exec("[ -d /usr/local/www/vnstat2 ] && rm -d -R /usr/local/www/vnstat2");
+	if ($config['installedpackages']['vnstat2']['config'][0]['vnstat_phpfrontend'] == "on") {
+		vnstat_php_frontend();
+	} else {
+		exec("[ -d /usr/local/www/vnstat2 ] && rm -d -R /usr/local/www/vnstat2");
 	}
 	conf_mount_ro();
 }
 
-function write_conf_f(){
+function write_conf_f() {
 	global $config;
 	$monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate'];
 
-// ************ Write new vnstat.conf *****************
-
+	// ************ Write new vnstat.conf *****************
 	$vnstat_conf_file = <<<EOF
 # vnStat 1.10 config file
 ##
@@ -108,9 +107,9 @@ CTxD            "-"
 EOF;
 
 	$hf2 = fopen("/usr/local/etc/vnstat.conf","w");
-	if(!$hf2) {
-	log_error("could not open /usr/local/etc/vnstat.conf for writing");
-	exit;
+	if (!$hf2) {
+		log_error("could not open /usr/local/etc/vnstat.conf for writing");
+		exit;
 	}
 	fwrite($hf2, $vnstat_conf_file);
 	fclose($hf2);
@@ -145,7 +144,7 @@ function create_vnstat_output() {
 }
 
 function vnstat_link_config() {
-// Check for pbi install and arch type then create symlinks
+	// Check for pbi install and arch type then create symlinks
 	if (file_exists('/usr/pbi/vnstat-' . php_uname("m"))) {
 		$conf_path = "/usr/local/etc/vnstat.conf";
 		$pbi_conf_path = "/usr/pbi/vnstat-" . php_uname("m") . "/etc/vnstat.conf";
@@ -179,14 +178,13 @@ function vnstat_create_nic_dbs() {
 	foreach ($leftovers as $nic) {
 		exec("/usr/local/bin/vnstat -u -i ". escapeshellarg($nic));
 	}
-
 	conf_mount_ro();
 }
 
 function vnstat_install_config() {
 	$vnstat_db_prefix = "/conf/vnstat";
 	conf_mount_rw();
-// Create vnstat database dir where it also will work for nanobsd
+	// Create vnstat database dir where it also will work for nanobsd
 	if (is_dir("/usr/local/pkg/vnstat2/vnstat")) {
 		@rename("/usr/local/pkg/vnstat2/vnstat", $vnstat_db_prefix);
 	}
@@ -194,141 +192,140 @@ function vnstat_install_config() {
 		@mkdir($vnstat_db_prefix);
 	}
 	vnstat_link_config();
-// Add MonthRotate value to config.xml and write /usr/local/etc/vnstat.conf
-	if ($config['installedpackages']['vnstat2']['config'][0]['monthrotate'] == ""){
+	// Add MonthRotate value to config.xml and write /usr/local/etc/vnstat.conf
+	if ($config['installedpackages']['vnstat2']['config'][0]['monthrotate'] == "") {
 		$config['installedpackages']['vnstat2']['config'][0]['monthrotate'] = "1";
 	}
-	if ($config['installedpackages']['vnstat2']['config'][0]['vnstat_phpfrontend'] == "on"){
+	if ($config['installedpackages']['vnstat2']['config'][0]['vnstat_phpfrontend'] == "on") {
 		vnstat_php_frontend();
 	}
 	write_conf_f();
-// Add cron job to config.xml
+	// Add cron job to config.xml
 	vnstat2_install_cron(true);
 	vnstat_create_nic_dbs();
 	write_config();
 	conf_mount_ro();
 }
 
-function vnstat_php_frontend(){
+function vnstat_php_frontend() {
 	global $config;
-// Copy vnstat_php_frontend to www 
+	// Copy vnstat_php_frontend to www
 	exec("/bin/cp -a /usr/local/pkg/vnstat2/vnstat_php_frontend/. /usr/local/www/vnstat2/");
-// Find information to be writing in config.php 
+	// Find information to be writing in config.php
 	// $iface_list_array_items
-        exec("ls /conf/vnstat/ | grep -v '\.'", $vnstat_nic_in);
-        $iface_list_array_items = implode("', '", $vnstat_nic_in);
-        $iface_list_array = "\$iface_list = array('$iface_list_array_items');";
-        // $iface_title_array_items
-        $iface_title_array_items = array();
-        $iface_title_array_items2 = array();
-        foreach ($vnstat_nic_in as $vnstat_nic_out)
-        {
-        $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
+	exec("ls /conf/vnstat/ | grep -v '\.'", $vnstat_nic_in);
+	$iface_list_array_items = implode("', '", $vnstat_nic_in);
+	$iface_list_array = "\$iface_list = array('$iface_list_array_items');";
+	// $iface_title_array_items
+	$iface_title_array_items = array();
+	$iface_title_array_items2 = array();
+	foreach ($vnstat_nic_in as $vnstat_nic_out) {
+		$ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN');
 		for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
 			$ifdescrs['opt' . $j] = $config['interfaces']['opt' . $j]['descr'];
 		}
-         	foreach ($ifdescrs as $ifdescr => $ifname):
-         		$real_nic_names3 = get_real_interface($ifdescr);
-         		If ($real_nic_names3 == $vnstat_nic_out)
-               {
-               $ifname_out = convert_friendly_interface_to_friendly_descr($ifdescr);
-               $iface_title_array_items = "\$iface_title['$vnstat_nic_out'] = '$ifname_out';\n";
-	       array_push($iface_title_array_items2, $iface_title_array_items);
-               }
-		endforeach;
+		foreach ($ifdescrs as $ifdescr => $ifname) {
+			$real_nic_names3 = get_real_interface($ifdescr);
+			if ($real_nic_names3 == $vnstat_nic_out) {
+				$ifname_out = convert_friendly_interface_to_friendly_descr($ifdescr);
+				$iface_title_array_items = "\$iface_title['$vnstat_nic_out'] = '$ifname_out';\n";
+				array_push($iface_title_array_items2, $iface_title_array_items);
+			}
+		}
 	}
-        $iface_title_array = implode($iface_title_array_items2);
+	$iface_title_array = implode($iface_title_array_items2);
 	// php in php static items
 	// added to new items for the front end version 1.5.1
-		$locale = "\$locale = 'en_US.UTF-8';";
-		$language = "\$language = 'en';";
-        $vnstat_bin2 = "\$vnstat_bin = '/usr/local/bin/vnstat';";
-        $data_dir2 = "\$data_dir = './dumps';";
-        $graph_format2 ="\$graph_format='svg';";
-        $colorscheme2 = "\$colorscheme['light'] = array(";
-        $colorscheme3 = "\$colorscheme['red'] = array(";
-        $colorscheme4 = "\$colorscheme['pfSense'] = array(";
-// ************ Write new config.php ******************
-        $config_file = <<<EOF
+	$locale = "\$locale = 'en_US.UTF-8';";
+	$language = "\$language = 'en';";
+	$vnstat_bin2 = "\$vnstat_bin = '/usr/local/bin/vnstat';";
+	$data_dir2 = "\$data_dir = './dumps';";
+	$graph_format2 ="\$graph_format='svg';";
+	$colorscheme2 = "\$colorscheme['light'] = array(";
+	$colorscheme3 = "\$colorscheme['red'] = array(";
+	$colorscheme4 = "\$colorscheme['pfSense'] = array(";
+	// ************ Write new config.php ******************
+	$config_file = <<<EOF
 <?php
-    //
-    // vnStat PHP frontend 1.5.1 (c)2006-2008 Bjorge Dijkstra (bjd@jooz.net)
-    //
-    // This program is free software; you can redistribute it and/or modify
-    // it under the terms of the GNU General Public License as published by
-    // the Free Software Foundation; either version 2 of the License, or
-    // (at your option) any later version.
-    //
-    // This program is distributed in the hope that it will be useful,
-    // but WITHOUT ANY WARRANTY; without even the implied warranty of
-    // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    // GNU General Public License for more details.
-    //
-    // You should have received a copy of the GNU General Public License
-    // along with this program; if not, write to the Free Software
-    // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-    //
-    //
-    // see file COPYING or at http://www.gnu.org/licenses/gpl.html 
-    // for more information.
-    //
-    //error_reporting(E_ALL | E_NOTICE);
-    
-    //
-    // configuration parameters
-    //
-    // edit these to reflect your particular situation
-    //
-$locale
-$language
-    // list of network interfaces monitored by vnStat
-$iface_list_array
+	//
+	// vnStat PHP frontend 1.5.1 (c)2006-2008 Bjorge Dijkstra (bjd@jooz.net)
+	//
+	// This program is free software; you can redistribute it and/or modify
+	// it under the terms of the GNU General Public License as published by
+	// the Free Software Foundation; either version 2 of the License, or
+	// (at your option) any later version.
+	//
+	// This program is distributed in the hope that it will be useful,
+	// but WITHOUT ANY WARRANTY; without even the implied warranty of
+	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	// GNU General Public License for more details.
+	//
+	// You should have received a copy of the GNU General Public License
+	// along with this program; if not, write to the Free Software
+	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	//
+	//
+	// see file COPYING or at http://www.gnu.org/licenses/gpl.html
+	// for more information.
+	//
+	//error_reporting(E_ALL | E_NOTICE);
+
+	//
+	// configuration parameters
+	//
+	// edit these to reflect your particular situation
+	//
+	$locale
+	$language
+	// list of network interfaces monitored by vnStat
+	$iface_list_array
 
-    //
-    // optional names for interfaces
-    // if there's no name set for an interface then the interface identifier
-    // will be displayed instead
-$iface_title_array
+	//
+	// optional names for interfaces
+	// if there's no name set for an interface then the interface identifier
+	// will be displayed instead
+	$iface_title_array
 
-    //
-    // There are two possible sources for vnstat data. If the 
-    // variable is set then vnstat is called directly from the PHP script
-    // to get the interface data. 
-    //
-    // The other option is to periodically dump the vnstat interface data to
-    // a file (e.g. by a cronjob). In that case the  variable
-    // must be cleared and set  to the location where the dumps
-    // are stored. Dumps must be named 'vnstat_dump_'.
-    //
-    // You can generate vnstat dumps with the command:
-    //   vnstat --dumpdb -i  > /path/to/data_dir/vnstat_dump_
-    // 
-$vnstat_bin2
-$data_dir2
+	//
+	// There are two possible sources for vnstat data. If the
+	// variable is set then vnstat is called directly from the PHP script
+	// to get the interface data.
+	//
+	// The other option is to periodically dump the vnstat interface data to
+	// a file (e.g. by a cronjob). In that case the  variable
+	// must be cleared and set  to the location where the dumps
+	// are stored. Dumps must be named 'vnstat_dump_'.
+	//
+	// You can generate vnstat dumps with the command:
+	//   vnstat --dumpdb -i  > /path/to/data_dir/vnstat_dump_
+	//
+	$vnstat_bin2
+	$data_dir2
 
-    // graphics format to use: svg or png
-$graph_format2
-    
-    // Font to use for PNG graphs
-    define('GRAPH_FONT',dirname(__FILE__).'/VeraBd.ttf');
+	// graphics format to use: svg or png
+	$graph_format2
 
-    // Font to use for SVG graphs
-    define('SVG_FONT', 'Verdana');
+	// Font to use for PNG graphs
+	define('GRAPH_FONT',dirname(__FILE__).'/VeraBd.ttf');
 
-    // color schemes
-    // colors are defined as R,G,B,ALPHA quads where R, G and B range from 0-255
-    // and ALPHA from 0-127 where 0 is opaque and 127 completely transparent.
-    //
-    define('DEFAULT_COLORSCHEME', 'pfSense');
+	// Font to use for SVG graphs
+	define('SVG_FONT', 'Verdana');
+
+	// color schemes
+	// colors are defined as R,G,B,ALPHA quads where R, G and B range from 0-255
+	// and ALPHA from 0-127 where 0 is opaque and 127 completely transparent.
+	//
+	define('DEFAULT_COLORSCHEME', 'pfSense');
 ?>
 EOF;
 
-     $hf = fopen("/usr/local/www/vnstat2/config.php","w");
-     if(!$hf) {
-     log_error("could not open /usr/local/www/vnstat2/config.php for writing");
-     exit;
-     }
-     fwrite($hf, $config_file);
-     fclose($hf);
+	$hf = fopen("/usr/local/www/vnstat2/config.php","w");
+	if (!$hf) {
+		log_error("could not open /usr/local/www/vnstat2/config.php for writing");
+		exit;
+	}
+	fwrite($hf, $config_file);
+	fclose($hf);
 }
+
 ?>
diff --git a/config/vnstat2/www/diag_vnstat.php b/config/vnstat2/www/diag_vnstat.php
index 04e03911..5e6524c7 100644
--- a/config/vnstat2/www/diag_vnstat.php
+++ b/config/vnstat2/www/diag_vnstat.php
@@ -1,30 +1,30 @@
 <?php
 /* $Id$ */
 /*
-    diag_pf_info.php
-    Copyright (C) 2010 Scott Ullrich
-    All rights reserved.
+	diag_pf_info.php
+	Copyright (C) 2010 Scott Ullrich
+	All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	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.
+	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.
+	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.
+	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.
 */
 
 /*
@@ -44,7 +44,7 @@ require("guiconfig.inc");
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 
 $pgtitle = gettext("Vnstat2 summary ");
-if($_REQUEST['getactivity']) {
+if ($_REQUEST['getactivity']) {
 	$text = `vnstat`;
 	$text .= "<p/>";
 	echo $text;
@@ -80,7 +80,7 @@ include("head.inc");
 	if ($pf_version < 2.0)
 		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
 		echo "<a href=$myurl/pkg_edit.php?xml=vnstatoutput.xml&id=0>Go Back</a><br />";
-	if($savemsg) {
+	if ($savemsg) {
 		echo "<div id='savemsg'>";
 		print_info_box($savemsg);
 		echo "</div>";	
@@ -89,25 +89,27 @@ include("head.inc");
 		print_input_errors($input_errors);
 ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  
-  <tr>
-    <td>
-	<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td>
-				<center>
-				<table>
-					<tr><td>
-						<div name='cpuactivitydiv' id='cpuactivitydiv'>
-							<b><?=gettext("Gathering vnstat information, please wait...");?>
-						</div>
-					</td></tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-	</div>
-    </td>
-  </tr>
+	<tr>
+		<td>
+			<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<tr>
+					<td>
+						<center>
+						<table>
+							<tr>
+								<td>
+									<div name='cpuactivitydiv' id='cpuactivitydiv'>
+										<b><?=gettext("Gathering vnstat information, please wait...");?>
+									</div>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+			</div>
+		</td>
+	</tr>
 </table>
 </form>
 <?php include("fend.inc"); ?>
diff --git a/config/vnstat2/www/diag_vnstat2.php b/config/vnstat2/www/diag_vnstat2.php
index e5ce1de5..504fd534 100644
--- a/config/vnstat2/www/diag_vnstat2.php
+++ b/config/vnstat2/www/diag_vnstat2.php
@@ -1,30 +1,30 @@
 <?php
 /* $Id$ */
 /*
-    diag_system_pftop.php
-    Copyright (C) 2008-2009 Scott Ullrich
-    All rights reserved.
+	diag_system_pftop.php
+	Copyright (C) 2008-2009 Scott Ullrich
+	All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	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.
+	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.
+	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.
+	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.
 */
 
 /*
@@ -46,11 +46,12 @@ $bbbb = convert_real_interface_to_friendly_descr($aaaa);
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 $pgtitle = gettext("Vnstat2 info for $bbbb ($aaaa)");
 
-if($_REQUEST['getactivity']) {
-	if($_REQUEST['sorttype'])
+if ($_REQUEST['getactivity']) {
+	if ($_REQUEST['sorttype']) {
 		$sorttype = escapeshellarg($_REQUEST['sorttype']);
-	else
-		$sorttype = gettext("-h");	
+	} else {
+		$sorttype = gettext("-h");
+	}
 	$text = `vnstat -i $aaaa {$sorttype}`;
 	echo $text;
 	exit;
@@ -58,10 +59,11 @@ if($_REQUEST['getactivity']) {
 
 include("head.inc");
 
-if($_REQUEST['sorttype'])
+if ($_REQUEST['sorttype']) {
 	$sorttype = htmlentities($_REQUEST['sorttype']);
-else
+} else {
 	$sorttype = "-h";
+}
 
 ?>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
@@ -87,16 +89,18 @@ else
 <div id='maincontent'>
 <?php
 	include("fbegin.inc"); 
-	if ($pf_version < 2.0)
+	if ($pf_version < 2.0) {
 		echo "<p class=\"pgtitle\">{$pgtitle}</p>";
-		echo "<a href=$myurl/pkg_edit.php?xml=vnstatoutput.xml&id=0>Go Back</a><br />";
-	if($savemsg) {
+	}
+	echo "<a href=$myurl/pkg_edit.php?xml=vnstatoutput.xml&id=0>Go Back</a><br />";
+	if ($savemsg) {
 		echo "<div id='savemsg'>";
 		print_info_box($savemsg);
 		echo "</div>";	
 	}
-	if ($input_errors)
+	if ($input_errors) {
 		print_input_errors($input_errors);
+	}
 ?>
 	<form method="post">
 	<?=gettext("Sort type:"); ?>
@@ -107,29 +111,31 @@ else
 		<option value='-m'><?=gettext("Show traffic for months.");?></option>
 		<option value='-t'><?=gettext("Show all time top10 traffic.");?></option>
 		<option value='-tr'><?=gettext("Calculate 5sec. of traffic.");?></option>
-		<option value='-w'><?=gettext("Show traffic for 7 days, current and previous week.");?></option>														
+		<option value='-w'><?=gettext("Show traffic for 7 days, current and previous week.");?></option>
 	</select>
 	<p/>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  
-  <tr>
-    <td>
-	<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
-		<tr>
-			<td>
-				<center>
-				<table>
-					<tr><td>
-						<div name='cpuactivitydiv' id='cpuactivitydiv'>
-							<b><?=gettext("Gathering vnstat activity, please wait...");?>
-						</div>
-					</td></tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-	</div>
-    </td>
-  </tr>
+	<tr>
+		<td>
+			<table id="backuptable" class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
+				<tr>
+					<td>
+						<center>
+						<table>
+							<tr>
+								<td>
+									<div name='cpuactivitydiv' id='cpuactivitydiv'>
+										<b><?=gettext("Gathering vnstat activity, please wait...");?>
+									</div>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+			</div>
+		</td>
+	</tr>
 </table>
 </form>
 <?php include("fend.inc"); ?>
diff --git a/config/vnstat2/www/vnstati.php b/config/vnstat2/www/vnstati.php
index e5ddcd21..01eca208 100644
--- a/config/vnstat2/www/vnstati.php
+++ b/config/vnstat2/www/vnstati.php
@@ -14,4 +14,3 @@ echo "<center><p class=\"pgtitle\">{$pgtitle}</p>";
 <center><img src="vnstat2_img.php?image=newpicture3.png" style="border:1px solid black; center;"><br />
 <center><img src="vnstat2_img.php?image=newpicture4.png" style="border:1px solid black; center;"><br />
 <?php include("fend.inc"); ?>
-
-- 
cgit v1.2.3


From 3ae988896566a44710767d56cf60765e37350400 Mon Sep 17 00:00:00 2001
From: k-paulius <k.dash.paulius@gmail.com>
Date: Mon, 13 Jul 2015 23:21:33 -0500
Subject: Declare $config as global variable. Fixes #4834.

---
 config/vnstat2/vnstat2.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index afbf270a..ca8d869d 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -183,6 +183,7 @@ function vnstat_create_nic_dbs() {
 
 function vnstat_install_config() {
 	$vnstat_db_prefix = "/conf/vnstat";
+	global $config;
 	conf_mount_rw();
 	// Create vnstat database dir where it also will work for nanobsd
 	if (is_dir("/usr/local/pkg/vnstat2/vnstat")) {
-- 
cgit v1.2.3


From 1f3536e071b893176cfef5c9c5580ea8e961fb6b Mon Sep 17 00:00:00 2001
From: k-paulius <k.dash.paulius@gmail.com>
Date: Mon, 13 Jul 2015 23:30:51 -0500
Subject: Bump vnstat2 version

---
 pkg_config.10.xml      | 2 +-
 pkg_config.8.xml       | 2 +-
 pkg_config.8.xml.amd64 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index c164d923..734076bc 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -672,7 +672,7 @@
 		<build_pbi>
 			<port>net/vnstat</port>
 		</build_pbi>
-		<version>1.12_3</version>
+		<version>1.12_4</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<maintainer>crazypark2@yahoo.dk</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 542ad974..cc2b6625 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -779,7 +779,7 @@
 		<depends_on_package>vnstat-1.11.tbz</depends_on_package>
 		<depends_on_package_pbi>vnstat-1.11_1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/vnstat</build_port_path>
-		<version>1.11_1,3</version>
+		<version>1.11_1,4</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<maintainer>bryan.paradis@gmail.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 62c0c9cd..a1681c9d 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -766,7 +766,7 @@
 		<depends_on_package>vnstat-1.11.tbz</depends_on_package>
 		<depends_on_package_pbi>vnstat-1.11_1-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/net/vnstat</build_port_path>
-		<version>1.11_1,3</version>
+		<version>1.11_1,4</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<maintainer>bryan.paradis@gmail.com</maintainer>
-- 
cgit v1.2.3