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

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

* include/functions_networkmap.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/networkmap.groups.php,
	operation/agentes/networkmap.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-02 09:44:10 +00:00
parent c25815d031
commit 5e31fc574b
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-07-02 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php,
operation/agentes/networkmap.topology.php,
operation/agentes/networkmap.groups.php,
operation/agentes/networkmap.php: improved the source code style.
2013-07-02 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js: Fixed deprecated way

6
pandora_console/include/functions_netflow.php
View File

@ -1165,7 +1165,7 @@ function netflow_xml_report ($id, $start_date, $end_date, $interval_length = 0)
echo " </report_item>\n";
}
echo "</report>\n";
echo "</report>\n";
}
/**
@ -1301,7 +1301,7 @@ function netflow_summary_xml ($data) {
/**
* Return a string describing the given unit.
*
*
* @param string Netflow unit.
*/
function netflow_format_unit ($unit) {
@ -1325,7 +1325,7 @@ function netflow_format_unit ($unit) {
/**
* Return a string describing the given aggregate.
*
*
* @param string Netflow aggregate.
*/
function netflow_format_aggregate ($aggregate) {

1
pandora_console/operation/agentes/networkmap.groups.php
View File

@ -31,6 +31,7 @@ require_once ('include/functions_networkmap.php');
// Set filter
$filter = networkmap_get_filter ($layout);
// Generate dot file
$graph = networkmap_generate_dot_groups (__('Pandora FMS'), $group,
$simple, $font_size, $layout, $nooverlap, $zoom, $ranksep, $center,

5
pandora_console/operation/agentes/networkmap.php
View File

@ -45,6 +45,7 @@ if ($delete_networkmap) {
__('Network map deleted successfully'),
__('Could not delete network map'), '', true);
$id_networkmap = 0;
}
@ -207,6 +208,7 @@ $buttons['topology'] = array('active' => $activeTab == 'topology',
'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;tab=topology&amp;pure='.$pure.'">' .
html_print_image("images/op_network.png", true, array ("title" => __('Topology view'))) .'</a>');
$combolist = '<form name="query_sel" method="post" action="index.php?sec=network&sec2=operation/agentes/networkmap">';
$combolist .= html_print_select($networkmaps, 'id_networkmap', $id_networkmap, 'onchange:this.form.submit()', __('No selected'), 0, true, false, false, '', false, 'margin-top:4px; margin-left:3px; width:150px;');
@ -324,6 +326,7 @@ if ($activeTab == 'policies') {
$table->data[0][] = __('Depth') . '&nbsp;' .
html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
}
$table->data[1][] = __('No Overlap') . '&nbsp;' .
html_print_checkbox ('nooverlap', '1', $nooverlap, true);
@ -344,6 +347,7 @@ $table->data[1][] = __('Simple') . '&nbsp;' .
$table->data[1][] = __('Regenerate') . '&nbsp;' .
html_print_checkbox ('regen', '1', $regen, true);
if ($pure == "1") {
// Zoom
$zoom_array = array (
@ -357,6 +361,7 @@ if ($pure == "1") {
$table->data[1][] = __('Zoom') . '&nbsp;' .
html_print_select ($zoom_array, 'zoom', $zoom, '', '', '', true, false, false, false);
}
if ($nooverlap == 1) {

7
pandora_console/operation/agentes/networkmap.topology.php
View File

@ -65,12 +65,13 @@ if ($nooverlap) {
$filename_img .= "_nooverlap";
$filename_dot .= "_nooverlap";
}
$filename_map .= "_".$id_networkmap.".map";
$filename_img .= "_".$id_networkmap.".png";
$filename_dot .= "_".$id_networkmap.".dot";
$filename_map .= "_" . $id_networkmap . ".map";
$filename_img .= "_" . $id_networkmap . ".png";
$filename_dot .= "_" . $id_networkmap . ".dot";
if ($regen != 1 && file_exists ($filename_img) &&
filemtime ($filename_img) > get_system_time () - SECONDS_5MINUTES) {
$result = true;
}
else {