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

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

* include/functions_graph.php, include/functions_ui.php,
	operation/reporting/reporting_viewer.php,
	operation/agentes/snapshot_view.php: improved the code style.
	
	* include/functions_html.php: added other parameter in print
	checkbox for to avoid to put a hidden input.
	
	Fixes: #3602766




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-06 14:03:32 +00:00
parent 9d808552af
commit 9f1ebc2d99
6 changed files with 118 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2013-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_ui.php,
operation/reporting/reporting_viewer.php,
operation/agentes/snapshot_view.php: improved the code style.
* include/functions_html.php: added other parameter in print
checkbox for to avoid to put a hidden input.
Fixes: #3602766
2013-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: uploaded the lost character key.

25
pandora_console/include/functions_graph.php
View File

@ -268,7 +268,8 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
if ($data[$data_i]['datos'] > $interval_max) {
$interval_max = $data[$data_i]['datos'];
} else if ($data[$data_i]['datos'] < $interval_min) {
}
else if ($data[$data_i]['datos'] < $interval_min) {
$interval_min = $data[$data_i]['datos'];
}
$total += $data[$data_i]['datos'];
@ -2494,28 +2495,28 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$timestamp = $timestamp_short;
/////////////////////////////////////////////////////////////////
if($is_unknown) {
if ($is_unknown) {
$total = 0;
}
if($show_events) {
if(!isset($chart[$timestamp]['event'.$series_suffix])) {
if ($show_events) {
if (!isset($chart[$timestamp]['event'.$series_suffix])) {
$chart[$timestamp]['event'.$series_suffix] = 0;
}
$chart[$timestamp]['event'.$series_suffix] += $event_value;
$series_type['event'.$series_suffix] = 'points';
}
if($show_alerts) {
if(!isset($chart[$timestamp]['alert'.$series_suffix])) {
if ($show_alerts) {
if (!isset($chart[$timestamp]['alert'.$series_suffix])) {
$chart[$timestamp]['alert'.$series_suffix] = 0;
}
$chart[$timestamp]['alert'.$series_suffix] += $alert_value;
$series_type['alert'.$series_suffix] = 'points';
}
if($show_unknown) {
if(!isset($chart[$timestamp]['unknown'.$series_suffix])) {
if ($show_unknown) {
if (!isset($chart[$timestamp]['unknown'.$series_suffix])) {
$chart[$timestamp]['unknown'.$series_suffix] = 0;
}
@ -3147,10 +3148,10 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
/////////////////////////////////////////////////////////////////////////////////////////
$color = array();
if($show_events) {
if ($show_events) {
$color['event'.$series_suffix] = array('border' => '#ff0000', 'color' => '#ff0000', 'alpha' => 50);
}
if($show_alerts) {
if ($show_alerts) {
$color['alert'.$series_suffix] = array('border' => '#ff7f00', 'color' => '#ff7f00', 'alpha' => 50);
}
@ -3167,11 +3168,11 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
$legend = array();
if($show_events) {
if ($show_events) {
$legend['event'] = __('Events');
}
if($show_alerts) {
if ($show_alerts) {
$legend['alert'] = __('Alerts');
}

6
pandora_console/include/functions_html.php
View File

@ -1318,9 +1318,11 @@ function html_print_checkbox_extended ($name, $value, $checked, $disabled, $scri
*
* @return string HTML code if return parameter is true.
*/
function html_print_checkbox ($name, $value, $checked = false, $return = false, $disabled = false, $script = '') {
function html_print_checkbox ($name, $value, $checked = false, $return = false, $disabled = false, $script = '', $disabled_hidden = false) {
$output = html_print_checkbox_extended ($name, $value, (bool) $checked, $disabled, $script, '', true);
$output .= html_print_input_hidden($name.'_sent',1,true);
if (!$disabled_hidden) {
$output .= html_print_input_hidden($name . '_sent', 1, true);
}
if ($return === false)
echo $output;

6
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -158,8 +158,10 @@ echo html_print_image("images/wait.gif", true, array("border" => '0'));
echo '<strong>'.__('Loading').'...</strong>';
echo '</div>';
/* We must add javascript here. Otherwise, the date picker won't
work if the date is not correct because php is returning. */
/*
* We must add javascript here. Otherwise, the date picker won't
* work if the date is not correct because php is returning.
*/
ui_require_jquery_file ("ui-timepicker-addon");
?>