Add textbox tool tips to display Alias values.

3 files changed, 21 insertions, 7 deletions

diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php
index 2a6d47ff..ca549820 100755
--- a/config/snort/snort_define_servers.php
+++ b/config/snort/snort_define_servers.php
@@ -203,15 +203,18 @@ if ($savemsg)
 				$server = substr($server, 0, 40) . "...";
 			$label = strtoupper($key);
 			$value = "";
-			if (!empty($pconfig["def_{$key}"]))
+			$title = "";
+			if (!empty($pconfig["def_{$key}"])) {
 				$value = htmlspecialchars($pconfig["def_{$key}"]);
+				$title = trim(filter_expand_alias($pconfig["def_{$key}"]));
+			}
 ?>
 			<tr>
 				<td width='22%' valign='top' class='vncell'><?php echo gettext("Define"); ?> <?=$label;?></td>
 				<td width="78%" class="vtable">
 					<input name="def_<?=$key;?>" size="40"
 					type="text" autocomplete="off" class="formfldalias" id="def_<?=$key;?>"
-					value="<?=$value;?>"> <br/>
+					value="<?=$value;?>" title="<?=$title;?>"> <br/>
 				<span class="vexpl"><?php echo gettext("Default value:"); ?> "<?=$server;?>" <br/><?php echo gettext("Leave " .
 				"blank for default value."); ?></span>
 				</td>
@@ -226,14 +229,17 @@ if ($savemsg)
 				$server = substr($server, 0, 40) . "...";
 			$label = strtoupper($key);
 			$value = "";
-			if (!empty($pconfig["def_{$key}"]))
+			$title = "";
+			if (!empty($pconfig["def_{$key}"])) {
 				$value = htmlspecialchars($pconfig["def_{$key}"]);
+				$title = trim(filter_expand_alias($pconfig["def_{$key}"]));
+			}
 ?>
 			<tr>
 				<td width='22%' valign='top' class='vncell'><?php echo gettext("Define"); ?> <?=$label;?></td>
 				<td width="78%" class="vtable">
 					<input name="def_<?=$key;?>" type="text" size="40" autocomplete="off" class="formfldalias" id="def_<?=$key;?>"
-					value="<?=$value;?>"> <br/>
+					value="<?=$value;?>" title="<?=$title;?>"> <br/>
 				<span class="vexpl"><?php echo gettext("Default value:"); ?> "<?=$server;?>" <br/> <?php echo gettext("Leave " .
 				"blank for default value."); ?></span>
 				</td>
@@ -262,6 +268,9 @@ if ($savemsg)
         if(isset($config['aliases']['alias']) && is_array($config['aliases']['alias']))
                 foreach($config['aliases']['alias'] as $alias_name) {
                         if ($alias_name['type'] == "host" || $alias_name['type'] == "network") {
+				// Skip any Aliases that resolve to an empty string
+				if (trim(filter_expand_alias($alias_name['name'])) == "")
+					continue;
 				if($addrisfirst == 1) $aliasesaddr .= ",";
 				$aliasesaddr .= "'" . $alias_name['name'] . "'";
 				$addrisfirst = 1;
diff --git a/config/snort/snort_interfaces_whitelist_edit.php b/config/snort/snort_interfaces_whitelist_edit.php
index fc157375..671fa4e5 100644
--- a/config/snort/snort_interfaces_whitelist_edit.php
+++ b/config/snort/snort_interfaces_whitelist_edit.php
@@ -261,7 +261,7 @@ if ($savemsg)
 		<div id="addressnetworkport"><?php echo gettext("Alias Name:"); ?></div>
 		</td>
 		<td width="78%" class="vtable">
-		<input autocomplete="off" name="address" type="text" class="formfldalias" id="address" size="30" value="<?=htmlspecialchars($pconfig['address']);?>" />
+		<input autocomplete="off" name="address" type="text" class="formfldalias" id="address" size="30" value="<?=htmlspecialchars($pconfig['address']);?>" title="<?=trim(filter_expand_alias($pconfig['address']));?>"/>
 		</td>
 	</tr>
 	<tr>
@@ -287,6 +287,9 @@ if ($savemsg)
                 foreach($config['aliases']['alias'] as $alias_name) {
 			if ($alias_name['type'] != "host" && $alias_name['type'] != "network")
 				continue;
+			// Skip any Alias that resolves to an empty string
+			if (trim(filter_expand_alias($alias_name['name'])) == "")
+				continue;
                         if($addrisfirst == 1) $aliasesaddr .= ",";
                         $aliasesaddr .= "'" . $alias_name['name'] . "'";
                         $addrisfirst = 1;
diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php
index 6c839846..95d5a10e 100755
--- a/config/snort/snort_preprocessors.php
+++ b/config/snort/snort_preprocessors.php
@@ -1161,8 +1161,8 @@ include_once("head.inc");
 	<tr>
 		<td width="22%" valign="top" class="vncell"><?php echo gettext("Ignore Scanners"); ?></td>
 		<td width="78%" class="vtable">
-			<input name="pscan_ignore_scanners" type="text" size="40" autocomplete="off"  class="formfldalias" id="pscan_ignore_scanners" 
-			value="<?=$pconfig['pscan_ignore_scanners'];?>">&nbsp;&nbsp;<?php echo gettext("Leave blank for default.  ") . 
+			<input name="pscan_ignore_scanners" type="text" size="40" autocomplete="off" class="formfldalias" id="pscan_ignore_scanners" 
+			value="<?=$pconfig['pscan_ignore_scanners'];?>" title="<?=trim(filter_expand_alias($pconfig['pscan_ignore_scanners']));?>">&nbsp;&nbsp;<?php echo gettext("Leave blank for default.  ") . 
 			gettext("Default value is ") . "<strong>" . gettext("\$HOME_NET") . "</strong>"; ?>.<br/>
 			<?php echo gettext("Ignores the specified entity as a source of scan alerts.  Entity must be a defined alias."); ?><br/>
 		</td>
@@ -1315,6 +1315,8 @@ include_once("head.inc");
         if(isset($config['aliases']['alias']) && is_array($config['aliases']['alias']))
                 foreach($config['aliases']['alias'] as $alias_name) {
                         if ($alias_name['type'] == "host" || $alias_name['type'] == "network") {
+				if (trim(filter_expand_alias($alias_name['name'])) == "")
+					continue;
 				if($addrisfirst == 1) $aliasesaddr .= ",";
 				$aliasesaddr .= "'" . $alias_name['name'] . "'";
 				$addrisfirst = 1;