diff options
| author | Renato Botelho <garga@pfSense.org> | 2013-09-25 15:45:49 -0700 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2013-09-25 15:45:49 -0700 |
| commit | 9c43a910afe77d425d73073d5ed14878b32d9dd1 (patch) | |
| tree | ba341f9689fde3e0b8a81c02ec87442d93f55b17 /usr/local/www | |
| parent | d2399f998013acaf0e5d7b2e50b16f364ae2c64c (diff) | |
| parent | 2d9063afe9b588c48a399c61f9083c8ad11f0ebd (diff) | |
| download | pfsense-9c43a910afe77d425d73073d5ed14878b32d9dd1.zip pfsense-9c43a910afe77d425d73073d5ed14878b32d9dd1.tar.gz | |
Merge pull request #806 from ccesario/master
Set network interfaces description as interface name.
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/pkg_edit.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 04f1ce8..1b3c042 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); } } |
