Merge pull request #1091 from bmeeks8/pfSense-pkg-snort-4.1.4_3

pfsense · Aug 19, 2021 · abf1c25 · abf1c25
2 parents 8df9544 + 2700ad6
commit abf1c25
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/security/pfSense-pkg-snort/Makefile b/security/pfSense-pkg-snort/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-snort
 PORTVERSION=	4.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_interfaces_suppress_edit.php b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_interfaces_suppress_edit.php
@@ -113,7 +113,7 @@ function is_validwhitelistname($name) {
 		$s_list = array();
 		$s_list['name'] = $_POST['name'];
 		$s_list['uuid'] = uniqid();
-		$s_list['descr']  =  mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto");
+		$s_list['descr'] = $_POST['descr'];
 		if ($_POST['suppresspassthru']) {
 			$s_list['suppresspassthru'] = str_replace("&#8203;", "", $s_list['suppresspassthru']);
 			$s_list['suppresspassthru'] = base64_encode(str_replace("\r\n", "\n", $_POST['suppresspassthru']));

diff --git a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_passlist_edit.php b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_passlist_edit.php
@@ -93,7 +93,7 @@
 else
 	$passlist_uuid = $a_passlist[$id]['uuid'];
 
-if ($_POST['save'] == "Save") {
+if ($_POST['save']) {
 	unset($input_errors);
 	$pconfig = array();
 	$p_list = array();
@@ -144,7 +144,7 @@
 		$p_list['vips'] = $_POST['vips']? 'yes' : 'no';
 		$p_list['vpnips'] = $_POST['vpnips']? 'yes' : 'no';
 		$p_list['address']['item'] = $addrs;
-		$p_list['descr']  =  mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto");
+		$p_list['descr'] = $_POST['descr'];
 
 		if (isset($id) && isset($a_passlist[$id])) {
 			$a_passlist[$id] = $p_list;