Replace calls to @unlink with unlink_if_exists().

10 files changed, 21 insertions, 25 deletions

diff --git a/config/suricata/suricata.inc b/config/suricata/suricata.inc
index 5fde5e3d..31947f99 100644
--- a/config/suricata/suricata.inc
+++ b/config/suricata/suricata.inc
@@ -685,7 +685,7 @@ function sync_suricata_package_config() {
 
 	// Do not start config build if there are no Suricata-configured interfaces
 	if (!is_array($config['installedpackages']['suricata']) || !is_array($config['installedpackages']['suricata']['rule'])) {
-		@unlink("{$rcdir}suricata.sh");
+		unlink_if_exists("{$rcdir}suricata.sh");
 		conf_mount_ro();
 		return;
 	}
@@ -853,19 +853,19 @@ function suricata_post_delete_logs($suricata_uuid = 0) {
 			// Keep most recent file
 			unset($filelist[count($filelist) - 1]);
 			foreach ($filelist as $file)
-				@unlink($file);
+				unlink_if_exists($file);
 
 			/* Clean-up Barnyard2 archived files if any exist */
 			$filelist = glob("{$suricata_log_dir}/barnyard2/archive/unified2.alert.*");
 			foreach ($filelist as $file)
-				@unlink($file);
+				unlink_if_exists($file);
 
 			/* Clean-up packet capture files if any exist */
 			$filelist = glob("{$suricata_log_dir}/log.pcap.*");
 			// Keep most recent file
 			unset($filelist[count($filelist) - 1]);
 			foreach ($filelist as $file)
-				@unlink($file);
+				unlink_if_exists($file);
 			unset($filelist);
 		}
 	}
diff --git a/config/suricata/suricata_alerts.php b/config/suricata/suricata_alerts.php
index 9e4eacf2..35d702eb 100644
--- a/config/suricata/suricata_alerts.php
+++ b/config/suricata/suricata_alerts.php
@@ -399,7 +399,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");
@@ -836,7 +836,7 @@ if (file_exists("{$g['varlog_path']}/suricata/suricata_{$if_real}{$suricata_uuid
 		}
 		unset($fields, $buf, $tmp);
 		fclose($fd);
-		@unlink("/tmp/alerts_suricata{$suricata_uuid}");
+		unlink_if_exists("/tmp/alerts_suricata{$suricata_uuid}");
 	}
 }
 ?>
diff --git a/config/suricata/suricata_blocked.php b/config/suricata/suricata_blocked.php
index 8f708a14..23e08fcd 100644
--- a/config/suricata/suricata_blocked.php
+++ b/config/suricata/suricata_blocked.php
@@ -125,7 +125,7 @@ if ($_POST['download'])
 			readfile("/tmp/{$file_name}");
 
 			// Clean up the temp files and directory
-			@unlink("/tmp/{$file_name}");
+			unlink_if_exists("/tmp/{$file_name}");
 			rmdir_recursive("/tmp/suricata_blocked");
 		} else
 			$savemsg = gettext("An error occurred while creating archive");
diff --git a/config/suricata/suricata_check_for_rule_updates.php b/config/suricata/suricata_check_for_rule_updates.php
index b38ebf3d..6d4e518c 100644
--- a/config/suricata/suricata_check_for_rule_updates.php
+++ b/config/suricata/suricata_check_for_rule_updates.php
@@ -115,7 +115,7 @@ if ($etpro == "on") {
 	$emergingthreats_url .= "{$etproid}/suricata/";
 	$et_name = "Emerging Threats Pro";
 	$et_md5_remove = ET_DNLD_FILENAME . ".md5";
-	@unlink("{$suricatadir}{$et_md5_remove}");
+	unlink_if_exists("{$suricatadir}{$et_md5_remove}");
 }
 else {
 	$emergingthreats_filename = ET_DNLD_FILENAME;
@@ -126,7 +126,7 @@ else {
 	$emergingthreats_url .= "suricata/";
 	$et_name = "Emerging Threats Open";
 	$et_md5_remove = ETPRO_DNLD_FILENAME . ".md5";
-	@unlink("{$suricatadir}{$et_md5_remove}");
+	unlink_if_exists("{$suricatadir}{$et_md5_remove}");
 }
 
 // Set a common flag for all Emerging Threats rules (open and pro).
diff --git a/config/suricata/suricata_download_updates.php b/config/suricata/suricata_download_updates.php
index 9426099f..62898a2b 100644
--- a/config/suricata/suricata_download_updates.php
+++ b/config/suricata/suricata_download_updates.php
@@ -130,12 +130,9 @@ if ($_POST['force']) {
 	conf_mount_rw();
 
 	// Remove the existing MD5 signature files to force a download
-	if (file_exists("{$suricatadir}{$emergingthreats_filename}.md5"))
-		@unlink("{$suricatadir}{$emergingthreats_filename}.md5");
-	if (file_exists("{$suricatadir}{$snort_community_rules_filename}.md5"))
-		@unlink("{$suricatadir}{$snort_community_rules_filename}.md5");
-	if (file_exists("{$suricatadir}{$snort_rules_file}.md5"))
-		@unlink("{$suricatadir}{$snort_rules_file}.md5");
+	unlink_if_exists("{$suricatadir}{$emergingthreats_filename}.md5");
+	unlink_if_exists("{$suricatadir}{$snort_community_rules_filename}.md5");
+	unlink_if_exists("{$suricatadir}{$snort_rules_file}.md5");
 
 	// Revert file system to R/O.
 	conf_mount_ro();
diff --git a/config/suricata/suricata_interfaces.php b/config/suricata/suricata_interfaces.php
index 5a6a58c2..0a3b7eba 100644
--- a/config/suricata/suricata_interfaces.php
+++ b/config/suricata/suricata_interfaces.php
@@ -86,7 +86,7 @@ if ($_POST['del_x']) {
 			suricata_create_rc();
 		else {
 			conf_mount_rw();
-			@unlink("{$rcdir}suricata.sh");
+			unlink_if_exists("{$rcdir}suricata.sh");
 			conf_mount_ro();
 		}
 	  
diff --git a/config/suricata/suricata_post_install.php b/config/suricata/suricata_post_install.php
index 46204f91..5b6defeb 100644
--- a/config/suricata/suricata_post_install.php
+++ b/config/suricata/suricata_post_install.php
@@ -103,7 +103,7 @@ $g['suricata_postinstall'] = true;
 conf_mount_rw();
 
 // Remove any previously installed script since we rebuild it
-@unlink("{$rcdir}suricata.sh");
+unlink_if_exists("{$rcdir}suricata.sh");
 
 // Create the top-tier log directory
 safe_mkdir(SURICATALOGDIR);
diff --git a/config/suricata/suricata_rulesets.php b/config/suricata/suricata_rulesets.php
index 7ea672b1..6212f46a 100644
--- a/config/suricata/suricata_rulesets.php
+++ b/config/suricata/suricata_rulesets.php
@@ -142,8 +142,7 @@ if ($_POST["save"]) {
 		$a_nat[$id]['autoflowbitrules'] = 'on';
 	else {
 		$a_nat[$id]['autoflowbitrules'] = 'off';
-		if (file_exists("{$suricatadir}suricata_{$suricata_uuid}_{$if_real}/rules/{$flowbit_rules_file}"))
-			@unlink("{$suricatadir}suricata_{$suricata_uuid}_{$if_real}/rules/{$flowbit_rules_file}");
+		unlink_if_exists("{$suricatadir}suricata_{$suricata_uuid}_{$if_real}/rules/{$flowbit_rules_file}");
 	}
 
 	write_config("Suricata pkg: save enabled rule categories for {$a_nat[$id]['interface']}.");
diff --git a/config/suricata/suricata_sid_mgmt.php b/config/suricata/suricata_sid_mgmt.php
index c5140ba0..adcf677a 100644
--- a/config/suricata/suricata_sid_mgmt.php
+++ b/config/suricata/suricata_sid_mgmt.php
@@ -236,7 +236,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!");
diff --git a/config/suricata/suricata_uninstall.php b/config/suricata/suricata_uninstall.php
index e55a43b2..817c9ebd 100644
--- a/config/suricata/suricata_uninstall.php
+++ b/config/suricata/suricata_uninstall.php
@@ -80,7 +80,7 @@ install_cron_job("{$suri_pf_table}" , false);
 /* See if we are to keep Suricata log files on uninstall */
 if ($config['installedpackages']['suricata']['config'][0]['clearlogs'] == 'on') {
 	log_error(gettext("[Suricata] Clearing all Suricata-related log files..."));
-	@unlink("{$suricata_rules_upd_log}");
+	unlink_if_exists("{$suricata_rules_upd_log}");
 	rmdir_recursive("{$suricatalogdir}");
 }
 
@@ -112,9 +112,9 @@ if (!empty($widgets)) {
 	$config['widgets']['sequence'] = implode(",", $widgetlist);
 	write_config("Suricata pkg: remove Suricata Dashboard Widget on package deinstall.");
 }
-@unlink("/usr/local/www/widgets/include/widget-suricata.inc");
-@unlink("/usr/local/www/widgets/widgets/suricata_alerts.widget.php");
-@unlink("/usr/local/www/widgets/javascript/suricata_alerts.js");
+unlink_if_exists("/usr/local/www/widgets/include/widget-suricata.inc");
+unlink_if_exists("/usr/local/www/widgets/widgets/suricata_alerts.widget.php");
+unlink_if_exists("/usr/local/www/widgets/javascript/suricata_alerts.js");
 
 // Finished with filesystem mods so remount it read-only
 conf_mount_ro();
@@ -124,7 +124,7 @@ if ($config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] !
 	log_error(gettext("Not saving settings... all Suricata configuration info and logs deleted..."));
 	unset($config['installedpackages']['suricata']);
 	unset($config['installedpackages']['suricatasync']);
-	@unlink("{$suricata_rules_upd_log}");
+	unlink_if_exists("{$suricata_rules_upd_log}");
 	rmdir_recursive("{$suricatalogdir}");
 	rmdir_recursive("{$sidmodspath}");
 	rmdir_recursive("{$iprep_path}");