From 238612a72478ce9c00d25b31f9a7516a69f996c5 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Wed, 22 Jan 2014 23:08:05 -0500
Subject: Updated pkg_config.8.* vnstat2 maintainer/version

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

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 0e40dfb2..6e03c0a7 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -827,10 +827,10 @@
 		<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.10_2</version>
+		<version>1.11_1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
-		<maintainer>crazypark2@yahoo.dk</maintainer>
+		<maintainer>bryan.paradis@gmail.com</maintainer>
 		<config_file>http://www.pfsense.com/packages/config/vnstat2/vnstat2.xml</config_file>
 		<configurationfile>vnstat2.xml</configurationfile>
 		<after_install_info></after_install_info>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 6454a58e..39911a23 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -814,10 +814,10 @@
 		<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.10_2</version>
+		<version>1.11_1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
-		<maintainer>crazypark2@yahoo.dk</maintainer>
+		<maintainer>bryan.paradis@gmail.com</maintainer>
 		<config_file>http://www.pfsense.com/packages/config/vnstat2/vnstat2.xml</config_file>
 		<configurationfile>vnstat2.xml</configurationfile>
 		<after_install_info></after_install_info>
-- 
cgit v1.2.3


From 3f126784b31d5b5011fb10be7802cf122d953d16 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Wed, 22 Jan 2014 23:09:02 -0500
Subject: added vnstat_php_frontend moving away from tar

---
 config/vnstat2/vnstat_php_frontend/COPYING         | 341 +++++++++++++++++++
 config/vnstat2/vnstat_php_frontend/README          |  52 +++
 config/vnstat2/vnstat_php_frontend/VeraBd.ttf      | Bin 0 -> 58716 bytes
 config/vnstat2/vnstat_php_frontend/config.php      |  69 ++++
 config/vnstat2/vnstat_php_frontend/graph.php       | 303 +++++++++++++++++
 config/vnstat2/vnstat_php_frontend/graph_svg.php   | 362 +++++++++++++++++++++
 config/vnstat2/vnstat_php_frontend/index.php       | 196 +++++++++++
 config/vnstat2/vnstat_php_frontend/lang/cs.php     |  39 +++
 config/vnstat2/vnstat_php_frontend/lang/en.php     |  39 +++
 config/vnstat2/vnstat_php_frontend/lang/nl.php     |  40 +++
 config/vnstat2/vnstat_php_frontend/localize.php    |  15 +
 .../vnstat_php_frontend/themes/dark/style.css      |  21 ++
 .../vnstat_php_frontend/themes/dark/theme.php      |  16 +
 .../vnstat_php_frontend/themes/espresso/style.css  | 170 ++++++++++
 .../vnstat_php_frontend/themes/espresso/theme.php  |  17 +
 .../vnstat_php_frontend/themes/light/style.css     | 159 +++++++++
 .../vnstat_php_frontend/themes/light/theme.php     |  15 +
 .../vnstat_php_frontend/themes/pfSense/style.css   | 170 ++++++++++
 .../vnstat_php_frontend/themes/pfSense/theme.php   |  17 +
 .../vnstat_php_frontend/themes/red/style.css       | 170 ++++++++++
 .../vnstat_php_frontend/themes/red/theme.php       |  16 +
 .../vnstat2/vnstat_php_frontend/vera_copyright.txt | 124 +++++++
 config/vnstat2/vnstat_php_frontend/vnstat.php      | 211 ++++++++++++
 23 files changed, 2562 insertions(+)
 create mode 100644 config/vnstat2/vnstat_php_frontend/COPYING
 create mode 100644 config/vnstat2/vnstat_php_frontend/README
 create mode 100644 config/vnstat2/vnstat_php_frontend/VeraBd.ttf
 create mode 100644 config/vnstat2/vnstat_php_frontend/config.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/graph.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/graph_svg.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/index.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/lang/cs.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/lang/en.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/lang/nl.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/localize.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/dark/style.css
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/dark/theme.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/espresso/style.css
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/espresso/theme.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/light/style.css
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/light/theme.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/pfSense/style.css
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/pfSense/theme.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/red/style.css
 create mode 100644 config/vnstat2/vnstat_php_frontend/themes/red/theme.php
 create mode 100644 config/vnstat2/vnstat_php_frontend/vera_copyright.txt
 create mode 100644 config/vnstat2/vnstat_php_frontend/vnstat.php

diff --git a/config/vnstat2/vnstat_php_frontend/COPYING b/config/vnstat2/vnstat_php_frontend/COPYING
new file mode 100644
index 00000000..a17bdaff
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/COPYING
@@ -0,0 +1,341 @@
+GNU GENERAL PUBLIC LICENSE
+               Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+            GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+             END OF TERMS AND CONDITIONS
+
+        How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
diff --git a/config/vnstat2/vnstat_php_frontend/README b/config/vnstat2/vnstat_php_frontend/README
new file mode 100644
index 00000000..20053152
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/README
@@ -0,0 +1,52 @@
+0. WHAT IS IT?
+
+This is a PHP frontend end to vnstat, a network traffic logger.
+Since vnstat is console mode only I created this script to
+make a 'nice' report of the data collected by vnstat.
+For more information about vnstat check out http://humdi.net/vnstat/
+For updates to this script check http://www.sqweek.com
+
+
+1. REQUIREMENTS 
+
+- vnstat setup and collecting data
+- webserver with PHP
+- php-gd extension installed for PNG graphs
+
+
+2. INSTALL
+
+Installation should be really straightforward:
+
+Put the files from this package somewhere inside the webroot of
+your webserver. Then edit the few configuration options in config.php
+to suit your situation and your good to go. The various options are
+explained in config.php.
+
+
+3. LICENSE
+
+vnstat PHP frontend 1.5.1
+Copyright (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
+
+
+NOTE:
+  The Truetype font file VeraBd.ttf is copyright by Bitstream Inc. 
+  See vera_copyright.txt for more information.
+
+
+
diff --git a/config/vnstat2/vnstat_php_frontend/VeraBd.ttf b/config/vnstat2/vnstat_php_frontend/VeraBd.ttf
new file mode 100644
index 00000000..51d6111d
Binary files /dev/null and b/config/vnstat2/vnstat_php_frontend/VeraBd.ttf differ
diff --git a/config/vnstat2/vnstat_php_frontend/config.php b/config/vnstat2/vnstat_php_frontend/config.php
new file mode 100644
index 00000000..3a4cd51a
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/config.php
@@ -0,0 +1,69 @@
+<?php
+    //
+    // vnStat PHP frontend (c)2006-2010 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 = 'en_US.UTF-8';
+    $language = 'en';
+
+    // list of network interfaces monitored by vnStat
+    $iface_list = array('em0', 'em1');
+
+    //
+    // optional names for interfaces
+    // if there's no name set for an interface then the interface identifier
+    // will be displayed instead
+    $iface_title['em0'] = 'WAN'; 
+    $iface_title['em1'] = 'LAN';
+
+    //
+    // There are two possible sources for vnstat data. If the $vnstat_bin
+    // 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 $vnstat_bin variable
+    // must be cleared and set $data_dir to the location where the dumps
+    // are stored. Dumps must be named 'vnstat_dump_$iface'.
+    //
+    // You can generate vnstat dumps with the command:
+    //   vnstat --dumpdb -i $iface > /path/to/data_dir/vnstat_dump_$iface
+    // 
+    $vnstat_bin = '/usr/local/bin/vnstat';
+    $data_dir = './dumps';
+
+    // graphics format to use: svg or png
+    $graph_format='svg';
+    
+    // Font to use for PNG graphs
+    define('GRAPH_FONT',dirname(__FILE__).'/VeraBd.ttf');
+
+    // Font to use for SVG graphs
+    define('SVG_FONT', 'Verdana');
+
+  define('DEFAULT_COLORSCHEME', 'pfSense');
+?>
\ No newline at end of file
diff --git a/config/vnstat2/vnstat_php_frontend/graph.php b/config/vnstat2/vnstat_php_frontend/graph.php
new file mode 100644
index 00000000..fb00be67
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/graph.php
@@ -0,0 +1,303 @@
+<?php
+    //
+    // vnStat PHP frontend (c)2006-2010 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.
+    //
+    require 'config.php';
+    require 'localize.php';
+    require 'vnstat.php';
+
+    validate_input();
+
+    require "./themes/$style/theme.php";
+
+    function allocate_color($im, $colors)
+    {
+	return imagecolorallocatealpha($im, $colors[0], $colors[1], $colors[2], $colors[3]);
+    }
+            
+    function init_image()
+    {
+        global $im, $xlm, $xrm, $ytm, $ybm, $iw, $ih,$graph, $cl, $iface, $colorscheme, $style;
+
+        if ($graph == 'none')
+            return;
+
+        //
+        // image object
+        //    
+        $xlm = 70;
+        $xrm = 20;
+        $ytm = 35;
+        $ybm = 60;
+        if ($graph == 'small')
+        {
+            $iw = 300 + $xrm + $xlm;
+            $ih = 100 + $ytm + $ybm;    
+        }
+        else
+        {
+            $iw = 600 + $xrm + $xlm;
+            $ih = 200 + $ytm + $ybm;
+        }
+
+        $im = imagecreatetruecolor($iw,$ih);
+
+        //
+        // colors
+        //
+	$cs = $colorscheme;
+	$cl['image_background'] = allocate_color($im, $cs['image_background']);
+	$cl['background'] = allocate_color($im, $cs['graph_background']);
+	$cl['background_2'] = allocate_color($im, $cs['graph_background_2']);
+        $cl['grid_stipple_1'] = allocate_color($im, $cs['grid_stipple_1']);
+        $cl['grid_stipple_2'] = allocate_color($im, $cs['grid_stipple_2']);
+        $cl['text'] = allocate_color($im, $cs['text']);
+        $cl['border'] = allocate_color($im, $cs['border']);
+        $cl['rx'] = allocate_color($im, $cs['rx']);
+        $cl['rx_border'] = allocate_color($im, $cs['rx_border']);
+        $cl['tx'] = allocate_color($im, $cs['tx']);
+        $cl['tx_border'] = allocate_color($im, $cs['tx_border']);
+	
+        imagefilledrectangle($im,0,0,$iw,$ih,$cl['image_background']);
+	imagefilledrectangle($im,$xlm,$ytm,$iw-$xrm,$ih-$ybm, $cl['background']);
+	
+	$x_step = ($iw - $xlm - $xrm) / 12;
+	$depth = ($x_step / 8) + 4;
+	imagefilledpolygon($im, array($xlm, $ytm, $xlm, $ih - $ybm, $xlm - $depth, $ih - $ybm + $depth, $xlm - $depth, $ytm + $depth), 4, $cl['background_2']);
+	imagefilledpolygon($im, array($xlm, $ih - $ybm, $xlm - $depth, $ih - $ybm + $depth, $iw - $xrm - $depth, $ih - $ybm  + $depth, $iw - $xrm, $ih - $ybm), 4, $cl['background_2']);
+
+	// draw title
+	$text = T('Traffic data for')." $iface";
+ 	$bbox = imagettfbbox(10, 0, GRAPH_FONT, $text);
+	$textwidth = $bbox[2] - $bbox[0];
+	imagettftext($im, 10, 0, ($iw-$textwidth)/2, ($ytm/2), $cl['text'], GRAPH_FONT, $text);
+		
+    }
+
+    function draw_border()
+    {
+        global $im,$cl,$iw,$ih;
+
+        imageline($im,     0,    0,$iw-1,    0, $cl['border']);
+        imageline($im,     0,$ih-1,$iw-1,$ih-1, $cl['border']);
+        imageline($im,     0,    0,    0,$ih-1, $cl['border']);  
+        imageline($im, $iw-1,    0,$iw-1,$ih-1, $cl['border']);
+    }
+    
+    function draw_grid($x_ticks, $y_ticks)
+    {
+        global $im, $cl, $iw, $ih, $xlm, $xrm, $ytm, $ybm;
+        $x_step = ($iw - $xlm - $xrm) / $x_ticks;
+        $y_step = ($ih - $ytm - $ybm) / $y_ticks;
+	
+	$depth = 10;//($x_step / 8) + 4;
+
+        $ls = array($cl['grid_stipple_1'],$cl['grid_stipple_2']);
+        imagesetstyle($im, $ls);
+        for ($i=$xlm;$i<=($iw-$xrm); $i += $x_step)
+        {
+            imageline($im, $i, $ytm, $i, $ih - $ybm, IMG_COLOR_STYLED);
+	    imageline($im, $i, $ih - $ybm, $i - $depth, $ih - $ybm + $depth, IMG_COLOR_STYLED);
+        }
+        for ($i=$ytm;$i<=($ih-$ybm); $i += $y_step)
+        {
+            imageline($im, $xlm, $i, $iw - $xrm, $i, IMG_COLOR_STYLED); 
+	    imageline($im, $xlm, $i, $xlm - $depth, $i + $depth, IMG_COLOR_STYLED);
+        }
+        imageline($im, $xlm, $ytm, $xlm, $ih - $ybm, $cl['border']);
+        imageline($im, $xlm, $ih - $ybm, $iw - $xrm, $ih - $ybm, $cl['border']);
+    }
+    
+    
+    function draw_data($data)
+    {
+        global $im,$cl,$iw,$ih,$xlm,$xrm,$ytm,$ybm;
+
+        sort($data);
+
+        $x_ticks = count($data);
+        $y_ticks = 10;
+        $y_scale = 1;
+        $prescale = 1;
+        $unit = 'K';
+        $offset = 0;
+        $gr_h = $ih - $ytm - $ybm;
+        $x_step = ($iw - $xlm - $xrm) / $x_ticks;
+        $y_step = ($ih - $ytm - $ybm) / $y_ticks;
+        $bar_w = ($x_step / 2) ;
+
+        //
+        // determine scale
+        //
+        $low = 99999999999;
+        $high = 0;
+        for ($i=0; $i<$x_ticks; $i++)
+        {
+            if ($data[$i]['rx'] < $low)
+            $low = $data[$i]['rx'];
+            if ($data[$i]['tx'] < $low)
+            $low = $data[$i]['tx'];
+            if ($data[$i]['rx'] > $high)
+            $high = $data[$i]['rx'];
+            if ($data[$i]['tx'] > $high)
+            $high = $data[$i]['tx'];
+        }
+
+        while ($high > ($prescale * $y_scale * $y_ticks))
+        {
+            $y_scale = $y_scale * 2;
+            if ($y_scale >= 1024)
+            {
+            $prescale = $prescale * 1024;
+            $y_scale = $y_scale / 1024;
+            if ($unit == 'K') 
+                $unit = 'M';
+            else if ($unit == 'M')
+                $unit = 'G';
+            else if ($unit == 'G')
+                $unit = 'T';
+            }
+        }
+
+        draw_grid($x_ticks, $y_ticks);
+	
+        //
+        // graph scale factor (per pixel)
+        //
+	imagesetthickness($im, 1);
+        $sf = ($prescale * $y_scale * $y_ticks) / $gr_h;
+
+        if ($data[0] == 'nodata')
+        {
+            $text = 'no data available';
+	    $bbox = imagettfbbox(10, 0, GRAPH_FONT, $text);
+	    $textwidth = $bbox[2] - $bbox[0];
+	    imagettftext($im, 10, 0, ($iw-$textwidth)/2, $ytm + 80, $cl['text'], GRAPH_FONT, $text);
+        }
+        else
+        {
+            //
+            // draw bars
+            //      
+            for ($i=0; $i<$x_ticks; $i++)
+            {
+        	$x = $xlm + ($i * $x_step);
+        	$y = $ytm + ($ih - $ytm - $ybm) - (($data[$i]['rx'] - $offset) / $sf);
+		
+		$depth = $x_step / 8;
+		$space = 0;
+		
+		$x1 = $x;
+		$y1 = $y;
+		$x2 = $x + $bar_w - $space;
+		$y2 = $ih - $ybm;
+		
+        	imagefilledrectangle($im, $x1, $y1, $x2, $y2, $cl['rx']);
+		imagerectangle($im, $x1, $y1, $x2, $y2, $cl['rx_border']);
+		
+		imagefilledrectangle($im, $x1 - $depth, $y1 + $depth, $x2 -$depth, $y2 + $depth, $cl['rx']);
+		imagerectangle($im, $x1 - $depth, $y1 + $depth, $x2 - $depth, $y2 + $depth, $cl['rx_border']);
+		
+		imagefilledpolygon($im, array($x1, $y1, $x2, $y1, $x2 - $depth, $y1 + $depth, $x1 - $depth, $y1 + $depth), 4, $cl['rx']);
+		imagepolygon($im, array($x1, $y1, $x2, $y1, $x2 - $depth, $y1 + $depth, $x1 - $depth, $y1 + $depth), 4, $cl['rx_border']);
+		imagefilledpolygon($im, array($x2, $y1, $x2, $y2, $x2 - $depth, $y2 + $depth, $x2 - $depth, $y1 + $depth), 4, $cl['rx']);
+		imagepolygon($im, array($x2, $y1, $x2, $y2, $x2 - $depth, $y2 + $depth, $x2 - $depth, $y1 + $depth), 4, $cl['rx_border']);
+
+        	$y1 = $ytm + ($ih - $ytm - $ybm) - (($data[$i]['tx'] - $offset) / $sf);
+		$x1 = $x1 + $bar_w;
+		$x2 = $x2 + $bar_w;
+
+        	imagefilledrectangle($im, $x1, $y1, $x2, $y2, $cl['tx']);
+		imagerectangle($im, $x1, $y1, $x2, $y2, $cl['tx_border']);
+		
+        	imagefilledrectangle($im, $x1 - $depth, $y1 + $depth, $x2 - $depth, $y2 + $depth, $cl['tx']);
+		imagerectangle($im, $x1 - $depth, $y1 + $depth, $x2 - $depth, $y2 + $depth, $cl['tx_border']);		
+		
+		imagefilledpolygon($im, array($x1, $y1, $x2, $y1, $x2 - $depth, $y1 + $depth, $x1 - $depth, $y1 + $depth), 4, $cl['tx']);
+		imagepolygon($im, array($x1, $y1, $x2, $y1, $x2 - $depth, $y1 + $depth, $x1 - $depth, $y1 + $depth), 4, $cl['tx_border']);
+		imagefilledpolygon($im, array($x2, $y1, $x2, $y2, $x2 - $depth, $y2 + $depth, $x2 - $depth, $y1 + $depth), 4, $cl['tx']);
+		imagepolygon($im, array($x2, $y1, $x2, $y2, $x2 - $depth, $y2 + $depth, $x2 - $depth, $y1 + $depth), 4, $cl['tx_border']);
+            }
+    
+            //
+            // axis labels
+            //
+            for ($i=0; $i<=$y_ticks; $i++)
+            {
+                $label = ($i * $y_scale).$unit;
+		$bbox = imagettfbbox(8, 0, GRAPH_FONT, $label);
+		$textwidth = $bbox[2] - $bbox[0];
+		imagettftext($im, 8, 0, $xlm - $textwidth - 16, ($ih - $ybm) - ($i * $y_step) + 8 + $depth, $cl['text'], GRAPH_FONT, $label);
+            }
+
+            for ($i=0; $i<$x_ticks; $i++)
+            {
+                $label = $data[$i]['img_label'];
+		$bbox = imagettfbbox(9, 0, GRAPH_FONT, $label);
+		$textwidth = $bbox[2] - $bbox[0];
+		imagettftext($im, 9, 0, $xlm + ($i * $x_step) + ($x_step / 2) - ($textwidth / 2) - $depth - 4, $ih - $ybm + 20 + $depth, $cl['text'], GRAPH_FONT, $label);
+            }
+        }
+
+        draw_border();
+
+
+        //
+        // legend
+        //
+        imagefilledrectangle($im, $xlm, $ih-$ybm+39, $xlm+8,$ih-$ybm+47,$cl['rx']);
+        imagerectangle($im, $xlm, $ih-$ybm+39, $xlm+8,$ih-$ybm+47,$cl['text']);
+	imagettftext($im, 8,0, $xlm+14, $ih-$ybm+48,$cl['text'], GRAPH_FONT,'bytes in');
+
+        imagefilledrectangle($im, $xlm+120 , $ih-$ybm+39, $xlm+128,$ih-$ybm+47,$cl['tx']);
+        imagerectangle($im, $xlm+120, $ih-$ybm+39, $xlm+128,$ih-$ybm+47,$cl['text']);
+	imagettftext($im, 8,0, $xlm+134, $ih-$ybm+48,$cl['text'], GRAPH_FONT,'bytes out'); 
+    }
+
+    function output_image()
+    {
+        global $page,$hour,$day,$month,$im,$iface;
+
+        if ($page == 'summary')
+            return;
+
+        init_image();
+
+        if ($page == 'h')
+        {
+            draw_data($hour);
+        }
+        else if ($page == 'd')
+        {
+            draw_data($day);
+        }
+        else if ($page == 'm')
+        {
+            draw_data($month);
+        }
+	
+        header('Content-type: image/png');	
+        imagepng($im);
+    }
+
+    get_vnstat_data();
+    output_image();
+?>        
diff --git a/config/vnstat2/vnstat_php_frontend/graph_svg.php b/config/vnstat2/vnstat_php_frontend/graph_svg.php
new file mode 100644
index 00000000..8992ed12
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/graph_svg.php
@@ -0,0 +1,362 @@
+<?php
+    //
+    // vnStat PHP frontend (c)2006-2010 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.
+    //
+    require 'config.php';
+    require 'localize.php';
+    require 'vnstat.php';
+
+    validate_input();
+
+    require "./themes/$style/theme.php";
+
+    function svg_create($width, $height)
+    {
+	header('Content-type: image/svg+xml');
+	print "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
+	print "<svg width=\"$width\" height=\"$height\" version=\"1.2\" baseProfile=\"tiny\" xmlns=\"http://www.w3.org/2000/svg\">\n";
+	print "<g style=\"shape-rendering: crispEdges\">\n";
+    }
+
+    function svg_end()
+    {
+	print "</g>\n";
+	print "</svg>\n";
+    }
+
+    function svg_options($options)
+    {
+	foreach ($options as $key => $value) {
+	    print "$key=\"$value\" ";
+	}
+    }
+
+    function svg_group($options)
+    {
+	print "<g ";
+	svg_options($options);
+	print ">\n";
+    }
+
+    function svg_group_end()
+    {
+	print "</g>\n";
+    }
+
+    function svg_text($x, $y, $text, $options = array()) 
+    {	
+	printf("<text x=\"%F\" y=\"%F\" ", $x, $y);
+	svg_options($options);
+	print ">$text</text>\n";
+    }
+
+    function svg_line($x1, $y1, $x2, $y2, $options = array())
+    {
+	printf("<line x1=\"%F\" y1=\"%F\" x2=\"%F\" y2=\"%F\" ", $x1, $y1, $x2, $y2);
+	svg_options($options);
+	print "/>\n";
+    }
+
+    function svg_rect($x, $y, $w, $h, $options = array()) 
+    {
+	printf("<rect x=\"%F\" y=\"%F\" width=\"%F\" height=\"%F\" ", $x, $y, $w, $h);
+	svg_options($options);
+	print "/>\n";
+    }
+
+    function svg_poly($points, $options = array())
+    {
+       print "<polygon points=\"";
+       for ($p = 0; $p < count($points); $p += 2) {
+	  printf("%F,%F ", $points[$p], $points[$p+1]);
+       }
+       svg_options($options);
+       print "\"/>\n";
+    }
+
+    function allocate_color($colors)
+    {
+	$col['rgb'] = sprintf("#%02X%02X%02X", $colors[0], $colors[1], $colors[2]);
+	$col['opacity'] = sprintf("%F", (127 - $colors[3]) / 127);
+	return $col;
+    }
+            
+    function init_image()
+    {
+        global $xlm, $xrm, $ytm, $ybm, $iw, $ih,$graph, $cl, $iface, $colorscheme, $style;
+
+        if ($graph == 'none')
+            return;
+
+        //
+        // image object
+        //    
+        $xlm = 70;
+        $xrm = 20;
+        $ytm = 35;
+        $ybm = 60;
+        if ($graph == 'small')
+        {
+            $iw = 300 + $xrm + $xlm;
+            $ih = 100 + $ytm + $ybm;    
+        }
+        else
+        {
+            $iw = 600 + $xrm + $xlm;
+            $ih = 200 + $ytm + $ybm;
+        }
+	
+	svg_create($iw, $ih);
+
+        //
+        // colors
+        //
+	$cs = $colorscheme;
+	$cl['image_background'] = allocate_color($cs['image_background']);
+	$cl['background'] = allocate_color($cs['graph_background']);
+	$cl['background_2'] = allocate_color($cs['graph_background_2']);
+        $cl['grid_stipple_1'] = allocate_color($cs['grid_stipple_1']);
+        $cl['grid_stipple_2'] = allocate_color($cs['grid_stipple_2']);
+        $cl['text'] = allocate_color($cs['text']);
+        $cl['border'] = allocate_color($cs['border']);
+        $cl['rx'] = allocate_color($cs['rx']);
+        $cl['rx_border'] = allocate_color($cs['rx_border']);
+        $cl['tx'] = allocate_color($cs['tx']);
+        $cl['tx_border'] = allocate_color($cs['tx_border']);
+	
+        svg_rect(0, 0, $iw, $ih, array( 'stroke' => 'none', 'stroke-width' => 0, 'fill' => $cl['image_background']['rgb']) );
+	svg_rect($xlm, $ytm, $iw-$xrm-$xlm, $ih-$ybm-$ytm, array( 'stroke' => 'none', 'stroke-width' => 0, 'fill' => $cl['background']['rgb']) );
+	
+	$depth = 12;
+	svg_group( array( 'stroke' => 'none', 'stroke-width' => 0, 'fill' => $cl['background_2']['rgb'], 'fill-opacity' => $cl['background_2']['opacity']) );
+	svg_poly(array($xlm, $ytm, $xlm, $ih - $ybm, $xlm - $depth, $ih - $ybm + $depth, $xlm - $depth, $ytm + $depth));
+	svg_poly(array($xlm, $ih - $ybm, $xlm - $depth, $ih - $ybm + $depth, $iw - $xrm - $depth, $ih - $ybm  + $depth, $iw - $xrm, $ih - $ybm));
+	svg_group_end();
+
+	// draw title
+	$text = T('Traffic data for')." $iface";
+	svg_text($iw / 2, ($ytm / 2), $text, array( 'stroke' => $cl['text'], 'fill' => $cl['text']['rgb'],'stroke-width' => 0, 'font-family' => SVG_FONT, 'font-weight' => 'bold', 'text-anchor' => 'middle' ));
+    }
+
+    function draw_border()
+    {
+        global $cl, $iw, $ih;
+	svg_rect(1, 1, $iw-2, $ih-2, array( 'stroke' => $cl['border']['rgb'], 'stroke-opacity' => $cl['border']['opacity'], 'stroke-width' => 1, 'fill' => 'none') );
+    }
+    
+    function draw_grid($x_ticks, $y_ticks)
+    {
+        global $cl, $iw, $ih, $xlm, $xrm, $ytm, $ybm;
+        $x_step = ($iw - $xlm - $xrm) / $x_ticks;
+        $y_step = ($ih - $ytm - $ybm) / $y_ticks;
+	
+	$depth = 12;
+
+	svg_group( array( 'stroke' => $cl['grid_stipple_1']['rgb'], 'stroke-opacity' => $cl['grid_stipple_1']['opacity'], 'stroke-width' => '1px', 'stroke-dasharray' => '1,1' ) );
+        for ($i = $xlm; $i <= ($iw - $xrm); $i += $x_step)
+        {
+	    svg_line($i, $ytm, $i, $ih-$ybm);
+            svg_line($i, $ih-$ybm, $i-$depth, $ih-$ybm+$depth);
+        }
+        for ($i = $ytm; $i <= ($ih - $ybm); $i += $y_step)
+        {
+            svg_line($xlm, $i, $iw - $xrm, $i); 
+	    svg_line($xlm, $i, $xlm - $depth, $i + $depth);
+        }
+	svg_group_end();
+
+	svg_group( array( 'stroke' => $cl['border']['rgb'], 'stroke-width' => '1px', 'stroke-opacity' => $cl['border']['opacity'] ) );
+        svg_line($xlm, $ytm, $xlm, $ih - $ybm);
+        svg_line($xlm, $ih - $ybm, $iw - $xrm, $ih - $ybm);
+	svg_group_end();
+    }
+    
+    
+    function draw_data($data)
+    {
+        global $cl,$iw,$ih,$xlm,$xrm,$ytm,$ybm;
+
+        sort($data);
+
+        $x_ticks = count($data);
+        $y_ticks = 10;
+        $y_scale = 1;
+        $prescale = 1;
+        $unit = 'K';
+        $offset = 0;
+        $gr_h = $ih - $ytm - $ybm;
+        $x_step = ($iw - $xlm - $xrm) / $x_ticks;
+        $y_step = ($ih - $ytm - $ybm) / $y_ticks;
+        $bar_w = ($x_step / 2) ;
+
+        //
+        // determine scale
+        //
+        $low = 99999999999;
+        $high = 0;
+        for ($i=0; $i<$x_ticks; $i++)
+        {
+            if ($data[$i]['rx'] < $low)
+            $low = $data[$i]['rx'];
+            if ($data[$i]['tx'] < $low)
+            $low = $data[$i]['tx'];
+            if ($data[$i]['rx'] > $high)
+            $high = $data[$i]['rx'];
+            if ($data[$i]['tx'] > $high)
+            $high = $data[$i]['tx'];
+        }
+
+        while ($high > ($prescale * $y_scale * $y_ticks))
+        {
+            $y_scale = $y_scale * 2;
+            if ($y_scale >= 1024)
+            {
+            $prescale = $prescale * 1024;
+            $y_scale = $y_scale / 1024;
+            if ($unit == 'K') 
+                $unit = 'M';
+            else if ($unit == 'M')
+                $unit = 'G';
+            else if ($unit == 'G')
+                $unit = 'T';
+            }
+        }
+
+        draw_grid($x_ticks, $y_ticks);
+	
+        //
+        // graph scale factor (per pixel)
+        //
+        $sf = ($prescale * $y_scale * $y_ticks) / $gr_h;
+
+        if ($data[0] == 'nodata')
+        {
+            $text = 'no data available';
+	    svg_text($iw/2, $ytm + 80, $text, array( 'stroke' => $cl['text']['rgb'], 'fill' => $cl['text']['rgb'], 'stroke-width' => 0, 'font-family' => SVG_FONT, 'font-size' => '16pt', 'text-anchor' => 'middle') );
+        }
+        else
+        {
+            //
+            // draw bars
+            //      
+            for ($i=0; $i<$x_ticks; $i++)
+            {
+        	$x = $xlm + ($i * $x_step);
+        	$y = $ytm + ($ih - $ytm - $ybm) - (($data[$i]['rx'] - $offset) / $sf);
+		
+		$depth = ($x_ticks < 20) ? 8 : 6;
+		$space = 0;
+		
+		$x1 = (int)$x;
+		$y1 = (int)$y;
+		$w = (int)($bar_w - $space);
+		$h = (int)($ih - $ybm - $y);
+		$x2 = (int)($x + $bar_w - $space);
+		$y2 = (int)($ih - $ybm);
+		
+		svg_group( array( 'stroke' => $cl['rx_border']['rgb'], 'stroke-opacity' => $cl['rx_border']['opacity'], 
+				  'stroke-width' => 1, 'stroke-linejoin' => 'round',
+			          'fill' => $cl['rx']['rgb'], 'fill-opacity' => $cl['rx']['opacity'] ) );
+        	svg_rect($x1, $y1, $w, $h);
+		svg_rect($x1 - $depth, $y1 + $depth, $w, $h);
+		svg_poly(array($x1, $y1, $x2, $y1, $x2 - $depth, $y1 + $depth, $x1 - $depth, $y1 + $depth));
+		svg_poly(array($x2, $y1, $x2, $y2, $x2 - $depth, $y2 + $depth, $x2 - $depth, $y1 + $depth));
+		svg_group_end();
+
+        	$y1 = (int)($ytm + ($ih - $ytm - $ybm) - (($data[$i]['tx'] - $offset) / $sf));
+		$x1 = (int)($x1 + $bar_w);
+		$x2 = (int)($x2 + $bar_w);
+		$w = (int)($bar_w - $space);
+		$h = (int)($ih - $ybm - $y1 - 1);
+
+		svg_group( array( 'stroke' => $cl['tx_border']['rgb'], 'stroke-opacity' => $cl['tx_border']['opacity'], 
+				  'stroke-width' => 1, 'stroke-linejoin' => 'round',
+			          'fill' => $cl['tx']['rgb'], 'fill-opacity' => $cl['tx']['opacity'] ) );
+        	svg_rect($x1, $y1, $w, $h);
+		svg_rect($x1 - $depth, $y1 + $depth, $w, $h);
+		svg_poly(array($x1, $y1, $x2, $y1, $x2 - $depth, $y1 + $depth, $x1 - $depth, $y1 + $depth));
+		svg_poly(array($x2, $y1, $x2, $y2, $x2 - $depth, $y2 + $depth, $x2 - $depth, $y1 + $depth));
+		svg_group_end();
+            }
+    
+            //
+            // axis labels
+            //
+	    svg_group( array( 'fill' => $cl['text']['rgb'], 'fill-opacity' => $cl['text']['opacity'], 'stroke-width' => '0', 'font-family' => SVG_FONT, 'font-size' => '10pt', 'text-anchor' => 'end' ) );
+            for ($i=0; $i<=$y_ticks; $i++)
+            {
+                $label = ($i * $y_scale).$unit;
+		$tx = $xlm - 16;
+		$ty = (int)(($ih - $ybm) - ($i * $y_step) + 8 + $depth);
+		svg_text($tx, $ty, $label);
+            }
+	    svg_group_end();
+
+	    svg_group( array( 'fill' => $cl['text']['rgb'], 'fill-opacity' => $cl['text']['opacity'], 'stroke-width' => '0', 'font-family' => SVG_FONT, 'font-size' => '10pt', 'text-anchor' => 'middle' ) );
+            for ($i=0; $i<$x_ticks; $i++)
+            {
+                $label = $data[$i]['img_label'];
+		svg_text($xlm + ($i * $x_step) + ($x_step / 2) - $depth - 4, $ih - $ybm + 20 + $depth, $label);
+            }
+	    svg_group_end();
+        }
+
+        draw_border();
+
+
+        //
+        // legend
+        //
+        svg_rect($xlm, $ih-$ybm+39, 8, 8, array( 'stroke' => $cl['text']['rgb'], 'stroke-width' => 1, 'fill' => $cl['rx']['rgb']) );
+	svg_text($xlm+14, $ih-$ybm+48, T('bytes in'), array( 'fill' => $cl['text']['rgb'], 'stroke-width' => 0, 'font-family' => SVG_FONT, 'font-size' => '8pt') );
+
+        svg_rect($xlm+120 , $ih-$ybm+39, 8, 8, array( 'stroke' => $cl['text']['rgb'], 'stroke-width' => 1, 'fill' => $cl['tx']['rgb']) );
+	svg_text($xlm+134, $ih-$ybm+48, T('bytes out'), array( 'fill' => $cl['text']['rgb'], 'stroke-width' => 0, 'font-family' => SVG_FONT, 'font-size' => '8pt') );
+    }
+
+    function output_image()
+    {
+        global $page,$hour,$day,$month,$iface;
+
+        if ($page == 'summary')
+            return;
+
+        init_image();
+
+        if ($page == 'h')
+        {
+            draw_data($hour);
+        }
+        else if ($page == 'd')
+        {
+            draw_data($day);
+        }
+        else if ($page == 'm')
+        {
+            draw_data($month);
+        }
+
+	svg_end();
+    }
+
+    get_vnstat_data();
+    output_image();
+?>        
diff --git a/config/vnstat2/vnstat_php_frontend/index.php b/config/vnstat2/vnstat_php_frontend/index.php
new file mode 100644
index 00000000..70c0427f
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/index.php
@@ -0,0 +1,196 @@
+<?php
+    //
+    // vnStat PHP frontend (c)2006-2010 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.
+    //
+    require 'config.php';
+    require 'localize.php';
+    require 'vnstat.php';
+
+    validate_input();
+
+    require "./themes/$style/theme.php";
+
+    function write_side_bar()
+    {
+        global $iface, $page, $graph, $script, $style;
+        global $iface_list, $iface_title;   
+        global $page_list, $page_title;
+        
+        $p = "&amp;graph=$graph&amp;style=$style";
+
+        print "<ul class=\"iface\">\n";
+        foreach ($iface_list as $if)
+        {
+            print "<li class=\"iface\">";
+            if (isset($iface_title[$if]))
+            {
+                print $iface_title[$if];
+            }
+            else
+            {
+                print $if;
+            }
+            print "<ul class=\"page\">\n";
+            foreach ($page_list as $pg)
+            {
+                print "<li class=\"page\"><a href=\"$script?if=$if$p&amp;page=$pg\">".$page_title[$pg]."</a></li>\n";
+            }
+            print "</ul></li>\n";
+	    
+        }
+        print "</ul>\n"; 
+    }
+    
+
+    function kbytes_to_string($kb)
+    {
+        $units = array('TB','GB','MB','KB');
+        $scale = 1024*1024*1024;
+        $ui = 0;
+
+        while (($kb < $scale) && ($scale > 1))
+        {
+            $ui++;
+            $scale = $scale / 1024;
+        }   
+        return sprintf("%0.2f %s", ($kb/$scale),$units[$ui]);
+    }
+    
+    function write_summary()
+    {
+        global $summary,$top,$day,$hour,$month;
+
+        $trx = $summary['totalrx']*1024+$summary['totalrxk'];
+        $ttx = $summary['totaltx']*1024+$summary['totaltxk'];
+
+        //
+        // build array for write_data_table
+        //
+        $sum[0]['act'] = 1;
+        $sum[0]['label'] = T('This hour');
+        $sum[0]['rx'] = $hour[0]['rx'];
+        $sum[0]['tx'] = $hour[0]['tx'];
+
+        $sum[1]['act'] = 1;
+        $sum[1]['label'] = T('This day');
+        $sum[1]['rx'] = $day[0]['rx'];
+        $sum[1]['tx'] = $day[0]['tx'];
+
+        $sum[2]['act'] = 1;
+        $sum[2]['label'] = T('This month');
+        $sum[2]['rx'] = $month[0]['rx'];
+        $sum[2]['tx'] = $month[0]['tx'];
+
+        $sum[3]['act'] = 1;
+        $sum[3]['label'] = T('All time');
+        $sum[3]['rx'] = $trx;
+        $sum[3]['tx'] = $ttx;
+
+        write_data_table(T('Summary'), $sum);
+        print "<br/>\n";
+        write_data_table(T('Top 10 days'), $top);
+    }
+    
+    
+    function write_data_table($caption, $tab)
+    {
+        print "<table width=\"100%\" cellspacing=\"0\">\n";
+        print "<caption>$caption</caption>\n";
+        print "<tr>";
+        print "<th class=\"label\" style=\"width:120px;\">&nbsp;</th>";
+        print "<th class=\"label\">".T('In')."</th>";
+        print "<th class=\"label\">".T('Out')."</th>";
+        print "<th class=\"label\">".T('Total')."</th>";  
+        print "</tr>\n";
+
+        for ($i=0; $i<count($tab); $i++)
+        {
+            if ($tab[$i]['act'] == 1)
+            {
+                $t = $tab[$i]['label'];
+                $rx = kbytes_to_string($tab[$i]['rx']);
+                $tx = kbytes_to_string($tab[$i]['tx']);
+                $total = kbytes_to_string($tab[$i]['rx']+$tab[$i]['tx']);
+                $id = ($i & 1) ? 'odd' : 'even';
+                print "<tr>";
+                print "<td class=\"label_$id\">$t</td>";
+                print "<td class=\"numeric_$id\">$rx</td>";
+                print "<td class=\"numeric_$id\">$tx</td>";
+                print "<td class=\"numeric_$id\">$total</td>";
+                print "</tr>\n";
+             }
+        }
+        print "</table>\n";
+    }
+
+    get_vnstat_data();
+
+    //
+    // html start
+    //
+    header('Content-type: text/html; charset=utf-8');
+    print '<?xml version="1.0"?>';
+?>        
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>vnStat - PHP frontend</title>
+  <link rel="stylesheet" type="text/css" href="themes/<?php echo $style ?>/style.css"/>
+</head>
+<body>
+
+<div id="wrap">
+  <div id="sidebar"><?php write_side_bar(); ?></div>
+   <div id="content">
+    <div id="header"><?php print T('Traffic data for')." $iface_title[$iface] ($iface)";?></div>
+    <div id="main">
+    <?php
+    $graph_params = "if=$iface&amp;page=$page&amp;style=$style";
+    if ($page != 's')
+        if ($graph_format == 'svg') {
+	     print "<object type=\"image/svg+xml\" width=\"692\" height=\"297\" data=\"graph_svg.php?$graph_params\"></object>\n";
+        } else {
+	     print "<img src=\"graph.php?$graph_params\" alt=\"graph\"/>\n";	
+        }
+
+    if ($page == 's')
+    {
+        write_summary();
+    }
+    else if ($page == 'h')
+    {   
+        write_data_table(T('Last 24 hours'), $hour); 
+    }
+    else if ($page == 'd')
+    {
+        write_data_table(T('Last 30 days'), $day);	
+    }
+    else if ($page == 'm')
+    {
+        write_data_table(T('Last 12 months'), $month);   
+    }
+    ?>
+    </div>
+    <div id="footer"><a href="http://www.sqweek.com/">vnStat PHP frontend</a> 1.5.1 - &copy;2006-2010 Bjorge Dijkstra (bjd _at_ jooz.net)</div>
+  </div>
+</div>
+
+</body></html>
diff --git a/config/vnstat2/vnstat_php_frontend/lang/cs.php b/config/vnstat2/vnstat_php_frontend/lang/cs.php
new file mode 100644
index 00000000..8704a503
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/lang/cs.php
@@ -0,0 +1,39 @@
+<?php
+
+// sidebar labels
+$L['summary'] = 'shrnutí';
+$L['hours'] = 'hodiny';
+$L['days'] = 'dny';
+$L['months'] = 'měsíce';
+
+// main table headers
+$L['Summary'] = 'Shrnutí';
+$L['Top 10 days'] = 'Nej 10 dní';
+$L['Last 24 hours'] = 'Posledních 24 hodin';
+$L['Last 30 days'] = 'Posledních 30 dní';
+$L['Last 12 months'] = 'Posledních 12 měsíců';
+
+// traffic table columns
+$L['In'] = 'Stahování';
+$L['Out'] = 'Odesílání';
+$L['Total'] = 'Celkem';
+
+// summary rows
+$L['This hour'] = 'Tato hodina';
+$L['This day'] = 'Tento den';
+$L['This month'] = 'Tento měsíc';
+$L['All time'] = 'Za celou dobu';
+
+// graph text
+$L['Traffic data for'] = 'Přehled pro';
+$L['bytes in'] = 'bytů staženo';
+$L['bytes out'] = 'bytů odesláno';
+
+// date formats
+$L['datefmt_days'] = '%d. %B';
+$L['datefmt_days_img'] = '%d';
+$L['datefmt_months'] = '%B %Y';
+$L['datefmt_months_img'] = '%b';
+$L['datefmt_hours'] = '%k%P';
+$L['datefmt_hours_img'] = '%k';
+$L['datefmt_top'] = '%d. %B %Y';
diff --git a/config/vnstat2/vnstat_php_frontend/lang/en.php b/config/vnstat2/vnstat_php_frontend/lang/en.php
new file mode 100644
index 00000000..b930ef2b
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/lang/en.php
@@ -0,0 +1,39 @@
+<?php
+
+// sidebar labels
+$L['summary'] = 'summary';
+$L['hours'] = 'hours';
+$L['days'] = 'days';
+$L['months'] = 'months';
+
+// main table headers
+$L['Summary'] = 'Summary';
+$L['Top 10 days'] = 'Top 10 days';
+$L['Last 24 hours'] = 'Last 24 hours';
+$L['Last 30 days'] = 'Last 30 days';
+$L['Last 12 months'] = 'Last 12 months';
+
+// traffic table columns
+$L['In'] = 'In';
+$L['Out'] = 'Out';
+$L['Total'] = 'Total';
+
+// summary rows
+$L['This hour'] = 'This hour';
+$L['This day'] = 'This day';
+$L['This month'] = 'This month';
+$L['All time'] = 'All time';
+
+// graph text
+$L['Traffic data for'] = 'Traffic data for';
+$L['bytes in'] = 'bytes in';
+$L['bytes out'] = 'bytes out';
+
+// date formats
+$L['datefmt_days'] = '%d %B';
+$L['datefmt_days_img'] = '%d';
+$L['datefmt_months'] = '%B %Y';
+$L['datefmt_months_img'] = '%b';
+$L['datefmt_hours'] = '%l%P';
+$L['datefmt_hours_img'] = '%l';
+$L['datefmt_top'] = '%d %B %Y';
diff --git a/config/vnstat2/vnstat_php_frontend/lang/nl.php b/config/vnstat2/vnstat_php_frontend/lang/nl.php
new file mode 100644
index 00000000..76691e0a
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/lang/nl.php
@@ -0,0 +1,40 @@
+<?php
+
+// sidebar labels
+$L['summary'] = 'samenvatting';
+$L['hours'] = 'uren';
+$L['days'] = 'dagen';
+$L['months'] = 'maanden';
+
+// main table headers
+$L['Summary'] = 'Samenvatting';
+$L['Top 10 days'] = 'Top 10 dagen';
+$L['Last 24 hours'] = 'Afgelopen 24 uur';
+$L['Last 30 days'] = 'Afgelopen 30 dagen';
+$L['Last 12 months'] = 'Afgelopen 12 maanden';
+
+// traffic table columns
+$L['In'] = 'In';
+$L['Out'] = 'Uit';
+$L['Total'] = 'Totaal';
+
+// summary rows
+$L['This hour'] = 'Dit uur';
+$L['This day'] = 'Deze dag';
+$L['This month'] = 'Deze maand';
+$L['All time'] = 'Altijd';
+
+// graph text
+$L['Traffic data for'] = 'Data verkeer voor';
+$L['bytes in'] = 'bytes in';
+$L['bytes out'] = 'bytes uit';
+
+// date formats
+$L['datefmt_days'] = '%d %B';
+$L['datefmt_days_img'] = '%d';
+$L['datefmt_months'] = '%B %Y';
+$L['datefmt_months_img'] = '%b';
+$L['datefmt_hours'] = '%H:%M';
+$L['datefmt_hours_img'] = '%H';
+$L['datefmt_top'] = '%d %B %Y';
+
diff --git a/config/vnstat2/vnstat_php_frontend/localize.php b/config/vnstat2/vnstat_php_frontend/localize.php
new file mode 100644
index 00000000..3695912f
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/localize.php
@@ -0,0 +1,15 @@
+<?php
+    // setup locale and translation
+    setlocale(LC_ALL, $locale);
+    require "lang/$language.php";
+
+    function T($str)
+    {
+        global $L;
+        if (isset($L[$str]))
+            return $L[$str];
+        else
+            return $str;
+    }
+
+?>
diff --git a/config/vnstat2/vnstat_php_frontend/themes/dark/style.css b/config/vnstat2/vnstat_php_frontend/themes/dark/style.css
new file mode 100644
index 00000000..8cf475fe
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/dark/style.css
@@ -0,0 +1,21 @@
+* {margin:0; padding:0;}
+body {background:#2f2f2f; font-family:Verdana; font-size:12px;}
+#wrap {width: 960px; background:#242424; padding:10px; margin:0 auto; border:1px solid #474747;}
+#sidebar {width: 160px; float: left; padding: 3px 4px; color: #fff; background-color: #2F2F2F; border:1px solid #474747; -moz-border-radius:8px;}
+#sidebar ul.iface {}
+#sidebar li.iface {list-style-type:none; color:#08BB08; text-transform:uppercase; padding-bottom:10px; text-align:center;}
+#sidebar a{color:#aaa;}
+#sidebar ul.page {}
+#sidebar li.page {list-style-type:none; text-transform:none;}
+#content {margin-left: 180px; width: 780px;}
+#header {padding: 3px; color: #fff; background-color: #2F2F2F; text-align: center; border:1px solid #474747; font-size:14px; font-weight:bold; -moz-border-radius:8px;}
+#footer {padding: 3px; color: #fff; background-color: #2F2F2F; text-align: center; border:1px solid #474747; font-size:11px; -moz-border-radius:8px; clear:both; margin-top:10px;}
+#footer a {color:#fff;}
+#main {padding: 10px 10px 10px 10px; color: #fff; background-color: #2F2F2F; text-align: center; border:1px solid #474747; -moz-border-radius:8px; margin-top:10px;}
+#main td {padding:1px 0;}
+#main td.numeric_odd {text-align: right; color: #fff; background:#474747;}
+#main td.numeric_even {text-align: right; color: #fff; background:#242424;}
+#main td.label_odd {color: #fff; background:#474747;}
+#main td.label_even {color: #fff; background:#242424;}
+#main th.label {color: #fff; padding:2px 0; border-bottom:1px solid #fff;}
+#main caption {padding: 3px 0 4px 0; color:#08BB08; text-transform:uppercase;}
\ No newline at end of file
diff --git a/config/vnstat2/vnstat_php_frontend/themes/dark/theme.php b/config/vnstat2/vnstat_php_frontend/themes/dark/theme.php
new file mode 100644
index 00000000..6df45cb2
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/dark/theme.php
@@ -0,0 +1,16 @@
+<?php
+	// A dark colorscheme based on a contribution by Mart Visser
+	$colorscheme = array(
+		'image_background'   => array(  36,  36,  36,   0 ),
+		'graph_background'   => array( 220, 220, 230,   0 ),
+		'graph_background_2' => array( 205, 205, 220,   0 ),
+		'grid_stipple_1'     => array( 140, 140, 140,   0 ),
+		'grid_stipple_2'     => array( 200, 200, 200,   0 ),
+		'border'             => array(  71,  71,  71,   0 ),
+		'text'               => array(  255,  255,  255,0 ),
+		'rx'                 => array(  10, 180,  10,  50 ),
+		'rx_border'          => array(  0, 120,  0,  90   ),
+		'tx'                 => array( 130, 130, 130,  50 ),
+		'tx_border'          => array(  60,  60,  60,  90 )
+	);
+?>
diff --git a/config/vnstat2/vnstat_php_frontend/themes/espresso/style.css b/config/vnstat2/vnstat_php_frontend/themes/espresso/style.css
new file mode 100644
index 00000000..e5dff7f9
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/espresso/style.css
@@ -0,0 +1,170 @@
+body
+{
+	background-color: #363330;
+	margin: 8px;
+	padding: 0;
+}
+
+#content
+{
+    width: 898px;
+}
+
+#sidebar
+{
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    width: 160px;
+    border-right: 1px solid #D3CAAA;
+    border-collapse: collapse;
+    float: left;
+}
+
+#sidebar ul.iface
+{
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px dashed #D3CAAA;
+    background-color: #363330;
+    color: #D3CAAA;
+}
+
+#sidebar li.iface
+{
+    list-style-type: none;
+    margin: 0px;
+    padding: 0px;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    border-bottom: 1px dashed #D3CAAA;
+}
+
+#sidebar a
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+}
+
+#sidebar ul.page
+{
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px dashed #D3CAAA;
+}
+
+#sidebar li.page
+{
+    list-style-type: none;
+    margin: 0px;
+    padding: 4px;
+    border: none;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.75em;
+    font-weight: normal;
+    text-align: right;
+    background-color: #413D39;
+    color: #D3CAAA;
+}
+
+
+#header
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 0px 8px 0px 8px;
+    border-width: 1px 1px 1px 1px;
+    border-style: dashed solid dashed solid;
+    border-color: #D3CAAA;
+    border-collapse: collapse;
+    background-color: #363330;
+    color: #D3CAAA;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    text-align: center;
+}
+
+#footer
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 2px 8px 2px 8px;
+    border-width: 1px 1px 1px 1px;
+    border-style: solid;
+    border-color: #D3CAAA;
+    border-collapse: collapse;
+    background-color: #363330;
+    color: #D3CAAA;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.70em;
+    text-align: center;
+}
+
+#main
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 8px 8px 8px 8px;
+    border-left: 1px solid #D3CAAA;
+    border-right: 1px solid #D3CAAA;
+    border-collapse: collapse;
+}
+
+#main td
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.8em;
+}
+
+#main td.numeric_odd
+{
+    text-align: right;
+    background-color: #756F68;
+    color: #D3CAAA;
+}
+
+#main td.numeric_even
+{
+    text-align: right;
+    background-color: #544C4A;
+    color: #D3CAAA;
+}
+
+#main td.label_odd
+{
+    background-color: #413D39;
+    color: #D3CAAA;
+}
+
+#main td.label_even
+{
+    background-color: #5A514F;
+    color: #D3CAAA;
+}
+
+#main th.label
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    background-color: #413D39;
+    color: #D3CAAA;
+}
+
+#main caption
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1.25em;
+    font-weight: bold;
+    padding: 4px;
+    color: #D3CAAA;
+}
+
+a
+{
+    text-decoration: none;
+    color: #D3CAAA;
+}
diff --git a/config/vnstat2/vnstat_php_frontend/themes/espresso/theme.php b/config/vnstat2/vnstat_php_frontend/themes/espresso/theme.php
new file mode 100644
index 00000000..3c7818f5
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/espresso/theme.php
@@ -0,0 +1,17 @@
+<?php
+	// A dark colorscheme based on a contribution by Márcio Bremm
+	// It is based also on Espresso (gtkrc theme) by Jesse L. Kay
+	$colorscheme = array(
+		'image_background'   => array( 065, 061, 057,   0 ),
+		'graph_background'   => array( 117, 111, 104,  30 ),
+		'graph_background_2' => array( 128, 122, 102,  30 ),
+		'grid_stipple_1'     => array( 140, 140, 140,   0 ),
+		'grid_stipple_2'     => array( 200, 200, 200,   0 ),
+		'border'             => array( 211, 202, 170,   0 ),
+		'text'               => array( 211, 202, 170,   0 ),
+		'rx'                 => array( 211, 202, 170,  50 ),
+		'rx_border'	       => array(  80,  40,  40,  90 ),
+		'tx'	              => array( 163, 156, 131,  50 ),
+		'tx_border'          => array(  60,  60,  60,  90 )
+	);
+?>
diff --git a/config/vnstat2/vnstat_php_frontend/themes/light/style.css b/config/vnstat2/vnstat_php_frontend/themes/light/style.css
new file mode 100644
index 00000000..28503f1d
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/light/style.css
@@ -0,0 +1,159 @@
+body 
+{
+    margin: 0;
+    padding: 0;
+}
+
+#wrap
+{
+   xwidth: 868px;
+}
+
+#sidebar
+{
+    width: 160px;
+    border-right: 1px solid #99b;
+    border-collapse: collapse;
+    float: left;
+}
+
+#sidebar ul.iface
+{
+    margin: 0;
+    padding: 0;
+    border-top: 1px solid #99b;    
+    color: #000;
+    background-color: #eef;
+}
+
+#sidebar li.iface
+{
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    xborder-top: 1px solid #99b;
+    border-bottom: 1px solid #99b;
+}
+
+#sidebar a
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+}
+
+#sidebar ul.page
+{
+    margin: 0;
+    padding: 0;
+    border-top: 1px solid #99b;
+}
+
+#sidebar li.page 
+{
+    margin: 0;
+    padding: 4px;
+    border: none;
+    list-style-type: none;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.75em;
+    font-weight: normal;
+    text-align: right;
+    color: #000;    
+    background-color: #fff;
+}
+
+#content
+{
+    margin-left: 160px;
+    width: 720px;
+}
+
+
+#header
+{
+    padding: 0px 8px 0px 8px;
+    border-width: 1px;
+    border-style: solid solid solid solid;
+    border-color: #99b;
+    border-collapse: collapse;
+    color: #000;    
+    background-color: #eef;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;    
+    text-align: center;
+}
+
+#footer
+{
+    padding: 2px 8px 2px 8px;
+    border: 1px solid #99b;
+    border-collapse: collapse;
+    color: #000;    
+    background-color: #eef;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.65em;
+    font-weight: bold;    
+    text-align: center;
+}
+
+#main
+{
+    padding: 8px;
+    border-left: 1px solid #99b;
+    border-right: 1px solid #99b;    
+    border-collapse: collapse;
+}
+
+#main td
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.8em;
+}
+
+#main td.numeric_odd
+{
+    text-align: right;
+    color: #000;
+    background-color: #eef;
+}
+
+#main td.numeric_even
+{
+    text-align: right;
+    color: #000;    
+    background-color: #fff;
+}
+
+#main td.label_odd
+{
+    color: #000;
+    background-color: #dde;
+}
+
+#main td.label_even
+{
+    color: #000;
+    background-color: #eee;
+}
+
+#main th.label
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    color: #000;    
+    background-color: #dde;
+}
+
+#main caption
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1.25em;
+    font-weight: bold;
+    padding: 4px;
+}
diff --git a/config/vnstat2/vnstat_php_frontend/themes/light/theme.php b/config/vnstat2/vnstat_php_frontend/themes/light/theme.php
new file mode 100644
index 00000000..2516c874
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/light/theme.php
@@ -0,0 +1,15 @@
+<?php
+	$colorscheme = array(
+		'image_background'   => array( 255, 255, 255,   0 ),
+		'graph_background'   => array( 220, 220, 230,   0 ),
+		'graph_background_2' => array( 205, 205, 220,   0 ),
+		'grid_stipple_1'     => array( 140, 140, 140,   0 ),
+		'grid_stipple_2'     => array( 200, 200, 200,   0 ),
+		'border'             => array(   0,   0,   0,   0 ),
+		'text'               => array(   0,   0,   0,   0 ),
+		'rx'                 => array( 190, 190,  20,  50 ),
+		'rx_border'	       => array(  40,  80,  40,  90 ),
+		'tx'	              => array( 130, 160, 100,  50 ),
+		'tx_border'          => array(  80,  40,  40,  90 )
+	);
+?>
diff --git a/config/vnstat2/vnstat_php_frontend/themes/pfSense/style.css b/config/vnstat2/vnstat_php_frontend/themes/pfSense/style.css
new file mode 100644
index 00000000..0136624d
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/pfSense/style.css
@@ -0,0 +1,170 @@
+body
+{
+	background-color: #FFFFFF;
+	margin: 8px;
+	padding: 0;
+}
+
+#content
+{
+    width: 898px;
+}
+
+#sidebar
+{
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    width: 160px;
+    border-right: 1px solid #990000;
+    border-collapse: collapse;
+    float: left;
+}
+
+#sidebar ul.iface
+{
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px dashed #990000;
+    background-color: #990000;
+    color: #FFFFFF;
+}
+
+#sidebar li.iface
+{
+    list-style-type: none;
+    margin: 1px;
+    padding: 0px;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    border-bottom: 1px dashed #990000;
+}
+
+#sidebar a
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+}
+
+#sidebar ul.page
+{
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px dashed #990000;
+}
+
+#sidebar li.page
+{
+    list-style-type: none;
+    margin: 0px;
+    padding: 4px;
+    border: none;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.75em;
+    font-weight: normal;
+    text-align: right;
+    background-color: #BBBBBB;
+    color: #000000;
+}
+
+
+#header
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 0px 8px 0px 8px;
+    border-width: 1px 1px 1px 1px;
+    border-style: dashed solid dashed solid;
+    border-color: #990000;
+    border-collapse: collapse;
+    background-color: #990000;
+    color: #FFFFFF;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    text-align: center;
+}
+
+#footer
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 2px 8px 2px 8px;
+    border-width: 1px 1px 1px 1px;
+    border-style: solid;
+    border-color: #82001D;
+    border-collapse: collapse;
+    background-color: #D2D2D2;
+    color: #82001D;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.70em;
+    text-align: center;
+}
+
+#main
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 8px 8px 8px 8px;
+    border-left: 1px solid #82001D;
+    border-right: 1px solid #82001D;
+    border-collapse: collapse;
+}
+
+#main td
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.8em;
+}
+
+#main td.numeric_odd
+{
+    text-align: right;
+    background-color: #C9C9C9;
+    color: #82001D;
+}
+
+#main td.numeric_even
+{
+    text-align: right;
+    background-color: #CFCFCF;
+    color: #82001D;
+}
+
+#main td.label_odd
+{
+    background-color: #A6A6A6;
+    color: #82001D;
+}
+
+#main td.label_even
+{
+    background-color: #C1C1C1;
+    color: #82001D;
+}
+
+#main th.label
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    background-color: #A6A6A6;
+    color: #82001D;
+}
+
+#main caption
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1.25em;
+    font-weight: bold;
+    padding: 4px;
+    color: #82001D;
+}
+
+a
+{
+    text-decoration: none;
+    color: #000000;
+}
diff --git a/config/vnstat2/vnstat_php_frontend/themes/pfSense/theme.php b/config/vnstat2/vnstat_php_frontend/themes/pfSense/theme.php
new file mode 100644
index 00000000..6489f842
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/pfSense/theme.php
@@ -0,0 +1,17 @@
+<?php
+	// A red colorscheme based on a contribution by Perry Mason
+	// Updated by Bryan Paradis to fit with vnstat2_php_frontend-1.5.1
+	$colorscheme = array(
+		'image_background'   => array( 240, 240, 240,   0 ),
+		'graph_background'   => array( 255, 255, 255,   0 ),
+		'graph_background_2' => array( 255, 255, 255,   0 ),
+		'grid_stipple_1'     => array( 144, 0, 0,   0 ),
+		'grid_stipple_2'     => array( 144, 0, 0,   0 ),
+		'border'             => array(   0,   0,   0,   0 ),
+		'text'               => array(   0,   0,   0,   0 ),
+		'rx'                 => array( 190,  20,  20,  50 ),
+		'rx_border'	       => array(  80,  40,  40,  90 ),
+		'tx'	              => array( 130, 130, 130,  50 ),
+		'tx_border'          => array(  60,  60,  60,  90 )
+	);
+?>
\ No newline at end of file
diff --git a/config/vnstat2/vnstat_php_frontend/themes/red/style.css b/config/vnstat2/vnstat_php_frontend/themes/red/style.css
new file mode 100644
index 00000000..48ab8d55
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/red/style.css
@@ -0,0 +1,170 @@
+body
+{
+	background-color: #D2D2D2;
+	margin: 8px;
+	padding: 0;
+}
+
+#content
+{
+    width: 898px;
+}
+
+#sidebar
+{
+    position: absolute;
+    left: 8px;
+    top: 8px;
+    width: 160px;
+    border-right: 1px solid #82001D;
+    border-collapse: collapse;
+    float: left;
+}
+
+#sidebar ul.iface
+{
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px dashed #82001D;
+    background-color: #D2D2D2;
+    color: #82001D;
+}
+
+#sidebar li.iface
+{
+    list-style-type: none;
+    margin: 0px;
+    padding: 0px;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    border-bottom: 1px dashed #82001D;
+}
+
+#sidebar a
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+}
+
+#sidebar ul.page
+{
+    margin: 0px;
+    padding: 0px;
+    border-top: 1px dashed #82001D;
+}
+
+#sidebar li.page
+{
+    list-style-type: none;
+    margin: 0px;
+    padding: 4px;
+    border: none;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.75em;
+    font-weight: normal;
+    text-align: right;
+    background-color: #C1C1C1;
+    color: #82001D;
+}
+
+
+#header
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 0px 8px 0px 8px;
+    border-width: 1px 1px 1px 1px;
+    border-style: dashed solid dashed solid;
+    border-color: #82001D;
+    border-collapse: collapse;
+    background-color: #D2D2D2;
+    color: #82001D;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    text-align: center;
+}
+
+#footer
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 2px 8px 2px 8px;
+    border-width: 1px 1px 1px 1px;
+    border-style: solid;
+    border-color: #82001D;
+    border-collapse: collapse;
+    background-color: #D2D2D2;
+    color: #82001D;
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.70em;
+    text-align: center;
+}
+
+#main
+{
+    width: 720px;
+    margin-left: 160px;
+    padding: 8px 8px 8px 8px;
+    border-left: 1px solid #82001D;
+    border-right: 1px solid #82001D;
+    border-collapse: collapse;
+}
+
+#main td
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 0.8em;
+}
+
+#main td.numeric_odd
+{
+    text-align: right;
+    background-color: #C9C9C9;
+    color: #82001D;
+}
+
+#main td.numeric_even
+{
+    text-align: right;
+    background-color: #CFCFCF;
+    color: #82001D;
+}
+
+#main td.label_odd
+{
+    background-color: #A6A6A6;
+    color: #82001D;
+}
+
+#main td.label_even
+{
+    background-color: #C1C1C1;
+    color: #82001D;
+}
+
+#main th.label
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1em;
+    font-weight: bold;
+    background-color: #A6A6A6;
+    color: #82001D;
+}
+
+#main caption
+{
+    font-family: 'Trebuchet MS', Verdana, sans-serif;
+    font-size: 1.25em;
+    font-weight: bold;
+    padding: 4px;
+    color: #82001D;
+}
+
+a
+{
+    text-decoration: none;
+    color: #A80022;
+}
diff --git a/config/vnstat2/vnstat_php_frontend/themes/red/theme.php b/config/vnstat2/vnstat_php_frontend/themes/red/theme.php
new file mode 100644
index 00000000..2c9ba6f4
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/themes/red/theme.php
@@ -0,0 +1,16 @@
+<?php
+	// A red colorscheme based on a contribution by Enrico Tröger
+	$colorscheme = array(
+		'image_background'   => array( 225, 225, 225,   0 ),
+		'graph_background'   => array( 220, 220, 230,   0 ),
+		'graph_background_2' => array( 205, 205, 220,   0 ),
+		'grid_stipple_1'     => array( 140, 140, 140,   0 ),
+		'grid_stipple_2'     => array( 200, 200, 200,   0 ),
+		'border'             => array(   0,   0,   0,   0 ),
+		'text'               => array(   0,   0,   0,   0 ),
+		'rx'                 => array( 190,  20,  20,  50 ),
+		'rx_border'	       => array(  80,  40,  40,  90 ),
+		'tx'	              => array( 130, 130, 130,  50 ),
+		'tx_border'          => array(  60,  60,  60,  90 )
+	);
+?>
diff --git a/config/vnstat2/vnstat_php_frontend/vera_copyright.txt b/config/vnstat2/vnstat_php_frontend/vera_copyright.txt
new file mode 100644
index 00000000..e651be1c
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/vera_copyright.txt
@@ -0,0 +1,124 @@
+Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+   1. I don't understand the resale restriction... What gives?
+
+      Bitstream is giving away these fonts, but wishes to ensure its
+      competitors can't just drop the fonts as is into a font sale system
+      and sell them as is. It seems fair that if Bitstream can't make money
+      from the Bitstream Vera fonts, their competitors should not be able to
+      do so either. You can sell the fonts as part of any software package,
+      however.
+
+   2. I want to package these fonts separately for distribution and
+      sale as part of a larger software package or system.  Can I do so?
+
+      Yes. A RPM or Debian package is a "larger software package" to begin 
+      with, and you aren't selling them independently by themselves. 
+      See 1. above.
+
+   3. Are derivative works allowed?
+      Yes!
+
+   4. Can I change or add to the font(s)?
+      Yes, but you must change the name(s) of the font(s).
+
+   5. Under what terms are derivative works allowed?
+
+      You must change the name(s) of the fonts. This is to ensure the
+      quality of the fonts, both to protect Bitstream and Gnome. We want to
+      ensure that if an application has opened a font specifically of these
+      names, it gets what it expects (though of course, using fontconfig,
+      substitutions could still could have occurred during font
+      opening). You must include the Bitstream copyright. Additional
+      copyrights can be added, as per copyright law. Happy Font Hacking!
+
+   6. If I have improvements for Bitstream Vera, is it possible they might get 
+       adopted in future versions?
+
+      Yes. The contract between the Gnome Foundation and Bitstream has
+      provisions for working with Bitstream to ensure quality additions to
+      the Bitstream Vera font family. Please contact us if you have such
+      additions. Note, that in general, we will want such additions for the
+      entire family, not just a single font, and that you'll have to keep
+      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+      glyphs to the font, they must be stylistically in keeping with Vera's
+      design. Vera cannot become a "ransom note" font. Jim Lyles will be
+      providing a document describing the design elements used in Vera, as a
+      guide and aid for people interested in contributing to Vera.
+
+   7. I want to sell a software package that uses these fonts: Can I do so?
+
+      Sure. Bundle the fonts with your software and sell your software
+      with the fonts. That is the intent of the copyright.
+
+   8. If applications have built the names "Bitstream Vera" into them, 
+      can I override this somehow to use fonts of my choosing?
+
+      This depends on exact details of the software. Most open source
+      systems and software (e.g., Gnome, KDE, etc.) are now converting to
+      use fontconfig (see www.fontconfig.org) to handle font configuration,
+      selection and substitution; it has provisions for overriding font
+      names and subsituting alternatives. An example is provided by the
+      supplied local.conf file, which chooses the family Bitstream Vera for
+      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
+      core server) has other mechanisms for font substitution.
+
diff --git a/config/vnstat2/vnstat_php_frontend/vnstat.php b/config/vnstat2/vnstat_php_frontend/vnstat.php
new file mode 100644
index 00000000..9c7e211c
--- /dev/null
+++ b/config/vnstat2/vnstat_php_frontend/vnstat.php
@@ -0,0 +1,211 @@
+<?php
+    //
+    // vnStat PHP frontend (c)2006-2010 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.
+    //
+        
+    //
+    // Valid values for other parameters you can pass to the script.
+    // Input parameters will always be limited to one of the values listed here.
+    // If a parameter is not provided or invalid it will revert to the default,
+    // the first parameter in the list.
+    //
+    if (isset($_SERVER['PHP_SELF']))
+    {
+	$script = $_SERVER['PHP_SELF'];
+    }
+    elseif (isset($_SERVER['SCRIPT_NAME']))
+    {
+	$script = $_SERVER['SCRIPT_NAME'];
+    }
+    else
+    {
+	die('can\'t determine script name!');
+    }
+    
+    $page_list  = array('s','h','d','m');
+    
+    $graph_list = array('large','small','none');
+    
+    $page_title['s'] = T('summary');
+    $page_title['h'] = T('hours');
+    $page_title['d'] = T('days');
+    $page_title['m'] = T('months');
+    
+
+    //
+    // functions
+    //
+    function validate_input()
+    {
+        global $page,  $page_list;
+        global $iface, $iface_list;
+        global $graph, $graph_list;
+	global $colorscheme, $style;
+        //
+        // get interface data
+        //
+        $page = isset($_GET['page']) ? $_GET['page'] : '';
+        $iface = isset($_GET['if']) ? $_GET['if'] : '';
+        $graph = isset($_GET['graph']) ? $_GET['graph'] : '';
+        $style = isset($_GET['style']) ? $_GET['style'] : '';
+
+        if (!in_array($page, $page_list))
+        {
+            $page = $page_list[0];
+        }
+
+        if (!in_array($iface, $iface_list))
+        {
+            $iface = $iface_list[0];
+        }
+
+        if (!in_array($graph, $graph_list))
+        {
+            $graph = $graph_list[0];
+        }
+
+	$tp = "./themes/$style";
+        if (!is_dir($tp) || !file_exists("$tp/theme.php"))
+        {
+	    $style = DEFAULT_COLORSCHEME;
+        }
+    }
+    
+
+    function get_vnstat_data()    
+    {
+        global $iface, $vnstat_bin, $data_dir;
+        global $hour,$day,$month,$top,$summary;
+
+        if (!isset($vnstat_bin) || $vnstat_bin == '')
+        {
+	    if (file_exists("$data_dir/vnstat_dump_$iface"))
+	    {
+        	$vnstat_data = file("$data_dir/vnstat_dump_$iface");
+	    }	    
+	    else
+	    {
+		$vnstat_data = array();
+	    }
+        }
+        else
+        {
+            $fd = popen("$vnstat_bin --dumpdb -i $iface", "r");
+            $buffer = '';
+            while (!feof($fd)) {
+                $buffer .= fgets($fd);
+            }
+            $vnstat_data = explode("\n", $buffer);
+            pclose($fd);
+        }
+
+
+        $day = array();
+        $hour = array();
+        $month = array();
+        $top = array();
+
+        //
+        // extract data
+        //
+        foreach($vnstat_data as $line) 
+        {
+            $d = explode(';', trim($line));
+            if ($d[0] == 'd')
+            {
+                $day[$d[1]]['time']  = $d[2];
+                $day[$d[1]]['rx']    = $d[3] * 1024 + $d[5];
+                $day[$d[1]]['tx']    = $d[4] * 1024 + $d[6];
+                $day[$d[1]]['act']   = $d[7];
+                if ($d[2] != 0)
+                {
+                    $day[$d[1]]['label'] = strftime(T('datefmt_days'),$d[2]);
+                    $day[$d[1]]['img_label'] = strftime(T('datefmt_days_img'), $d[2]);
+                }
+                else
+                {
+                    $day[$d[1]]['label'] = '';
+                    $day[$d[1]]['img_label'] = '';          
+                }           
+            }
+            else if ($d[0] == 'm')
+            {
+                $month[$d[1]]['time'] = $d[2];
+                $month[$d[1]]['rx']   = $d[3] * 1024 + $d[5];
+                $month[$d[1]]['tx']   = $d[4] * 1024 + $d[6];
+                $month[$d[1]]['act']  = $d[7];
+                if ($d[2] != 0)
+                {
+                    $month[$d[1]]['label'] = strftime(T('datefmt_months'), $d[2]);
+                    $month[$d[1]]['img_label'] = strftime(T('datefmt_months_img'), $d[2]);
+                }
+                else
+                {
+                    $month[$d[1]]['label'] = '';
+                    $month[$d[1]]['img_label'] = '';            
+                }
+            }
+            else if ($d[0] == 'h')
+            {
+                $hour[$d[1]]['time'] = $d[2];
+                $hour[$d[1]]['rx']   = $d[3];
+                $hour[$d[1]]['tx']   = $d[4];
+                $hour[$d[1]]['act']  = 1;
+                if ($d[2] != 0)
+                {
+                    $st = $d[2] - ($d[2] % 3600);
+                    $et = $st + 3600;
+                    $hour[$d[1]]['label'] = strftime(T('datefmt_hours'), $st).' - '.strftime(T('datefmt_hours'), $et);
+                    $hour[$d[1]]['img_label'] = strftime(T('datefmt_hours_img'), $d[2]);
+                }
+                else
+                {
+                    $hour[$d[1]]['label'] = '';
+                    $hour[$d[1]]['img_label'] = '';
+                }
+            }
+            else if ($d[0] == 't')
+            {   
+                $top[$d[1]]['time'] = $d[2];
+                $top[$d[1]]['rx']   = $d[3] * 1024 + $d[5];
+                $top[$d[1]]['tx']   = $d[4] * 1024 + $d[6];
+                $top[$d[1]]['act']  = $d[7];
+                $top[$d[1]]['label'] = strftime(T('datefmt_top'), $d[2]);
+                $top[$d[1]]['img_label'] = '';
+            }
+            else
+            {
+                $summary[$d[0]] = isset($d[1]) ? $d[1] : '';
+            }
+        }
+        if (count($day) == 0)
+            $day[0] = 'nodata';
+        rsort($day);
+
+        if (count($month) == 0)
+            $month[0] = 'nodata';
+        rsort($month);
+
+        if (count($hour) == 0)
+            $hour[0] = 'nodata';
+        rsort($hour);
+    }
+?>
-- 
cgit v1.2.3


From 5f345d7ed67f48103b14c6e0e698c981698e0981 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Wed, 22 Jan 2014 23:11:02 -0500
Subject: updated vnstat2.inc paths, indents, uninstall

---
 config/vnstat2/vnstat2.inc | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index 54a15aa6..64eaaa38 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -3,16 +3,16 @@ function vnstat_install_deinstall() {
 	conf_mount_rw();
 	global $config;
 // Remove Vnstat package and files
-        exec("cd /var/db/pkg/ && pkg_delete `ls | grep vnstat`");
+    exec("cd /var/db/pkg/ && pkg_delete `ls | grep vnstat`");
 	exec("rm -d -R /usr/local/www/vnstat2");
 	exec("rm -d -R /usr/local/www/vnstati");
-	exec("rm /usr/local/pkg/vnstat_php_frontend.xml");
-	exec("rm /usr/local/pkg/vnstat2.sh");
-	exec("rm /usr/local/etc/vnstat2.conf");
 	exec("rm /usr/local/www/diag_vnstat.php");
 	exec("rm /usr/local/www/diag_vnstat2.php");
 	exec("rm /usr/local/www/vnstati.php");
 	exec("rm /usr/local/www/vnstat2_img.php");
+	exec("rm -d -R /usr/local/pkg/vnstat2");
+	exec("rm /usr/local/etc/vnstat2.conf");
+
 // Remove vnstat cron entry from config.xml
 	vnstat2_install_cron(false);
 	conf_mount_ro();
@@ -25,7 +25,7 @@ function vnstat2_install_cron($vnstat_cron_value) {
 		return;
 	$x=0;
 	foreach($config['cron']['item'] as $item) {
-		if(strstr($item['command'], "/usr/local/pkg/vnstat2.sh")) {
+		if(strstr($item['command'], "/usr/local/pkg/vnstat2/vnstat2.sh")) {
 			$is_installed = true;
 			break;
 		}
@@ -41,7 +41,7 @@ function vnstat2_install_cron($vnstat_cron_value) {
 	        		$cron_item['month']     = "*";
 	        		$cron_item['wday']      = "*";
 	        		$cron_item['who']       = "root";
-	        		$cron_item['command']   = "/usr/local/pkg/vnstat2.sh";
+	        		$cron_item['command']   = "/usr/local/pkg/vnstat2/vnstat2.sh";
 	        		$config['cron']['item'][] = $cron_item;		
 				write_config();
 				configure_cron();
@@ -70,10 +70,10 @@ function change_vnstat_conf(){
 	$no_vnstat_phpfrontend = $config['installedpackages']['vnstat2']['config'][0]['vnstat_phpfrontend'];
         if ($no_vnstat_phpfrontend == "on"){
  		vnstat_php_frontend();
-	}
+		}
 	else {
 	exec("[ -d /usr/local/www/vnstat2 ] && rm -d -R /usr/local/www/vnstat2");
-}
+	}
 	conf_mount_ro();
 }
 
@@ -149,16 +149,16 @@ function vnstat_install_config() {
 	conf_mount_rw();
 // Create vnstat database dir where it also will work for nanobsd
 //	exec("[ -d /var/db/vnstat ] && mv /var/db/vnstat /conf/vnstat");
-	exec("[ -d /usr/local/pkg/vnstat ] && mv /usr/local/pkg/vnstat /conf/vnstat");
+	exec("[ -d /usr/local/pkg/vnstat2/vnstat ] && mv /usr/local/pkg/vnstat2/vnstat /conf/vnstat");
 	exec("[ ! -d /conf/vnstat ] && mkdir /conf/vnstat");
 // Check for pbi install and arch type then create symlinks
 	if (file_exists('/usr/pbi/vnstat-i386')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-i386/etc/vnstat.conf"); }
 	if (file_exists('/usr/pbi/vnstat-amd64')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-amd64/etc/vnstat.conf"); }
 // Copy files to web dir
-	exec("[ ! -f /usr/local/www/diag_vnstat2.php ] && cp /usr/local/pkg/diag_vnstat2.abc /usr/local/www/diag_vnstat2.php");
-	exec("[ ! -f /usr/local/www/diag_vnstat.php ] && cp /usr/local/pkg/diag_vnstat.abc /usr/local/www/diag_vnstat.php");
-	exec("[ ! -f /usr/local/www/vnstati.php ] && cp /usr/local/pkg/vnstati.abc /usr/local/www/vnstati.php");
-	exec("[ ! -f /usr/local/www/vnstat2_img.php ] && cp /usr/local/pkg/vnstat2_img.abc /usr/local/www/vnstat2_img.php");
+	exec("[ ! -f /usr/local/www/diag_vnstat2.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat2.abc /usr/local/www/diag_vnstat2.php");
+	exec("[ ! -f /usr/local/www/diag_vnstat.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat.abc /usr/local/www/diag_vnstat.php");
+	exec("[ ! -f /usr/local/www/vnstati.php ] && cp /usr/local/pkg/vnstat2/vnstati.abc /usr/local/www/vnstati.php");
+	exec("[ ! -f /usr/local/www/vnstat2_img.php ] && cp /usr/local/pkg/vnstat2/vnstat2_img.abc /usr/local/www/vnstat2_img.php");
 // Add MonthRotate value to config.xml and write /usr/local/etc/vnstat.conf
 	$no_monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate'];	
 	if ($no_monthrotate == ""){
@@ -197,10 +197,8 @@ function vnstat_install_config() {
 
 function vnstat_php_frontend(){
 	global $config;
-// Unpack and move Vnstat frontend 
-	exec("cd ..");
-	exec("tar -zxovf /usr/local/pkg/vnstat_php_frontend-1.5.1-updated.tar.gz");
-	exec("mv vnstat_php_frontend-1.5.1-updated /usr/local/www/vnstat2");
+// Copy vnstat_php_frontend to www 
+	exec("cp -a /usr/local/pkg/vnstat2/vnstat_php_frontend/. /usr/local/www/vnstat2/");
 // Find information to be writing in config.php 
 	// $iface_list_array_items
         exec("ls /conf/vnstat/ | grep -v '\.'", $vnstat_nic_in);
@@ -228,8 +226,8 @@ function vnstat_php_frontend(){
         $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';";
+		$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';";
-- 
cgit v1.2.3


From b7ba2b9476ee4f66ce6a3710cd9b9883fc5e074d Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Thu, 23 Jan 2014 00:32:11 -0500
Subject: vnstat2.xml paths + additional vnstat_php_frontend

---
 config/vnstat2/vnstat2.xml | 138 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 124 insertions(+), 14 deletions(-)

diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 6d8ba41a..428b0f60 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -10,7 +10,7 @@
 	<version>1.0</version>
 	<title>Vnstat2</title>
 	<aftersaveredirect>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</aftersaveredirect>
-	<include_file>/usr/local/pkg/vnstat2.inc</include_file>
+	<include_file>/usr/local/pkg/vnstat2/vnstat2.inc</include_file>
 	<menu>
 		<name>vnstat2</name>
 		<tooltiptext></tooltiptext>
@@ -41,50 +41,160 @@
 		</tab>
 	</tabs>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/pkg/vnstat2/</prefix>
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat2.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://files.pfsense.org/packages/8/vnstat/vnstat_php_frontend-1.5.1-updated.tar.gz</item>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstati.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/vnstati.xml</item>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstatoutput.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/pkg/vnstat2/</prefix>
 		<chmod>0744</chmod>
 		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat2.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/vnstatoutput.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/pkg/vnstat2/</prefix>
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/vnstat2/bin/diag_vnstat.abc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/pkg/vnstat2/</prefix>
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/vnstat2/bin/diag_vnstat2.abc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/pkg/vnstat2/</prefix>
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstat2_img.abc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
+		<prefix>/usr/local/pkg/vnstat2/</prefix>
 		<chmod>0644</chmod>
 		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstati.abc</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/lang/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/lang/cs.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/lang/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/lang/en.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/lang/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/lang/nl.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/dark/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/dark/style.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/dark/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/dark/theme.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/espresso/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/espresso/style.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/espresso/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/espresso/theme.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/light/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/light/style.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/light/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/light/theme.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/pfSense/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/pfSense/style.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/pfSense/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/pfSense/theme.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/red/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/red/style.css</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/themes/red/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/themes/red/theme.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/config.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/COPYING</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/graph.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/graph_svg.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/index.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/localize.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/README</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/vera_copyright.txt</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/VeraBd.ttf</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/</prefix>
+		<chmod>0644</chmod>
+		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat_php_frontend/vnstat.php</item>
+	</additional_files_needed>
 	<fields>
 		<field>
 			<description>Change rotate day of the month (by default set to 1)</description>
-- 
cgit v1.2.3


From c8e0f450685d5d5086d6b48acdc898c62df4a633 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Thu, 23 Jan 2014 00:34:07 -0500
Subject: updated vnstat.inc path in two xml

---
 config/vnstat2/vnstati.xml      | 2 +-
 config/vnstat2/vnstatoutput.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/vnstat2/vnstati.xml b/config/vnstat2/vnstati.xml
index e2246ca0..65bcd4ba 100644
--- a/config/vnstat2/vnstati.xml
+++ b/config/vnstat2/vnstati.xml
@@ -10,7 +10,7 @@
 	<version>1.0</version>
 	<title>Vnstat2</title>
 	<aftersaveredirect>/vnstati.php</aftersaveredirect>
-	<include_file>/usr/local/pkg/vnstat2.inc</include_file>
+	<include_file>/usr/local/pkg/vnstat2/vnstat2.inc</include_file>
 	<menu>
 		<name>vnstat2</name>
 		<tooltiptext></tooltiptext>
diff --git a/config/vnstat2/vnstatoutput.xml b/config/vnstat2/vnstatoutput.xml
index 4b410aaa..32ac58f3 100644
--- a/config/vnstat2/vnstatoutput.xml
+++ b/config/vnstat2/vnstatoutput.xml
@@ -10,7 +10,7 @@
 	<version>1.0</version>
 	<title>Vnstat2</title>
 	<aftersaveredirect>/diag_vnstat2.php</aftersaveredirect>
-	<include_file>/usr/local/pkg/vnstat2.inc</include_file>
+	<include_file>/usr/local/pkg/vnstat2/vnstat2.inc</include_file>
 	<menu>
 		<name>vnstat2</name>
 		<tooltiptext></tooltiptext>
-- 
cgit v1.2.3


From 6a50a095c6e3d7f5888f46d81fb8592bc284fd8e Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Thu, 23 Jan 2014 01:05:06 -0500
Subject: EOL conversion

---
 config/vnstat2/vnstat2.inc      | 2 +-
 config/vnstat2/vnstat2.sh       | 1 +
 config/vnstat2/vnstat2.xml      | 1 +
 config/vnstat2/vnstati.xml      | 1 +
 config/vnstat2/vnstatoutput.xml | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index 64eaaa38..b200a388 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -2,7 +2,7 @@
 function vnstat_install_deinstall() {
 	conf_mount_rw();
 	global $config;
-// Remove Vnstat package and files
+// Remove Vnstat package and files 
     exec("cd /var/db/pkg/ && pkg_delete `ls | grep vnstat`");
 	exec("rm -d -R /usr/local/www/vnstat2");
 	exec("rm -d -R /usr/local/www/vnstati");
diff --git a/config/vnstat2/vnstat2.sh b/config/vnstat2/vnstat2.sh
index 05fb1136..54f30843 100644
--- a/config/vnstat2/vnstat2.sh
+++ b/config/vnstat2/vnstat2.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+
 /etc/rc.conf_mount_rw
 /usr/local/bin/vnstat -u
 sleep 0.2
diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 428b0f60..049c11ca 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -246,3 +246,4 @@
 	<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 65bcd4ba..7cd3f3be 100644
--- a/config/vnstat2/vnstati.xml
+++ b/config/vnstat2/vnstati.xml
@@ -54,3 +54,4 @@
 	<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 32ac58f3..9d2e3d05 100644
--- a/config/vnstat2/vnstatoutput.xml
+++ b/config/vnstat2/vnstatoutput.xml
@@ -54,3 +54,4 @@
 	<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 fa3eedf5db1d2c3668d5b3425b945a7708a44018 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Thu, 23 Jan 2014 01:16:03 -0500
Subject: fixed uninstall of vnstat.con

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

diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index b200a388..78259ea3 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -11,7 +11,7 @@ function vnstat_install_deinstall() {
 	exec("rm /usr/local/www/vnstati.php");
 	exec("rm /usr/local/www/vnstat2_img.php");
 	exec("rm -d -R /usr/local/pkg/vnstat2");
-	exec("rm /usr/local/etc/vnstat2.conf");
+	exec("rm /usr/local/etc/vnstat.conf");
 
 // Remove vnstat cron entry from config.xml
 	vnstat2_install_cron(false);
-- 
cgit v1.2.3


From 23688222d32aa23af5d38473e9b65a1b5a6c4ac4 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Thu, 23 Jan 2014 05:17:23 -0500
Subject: Typos  dansguardian.inc

---
 config/dansguardian/dansguardian.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc
index ad6e6482..18c9f171 100755
--- a/config/dansguardian/dansguardian.inc
+++ b/config/dansguardian/dansguardian.inc
@@ -934,8 +934,8 @@ EOF;
 		}
 	else{
 		if ($dansguardian_blacklist['cron']=="force_download"){
-			log_error("Blacklist udpate process started");
-			file_notice("Dansguardian - Blacklist udpate process started","");
+			log_error("Blacklist update process started");
+			file_notice("Dansguardian - Blacklist update process started","");
 			file_put_contents("/root/dansguardian_custom.script",base64_decode($dansguardian_blacklist['custom_script']),LOCK_EX);
 			if ($dansguardian_blacklist['enable_custom_script'] && $dansguardian_blacklist['custom_script'] != "")
 				mwexec_bg("/root/dansguardian_custom.script");
-- 
cgit v1.2.3


From e80ce28e1110ce1ec1e22d4e26336a119fa9ae47 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Mon, 27 Jan 2014 04:52:44 -0500
Subject: Menu name capitalization

---
 config/vnstat2/vnstat2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 049c11ca..18d3f911 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -12,7 +12,7 @@
 	<aftersaveredirect>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</aftersaveredirect>
 	<include_file>/usr/local/pkg/vnstat2/vnstat2.inc</include_file>
 	<menu>
-		<name>vnstat2</name>
+		<name>Vnstat2</name>
 		<tooltiptext></tooltiptext>
 		<section>Status</section>
 		<url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
-- 
cgit v1.2.3


From cbae21bf5ec6d91f206c0a4977dca43257d43dcb Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Fri, 21 Feb 2014 10:09:57 -0500
Subject: Remove line as request by ermal

"ermal added a note 27 minutes ago repo collab
Please remove this line."


exec("cd /var/db/pkg/ && pkg_delete `ls | grep vnstat`");
---
 config/vnstat2/vnstat2.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index 78259ea3..c37314c3 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -3,7 +3,6 @@ function vnstat_install_deinstall() {
 	conf_mount_rw();
 	global $config;
 // Remove Vnstat package and files 
-    exec("cd /var/db/pkg/ && pkg_delete `ls | grep vnstat`");
 	exec("rm -d -R /usr/local/www/vnstat2");
 	exec("rm -d -R /usr/local/www/vnstati");
 	exec("rm /usr/local/www/diag_vnstat.php");
-- 
cgit v1.2.3


From 2dc81505264000fcb7728225220c991f5162239b Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Fri, 21 Feb 2014 10:37:07 -0500
Subject: Move www files into additional files

rename bin to www move files to additional files and remove from
installation script.
---
 config/vnstat2/vnstat2.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 18d3f911..9bca9726 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -61,24 +61,24 @@
 		<item>http://www.pfsense.com/packages/config/vnstat2/vnstat2.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/vnstat2/</prefix>
+		<prefix>/usr/local/www/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/diag_vnstat.abc</item>
+		<item>http://www.pfsense.com/packages/config/vnstat2/www/diag_vnstat.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/vnstat2/</prefix>
+		<prefix>/usr/local/www/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/diag_vnstat2.abc</item>
+		<item>http://www.pfsense.com/packages/config/vnstat2/www/diag_vnstat2.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/vnstat2/</prefix>
+		<prefix>/usr/local/www/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstat2_img.abc</item>
+		<item>http://www.pfsense.com/packages/config/vnstat2/www/vnstat2_img.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/vnstat2/</prefix>
+		<prefix>/usr/local/www/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstati.abc</item>
+		<item>http://www.pfsense.com/packages/config/vnstat2/www/vnstati.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/vnstat2/vnstat_php_frontend/lang/</prefix>
-- 
cgit v1.2.3


From 324c82e37900b3681c6bcff4df91bfc22e8dc493 Mon Sep 17 00:00:00 2001
From: Bryan Paradis <bryan.paradis@gmail.com>
Date: Fri, 21 Feb 2014 10:45:02 -0500
Subject: 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
---
 config/vnstat2/bin/diag_vnstat.abc  | 115 ------------------------------
 config/vnstat2/bin/diag_vnstat2.abc | 137 ------------------------------------
 config/vnstat2/bin/vnstat2_img.abc  |   6 --
 config/vnstat2/bin/vnstati.abc      |  17 -----
 config/vnstat2/vnstat2.inc          |   9 ---
 config/vnstat2/www/diag_vnstat.php  | 115 ++++++++++++++++++++++++++++++
 config/vnstat2/www/diag_vnstat2.php | 137 ++++++++++++++++++++++++++++++++++++
 config/vnstat2/www/vnstat2_img.php  |   6 ++
 config/vnstat2/www/vnstati.php      |  17 +++++
 9 files changed, 275 insertions(+), 284 deletions(-)
 delete mode 100644 config/vnstat2/bin/diag_vnstat.abc
 delete mode 100644 config/vnstat2/bin/diag_vnstat2.abc
 delete mode 100644 config/vnstat2/bin/vnstat2_img.abc
 delete mode 100644 config/vnstat2/bin/vnstati.abc
 create mode 100644 config/vnstat2/www/diag_vnstat.php
 create mode 100644 config/vnstat2/www/diag_vnstat2.php
 create mode 100644 config/vnstat2/www/vnstat2_img.php
 create mode 100644 config/vnstat2/www/vnstati.php

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"); ?>
-
diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index c37314c3..9a684aa1 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -5,10 +5,6 @@ function vnstat_install_deinstall() {
 // Remove Vnstat package and files 
 	exec("rm -d -R /usr/local/www/vnstat2");
 	exec("rm -d -R /usr/local/www/vnstati");
-	exec("rm /usr/local/www/diag_vnstat.php");
-	exec("rm /usr/local/www/diag_vnstat2.php");
-	exec("rm /usr/local/www/vnstati.php");
-	exec("rm /usr/local/www/vnstat2_img.php");
 	exec("rm -d -R /usr/local/pkg/vnstat2");
 	exec("rm /usr/local/etc/vnstat.conf");
 
@@ -153,11 +149,6 @@ function vnstat_install_config() {
 // Check for pbi install and arch type then create symlinks
 	if (file_exists('/usr/pbi/vnstat-i386')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-i386/etc/vnstat.conf"); }
 	if (file_exists('/usr/pbi/vnstat-amd64')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-amd64/etc/vnstat.conf"); }
-// Copy files to web dir
-	exec("[ ! -f /usr/local/www/diag_vnstat2.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat2.abc /usr/local/www/diag_vnstat2.php");
-	exec("[ ! -f /usr/local/www/diag_vnstat.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat.abc /usr/local/www/diag_vnstat.php");
-	exec("[ ! -f /usr/local/www/vnstati.php ] && cp /usr/local/pkg/vnstat2/vnstati.abc /usr/local/www/vnstati.php");
-	exec("[ ! -f /usr/local/www/vnstat2_img.php ] && cp /usr/local/pkg/vnstat2/vnstat2_img.abc /usr/local/www/vnstat2_img.php");
 // Add MonthRotate value to config.xml and write /usr/local/etc/vnstat.conf
 	$no_monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate'];	
 	if ($no_monthrotate == ""){
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"); ?>
+
-- 
cgit v1.2.3