From 7890cc829e7d0f2d10ee038d4e92ce74de92dcc1 Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Mon, 18 Jul 2011 13:32:34 +0000
Subject: [PATCH] 2011-07-18  Sergio Martin <sergio.martin@artica.es>

	* godmode/massive/massive_operations.php: Fixed acl last fix
	warnings



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  5 ++++
 .../godmode/massive/massive_operations.php    | 29 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f07a5a2094..9292aa2106 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-18  Sergio Martin <sergio.martin@artica.es>
+
+	* godmode/massive/massive_operations.php: Fixed acl last fix 
+	warnings
+
 2011-07-18  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/massive/massive_operations.php
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 529aaedb9e..cd04a9ab43 100644
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -42,7 +42,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	$options_users = array('add_profiles' => __('Massive profiles addition'), 'delete_profiles' => __('Massive profiles deletion'));
 }
 else {
-	$option_users = array();
+	$options_users = array();
 }
 
 $options_modules = array('delete_modules' => __('Massive modules deletion'), 'edit_modules' => __('Massive modules edition'), 
@@ -109,15 +109,10 @@ $alertstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massi
 		. html_print_image ('images/bell.png', true, array ('title' => __('Alerts operations')))
 		. '</a>', 'active' => $tab == 'massive_alerts');
 		
-if (check_acl ($config['id_user'], 0, "PM")) {
-	$userstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users">'
-			. html_print_image ('images/group.png', true, array ('title' => __('Users operations')))
-			. '</a>', 'active' => $tab == 'massive_users');
-}
-else {
-	$userstab = array();
-}
-		
+$userstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users">'
+		. html_print_image ('images/group.png', true, array ('title' => __('Users operations')))
+		. '</a>', 'active' => $tab == 'massive_users');
+	
 $agentstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_agents">'
 		. html_print_image ('images/bricks.png', true, array ('title' => __('Agents operations')))
 		. '</a>', 'active' => $tab == 'massive_agents');
@@ -131,11 +126,15 @@ $policiestab = enterprise_hook('massive_policies_tab');
 
 if ($policiestab == -1)
 	$policiestab = "";
-		
-
-$onheader = array('massive_agents' => $agentstab, 'massive_modules' => $modulestab, 
-				'user_agents' => $userstab, 'massive_alerts' => $alertstab, 
-				'policies' => $policiestab);
+				
+$onheader = array();
+$onheader['massive_agents'] = $agentstab;
+$onheader['massive_modules'] = $modulestab;
+if (check_acl ($config['id_user'], 0, "PM")) {
+	$onheader['user_agents'] = $userstab;
+}
+$onheader['massive_alerts'] = $alertstab;
+$onheader['policies'] = $policiestab;
 
 ui_print_page_header (__('Massive operations'). ' &raquo; '. $options[$option], "images/sitemap_color.png", false, "", true, $onheader);