summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-07-22 09:36:27 +0545
committerPhil Davis <phil.davis@inf.org>2015-07-22 09:36:27 +0545
commit9cbdb6e3c380efc8f812b36c7c0b90f0e52862dc (patch)
tree1e4be87df3b92245bad6f07b063f0b37d03ee460 /usr
parent909d9ec10b4b5e2f2bf417ae545003888bf4c723 (diff)
downloadpfsense-9cbdb6e3c380efc8f812b36c7c0b90f0e52862dc.zip
pfsense-9cbdb6e3c380efc8f812b36c7c0b90f0e52862dc.tar.gz
Interfaces widget use more obscure separator
when acquiring the interface data. In particular the media information can have commas in it already as reported in Redmine bug #4859
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/includes/functions.inc.php8
-rw-r--r--usr/local/www/javascript/index/ajax.js2
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php
index 69b8642..2c48543 100644
--- a/usr/local/www/includes/functions.inc.php
+++ b/usr/local/www/includes/functions.inc.php
@@ -377,7 +377,7 @@ function get_interfacestatus() {
foreach ($ifdescrs as $ifdescr => $ifname) {
$ifinfo = get_interface_info($ifdescr);
- $data .= $ifname . ",";
+ $data .= $ifname . "^";
if ($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") {
$data .= "up";
} else if ($ifinfo['status'] == "no carrier") {
@@ -385,15 +385,15 @@ function get_interfacestatus() {
} else if ($ifinfo['status'] == "down") {
$data .= "block";
}
- $data .= ",";
+ $data .= "^";
if ($ifinfo['ipaddr']) {
$data .= "<strong>" . htmlspecialchars($ifinfo['ipaddr']) . "</strong>";
}
- $data .= ",";
+ $data .= "^";
if ($ifinfo['ipaddrv6']) {
$data .= "<strong>" . htmlspecialchars($ifinfo['ipaddrv6']) . "</strong>";
}
- $data .= ",";
+ $data .= "^";
if ($ifinfo['status'] != "down") {
$data .= htmlspecialchars($ifinfo['media']);
}
diff --git a/usr/local/www/javascript/index/ajax.js b/usr/local/www/javascript/index/ajax.js
index d2ac90e..274b8c0 100644
--- a/usr/local/www/javascript/index/ajax.js
+++ b/usr/local/www/javascript/index/ajax.js
@@ -149,7 +149,7 @@ function updateInterfaces(x){
if (widgetActive("interfaces")){
interfaces_split = x.split("~");
interfaces_split.each(function(iface){
- details = iface.split(",");
+ details = iface.split("^");
if (details[2] == '')
ipv4_details = '';
else
OpenPOWER on IntegriCloud