From 5180182c8975d4630cbc22174cc41f8e2c6d2b55 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 12 Jul 2012 18:29:33 +0000
Subject: Fix the issues with rules pages and the ones rpeorted on the forum

---
 config/snort/snort_interfaces_suppress_edit.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'config/snort/snort_interfaces_suppress_edit.php')

diff --git a/config/snort/snort_interfaces_suppress_edit.php b/config/snort/snort_interfaces_suppress_edit.php
index 45340f21..8a7e29ef 100644
--- a/config/snort/snort_interfaces_suppress_edit.php
+++ b/config/snort/snort_interfaces_suppress_edit.php
@@ -70,7 +70,8 @@ if (isset($id) && $a_suppress[$id]) {
 	$pconfig['name'] = $a_suppress[$id]['name'];
 	$pconfig['uuid'] = $a_suppress[$id]['uuid'];
 	$pconfig['descr'] = $a_suppress[$id]['descr'];
-	$pconfig['suppresspassthru'] = base64_decode($a_suppress[$id]['suppresspassthru']);
+	if (!empty($a_suppress[$id]['suppresspassthru']));
+		$pconfig['suppresspassthru'] = base64_decode($a_suppress[$id]['suppresspassthru']);
 	if (empty($a_suppress[$id]['uuid']))
 		$pconfig['uuid'] = uniqid();
 }
@@ -106,7 +107,8 @@ if ($_POST['submit']) {
 		$s_list['name'] = $_POST['name'];
 		$s_list['uuid'] = $suppress_uuid;
 		$s_list['descr']  =  mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto");
-		$s_list['suppresspassthru'] = base64_encode($_POST['suppresspassthru']);
+		if ($_POST['suppresspassthru'])
+			$s_list['suppresspassthru'] = base64_encode($_POST['suppresspassthru']);
 
 		if (isset($id) && $a_suppress[$id])
 			$a_suppress[$id] = $s_list;
@@ -190,7 +192,7 @@ if ($savemsg)
 <tr>
 	<td width="10%" class="vncell">&nbsp;Advanced pass through</td>
 	<td width="100%" class="vtable"><textarea wrap="off"
-		name="suppresspassthru" cols="90" rows="28" id="suppresspassthru" class="formpre"> <?=htmlspecialchars($pconfig['suppresspassthru']);?></textarea>
+		name="suppresspassthru" cols="90" rows="28" id="suppresspassthru" class="formpre"><?=htmlspecialchars($pconfig['suppresspassthru']);?></textarea>
 	</td>
 </tr>
 <tr>
@@ -199,7 +201,7 @@ if ($savemsg)
 		class="formbtn" value="Save" /> <input id="cancelbutton"
 		name="cancelbutton" type="button" class="formbtn" value="Cancel"
 		onclick="history.back()" /> <?php if (isset($id) && $a_suppress[$id]): ?>
-					<input name="id" type="hidden" value="<?=$id;?>" /> <?php endif; ?>
+		<input name="id" type="hidden" value="<?=$id;?>" /> <?php endif; ?>
 	</td>
 </tr>
 </table>
-- 
cgit v1.2.3