summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-10-02 08:41:17 -0300
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-10-02 08:41:17 -0300
commitf82cbe49b47b202eb1ccf8ab3dd3d7cf87013ef9 (patch)
tree7bdd567bee60eb5af8e3fda96124ddac9e1c412d /usr
parent80f88b3bf2fd258467bd7c56517c9027e40043bf (diff)
downloadpfsense-f82cbe49b47b202eb1ccf8ab3dd3d7cf87013ef9.zip
pfsense-f82cbe49b47b202eb1ccf8ab3dd3d7cf87013ef9.tar.gz
fix pkg_edit.php to show interface description instead of interface name
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/pkg_edit.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 90f6163..a6e1299 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -719,7 +719,9 @@ if ($pkg['tabs'] <> "") {
if (is_array($config['interfaces']))
foreach ($config['interfaces'] as $iface_key=>$iface_value){
if (isset($iface_value['enable']) && ! preg_match("/$interface_regex/",$iface_key)){
- $iface_description=(isset($pkga['showips']) ? strtoupper($iface_key)." address" : strtoupper($iface_key));
+ $iface_description=($iface_value['descr'] !="" ? strtoupper($iface_value['descr']) : strtoupper($iface_key));
+ if (isset($pkga['showips']))
+ $iface_description .= " address";
$ips[]=array('ip'=> $iface_key, 'description'=> $iface_description);
}
}
OpenPOWER on IntegriCloud