diff options
| author | Ermal <eri@pfsense.org> | 2011-08-02 15:59:36 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-08-02 16:00:57 +0000 |
| commit | 165f7370b89857b4db89eb2d873fa120791bd8cf (patch) | |
| tree | 863f612d48b3725bab8160f70db625b1c1dc244b /config/snort/snort_barnyard.php | |
| parent | a17dd016725b63dad1cd1032ed8afa3c15540fff (diff) | |
| download | pfsense-packages-165f7370b89857b4db89eb2d873fa120791bd8cf.tar.gz pfsense-packages-165f7370b89857b4db89eb2d873fa120791bd8cf.tar.bz2 pfsense-packages-165f7370b89857b4db89eb2d873fa120791bd8cf.zip | |
Polishing of the snort pacakge, part 2:
* Get rid of snort_head.inc
* No more apply settings button since it does not make sense
* Other cleanups in many parts of the code
Tested only on 2.0
Diffstat (limited to 'config/snort/snort_barnyard.php')
| -rw-r--r-- | config/snort/snort_barnyard.php | 70 |
1 files changed, 27 insertions, 43 deletions
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php index 17c49689..e54ce831 100644 --- a/config/snort/snort_barnyard.php +++ b/config/snort/snort_barnyard.php @@ -137,23 +137,13 @@ if (isset($id) && $a_nat[$id]) { if (isset($_GET['dup'])) unset($id); -$if_real = convert_friendly_interface_to_real_interface_name2($pconfig['interface']); +$if_real = snort_get_real_interface($pconfig['interface']); if (!empty($config['installedpackages']['snortglobal']['rule'][$id])) $snort_uuid = $config['installedpackages']['snortglobal']['rule'][$id]['uuid']; /* alert file */ $d_snortconfdirty_path = "/var/run/snort_conf_{$snort_uuid}_{$if_real}.dirty"; -/* this will exec when alert says apply */ -if ($_POST['apply']) { - if (file_exists($d_snortconfdirty_path)) { - write_config(); - sync_snort_package(); - unlink($d_snortconfdirty_path); - } -} - - if ($_POST["Submit"]) { /* XXX: Mising error reporting?! @@ -257,7 +247,6 @@ if ($_POST["Submit"]) { write_config(); sync_snort_package_all($id, $if_real, $snort_uuid); - touch($d_snortconfdirty_path); /* after click go to this page */ header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); @@ -272,7 +261,7 @@ if ($_POST["Submit"]) { } $pgtitle = "Snort: Interface: $id$if_real Barnyard2 Edit"; -include("/usr/local/pkg/snort/snort_head.inc"); +include_once("head.inc"); ?> <body @@ -286,10 +275,6 @@ include("/usr/local/pkg/snort/snort_head.inc"); echo "{$snort_general_css}\n"; ?> -<!-- hack to fix the hardcoed fbegin link in header --> -<div id="header-left2"><a href="../index.php" id="status-link2"><img - src="./images/transparent.gif" border="0"></img></a></div> - <div class="body2"> <noscript> @@ -334,7 +319,7 @@ echo " print_info_box2($savemsg); } - if (file_exists($d_snortconfdirty_path)) { + if (0 && file_exists($d_snortconfdirty_path)) { echo '<p>'; if($savemsg) { @@ -350,27 +335,26 @@ echo " ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td class="tabnavtbl"><?php - if($id != "") - { - - echo '<div class="newtabmenu" style="margin:1px 0px; width:775px;">' . "\n"; - echo '<!-- Tabbed bar code -->' . "\n"; - echo '<ul class="newtabmenu">' . "\n"; - echo '<li><a href="/snort/snort_interfaces.php"><span>Snort Interfaces</span></a></li>' . "\n"; - echo "<li><a href=\"/snort/snort_interfaces_edit.php?id={$id}\"><span>If Settings</span></a></li>\n"; - echo "<li><a href=\"/snort/snort_rulesets.php?id={$id}\"><span>Categories</span></a></li>\n"; - echo "<li><a href=\"/snort/snort_rules.php?id={$id}\"><span>Rules</span></a></li>\n"; - echo "<li><a href=\"/snort/snort_define_servers.php?id={$id}\"><span>Servers</span></a></li>\n"; - echo "<li><a href=\"/snort/snort_preprocessors.php?id={$id}\"><span>Preprocessors</span></a></li>\n"; - echo "<li class=\"newtabmenu_active\"><a href=\"/snort/snort_barnyard.php?id={$id}\"><span>Barnyard2</span></a></li>\n"; - echo '</ul>' . "\n"; - echo '</div>' . "\n"; - - } - ?></td> - </tr> +<tr><td> +<?php + $tab_array = array(); + $tabid = 0; + $tab_array[$tabid] = array(gettext("Snort Interfaces"), false, "/snort/snort_interfaces.php"); + $tabid++; + $tab_array[$tabid] = array(gettext("If Settings"), false, "/snort/snort_interfaces_edit.php?id={$id}"); + $tabid++; + $tab_array[$tabid] = array(gettext("Categories"), false, "/snort/snort_rulesets.php?id={$id}"); + $tabid++; + $tab_array[$tabid] = array(gettext("Rules"), false, "/snort/snort_rules.php?id={$id}"); + $tabid++; + $tab_array[$tabid] = array(gettext("Servers"), false, "/snort/snort_define_servers.php?id={$id}"); + $tabid++; + $tab_array[$tabid] = array(gettext("Preprocessors"), false, "/snort/snort_preprocessors.php?id={$id}"); + $tabid++; + $tab_array[$tabid] = array(gettext("Barnyard2"), true, "/snort/snort_barnyard.php?id={$id}"); + display_top_tabs($tab_array); +?> +</td></tr> <tr> <td class="tabcont"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> @@ -468,10 +452,10 @@ echo " </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><input name="Submit" type="submit" class="formbtn" - value="Save"><input type="button" class="formbtn" value="Cancel" - onclick="history.back()"> <?php if (isset($id) && $a_nat[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>"> <?php endif; ?></td> + <td width="78%"> + <input name="Submit" type="submit" class="formbtn" value="Save"> + <?php if (isset($id) && $a_nat[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>"> <?php endif; ?></td> </tr> <tr> <td width="22%" valign="top"> </td> |