From bd466aee5cba77c2e0cfba0ec141320d9416f801 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Thu, 18 Sep 2014 21:32:24 -0400
Subject: More replace PHP @unlink() with system unlink_if_exists().

---
 config/snort/snort_alerts.php   | 4 ++--
 config/snort/snort_rulesets.php | 2 +-
 config/snort/snort_sid_mgmt.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'config/snort')

diff --git a/config/snort/snort_alerts.php b/config/snort/snort_alerts.php
index 54988395..2396b71e 100755
--- a/config/snort/snort_alerts.php
+++ b/config/snort/snort_alerts.php
@@ -401,7 +401,7 @@ if ($_POST['download']) {
 		readfile("/tmp/{$file_name}");
 
 		// Clean up the temp file
-		@unlink("/tmp/{$file_name}");
+		unlink_if_exists("/tmp/{$file_name}");
 	}
 	else
 		$savemsg = gettext("An error occurred while creating archive");
@@ -748,7 +748,7 @@ if (file_exists("{$snortlogdir}/snort_{$if_real}{$snort_uuid}/alert")) {
 			$counter++;
 		}
 		fclose($fd);
-		@unlink("/tmp/alert_{$snort_uuid}");
+		unlink_if_exists("/tmp/alert_{$snort_uuid}");
 	}
 }
 ?>
diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index 934ac90e..6171380e 100755
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -139,7 +139,7 @@ if ($_POST["save"]) {
 	else {
 		$a_nat[$id]['autoflowbitrules'] = 'off';
 		if (file_exists("{$snortdir}/snort_{$snort_uuid}_{$if_real}/rules/{$flowbit_rules_file}"))
-			@unlink("{$snortdir}/snort_{$snort_uuid}_{$if_real}/rules/{$flowbit_rules_file}");
+			unlink_if_exists("{$snortdir}/snort_{$snort_uuid}_{$if_real}/rules/{$flowbit_rules_file}");
 	}
 
 	write_config("Snort pkg: save enabled rule categories for {$a_nat[$id]['interface']}.");
diff --git a/config/snort/snort_sid_mgmt.php b/config/snort/snort_sid_mgmt.php
index 285cd6f9..04edae74 100644
--- a/config/snort/snort_sid_mgmt.php
+++ b/config/snort/snort_sid_mgmt.php
@@ -233,7 +233,7 @@ if (isset($_POST['sidlist_dnload_all_x'])) {
 		readfile("/tmp/{$file_name}");
 
 		// Clean up the temp file
-		@unlink("/tmp/{$file_name}");
+		unlink_if_exists("/tmp/{$file_name}");
 	}
 	else
 		$savemsg = gettext("An error occurred while creating the gzip archive!");
-- 
cgit v1.2.3