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

2009-12-29 Sancho Lerena <slerena@artica.es> 

* include/functions_servers.php: Fixed notice (division by 0).

        * include/functions_visual_map.php: Fixed problem in graphs 
        embedded in the visual console maps (problem with &amp; in
        fgraph call !!?).

        * include/config_process.php: Added supression of DEPRECATED
        system messages for PHP 5.2.11 or higher insted 5.3

        * godmode/agentes/module_manager_editor_prediction.php: Fixed
        several missing fields in the prediction module edition.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2009-12-29 16:43:35 +00:00
parent 51e4221b03
commit b728ffc520
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2009-12-29 Sancho Lerena <slerena@artica.es>
* include/functions_servers.php: Fixed notice (division by 0).
* include/functions_visual_map.php: Fixed problem in graphs
embedded in the visual console maps (problem with &amp; in fgraph
call !!?).
* include/config_process.php: Added supression of DEPRECATED
system messages for PHP 5.2.11 or higher insted 5.3
* godmode/agentes/module_manager_editor_prediction.php: Fixed several
missing fields in the prediction module edition.
2009-12-28 Sancho Lerena <slerena@artica.es> 2009-12-28 Sancho Lerena <slerena@artica.es>
* module_manager_editor_common.php: Latest changes from mdtrooper break * module_manager_editor_common.php: Latest changes from mdtrooper break

2
pandora_console/godmode/agentes/module_manager_editor_prediction.php
View File

@ -64,8 +64,6 @@ $table_simple->colspan['prediction_module'][1] = 3;
push_table_simple ($data, 'prediction_module'); push_table_simple ($data, 'prediction_module');
/* Removed common useless parameter */ /* Removed common useless parameter */
unset ($table_simple->data[2]);
unset ($table_simple->data[3]);
unset ($table_advanced->data[3]); unset ($table_advanced->data[3]);
unset ($table_advanced->data[2][2]); unset ($table_advanced->data[2][2]);
unset ($table_advanced->data[2][3]); unset ($table_advanced->data[2][3]);

2
pandora_console/include/config_process.php
View File

@ -29,7 +29,7 @@ $pandora_version = 'v3.0';
// error_reporting(E_ALL); // error_reporting(E_ALL);
if (strnatcmp(phpversion(),'5.3') >= 0) if (strnatcmp(phpversion(),'5.2.11') >= 0)
{ {
error_reporting(E_ALL & ~E_DEPRECATED & ~E_NOTICE); error_reporting(E_ALL & ~E_DEPRECATED & ~E_NOTICE);
} }

4
pandora_console/include/functions_servers.php
View File

@ -84,7 +84,11 @@ function get_server_performance () {
$data["avg_interval_local_modules"] = get_db_sql ("SELECT AVG(tagente.intervalo) FROM tagente WHERE disabled = 0 AND intervalo > 0"); $data["avg_interval_local_modules"] = get_db_sql ("SELECT AVG(tagente.intervalo) FROM tagente WHERE disabled = 0 AND intervalo > 0");
if ($data["avg_interval_local_modules"] > 0){
$data["local_modules_rate"] = $data["total_local_modules"] / $data["avg_interval_local_modules"]; $data["local_modules_rate"] = $data["total_local_modules"] / $data["avg_interval_local_modules"];
} else {
$data["local_modules_rate"] = 0;
}
$data["total_modules"] = $data["total_local_modules"] + $data["total_remote_modules"]; $data["total_modules"] = $data["total_local_modules"] + $data["total_remote_modules"];

8
pandora_console/include/functions_visual_map.php
View File

@ -239,9 +239,13 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
} }
} }
if ($resizedMap) if ($resizedMap)
print_image ("include/fgraph.php?tipo=sparse&amp;id=".$layout_data['id_agente_modulo']."&amp;label=".safe_input ($layout_data['label'])."&amp;height=".((integer)($proportion * $layout_data['height']))."&pure=1&amp;width=".((integer)($proportion * $layout_data['width']))."&amp;period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
// ATTENTION: DO NOT USE &amp; here because is bad-translated and doesnt work
// resulting fault image links :(
print_image ("include/fgraph.php?tipo=sparse&id=".$layout_data['id_agente_modulo']."&label=".safe_input ($layout_data['label'])."&height=".((integer)($proportion * $layout_data['height']))."&pure=1&width=".((integer)($proportion * $layout_data['width']))."&period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
else else
print_image ("include/fgraph.php?tipo=sparse&amp;id=".$layout_data['id_agente_modulo']."&amp;label=".safe_input ($layout_data['label'])."&amp;height=".$layout_data['height']."&pure=1&amp;width=".$layout_data['width']."&amp;period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0)); print_image ("include/fgraph.php?tipo=sparse&id=".$layout_data['id_agente_modulo']."&label=".safe_input ($layout_data['label'])."&height=".$layout_data['height']."&pure=1&width=".$layout_data['width']."&period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
echo "</a>"; echo "</a>";
echo "</div>"; echo "</div>";
break; break;