1 files changed, 10 insertions, 9 deletions

diff --git a/config/snort-dev/snort_barnyard.php b/config/snort-dev/snort_barnyard.php
index d703b5dc..cfe4e77d 100644
--- a/config/snort-dev/snort_barnyard.php
+++ b/config/snort-dev/snort_barnyard.php
@@ -80,6 +80,8 @@ if (isset($id) && $a_nat[$id]) {
 
 if (isset($_GET['dup']))
 	unset($id);
+	
+$if_real = convert_friendly_interface_to_real_interface_name($pconfig['interface']);
 
 if ($_POST) {
 
@@ -129,7 +131,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = "Services: Snort Barnyard2 Edit";
+$pgtitle = "Snort: Interface: $id$if_real Barnyard2 Edit";
 include("head.inc");
 
 ?>
@@ -184,14 +186,13 @@ if($id != "")
 {
 
     $tab_array = array();
-    $tab_array[] = array("Snort Interfaces", false, "/snort_interfaces.php");
-    $tab_array[] = array("If Settings", false, "/snort_interfaces_edit.php");
-    $tab_array[] = array("Categories", false, "/snort/snort_{$snortIf}_{$id}/snort_rulesets_{$snortIf}_{$id}.php");
-    $tab_array[] = array("Rules", false, "/snort/snort_{$snortIf}_{$id}/snort_rules_{$snortIf}_{$id}.php");
-    $tab_array[] = array("Servers", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_define_servers_{$snortIf}_{$id}.xml&id=0");
-    $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0");
-    $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0");
-    $tab_array[] = array("Barnyard2", true, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0");
+    $tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php");
+    $tab_array[] = array("If Settings", false, "/snort/snort_interfaces_edit.php?id={$id}");
+    $tab_array[] = array("Categories", false, "/snort/snort_rulesets.php?id={$id}");
+    $tab_array[] = array("Rules", false, "/snort/snort_rules.php?id={$id}");
+    $tab_array[] = array("Servers", false, "/snort/snort_define_servers.php?id={$id}");
+    $tab_array[] = array("Preprocessors", false, "/snort/snort_preprocessors.php?id={$id}");
+    $tab_array[] = array("Barnyard2", true, "/snort/snort_barnyard.php?id={$id}");
     display_top_tabs($tab_array);	
 
 }