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

2013-03-12 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/modules/manage_network_components_form.php,
	godmode/modules/manage_network_templates_form.php: improved the code
	style.
	
	* extensions/update_manager/lib/functions.ajax.php,
	include/graphs/functions_flot.php: fixed the warnings PHP messages.
	
	Fixes: #3607177




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7838 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-03-12 16:20:53 +00:00
parent 3dd28258e1
commit ae6dbd8b0f
5 changed files with 92 additions and 69 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-03-12 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form.php,
godmode/modules/manage_network_templates_form.php: improved the code
style.
* extensions/update_manager/lib/functions.ajax.php,
include/graphs/functions_flot.php: fixed the warnings PHP messages.
Fixes: #3607177
2013-03-11 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/functions.ajax.php: disabled the

6
pandora_console/extensions/update_manager/lib/functions.ajax.php
View File

@ -110,7 +110,11 @@ function update_pandora_get_packages_online_ajax($ajax = true) {
$return['last'] = $last;
$return['package'] = $package;
$return['timestamp'] = date($config["date_format"], $timestamp);
if (!isset($config["date_format"]))
$default_date_format = "F j, Y, g:i a";
else
$default_date_format = $config["date_format"];
$return['timestamp'] = date($default_date_format, $timestamp);
$return['text_adv'] = html_print_image('images/world.png', true);
$return['end'] = 1;
}

10
pandora_console/godmode/modules/manage_network_components_form.php
View File

@ -577,8 +577,12 @@ $(document).ready (function () {
});
});
<?php if ($id_component_type == 2) :?>
type_change ();
<?php endif; ?>
<?php
if ($id_component_type == 2) {
?>
type_change ();
<?php
}
?>
//-->
</script>

16
pandora_console/include/graphs/functions_flot.php
View File

@ -249,6 +249,10 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
$legend_events = '';
$legend_alerts = '';
if (empty($chart_extra_data)) {
$chart_extra_data = array();
}
foreach ($chart_extra_data as $i => $data) {
switch ($i) {
case 'legend_alerts':
@ -258,11 +262,11 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend, $long_in
$legend_events = $data;
break;
default:
if(isset($data['events'])) {
if (isset($data['events'])) {
$event_ids[] = $i;
$events[$i] = $data['events'];
}
if(isset($data['alerts'])) {
if (isset($data['alerts'])) {
$alert_ids[] = $i;
$alerts[$i] = $data['alerts'];
}
@ -552,7 +556,7 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
$values2 = array();
foreach($data as $jsvar => $values) {
foreach ($data as $jsvar => $values) {
$values2[] = implode($separator,$values);
}
@ -604,8 +608,8 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
$intervaltick = $period / $i;
$leg_max_length = 0;
foreach($legend as $l) {
if(strlen($l) > $leg_max_length) {
foreach ($legend as $l) {
if (strlen($l) > $leg_max_length) {
$leg_max_length = strlen($l);
}
}
@ -673,7 +677,7 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
$values2 = array();
foreach($data as $jsvar => $values) {
foreach ($data as $jsvar => $values) {
$values2[] = implode($separator,$values);
$i ++;
}