From 8ada52ed44113588539384fc756d9bea1c1db988 Mon Sep 17 00:00:00 2001 From: jsatoh Date: Sat, 31 Mar 2012 02:37:47 +0000 Subject: [PATCH] 2012-03-31 Junichi Satoh * operation/incidents/incident.php: Fixed SQL error with PostgreSQL. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5855 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 +++ .../operation/incidents/incident.php | 30 ++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 60a957c7d9..7580df7195 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2012-03-31 Junichi Satoh + + * operation/incidents/incident.php: Fixed SQL error with PostgreSQL. + 2012-03-31 Junichi Satoh * operation/incidents/incident_statistics.php: Removed obsolete diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php index 6e63bf48e6..751d6908e6 100755 --- a/pandora_console/operation/incidents/incident.php +++ b/pandora_console/operation/incidents/incident.php @@ -122,8 +122,8 @@ elseif ($action == "insert") { $id_creator = $config['id_user']; $estado = get_parameter ("estado_form"); $id_agent = get_parameter ("id_agent"); - $sql = sprintf ("INSERT INTO tincidencia (inicio, actualizacion, titulo, descripcion, id_usuario, origen, estado, prioridad, id_grupo, id_creator, id_agent) VALUES - (NOW(), NOW(), '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d)", $titulo, $descripcion, $config["id_user"], $origen, $estado, $prioridad, $grupo, $config["id_user"], $id_agent); + $sql = sprintf ("INSERT INTO tincidencia (inicio, actualizacion, titulo, descripcion, id_usuario, origen, estado, prioridad, id_grupo, id_creator, id_agent, id_agente_modulo) VALUES + (NOW(), NOW(), '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0)", $titulo, $descripcion, $config["id_user"], $origen, $estado, $prioridad, $grupo, $config["id_user"], $id_agent); $id_inc = db_process_sql ($sql, "insert_id"); if ($id_inc === false) { @@ -173,16 +173,26 @@ $groups = users_get_groups ($config["id_user"], "IR"); //Select incidencts where the user has access to ($groups from //get_user_groups), array_keys for the id, implode to pass to SQL -$sql = "SELECT * FROM tincidencia WHERE - id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." - ORDER BY actualizacion DESC LIMIT ".$offset.",".$config["block_size"]; +switch ($config["dbtype"]) { + case "mysql": + $sql = "SELECT * FROM tincidencia WHERE + id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." + ORDER BY actualizacion DESC LIMIT ".$offset.",".$config["block_size"]; + $count_sql = "SELECT count(*) FROM tincidencia WHERE + id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." + ORDER BY actualizacion DESC"; + break; + case "postgresql": + case "oracle": + $sql = "SELECT * FROM tincidencia WHERE + id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." + ORDER BY actualizacion DESC OFFSET ".$offset." LIMIT ".$config["block_size"]; + $count_sql = "SELECT count(*) FROM tincidencia WHERE + id_grupo IN (".implode (",",array_keys ($groups)).")".$filter; + breka; +} $result = db_get_all_rows_sql ($sql); - -$count_sql = "SELECT count(*) FROM tincidencia WHERE - id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." - ORDER BY actualizacion DESC"; - $count = db_get_value_sql ($count_sql); if (empty ($result)) {