From b391b9f1dec08546f7d26b47e67144f588d3cb76 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Mon, 10 Sep 2012 13:38:05 +0000 Subject: [PATCH] 2012-09-10 Juan Manuel Ramon * include/functions_reporting.php include/javascript/pandora.js include/functions_ui.php: Fixes in global, exception and sla metaconsole reports. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6945 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_reporting.php | 2 +- pandora_console/include/functions_ui.php | 7 +++++-- pandora_console/include/javascript/pandora.js | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f1509509a3..642bd2f81a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-09-10 Juan Manuel Ramon + + * include/functions_reporting.php + include/javascript/pandora.js + include/functions_ui.php: Fixes in global, exception and sla + metaconsole reports. + 2012-09-10 Sergio Martin * ChangeLog: Updated the changelog with diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 43b74333d2..16ea39b3bb 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -4166,7 +4166,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $height = count($data_pie_graph)*20+35; $data = array(); - $data[0] = hbar_graph(false, $data_hbar, 600, $height, array(), array(), "", "", true, "", $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true); + $data[0] = hbar_graph(false, $data_hbar, 600, $height, array(), array(), "", "", true, $config['homeurl'] . "/", $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true); array_push ($table->data, $data); } diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index f65fb59413..09ad4f3210 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1980,8 +1980,11 @@ function ui_get_full_url ($url = '', $no_proxy = false, $add_name_php_file = fal } // using a different port than the standard - if ( $port != null ) { - $fullurl .= ":" . $port; + if (!$proxy) { + // using a different port than the standard + if ( $port != null ) { + $fullurl .= ":" . $port; + } } if ($url === '') { diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 95d8f7ad84..c4342e09d1 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -463,7 +463,7 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_ data: data_params, async: false, type: 'POST', - url: action= homedir + "/ajax.php", + url: action= homedir_path + "/ajax.php", timeout: 10000, dataType: 'json', success: function (data) { @@ -509,7 +509,7 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_ jQuery.ajax ({ data: data_params, type: 'POST', - url: action= homedir + "/ajax.php", + url: action= homedir_path + "/ajax.php", timeout: 10000, dataType: 'json', success: function (data) {