diff options
author | Bryan Paradis <bryan.paradis@gmail.com> | 2014-02-21 10:45:02 -0500 |
---|---|---|
committer | Bryan Paradis <bryan.paradis@gmail.com> | 2014-02-21 10:45:09 -0500 |
commit | 324c82e37900b3681c6bcff4df91bfc22e8dc493 (patch) | |
tree | 8e4355365a1ef392c837cbe26804671ec4be6cc6 /config/vnstat2/bin | |
parent | 2dc81505264000fcb7728225220c991f5162239b (diff) | |
download | pfsense-packages-324c82e37900b3681c6bcff4df91bfc22e8dc493.tar.gz pfsense-packages-324c82e37900b3681c6bcff4df91bfc22e8dc493.tar.bz2 pfsense-packages-324c82e37900b3681c6bcff4df91bfc22e8dc493.zip |
Moved php files into additional files
bin folder renamed to www
abc files renamed to php
removed delete lines in vnstat2.inc for php files
removed install lines in vnstat2.inc for php files
Diffstat (limited to 'config/vnstat2/bin')
-rw-r--r-- | config/vnstat2/bin/diag_vnstat.abc | 115 | ||||
-rw-r--r-- | config/vnstat2/bin/diag_vnstat2.abc | 137 | ||||
-rw-r--r-- | config/vnstat2/bin/vnstat2_img.abc | 6 | ||||
-rw-r--r-- | config/vnstat2/bin/vnstati.abc | 17 |
4 files changed, 0 insertions, 275 deletions
diff --git a/config/vnstat2/bin/diag_vnstat.abc b/config/vnstat2/bin/diag_vnstat.abc deleted file mode 100644 index afef3849..00000000 --- a/config/vnstat2/bin/diag_vnstat.abc +++ /dev/null @@ -1,115 +0,0 @@ -<?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/bin/diag_vnstat2.abc b/config/vnstat2/bin/diag_vnstat2.abc deleted file mode 100644 index ec19a0b2..00000000 --- a/config/vnstat2/bin/diag_vnstat2.abc +++ /dev/null @@ -1,137 +0,0 @@ -<?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/bin/vnstat2_img.abc b/config/vnstat2/bin/vnstat2_img.abc deleted file mode 100644 index 85644309..00000000 --- a/config/vnstat2/bin/vnstat2_img.abc +++ /dev/null @@ -1,6 +0,0 @@ -<?php -require_once("guiconfig.inc"); -$image = $_GET['image']; -header("Content-type: image/png"); -readfile("/tmp/$image"); -?> diff --git a/config/vnstat2/bin/vnstati.abc b/config/vnstat2/bin/vnstati.abc deleted file mode 100644 index e5ddcd21..00000000 --- a/config/vnstat2/bin/vnstati.abc +++ /dev/null @@ -1,17 +0,0 @@ -<?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"); ?> - |