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

2013-02-07 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/users/user_list.php, godmode/users/profile_list.php,
	godmode/users/configure_user.php,
	godmode/users/configure_profile.php, godmode/db/db_audit.php,
	include/functions_reporting.php: cleaned source code style.
	
	* include/functions_graph.php: fixed the default parameter
	$adapt_Key in the function "grafico_modulo_string".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7601 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-07 10:57:52 +00:00
parent caad696367
commit d1170bab4f
8 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-02-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/users/user_list.php, godmode/users/profile_list.php,
godmode/users/configure_user.php,
godmode/users/configure_profile.php, godmode/db/db_audit.php,
include/functions_reporting.php: cleaned source code style.
* include/functions_graph.php: fixed the default parameter
$adapt_Key in the function "grafico_modulo_string".
2013-02-06 Sergio Martin <sergio.martin@artica.es>
* include/functions_users.php

44
pandora_console/include/functions_graph.php
View File

@ -2733,23 +2733,23 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str).
'<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
$long_index_prev, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type_prev,
$chart_extra_data_prev, 0, 0, $adapt_key, false, $series_suffix_str);
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str).
'<br>'.
area_graph($flash_chart, $chart_prev, $width, $height/2, $color_prev, $legend_prev,
$long_index_prev, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type_prev,
$chart_extra_data_prev, 0, 0, $adapt_key, false, $series_suffix_str);
}
else {
return area_graph($flash_chart, $chart, $width, $height, $color, $legend,
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str);
$long_index, ui_get_full_url("images/image_problem.opaque.png"), "", $unit, $homeurl,
$water_mark,
$config['fontpath'], $config['font_size'], $unit, 1, $series_type,
$chart_extra_data, 0, 0, $adapt_key, false, $series_suffix_str);
}
}
@ -2956,7 +2956,7 @@ function graph_netflow_aggregate_pie ($data, $aggregate, $ttl = 1, $only_image =
*/
function grafico_modulo_string ($agent_module_id, $period, $show_events,
$width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure=0,
$date = 0, $only_image = false, $homeurl = '', $adapt_key, $ttl = 1) {
$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $ttl = 1) {
global $config;
global $graphic_type;
global $max_value;
@ -3110,9 +3110,9 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
// Data in the interval
//The order in chart array is very important!!!!
$chart[$timestamp]['event'] = $event_value;
$chart[$timestamp]['alert'] = $alert_value;
$chart[$timestamp]['max'] = 0;
$chart[$timestamp]['event'] = $event_value;
$chart[$timestamp]['alert'] = $alert_value;
$chart[$timestamp]['max'] = 0;
if ($count > 0) {
$chart[$timestamp]['sum'] = $count;
@ -3176,9 +3176,9 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
$legend['alert'] = __('Alerts');
}
$legend['max'] = __('Max').': '.__('Last').': '.$graph_stats['max']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['max']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['max']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['max']['min'].' '.$unit;
$legend['max'] = __('Max').': '.__('Last').': '.$graph_stats['max']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['max']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['max']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['max']['min'].' '.$unit;
$legend['sum'] = __('Data').': '.__('Last').': '.$graph_stats['sum']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['sum']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['sum']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['sum']['min'].' '.$unit;
$legend['min'] = __('Min').': '.__('Last').': '.$graph_stats['min']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['min']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['min']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['min']['min'].' '.$unit;
$legend['min'] = __('Min').': '.__('Last').': '.$graph_stats['min']['last'].' '.$unit.' ; '.__('Avg').': '.$graph_stats['min']['avg'].' '.$unit.' ; '.__('Max').': '.$graph_stats['min']['max'].' '.$unit.' ; '.__('Min').': '.$graph_stats['min']['min'].' '.$unit;
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
@ -3335,8 +3335,8 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
///Functions for the LOG4X graphs
function grafico_modulo_log4x ($id_agente_modulo, $periodo, $show_event,
$width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
$date = 0) {
$width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
$date = 0) {
grafico_modulo_log4x_trace("<pre style='text-align:left;'>");