diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5e3e39ff09..7b386877f4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2008-10-02 Esteban Sanchez + + * operation/reporting/reporting_viewer.php, + operation/reporting/reporting_xml.php: Quote order field on + get_db_all_rows_field_filter(), since it was a reserved word in SQL. + Style corrections. + 2008-10-02 Esteban Sanchez * include/functions_db.php: Removed quotes when using $order_field so diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 7feecfeb10..aefbd1b4e4 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -125,7 +125,7 @@ $table->rowclass = array (); $table->rowclass[0] = 'datos3'; $group_name = dame_grupo ($report['id_group']); -$contents = get_db_all_rows_field_filter ("treport_content","id_report",$id_report,"order"); +$contents = get_db_all_rows_field_filter ("treport_content", "id_report", $id_report, "`order`"); if ($contents === false) { return; }; @@ -163,7 +163,7 @@ foreach ($contents as $content) { $data[2] = "

".human_time_description ($content['period'])."

"; array_push ($table->data, $data); - $result = get_db_all_rows_field_filter ("tgraph_source","id_graph",$content['id_gs']); + $result = get_db_all_rows_field_filter ("tgraph_source", "id_graph", $content['id_gs']); $modules = array (); $weights = array (); if ($result === false) diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php index bec4d5ed2e..c8bdcfc3b7 100644 --- a/pandora_console/operation/reporting/reporting_xml.php +++ b/pandora_console/operation/reporting/reporting_xml.php @@ -64,7 +64,7 @@ if ($datetime > time ()) { } $group_name = dame_grupo ($report['id_group']); -$contents = get_db_all_rows_field_filter ("treport_content","id_report",$id_report,"order"); +$contents = get_db_all_rows_field_filter ('treport_content', 'id_report', $id_report, '`order`'); $xml["id"] = $id_report; @@ -209,10 +209,10 @@ foreach ($contents as $content) { $data["objdata"] .= "]]>"; break; } - array_push ($xml["reports"],$data); + array_push ($xml["reports"], $data); } -header('Content-type: application/xml; charset="utf-8"',true); +header ('Content-type: application/xml; charset="utf-8"',true); function xml_array ($array) {