From 552f5a6a5ffc6d6279c8b86a71996de2243d4c50 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 4 Feb 2014 17:01:20 -0200
Subject: Use unlink_if_exists or @unlink to avoid PHP errors when file doesn't
 exist

---
 etc/inc/interfaces.inc                  | 2 +-
 etc/inc/rrd.inc                         | 3 +--
 usr/local/www/firewall_aliases_edit.php | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 2e4a8d5..18c0741 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1828,7 +1828,7 @@ EOD;
 	} else {
 		if (file_exists("/conf/{$pppif}.log")) {
 			conf_mount_rw();
-			unlink("/conf/{$pppif}.log");
+			@unlink("/conf/{$pppif}.log");
 			conf_mount_ro();
 		}
 	}
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index a66120a..16d7aaa 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -36,8 +36,7 @@
 
 function dump_rrd_to_xml($rrddatabase, $xmldumpfile) {
 	$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool";
-	if(file_exists($xmldumpfile))
-		unlink($xmldumpfile);
+	unlink_if_exists($xmldumpfile);
 
 	exec("$rrdtool dump " . escapeshellarg($rrddatabase) . " {$xmldumpfile} 2>&1", $dumpout, $dumpret);
 	if ($dumpret <> 0) {
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index d92e145..ab149c8 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -73,7 +73,7 @@ if($_POST)
 
 // Debugging
 if($debug)
-	unlink("{$g['tmp_path']}/alias_rename_log.txt");
+	unlink_if_exists("{$g['tmp_path']}/alias_rename_log.txt");
 
 function alias_same_type($name, $type) {
 	global $config;
@@ -211,7 +211,7 @@ if ($_POST) {
 				/* fetch down and add in */
 				$isfirst = 0;
 				$temp_filename = tempnam("{$g['tmp_path']}/", "alias_import");
-				unlink($temp_filename);
+				unlink_if_exists($temp_filename);
 				$verify_ssl = isset($config['system']['checkaliasesurlcert']);
 				mkdir($temp_filename);
 				download_file($_POST['address' . $x], $temp_filename . "/aliases", $verify_ssl);
-- 
cgit v1.1