clean up commandline delhost output

git-svn-id: http://www.observium.org/svn/observer/trunk@1248 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-06-23 14:49:08 +00:00
parent dffd147479
commit f341e1c472
3 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ if($argv[1]) {
$host = strtolower($argv[1]);
$id = getidbyname($host);
if($id) {
delete_device($id);
echo delete_device($id);
echo("Removed $host\n");
} else {
echo("Host doesn't exist!\n");

View File

@ -6,9 +6,9 @@ if($_SESSION['userlevel'] < 10) {
}
if($_POST['id']) {
delete_device(mres($_POST['id']));
} elseif (mres($_GET['id'])) {
delete_device(mres($_GET['id']));
echo delete_device(mres($_POST['id']));
} elseif ($_GET['id']) {
echo delete_device(mres($_GET['id']));
}
?>

View File

@ -311,7 +311,7 @@ function delete_device($id)
$int_if = $int_data['ifDescr'];
$int_id = $int_data['interface_id'];
delete_port($int_id);
echo("Removed interface $int_id ($int_if)<br />");
$ret = "Removed interface $int_id ($int_if)\n";
}
mysql_query("DELETE FROM `entPhysical` WHERE `device_id` = '$id'");
mysql_query("DELETE FROM `devices_attribs` WHERE `device_id` = '$id'");
@ -333,7 +333,7 @@ function delete_device($id)
mysql_query("DELETE FROM `frequency` WHERE `device_id` = '$id'");
mysql_query("DELETE FROM `current` WHERE `device_id` = '$id'");
shell_exec("rm -rf ".$config['rrd_dir']."/$host");
echo("Removed device $host<br />");
return $ret . "Removed device $host\n";
}
function retireHost($id)