aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPerry Mason <crazypark2@yahoo.dk>2011-01-23 21:41:57 +0100
committerPerry Mason <crazypark2@yahoo.dk>2011-01-23 21:41:57 +0100
commit6f60676ff9627cd36e05e33ffa85357709f02230 (patch)
tree275937b03b1859b3c1a875a283682ba2e1643987
parentd0322e72068aa27232581b7e38e351515b511f9a (diff)
downloadpfsense-packages-6f60676ff9627cd36e05e33ffa85357709f02230.tar.gz
pfsense-packages-6f60676ff9627cd36e05e33ffa85357709f02230.tar.bz2
pfsense-packages-6f60676ff9627cd36e05e33ffa85357709f02230.zip
[vnstat2] Update names correctly
-rw-r--r--config/vnstat2/bin/diag_vnstat2.abc2
-rw-r--r--config/vnstat2/bin/vnstati.abc3
-rw-r--r--config/vnstat2/vnstat2.inc4
3 files changed, 4 insertions, 5 deletions
diff --git a/config/vnstat2/bin/diag_vnstat2.abc b/config/vnstat2/bin/diag_vnstat2.abc
index e4ef0f21..ec19a0b2 100644
--- a/config/vnstat2/bin/diag_vnstat2.abc
+++ b/config/vnstat2/bin/diag_vnstat2.abc
@@ -40,7 +40,7 @@
require("guiconfig.inc");
global $config;
-$aaaa = $config['installedpackages']['vnstat2']['config'][0]['vnstat_output_nic'];
+$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"));
diff --git a/config/vnstat2/bin/vnstati.abc b/config/vnstat2/bin/vnstati.abc
index 08b31541..2f93e5fe 100644
--- a/config/vnstat2/bin/vnstati.abc
+++ b/config/vnstat2/bin/vnstati.abc
@@ -4,9 +4,8 @@ global $config;
include("head.inc");
include("fbegin.inc");
$aaaa = $config['installedpackages']['vnstat2']['config'][0]['vnstat_interface'];
-$bbbb = convert_friendly_interface_to_real_interface_name($aaaa);
$cccc = convert_real_interface_to_friendly_descr($bbbb);
-$pgtitle = gettext("Vnstati info for $cccc ($bbbb)");
+$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>";
?>
diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc
index c538046b..837b5294 100644
--- a/config/vnstat2/vnstat2.inc
+++ b/config/vnstat2/vnstat2.inc
@@ -124,8 +124,8 @@ function create_vnstati_image() {
conf_mount_rw();
global $config;
$iface = $_POST['vnstat_interface'];
- $config['installedpackages']['vnstat2']['config'][0]['vnstati_interface'] = $iface;
$ifaces_final = convert_friendly_interface_to_real_interface_name($iface);
+ $config['installedpackages']['vnstat2']['config'][0]['vnstat_interface'] = $ifaces_final;
exec("/usr/local/bin/vnstati -i ". $ifaces_final ." -vs -o /tmp/newpicture1.png");
exec("/usr/local/bin/vnstati -i ". $ifaces_final ." -m -o /tmp/newpicture2.png");
exec("/usr/local/bin/vnstati -i ". $ifaces_final ." -d -o /tmp/newpicture3.png");
@@ -139,7 +139,7 @@ function create_vnstat_output() {
global $config;
$iface2 = $_POST['vnstat_interface2'];
$ifaces_final2 = convert_friendly_interface_to_real_interface_name($iface2);
- $config['installedpackages']['vnstat2']['config'][0]['vnstat_output_nic'] = $ifaces_final2;
+ $config['installedpackages']['vnstat2']['config'][0]['vnstat_interface2'] = $ifaces_final2;
write_config();
conf_mount_ro();
}