Merge pull request #579 from parawizard/master

Vnstat2 - Integration of vnstat_php_frontend into packages repo from tar
author: Ermal Luçi <eri@pfsense.org> 2014-02-21 16:56:57 +0100
committer: Ermal Luçi <eri@pfsense.org> 2014-02-21 16:56:57 +0100
commit: 7dda8e5ca8214ffa8ae098af501569684602a8be (patch)
tree: ac0ff8dab93c892ebc9eeeadbf0723d0398717b4 /config/vnstat2/www
parent: 9da67718c24ba88efc9884c7f26aa6fa7f3c4ded (diff)
parent: 324c82e37900b3681c6bcff4df91bfc22e8dc493 (diff)
download: pfsense-packages-7dda8e5ca8214ffa8ae098af501569684602a8be.tar.gz
pfsense-packages-7dda8e5ca8214ffa8ae098af501569684602a8be.tar.bz2
pfsense-packages-7dda8e5ca8214ffa8ae098af501569684602a8be.zip
4 files changed, 275 insertions, 0 deletions
diff --git a/config/vnstat2/www/diag_vnstat.php b/config/vnstat2/www/diag_vnstat.php
new file mode 100644
index 00000000..afef3849
--- /dev/null
+++ b/config/vnstat2/www/diag_vnstat.php
@@ -0,0 +1,115 @@
+<?php
+/* $Id$ */
+/*
+    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:
+
+    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.
+*/
+
+/*
+	pfSense_BUILDER_BINARIES:	/usr/bin/top
+	pfSense_MODULE:	system
+*/
+
+##|+PRIV
+##|*IDENT=page-diag-system-activity
+##|*NAME=Diagnostics: System Activity
+##|*DESCR=Allows access to the 'Diagnostics: System Activity' page
+##|*MATCH=diag_system_activity*
+##|-PRIV
+
+require("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+
+$pgtitle = gettext("Vnstat2 summary ");
+if($_REQUEST['getactivity']) {
+	$text = `vnstat`;
+	$text .= "<p/>";
+	echo $text;
+	exit;
+}
+
+include("head.inc");
+
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+
+<script type="text/javascript">
+	function getcpuactivity() {
+		var url = "/diag_vnstat.php";
+		var pars = 'getactivity=yes';
+		var myAjax = new Ajax.Request(
+			url,
+			{
+				method: 'post',
+				parameters: pars,
+				onComplete: activitycallback
+			});
+	}
+	function activitycallback(transport) {
+		$('cpuactivitydiv').innerHTML = '<font face="Courier"><font size="2"><b><pre>' + transport.responseText  + '</pre></font>';
+		setTimeout('getcpuactivity()', 2000);		
+	}
+	setTimeout('getcpuactivity()', 5000);	
+</script>
+<div id='maincontent'>
+<?php
+	include("fbegin.inc"); 
+	if(strstr($pfSversion, "1.2")) 
+		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 "<div id='savemsg'>";
+		print_info_box($savemsg);
+		echo "</div>";	
+	}
+	if ($input_errors)
+		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>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/vnstat2/www/diag_vnstat2.php b/config/vnstat2/www/diag_vnstat2.php
new file mode 100644
index 00000000..ec19a0b2
--- /dev/null
+++ b/config/vnstat2/www/diag_vnstat2.php
@@ -0,0 +1,137 @@
+<?php
+/* $Id$ */
+/*
+    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:
+
+    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.
+*/
+
+/*
+	pfSense_MODULE:	filter
+*/
+
+##|+PRIV
+##|*IDENT=page-diag-system-activity
+##|*NAME=Diagnostics: System Activity
+##|*DESCR=Allows access to the 'Diagnostics: System Activity' page
+##|*MATCH=diag_system_pftop*
+##|-PRIV
+
+require("guiconfig.inc");
+global $config;
+$aaaa = $config['installedpackages']['vnstat2']['config'][0]['vnstat_interface2'];
+$bbbb = convert_real_interface_to_friendly_descr($aaaa);
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+$pgtitle = gettext("Vnstat2 info for $bbbb ($aaaa)");
+
+if($_REQUEST['getactivity']) {
+	if($_REQUEST['sorttype'])
+		$sorttype = escapeshellarg($_REQUEST['sorttype']);
+	else
+		$sorttype = gettext("-h");	
+	$text = `vnstat -i $aaaa {$sorttype}`;
+	echo $text;
+	exit;
+}
+
+include("head.inc");
+
+if($_REQUEST['sorttype'])
+	$sorttype = htmlentities($_REQUEST['sorttype']);
+else
+	$sorttype = "-h";
+
+?>
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<form method="post" action="diag_vnstat2.php">
+<script type="text/javascript">
+	function getcpuactivity() {
+		var url = "/diag_vnstat2.php";
+		var pars = 'getactivity=yes&sorttype=' + $('sorttype').value;
+		var myAjax = new Ajax.Request(
+			url,
+			{
+				method: 'post',
+				parameters: pars,
+				onComplete: activitycallback
+			});
+	}
+	function activitycallback(transport) {
+		$('cpuactivitydiv').innerHTML = '<font face="Courier"><font size="2"><b><pre>' + transport.responseText  + '</pre></font>';
+		setTimeout('getcpuactivity()', 2500);		
+	}
+	setTimeout('getcpuactivity()', 1000);	
+</script>
+<div id='maincontent'>
+<?php
+	include("fbegin.inc"); 
+	if(strstr($pfSversion, "1.2")) 
+		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 "<div id='savemsg'>";
+		print_info_box($savemsg);
+		echo "</div>";	
+	}
+	if ($input_errors)
+		print_input_errors($input_errors);
+?>
+	<form method="post">
+	<?=gettext("Sort type:"); ?>
+	<select name='sorttype' id='sorttype' onChange='this.form.submit();'>
+		<option value='<?=$sorttype?>'><?=$sorttype?></option>
+		<option value='-h'><?=gettext("Show traffic for the last 24 hours.");?></option>
+		<option value='-d'><?=gettext("Show traffic for days.");?></option>
+		<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>														
+	</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>
+</table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/vnstat2/www/vnstat2_img.php b/config/vnstat2/www/vnstat2_img.php
new file mode 100644
index 00000000..85644309
--- /dev/null
+++ b/config/vnstat2/www/vnstat2_img.php
@@ -0,0 +1,6 @@
+<?php
+require_once("guiconfig.inc");
+$image = $_GET['image'];
+header("Content-type: image/png");
+readfile("/tmp/$image");
+?> 
diff --git a/config/vnstat2/www/vnstati.php b/config/vnstat2/www/vnstati.php
new file mode 100644
index 00000000..e5ddcd21
--- /dev/null
+++ b/config/vnstat2/www/vnstati.php
@@ -0,0 +1,17 @@
+<?php
+require_once("guiconfig.inc");
+global $config;
+include("head.inc");
+include("fbegin.inc");
+$aaaa = $config['installedpackages']['vnstat2']['config'][0]['vnstat_interface'];
+$cccc = convert_real_interface_to_friendly_descr($aaaa);
+$pgtitle = gettext("Vnstati info for $cccc ($aaaa)");
+echo "<a href=$myurl/pkg_edit.php?xml=vnstati.xml&id=0>Go Back</a><br />";
+echo "<center><p class=\"pgtitle\">{$pgtitle}</p>";
+?>
+<center><img src="vnstat2_img.php?image=newpicture1.png" style="border:1px solid black; center;"><br />
+<center><img src="vnstat2_img.php?image=newpicture2.png" style="border:1px solid black; center;"><br />
+<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"); ?>
+
author	Ermal Luçi <eri@pfsense.org>	2014-02-21 16:56:57 +0100
committer	Ermal Luçi <eri@pfsense.org>	2014-02-21 16:56:57 +0100
commit	7dda8e5ca8214ffa8ae098af501569684602a8be (patch)
tree	ac0ff8dab93c892ebc9eeeadbf0723d0398717b4 /config/vnstat2/www
parent	9da67718c24ba88efc9884c7f26aa6fa7f3c4ded (diff)
parent	324c82e37900b3681c6bcff4df91bfc22e8dc493 (diff)
download	pfsense-packages-7dda8e5ca8214ffa8ae098af501569684602a8be.tar.gz pfsense-packages-7dda8e5ca8214ffa8ae098af501569684602a8be.tar.bz2 pfsense-packages-7dda8e5ca8214ffa8ae098af501569684602a8be.zip