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

2013-10-07 Ramon Novoa <rnovoa@artica.es> 

* include/functions_networkmap.php,
	  operation/agentes/networkmap_list.php,
	  operation/agentes/networkmap.php: Fixed ACL related problems.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8862 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2013-10-07 10:52:24 +00:00
parent f0f7d10e00
commit bd51b40fcc
4 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-07 Ramon Novoa <rnovoa@artica.es>
* include/functions_networkmap.php,
operation/agentes/networkmap_list.php,
operation/agentes/networkmap.php: Fixed ACL related problems.
2013-10-07 Sergio Martin <sergio.martin@artica.es> 2013-10-07 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_pchart.php: Disabled * include/graphs/functions_pchart.php: Disabled

36
pandora_console/include/functions_networkmap.php
View File

@ -1229,35 +1229,19 @@ function networkmap_get_networkmaps ($id_user = '', $type = '', $optgrouped = tr
$id_user = $config['id_user']; $id_user = $config['id_user'];
} }
$type_cond = ''; // Configure filters
if ($type != '') { $where = array ();
switch ($config["dbtype"]) { $where['id_group'] = array_keys (users_get_groups($id_user));
case "mysql": if ($type != '') {
$type_cond = ' AND type = "'.$type.'"'; $where['type'] = $type;
break;
case "postgresql":
case "oracle":
$type_cond = ' AND type = \''.$type.'\'';
break;
}
} }
switch ($config["dbtype"]) { $where['order'][0]['field'] = 'type';
case "mysql": $where['order'][0]['order'] = 'DESC';
$networkmaps_raw = db_get_all_rows_filter( $where['order'][1]['field'] = 'name';
'tnetwork_map', 'id_user = "' . $id_user . '" ' . $where['order'][1]['order'] = 'ASC';
$type_cond . ' ORDER BY type DESC, name ASC',
array('id_networkmap','name', 'type'));
break;
case "postgresql":
case "oracle":
$networkmaps_raw = db_get_all_rows_filter(
'tnetwork_map', 'id_user = \'' . $id_user . '\' ' .
$type_cond . ' ORDER BY type DESC, name ASC',
array('id_networkmap','name', 'type'));
break;
}
$networkmaps_raw = db_get_all_rows_filter('tnetwork_map', $where);
if ($networkmaps_raw === false) { if ($networkmaps_raw === false) {
return false; return false;
} }

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

@ -223,16 +223,17 @@ $combolist .= '</form>';
$buttons['combolist'] = $combolist; $buttons['combolist'] = $combolist;
$buttons['addmap'] = array('active' => $activeTab == false, if (check_acl ($config['id_user'], 0, "AW")) {
$buttons['addmap'] = array('active' => $activeTab == false,
'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;add_networkmap=1&amp;tab='.$activeTab.'&amp;pure='.$pure.'">' . 'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;add_networkmap=1&amp;tab='.$activeTab.'&amp;pure='.$pure.'">' .
html_print_image("images/add_mc.png", true, array ("title" => __('Add map'))) .'</a>'); html_print_image("images/add_mc.png", true, array ("title" => __('Add map'))) .'</a>');
if (!$nomaps && $id_networkmap != 0) { if (!$nomaps && $id_networkmap != 0) {
$buttons['deletemap'] = array('active' => $activeTab == false, $buttons['deletemap'] = array('active' => $activeTab == false,
'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;delete_networkmap=1&amp;tab='.$activeTab.'&amp;pure='.$pure.'">' . 'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;delete_networkmap=1&amp;tab='.$activeTab.'&amp;pure='.$pure.'">' .
html_print_image("images/delete_mc.png", true, array ("title" => __('Delete map'))) .'</a>'); html_print_image("images/delete_mc.png", true, array ("title" => __('Delete map'))) .'</a>');
$buttons['savemap'] = array('active' => $activeTab == false, $buttons['savemap'] = array('active' => $activeTab == false,
'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;save_networkmap=1 'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;save_networkmap=1
&amp;tab='.$activeTab.'&amp;save_networkmap=1&amp;name='.$name.'&amp;group='.$group.' &amp;tab='.$activeTab.'&amp;save_networkmap=1&amp;name='.$name.'&amp;group='.$group.'
&amp;layout='.$layout.'&amp;nooverlap='.$nooverlap.'&amp;simple='.$simple.'&amp;regen='.$regen.' &amp;layout='.$layout.'&amp;nooverlap='.$nooverlap.'&amp;simple='.$simple.'&amp;regen='.$regen.'
@ -242,6 +243,7 @@ if (!$nomaps && $id_networkmap != 0) {
&amp;module_group='.$module_group.'&amp;pure='.$pure.'&amp;hidden_options='.(int)$hidden_options.' &amp;module_group='.$module_group.'&amp;pure='.$pure.'&amp;hidden_options='.(int)$hidden_options.'
&amp;show_snmp_modules='.(int)$show_snmp_modules.'">' . &amp;show_snmp_modules='.(int)$show_snmp_modules.'">' .
html_print_image("images/save_mc.png", true, array ("title" => __('Save map'))) .'</a>'); html_print_image("images/save_mc.png", true, array ("title" => __('Save map'))) .'</a>');
}
} }
$title = ''; $title = '';

34
pandora_console/operation/agentes/networkmap_list.php
View File

@ -166,22 +166,20 @@ else {
} }
// Create networkmap form // Create networkmap form
$networkmap_types = networkmap_get_types(); if (check_acl ($config['id_user'], 0, "AW")) {
$networkmap_types = networkmap_get_types();
echo '<form method="post" action="index.php?sec=network&amp;sec2=operation/agentes/networkmap">';
echo "<table style='width: 100%' class='databox'>";
echo "<tr>";
echo "<td class='datos' style='width: 50%'>";
html_print_input_hidden('add_networkmap', 1);
html_print_select($networkmap_types, 'tab', 'topology', '');
echo "</td>";
echo "<td class='datos'>";
html_print_submit_button (__('Create networkmap'), 'crt', false, 'class="sub next"');
echo "</td>";
echo "</tr>";
echo "</table>";
echo "</form>";
}
?> ?>
<form method="post" action="index.php?sec=network&amp;sec2=operation/agentes/networkmap">
<table style='width: 100%' class='databox'>
<tr>
<td class='datos' style='width: 50%'>
<?php
html_print_input_hidden('add_networkmap', 1);
html_print_select($networkmap_types, 'tab', 'topology', '');
?>
</td>
<td class='datos'>
<?php
html_print_submit_button (__('Create networkmap'), 'crt', false, 'class="sub next"');
?>
</td>
</tr>
</table>
</form>