aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/vnstat2/vnstat2.priv.inc44
-rw-r--r--config/vnstat2/vnstat2.xml16
-rw-r--r--config/vnstat2/vnstati.xml10
-rw-r--r--config/vnstat2/vnstatoutput.xml8
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
7 files changed, 66 insertions, 18 deletions
diff --git a/config/vnstat2/vnstat2.priv.inc b/config/vnstat2/vnstat2.priv.inc
new file mode 100644
index 00000000..324ac435
--- /dev/null
+++ b/config/vnstat2/vnstat2.priv.inc
@@ -0,0 +1,44 @@
+<?php
+/*
+ vnstat2.priv.inc
+ part of pfSense (http://www.pfSense.org/)
+ Copyright (C) 2015 ESF, LLC
+ 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.
+*/
+global $priv_list;
+
+$priv_list['page-status-vnstat2'] = array();
+$priv_list['page-status-vnstat2']['name'] = "WebCfg - Status: vnstat2 package";
+$priv_list['page-status-vnstat2']['descr'] = "Allow access to vnstat2 package GUI";
+
+$priv_list['page-status-vnstat2']['match'] = array();
+$priv_list['page-status-vnstat2']['match'][] = "pkg_edit.php?xml=vnstat2.xml*";
+$priv_list['page-status-vnstat2']['match'][] = "pkg_edit.php?xml=vnstati.xml*";
+$priv_list['page-status-vnstat2']['match'][] = "pkg_edit.php?xml=vnstatoutput.xml*";
+$priv_list['page-status-vnstat2']['match'][] = "diag_vnstat.php*";
+$priv_list['page-status-vnstat2']['match'][] = "diag_vnstat2.php*";
+$priv_list['page-status-vnstat2']['match'][] = "vnstat2_img.php*";
+$priv_list['page-status-vnstat2']['match'][] = "vnstati.php*";
+
+?>
diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 7e65d465..8d586f10 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -42,24 +42,24 @@
]]>
</copyright>
<name>vnstat2</name>
- <version>1.12.5</version>
+ <version>1.12.8</version>
<title>Vnstat2</title>
- <aftersaveredirect>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</aftersaveredirect>
+ <aftersaveredirect>/pkg_edit.php?xml=vnstat2.xml</aftersaveredirect>
<include_file>/usr/local/pkg/vnstat2/vnstat2.inc</include_file>
<menu>
<name>Vnstat2</name>
<section>Status</section>
- <url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstat2.xml</url>
</menu>
<tabs>
<tab>
<text>Config</text>
- <url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstat2.xml</url>
<active/>
</tab>
<tab>
<text>Vnstati</text>
- <url>/pkg_edit.php?xml=vnstati.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstati.xml</url>
</tab>
<tab>
<text>Access vnstat php frontend</text>
@@ -67,7 +67,7 @@
</tab>
<tab>
<text>vnstat info</text>
- <url>/pkg_edit.php?xml=vnstatoutput.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstatoutput.xml</url>
</tab>
<tab>
<text>vnstat summary</text>
@@ -79,6 +79,10 @@
<item>https://packages.pfsense.org/packages/config/vnstat2/vnstat2.inc</item>
</additional_files_needed>
<additional_files_needed>
+ <prefix>/etc/inc/priv/</prefix>
+ <item>https://packages.pfsense.org/packages/config/vnstat2/vnstat2.priv.inc</item>
+ </additional_files_needed>
+ <additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/vnstat2/vnstati.xml</item>
</additional_files_needed>
diff --git a/config/vnstat2/vnstati.xml b/config/vnstat2/vnstati.xml
index b395e65f..373fa0eb 100644
--- a/config/vnstat2/vnstati.xml
+++ b/config/vnstat2/vnstati.xml
@@ -42,23 +42,23 @@
]]>
</copyright>
<name>vnstat2</name>
- <version>1.12.5</version>
+ <version>1.12.8</version>
<title>Vnstat2</title>
<aftersaveredirect>/vnstati.php</aftersaveredirect>
<include_file>/usr/local/pkg/vnstat2/vnstat2.inc</include_file>
<menu>
<name>vnstat2</name>
<section>Status</section>
- <url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstat2.xml</url>
</menu>
<tabs>
<tab>
<text>Config</text>
- <url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstat2.xml</url>
</tab>
<tab>
<text>Vnstati</text>
- <url>/pkg_edit.php?xml=vnstati.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstati.xml</url>
<active/>
</tab>
<tab>
@@ -67,7 +67,7 @@
</tab>
<tab>
<text>vnstat info</text>
- <url>/pkg_edit.php?xml=vnstatoutput.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstatoutput.xml</url>
</tab>
<tab>
<text>vnstat summary</text>
diff --git a/config/vnstat2/vnstatoutput.xml b/config/vnstat2/vnstatoutput.xml
index 297c171a..668c5ba2 100644
--- a/config/vnstat2/vnstatoutput.xml
+++ b/config/vnstat2/vnstatoutput.xml
@@ -49,16 +49,16 @@
<menu>
<name>vnstat2</name>
<section>Status</section>
- <url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstat2.xml</url>
</menu>
<tabs>
<tab>
<text>Config</text>
- <url>/pkg_edit.php?xml=vnstat2.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstat2.xml</url>
</tab>
<tab>
<text>Vnstati</text>
- <url>/pkg_edit.php?xml=vnstati.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstati.xml</url>
</tab>
<tab>
<text>Access vnstat php frontend</text>
@@ -66,7 +66,7 @@
</tab>
<tab>
<text>vnstat info</text>
- <url>/pkg_edit.php?xml=vnstatoutput.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=vnstatoutput.xml</url>
<active/>
</tab>
<tab>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 90c85062..1e9b6f94 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -689,7 +689,7 @@
<build_pbi>
<port>net/vnstat</port>
</build_pbi>
- <version>1.12.7</version>
+ <version>1.12.8</version>
<status>Stable</status>
<required_version>2.2</required_version>
<maintainer>crazypark2@yahoo.dk</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 52b25d97..230a0796 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -739,7 +739,7 @@
<depends_on_package>vnstat-1.11.tbz</depends_on_package>
<depends_on_package_pbi>vnstat-1.11_1-i386.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/net/vnstat</build_port_path>
- <version>1.11_1,4</version>
+ <version>1.12.8</version>
<status>Stable</status>
<required_version>2.0</required_version>
<maintainer>bryan.paradis@gmail.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 478a6a6a..1c65f72a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -726,7 +726,7 @@
<depends_on_package>vnstat-1.11.tbz</depends_on_package>
<depends_on_package_pbi>vnstat-1.11_1-amd64.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/net/vnstat</build_port_path>
- <version>1.11_1,4</version>
+ <version>1.12.8</version>
<status>Stable</status>
<required_version>2.0</required_version>
<maintainer>bryan.paradis@gmail.com</maintainer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 05:54:20 +0000