From 0473ff752b79f1bb2102ec7293f10ab81af4b795 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Tue, 27 Jul 2010 21:13:14 +0000 Subject: [PATCH] make sure there aren't any trailing spaces in paths or we could accidentally maybe perhaps rm -r / or similar wrong directories git-svn-id: http://www.observium.org/svn/observer/trunk@1500 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/functions.php b/includes/functions.php index f745459be5..9c3463a403 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -254,7 +254,7 @@ function delete_port($int_id) mysql_query("DELETE FROM `bill_ports` WHERE `port_id` = '$int_id'"); mysql_query("DELETE from `pseudowires` WHERE `interface_id` = '$int_id'"); mysql_query("DELETE FROM `ports` WHERE `interface_id` = '$int_id'"); - shell_exec("rm -rf ".$config['rrd_dir']."/".$interface['hostname']."/".$interface['ifIndex'].".rrd"); + shell_exec("rm -rf ".trim($config['rrd_dir'])."/".trim($interface['hostname'])."/".$interface['ifIndex'].".rrd"); } function delete_device($id) @@ -286,7 +286,7 @@ function delete_device($id) mysql_query("DELETE FROM `frequency` WHERE `device_id` = '$id'"); mysql_query("DELETE FROM `current` WHERE `device_id` = '$id'"); mysql_query("DELETE FROM `sensors` WHERE `device_id` = '$id'"); - shell_exec("rm -rf ".$config['rrd_dir']."/$host"); + shell_exec("rm -rf ".trim($config['rrd_dir'])."/$host"); return $ret . "Removed device $host\n"; }