Merge pull request #3643 from phil-davis/disable-alias-popup-in-rules-7381

4 files changed, 29 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) . '&hellip;';
-	}
-
 	return $content;
 }
 
diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index d76a5de..5766499 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -63,6 +63,7 @@ $pconfig['webguicss'] = $config['system']['webgui']['webguicss'];
 $pconfig['webguifixedmenu'] = $config['system']['webgui']['webguifixedmenu'];
 $pconfig['dashboardcolumns'] = $config['system']['webgui']['dashboardcolumns'];
 $pconfig['webguileftcolumnhyper'] = isset($config['system']['webgui']['webguileftcolumnhyper']);
+$pconfig['disablealiaspopupdetail'] = isset($config['system']['webgui']['disablealiaspopupdetail']);
 $pconfig['dashboardavailablewidgetspanel'] = isset($config['system']['webgui']['dashboardavailablewidgetspanel']);
 $pconfig['systemlogsfilterpanel'] = isset($config['system']['webgui']['systemlogsfilterpanel']);
 $pconfig['systemlogsmanagelogpanel'] = isset($config['system']['webgui']['systemlogsmanagelogpanel']);
@@ -274,6 +275,9 @@ if ($_POST) {
 		unset($config['system']['webgui']['webguileftcolumnhyper']);
 		$config['system']['webgui']['webguileftcolumnhyper'] = $_POST['webguileftcolumnhyper'] ? true : false;
 
+		unset($config['system']['webgui']['disablealiaspopupdetail']);
+		$config['system']['webgui']['disablealiaspopupdetail'] = $_POST['disablealiaspopupdetail'] ? true : false;
+
 		unset($config['system']['webgui']['dashboardavailablewidgetspanel']);
 		$config['system']['webgui']['dashboardavailablewidgetspanel'] = $_POST['dashboardavailablewidgetspanel'] ? true : false;
 
@@ -580,6 +584,7 @@ gen_associatedpanels_fields(
 	$pconfig['statusmonitoringsettingspanel']);
 gen_requirestatefilter_field($section, $pconfig['requirestatefilter']);
 gen_webguileftcolumnhyper_field($section, $pconfig['webguileftcolumnhyper']);
+gen_disablealiaspopupdetail_field($section, $pconfig['disablealiaspopupdetail']);
 
 $section->addInput(new Form_Checkbox(
 	'loginshowhost',
diff --git a/src/usr/local/www/system_user_settings.php b/src/usr/local/www/system_user_settings.php
index 7cf5c17..03d8355 100644
--- a/src/usr/local/www/system_user_settings.php
+++ b/src/usr/local/www/system_user_settings.php
@@ -47,6 +47,7 @@ if (isset($id) && $a_user[$id]) {
 	$pconfig['systemlogsmanagelogpanel'] = isset($a_user[$id]['systemlogsmanagelogpanel']);
 	$pconfig['statusmonitoringsettingspanel'] = isset($a_user[$id]['statusmonitoringsettingspanel']);
 	$pconfig['webguileftcolumnhyper'] = isset($a_user[$id]['webguileftcolumnhyper']);
+	$pconfig['disablealiaspopupdetail'] = isset($a_user[$id]['disablealiaspopupdetail']);
 	$pconfig['pagenamefirst'] = isset($a_user[$id]['pagenamefirst']);
 } else {
 	echo gettext("The settings cannot be managed for a non-local user.");
@@ -118,6 +119,13 @@ if (isset($_POST['save'])) {
 			unset($userent['webguileftcolumnhyper']);
 		}
 
+		if ($_POST['disablealiaspopupdetail']) {
+			$pconfig['disablealiaspopupdetail'] = $userent['disablealiaspopupdetail'] = true;
+		} else {
+			$pconfig['disablealiaspopupdetail'] = false;
+			unset($userent['disablealiaspopupdetail']);
+		}
+
 		if ($_POST['pagenamefirst']) {
 			$pconfig['pagenamefirst'] = $userent['pagenamefirst'] = true;
 		} else {
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index 305f2d3..abf9d82 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -68,6 +68,7 @@ if (isset($id) && $a_user[$id]) {
 	$pconfig['systemlogsmanagelogpanel'] = isset($a_user[$id]['systemlogsmanagelogpanel']);
 	$pconfig['statusmonitoringsettingspanel'] = isset($a_user[$id]['statusmonitoringsettingspanel']);
 	$pconfig['webguileftcolumnhyper'] = isset($a_user[$id]['webguileftcolumnhyper']);
+	$pconfig['disablealiaspopupdetail'] = isset($a_user[$id]['disablealiaspopupdetail']);
 	$pconfig['pagenamefirst'] = isset($a_user[$id]['pagenamefirst']);
 	$pconfig['groups'] = local_user_get_groups($a_user[$id]);
 	$pconfig['utype'] = $a_user[$id]['scope'];
@@ -359,6 +360,12 @@ if ($_POST['save']) {
 			unset($userent['webguileftcolumnhyper']);
 		}
 
+		if ($_POST['disablealiaspopupdetail']) {
+			$userent['disablealiaspopupdetail'] = true;
+		} else {
+			unset($userent['disablealiaspopupdetail']);
+		}
+
 		if ($_POST['pagenamefirst']) {
 			$userent['pagenamefirst'] = true;
 		} else {
@@ -974,6 +981,7 @@ events.push(function() {
 		hideCheckbox('systemlogsmanagelogpanel', !adv);
 		hideCheckbox('statusmonitoringsettingspanel', !adv);
 		hideCheckbox('webguileftcolumnhyper', !adv);
+		hideCheckbox('disablealiaspopupdetail', !adv);
 		hideCheckbox('pagenamefirst', !adv);
 	}