From fc4680e4755bc3aea6a627a137bcda99c881a38c Mon Sep 17 00:00:00 2001 From: vgilc Date: Thu, 15 Mar 2012 10:40:43 +0000 Subject: [PATCH] 2012-03-15 Vanessa Gil * godmode/alerts/alert_actions.php godmode/agentes/modificar_agente.php godmode/alerts/configure_alert_template: Removed duplicated log entries. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5774 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/agentes/modificar_agente.php | 1 - pandora_console/godmode/alerts/alert_actions.php | 4 ++-- .../godmode/alerts/configure_alert_template.php | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9c4fd85dc2..a83a2a57c1 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-03-15 Vanessa Gil + + * godmode/alerts/alert_actions.php + godmode/agentes/modificar_agente.php + godmode/alerts/configure_alert_template: Removed + duplicated log entries. + 2012-03-15 Hirofumi Kosaka * include/functions_api.php: Fixed the function "set_new_agent" diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index adea3c8ef3..aedf87da6d 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -54,7 +54,6 @@ if (!empty($agent_to_delete)) { if (check_acl ($config["id_user"], $id_grupo, "AW")==1) { $id_agentes[0] = $id_agente; $result = agents_delete_agent($id_agentes); - db_pandora_audit("Agent management", "Delete Agent " . $agent_name); } else { // NO permissions. diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index fd32f44c40..488da0f071 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -252,10 +252,10 @@ if ($delete_action) { $result = alerts_delete_alert_action ($id); if ($result) { - db_pandora_audit("Command management", "Delete alert action " . $id); + db_pandora_audit("Command management", "Delete alert action #" . $id); } else { - db_pandora_audit("Command management", "Fail try to delete alert action " . $id); + db_pandora_audit("Command management", "Fail try to delete alert action #" . $id); } ui_print_result_message ($result, diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index e924df3217..e40d1c5f11 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -281,10 +281,10 @@ function update_template ($step) { } if ($result) { - db_pandora_audit("Template alert management", "Update alert template " . $id, false, false, json_encode($values)); + db_pandora_audit("Template alert management", "Update alert template #" . $id, false, false, json_encode($values)); } else { - db_pandora_audit("Template alert management", "Fail try to update alert template " . $id, false, false, json_encode($values)); + db_pandora_audit("Template alert management", "Fail try to update alert template #" . $id, false, false, json_encode($values)); } return $result; @@ -371,7 +371,7 @@ if ($create_template) { } if ($result) { //db_pandora_audit("Command management", "Create alert command " . $result, false, false, json_encode($values)); - db_pandora_audit("Template alert management", "Create alert template " . $result, false, false, json_encode($values)); + db_pandora_audit("Template alert management", "Create alert template #" . $result, false, false, json_encode($values)); } else { //db_pandora_audit("Command management", "Fail try to create alert command", false, false, json_encode($values));