diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-03-13 14:11:41 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2017-03-13 14:11:41 +0545 |
| commit | d9058974d1a80c48a36f54f1eade5f57a60d9cab (patch) | |
| tree | d4990c2037c2ca002f1ae23341943e131b5d50bc /src/usr/local/www/guiconfig.inc | |
| parent | 2b359eda6d4d6712888a59cb5b01aeee245e34be (diff) | |
| download | pfsense-d9058974d1a80c48a36f54f1eade5f57a60d9cab.zip pfsense-d9058974d1a80c48a36f54f1eade5f57a60d9cab.tar.gz | |
Redmine #7381 Disable detail in alias popup
Diffstat (limited to 'src/usr/local/www/guiconfig.inc')
| -rw-r--r-- | src/usr/local/www/guiconfig.inc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 433b3b6..43321d9 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -1110,7 +1110,7 @@ function add_package_tabs($tabgroup, &$tab_array) { } function alias_info_popup($alias_id) { - global $config; + global $config, $user_settings; if (!is_array($config['aliases']['alias'][$alias_id])) { return; @@ -1120,7 +1120,13 @@ function alias_info_popup($alias_id) { $alias = $config['aliases']['alias'][$alias_id]; $content = ""; - if ($alias['url']) { + if ($user_settings['webgui']['disablealiaspopupdetail']) { + if (strlen($alias['descr']) >= $maxlength) { + $alias['descr'] = substr($alias['descr'], 0, $maxlength) . '…'; + } + + $content .= $alias['descr']; + } else if ($alias['url']) { // TODO: Change it when pf supports tables with ports if ($alias['type'] == "urltable") { exec("/sbin/pfctl -t {$alias['name']} -T show | wc -l", $total_entries); @@ -1164,10 +1170,6 @@ function alias_info_popup($alias_id) { $content .= "<table>\n"; } - if (strlen($alias['descr']) >= $maxlength) { - $alias['descr'] = substr($alias['descr'], 0, $maxlength) . '…'; - } - return $content; } |
