diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2f9af9bc2a..5dacaf7293 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,18 @@ +2011-03-08 Miguel de Dios + + * include/functions_events.php, include/functions_messages.php, + include/auth/mysql.php, include/functions_api.php, + include/functions_incidents.php, include/functions_db.php, + operation/incidents/incident_detail.php, + operation/snmpconsole/snmp_view.php, operation/reporting/graph_viewer.php, + godmode/groups/group_list.php, godmode/agentes/module_manager.php, + godmode/agentes/configurar_agente.php, godmode/agentes/planned_downtime.php, + godmode/servers/recon_script.php, godmode/servers/manage_recontask.php, + godmode/servers/modificar_server.php, godmode/snmpconsole/snmp_alert.php, + godmode/snmpconsole/snmp_filters.php, + godmode/modules/manage_network_templates_form.php: change the source code + for to use process_sql_delete instead of the SQL. + 2011-03-08 Miguel de Dios * include/functions_api.php, include/functions_db.php, diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 7120d04d86..2b5b073793 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -359,9 +359,12 @@ if (isset( $_GET["fix_module"])) { $error = ""; //If the value of media is 0 or something went wrong, don't delete if (!empty ($media)) { - $sql = sprintf ("DELETE FROM tagente_datos WHERE datos > %f AND id_agente_modulo = %d", $media, $id_module); - $result = process_sql ($sql); - } else { + $where = array( + 'datos' => '>' . $media, + 'id_agente_modulo' => $id_module); + process_sql_delete('tagente_datos', $where); + } + else { $result = false; $error = " - ".__('No data to normalize'); } @@ -785,10 +788,12 @@ if ($delete_module) { // DELETE agent module ! if ($result === false) $error++; - if (process_sql ("DELETE FROM tagente_estado WHERE id_agente_modulo = ".$id_borrar_modulo) === false) + $result = process_sql_delete('tagente_estado', array('id_agente_modulo' => $id_borrar_modulo)); + if ($result === false) $error++; - - if (process_sql ("DELETE FROM tagente_datos_inc WHERE id_agente_modulo = ".$id_borrar_modulo) === false) + + $result = process_sql_delete('tagente_datos_inc', array('id_agente_modulo' => $id_borrar_modulo)); + if ($result === false) $error++; if (delete_alert_agent_module($id_borrar_modulo) === false) @@ -799,7 +804,8 @@ if ($delete_module) { // DELETE agent module ! if ($error != 0) { process_sql_rollback (); print_error_message (__('There was a problem deleting the module')); - } else { + } + else { process_sql_commit (); print_success_message (__('Module deleted succesfully')); diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index bbc1eb217d..7ec1a65cfd 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -108,14 +108,16 @@ if ($multiple_delete) { // error. NOTICE that we don't delete all data here, just marking for deletion // and delete some simple data. - if (process_sql ("UPDATE tagente_modulo + if (process_sql("UPDATE tagente_modulo SET nombre = 'pendingdelete', disabled = 1, delete_pending = 1 WHERE id_agente_modulo = ".$id_agent_module_del) === false) $error++; - if (process_sql ("DELETE FROM tagente_estado WHERE id_agente_modulo = ".$id_agent_module_del) === false) + $result = process_sql_delete('tagente_estado', array('id_agente_modulo' => $id_agent_module_del)); + if ($result === false) $error++; - - if (process_sql ("DELETE FROM tagente_datos_inc WHERE id_agente_modulo = ".$id_agent_module_del) === false) + + $result = process_sql_delete('tagente_datos_inc', array('id_agente_modulo' => $id_agent_module_del)); + if ($result === false) $error++; @@ -123,7 +125,8 @@ if ($multiple_delete) { if ($error != 0) { process_sql_rollback (); print_error_message (__('There was a problem deleting the module')); - } else { + } + else { process_sql_commit (); print_success_message (__('Module deleted succesfully')); } diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php index 8fb6ef0990..ba7abd1ba1 100644 --- a/pandora_console/godmode/agentes/planned_downtime.php +++ b/pandora_console/godmode/agentes/planned_downtime.php @@ -70,20 +70,19 @@ if ($delete_downtime_agent == 1){ $id_da = get_parameter ("id_downtime_agent"); - $sql = "DELETE FROM tplanned_downtime_agents WHERE id = $id_da"; - $result = process_sql ($sql); + $result = process_sql_delete('tplanned_downtime_agents', array('id' => $id_da)); } // DELETE WHOLE DOWNTIME! if ($delete_downtime) { - $sql = sprintf ("DELETE FROM tplanned_downtime WHERE id = %d", $id_downtime); - $result = process_sql ($sql); - $sql = sprintf ("DELETE FROM tplanned_downtime_agents WHERE id = %d", $id_downtime); - $result2 = process_sql ($sql); + $result = process_sql_delete('tplanned_downtime', array('id' => $id_downtime)); + + $result2 = process_sql_delete('tplanned_downtime_agents', array('id' => $id_downtime)); if (($result === false) OR ($result2 === false)){ echo '

'.__('Not deleted. Error deleting data').'

'; - } else { + } + else { echo '

'.__('Successfully deleted').'

'; } } @@ -193,7 +192,8 @@ if ($create_downtime || $update_downtime) { print_input_hidden ('update_downtime', 1); print_input_hidden ('id_downtime', $id_downtime); print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"'); - } else { + } + else { print_input_hidden ('create_downtime', 1); print_submit_button (__('Add'), 'crtbutton', false, 'class="sub wand"'); } @@ -244,7 +244,8 @@ if ($create_downtime || $update_downtime) { $downtimes = get_db_all_rows_sql ($sql); if ($downtimes === false) { echo '
'. __('There are no scheduled downtimes').'
'; - } else { + } + else { $table->class = 'databox'; $table->width = '80%'; $table->data = array (); @@ -277,7 +278,8 @@ if ($create_downtime || $update_downtime) { print_table ($table); } } -} else { +} +else { // View available downtimes present in database (if any of them) $table->class = 'databox'; @@ -302,7 +304,8 @@ if ($create_downtime || $update_downtime) { $downtimes = get_db_all_rows_sql ($sql); if (!$downtimes) { echo '
'.__('No planned downtime').'
'; - } else { + } + else { echo '

'.__('Planned Downtime present on system').':

'; foreach ($downtimes as $downtime) { $data = array(); @@ -319,7 +322,8 @@ if ($create_downtime || $update_downtime) { print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))); $data[6] = '' . print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . ''; - } else { + } + else { $data[5]= "N/A"; $data[6]= "N/A"; diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 33f4fedfd3..6a1ba03745 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -166,12 +166,10 @@ if ($delete_group) { $group = get_db_row_filter('tgrupo', array('id_grupo' => $id_group)); process_sql_update('tgrupo', array('parent' => $group['parent']), array('parent' => $id_group)); - - $sql = sprintf ('DELETE FROM tgroup_stat WHERE id_group = %d', $id_group); - $result = process_sql ($sql); - $sql = sprintf ('DELETE FROM tgrupo WHERE id_grupo = %d', $id_group); - $result = process_sql ($sql); + $result = process_sql_delete('tgroup_stat', array('id_group' => $id_group)); + + $result = process_sql_delete('tgrupo', array('id_grupo' => $id_group)); } else { echo "

" . diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php index 5b7642851f..86056d6f63 100644 --- a/pandora_console/godmode/modules/manage_network_templates_form.php +++ b/pandora_console/godmode/modules/manage_network_templates_form.php @@ -38,8 +38,11 @@ if (isset ($_GET["delete_module"])) { // Delete module from profile $errors = 0; foreach ($id_nc as $component) { - $sql = sprintf ("DELETE FROM tnetwork_profile_component WHERE id_np = %d AND id_nc = %d", $id_np, $component); - $result = process_sql ($sql); + $where = array( + 'id_np' => $id_np, + 'id_nc' => $component); + $result = process_sql_delete('tnetwork_profile_component', $where); + if ($result === false) { $errors++; } diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index 4e948273df..f040412820 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -34,11 +34,13 @@ print_page_header (__('Manage recontask'), "", false, "", true); // -------------------------------- if (isset ($_GET["delete"])) { $id = get_parameter_get ("delete"); - $sql = sprintf("DELETE FROM trecon_task WHERE id_rt = '%d'",$id); - $result = process_sql ($sql); + + $result = process_sql_delete('trecon_task', array('id_rt' => $id)); + if ($result !== false) { echo '

'.__('Successfully deleted recon task').'

'; - } else { + } + else { echo '

'.__('Error deleting recon task').'

'; } } diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 8a822eb801..9ddc1af63a 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -57,8 +57,9 @@ else { if (isset ($_GET["delete"])) { $id_server = get_parameter_get ("server_del"); - $sql = sprintf ("DELETE FROM tserver WHERE id_server='%d'",$id_server); - $result = process_sql ($sql); + + $result = process_sql_delete('tserver', array('id_server' => $id_server)); + if ($result !== false) { echo '

'.__('Server deleted successfully').'

'; } diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php index f3cf842366..d71c6f8f38 100644 --- a/pandora_console/godmode/servers/recon_script.php +++ b/pandora_console/godmode/servers/recon_script.php @@ -143,8 +143,10 @@ else { if (isset($_GET["kill_reconscript"])){ // if delete alert $reconscript_id = get_parameter ("kill_reconscript", 0); - $sql_delete= "DELETE FROM trecon_script WHERE id_recon_script = ".$reconscript_id; - $result = process_sql($sql_delete); + + $result = process_sql_delete('trecon_script', + array('id_recon_script' => $reconscript_id)); + if (! $result){ echo "

".__('Problem deleting reconscript')."

"; } @@ -152,8 +154,8 @@ else { echo "

".__('reconscript deleted successfully')."

"; } if ($reconscript_id != 0){ - $sql_delete2 = "DELETE FROM trecon_task WHERE id_recon_script = ".$reconscript_id; - $result = process_sql ($sql_delete2); + $result = process_sql_delete('trecon_task', + array('id_recon_script' => $reconscript_id)); } } diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index 3224ba5505..b98f380a98 100644 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -128,11 +128,12 @@ if ((isset ($_GET["update_alert"])) && ($_GET["update_alert"] != -1)) { // ============= if (isset ($_GET["delete_alert"])) { // Delete alert $alert_delete = (int) get_parameter_get ("delete_alert", 0); - $sql = sprintf ("DELETE FROM talert_snmp WHERE id_as = %d", $alert_delete); - $result = process_sql ($sql); + + $result = process_sql_delete('talert_snmp', array('id_as' => $alert_delete)); if ($result === false) { echo '

'.__('There was a problem deleting the alert').'

'; - } else { + } + else { echo '

'.__('Successfully deleted').'

'; } } diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php index b0ea8e2428..5308f66659 100644 --- a/pandora_console/godmode/snmpconsole/snmp_filters.php +++ b/pandora_console/godmode/snmpconsole/snmp_filters.php @@ -68,8 +68,8 @@ if ($update_filter > -2) { } } else if ($delete_filter > -1) { // Delete - $sql = sprintf ("DELETE FROM tsnmp_filter WHERE id_snmp_filter = %d", $delete_filter); - if (process_sql ($sql) === false) { + $result = process_sql_delete('tsnmp_filter', array('id_snmp_filter' => $delete_filter)); + if ($result === false) { print_error_message (__('There was a problem deleting the filter')); } else { diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index da555d9ee7..ecf1bfe905 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -343,13 +343,12 @@ function create_user ($id_user, $password, $user_info) { * @param string User id */ function delete_user ($id_user) { - $sql = "DELETE FROM tusuario_perfil WHERE id_usuario = '".$id_user."'"; - $result = process_sql ($sql); + $result = process_sql_delete('tusuario_perfil', array('id_usuario' => $id_user)); if ($result === false) { return false; } - $sql = "DELETE FROM tusuario WHERE id_user = '".$id_user."'"; - $result = process_sql ($sql); + + $result = process_sql_delete('tusuario', array('id_user' => $id_user)); if ($result === false) { return false; } diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 7b72fde222..554f3bebc7 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -1508,8 +1508,11 @@ function set_delete_user_profile($id, $thrash1, $other, $thrash2) { $group = $other['data'][0]; $profile = $other['data'][1]; - $sql = sprintf ('DELETE FROM tusuario_perfil WHERE id_usuario LIKE "%s" AND id_perfil = %d AND id_grupo = %d', $id, $profile, $group); - $return = process_sql ($sql); + $where = array( + 'id_usuario' => $id, + 'id_perfil' => $profile, + 'id_grupo' => $group); + $result = process_sql_delete('tusuario_perfil', $where); if ($return === false) returnError('error_delete_user_profile', 'Error delete user profile.'); else diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 04eda3b05c..7d68b8a18b 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -483,8 +483,10 @@ function create_user_profile ($id_user, $id_profile = 1, $id_group = 0, $assignU * @return bool Whether or not it's deleted */ function delete_user_profile ($id_user, $id_profile) { - $sql = sprintf ("DELETE FROM tusuario_perfil WHERE id_usuario = '%s' AND id_up = %d", $id_user, $id_profile); - return (bool) process_sql ($sql); + $where = array( + 'id_usuario' => $id_user, + 'id_up' => $id_profile); + return (bool)process_sql_delete('tusuario_perfil', $where); } /** @@ -495,8 +497,7 @@ function delete_user_profile ($id_user, $id_profile) { * @return bool Whether or not it's deleted */ function delete_profile ($id_profile) { - $sql = sprintf ("DELETE FROM tperfil WHERE id_perfil = %d", $id_profile); - return (bool) process_sql ($sql); + return (bool)process_sql_delete('tperfil', array('id_perfil' => $id_profile)); } /** @@ -2047,8 +2048,7 @@ function agent_delete_address ($id_agent, $ip_address) { AND id_agent = %d",$ip_address, $id_agent); $id_ag = get_db_sql ($sql); if ($id_ag !== false) { - $sql = sprintf ("DELETE FROM taddress_agent WHERE id_ag = %d",$id_ag); - process_sql ($sql); + process_sql_delete('taddress_agent', array('id_ag' => $id_ag)); } $agent_name = get_agent_name($id_agent, ""); pandora_audit("Agent management", diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index b250e5de37..b83cbc5b55 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -116,8 +116,7 @@ function delete_event ($id_event, $similar = true) { $errors = 0; foreach ($id_event as $event) { - $sql = sprintf ("DELETE FROM tevento WHERE id_evento = %d", $event); - $ret = process_sql ($sql); + $ret = process_sql_delete('tevento', array('id_evento' => $event)); if (check_acl ($config["id_user"], get_event_group ($event), "IM") == 0) { //Check ACL diff --git a/pandora_console/include/functions_incidents.php b/pandora_console/include/functions_incidents.php index dc1fd080c3..d7a369201a 100644 --- a/pandora_console/include/functions_incidents.php +++ b/pandora_console/include/functions_incidents.php @@ -242,8 +242,7 @@ function delete_incidents ($id_incident) { foreach ($ids as $id_inc) { //Delete incident - $sql = sprintf ("DELETE FROM tincidencia WHERE id_incidencia = %d", $id_inc); - $ret = process_sql ($sql); + $ret = process_sql_delete('tincidencia', array('id_incidencia' => $id_inc)); if ($ret === false) { $errors++; } @@ -333,8 +332,8 @@ function delete_incidents_attach ($id_attach, $transact = true) { //Delete attachment foreach ($id_attach as $id) { $filename = get_db_value ("filename", "tattachment", "id_attachment", $id); - $sql = sprintf ("DELETE FROM tattachment WHERE id_attachment = %d", $id); - $ret = process_sql ($sql); + + $ret = process_sql_delete('tattachment', array('id_attachment' => $id)); if ($ret === false) { $errors++; } @@ -344,12 +343,15 @@ function delete_incidents_attach ($id_attach, $transact = true) { if ($transact == true && $errors > 0) { process_sql_rollback (); return false; - } elseif ($transact == true) { + } + elseif ($transact == true) { process_sql_commit (); return true; - } elseif ($errors > 0) { + } + elseif ($errors > 0) { return false; - } else { + } + else { return true; } } diff --git a/pandora_console/include/functions_messages.php b/pandora_console/include/functions_messages.php index 7b42794bb6..1df733a09f 100644 --- a/pandora_console/include/functions_messages.php +++ b/pandora_console/include/functions_messages.php @@ -104,8 +104,10 @@ function create_message_group ($usuario_origen, $dest_group, $subject, $mensaje) function delete_message ($id_message) { global $config; - $sql = sprintf ("DELETE FROM tmensajes WHERE id_usuario_destino='%s' AND id_mensaje=%d", $config["id_user"], $id_message); - return (bool) process_sql ($sql); + $where = array( + 'id_usuario_destino' => $config["id_user"], + 'id_mensaje' => $id_message); + return (bool)process_sql_delete($tmensajes, $where); } /** diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php index a43ad36789..0398016657 100644 --- a/pandora_console/operation/incidents/incident_detail.php +++ b/pandora_console/operation/incidents/incident_detail.php @@ -92,8 +92,8 @@ if (isset ($_GET["id"])) { if (((check_acl ($config["id_user"], $id_grupo, "IM")==1) OR ($id_owner == $config["id_user"])) AND isset ($_POST["delete_file"])) { $file_id = (int) get_parameter_post ("delete_file", 0); $filename = get_db_value ("filename", "tattachment", "id_attachment", $file_id); - $sql = sprintf ("DELETE FROM tattachment WHERE id_attachment = %d",$file_id); - $result = process_sql ($sql); + + $result = process_sql_delete('tattachment', array('id_attachment' => $file_id)); if (!empty ($result)) { unlink ($config["attachment_store"]."/pand".$file_id."_".$filename); @@ -134,7 +134,8 @@ if (isset ($_GET["id"])) { if ($id_attachment !== false) { $nombre_archivo = $config["attachment_store"]."/pand".$id_attachment."_".$filename; $result = copy ($_FILES['userfile']['tmp_name'], $nombre_archivo); - } else { + } + else { echo '

'.__('File could not be saved due to database error').'

'; $result = false; } @@ -142,8 +143,9 @@ if (isset ($_GET["id"])) { if ($result !== false) { unlink ($_FILES['userfile']['tmp_name']); process_incidents_touch ($id_inc); - } else { - process_sql ("DELETE FROM tattachment WHERE id_attachment = ".$id_attachment); + } + else { + process_sql_delete('tattachment', array('id_attachment' => $id_attachment)); } print_result_message ($result, diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php index 4b331bbc36..2599c73970 100644 --- a/pandora_console/operation/reporting/graph_viewer.php +++ b/pandora_console/operation/reporting/graph_viewer.php @@ -36,8 +36,7 @@ if ($delete_graph) { $result = "

".__('Not deleted. Error deleting data')."

"; $res = process_sql_delete('tgraph', array('id_graph' => $id_graph)); - - $sql = "DELETE FROM tgraph WHERE id_graph = $id_graph"; + if ($res) $result = "

".__('Successfully deleted')."

"; else diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index ed34abc4db..97664e535b 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -56,8 +56,8 @@ print_page_header (__("SNMP Console"), "images/computer_error.png", false, "", f if (isset ($_GET["delete"])){ $id_trap = (int) get_parameter_get ("delete", 0); if ($id_trap > 0 && check_acl ($config['id_user'], 0, "IM")) { - $sql = sprintf ("DELETE FROM ttrap WHERE id_trap = %d", $id_trap); - $result = process_sql ($sql); + + $result = process_sql_delete('ttrap', array('id_trap' => $id_trap)); print_result_message ($result, __('Successfully deleted'), __('Could not be deleted')); @@ -92,8 +92,7 @@ if (isset ($_POST["deletebt"])) { $trap_ids = get_parameter_post ("snmptrapid", array ()); if (is_array ($trap_ids) && check_acl ($config['id_user'], 0, "IW")) { foreach ($trap_ids as $id_trap) { - $sql = sprintf ("DELETE FROM ttrap WHERE id_trap = %d", $id_trap); - process_sql ($sql); + process_sql_delete('ttrap', array('id_trap' => $id_trap)); } } else {