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

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

Browse Source 
* operation/agentes/networkmap_list.php,
	godmode/alerts/alert_templates.php,
	godmode/events/event_responses.list.php,
	godmode/netflow/nf_edit.php: fixed the show elements with the limits
	of user ACL.
	
	Fixes: #3605969




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7735 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-27 16:53:14 +00:00
parent 7ae34498de
commit 1ac5591444
5 changed files with 27 additions and 5 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-27 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap_list.php,
godmode/alerts/alert_templates.php,
godmode/events/event_responses.list.php,
godmode/netflow/nf_edit.php: fixed the show elements with the limits
of user ACL.
Fixes: #3605969
2013-02-27 Dario Rodriguez <dario@artica.es> 2013-02-27 Dario Rodriguez <dario@artica.es>
* operation/agentes/ver_agente.php: Adapted VMware extension known to * operation/agentes/ver_agente.php: Adapted VMware extension known to

3
pandora_console/godmode/alerts/alert_templates.php
View File

@ -256,6 +256,9 @@ $total_templates = alerts_get_alert_templates ($filter, array ('COUNT(*) AS tota
$total_templates = $total_templates[0]['total']; $total_templates = $total_templates[0]['total'];
$filter['offset'] = (int) get_parameter ('offset'); $filter['offset'] = (int) get_parameter ('offset');
$filter['limit'] = (int) $config['block_size']; $filter['limit'] = (int) $config['block_size'];
if (!is_user_admin($config['id_user']))
$filter['id_group'] = array_keys(users_get_groups(false, "LM"));
$templates = alerts_get_alert_templates ($filter, $templates = alerts_get_alert_templates ($filter,
array ('id', 'name', 'description', 'type', 'id_group')); array ('id', 'name', 'description', 'type', 'id_group'));
if ($templates === false) if ($templates === false)

9
pandora_console/godmode/events/event_responses.list.php
View File

@ -31,7 +31,14 @@ html_print_submit_button(__('Create response'), 'create_response_button', false,
echo '</form>'; echo '</form>';
echo '</div>'; echo '</div>';
$event_responses = db_get_all_rows_in_table('tevent_response'); if (!is_user_admin($config['id_user'])) {
$id_groups = array_keys(users_get_groups(false, "PM"));
$event_responses = db_get_all_rows_filter('tevent_response',
array('id_group' => $id_groups));
}
else {
$event_responses = db_get_all_rows_in_table('tevent_response');
}
if(empty($event_responses)) { if(empty($event_responses)) {
ui_print_info_message(__('No responses found')); ui_print_info_message(__('No responses found'));

4
pandora_console/godmode/netflow/nf_edit.php
View File

@ -104,7 +104,9 @@ if ($multiple_delete) {
$own_info = get_user_info ($config['id_user']); $own_info = get_user_info ($config['id_user']);
// Get group list that user has access // Get group list that user has access
$groups_user = users_get_groups ($config['id_user'], "AW", $own_info['is_admin'], true); $groups_user = users_get_groups ($config['id_user'], "AW", $own_info['is_admin'], true);
$sql = "SELECT * FROM tnetflow_filter WHERE id_group IN (".implode(',', array_keys ($groups_user)).")"; $sql = "SELECT *
FROM tnetflow_filter
WHERE id_group IN (0, ".implode(',', array_keys ($groups_user)).")";
$filters = db_get_all_rows_sql($sql); $filters = db_get_all_rows_sql($sql);
if ($filters === false) if ($filters === false)
$filters = array (); $filters = array ();

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

@ -131,9 +131,9 @@ if ($type_search != '0')
$user_info = users_get_user_by_id($config['id_user']); $user_info = users_get_user_by_id($config['id_user']);
//If the user is not admin only user map are shown. //If the user is not admin only user map are shown.
if (!$user_info['is_admin']) { //if (!$user_info['is_admin']) {
$where['id_user'] = $config['id_user']; // $where['id_user'] = $config['id_user'];
} //}
$network_maps = db_get_all_rows_filter('tnetwork_map', $network_maps = db_get_all_rows_filter('tnetwork_map',
$where); $where);