diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-07-22 10:53:57 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-07-22 10:53:57 +0545 |
| commit | d97992c75c17930b59d5b233975a630615299c56 (patch) | |
| tree | 164cfbe0fbbebbe06d94c804f15a627c75bc9bd0 | |
| parent | 8c378f3fd259138657d246c76e00214eebb9090f (diff) | |
| download | pfsense-d97992c75c17930b59d5b233975a630615299c56.zip pfsense-d97992c75c17930b59d5b233975a630615299c56.tar.gz | |
Interfaces widget use more obscure separator RELENG_2_2
Redmine #4859 fix for RELENG_2_2
| -rw-r--r-- | usr/local/www/includes/functions.inc.php | 8 | ||||
| -rw-r--r-- | usr/local/www/javascript/index/ajax.js | 2 |
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 f2e1191..dfc2115 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -327,7 +327,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") { @@ -335,13 +335,13 @@ 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 |
