tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sql problemas in incidents section (oracle). Ticket#2902

Browse Source
This commit is contained in:
Arturo Gonzalez Diaz 2015-10-21 13:57:05 +02:00
parent 7aed427a7a
commit e8cc3ccbf9
3 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/godmode/agentes/agent_incidents.php
View File

@ -40,10 +40,19 @@ $url = "index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=inciden
//Select incidencts where the user has access to ($groups from //Select incidencts where the user has access to ($groups from
//get_user_groups), array_keys for the id, implode to pass to SQL //get_user_groups), array_keys for the id, implode to pass to SQL
$sql = "SELECT * FROM tincidencia WHERE switch ($config["dbtype"]) {
id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." case 'mysql':
ORDER BY actualizacion DESC LIMIT ".$offset.",".$config["block_size"]; $sql = "SELECT * FROM tincidencia WHERE
id_grupo IN (".implode (",",array_keys ($groups)).")".$filter."
ORDER BY actualizacion DESC LIMIT ".$offset.",".$config["block_size"];
break;
case 'oracle':
$sql = "SELECT * FROM tincidencia WHERE
id_grupo IN (".implode (",",array_keys ($groups)).")".$filter."
AND rownum <= " . $offset.",".$config["block_size"] . "
ORDER BY actualizacion DESC";
break;
}
$result = db_get_all_rows_sql ($sql); $result = db_get_all_rows_sql ($sql);
$count_sql = "SELECT count(*) FROM tincidencia WHERE $count_sql = "SELECT count(*) FROM tincidencia WHERE

41
pandora_console/include/functions_graph.php
View File

@ -2233,11 +2233,23 @@ function graphic_incident_group () {
$data = array (); $data = array ();
$max_items = 5; $max_items = 5;
$sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents, nombre switch ($config["dbtype"]) {
FROM tincidencia,tgrupo case 'mysql':
WHERE tgrupo.id_grupo = tincidencia.id_grupo $sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents, nombre
GROUP BY tgrupo.id_grupo, nombre ORDER BY 1 DESC LIMIT %d', FROM tincidencia,tgrupo
$max_items); WHERE tgrupo.id_grupo = tincidencia.id_grupo
GROUP BY tgrupo.id_grupo, nombre ORDER BY 1 DESC LIMIT %d',
$max_items);
break;
case 'oracle':
$sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents, nombre
FROM tincidencia,tgrupo
WHERE tgrupo.id_grupo = tincidencia.id_grupo
AND rownum <= %d
GROUP BY tgrupo.id_grupo, nombre ORDER BY 1 DESC',
$max_items);
break;
}
$incidents = db_get_all_rows_sql ($sql); $incidents = db_get_all_rows_sql ($sql);
$sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents $sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents
@ -2279,10 +2291,21 @@ function graphic_incident_user () {
$data = array (); $data = array ();
$max_items = 5; $max_items = 5;
$sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents, id_usuario switch ($config["dbtype"]) {
FROM tincidencia case 'mysql':
GROUP BY id_usuario $sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents, id_usuario
ORDER BY 1 DESC LIMIT %d', $max_items); FROM tincidencia
GROUP BY id_usuario
ORDER BY 1 DESC LIMIT %d', $max_items);
break;
case 'oracle':
$sql = sprintf ('SELECT COUNT(id_incidencia) n_incidents, id_usuario
FROM tincidencia
WHERE rownum <= %d
GROUP BY id_usuario
ORDER BY 1 DESC', $max_items);
break;
}
$incidents = db_get_all_rows_sql ($sql); $incidents = db_get_all_rows_sql ($sql);
if ($incidents == false) { if ($incidents == false) {

8
pandora_console/operation/incidents/incident.php
View File

@ -196,9 +196,13 @@ switch ($config["dbtype"]) {
break; break;
case "postgresql": case "postgresql":
case "oracle": case "oracle":
$sql = "SELECT * FROM tincidencia WHERE $set = array();
$set['limit'] = $config["block_size"];
$set['offset'] = $offset;
$sql = "SELECT * FROM tincidencia WHERE
id_grupo IN (".implode (",",array_keys ($groups)).")".$filter." id_grupo IN (".implode (",",array_keys ($groups)).")".$filter."
ORDER BY actualizacion DESC OFFSET ".$offset." LIMIT ".$config["block_size"]; ORDER BY actualizacion DESC";
$sql = oracle_recode_query ($sql, $set);
$count_sql = "SELECT count(*) FROM tincidencia WHERE $count_sql = "SELECT count(*) FROM tincidencia WHERE
id_grupo IN (".implode (",",array_keys ($groups)).")".$filter; id_grupo IN (".implode (",",array_keys ($groups)).")".$filter;
$total_sql = "SELECT count(*) FROM tincidencia WHERE $total_sql = "SELECT count(*) FROM tincidencia WHERE