tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1921-Informe-de-tipo-Datos-Históricos-no-devuelve-info-de-base-de-datos-histórico-dev' into 'develop' 

Fixed connection to historical db

See merge request artica/pandorafms!1305
This commit is contained in:
vgilc 2018-02-26 10:12:36 +01:00
parent 4b9dd69a0f 17586472c8
commit 1c56f18dd8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_reporting.php
View File

@ -2463,7 +2463,7 @@ function reporting_historical_data($report, $content) {
WHERE id_agente_modulo =' . $content['id_agent_module'] . ' WHERE id_agente_modulo =' . $content['id_agent_module'] . '
AND utimestamp >' . $date_limit . ' AND utimestamp >' . $date_limit . '
AND utimestamp <=' . time() AND utimestamp <=' . time()
); , true);
break; break;
default: default:
$result = db_get_all_rows_sql ( $result = db_get_all_rows_sql (
@ -2472,7 +2472,7 @@ function reporting_historical_data($report, $content) {
WHERE id_agente_modulo =' . $content['id_agent_module'] . ' WHERE id_agente_modulo =' . $content['id_agent_module'] . '
AND utimestamp >' . $date_limit . ' AND utimestamp >' . $date_limit . '
AND utimestamp <=' . time() AND utimestamp <=' . time()
); , true);
break; break;
} }