Merge pull request #220 from doktornotor/patch-4

pfsense · Nov 30, 2016 · 5295c75 · 5295c75
2 parents 838ef79 + 8186fdd
commit 5295c75
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/security/pfSense-pkg-suricata/Makefile b/security/pfSense-pkg-suricata/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-suricata
 PORTVERSION=	3.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_alerts.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_alerts.php
@@ -474,7 +474,7 @@ function build_logfile_list() {
 	build_instance_list()
 ))->setHelp('Choose which instance alerts you want to inspect.');
 
-$group = new Form_Group('Save or Remove Hosts');
+$group = new Form_Group('Save or Remove Logs');
 
 $group->add(new Form_Button(
 	'download',
@@ -494,7 +494,7 @@ function build_logfile_list() {
 
 $section->add($group);
 
-$group = new Form_Group('Save or Remove Hosts');
+$group = new Form_Group('Save Settings');
 
 $group->add(new Form_Button(
 	'save',

diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_blocked.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_blocked.php
@@ -194,7 +194,7 @@
 
 $section->add($group);
 
-$group = new Form_Group('Save or Remove Hosts');
+$group = new Form_Group('Save Settings');
 
 $group->add(new Form_Button(
 	'save',

diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php
@@ -217,7 +217,7 @@
 	'ETPro for Suricata offers daily updates and extensive coverage of current malware threats.',
 	$pconfig['enable_etpro_rules'] == 'on' ? true:false,
 	'on'
-))->setHelp('The ETPro rules contain all of the ETOpen rules, so the ETOpen rules are not required and are disabled when the ETPro rules are selected. <a href="https://www.proofpoint.com/us/solutions/products/threat-intelligence/ET-Pro-Ruleset">Sign Up for an ETPro Account</a>');
+))->setHelp('The ETPro rules contain all of the ETOpen rules, so the ETOpen rules are not required and are disabled when the ETPro rules are selected. <a href="https://www.proofpoint.com/us/products/et-pro-ruleset">Sign Up for an ETPro Account</a>');
 $section->addInput(new Form_Input(
 	'etprocode',
 	'ETPro Subscription Configuration Code',
@@ -230,7 +230,7 @@
 	'Snort VRT free Registered User or paid Subscriber rules',
 	$pconfig['enable_vrt_rules'] == 'on' ? true:false,
 	'on'
-))->setHelp('<a href="https://www.snort.org/users/sign_up">Sign Up for a free Registered User Rule Account</a><br /><a href="http://www.emergingthreats.net/solutions/etpro-ruleset/https://www.snort.org/products">Sign Up for paid Sourcefire VRT Certified Subscriber Rules</a>');
+))->setHelp('<a href="https://www.snort.org/users/sign_up">Sign Up for a free Registered User Rule Account</a><br /><a href="https://www.snort.org/products">Sign Up for paid Sourcefire VRT Certified Subscriber Rules</a>');
 $section->addInput(new Form_Input(
 	'snort_rules_file',
 	'Snort VRT Rules Filename',
@@ -256,7 +256,7 @@
 	'Hide deprecated rules categories in the GUI and remove them from the configuration. Default is Not Checked.',
 	$pconfig['hide_deprecated_rules'] == 'on' ? true:false,
 	'on'
-))->setHelp('If you are a Snort VRT Paid Subscriber, the community ruleset is already built into your download of the Snort VRT rules, and there is no benefit in adding this rule set.');
+));
 $form->add($section);
 
 $section = new Form_Section('Rules Update Settings');

diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_import_aliases.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_import_aliases.php
@@ -98,7 +98,7 @@
 					<?php if ($disable): ?>
 					<tr title="<?=$tooltip?>">
 					  <td class="text-center">
-					  	<img src="/icon_block_d.gif" width="11" height"11" border="0"/>
+					  	<i class="fa fa-times text-danger"></i>
 					<?php else: ?>
 					<tr>
 					  <td class="text-center">

diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_rules.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_rules.php
@@ -587,10 +587,10 @@ function build_cat_list() {
 	$msg = '<b>' . gettext('Note: ') . '</b>' . gettext('You should not disable flowbit rules!  Add Suppress List entries for them instead by ');
 	$msg .= '<a href="/suricata/suricata_rules_flowbits.php?id=' . $id . '" title="' . gettext('Add Suppress List entry for Flowbit Rule') . '">';
 	$msg .= gettext('clicking here.') . '</a>';
-	$group->setHelp('When finished, click APPLY to save and send any SID enable/disable changes made on this tab to Snort.<br/>' . $msg);
+	$group->setHelp('When finished, click APPLY to save and send any SID enable/disable changes made on this tab to Suricata.<br/>' . $msg);
 }
 else {
-	$group->setHelp('When finished, click APPLY to save and send any SID enable/disable changes made on this tab to Snort.');
+	$group->setHelp('When finished, click APPLY to save and send any SID enable/disable changes made on this tab to Suricata.');
 }
 $section->add($group);
 print($section);