diff options
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | etc/inc/rrd.inc | 3 | ||||
| -rwxr-xr-x | 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 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) { diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 8813235..77a2630 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; @@ -203,7 +203,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); mwexec("/bin/mkdir -p {$temp_filename}"); mwexec("/usr/bin/fetch -q -o \"{$temp_filename}/aliases\" " . escapeshellarg($_POST['address' . $x])); /* if the item is tar gzipped then extract */ |
