From 4bdb08e3b0d4dacaba45f60e7f8a192f1f6d670e 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

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

(limited to 'etc')

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index e842ffa..49c6121 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1823,7 +1823,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) {
-- 
cgit v1.1