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

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

* godmode/db/db_refine.php, godmode/servers/plugin.php: improved
	the code style.
	
	* include/functions_reporting.php: fixed the SLA when it is the
	equal to limit.
	
	Fixes: #3602722




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7606 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-07 13:43:23 +00:00
parent 2415e5ed9a
commit f6fd3a085d
4 changed files with 50 additions and 36 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/db/db_refine.php, godmode/servers/plugin.php: improved
the code style.
* include/functions_reporting.php: fixed the SLA when it is the
equal to limit.
Fixes: #3602722
2013-02-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form_common.php: fixed

6
pandora_console/godmode/servers/plugin.php
View File

@ -378,10 +378,12 @@ else {
$result = db_process_sql_insert('tplugin', $values);
if (! $result) {
echo "<h3 class='error'>".__('Problem creating plugin')."</h3>";
echo "<h3 class='error'>" .
__('Problem creating plugin') . "</h3>";
}
else {
echo "<h3 class='suc'>".__('Plugin created successfully')."</h3>";
echo "<h3 class='suc'>" .
__('Plugin created successfully') . "</h3>";
}
}

10
pandora_console/include/functions_reporting.php
View File

@ -2824,7 +2824,8 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
}
//Do not show right modules if 'only_display_wrong' is active
if ($content['only_display_wrong'] == 1 && $sla_value >= $sla['sla_limit']) continue;
if ($content['only_display_wrong'] == 1 && $sla_value >= $sla['sla_limit'])
continue;
// Calculate general pie graph data
foreach ($data_sla as $d) {
@ -2914,7 +2915,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$data[5] = '';
$data[6] = '';
if ($sla_value > $sla['sla_limit']) {
if ($sla_value >= $sla['sla_limit']) {
$data[4] = '<span style="font: bold '.$sizem.'em Arial, Sans-serif; color: #000000;">';
$data[5] = '<span style="font: bold '.$sizem.'em Arial, Sans-serif; color: #000000;">'.__('OK').'</span>';
}
@ -2925,10 +2926,11 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
}
// Print icon with status including edge
if ($sla_value > $sla['sla_limit']+$edge_interval) {
if ($sla_value > ($sla['sla_limit'] + $edge_interval)) {
$data[6] = html_print_image('images/status_sets/default/severity_normal.png',true,array('title'=>__('Inside limits')));
}
elseif ($sla_value <= $sla['sla_limit']+$edge_interval && $sla_value >= $sla['sla_limit']-$edge_interval) {
elseif (($sla_value <= $sla['sla_limit'] + $edge_interval)
&& ($sla_value >= $sla['sla_limit'] - $edge_interval)) {
$data[6] = html_print_image('images/status_sets/default/severity_warning.png',true,array('title'=>__('On the edge')));
}
else {