From 196066ec07557ec6d5349f6004853a8610244a4b Mon Sep 17 00:00:00 2001 From: slerena Date: Tue, 9 Oct 2007 14:18:03 +0000 Subject: [PATCH] 2007-10-09 Sancho Lerena * operation/reporting/reporting_viewer.php: Fixed small bug mixing min/max values of SLA render. * godmode/reporting/reporting_builder.php: Fixed small bug deleting item from report, that return user to another report. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@671 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 ++++++++- pandora_console/godmode/reporting/reporting_builder.php | 4 ++-- pandora_console/operation/reporting/reporting_viewer.php | 3 +-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 65ee4d7031..392eaf5f97 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,4 +1,11 @@ -2007-10-03 Sancho Lerena +2007-10-09 Sancho Lerena + + * operation/reporting/reporting_viewer.php: Fixed small bug mixing min/max values of SLA render. + + * godmode/reporting/reporting_builder.php: Fixed small bug deleting item from report, that + return user to another report. + +2007-10-08 Sancho Lerena * Security fix has been included in ver_agente.php, using a new function to validate GET variables (checking for numeric data). This security isse was a SQL Blind URL Attack. This diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 1fb2da5942..15e2ae0b1a 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -388,7 +388,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$period.""; echo ""; if ($form_id_user == $id_user){ - echo ""; + echo ""; } echo ""; } @@ -447,4 +447,4 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; echo ""; } -?> \ No newline at end of file +?> diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 9e067d3dd5..de1c2c5125 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -48,7 +48,6 @@ $report_description = give_db_value ("description", "treport", "id_report", $id_ $report_private= give_db_value ("private", "treport", "id_report", $id_report); $report_user = give_db_value ("id_user", "treport", "id_report", $id_report); if (($report_user == $id_user) OR (dame_admin($id_user)==1) OR ($report_private == 0)) { - //echo "SLA for Tato: %".return_module_SLA (50, 604800, 1, 1); echo "

".$lang_label["reporting"]." > "; echo $lang_label["custom_reporting"]." - "; @@ -76,7 +75,7 @@ if (($report_user == $id_user) OR (dame_admin($id_user)==1) OR ($report_private case 2: // SLA $module_name = give_db_value ("nombre", "tagente_modulo", "id_agente_modulo", $id_agent_module); $agent_name = dame_nombre_agente_agentemodulo ($id_agent_module); - $sla_result = format_numeric(return_module_SLA ($id_agent_module, $period, $sla_max, $sla_min), 2); + $sla_result = format_numeric(return_module_SLA ($id_agent_module, $period, $sla_min, $sla_max), 2); echo ""; echo "

".$lang_label["SLA"]."

";