Merge branch 'develop' into feature/meta-agent-cache

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 6.0dev-150327
+Version: 6.0dev-150413
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.0dev-150327"
+pandora_version="6.0dev-150413"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '6.0dev';
-use constant AGENT_BUILD => '150327';
+use constant AGENT_BUILD => '150413';
 
 # Commands to retrieve total memory information in kB
 use constant TOTALMEMORY_CMDS => {
@@ -975,6 +975,8 @@ sub launch_tentacle_proxy () {
 			#Execute tentacle server as a daemon
 			my $new_process = "tentacle_server -b ".$Conf{'server_ip'}." -g ".$Conf{'server_port'}." -c ".$Conf{'proxy_max_connection'}." -t ".$Conf{'proxy_timeout'};
 
+			$new_process .= ' -C' if ($Conf{'server_ssl'} eq 'yes');
+
 			log_message ('setup', 'Proxy mode enabled');
 			exec ($new_process);
 		} 

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     6.0dev
-%define release     150327
+%define release     150413
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     6.0dev
-%define release     150327
+%define release     150413
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/tentacle_server

@@ -171,6 +171,9 @@ my $t_proxy_socket;
 # Proxy selected handler
 my $t_proxy_select;
 
+# Use SSL for proxy, 1 true, 0 false
+my $t_proxy_ssl = 0;
+
 # Use libwrap, 1 true, 0 false
 my $t_use_libwrap = 0;
 
@@ -206,11 +209,12 @@ sub print_help {
 	print ("\t-t time\t\tTime-out for network operations in seconds (default ${t_timeout}s).\n");
 	print ("\t-v\t\tBe verbose.\n");
 	print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
-	print ("\t-x pwd\t\tServer password.\n\n");
-	print ("\t-b proxy_ip_address\t\tProxied server address.\n\n");	
-	print ("\t-g proxy_port\t\tPort of proxied server.\n\n");
+	print ("\t-x pwd\t\tServer password.\n");
+	print ("\t-b proxy_ip_address\tProxied server address.\n");	
+	print ("\t-g proxy_port\t\tPort of proxied server.\n");
+	print ("\t-C\t\tEnable SSL for proxy connection without a client certificate.\n");
 	print ("\t-T\t\tEnable tcpwrappers support.\n");
-	print ("\t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n");
+	print ("\t\t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n");
 }
 
 ################################################################################
@@ -256,7 +260,7 @@ sub parse_options {
 	my @t_addresses_tmp;
 
 	# Get options
-	if (getopts ('a:b:c:de:f:g:hi:k:m:op:qr:s:S:t:Tvwx:', \%opts) == 0 || defined ($opts{'h'})) {
+	if (getopts ('a:b:c:Cde:f:g:hi:k:m:op:qr:s:S:t:Tvwx:', \%opts) == 0 || defined ($opts{'h'})) {
 		print_help ();
 		exit 1;
 	}
@@ -444,6 +448,15 @@ sub parse_options {
 		}
 	}	
 
+	# Enable SSL without a client certificate
+	if (defined ($opts{'C'})) {
+
+		require IO::Socket::SSL;
+
+		$t_proxy_ssl = 1;
+	} 
+
+
 	# TCP wrappers support
 	if (defined ($opts{'T'})) {
 		if ($t_libwrap_installed) {
@@ -658,6 +671,30 @@ sub start_ssl {
 	print_log ("SSL started for " . $t_client_socket->sockhost ());
 }
 
+################################################################################
+## SUB start_proxy_ssl
+## Convert the proxy socket to an IO::Socket::SSL socket.
+################################################################################
+sub start_proxy_ssl {
+	my $err;
+
+	if ($t_proxy_ssl != 1) {
+		return;
+	}
+
+	IO::Socket::SSL->start_SSL (
+		$t_proxy_socket,
+		SSL_verify_mode => 0x00,
+	);
+
+	$err = IO::Socket::SSL::errstr ();
+	if ($err ne '') {
+		error ($err);
+	}
+
+	print_log ("proxy SSL started for " . $t_proxy_socket->sockhost ());
+}
+
 ################################################################################
 ## SUB accept_connections
 ## Manage incoming connections.
@@ -750,6 +787,11 @@ sub serve_proxy_connection {
 	# Start a connection with the other Tentacle Server
 	open_proxy();		
 
+	# Start SSL for proxy
+	if ($t_proxy_ssl == 1) {
+		start_proxy_ssl();
+	}
+	
 	my $command;
 
 	# Read commands
@@ -1582,6 +1624,14 @@ __END__
 
 =item	I<-x> pwd		B<Server password>.
 
+=item	I<-b proxy_ip_address>	B<Proxied server> address.
+
+=item	I<-g proxy_port>	B<Port> of proxied server.
+
+=item	I<-C>			Enable SSL for proxy without a client certificate.
+
+=item	I<-T>			Enable tcpwrappers support ('Authen::Libwrap' required).
+
 =back
 
 =head1 EXIT STATUS

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{150327}
+{150413}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("6.0dev(Build 150327)")
+#define PANDORA_VERSION ("6.0dev(Build 150413)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/pandora_windows_service.cc

@@ -322,7 +322,7 @@ Pandora_Windows_Service::killTentacleProxy() {
 
 int 
 Pandora_Windows_Service::launchTentacleProxy() {
-	string server_ip, server_port, proxy_max_connections, proxy_timeout;
+	string server_ip, server_port, proxy_max_connections, proxy_timeout, server_ssl;
 	string proxy_cmd;
 	PROCESS_INFORMATION pi;
 	STARTUPINFO         si;	
@@ -331,6 +331,7 @@ Pandora_Windows_Service::launchTentacleProxy() {
 	server_ip = conf->getValue("server_ip");
 	
 	if (server_ip != "localhost") {
+
 		proxy_max_connections = conf->getValue("proxy_max_connection");
 
 		if (proxy_max_connections == "") {
@@ -349,7 +350,16 @@ Pandora_Windows_Service::launchTentacleProxy() {
 			server_port = "41121";
 		}
 
-		proxy_cmd = "tentacle_server.exe -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout;		
+		server_ssl = conf->getValue("server_ssl");
+
+		if (server_ssl == "1") {
+			proxy_cmd = "tentacle_server.exe -C";
+		}
+		else {
+			proxy_cmd = "tentacle_server.exe";
+		}
+
+		proxy_cmd += " -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout;
 
 		ZeroMemory (&si, sizeof (si));
 		ZeroMemory (&pi, sizeof (pi));

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(6.0dev(Build 150327))"
+      VALUE "ProductVersion", "(6.0dev(Build 150413))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 6.0dev-150327
+Version: 6.0dev-150413
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.0dev-150327"
+pandora_version="6.0dev-150413"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql

@@ -70,3 +70,17 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES  ('post_process_custom_values',
 ALTER TABLE `tnetwork_map` ADD COLUMN `id_tag` int(11) DEFAULT 0;
 ALTER TABLE `tnetwork_map` ADD COLUMN `store_group` int(11) DEFAULT 0;
 UPDATE `tnetwork_map` SET `store_group` = `id_group`;
+
+-- ---------------------------------------------------------------------
+-- Table `tperfil`
+-- ---------------------------------------------------------------------
+ALTER TABLE `tperfil` ADD COLUMN `map_view` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE `tperfil` ADD COLUMN `map_edit` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE `tperfil` ADD COLUMN `map_management` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE `tperfil` ADD COLUMN `vconsole_view` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE `tperfil` ADD COLUMN `vconsole_edit` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE `tperfil` ADD COLUMN `vconsole_management` tinyint(1) NOT NULL DEFAULT 0;
+
+UPDATE `tperfil` SET `map_view` = 1, `vconsole_view` = 1 WHERE `report_view` = 1;
+UPDATE `tperfil` SET `map_edit` = 1, `vconsole_edit` = 1 WHERE `report_edit` = 1;
+UPDATE `tperfil` SET `map_management` = 1, `vconsole_management` = 1 WHERE `report_management` = 1;

pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql

@@ -70,3 +70,17 @@ INSERT INTO tconfig (token, value) VALUES ('post_process_custom_values', '{"0.00
 ALTER TABLE tnetwork_map ADD COLUMN id_tag NUMBER(11, 0) DEFAULT 0;
 ALTER TABLE tnetwork_map ADD COLUMN store_group NUMBER(11, 0) DEFAULT 0;
 UPDATE tnetwork_map SET store_group = id_group;
+
+-- ---------------------------------------------------------------------
+-- Table `tperfil`
+-- ---------------------------------------------------------------------
+ALTER TABLE tperfil ADD COLUMN map_view NUMBER(1, 0) DEFAULT 0 NOT NULL;
+ALTER TABLE tperfil ADD COLUMN map_edit NUMBER(1, 0) DEFAULT 0 NOT NULL;
+ALTER TABLE tperfil ADD COLUMN map_management NUMBER(1, 0) DEFAULT 0 NOT NULL;
+ALTER TABLE tperfil ADD COLUMN vconsole_view NUMBER(1, 0) DEFAULT 0 NOT NULL;
+ALTER TABLE tperfil ADD COLUMN vconsole_edit NUMBER(1, 0) DEFAULT 0 NOT NULL;
+ALTER TABLE tperfil ADD COLUMN vconsole_management NUMBER(1, 0) DEFAULT 0 NOT NULL;
+
+UPDATE tperfil SET map_view = 1, vconsole_view = 1 WHERE report_view = 1;
+UPDATE tperfil SET map_edit = 1, vconsole_edit = 1 WHERE report_edit = 1;
+UPDATE tperfil SET map_management = 1, vconsole_management = 1 WHERE report_management = 1;

pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql

@@ -68,3 +68,17 @@ INSERT INTO "tconfig" ("token", "value") VALUES ('post_process_custom_values', '
 ALTER TABLE "tnetwork_map" ADD COLUMN "id_tag" INTEGER DEFAULT 0;
 ALTER TABLE "tnetwork_map" ADD COLUMN "store_group" INTEGER DEFAULT 0;
 UPDATE "tnetwork_map" SET "store_group" = "id_group";
+
+-- ---------------------------------------------------------------------
+-- Table `tperfil`
+-- ---------------------------------------------------------------------
+ALTER TABLE "tperfil" ADD COLUMN "map_view" SMALLINT NOT NULL DEFAULT 0;
+ALTER TABLE "tperfil" ADD COLUMN "map_edit" SMALLINT NOT NULL DEFAULT 0;
+ALTER TABLE "tperfil" ADD COLUMN "map_management" SMALLINT NOT NULL DEFAULT 0;
+ALTER TABLE "tperfil" ADD COLUMN "vconsole_view" SMALLINT NOT NULL DEFAULT 0;
+ALTER TABLE "tperfil" ADD COLUMN "vconsole_edit" SMALLINT NOT NULL DEFAULT 0;
+ALTER TABLE "tperfil" ADD COLUMN "vconsole_management" SMALLINT NOT NULL DEFAULT 0;
+
+UPDATE "tperfil" SET "map_view" = 1, "vconsole_view" = 1 WHERE "report_view" = 1;
+UPDATE "tperfil" SET "map_edit" = 1, "vconsole_edit" = 1 WHERE "report_edit" = 1;
+UPDATE "tperfil" SET "map_management" = 1, "vconsole_management" = 1 WHERE "report_management" = 1;

pandora_console/godmode/agentes/planned_downtime.editor.php

@@ -159,6 +159,9 @@ if ($create_downtime || $update_downtime) {
 	else if ($type_execution == 'once' && $datetime_from >= $datetime_to) {
 		ui_print_error_message(__('Not created. Error inserting data') . ". " .__('The end date must be higher than the start date'));
 	}
+	else if ($type_execution == 'once' && $datetime_to <= $now) {
+		ui_print_error_message(__('Not created. Error inserting data') . ". " .__('The end date must be higher than the current time'));
+	}
 	else if ($type_execution == 'periodically'
 			&& (($type_periodicity == 'weekly' && $periodically_time_from >= $periodically_time_to)
 				|| ($type_periodicity == 'monthly' && $periodically_day_from == $periodically_day_to && $periodically_time_from >= $periodically_time_to))) {
@@ -216,7 +219,6 @@ if ($create_downtime || $update_downtime) {
 					'description' => $description,
 					'date_from' => $datetime_from,
 					'date_to' => $datetime_to,
-					'executed' => 0,
 					'id_group' => $id_group,
 					'only_alerts' => 0,
 					'monday' => $monday,
@@ -307,18 +309,22 @@ if ($id_downtime > 0) {
 	$type_downtime = $result['type_downtime'];
 	$type_execution = $result['type_execution'];
 	$type_periodicity = $result['type_periodicity'];
+	$executed = $result['executed'];
 	
 	if ($id_group == 0)
 		$id_group = $result['id_group'];
 }
 
+// when the planned down time is in execution, only action to postpone on once type is enabled and the other are disabled.
+$disabled_in_execution = $executed ? 1 : 0;
+
 $table->class = 'databox_color';
 $table->width = '98%';
 $table->data = array ();
 $table->data[0][0] = __('Name');
-$table->data[0][1] = html_print_input_text ('name', $name, '', 25, 40, true);
+$table->data[0][1] = html_print_input_text ('name', $name, '', 25, 40, true, $disabled_in_execution);
 $table->data[1][0] = __('Group');
-$table->data[1][1] = html_print_select_groups(false, "AW", true, 'id_group', $id_group, '', '', 0, true);
+$table->data[1][1] = html_print_select_groups(false, "AW", true, 'id_group', $id_group, '', '', 0, true, false, true, '', $disabled_in_execution);
 $table->data[2][0] = __('Description');
 $table->data[2][1] = html_print_textarea ('description', 3, 35, $description, '', true);
 
@@ -329,11 +335,12 @@ $table->data[3][1] = html_print_select(array('quiet' => __('Quiet'),
 	'disable_agents' => __('Disabled Agents'),
 	'disable_agents_alerts' => __('Disabled only Alerts')),
 	'type_downtime', $type_downtime, 'change_type_downtime()', '', 0, true, false, true,
-	'');
+	'', $disabled_in_execution);
 $table->data[4][0] = __('Execution');
 $table->data[4][1] = html_print_select(array('once' => __('Once'),
 	'periodically' => __('Periodically')),
-	'type_execution', $type_execution, 'change_type_execution();', '', 0, true);
+	'type_execution', $type_execution, 'change_type_execution();', '', 0, true,
+	false, true, '', $disabled_in_execution);
 
 $days = array_combine(range(1, 31), range(1, 31));
 $table->data[5][0] = __('Configure the time') . "&nbsp;" . ui_print_help_icon ('planned_downtime_time', true);;
@@ -345,9 +352,9 @@ $table->data[5][1] = "
 					__('From:') .
 					"</td>
 				<td>".
-				html_print_input_text ('once_date_from', $once_date_from, '', 10, 10, true) .
+				html_print_input_text ('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution) .
 				ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
-				html_print_input_text ('once_time_from', $once_time_from, '', 9, 9, true) .
+				html_print_input_text ('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution) .
 				ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
 				"</td>
 			</tr>
@@ -372,7 +379,8 @@ $table->data[5][1] = "
 							'weekly' => __('Weekly'),
 							'monthly' => __('Monthly')),
 						'type_periodicity', $type_periodicity,
-						'change_type_periodicity();', '', 0, true) .
+						'change_type_periodicity();', '', 0, true,
+						false, true, '', $disabled_in_execution) .
 				"</td>
 			</tr>
 			<tr>
@@ -380,25 +388,25 @@ $table->data[5][1] = "
 					<table id='weekly_item' style='display: none;'>
 						<tr>
 							<td>" . __('Mon') .
-							html_print_checkbox ('monday', 1, $monday, true) .
+							html_print_checkbox ('monday', 1, $monday, true, $disabled_in_execution) .
 							"</td>
 							<td>" . __('Tue') .
-							html_print_checkbox ('tuesday', 1, $tuesday, true) .
+							html_print_checkbox ('tuesday', 1, $tuesday, true, $disabled_in_execution) .
 							"</td>
 							<td>" . __('Wed') .
-							html_print_checkbox ('wednesday', 1, $wednesday, true) .
+							html_print_checkbox ('wednesday', 1, $wednesday, true, $disabled_in_execution) .
 							"</td>
 							<td>" . __('Thu') .
-							html_print_checkbox ('thursday', 1, $thursday, true) .
+							html_print_checkbox ('thursday', 1, $thursday, true, $disabled_in_execution) .
 							"</td>
 							<td>" . __('Fri') .
-							html_print_checkbox ('friday', 1, $friday, true) .
+							html_print_checkbox ('friday', 1, $friday, true, $disabled_in_execution) .
 							"</td>
 							<td>" . __('Sat') .
-							html_print_checkbox ('saturday', 1, $saturday, true) .
+							html_print_checkbox ('saturday', 1, $saturday, true, $disabled_in_execution) .
 							"</td>
 							<td>" . __('Sun') .
-							html_print_checkbox ('sunday', 1, $sunday, true) .
+							html_print_checkbox ('sunday', 1, $sunday, true, $disabled_in_execution) .
 							"</td>
 						</tr>
 					</table>
@@ -407,12 +415,14 @@ $table->data[5][1] = "
 							<td>" . __('From day:') . "</td>
 							<td>".
 								html_print_select($days,
-									'periodically_day_from', $periodically_day_from, '', '', 0, true) .
+									'periodically_day_from', $periodically_day_from, '', '', 0, true,
+									false, true, '', $disabled_in_execution) .
 							"</td>
 							<td>" . __('To day:') . "</td>
 							<td>".
 								html_print_select($days,
-									'periodically_day_to', $periodically_day_to, '', '', 0, true) .
+									'periodically_day_to', $periodically_day_to, '', '', 0, true,
+									false, true, '', $disabled_in_execution) .
 							"</td>
 							<td>" . ui_print_help_tip(__('The end day must be higher than the start day'), true) . "</td>
 						</tr>
@@ -423,7 +433,7 @@ $table->data[5][1] = "
 							<td>".
 							html_print_input_text (
 								'periodically_time_from',
-								$periodically_time_from, '', 7, 7, true) . 
+								$periodically_time_from, '', 7, 7, true, $disabled_in_execution) . 
 							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
 								".<br>".__('The end time must be higher than the start time'), true) .
 							"</td>
@@ -431,7 +441,7 @@ $table->data[5][1] = "
 							<td>".
 							html_print_input_text (
 								'periodically_time_to',
-								$periodically_time_to, '', 7, 7, true) .
+								$periodically_time_to, '', 7, 7, true, $disabled_in_execution) .
 							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
 								".<br>".__('The end time must be higher than the start time'), true) .
 							"</td>
@@ -498,7 +508,7 @@ if ($id_downtime > 0) {
 	}
 	
 	$disabled_add_button = false;
-	if (empty($data)) {
+	if (empty($data) || $disabled_in_execution) {
 		$disabled_add_button = true;
 	}
 	
@@ -589,11 +599,13 @@ if ($id_downtime > 0) {
 			if (($type_downtime != 'disable_agents_alerts')
 				&&  ($type_downtime != 'disable_agents')) {
 				
-				$data[5] = '<a href="javascript:show_editor_module(' . $downtime["id_agente"] . ');">' .
+				$href = $executed ? 'javascript:void(0);' : 'javascript:show_editor_module(' . $downtime["id_agente"] . ');';
+				$data[5] = '<a href="' . $href . '">' .
 					html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Delete'))) . "</a>";
 				
 			}
-			$data[5] .= '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor'.
+			$href = $executed ? 'javascript:void(0);' : 'index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor';
+			$data[5] .= '<a href="' . $href .
 				'&amp;id_agent=' . $downtime["id_agente"] . 
 				'&amp;delete_downtime_agent=1' .
 				'&amp;id_downtime_agent=' . $downtime["id"] .
@@ -994,5 +1006,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
 				}
 			});
 		}
+		// Disable datepickers when it has readonly attribute
+		$('input.hasDatepicker[readonly]').disable();
 	});
 </script>

pandora_console/godmode/agentes/planned_downtime.list.php

@@ -499,6 +499,12 @@ else {
 				'delete_downtime=1&id_downtime='.$downtime['id'].'">' .
 			html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete')));
 		}
+		elseif ($downtime["executed"] == 1 && $downtime['type_execution'] == 'once'){
+			$data[8] = '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor&amp;' .
+				'edit_downtime=1&amp;id_downtime='.$downtime['id'].'">' .
+			html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
+			$data[9]= "N/A";
+		}
 		else {
 			$data[8]= "N/A";
 			$data[9]= "N/A";

pandora_console/godmode/reporting/map_builder.php

@@ -17,6 +17,18 @@ global $config;
 
 require_once ($config['homedir'] . '/include/functions_visual_map.php');
 
+// ACL for the general permission
+$vconsoles_read = check_acl ($config['id_user'], 0, "VR");
+$vconsoles_write = check_acl ($config['id_user'], 0, "VW");
+$vconsoles_manage = check_acl ($config['id_user'], 0, "VM");
+
+if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access map builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
 $pure = (int)get_parameter('pure', 0);
 $hack_metaconsole = '';
 if (defined('METACONSOLE'))
@@ -31,7 +43,36 @@ $copy_layout = (bool) get_parameter ('copy_layout');
 $delete_layout = (bool) get_parameter ('delete_layout');
 $refr = (int) get_parameter('refr');
 
-if ($delete_layout) {
+if ($delete_layout || $copy_layout) {
+	// Visual console required
+	if (empty($id_layout)) {
+		db_pandora_audit("ACL Violation",
+			"Trying to access map builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+	
+	$group_id = db_get_value("id_group", "tlayout", "id", $id_layout);
+	if ($group_id === false) {
+		db_pandora_audit("ACL Violation",
+			"Trying to access map builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+	
+	// ACL for the visual console
+	// $vconsole_read = check_acl ($config['id_user'], $group_id, "VR");
+	$vconsole_write = check_acl ($config['id_user'], $group_id, "VW");
+	$vconsole_manage = check_acl ($config['id_user'], $group_id, "VM");
+
+	if (!$vconsole_write && !$vconsole_manage) {
+		db_pandora_audit("ACL Violation",
+			"Trying to access map builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+	
+	if ($delete_layout) {
 		db_process_sql_delete ('tlayout_data', array ('id_layout' => $id_layout));
 		$result = db_process_sql_delete ('tlayout', array ('id' => $id_layout));
 		if ($result) {
@@ -44,9 +85,9 @@ if ($delete_layout) {
 			ui_print_error_message(__('Not deleted. Error deleting data'));
 		}
 		$id_layout = 0;
-}
+	}
 
-if ($copy_layout) {	
+	if ($copy_layout) {	
 		// Number of inserts
 		$ninsert = (int) 0;
 		
@@ -134,7 +175,7 @@ if ($copy_layout) {
 		else {
 			ui_print_error_message(__('Not copied. Error copying data'));
 		}
-	
+	}
 }
 
 $table->width = '98%';
@@ -146,7 +187,7 @@ $table->head[2] = __('Items');
 
 // Fix: IW was the old ACL for report editing, now is RW
 //Only for RW flag
-if (check_acl ($config['id_user'], 0, "RW")) {
+if ($vconsoles_write || $vconsoles_manage) {
 	$table->head[3] = __('Copy');
 	$table->head[4] = __('Delete');
 }
@@ -159,9 +200,9 @@ $table->align[3] = 'center';
 $table->align[4] = 'center';
 
 // Only display maps of "All" group if user is administrator
-// or has "RR" privileges, otherwise show only maps of user group
+// or has "VR" privileges, otherwise show only maps of user group
 $own_info = get_user_info ($config['id_user']);
-if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "RR"))
+if ($own_info['is_admin'] || $vconsoles_read)
 	$maps = visual_map_get_user_layouts ();	
 else
 	$maps = visual_map_get_user_layouts ($config['id_user'], false, false, false);
@@ -171,6 +212,9 @@ if (!$maps) {
 }
 else {
 	foreach ($maps as $map) {
+		// ACL for the visual console permission
+		$vconsole_write = check_acl ($config['id_user'], $map['id_group'], "VW");
+		$vconsole_manage = check_acl ($config['id_user'], $map['id_group'], "VM");
 		
 		$data = array ();
 		
@@ -187,7 +231,7 @@ else {
 		$data[2] = db_get_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
 		
 		// Fix: IW was the old ACL for report editing, now is RW
-		if (check_acl ($config['id_user'], 0, "RW")) {
+		if ($vconsole_write || $vconsole_manage) {
 			
 			if (!defined('METACONSOLE')) {
 				$data[3] = '<a class="copy_visualmap" href="index.php?sec=reporting&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image ("images/copy.png", true).'</a>';
@@ -212,13 +256,11 @@ else {
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
 }
 
-// Fix: IW was the old ACL to check for report editing, now is RW
-//Only for RW flag
-if (check_acl ($config['id_user'], 0, "RW")) {
+if ($vconsoles_write || $vconsoles_manage) {
 	if (!defined('METACONSOLE'))
 		echo '<form action="index.php?sec=reporting&amp;sec2=godmode/reporting/visual_console_builder" method="post">';
 	else {		
-		echo '<form action="index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=' . $pure . '" method="post">';
+		echo '<form action="index.php?sec=screen&sec2=screens/screens&action=visualmap&action2=new&operation=new_visualmap&tab=data&pure=' . $pure . '" method="post">';
 	}
 	html_print_input_hidden ('edit_layout', 1);
 	html_print_submit_button (__('Create'), '', false, 'class="sub next"');

pandora_console/godmode/reporting/visual_console_builder.data.php

@@ -17,7 +17,26 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "RW")) {
+if (empty($idVisualConsole)) {
+	// ACL for the a new visual console
+	// if (!isset($vconsole_read))
+	// 	$vconsole_read = check_acl ($config['id_user'], 0, "VR");
+	if (!isset($vconsole_write))
+		$vconsole_write = check_acl ($config['id_user'], 0, "VW");
+	if (!isset($vconsole_manage))
+		$vconsole_manage = check_acl ($config['id_user'], 0, "VM");
+}
+else {
+	// ACL for the existing visual console
+	// if (!isset($vconsole_read))
+	// 	$vconsole_read = check_acl ($config['id_user'], $idGroup, "VR");
+	if (!isset($vconsole_write))
+		$vconsole_write = check_acl ($config['id_user'], $idGroup, "VW");
+	if (!isset($vconsole_manage))
+		$vconsole_manage = check_acl ($config['id_user'], $idGroup, "VM");
+}
+
+if (!$vconsole_write && !$vconsole_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access report builder");
 	require ("general/noaccess.php");
@@ -85,7 +104,7 @@ $groups = users_get_groups ($config['id_user'], 'RW');
 $own_info = get_user_info($config['id_user']);
 // Only display group "All" if user is administrator
 // or has "RW" privileges
-if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "RW"))
+if ($own_info['is_admin'] || $vconsole_write || $vconsole_manage)
 	$display_all_group = true;
 else
 	$display_all_group = false;

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -1080,7 +1080,7 @@ function cleanFields(item) {
 		tinymce.get('text-label').setContent("(_VALUE_)");
 	}
 	
-	fill_parent_select();
+	//fill_parent_select();
 	
 	var anyText = $("#any_text").html(); //Trick for catch the translate text.
 	$("#module")

pandora_console/godmode/reporting/visual_console_builder.editor.php

@@ -17,7 +17,23 @@ global $config;
 // Login check
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "RW")) {
+// Visual console required
+if (empty($visualConsole)) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// ACL for the existing visual console
+// if (!isset($vconsole_read))
+// 	$vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
+if (!isset($vconsole_write))
+	$vconsole_write = check_acl ($config['id_user'], $visualConsole['id_group'], "VW");
+if (!isset($vconsole_manage))
+	$vconsole_manage = check_acl ($config['id_user'], $visualConsole['id_group'], "VM");
+
+if (!$vconsole_write && !$vconsole_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access report builder");
 	require ("general/noaccess.php");

pandora_console/godmode/reporting/visual_console_builder.elements.php

@@ -17,7 +17,23 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "RW")) {
+// Visual console required
+if (empty($visualConsole)) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// ACL for the existing visual console
+// if (!isset($vconsole_read))
+// 	$vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
+if (!isset($vconsole_write))
+	$vconsole_write = check_acl ($config['id_user'], $visualConsole['id_group'], "VW");
+if (!isset($vconsole_manage))
+	$vconsole_manage = check_acl ($config['id_user'], $visualConsole['id_group'], "VM");
+
+if (!$vconsole_write && !$vconsole_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access report builder");
 	require ("general/noaccess.php");

pandora_console/godmode/reporting/visual_console_builder.php

@@ -18,27 +18,13 @@ global $statusProcessInDB;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "RW")) {
-	db_pandora_audit("ACL Violation",
-		"Trying to access report builder");
-	require ("general/noaccess.php");
-	exit;
-}
-
 require_once ($config['homedir'] . '/include/functions_visual_map.php');
 require_once($config['homedir'] . "/include/functions_agents.php");
 enterprise_include_once('include/functions_visual_map.php');
 
-$pure = (int)get_parameter('pure', 0);
-
-if (!empty($idVisualConsole)) {
-	$idVisualConsole = get_parameter('id_visual_console', $idVisualConsole);
-}
-else {
-	$idVisualConsole = get_parameter('id_visual_console', 0);
-}
-
-$id_layout = 0;
+// Retrieve the visual console id
+set_unless_defined ($idVisualConsole, 0); // Set default
+$idVisualConsole = get_parameter('id_visual_console', $idVisualConsole);
 
 if (!defined('METACONSOLE')) {
 	$action_name_parameter = 'action';
@@ -53,8 +39,57 @@ $action = get_parameterBetweenListValues($action_name_parameter,
 
 $activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'wizard_services', 'editor'), 'data');
 
+// Visual console creation tab and actions
+if (empty($idVisualConsole)) {
+	$visualConsole = null;
+	
+	// General ACL
+	//$vconsole_read = check_acl ($config['id_user'], 0, "VR");
+	$vconsole_write = check_acl ($config['id_user'], 0, "VW");
+	$vconsole_manage = check_acl ($config['id_user'], 0, "VM");
+}
+// The visual console exists
+else if ($activeTab != 'data' || ($activeTab == 'data' && $action != 'new')) {
+	
+	// Load the visual console data
+	$visualConsole = db_get_row_filter('tlayout', array('id' => $idVisualConsole));
+	
+	// The visual console should exist.
+	if (empty($visualConsole)) {
+		db_pandora_audit("ACL Violation",
+			"Trying to access report builder");
+		require ("general/noaccess.php");
+		return;
+	}
+	
+	// The default group id is 0
+	set_unless_defined ($visualConsole['id_group'], 0);
+	
+	// ACL for the existing visual console
+	//$vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
+	$vconsole_write = check_acl ($config['id_user'], $visualConsole['id_group'], "VW");
+	$vconsole_manage = check_acl ($config['id_user'], $visualConsole['id_group'], "VM");
+}
+else {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	return;
+}
+
+// This section is only to manage the visual console
+if (!$vconsole_write && !$vconsole_manage) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+$pure = (int) get_parameter ('pure', 0);
 $refr = (int) get_parameter ('refr', $config['vc_refr']);
 
+$id_layout = 0;
+
 
 //Save/Update data in DB
 global $statusProcessInDB;
@@ -71,16 +106,30 @@ switch ($activeTab) {
 			
 			case 'update':
 			case 'save':
-				$idGroup = get_parameter('id_group');
-				$background = get_parameter('background');
-				$visualConsoleName = get_parameter('name');
+				$idGroup = (int) get_parameter('id_group');
+				$background = (string) get_parameter('background');
+				$visualConsoleName = (string) get_parameter('name');
 				
-				$values = array('name' => $visualConsoleName,
-					'id_group' => $idGroup, 'background' => $background);
+				// ACL for the new visual console
+				//$vconsole_read_new = check_acl ($config['id_user'], $idGroup, "VR");
+				$vconsole_write_new = check_acl ($config['id_user'], $idGroup, "VW");
+				$vconsole_manage_new = check_acl ($config['id_user'], $idGroup, "VM");
+				
+				// The user should have permissions on the new group
+				if (!$vconsole_write_new && !$vconsole_manage_new) {
+					db_pandora_audit("ACL Violation",
+						"Trying to access report builder");
+					require ("general/noaccess.php");
+					exit;
+				}
+				
+				$values = array(
+						'name' => $visualConsoleName,
+						'id_group' => $idGroup, 
+						'background' => $background
+					);
 				
 				// If the background is changed the size is reseted
-				$visualConsole = db_get_row_filter('tlayout',
-					array('id' => $idVisualConsole));
 				$background_now = $visualConsole['background'];
 				if ($background_now != $background && $background) {
 					$sizeBackground = getimagesize($config['homedir'] . '/images/console/background/' . $background);
@@ -93,10 +142,18 @@ switch ($activeTab) {
 						$result = false;
 						if ($values['name'] != "" && $values['background'])
 							$result = db_process_sql_update('tlayout', $values, array('id' => $idVisualConsole));
-						if ($result !== false && $values['background']) {
+						if ($result !== false) {
 							db_pandora_audit( "Visual console builder", "Update visual console #$idVisualConsole");
 							$action = 'edit';
 							$statusProcessInDB = array('flag' => true, 'message' => ui_print_success_message(__('Successfully update.'), '', true));
+							
+							// Return the updated visual console
+							$visualConsole = db_get_row_filter('tlayout',
+								array('id' => $idVisualConsole));
+							// Update the ACL
+							//$vconsole_read = $vconsole_read_new;
+							$vconsole_write = $vconsole_write_new;
+							$vconsole_manage = $vconsole_manage_new;
 						}
 						else {
 							db_pandora_audit( "Visual console builder", "Fail update visual console #$idVisualConsole");
@@ -116,6 +173,14 @@ switch ($activeTab) {
 								$action = 'edit';
 								$statusProcessInDB = array('flag' => true,
 									'message' => ui_print_success_message(__('Successfully created.'), '', true));
+								
+								// Return the updated visual console
+								$visualConsole = db_get_row_filter('tlayout',
+									array('id' => $idVisualConsole));
+								// Update the ACL
+								//$vconsole_read = $vconsole_read_new;
+								$vconsole_write = $vconsole_write_new;
+								$vconsole_manage = $vconsole_manage_new;
 							}
 							else {
 								db_pandora_audit( "Visual console builder", "Fail try to create visual console");
@@ -125,13 +190,9 @@ switch ($activeTab) {
 						}
 						break;
 				}
-				$visualConsole = db_get_row_filter('tlayout',
-					array('id' => $idVisualConsole));
 				break;
 			
 			case 'edit':
-				$visualConsole = db_get_row_filter('tlayout',
-					array('id' => $idVisualConsole));
 				$visualConsoleName = $visualConsole['name'];
 				$idGroup = $visualConsole['id_group'];
 				$background = $visualConsole['background'];
@@ -147,13 +208,11 @@ switch ($activeTab) {
 						json_encode(array())));
 				
 				$delete_items = json_decode($delete_items_json, true);
-				$id_visual_console = (int)get_parameter(
-					'id_visual_console', 0);
 				
 				if (!empty($delete_items)) {
 					$result = (bool)db_process_sql_delete(
 						'tlayout_data',
-						array('id_layout' => $id_visual_console,
+						array('id_layout' => $idVisualConsole,
 							'id' => $delete_items));
 					
 				}
@@ -187,6 +246,10 @@ switch ($activeTab) {
 						'height' => $height),
 					array('id' => $idVisualConsole));
 				
+				// Return the updated visual console
+				$visualConsole = db_get_row_filter('tlayout',
+					array('id' => $idVisualConsole));
+				
 				//Update elements in visual map
 				$idsElements = db_get_all_rows_filter('tlayout_data',
 					array('id_layout' => $idVisualConsole), array('id'));
@@ -246,12 +309,10 @@ switch ($activeTab) {
 				}
 				break;
 		}
-		$visualConsole = db_get_row_filter('tlayout', array('id' => $idVisualConsole));
 		$visualConsoleName = $visualConsole['name'];
 		$action = 'edit';
 		break;
 	case 'wizard':
-		$visualConsole = db_get_row_filter('tlayout', array('id' => $idVisualConsole));
 		$visualConsoleName = $visualConsole['name'];
 		$background = $visualConsole['background'];
 		switch ($action) {
@@ -430,7 +491,6 @@ switch ($activeTab) {
 		}
 		break;
 	case 'wizard_services':
-		$visualConsole = db_get_row_filter('tlayout', array('id' => $idVisualConsole));
 		$visualConsoleName = $visualConsole['name'];
 		switch ($action) {
 			case 'update':
@@ -453,9 +513,6 @@ switch ($activeTab) {
 			case 'new':
 			case 'update':
 			case 'edit':
-				$visualConsole = db_get_row_filter('tlayout',
-					array('id' => $idVisualConsole));
-				
 				$visualConsoleName = $visualConsole['name'];
 				$action = 'edit';
 				break;

pandora_console/godmode/reporting/visual_console_builder.wizard.php

@@ -17,7 +17,23 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "RW")) {
+// Visual console required
+if (empty($visualConsole)) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// ACL for the existing visual console
+// if (!isset($vconsole_read))
+// 	$vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
+if (!isset($vconsole_write))
+	$vconsole_write = check_acl ($config['id_user'], $visualConsole['id_group'], "VW");
+if (!isset($vconsole_manage))
+	$vconsole_manage = check_acl ($config['id_user'], $visualConsole['id_group'], "VM");
+
+if (!$vconsole_write && !$vconsole_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access report builder");
 	require ("general/noaccess.php");

pandora_console/godmode/users/configure_profile.php

@@ -64,24 +64,51 @@ $id_profile = (int) get_parameter ('id');
 if ($id_profile || $new_profile) {
 	
 	if ($new_profile) {
+		// Name
 		$name = '';
+		
+		// Incidents
 		$incident_view = 0;
 		$incident_edit = 0;
 		$incident_management = 0;
+		
+		// Agents
 		$agent_view = 0;
 		$agent_edit = 0;
+		$agent_disable = 0;
+		
+		// Alerts
 		$alert_edit = 0;
-		$user_management = 0;
-		$db_management = 0;
 		$alert_management = 0;
+		
+		// Users
+		$user_management = 0;
+		
+		// DB
+		$db_management = 0;
+		
+		// Pandora
 		$pandora_management = 0;
-		$report_view = 0;
-		$report_edit = 0;
-		$report_management = 0;
+		
+		// Events
 		$event_view = 0;
 		$event_edit = 0;
 		$event_management = 0;
-		$agent_disable = 0;
+		
+		// Reports
+		$report_view = 0;
+		$report_edit = 0;
+		$report_management = 0;
+		
+		// Network maps
+		$map_view = 0;
+		$map_edit = 0;
+		$map_management = 0;
+		
+		// Visual console
+		$vconsole_view = 0;
+		$vconsole_edit = 0;
+		$vconsole_management = 0;
 		
 		$page_title = __('Create profile');
 	}
@@ -101,38 +128,91 @@ if ($id_profile || $new_profile) {
 			exit;
 		}
 		
+		// Name
 		$name = $profile["name"];
+		
+		// Incidents
 		$incident_view = (bool) $profile["incident_view"];
 		$incident_edit = (bool) $profile["incident_edit"];
 		$incident_management = (bool) $profile["incident_management"];
+		
+		// Agents
 		$agent_view = (bool) $profile["agent_view"];
 		$agent_edit = (bool) $profile["agent_edit"];
+		$agent_disable = (bool) $profile["agent_disable"];
+		
+		// Alerts
 		$alert_edit = (bool) $profile["alert_edit"];
-		$user_management = (bool) $profile["user_management"];
-		$db_management = (bool) $profile["db_management"];
 		$alert_management = (bool) $profile["alert_management"];
+		
+		// Users
+		$user_management = (bool) $profile["user_management"];
+		
+		// DB
+		$db_management = (bool) $profile["db_management"];
+		
+		// Pandora
 		$pandora_management = (bool) $profile["pandora_management"];
-		$report_view = (bool) $profile["report_view"];
-		$report_edit = (bool) $profile["report_edit"];
-		$report_management = (bool) $profile["report_management"];
+		
+		// Events
 		$event_view = (bool) $profile["event_view"];
 		$event_edit = (bool) $profile["event_edit"];
 		$event_management = (bool) $profile["event_management"];
-		$agent_disable = (bool) $profile["agent_disable"];
+		
+		// Reports
+		$report_view = (bool) $profile["report_view"];
+		$report_edit = (bool) $profile["report_edit"];
+		$report_management = (bool) $profile["report_management"];
+		
+		// Network maps
+		$map_view = (bool) $profile["map_view"];
+		$map_edit = (bool) $profile["map_edit"];
+		$map_management = (bool) $profile["map_management"];
+		
+		// Visual console
+		$vconsole_view = (bool) $profile["vconsole_view"];
+		$vconsole_edit = (bool) $profile["vconsole_edit"];
+		$vconsole_management = (bool) $profile["vconsole_management"];
 		
 		$id_audit = db_pandora_audit("User management",
 			"Edit profile ". $name);
 		enterprise_include_once('include/functions_audit.php');
-		$info = 'Name: ' . $name . ' Incident view: ' . $incident_view .
-			' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management .
-			' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit .
-			' Alert edit: ' . $alert_edit . ' User management: ' . $user_management .
-			' DB management: ' . $db_management . ' Alert management: ' . $alert_management .
-			' Report view: ' . $report_view . ' Report edit: ' . $report_edit .
-			' Report management: ' . $report_management . ' Event view: ' . $event_view .
-			' Event edit: ' . $event_edit . ' Event management: ' . $event_management .
+		
+		$info = 'Name: ' . $name .
+				
+				' Incident view: ' . $incident_view .
+				' Incident edit: ' . $incident_edit .
+				' Incident management: ' . $incident_management .
+				
+				' Agent view: ' . $agent_view .
+				' Agent edit: ' . $agent_edit .
 				' Agent disable: ' . $agent_disable .
+				
+				' Alert edit: ' . $alert_edit .
+				' Alert management: ' . $alert_management .
+				
+				' User management: ' . $user_management .
+				
+				' DB management: ' . $db_management .
+				
+				' Event view: ' . $event_view .
+				' Event edit: ' . $event_edit .
+				' Event management: ' . $event_management .
+				
+				' Report view: ' . $report_view .
+				' Report edit: ' . $report_edit .
+				' Report management: ' . $report_management .
+				
+				' Network map view: ' . $map_view .
+				' Network map edit: ' . $map_edit .
+				' Network map management: ' . $map_management .
+				
+				' Visual console view: ' . $vconsole_view .
+				' Visual console edit: ' . $vconsole_edit .
+				' Visual console management: ' . $vconsole_management .
+				
 				' Pandora Management: ' . $pandora_management;
+		
 		enterprise_hook('audit_pandora_enterprise', array($id_audit, $info));
 		
 		
@@ -141,7 +221,7 @@ if ($id_profile || $new_profile) {
 	
 	$table->width = '98%';
 	$table->class = 'databox';
-	if (defined("METACONSOLE")){
+	if (defined("METACONSOLE")) {
 		$table->width = '100%';
 		$table->class = 'databox data';
 		if ($id_profile)
@@ -156,42 +236,123 @@ if ($id_profile || $new_profile) {
 	$table->style[0] = 'font-weight: bold';
 	$table->data = array ();
 	
-	$table->data[0][0] = __('Profile name');
-	$table->data[0][1] = html_print_input_text ('name', $name, '', 30, 60, true);
-	$table->data[1][0] = __('View incidents');
-	$table->data[1][1] = html_print_checkbox ('incident_view', 1, $incident_view, true);
-	$table->data[2][0] = __('Edit incidents');
-	$table->data[2][1] = html_print_checkbox ('incident_edit', 1, $incident_edit, true);
-	$table->data[3][0] = __('Manage incidents');
-	$table->data[3][1] = html_print_checkbox ('incident_management', 1, $incident_management, true);
-	$table->data[4][0] = __('View agents');
-	$table->data[4][1] = html_print_checkbox ('agent_view', 1, $agent_view, true);
-	$table->data[5][0] = __('Edit agents');
-	$table->data[5][1] = html_print_checkbox ('agent_edit', 1, $agent_edit, true);
-	$table->data[6][0] = __('Disable agents');
-	$table->data[6][1] = html_print_checkbox ('agent_disable', 1, $agent_disable, true);
-	$table->data[7][0] = __('Edit alerts');
-	$table->data[7][1] = html_print_checkbox ('alert_edit', 1, $alert_edit, true);
-	$table->data[8][0] = __('Manage users');
-	$table->data[8][1] = html_print_checkbox ('user_management', 1, $user_management, true);
-	$table->data[9][0] = __('Manage Database');
-	$table->data[9][1] = html_print_checkbox ('db_management', 1, $db_management, true);
-	$table->data[10][0] = __('Manage alerts');
-	$table->data[10][1] = html_print_checkbox ('alert_management', 1, $alert_management, true);
-	$table->data[11][0] = __('View reports');
-	$table->data[11][1] = html_print_checkbox ('report_view', 1, $report_view, true);
-	$table->data[12][0] = __('Edit reports');
-	$table->data[12][1] = html_print_checkbox ('report_edit', 1, $report_edit, true);
-	$table->data[13][0] = __('Manage reports');
-	$table->data[13][1] = html_print_checkbox ('report_management', 1, $report_management, true);
-	$table->data[14][0] = __('View events');
-	$table->data[14][1] = html_print_checkbox ('event_view', 1, $event_view, true);
-	$table->data[15][0] = __('Edit events');
-	$table->data[15][1] = html_print_checkbox ('event_edit', 1, $event_edit, true);
-	$table->data[16][0] = __('Manage events');
-	$table->data[16][1] = html_print_checkbox ('event_management', 1, $event_management, true);
-	$table->data[17][0] = __('Pandora management');
-	$table->data[17][1] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
+	// Name
+	$row = array();
+	$row['name'] = __('Profile name');
+	$row['input'] = html_print_input_text ('name', $name, '', 30, 60, true);
+	$table->data['name'] = $row;
+	
+	// Incidents
+	$row = array();
+	$row['name'] = __('View incidents');
+	$row['input'] = html_print_checkbox ('incident_view', 1, $incident_view, true);
+	$table->data['IR'] = $row;
+	$row = array();
+	$row['name'] = __('Edit incidents');
+	$row['input'] = html_print_checkbox ('incident_edit', 1, $incident_edit, true);
+	$table->data['IW'] = $row;
+	$row = array();
+	$row['name'] = __('Manage incidents');
+	$row['input'] = html_print_checkbox ('incident_management', 1, $incident_management, true);
+	$table->data['IM'] = $row;
+	
+	// Agents
+	$row = array();
+	$row['name'] = __('View agents');
+	$row['input'] = html_print_checkbox ('agent_view', 1, $agent_view, true);
+	$table->data['AR'] = $row;
+	$row = array();
+	$row['name'] = __('Edit agents');
+	$row['input'] = html_print_checkbox ('agent_edit', 1, $agent_edit, true);
+	$table->data['AW'] = $row;
+	$row = array();
+	$row['name'] = __('Disable agents');
+	$row['input'] = html_print_checkbox ('agent_disable', 1, $agent_disable, true);
+	$table->data['AD'] = $row;
+	
+	// Alerts
+	$row = array();
+	$row['name'] = __('Edit alerts');
+	$row['input'] = html_print_checkbox ('alert_edit', 1, $alert_edit, true);
+	$table->data['LW'] = $row;
+	$row = array();
+	$row['name'] = __('Manage alerts');
+	$row['input'] = html_print_checkbox ('alert_management', 1, $alert_management, true);
+	$table->data['LM'] = $row;
+	
+	// Users
+	$row = array();
+	$row['name'] = __('Manage users');
+	$row['input'] = html_print_checkbox ('user_management', 1, $user_management, true);
+	$table->data['UM'] = $row;
+	
+	// DB
+	$row = array();
+	$row['name'] = __('Manage database');
+	$row['input'] = html_print_checkbox ('db_management', 1, $db_management, true);
+	$table->data['DM'] = $row;
+	
+	// Events
+	$row = array();
+	$row['name'] = __('View events');
+	$row['input'] = html_print_checkbox ('event_view', 1, $event_view, true);
+	$table->data['ER'] = $row;
+	$row = array();
+	$row['name'] = __('Edit events');
+	$row['input'] = html_print_checkbox ('event_edit', 1, $event_edit, true);
+	$table->data['EW'] = $row;
+	$row = array();
+	$row['name'] = __('Manage events');
+	$row['input'] = html_print_checkbox ('event_management', 1, $event_management, true);
+	$table->data['EM'] = $row;
+	
+	// Reports
+	$row = array();
+	$row['name'] = __('View reports');
+	$row['input'] = html_print_checkbox ('report_view', 1, $report_view, true);
+	$table->data['RR'] = $row;
+	$row = array();
+	$row['name'] = __('Edit reports');
+	$row['input'] = html_print_checkbox ('report_edit', 1, $report_edit, true);
+	$table->data['RW'] = $row;
+	$row = array();
+	$row['name'] = __('Manage reports');
+	$row['input'] = html_print_checkbox ('report_management', 1, $report_management, true);
+	$table->data['RM'] = $row;
+	
+	// Network maps
+	$row = array();
+	$row['name'] = __('View network maps');
+	$row['input'] = html_print_checkbox ('map_view', 1, $map_view, true);
+	$table->data['MR'] = $row;
+	$row = array();
+	$row['name'] = __('Edit network maps');
+	$row['input'] = html_print_checkbox ('map_edit', 1, $map_edit, true);
+	$table->data['MW'] = $row;
+	$row = array();
+	$row['name'] = __('Manage network maps');
+	$row['input'] = html_print_checkbox ('map_management', 1, $map_management, true);
+	$table->data['MM'] = $row;
+	
+	// Visual console
+	$row = array();
+	$row['name'] = __('View visual console');
+	$row['input'] = html_print_checkbox ('vconsole_view', 1, $vconsole_view, true);
+	$table->data['VR'] = $row;
+	$row = array();
+	$row['name'] = __('Edit visual console');
+	$row['input'] = html_print_checkbox ('vconsole_edit', 1, $vconsole_edit, true);
+	$table->data['VW'] = $row;
+	$row = array();
+	$row['name'] = __('Manage visual console');
+	$row['input'] = html_print_checkbox ('vconsole_management', 1, $vconsole_management, true);
+	$table->data['VM'] = $row;
+	
+	// Pandora
+	$row = array();
+	$row['name'] = __('Pandora management');
+	$row['input'] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
+	$table->data['PM'] = $row;
 	
 	echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/users/profile_list&pure='.$pure.'">';
 	

pandora_console/godmode/users/profile_list.php

@@ -103,25 +103,51 @@ if ($delete_profile) {
 }
 
 // Store the variables when create or update
-if($create_profile || $update_profile) {
+if ($create_profile || $update_profile) {
 	$name = get_parameter ("name");
+	
+	// Incidents
 	$incident_view = (bool) get_parameter ("incident_view");
 	$incident_edit = (bool) get_parameter ("incident_edit");
 	$incident_management = (bool) get_parameter ("incident_management");
+	
+	// Agents
 	$agent_view = (bool) get_parameter ("agent_view");
 	$agent_edit = (bool) get_parameter ("agent_edit");
+	$agent_disable = (bool) get_parameter ("agent_disable");
+	
+	// Alerts
 	$alert_edit = (bool) get_parameter ("alert_edit");
-	$user_management = (bool) get_parameter ("user_management");
-	$db_management = (bool) get_parameter ("db_management");
 	$alert_management = (bool) get_parameter ("alert_management");
+	
+	// Users
+	$user_management = (bool) get_parameter ("user_management");
+	
+	// DB
+	$db_management = (bool) get_parameter ("db_management");
+	
+	// Pandora
 	$pandora_management = (bool) get_parameter ("pandora_management");
-	$report_view = (bool) get_parameter ("report_view");
-	$report_edit = (bool) get_parameter ("report_edit");
-	$report_management = (bool) get_parameter ("report_management");
+	
+	// Events
 	$event_view = (bool) get_parameter ("event_view");
 	$event_edit = (bool) get_parameter ("event_edit");
 	$event_management = (bool) get_parameter ("event_management");
-	$agent_disable = (bool) get_parameter ("agent_disable");
+	
+	// Reports
+	$report_view = (bool) get_parameter ("report_view");
+	$report_edit = (bool) get_parameter ("report_edit");
+	$report_management = (bool) get_parameter ("report_management");
+	
+	// Network maps
+	$map_view = (bool) get_parameter ("map_view");
+	$map_edit = (bool) get_parameter ("map_edit");
+	$map_management = (bool) get_parameter ("map_management");
+	
+	// Visual console
+	$vconsole_view = (bool) get_parameter ("vconsole_view");
+	$vconsole_edit = (bool) get_parameter ("vconsole_edit");
+	$vconsole_management = (bool) get_parameter ("vconsole_management");
 	
 	$values = array(
 			'name' => $name,
@@ -130,18 +156,25 @@ if($create_profile || $update_profile) {
 			'incident_management' => $incident_management,
 			'agent_view' => $agent_view,
 			'agent_edit' => $agent_edit,
+			'agent_disable' => $agent_disable,
 			'alert_edit' => $alert_edit,
+			'alert_management' => $alert_management,
 			'user_management' => $user_management,
 			'db_management' => $db_management,
-		'alert_management' => $alert_management,
-		'pandora_management' => $pandora_management,
-		'report_view' => $report_view,
-		'report_edit' => $report_edit,
-		'report_management' => $report_management,
 			'event_view' => $event_view,
 			'event_edit' => $event_edit,
 			'event_management' => $event_management,
-		'agent_disable' => $agent_disable);
+			'report_view' => $report_view,
+			'report_edit' => $report_edit,
+			'report_management' => $report_management,
+			'map_view' => $map_view,
+			'map_edit' => $map_edit,
+			'map_management' => $map_management,
+			'vconsole_view' => $vconsole_view,
+			'vconsole_edit' => $vconsole_edit,
+			'vconsole_management' => $vconsole_management,
+			'pandora_management' => $pandora_management
+		);
 }
 
 // Update profile
@@ -149,16 +182,41 @@ if ($update_profile) {
 	if ($name) {
 		$ret = db_process_sql_update('tperfil', $values, array('id_perfil' => $id_profile));
 		if ($ret !== false) {
-			$info = 'Name: ' . $name . ' Incident view: ' . $incident_view .
-				' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management .
-				' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit .
-				' Alert edit: ' . $alert_edit . ' User management: ' . $user_management .
-				' DB management: ' . $db_management . ' Alert management: ' . $alert_management .
-				' Report view: ' . $report_view . ' Report edit: ' . $report_edit .
-				' Report management: ' . $report_management . ' Event view: ' . $event_view .
-				' Event edit: ' . $event_edit . ' Event management: ' . $event_management .
+			$info = 'Name: ' . $name .
+					
+					' Incident view: ' . $incident_view .
+					' Incident edit: ' . $incident_edit .
+					' Incident management: ' . $incident_management .
+					
+					' Agent view: ' . $agent_view .
+					' Agent edit: ' . $agent_edit .
 					' Agent disable: ' . $agent_disable .
+					
+					' Alert edit: ' . $alert_edit .
+					' Alert management: ' . $alert_management .
+					
+					' User management: ' . $user_management .
+					
+					' DB management: ' . $db_management .
+					
+					' Event view: ' . $event_view .
+					' Event edit: ' . $event_edit .
+					' Event management: ' . $event_management .
+					
+					' Report view: ' . $report_view .
+					' Report edit: ' . $report_edit .
+					' Report management: ' . $report_management .
+					
+					' Network map view: ' . $map_view .
+					' Network map edit: ' . $map_edit .
+					' Network map management: ' . $map_management .
+					
+					' Visual console view: ' . $vconsole_view .
+					' Visual console edit: ' . $vconsole_edit .
+					' Visual console management: ' . $vconsole_management .
+					
 					' Pandora Management: ' . $pandora_management;
+			
 			db_pandora_audit("User management",
 				"Update profile ". $name, false, false, $info);
 			
@@ -182,16 +240,41 @@ if ($create_profile) {
 		if ($ret !== false) {
 			ui_print_success_message(__('Successfully created'));
 			
-			$info = 'Name: ' . $name . ' Incident view: ' . $incident_view .
-				' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management .
-				' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit .
-				' Alert edit: ' . $alert_edit . ' User management: ' . $user_management .
-				' DB management: ' . $db_management . ' Alert management: ' . $alert_management .
-				' Report view: ' . $report_view . ' Report edit: ' . $report_edit .
-				' Report management: ' . $report_management . ' Event view: ' . $event_view .
-				' Event edit: ' . $event_edit . ' Event management: ' . $event_management .
+			$info = 'Name: ' . $name .
+					
+					' Incident view: ' . $incident_view .
+					' Incident edit: ' . $incident_edit .
+					' Incident management: ' . $incident_management .
+					
+					' Agent view: ' . $agent_view .
+					' Agent edit: ' . $agent_edit .
 					' Agent disable: ' . $agent_disable .
+					
+					' Alert edit: ' . $alert_edit .
+					' Alert management: ' . $alert_management .
+					
+					' User management: ' . $user_management .
+					
+					' DB management: ' . $db_management .
+					
+					' Event view: ' . $event_view .
+					' Event edit: ' . $event_edit .
+					' Event management: ' . $event_management .
+					
+					' Report view: ' . $report_view .
+					' Report edit: ' . $report_edit .
+					' Report management: ' . $report_management .
+					
+					' Network map view: ' . $map_view .
+					' Network map edit: ' . $map_edit .
+					' Network map management: ' . $map_management .
+					
+					' Visual console view: ' . $vconsole_view .
+					' Visual console edit: ' . $vconsole_edit .
+					' Visual console management: ' . $vconsole_management .
+					
 					' Pandora Management: ' . $pandora_management;
+			
 			db_pandora_audit("User management",
 				"Created profile ". $name, false, false, $info);
 		}
@@ -217,26 +300,32 @@ $table->data = array ();
 $table->size = array ();
 $table->align = array ();
 
-$table->head[0] = __('Profiles');
+$table->head['profiles'] = __('Profiles');
 
-$table->head[1] = "IR" . ui_print_help_tip (__('System incidents reading'), true);
-$table->head[2] = "IW" . ui_print_help_tip (__('System incidents writing'), true);
-$table->head[3] = "IM" . ui_print_help_tip (__('System incidents management'), true);
-$table->head[4] = "AR" . ui_print_help_tip (__('Agents reading'), true);
-$table->head[5] = "AW" . ui_print_help_tip (__('Agents management'), true);
-$table->head[6] = "AD" . ui_print_help_tip (__('Agents disable'), true);
-$table->head[7] = "LW" . ui_print_help_tip (__('Alerts editing'), true);
-$table->head[8] = "UM" . ui_print_help_tip (__('Users management'), true);
-$table->head[9] = "DM" . ui_print_help_tip (__('Database management'), true);
-$table->head[10] = "LM" . ui_print_help_tip (__('Alerts management'), true);
-$table->head[11] = "RR" . ui_print_help_tip (__('Reports reading'), true);
-$table->head[12] = "RW" . ui_print_help_tip (__('Reports writing'), true);
-$table->head[13] = "RM" . ui_print_help_tip (__('Reports management'), true);
-$table->head[14] = "ER" . ui_print_help_tip (__('Events reading'), true);
-$table->head[15] = "EW" . ui_print_help_tip (__('Events writing'), true);
-$table->head[16] = "EM" . ui_print_help_tip (__('Events management'), true);
-$table->head[17] = "PM" . ui_print_help_tip (__('Systems management'), true);
-$table->head[18] = '<span title="Operations">' . __('Op.') . '</span>';
+$table->head['IR'] = "IR" . ui_print_help_tip (__('System incidents reading'), true);
+$table->head['IW'] = "IW" . ui_print_help_tip (__('System incidents writing'), true);
+$table->head['IM'] = "IM" . ui_print_help_tip (__('System incidents management'), true);
+$table->head['AR'] = "AR" . ui_print_help_tip (__('Agents reading'), true);
+$table->head['AW'] = "AW" . ui_print_help_tip (__('Agents management'), true);
+$table->head['AD'] = "AD" . ui_print_help_tip (__('Agents disable'), true);
+$table->head['LW'] = "LW" . ui_print_help_tip (__('Alerts editing'), true);
+$table->head['LM'] = "LM" . ui_print_help_tip (__('Alerts management'), true);
+$table->head['UM'] = "UM" . ui_print_help_tip (__('Users management'), true);
+$table->head['DM'] = "DM" . ui_print_help_tip (__('Database management'), true);
+$table->head['ER'] = "ER" . ui_print_help_tip (__('Events reading'), true);
+$table->head['EW'] = "EW" . ui_print_help_tip (__('Events writing'), true);
+$table->head['EM'] = "EM" . ui_print_help_tip (__('Events management'), true);
+$table->head['RR'] = "RR" . ui_print_help_tip (__('Reports reading'), true);
+$table->head['RW'] = "RW" . ui_print_help_tip (__('Reports writing'), true);
+$table->head['RM'] = "RM" . ui_print_help_tip (__('Reports management'), true);
+$table->head['MR'] = "MR" . ui_print_help_tip (__('Network maps reading'), true);
+$table->head['MW'] = "MW" . ui_print_help_tip (__('Network maps writing'), true);
+$table->head['MM'] = "MM" . ui_print_help_tip (__('Network maps management'), true);
+$table->head['VR'] = "VR" . ui_print_help_tip (__('Visual console reading'), true);
+$table->head['VW'] = "VW" . ui_print_help_tip (__('Visual console writing'), true);
+$table->head['VM'] = "VM" . ui_print_help_tip (__('Visual console management'), true);
+$table->head['PM'] = "PM" . ui_print_help_tip (__('Systems management'), true);
+$table->head['operations'] = '<span title="Operations">' . __('Op.') . '</span>';
 
 $table->align = array_fill (1, 11, "center");
 $table->size = array_fill (1, 10, 40);
@@ -249,26 +338,32 @@ if ($profiles === false) {
 $img = html_print_image ("images/ok.png", true, array ("border" => 0)); 
 
 foreach ($profiles as $profile) {
-	$data[0] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'&pure='.$pure.'"><b>'.$profile["name"].'</b></a>';
-	$data[1] = ($profile["incident_view"] ? $img : '');
-	$data[2] = ($profile["incident_edit"] ? $img : '');
-	$data[3] = ($profile["incident_management"] ? $img : '');
-	$data[4] = ($profile["agent_view"] ? $img : '');
-	$data[5] = ($profile["agent_edit"] ? $img : '');
-	$data[6] = ($profile["agent_disable"] ? $img : '');
-	$data[7] = ($profile["alert_edit"] ? $img : '');
-	$data[8] = ($profile["user_management"] ? $img : '');
-	$data[9] = ($profile["db_management"] ? $img : '');
-	$data[10] = ($profile["alert_management"] ? $img : '');
-	$data[11] = ($profile["report_view"] ? $img : '');
-	$data[12] = ($profile["report_edit"] ? $img : '');
-	$data[13] = ($profile["report_management"] ? $img : '');
-	$data[14] = ($profile["event_view"] ? $img : '');
-	$data[15] = ($profile["event_edit"] ? $img : '');
-	$data[16] = ($profile["event_management"] ? $img : '');
-	$data[17] = ($profile["pandora_management"] ? $img : '');
-	$data[18] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'&pure='.$pure.'"><b>'. html_print_image('images/config.png', true, array('title' => __('Edit'))) .'</b></a>';
-	$data[18] .= '&nbsp;&nbsp;<a href="index.php?sec='.$sec.'&sec2=godmode/users/profile_list&delete_profile=1&id='.$profile["id_perfil"].'&pure='.$pure.'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'. html_print_image("images/cross.png", true) . '</a>';
+	$data['profiles'] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'&pure='.$pure.'"><b>'.$profile["name"].'</b></a>';
+	$data['IR'] = ($profile["incident_view"] ? $img : '');
+	$data['IW'] = ($profile["incident_edit"] ? $img : '');
+	$data['IM'] = ($profile["incident_management"] ? $img : '');
+	$data['AR'] = ($profile["agent_view"] ? $img : '');
+	$data['AW'] = ($profile["agent_edit"] ? $img : '');
+	$data['AD'] = ($profile["agent_disable"] ? $img : '');
+	$data['LW'] = ($profile["alert_edit"] ? $img : '');
+	$data['LM'] = ($profile["alert_management"] ? $img : '');
+	$data['UM'] = ($profile["user_management"] ? $img : '');
+	$data['DM'] = ($profile["db_management"] ? $img : '');
+	$data['ER'] = ($profile["event_view"] ? $img : '');
+	$data['EW'] = ($profile["event_edit"] ? $img : '');
+	$data['EM'] = ($profile["event_management"] ? $img : '');
+	$data['RR'] = ($profile["report_view"] ? $img : '');
+	$data['RW'] = ($profile["report_edit"] ? $img : '');
+	$data['RM'] = ($profile["report_management"] ? $img : '');
+	$data['MR'] = ($profile["map_view"] ? $img : '');
+	$data['MW'] = ($profile["map_edit"] ? $img : '');
+	$data['MM'] = ($profile["map_management"] ? $img : '');
+	$data['VR'] = ($profile["vconsole_view"] ? $img : '');
+	$data['VW'] = ($profile["vconsole_edit"] ? $img : '');
+	$data['VM'] = ($profile["vconsole_management"] ? $img : '');
+	$data['PM'] = ($profile["pandora_management"] ? $img : '');
+	$data['operations'] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_profile&id='.$profile["id_perfil"].'&pure='.$pure.'"><b>'. html_print_image('images/config.png', true, array('title' => __('Edit'))) .'</b></a>';
+	$data['operations'] .= '&nbsp;&nbsp;<a href="index.php?sec='.$sec.'&sec2=godmode/users/profile_list&delete_profile=1&id='.$profile["id_perfil"].'&pure='.$pure.'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'. html_print_image("images/cross.png", true) . '</a>';
 	array_push ($table->data, $data);
 }
 

pandora_console/include/ajax/module.php

@@ -1038,6 +1038,14 @@ if ($list_modules) {
 		.click (function () {
 			return false;
 		});
+		$("a.relations_details").cluetip ({
+			arrows: true,
+			attribute: 'href',
+			cluetipClass: 'default'
+		})
+		.click (function () {
+			return false;
+		});
 		
 		function toggle_full_value(id) {
 			text = $("#hidden_value_module_" + id).html();

pandora_console/include/ajax/networkmap.ajax.php

@@ -58,50 +58,17 @@ switch($action) {
 		}
 		
 		if (isset($stats['agents'])) {
-			if ($metaconsole) {
-				include_once ('include/functions_reporting.php');
-				
-				$servers = db_get_all_rows_sql ("SELECT *
-					FROM tmetaconsole_setup");
-				if ($servers === false)
-					$servers = array();
-				
-				$total_agents = 0;
-				
-				foreach ($servers as $server) {
-					// If connection was good then retrieve all data server
-					if (metaconsole_load_external_db ($server)) {
-						$connection = true;
-					}
-					else {
-						$connection = false;
-					}
-					
-					if ($connection)
-						$data = reporting_get_group_stats();
-					
-					metaconsole_restore_db();
-					
-					$total_agents += $data["total_agents"];
-				}
-				
-				
-				$total_agents = format_numeric($total_agents);
-				
-				$summary .= $total_agents .
-					" x " . html_print_image($hack_metaconsole . 'images/bricks.png',true) .
-					' ' . __('Agents') . "<br>";
-			}
-			else {
+			// TODO: GET STATUS OF THE AGENTS AND ADD IT TO SUMMARY
 			$summary .= count($stats['agents']) .
 				" x " . html_print_image($hack_metaconsole . 'images/bricks.png',true) .
 				' ' . __('Agents') . "<br>";
 		}
-		}
 		
 		if (isset($stats['modules'])) {
 			// TODO: GET STATUS OF THE MODULES AND ADD IT TO SUMMARY
-			$summary .= count($stats['modules'])." x ".html_print_image('images/brick.png',true).' '.__('Modules')."<br>";
+			$summary .= count($stats['modules']) .
+				" x " . html_print_image($hack_metaconsole . 'images/brick.png',true) .
+				' ' . __('Modules') . "<br>";
 		}
 		
 		echo '<h3>'.__('Map summary').'</h3><strong>'.$summary.'</strong>';
@@ -120,47 +87,10 @@ switch($action) {
 		$summary = '<br>';
 		
 		if (isset($stats['agents'])) {
-			if ($metaconsole) {
-				include_once ('include/functions_reporting.php');
-				
-				$servers = db_get_all_rows_sql ("SELECT *
-					FROM tmetaconsole_setup
-					WHERE id = " . $id_server);
-				if ($servers === false)
-					$servers = array();
-				
-				$total_agents = 0;
-				
-				foreach ($servers as $server) {
-					// If connection was good then retrieve all data server
-					if (metaconsole_load_external_db ($server)) {
-						$connection = true;
-					}
-					else {
-						$connection = false;
-					}
-					
-					if ($connection)
-						$data = reporting_get_group_stats();
-					
-					metaconsole_restore_db();
-					
-					$total_agents += $data["total_agents"];
-				}
-				
-				
-				$total_agents = format_numeric($total_agents);
-				
-				$summary .= $total_agents .
-					" x " . html_print_image($hack_metaconsole . 'images/bricks.png',true) .
-					' ' . __('Agents') . "<br>";
-			}
-			else {
 			$summary .= count($stats['agents']) .
 				" x " . html_print_image($hack_metaconsole . 'images/bricks.png',true) .
 				' ' . __('Agents') . "<br>";
 		}
-		}
 		echo '<h3>'.__('Map summary').'</h3><strong>'.$summary.'</strong>';
 		break;
 }

pandora_console/include/ajax/visual_console_builder.ajax.php

@@ -17,14 +17,41 @@ global $config;
 
 check_login ();
 
-// Fix: IW was the old ACL to check for report editing, now is RW
-if (! check_acl ($config['id_user'], 0, "RW")) {
+$id_visual_console = get_parameter('id_visual_console', null);
+
+// WARNING: CHECK THE ENTIRE FUNCTIONALITY
+
+// Visual console id required
+if (empty($id_visual_console)) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access report builder");
 	require ("general/noaccess.php");
 	exit;
 }
 
+// Get the group id for the ACL checks
+$group_id = db_get_value('id_group', 'tlayout', 'id', $id_visual_console);
+if ($group_id === false) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// ACL for the existing visual console
+// if (!isset($vconsole_read))
+// 	$vconsole_read = check_acl ($config['id_user'], $group_id, "VR");
+if (!isset($vconsole_write))
+	$vconsole_write = check_acl ($config['id_user'], $group_id, "VW");
+if (!isset($vconsole_manage))
+	$vconsole_manage = check_acl ($config['id_user'], $group_id, "VM");
+
+if (!$vconsole_write && !$vconsole_manage) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access report builder");
+	require ("general/noaccess.php");
+	exit;
+}
 
 //Fix ajax to avoid include the file, 'functions_graph.php'.
 $ajax = true;
@@ -39,8 +66,6 @@ enterprise_include_once('include/functions_visual_map.php');
 $action = get_parameter('action');
 $type = get_parameter('type');
 
-$id_visual_console = get_parameter('id_visual_console', null);
-
 $id_element = get_parameter('id_element', null);
 
 $image = get_parameter('image', null);

pandora_console/include/class/Tree.class.php

@@ -367,7 +367,8 @@ class Tree {
 												AND ta.id_grupo = tg.id_grupo
 												$group_acl
 												$agent_search_filter
-												$agent_status_filter";
+												$agent_status_filter
+												$module_search_filter";
 							$counter_columns = $this->getAgentCounterColumnsSql($agent_table);
 							if (!empty($counter_columns))
 								$columns .= ", $counter_columns";
@@ -385,6 +386,7 @@ class Tree {
 											$group_acl
 											$agent_search_filter
 											$agent_status_filter
+											$module_search_filter
 									GROUP BY tg.id_grupo
 									ORDER BY $order_fields";
 						}
@@ -407,6 +409,7 @@ class Tree {
 										$group_acl
 										$agent_search_filter
 										$agent_status_filter
+										$module_search_filter
 									GROUP BY ta.id_agente
 									ORDER BY $order_fields";
 						}

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC150327';
+$build_version = 'PC150413';
 $pandora_version = 'v6.0dev';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -1770,7 +1770,9 @@ function check_acl($id_user, $id_group, $access, $id_agent = 0) {
 				tperfil.report_view, tperfil.report_edit,
 				tperfil.report_management, tperfil.event_view,
 				tperfil.event_edit, tperfil.event_management, 
-				tperfil.agent_disable
+				tperfil.agent_disable,
+				tperfil.map_view, tperfil.map_edit, tperfil.map_management,
+				tperfil.vconsole_view, tperfil.vconsole_edit, tperfil.vconsole_management
 			FROM tusuario_perfil, tperfil
 			WHERE tusuario_perfil.id_perfil = tperfil.id_perfil
 				AND tusuario_perfil.id_usuario = '%s'", $id_user);
@@ -1785,7 +1787,9 @@ function check_acl($id_user, $id_group, $access, $id_agent = 0) {
 				tperfil.report_view, tperfil.report_edit,
 				tperfil.report_management, tperfil.event_view,
 				tperfil.event_edit, tperfil.event_management,
-				tperfil.agent_disable
+				tperfil.agent_disable,
+				tperfil.map_view, tperfil.map_edit, tperfil.map_management,
+				tperfil.vconsole_view, tperfil.vconsole_edit, tperfil.vconsole_management
 			FROM tusuario_perfil, tperfil
 			WHERE tusuario_perfil.id_perfil = tperfil.id_perfil 
 				AND tusuario_perfil.id_usuario = '%s'
@@ -1874,6 +1878,24 @@ function get_acl_column($access) {
 		case "EM":
 			return "event_management";
 			break;
+		case "MR":
+			return "map_view";
+			break;
+		case "MW":
+			return "map_edit";
+			break;
+		case "MM":
+			return "map_management";
+			break;
+		case "VR":
+			return "vconsole_view";
+			break;
+		case "VW":
+			return "vconsole_edit";
+			break;
+		case "VM":
+			return "vconsole_management";
+			break;
 		default:
 			return "";
 			break;
@@ -2318,4 +2340,26 @@ function set_pandora_error_for_header($message, $title = null) {
 	$_SESSION["alert_msg"] .= ui_print_error_message($message_config,
 		'', true);
 }
+
+function set_if_defined (&$var, $test) {
+	if (isset($test)) {
+		$var = $test;
+		
+		return true;
+	}
+	else {
+		return false;
+	}
+}
+
+function set_unless_defined (&$var, $default) {
+	if (! isset($var)) {
+		$var = $default;
+		
+		return true;
+	}
+	else {
+		return false;
+	}
+}
 ?>

pandora_console/include/functions_config.php

@@ -1413,6 +1413,12 @@ function config_check () {
 			__("Default font doesnt exist"));
 	}
 	
+	if ($config['event_storm_protection']) {
+		set_pandora_error_for_header(
+			__('You need to restart server after altering this configuration setting.'),
+			__('Event storm protection is activated. No events will be generated during this mode.'));
+	}
+	
 	global $develop_bypass;
 	
 	if ($develop_bypass == 1) {

pandora_console/include/functions_networkmap.php

@@ -28,10 +28,6 @@ require_once ('functions_agents.php');
 require_once($config['homedir'] . "/include/functions_modules.php");
 require_once($config['homedir'] . "/include/functions_groups.php");
 ui_require_css_file ('cluetip');
-$hack_metaconsole = '';
-if (defined('METACONSOLE'))
-	$hack_metaconsole = '../../';
-ui_require_jquery_file ('cluetip', $hack_metaconsole . 'include/javascript/');
 
 // Check if a node descends from a given node
 function networkmap_is_descendant ($node, $ascendant, $parents) {
@@ -689,7 +685,6 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0,
 		}
 		
 		$filter['id_grupo'] = $id_groups;
-		$filter['id_group'] = $id_groups;
 	}
 	else {
 		if ($strict_user) {
@@ -746,10 +741,12 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0,
 	if ($depth != 'group') {
 		if ($strict_user) {
 			$filter['group_by'] = 'tagente.nombre';
+			$filter['id_group'] = $filter['id_grupo'];
 			$fields = array ('tagente.id_grupo, tagente.nombre, tagente.id_os, tagente.id_agente, 
 						tagente.normal_count, tagente.warning_count, tagente.critical_count,
 						tagente.unknown_count, tagente.total_count, tagente.notinit_count');
 			$agents = tags_get_all_user_agents (false, $config['id_user'], $acltags, $filter, $fields, false, $strict_user, true);
+			unset($filter['id_group']);
 		} else {
 		// Get agents data
 		$agents = agents_get_agents ($filter,
@@ -1429,12 +1426,13 @@ function networkmap_open_graph ($layout, $nooverlap, $pure, $zoom, $ranksep, $fo
 	$size = $size_x . ',' . $size_y;
 	
 	// BEWARE: graphwiz DONT use single ('), you need double (")
-	$head = "graph networkmap { bgcolor=\"transparent\"; labeljust=l; margin=0; ";
+	$head = "graph networkmap { bgcolor=\"transparent\"; labeljust=l; margin=0; pad=\"0.75,0.75\";";
 	if ($nooverlap != '') {
 		$head .= "overlap=\"$overlap\";";
 		$head .= "ranksep=\"$ranksep\";";
 		$head .= "outputorder=edgesfirst;";
 	}
+	
 	$head .= "ratio=fill;";
 	$head .= "root=0;";
 	$head .= "size=\"$size\";";
@@ -1491,36 +1489,40 @@ function networkmap_get_filter ($layout) {
  * 
  * @return mixed New networkmap id if created. False if it could not be created.
  */
-function networkmap_create_networkmap ($name, $type = 'topology', $layout = 'radial', $nooverlap = true, $simple = false, $regenerate = true, $font_size = 12, $id_group = 0, $id_module_group = 0, $depth = 'all', $only_modules_with_alerts = false, $hide_policy_modules = false, $zoom = 1, $distance_nodes = 2.5, $center = 0, $text_filter = '', $dont_show_subgroups = 0, $show_groups = false, $show_modules = false, $pandoras_children = false) {
-	
+function networkmap_create_networkmap ($values) {
 	global $config;
 	
-	$values = array();
+	// The name is required
+	if (! isset($values['name']))
+		return false;
 	
-	$values['name'] = $name;
-	$values['type'] = $type;
-	$values['layout'] = $layout;
-	$values['nooverlap'] = $nooverlap;
-	$values['simple'] = $simple;
-	$values['regenerate'] = $regenerate;
-	$values['font_size'] = $font_size;
-	$values['id_group'] = $id_group;
-	$values['id_module_group'] = $id_module_group;
-	$values['depth'] = $depth;
-	$values['only_modules_with_alerts'] = $only_modules_with_alerts;
-	$values['hide_policy_modules'] = $hide_policy_modules;
-	$values['zoom'] = $zoom;
-	$values['distance_nodes'] = $distance_nodes;
-	$values['center'] = $center;
-	$values['id_user'] = $config['id_user'];
-	$values['text_filter'] = $text_filter;
-	$values['dont_show_subgroups'] = $dont_show_subgroups;
-	
-	$values['pandoras_children'] = $pandoras_children;
-	$values['show_groups'] = $show_groups;
-	$values['show_modules'] = $show_modules;
-	
-	$values['server_name'] = "";
+	// Set defaults for the empty values
+	set_unless_defined ($values['type'], 'topology');
+	set_unless_defined ($values['layout'], 'radial');
+	set_unless_defined ($values['nooverlap'], true);
+	set_unless_defined ($values['simple'], false);
+	set_unless_defined ($values['regenerate'], true);
+	set_unless_defined ($values['font_size'], 12);
+	set_unless_defined ($values['store_group'], 0);
+	set_unless_defined ($values['id_group'], 0);
+	set_unless_defined ($values['regenerate'], true);
+	set_unless_defined ($values['id_module_group'], 0);
+	set_unless_defined ($values['depth'], 'all');
+	set_unless_defined ($values['only_modules_with_alerts'], false);
+	set_unless_defined ($values['hide_policy_modules'], false);
+	set_unless_defined ($values['zoom'], 1);
+	set_unless_defined ($values['distance_nodes'], 2.5);
+	set_unless_defined ($values['center'], 0);
+	set_unless_defined ($values['id_user'], $config['id_user']);
+	set_unless_defined ($values['text_filter'], '');
+	set_unless_defined ($values['regenerate'], true);
+	set_unless_defined ($values['dont_show_subgroups'], 0);
+	set_unless_defined ($values['show_groups'], false);
+	set_unless_defined ($values['pandoras_children'], false);
+	set_unless_defined ($values['show_modules'], false);
+	set_unless_defined ($values['show_snmp_modules'], 0);
+	set_unless_defined ($values['l2_network'], 0);
+	set_unless_defined ($values['server_name'], '');
 	
 	return @db_process_sql_insert('tnetwork_map', $values);
 }
@@ -1790,14 +1792,41 @@ function networkmap_get_new_nodes_from_ip_mask($ip_mask, $fields = array(), $str
 
 ?>
 <script language="javascript" type="text/javascript">
-	/* <![CDATA[ */
 	$(document).ready (function () {
-		$("area[title!='<?php echo 'Pandora FMS'; ?>']").cluetip ({
-			arrows: true,
-			attribute: 'title',
-			cluetipClass: 'default',
-			positionBy: "bottomTop"
+		// TODO: Implement the jquery tooltip functionality everywhere
+		// and remove the cluetip code.
+		$("area[title!='<?php echo 'Pandora FMS'; ?>']")
+			.each(function (index, element) {
+				// Store the title.
+				// The title stores the url into a data property
+				$(element).data('uri', $(element).prop('title'));
+			})
+			.tooltip({
+				track: true,
+				content: '<?php html_print_image("images/spinner.gif"); ?>',
+				open: function (evt, ui) {
+					var elem = $(this);
+					var uri = elem.data('uri');
+					
+					if (typeof uri != 'undefined' && uri.length > 0) {
+						var jqXHR = $.ajax(uri).done(function(data) {
+							elem.tooltip('option', 'content', data);
+						});
+						// Store the connection handler
+						elem.data('jqXHR', jqXHR);
+					}
+					
+					$(".ui-tooltip>.ui-tooltip-content:not(.cluetip-default)")
+						.addClass("cluetip-default");
+				},
+				close: function (evt, ui) {
+					var elem = $(this);
+					var jqXHR = elem.data('jqXHR');
+					
+					// Close the connection handler
+					if (typeof jqXHR != 'undefined')
+						jqXHR.abort();
+				}
 			});
 	});
-	/* ]]> */
 </script>

pandora_console/include/functions_visual_map.php

@@ -2086,7 +2086,8 @@ function visual_map_create_internal_name_item($label = null, $type, $image, $age
 }
 
 function visual_map_get_items_parents($idVisual) {
-	$items = db_get_all_rows_filter('tlayout_data',array('id_layout' => $idVisual));
+	$items = db_get_all_rows_sql(sprintf("SELECT * FROM tlayout_data where id_layout = %s order by label",$idVisual));
+	//$items = db_get_all_fields_in_table('tlayout_data',array('id_layout' => $idVisual));
 	if ($items == false) {
 		$items = array();
 	}

pandora_console/include/graphs/functions_flot.php

@@ -721,6 +721,8 @@ function flot_slicesbar_graph ($graph_data, $period, $width, $height, $legend, $
 	$fontsize = 7;
 	
 	$extra_height = 15;
+	if (defined("METACONSOLE"))
+		$extra_height = 20;
 	
 	$return .= "<div id='extra_$graph_id' style='font-size: ".$fontsize."pt; display:none; position:absolute; overflow: auto; height: ".$extra_height."px; background:#fff; padding: 2px 2px 2px 2px; border: solid #000 1px;'></div>";
 	

pandora_console/include/help/en/help_profile.php

@@ -10,63 +10,71 @@
 
 <p>The following list defines what ACL control allows in each feature at the console:</p>
 
-<table cellpadding=4 cellspacing=0 style='background-color: #f0f0f0; border: 1px solid #acacac'>
-<tr><th style='background-color: #cacaca'>Feature<Th  style='background-color: #cacaca'>ACL Control 
+<table cellpadding=4 cellspacing=0 style='background-color: #f0f0f0;'>
+<tr><th style='background-color: #cacaca'>Feature<th style='background-color: #cacaca'>ACL Control 
 
-<tr><td>View agent data (all tabs)<td>AR
-<tr><td>Tactical view<td>AR
-<tr><td>Network map view<td>AR
-<tr><td>Group view<td>AR
-<tr><td>Visual console edition<td>RW
-<tr><td>Create report<td>RW
-<tr><td>Create user custom-defined graph<td>RW
-<tr><td>View report, visual map and/or custom graph<td>RR
-<tr><td>Apply report template<td>RR
-<tr><td>Create report template<td>RM
-<tr><td>Create incident<td>IW
-<tr><td>Read incident<td>IR
-<tr><td>Delete Incident<td>IW
-<tr><td>Become owner of another incident<td>IM
-<tr><td>Delete incident of another user<td>IM
-<tr><td>View event<td>ER
-<tr><td>Validate/Comment event<td>EW
-<tr><td>Delete event<td>EM
-<tr><td>Execute response<td>EW
-<tr><td>Create incident from event (Response)<td>EW&IW
-<tr><td>Manage response<td>PM
-<tr><td>Manage filters<td>EW
-<tr><td>Customize event columns<td>PM
-<tr><td>Change owner/Re-open event<td>EM
-<tr><td>View user<td>AR
-<tr><td>SNMP Console view<td>AR
-<tr><td>Validate traps<td>IW
-<tr><td>Message<td>IW
+<tr><td>View the agent's data (all tabs)<td>AR
+<tr><td>Tactical View<td>AR
+<tr><td>Group View<td>AR
+<tr><td>Visual console editing<td>RW
+<tr><td>Creating reports<td>RW
+<tr><td>Creating user-defined graphs<td>RW
+<tr><td>Viewing reports, visual maps and custom graphs<td>RR
+<tr><td>Applying report templates<td>RR
+<tr><td>Creating report templates<td>RM
+<tr><td>Creating incidents<td>IW
+<tr><td>Reading incidents<td>IR
+<tr><td>Deleting incidents<td>IW
+<tr><td>Becoming the owner of another user's incidents<td>IM
+<tr><td>Deleting another user's incidents<td>IM
+<tr><td>Viewing events<td>ER
+<tr><td>Validating and commenting events<td>EW
+<tr><td>Deleting events<td>EM
+<tr><td>Executing responses<td>EW
+<tr><td>Creating incidents from events (response)<td>EW&IW
+<tr><td>Managing responses<td>PM
+<tr><td>Managing filters<td>EW
+<tr><td>Customizing event columns<td>PM
+<tr><td>Changing owners / reopen event<td>EM
+<tr><td>Viewing users<td>AR
+<tr><td>SNMP Console viewing<td>AR
+<tr><td>Validating traps<td>IW
+<tr><td>Messages<td>IW
 <tr><td>Cron jobs	<td>PM
 <tr><td>Tree view	<td>AR
-<tr><td>Update manager (Operation & Admin)	<td>PM
+<tr><td>Update Manager (operation and administration)	<td>PM
 <tr><td>Extension Module Group<td>AR
-<tr><td>Agent management<td>AW
-<tr><td>Remote agent configuration management <td>AW
-<tr><td>Assign alerts to agents<td>LW
-<tr><td>Define, alter and delete alert templates, actions and commands<td>LM
-<tr><td>Group management<td>PM
-<tr><td>Create inventory modules<td>PM
-<tr><td>Module management (includes all suboptions)<td>PM
-<tr><td>Massive management operations	<td>AW
-<tr><td>Create agent<td>AW
-<tr><td>Duplicate remote configurations<td>AW
-<tr><td>Downtime management<td>AW
-<tr><td>Alert management<td>LW
-<tr><td>User management<td>UM
-<tr><td>SNMP Console management (alerts and MIB load)<td>PM
-<tr><td>Profile management<td>PM
-<tr><td>Server management<td>PM
-<tr><td>System audit<td>PM
+<tr><td>Agent Management<td>AW
+<tr><td>Remote Agent Configuration Management <td>AW
+<tr><td>Assigning alerts to agents<td>LW
+<tr><td>Defining, altering and deleting alert templates, actions and commands<td>LM
+<tr><td>Group Management<td>PM
+<tr><td>Creating inventory modules<td>PM
+<tr><td>Module Management (includes all suboptions)<td>PM
+<tr><td>Massive Management Operations	<td>AW
+<tr><td>Creating agents<td>AW
+<tr><td>Duplicating remote configurations<td>AW
+<tr><td>Downtime Management<td>AW
+<tr><td>Alert Management<td>LW
+<tr><td>User Management<td>UM
+<tr><td>SNMP Console Management (alerts and MIB loading)<td>PM
+<tr><td>Profile Management<td>PM
+<tr><td>Server Management<td>PM
+<tr><td>System Audit<td>PM
 <tr><td>Setup<td>PM
-<tr><td>Database maintance<td>DM
-<tr><td>Administrator extension menu<td>PM
-<tr><td>Search bar<td>AR
-<tr><td>Policy management<td>AW
-<tr><td>Disable agent/module/alert<td>AD
+<tr><td>Database Maintenance<td>DM
+<tr><td>Administrator Extension Menu<td>PM
+<tr><td>Search Bar<td>AR
+<tr><td>Policy Management<td>AW
+<tr><td>Disabling agents / modules / alerts<td>AD
+<tr><td>Alerts validation<td>LM&AR or AW&LW
+<tr><td>Network-map view<td>MR
+<tr><td>Network-map edition<td>MW
+<tr><td>Deletion of owned network-map<td>MW
+<tr><td>Deletion of any network-map<td>MM
+<tr><td>Visual console view<td>VR
+<tr><td>Visual console edition<td>VW
+<tr><td>Deletion of owned visual console<td>VW
+<tr><td>Deletion of any visual console<td>VM
 
 </table>

pandora_console/include/help/es/help_profile.php

@@ -13,16 +13,16 @@
 
 <br>
 
-<table cellpadding=4 cellspacing=0 style='background-color: #f0f0f0; border: 1px solid #acacac'>
-<tr><th style='background-color: #cacaca'>Operacion<Th  style='background-color: #cacaca'>Bit de acceso
+<table cellpadding=4 cellspacing=0 style='background-color: #f0f0f0;'>
+<tr><th style='background-color: #cacaca'>Operación<th style='background-color: #cacaca'>Bit de acceso
+
 <tr><td>Ver datos agente (todas las vistas)	<td>AR
 <tr><td>Vista táctica	<td>AR
-<tr><td>Vista mapas de red	<td>AR
 <tr><td>Vista de grupos	<td>AR
 <tr><td>Crear un visual console	<td>RW
 <tr><td>Crear un informe	<td>RW
-<tr><td>Crear una grafica combinada	<td>RW
-<tr><td>Ver informe, mapa, grafica, etc	<td>RR
+<tr><td>Crear una gráfica combinada	<td>RW
+<tr><td>Ver informe, gráfica, etc	<td>RR
 <tr><td>Aplicar una plantilla de informe<td>RR
 <tr><td>Crear una plantilla de informe<td>RM
 <tr><td>Crear incidente	<td>IW
@@ -34,7 +34,7 @@
 <tr><td>Validar/Comentar evento	<td>EW
 <tr><td>Borrar evento	<td>EM
 <tr><td>Ejecutar respuestas<td>EW
-<tr><td>Crear incidencia a traves del evento (Respuesta)	<td>EW&IW
+<tr><td>Crear incidencia a través del evento (Respuesta)	<td>EW&IW
 <tr><td>Gestionar respuestas<td>PM
 <tr><td>Gestionar filtros<td>EW
 <tr><td>Personalizar columnas de eventos<td>PM
@@ -47,13 +47,13 @@
 <tr><td>Tree view	<td>AR
 <tr><td>Update manager (Operación y Administración)	<td>PM
 <tr><td>Extension Module Group<td>AR
-<tr><td>Vista de gestion agente	<td>AW
+<tr><td>Vista de gestión agente	<td>AW
 <tr><td>Edición del agente y de su .conf	<td>AW
 <tr><td>Asignación de alertas ya creadas	<td>LW
 <tr><td>Definir, modificar plantillas, comandos y acciones	<td>LM
 <tr><td>Gestión de grupos	<td>PM
-<tr><td>Crear modulos de inventario	<td>PM
-<tr><td>Gestionar modulos (Incluidas todas las subopciones)<td>PM
+<tr><td>Crear módulos de inventario	<td>PM
+<tr><td>Gestionar módulos (Incluidas todas las subopciones)<td>PM
 <tr><td>Operaciones masivas	<td>AW
 <tr><td>Crear agente	<td>AW
 <tr><td>Duplicar configuración remota<td>AW
@@ -63,13 +63,18 @@
 <tr><td>Gestión de consola SNMP<td>PM
 <tr><td>Gestión de perfiles<td>PM
 <tr><td>Gestión de servidores<td>PM
-<tr><td>Auditoría del sistema (edicion y visualizacion)<td>PM
+<tr><td>Auditoría del sistema (edición y visualización)<td>PM
 <tr><td>Setup (todas las solapas inferiores incl)	<td>PM
 <tr><td>Mantenimiento de la BBDD	<td>DM
-<tr><td>Extensiones administracion	<td>PM
-<tr><td>Barra busqueda	<td>AR
+<tr><td>Extensiones administración	<td>PM
+<tr><td>Barra búsqueda	<td>AR
 <tr><td>Gestión de Políticas<td>AW
 <tr><td>Desactivar agente/módulo/alerta<td>AD
+<tr><td>Validar alertas<td>LM&AR o AW&LW
+<tr><td>Vista de mapas de red<td>MR
+<tr><td>Edición de mapas de red<td>MW
+<tr><td>Borrado de mapas de red propios<td>MW
+<tr><td>Borrado de cualquier mapa de red<td>MM
 
 </table>
 

pandora_console/include/javascript/tree/TreeController.js

@@ -46,7 +46,7 @@ TreeController = {
 						$group
 							.addClass("tree-root")
 							.hide()
-							.prepend('<img src="'+(controller.baseURL.length > 0 ? controller.baseURL : '')+'images/pandora.ico.gif" />');
+							.prepend('<img src="'+(controller.baseURL.length > 0 ? controller.baseURL : '')+'images/pandora.png" />');
 					}
 					// Normal group
 					else {

pandora_console/include/languages/ar.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 
 #: ../../godmode/menu.php:28
@@ -29388,9 +29388,6 @@ msgstr ""
 #~ msgid "Search value"
 #~ msgstr "البحث عن القيمة"
 
-#~ msgid "OID:"
-#~ msgstr "قائمة أوراكل إنترنت (OID"
-
 #~ msgid "Read message"
 #~ msgstr "قراءة رسالة"
 
@@ -29794,6 +29791,3 @@ msgstr ""
 
 #~ msgid "Total data"
 #~ msgstr "إجمالي البيانات"
-
-#~ msgid "Without permissions"
-#~ msgstr "دون تصريح"

pandora_console/include/languages/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:52+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:28+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 
 #: ../../general/links_menu.php:20 ../../godmode/menu.php:216
@@ -30237,12 +30237,6 @@ msgstr "Registres del sistema"
 #~ msgid "Id"
 #~ msgstr "Id"
 
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Max. Delay (sec) / Mòduls retard"
-
-#~ msgid "Add module macro"
-#~ msgstr "Afegir macro mòdul"
-
 #~ msgid "Database sanity tool"
 #~ msgstr "Eina de base de dades del seny"
 
@@ -30278,72 +30272,9 @@ msgstr "Registres del sistema"
 #~ msgid "Field 3"
 #~ msgstr "Camp 3"
 
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Esquerra en blanc per mòduls d'inventari de xarxa"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr ""
-#~ "Posi aquí la seva codi de seqüència de comandaments per al mòdul d'inventari"
-
-#~ msgid "Invalid license."
-#~ msgstr "Invalid llicència."
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "Si us plau, poseu-vos en contacte amb Artica en info@artica.es d'una "
-#~ "llicència vàlida."
-
-#~ msgid "Columns"
-#~ msgstr "Columnes"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Agent i la informació del monitor"
-
-#~ msgid "No servers"
-#~ msgstr "No hi ha servidors"
-
-#~ msgid "Event information"
-#~ msgstr "De l'esdeveniment"
-
-#~ msgid "Without permissions"
-#~ msgstr "Sense permisos"
-
-#~ msgid "disabled"
-#~ msgstr "Deshabilitat"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "Replicació Esdeveniments no està habilitat"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr ""
-#~ "Replicació Esdeveniments no està configurat correctament per a aquest "
-#~ "metaconsola"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "El servidor sembla estar configurat per replicar els esdeveniments, però cap "
-#~ "esdeveniment s'ha rebut encara"
-
-#~ msgid "Unknown error"
-#~ msgstr "Error desconegut"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "Classificar els agents de "
-
 #~ msgid "Search value"
 #~ msgstr "Valor de Recerca"
 
-#~ msgid "Custom data:"
-#~ msgstr "Dades personalitzats:"
-
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
-#~ msgid "Type:"
-#~ msgstr "Tipus:"
-
 #~ msgid "Update manager settings"
 #~ msgstr "Actualització de valors del gestor"
 
@@ -30369,9 +30300,6 @@ msgstr "Registres del sistema"
 #~ msgid "Code / binary directory"
 #~ msgstr "Codi / directori de binaris"
 
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "No hi ha agents en aquesta Agrupació"
-
 #~ msgid "Current directory is not writable by HTTP Server"
 #~ msgstr "Directori actual no té permisos d'escriptura pel servidor HTTP"
 

pandora_console/include/languages/cs.po

@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: cs\n"
 
@@ -29593,15 +29593,9 @@ msgstr "Soubory záznamu systému"
 #~ msgid "No layouts found"
 #~ msgstr "Nenalezena žádná rozržení"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "Search value"
 #~ msgstr "Hledaná hodnota"
 
-#~ msgid "Custom data:"
-#~ msgstr "Vlastní data:"
-
 #~ msgid "Combined image render"
 #~ msgstr "Kombinované vykreslení obrázku"
 

pandora_console/include/languages/de.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:52+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:28+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: \n"
 
@@ -31086,9 +31086,6 @@ msgstr "System-Log"
 #~ msgid "No layouts found"
 #~ msgstr "Keine Layouts gefunden"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "MinMax.Al"
 #~ msgstr "MinMax.Al"
 
@@ -31117,21 +31114,12 @@ msgstr "System-Log"
 #~ msgid "%d hour"
 #~ msgstr "%d Stunde"
 
-#~ msgid "Custom data:"
-#~ msgstr "Benutzerdefinierte Daten:"
-
 #~ msgid "Download file"
 #~ msgstr "Datei herunterladen"
 
-#~ msgid "Add module macro"
-#~ msgstr "Modulmakro hinzufügen"
-
 #~ msgid "Standard user"
 #~ msgstr "Standardbenutzer"
 
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Max. Verzögerung (Sek.) / Module verzögert"
-
 #~ msgid "Map element editor"
 #~ msgstr "Kartenelemente-Editor"
 
@@ -31306,64 +31294,6 @@ msgstr "System-Log"
 #~ msgid "Event not validate"
 #~ msgstr "Ereignis nicht bestätigen"
 
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Fügen Sie hier ihren Skript-Code für das Bestandsmodul ein."
-
-#~ msgid "Invalid license."
-#~ msgstr "Ungültige Lizenz"
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "Bitte kontaktieren Sie Artica unter info@artica.es, um eine gültige Lizenz "
-#~ "zu erhalten."
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Für Netzwerk-Bestandsmodule leer lassen."
-
-#~ msgid "Columns"
-#~ msgstr "Spalten"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Beauftragten- und Überwachungsinformation"
-
-#~ msgid "No servers"
-#~ msgstr "Keine Server"
-
-#~ msgid "Event information"
-#~ msgstr "Ereignis-Information"
-
-#~ msgid "Without permissions"
-#~ msgstr "Ohne Erlaubnisse"
-
-#~ msgid "disabled"
-#~ msgstr "deaktiviert"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "Ereignis-Replikation ist nicht eingeschaltet."
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr ""
-#~ "Ereignis-Replikation ist nicht richtig für diese Meta-Konsole konfiguriert."
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "Der Server scheint richtig für die Replizierung von Ereignissen konfiguriert "
-#~ "zu sein. Es sind bis jetzt nur noch keine Ereignisse empfangen worden."
-
-#~ msgid "Unknown error"
-#~ msgstr "Unbekannter Fehler"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "Sortiere die Beauftragten nach "
-
-#~ msgid "Type:"
-#~ msgstr "Typ :"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "Es gibt keine Beauftragten in dieser Gruppierung."
-
 #~ msgid "Checking tagente_estado table"
 #~ msgstr "Prüfe 'tagente_estado'-Tabelle"
 
@@ -31382,23 +31312,3 @@ msgstr "System-Log"
 #~ "Pandora FMS (Anzahl der Agenten und der laufenden Module). Wenn Sie das "
 #~ "unterbinden möchten, löschen Sie das Update Plugin oder die Adresse des "
 #~ "Remoteservers im Plugin."
-
-#~ msgid "Custom OID/Data"
-#~ msgstr "Benutzerdefinierte OIDs / Daten"
-
-#~ msgid "Group by OID/IP"
-#~ msgstr "Gruppieren nach OID / IP"
-
-#~ msgid "Contact Ártica ST at info@artica.es to get an auth key."
-#~ msgstr ""
-#~ "Bitte kontaktieren Sie Ártica ST durch 'info@artica.es', um einen "
-#~ "Authentisierungsschlüssel zu erhalten."
-
-#~ msgid "Modules status"
-#~ msgstr "Modulstatus"
-
-#~ msgid "Agents status"
-#~ msgstr "Agentenstatus"
-
-#~ msgid "Alerts status"
-#~ msgstr "Alarmstatus"

pandora_console/include/languages/el.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:30+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: el\n"
 

pandora_console/include/languages/en_GB.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: pandora-fms\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-24 17:21+0100\n"
-"PO-Revision-Date: 2014-10-30 12:03+0000\n"
-"Last-Translator: Vanessa <florecillasamarillas@hotmail.com>\n"
+"PO-Revision-Date: 2015-03-27 14:57+0000\n"
+"Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:30+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: \n"
 
@@ -50,7 +50,7 @@ msgstr "QR code of the page"
 #: ../../general/header.php:134 ../../general/header.php:135
 #: ../../include/functions_clippy.php:128
 msgid "Pandora FMS assistant"
-msgstr ""
+msgstr "Pandora FMS assistant"
 
 #: ../../general/header.php:160
 #: ../../enterprise/meta/general/main_header.php:298
@@ -521,6 +521,9 @@ msgid ""
 "learn more about Pandora FMS. Monitoring could be overwhelm, but take your "
 "time to learn how to use the power of Pandora FMS!"
 msgstr ""
+"If this is your first time with Pandora FMS, we propose you a few links to "
+"learn more about Pandora FMS. Monitoring could be overwhelm, but take your "
+"time to learn how to use the power of Pandora FMS!"
 
 #: ../../general/login_help_dialog.php:51
 #: ../../general/login_help_dialog.php:53
@@ -591,7 +594,7 @@ msgstr "You don't have access to this page"
 
 #: ../../general/noaccess.php:26
 msgid "Access to this page is restricted"
-msgstr ""
+msgstr "Access to this page is restricted"
 
 #: ../../general/noaccess.php:31 ../../enterprise/meta/general/noaccess.php:29
 #: ../../enterprise/meta/general/metaconsole_no_activated.php:21
@@ -605,6 +608,10 @@ msgid ""
 "\t\t\tPlease know that all attempts to access this page are recorded in "
 "security logs of Pandora System Database"
 msgstr ""
+"Access to this page is restricted to authorised users only, please contact "
+"system administrator if you need assistance. <br/> <br/>\n"
+"\t\t\tPlease know that all attempts to access this page are recorded in "
+"security logs of Pandora System Database"
 
 #: ../../general/shortcut_bar.php:165
 msgid "Press here to activate shortcut bar"
@@ -747,11 +754,11 @@ msgstr ""
 #: ../../general/login_page.php:140 ../../mobile/include/user.class.php:295
 #: ../../mobile/include/user.class.php:296
 msgid "Authenticator code"
-msgstr ""
+msgstr "Authenticator code"
 
 #: ../../general/login_page.php:146 ../../mobile/include/user.class.php:300
 msgid "Check code"
-msgstr ""
+msgstr "Check code"
 
 #: ../../general/login_page.php:154
 msgid "View details"
@@ -3869,25 +3876,25 @@ msgstr "Generated at"
 #: ../../mobile/include/user.class.php:171
 #: ../../mobile/include/user.class.php:178
 msgid "Double authentication failed"
-msgstr ""
+msgstr "Double authentication failed"
 
 #: ../../mobile/include/user.class.php:154
 msgid "Secret code not found"
-msgstr ""
+msgstr "Secret code not found"
 
 #: ../../mobile/include/user.class.php:155
 msgid "Please contact the administrator to reset your double authentication"
-msgstr ""
+msgstr "Please contact the administrator to reset your double authentication"
 
 #: ../../mobile/include/user.class.php:172 ../../index.php:217
 #: ../../enterprise/meta/index.php:236
 #: ../../include/ajax/double_auth.ajax.php:489
 msgid "Invalid code"
-msgstr ""
+msgstr "Invalid code"
 
 #: ../../mobile/include/user.class.php:179
 msgid "There was an error checking the code"
-msgstr ""
+msgstr "There was an error checking the code"
 
 #: ../../mobile/include/user.class.php:211
 msgid "Login Failed"
@@ -4262,7 +4269,7 @@ msgstr "Create"
 
 #: ../../godmode/reporting/visual_console_builder.data.php:72
 msgid "Create visual console"
-msgstr ""
+msgstr "Create visual console"
 
 #: ../../godmode/reporting/visual_console_builder.data.php:79
 #: ../../godmode/setup/os.builder.php:33
@@ -4682,11 +4689,11 @@ msgstr "Could not be created."
 
 #: ../../godmode/reporting/visual_console_builder.php:167
 msgid "Successfully multiple delete."
-msgstr ""
+msgstr "Successfully multiple delete."
 
 #: ../../godmode/reporting/visual_console_builder.php:168
 msgid "Unsuccessfull multiple delete."
-msgstr ""
+msgstr "Unsuccessfull multiple delete."
 
 #: ../../godmode/reporting/visual_console_builder.php:245
 msgid "Successfully delete."
@@ -4882,7 +4889,7 @@ msgstr "Icon"
 #: ../../include/functions_visual_map_editor.php:545
 #: ../../include/functions_visual_map.php:2035
 msgid "Box"
-msgstr ""
+msgstr "Box"
 
 #: ../../godmode/reporting/visual_console_builder.elements.php:190
 #: ../../godmode/reporting/visual_console_builder.elements.php:572
@@ -5083,7 +5090,7 @@ msgstr "Filter"
 #: ../../enterprise/meta/advanced/metasetup.translate_string.php:148
 #: ../../enterprise/meta/include/functions_networkmap_meta.php:84
 msgid "Show Options"
-msgstr ""
+msgstr "Show Options"
 
 #: ../../godmode/reporting/reporting_builder.list_items.php:270
 #: ../../godmode/agentes/module_manager.php:505
@@ -5560,7 +5567,7 @@ msgstr "Free text for search: "
 
 #: ../../godmode/reporting/reporting_builder.php:394
 msgid "Show Option"
-msgstr ""
+msgstr "Show Option"
 
 #: ../../godmode/reporting/reporting_builder.php:469
 #: ../../operation/reporting/custom_reporting.php:38
@@ -5751,7 +5758,7 @@ msgstr "Descending"
 #: ../../godmode/reporting/reporting_builder.item_editor.php:518
 #: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1020
 msgid "Item Editor"
-msgstr ""
+msgstr "Item Editor"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:537
 msgid "Not valid"
@@ -5761,7 +5768,7 @@ msgstr "Not valid"
 #: ../../enterprise/godmode/reporting/reporting_builder.global.php:188
 #: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1066
 msgid "Last value"
-msgstr ""
+msgstr "Last value"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:596
 #: ../../godmode/reporting/reporting_builder.item_editor.php:2356
@@ -5774,6 +5781,9 @@ msgid ""
 "Information contained in this kind of reports will be always reporting the "
 "most recent information"
 msgstr ""
+"Warning: period 0 reports cannot be used to show information back in time. "
+"Information contained in this kind of reports will be always reporting the "
+"most recent information"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:610
 #: ../../operation/integria_incidents/incident.incident.php:97
@@ -30650,15 +30660,9 @@ msgstr "System logfiles"
 #~ msgid "From the last"
 #~ msgstr "From the last"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "S"
 #~ msgstr "S"
 
-#~ msgid "Custom data:"
-#~ msgstr "Custom data:"
-
 #~ msgid "Search text"
 #~ msgstr "Search text"
 
@@ -30973,76 +30977,3 @@ msgstr "System logfiles"
 
 #~ msgid "Total Agents"
 #~ msgstr "Total Agents"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "Sort the agents by "
-
-#~ msgid "Type:"
-#~ msgstr "Type:"
-
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Max. Delay(sec)/Modules delayed"
-
-#~ msgid "Add module macro"
-#~ msgstr "Add module macro"
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Left blank for Network Inventory Modules."
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Please place your script code here for the inventory module."
-
-#~ msgid "Columns"
-#~ msgstr "Columns"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Agent and monitor information"
-
-#~ msgid "Event information"
-#~ msgstr "Event information"
-
-#~ msgid "No servers"
-#~ msgstr "No servers"
-
-#~ msgid "Without permissions"
-#~ msgstr "Without permissions"
-
-#~ msgid "disabled"
-#~ msgstr "Disabled"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "Event replication is not enabled"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr "Event replication is not properly configured for this metaconsole."
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "The server seems to be configured to replicate events, but no events have "
-#~ "been received yet."
-
-#~ msgid "Unknown error"
-#~ msgstr "Unknown error"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "There are no agents in this group."
-
-#~ msgid "Custom OID/Data"
-#~ msgstr "Custom OID/Data"
-
-#~ msgid "Group by OID/IP"
-#~ msgstr "Group by OID/IP"
-
-#~ msgid "Contact Ártica ST at info@artica.es to get an auth key."
-#~ msgstr "Contact Ártica ST at info@artica.es to get an auth key."
-
-#~ msgid "Invalid license."
-#~ msgstr "Invalid licence."
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr "Please contact Artica at info@artica.es for a valid licence."
-
-#~ msgid "Report group"
-#~ msgstr "Report group"

pandora_console/include/languages/es.po

@@ -10,13 +10,13 @@ msgstr ""
 "Project-Id-Version: index.es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-24 17:21+0100\n"
-"PO-Revision-Date: 2015-03-24 16:46+0000\n"
-"Last-Translator: Vanessa <florecillasamarillas@hotmail.com>\n"
+"PO-Revision-Date: 2015-03-31 09:50+0000\n"
+"Last-Translator: Carlos Moreno <carlos.moreno@artica.es>\n"
 "Language-Team: Español; Castellano <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:52+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:28+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: \n"
 
@@ -597,7 +597,7 @@ msgstr "No tiene permiso para acceder a esta página"
 
 #: ../../general/noaccess.php:26
 msgid "Access to this page is restricted"
-msgstr ""
+msgstr "El acceso a esta página es restringido"
 
 #: ../../general/noaccess.php:31 ../../enterprise/meta/general/noaccess.php:29
 #: ../../enterprise/meta/general/metaconsole_no_activated.php:21
@@ -3890,7 +3890,7 @@ msgstr ""
 #: ../../enterprise/meta/index.php:236
 #: ../../include/ajax/double_auth.ajax.php:489
 msgid "Invalid code"
-msgstr ""
+msgstr "Código inválido"
 
 #: ../../mobile/include/user.class.php:179
 msgid "There was an error checking the code"
@@ -4269,7 +4269,7 @@ msgstr "Crear"
 
 #: ../../godmode/reporting/visual_console_builder.data.php:72
 msgid "Create visual console"
-msgstr ""
+msgstr "Crear consola visual"
 
 #: ../../godmode/reporting/visual_console_builder.data.php:79
 #: ../../godmode/setup/os.builder.php:33
@@ -5090,7 +5090,7 @@ msgstr "Filtro"
 #: ../../enterprise/meta/advanced/metasetup.translate_string.php:148
 #: ../../enterprise/meta/include/functions_networkmap_meta.php:84
 msgid "Show Options"
-msgstr ""
+msgstr "Mostrar opciones"
 
 #: ../../godmode/reporting/reporting_builder.list_items.php:270
 #: ../../godmode/agentes/module_manager.php:505
@@ -5567,7 +5567,7 @@ msgstr "Texto libre de búsqueda "
 
 #: ../../godmode/reporting/reporting_builder.php:394
 msgid "Show Option"
-msgstr ""
+msgstr "Mostrar Opciones"
 
 #: ../../godmode/reporting/reporting_builder.php:469
 #: ../../operation/reporting/custom_reporting.php:38
@@ -5768,7 +5768,7 @@ msgstr "No válida"
 #: ../../enterprise/godmode/reporting/reporting_builder.global.php:188
 #: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1066
 msgid "Last value"
-msgstr ""
+msgstr "Último valor"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:596
 #: ../../godmode/reporting/reporting_builder.item_editor.php:2356
@@ -6193,7 +6193,7 @@ msgstr "Media"
 #: ../../godmode/reporting/reporting_builder.item_editor.php:1043
 #: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1313
 msgid "Only average"
-msgstr ""
+msgstr "Solo media"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:1047
 #: ../../godmode/massive/massive_edit_modules.php:440
@@ -6851,11 +6851,11 @@ msgstr "Actualizar perfil"
 
 #: ../../godmode/users/configure_profile.php:148
 msgid "Update Profile"
-msgstr ""
+msgstr "Actualizar Perfil"
 
 #: ../../godmode/users/configure_profile.php:150
 msgid "Create Profile"
-msgstr ""
+msgstr "Crear Perfil"
 
 #: ../../godmode/users/configure_profile.php:159
 #: ../../godmode/users/configure_user.php:613
@@ -7153,11 +7153,11 @@ msgstr "El perfil no se puede añadir"
 
 #: ../../godmode/users/configure_user.php:422
 msgid "Update User"
-msgstr ""
+msgstr "Actualizar Usuario"
 
 #: ../../godmode/users/configure_user.php:425
 msgid "Create User"
-msgstr ""
+msgstr "Crear Usuario"
 
 #: ../../godmode/users/configure_user.php:442
 #: ../../operation/users/user_edit.php:200
@@ -7320,7 +7320,7 @@ msgstr "El usuario sin permiso de acceso solo puede tener acceso al API"
 
 #: ../../godmode/users/configure_user.php:539
 msgid "Strict ACL"
-msgstr ""
+msgstr "ACL Estricto"
 
 #: ../../godmode/users/configure_user.php:540
 msgid ""
@@ -8114,7 +8114,7 @@ msgstr "No se selección ningún agente"
 
 #: ../../godmode/massive/massive_delete_tags.php:107
 msgid "No tag selected"
-msgstr ""
+msgstr "Ninguna etiqueta seleccionada"
 
 #: ../../godmode/massive/massive_edit_agents.php:95
 msgid "No values changed"
@@ -8535,7 +8535,7 @@ msgstr "Alertas en standby"
 
 #: ../../godmode/massive/massive_add_tags.php:43
 msgid "No tags selected"
-msgstr ""
+msgstr "Ninguna etiqueta seleccionada"
 
 #: ../../godmode/massive/massive_delete_profiles.php:61
 msgid "Not deleted. You must select an existing user"
@@ -9006,7 +9006,7 @@ msgstr "Categoría creada con éxito"
 
 #: ../../godmode/category/edit_category.php:139
 msgid "Update category"
-msgstr ""
+msgstr "Actualizar categoría"
 
 #: ../../godmode/category/edit_category.php:148
 #: ../../godmode/category/category.php:98
@@ -9458,11 +9458,11 @@ msgstr "No se encontraron respuestas"
 
 #: ../../godmode/events/event_edit_filter.php:166
 msgid "Update Filter"
-msgstr ""
+msgstr "Actualizar Filtro"
 
 #: ../../godmode/events/event_edit_filter.php:169
 msgid "Create Filter"
-msgstr ""
+msgstr "Crear filtro"
 
 #: ../../godmode/events/event_edit_filter.php:179
 #: ../../operation/events/events_list.php:234
@@ -9590,7 +9590,7 @@ msgstr "Respuestas"
 
 #: ../../godmode/events/event_responses.editor.php:63
 msgid "Edit event responses"
-msgstr ""
+msgstr "Editar respuestas de eventos"
 
 #: ../../godmode/events/event_responses.editor.php:93
 #: ../../enterprise/extensions/ipam/ipam_network.php:125
@@ -10529,7 +10529,7 @@ msgstr ""
 #: ../../godmode/agentes/module_manager_editor.php:467
 #: ../../godmode/agentes/module_manager_editor_common.php:579
 msgid "Custom macros"
-msgstr ""
+msgstr "Macros personalizadas"
 
 #: ../../godmode/agentes/module_manager_editor.php:469
 msgid "Module relations"
@@ -10602,11 +10602,11 @@ msgstr "Los ficheros conf o md5 han podido no ser borrados"
 
 #: ../../godmode/agentes/modificar_agente.php:143
 msgid "Show Agents"
-msgstr ""
+msgstr "Mostrar Agentes"
 
 #: ../../godmode/agentes/modificar_agente.php:145
 msgid "Everyone"
-msgstr ""
+msgstr "Todos"
 
 #: ../../godmode/agentes/modificar_agente.php:146
 msgid "Only disabled"
@@ -11392,7 +11392,7 @@ msgstr "Solo debe establecerse este valor en los módulos asíncronos"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:501
 msgid "Tags from policy"
-msgstr ""
+msgstr "Etiquetas desde política"
 
 #: ../../godmode/agentes/module_manager_editor_common.php:514
 msgid "The module still stores data but the alerts and events will be stop"
@@ -13296,13 +13296,13 @@ msgstr ""
 #: ../../enterprise/meta/advanced/metasetup.visual.php:167
 #: ../../enterprise/meta/include/functions_meta.php:414
 msgid "Show only the group name"
-msgstr ""
+msgstr "Mostrar solo el nombre del grupo"
 
 #: ../../godmode/setup/setup_visuals.php:482
 #: ../../enterprise/meta/advanced/metasetup.visual.php:169
 #: ../../include/functions_config.php:457
 msgid "Show the group name instead the group icon."
-msgstr ""
+msgstr "Mostrar el nombre del grupo en lugar de icono del grupo"
 
 #: ../../godmode/setup/setup_visuals.php:492
 #: ../../include/functions_config.php:459
@@ -13635,11 +13635,11 @@ msgstr "Etiqueta creada satisfactoriamente"
 
 #: ../../godmode/tag/edit_tag.php:159
 msgid "Update Tag"
-msgstr ""
+msgstr "Actualizar Etiqueta"
 
 #: ../../godmode/tag/edit_tag.php:162
 msgid "Create Tag"
-msgstr ""
+msgstr "Crear etiqueta"
 
 #: ../../godmode/tag/edit_tag.php:183
 #: ../../enterprise/meta/monitoring/wizard/wizard.php:108
@@ -13702,7 +13702,7 @@ msgstr "URL update manager"
 
 #: ../../godmode/update_manager/update_manager.setup.php:65
 msgid "Proxy server:"
-msgstr ""
+msgstr "Servidor Proxy:"
 
 #: ../../godmode/update_manager/update_manager.setup.php:67
 msgid "Proxy server"
@@ -13710,7 +13710,7 @@ msgstr "Servidor proxy"
 
 #: ../../godmode/update_manager/update_manager.setup.php:69
 msgid "Proxy port:"
-msgstr ""
+msgstr "Puerto Proxy:"
 
 #: ../../godmode/update_manager/update_manager.setup.php:71
 msgid "Proxy port"
@@ -13726,7 +13726,7 @@ msgstr "Usuario del proxy"
 
 #: ../../godmode/update_manager/update_manager.setup.php:77
 msgid "Proxy password:"
-msgstr ""
+msgstr "Contraseña del Proxy:"
 
 #: ../../godmode/update_manager/update_manager.setup.php:79
 msgid "Proxy password"
@@ -13942,11 +13942,11 @@ msgstr "Actualizar grupo"
 
 #: ../../godmode/groups/configure_group.php:105
 msgid "Update Group"
-msgstr ""
+msgstr "Actualizar Grupo"
 
 #: ../../godmode/groups/configure_group.php:107
 msgid "Create Group"
-msgstr ""
+msgstr "Crear Grupo"
 
 #: ../../godmode/groups/configure_group.php:140
 msgid "You have not access to the parent."
@@ -14405,7 +14405,7 @@ msgstr "Configurar acción de alerta"
 
 #: ../../godmode/alerts/configure_alert_action.php:97
 msgid "Update Action"
-msgstr ""
+msgstr "Actualizar Acción"
 
 #: ../../godmode/alerts/configure_alert_action.php:100
 #: ../../godmode/alerts/alert_list.builder.php:126
@@ -15624,7 +15624,7 @@ msgstr "Volver a modo normal"
 
 #: ../../operation/reporting/reporting_viewer.php:140
 msgid "View Report"
-msgstr ""
+msgstr "Ver Informe"
 
 #: ../../operation/reporting/reporting_viewer.php:170
 #: ../../enterprise/include/functions_reporting_pdf.php:3988
@@ -15956,7 +15956,7 @@ msgstr "Error al actualizar la información del usuario"
 
 #: ../../operation/users/user_edit.php:191
 msgid "Edit my User"
-msgstr ""
+msgstr "Editar mi Usuario"
 
 #: ../../operation/users/user_edit.php:233
 msgid "New Password"
@@ -16026,7 +16026,7 @@ msgstr "Detalle de alertas"
 
 #: ../../operation/users/user_edit.php:357
 msgid "Show information"
-msgstr ""
+msgstr "Mostrar información"
 
 #: ../../operation/users/user_edit.php:388
 msgid ""
@@ -16855,7 +16855,7 @@ msgstr "Estado del módulo"
 
 #: ../../operation/tree.php:168
 msgid "Search module"
-msgstr ""
+msgstr "Buscar módulo"
 
 #: ../../operation/tree.php:193
 msgid "Tree search"
@@ -16876,23 +16876,23 @@ msgstr "Alertas disparadas"
 
 #: ../../operation/tree.php:289
 msgid "Critical agents"
-msgstr ""
+msgstr "Agentes Críticos"
 
 #: ../../operation/tree.php:294
 msgid "Warning agents"
-msgstr ""
+msgstr "Agentes en advertencia"
 
 #: ../../operation/tree.php:299
 msgid "Unknown agents"
-msgstr ""
+msgstr "Agentes en desconocido"
 
 #: ../../operation/tree.php:304
 msgid "Not init agents"
-msgstr ""
+msgstr "Agentes no inicializados"
 
 #: ../../operation/tree.php:309
 msgid "Normal agents"
-msgstr ""
+msgstr "Agentes en normal"
 
 #: ../../operation/agentes/gis_view.php:93
 msgid "Last position in "
@@ -17099,7 +17099,7 @@ msgstr ""
 
 #: ../../operation/agentes/networkmap_list.php:370
 msgid "None selected"
-msgstr ""
+msgstr "Nada seleccionado"
 
 #: ../../operation/agentes/custom_fields.php:28
 #: ../../operation/agentes/agent_fields.php:28
@@ -17274,7 +17274,7 @@ msgstr "Agente desconocido"
 #: ../../operation/agentes/group_view.php:90
 #: ../../include/functions_reporting.php:8163
 msgid "Agents not init"
-msgstr ""
+msgstr "Agentes no inicializados"
 
 #: ../../operation/agentes/group_view.php:92
 msgid "Not Init"
@@ -17564,7 +17564,7 @@ msgstr "Lista completa de monitores"
 
 #: ../../operation/agentes/estado_monitores.php:150
 msgid "List of modules"
-msgstr ""
+msgstr "Lista de módulos"
 
 #: ../../operation/agentes/estado_monitores.php:422
 msgid "Status:"
@@ -17664,7 +17664,7 @@ msgstr "Estado del monitor"
 
 #: ../../operation/agentes/status_monitor.php:542
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opciones Avanzadas"
 
 #: ../../operation/agentes/status_monitor.php:984
 #: ../../operation/search_modules.php:52
@@ -18445,11 +18445,11 @@ msgstr "La operación no puedo completarse"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_advanced.php:107
 msgid "Advance Options"
-msgstr ""
+msgstr "Opciones Avanzadas"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.advanced.php:69
 msgid "Advance Reporting"
-msgstr ""
+msgstr "Opciones Avanzadas"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_editor.php:101
 #: ../../enterprise/godmode/reporting/reporting_builder.template.php:79
@@ -18611,7 +18611,7 @@ msgstr "No se pudo aplicar"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:221
 msgid "Create template report wizard"
-msgstr ""
+msgstr "Creación de informe con Asistente de Plantillas"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:261
 #: ../../enterprise/godmode/reporting/graph_template_wizard.php:142
@@ -18636,7 +18636,7 @@ msgstr "Grupo de destino"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:310
 msgid "Filter by"
-msgstr ""
+msgstr "Filtrar por"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:366
 #: ../../enterprise/godmode/reporting/graph_template_wizard.php:162
@@ -18648,7 +18648,7 @@ msgstr "Filtrar agente"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:373
 msgid "Filter tag"
-msgstr ""
+msgstr "Filtro etiqueta"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:385
 #: ../../enterprise/godmode/reporting/graph_template_wizard.php:173
@@ -18908,11 +18908,11 @@ msgstr ""
 
 #: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:102
 msgid "Tags unused"
-msgstr ""
+msgstr "Etiquetas sin usar"
 
 #: ../../enterprise/godmode/massive/massive_edit_tags_policy.php:118
 msgid "Tags used"
-msgstr ""
+msgstr "Etiquetas usadas"
 
 #: ../../enterprise/godmode/massive/massive_delete_alerts_snmp.php:165
 #: ../../enterprise/godmode/massive/massive_modify_alerts_snmp.php:216
@@ -21428,7 +21428,7 @@ msgstr "Pendiente de generar"
 
 #: ../../enterprise/operation/agentes/networkmap_enterprise.php:249
 msgid "There are no maps defined."
-msgstr ""
+msgstr "No hay mapas definidos."
 
 #: ../../enterprise/operation/agentes/networkmap_enterprise.php:259
 #: ../../enterprise/meta/include/functions_networkmap_meta.php:180
@@ -21532,11 +21532,12 @@ msgstr "(Adoptados)(Desvinculados)"
 
 #: ../../enterprise/load_enterprise.php:306
 msgid "Invalid licence."
-msgstr ""
+msgstr "Licencia inválida"
 
 #: ../../enterprise/load_enterprise.php:307
 msgid "Please contact Artica at info@artica.es for a valid licence."
 msgstr ""
+"Por favor contacte con Ártica en info@artica.es para una licencia válida."
 
 #: ../../enterprise/load_enterprise.php:309
 msgid "Or disable Pandora FMS enterprise"
@@ -21601,11 +21602,11 @@ msgstr ""
 
 #: ../../enterprise/load_enterprise.php:666
 msgid "E-mail:"
-msgstr ""
+msgstr "E-mail:"
 
 #: ../../enterprise/load_enterprise.php:670
 msgid "Contact:"
-msgstr ""
+msgstr "Contacto:"
 
 #: ../../enterprise/load_enterprise.php:674
 msgid "Auth Key:"
@@ -21618,7 +21619,7 @@ msgstr ""
 
 #: ../../enterprise/load_enterprise.php:690
 msgid "ERROR:"
-msgstr ""
+msgstr "ERROR:"
 
 #: ../../enterprise/load_enterprise.php:690
 msgid "When connecting to Artica server."
@@ -21736,11 +21737,11 @@ msgstr "Vista de grupo"
 
 #: ../../enterprise/meta/monitoring/group_view.php:74
 msgid "Summary of the status groups"
-msgstr ""
+msgstr "Resumen de los grupos por estatus"
 
 #: ../../enterprise/meta/monitoring/group_view.php:94
 msgid "Group or Tag"
-msgstr ""
+msgstr "Grupo o Etiqueta"
 
 #: ../../enterprise/meta/monitoring/wizard/wizard.create_agent.php:40
 #: ../../enterprise/meta/monitoring/wizard/wizard.module.web.php:84
@@ -21897,15 +21898,15 @@ msgstr "Vista táctica"
 
 #: ../../enterprise/meta/monitoring/tactical.php:215
 msgid "Report of state"
-msgstr ""
+msgstr "Informe de estado"
 
 #: ../../enterprise/meta/monitoring/tactical.php:340
 msgid "Report of events (last hour)"
-msgstr ""
+msgstr "Informe de eventos (última hora)"
 
 #: ../../enterprise/meta/monitoring/tactical.php:356
 msgid "Info of state in events (last hour)"
-msgstr ""
+msgstr "Información del estado en los eventos (última hora)"
 
 #: ../../enterprise/meta/monitoring/tactical.php:371
 msgid "More events"
@@ -21973,7 +21974,7 @@ msgstr "No se puede mover"
 
 #: ../../enterprise/meta/advanced/agents_setup.move_agents.php:124
 msgid "Move Agents"
-msgstr ""
+msgstr "Mover Agentes"
 
 #: ../../enterprise/meta/advanced/agents_setup.move_agents.php:137
 msgid "Source Server"
@@ -22181,7 +22182,7 @@ msgstr "Sólo bases de datos"
 
 #: ../../enterprise/meta/advanced/policymanager.apply.php:188
 msgid "Apply Policies"
-msgstr ""
+msgstr "Aplicar Políticas"
 
 #: ../../enterprise/meta/advanced/synchronizing.user.php:215
 #, php-format
@@ -22225,7 +22226,7 @@ msgstr ""
 
 #: ../../enterprise/meta/advanced/synchronizing.user.php:498
 msgid "Synchronizing Users"
-msgstr ""
+msgstr "Sincronizando Usuarios"
 
 #: ../../enterprise/meta/advanced/synchronizing.user.php:553
 msgid "Profile mode"
@@ -22334,7 +22335,7 @@ msgstr "Creadas/actualizadas %s/%s plantillas"
 
 #: ../../enterprise/meta/advanced/synchronizing.alert.php:324
 msgid "Synchronizing Alerts"
-msgstr ""
+msgstr "Sincronizando Alertas"
 
 #: ../../enterprise/meta/advanced/synchronizing.group.php:103
 #, php-format
@@ -22384,7 +22385,7 @@ msgstr "NInguna actualización o creación de grupo"
 
 #: ../../enterprise/meta/advanced/synchronizing.group.php:227
 msgid "Synchronizing Groups"
-msgstr ""
+msgstr "Sincronizando Grupos"
 
 #: ../../enterprise/meta/advanced/synchronizing.tag.php:124
 #, php-format
@@ -22398,7 +22399,7 @@ msgstr "Creados/actualizados %s/%s tags"
 
 #: ../../enterprise/meta/advanced/synchronizing.tag.php:138
 msgid "Synchronizing Tags"
-msgstr ""
+msgstr "Sincronizando Etiquetas"
 
 #: ../../enterprise/meta/advanced/metasetup.php:49
 msgid "Consoles Setup"
@@ -22930,7 +22931,7 @@ msgstr "Gracias por usar Pandora FMS"
 
 #: ../../enterprise/dashboard/widgets/tree_view.php:24
 msgid "Show the tree view"
-msgstr ""
+msgstr "Mostrar la vista de árbol"
 
 #: ../../enterprise/dashboard/widgets/tree_view.php:27
 #: ../../enterprise/dashboard/widgets/url.php:26
@@ -25155,11 +25156,11 @@ msgstr "Siguiente IP disponible"
 
 #: ../../enterprise/extensions/check_acls.php:16
 msgid "ACL users for this agent"
-msgstr ""
+msgstr "Usuarios ACL para este agente"
 
 #: ../../enterprise/extensions/check_acls.php:100
 msgid "There are no defined users"
-msgstr ""
+msgstr "No hay usuarios definidos"
 
 #: ../../enterprise/extensions/check_acls.php:104
 msgid "ACL module tags for the modules in this agent"
@@ -25175,7 +25176,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/check_acls.php:201
 msgid "Check ACL"
-msgstr ""
+msgstr "Chequear ACL"
 
 #: ../../enterprise/extensions/backup/main.php:53
 msgid "Pandora database backup utility"
@@ -25401,7 +25402,7 @@ msgstr "No existe un agente con este nombre"
 
 #: ../../include/functions_api.php:886
 msgid "Does not exist module with this name."
-msgstr ""
+msgstr "No existe módulos con este nombre."
 
 #: ../../include/functions_api.php:1231
 msgid "Correct Delete"
@@ -28374,20 +28375,20 @@ msgstr "Estado actual"
 
 #: ../../include/functions_reporting.php:8137
 msgid "Agents critical"
-msgstr ""
+msgstr "Agentes críticos"
 
 #: ../../include/functions_reporting.php:8142
 msgid "Agents warning"
-msgstr ""
+msgstr "Agentes warning"
 
 #: ../../include/functions_reporting.php:8150
 msgid "Agents ok"
-msgstr ""
+msgstr "Agentes ok"
 
 #: ../../include/functions_reporting.php:8176
 #: ../../include/functions_reporting.php:8185
 msgid "Agents by status"
-msgstr ""
+msgstr "Agentes por estado"
 
 #: ../../include/functions_reporting.php:8231
 #: ../../include/functions_reporting.php:8239
@@ -28397,29 +28398,29 @@ msgstr "Resumen de nodos"
 #: ../../include/functions_reporting.php:8263
 #: ../../include/functions_reporting.php:8286
 msgid "Warning events"
-msgstr ""
+msgstr "Eventos en advertencia"
 
 #: ../../include/functions_reporting.php:8269
 #: ../../include/functions_reporting.php:8290
 msgid "OK events"
-msgstr ""
+msgstr "Eventos OK"
 
 #: ../../include/functions_reporting.php:8275
 #: ../../include/functions_reporting.php:8294
 msgid "Unknown events"
-msgstr ""
+msgstr "Eventos desconocidos"
 
 #: ../../include/functions_reporting.php:8343
 msgid "Last activity in Pandora FMS console"
-msgstr ""
+msgstr "Última actividad en la consola de Pandora FMS"
 
 #: ../../include/functions_reporting.php:8463
 msgid "Events info (1hr.)"
-msgstr ""
+msgstr "Información de Eventos (1hr.)"
 
 #: ../../include/functions_reporting.php:8476
 msgid "Events info (1hr)"
-msgstr ""
+msgstr "Información de Eventos (1hr.)"
 
 #: ../../include/graphs/functions_flot.php:302
 msgid "Cancel zoom"
@@ -28509,7 +28510,7 @@ msgstr ""
 #: ../../include/ajax/double_auth.ajax.php:203
 #: ../../include/ajax/double_auth.ajax.php:294
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #: ../../include/ajax/double_auth.ajax.php:219
 msgid "Are you installed the app yet?"
@@ -28856,7 +28857,7 @@ msgstr ""
 
 #: ../../include/class/Tree.class.php:1281
 msgid "NO DATA"
-msgstr ""
+msgstr "SIN DATOS"
 
 #: ../../include/functions_visual_map.php:823
 msgid "Last value: "
@@ -28931,7 +28932,7 @@ msgstr "Ir a \"editar agentes\""
 
 #: ../../include/functions_treeview.php:433
 msgid "Agent data"
-msgstr ""
+msgstr "Datos de agentes"
 
 #: ../../include/functions_treeview.php:506
 msgid "Advanced information"
@@ -29832,7 +29833,7 @@ msgstr "Vista de Agentes/Alertas"
 
 #: ../../extensions/db_status.php:43 ../../extensions/db_status.php:365
 msgid "DB Status"
-msgstr ""
+msgstr "Estado BD"
 
 #: ../../extensions/db_status.php:56
 msgid ""
@@ -29846,7 +29847,7 @@ msgstr ""
 
 #: ../../extensions/db_status.php:63
 msgid "DB settings"
-msgstr ""
+msgstr "Configuración BD"
 
 #: ../../extensions/db_status.php:67
 msgid "DB User with privileges"
@@ -31229,15 +31230,9 @@ msgstr "Logs sistema"
 #~ msgid "hour"
 #~ msgstr "hora"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "Manage SNMP console"
 #~ msgstr "Consola SNMP"
 
-#~ msgid "Custom data:"
-#~ msgstr "Datos personalizados:"
-
 #~ msgid ""
 #~ "Pandora FMS Sanity tool is used to remove bad database structure data, "
 #~ "created modules with missing status, or modules that cannot be initialized "
@@ -31255,91 +31250,3 @@ msgstr "Logs sistema"
 #~ "datos esta también implementada en <b>Pandora_db.pl</b> de modo que debería "
 #~ "ejecutarla cada día o cada semana. Esta herramienta no COMPACTA O REDUCE su "
 #~ "base de datos, solo elimina las estructuras corruptas."
-
-#~ msgid "Sort the agents by "
-#~ msgstr "Listar los agentes por "
-
-#~ msgid "Type:"
-#~ msgstr "Tipo:"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "No hay agentes en esta agrupación"
-
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Max. Demora (Sec)/Modulos retrasados"
-
-#~ msgid "Add module macro"
-#~ msgstr "Añadir macro de módulo"
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Módulos de inventario de red en blanco"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Introduzca aquí el código de script para el módulo de inventario"
-
-#~ msgid "Invalid license."
-#~ msgstr "Licencia no válida"
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "Por favor, póngase en contacto con info@artica.es para obtener una licencia "
-#~ "válida."
-
-#~ msgid "Columns"
-#~ msgstr "Columnas"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Información sobre el agente y el monitor"
-
-#~ msgid "Event information"
-#~ msgstr "Información del evento"
-
-#~ msgid "No servers"
-#~ msgstr "No hay servidores"
-
-#~ msgid "Without permissions"
-#~ msgstr "Sin permisos"
-
-#~ msgid "disabled"
-#~ msgstr "desactivado"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "La replicación de eventos no está habilitada"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr ""
-#~ "La replicación eventos no está configurado correctamente para esta "
-#~ "metaconsola"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "El servidor parece estar configurado para replicar eventos, pero no se han "
-#~ "recibido eventos todavía"
-
-#~ msgid "Unknown error"
-#~ msgstr "Error desconocido"
-
-#~ msgid "Custom OID/Data"
-#~ msgstr "OID/Data Personalizado"
-
-#~ msgid "Contact Ártica ST at info@artica.es to get an auth key."
-#~ msgstr ""
-#~ "Contactar con Artica ST en info@artica.es para obtener una clave de "
-#~ "autenticación"
-
-#~ msgid "Group by OID/IP"
-#~ msgstr "Agrupar por OID/IP"
-
-#~ msgid "Report group"
-#~ msgstr "Informe de grupo"
-
-#~ msgid "Modules status"
-#~ msgstr "Estado de los módulos"
-
-#~ msgid "Agents status"
-#~ msgstr "Estado de los agentes"
-
-#~ msgid "Alerts status"
-#~ msgstr "Estado de las alertas"

pandora_console/include/languages/fr.po

@@ -9,13 +9,13 @@ msgstr ""
 "Project-Id-Version: pandora-fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-03-24 17:21+0100\n"
-"PO-Revision-Date: 2014-10-01 22:06+0000\n"
-"Last-Translator: katalina rodriguez <Unknown>\n"
+"PO-Revision-Date: 2015-03-29 11:01+0000\n"
+"Last-Translator: Jean Marc <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:52+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:28+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: fr\n"
 
@@ -61,12 +61,12 @@ msgstr "Pret"
 
 #: ../../general/header.php:107 ../../general/header.php:108
 msgid "QR Code of the page"
-msgstr ""
+msgstr "Code QR de la page"
 
 #: ../../general/header.php:112
 #: ../../operation/visual_console/public_console.php:104
 msgid "QR code of the page"
-msgstr ""
+msgstr "Code QR de la page"
 
 #: ../../general/header.php:134 ../../general/header.php:135
 #: ../../include/functions_clippy.php:128
@@ -614,7 +614,7 @@ msgstr "Vous n'avez pas l'autorisation pour accéder à cette page"
 
 #: ../../general/noaccess.php:26
 msgid "Access to this page is restricted"
-msgstr ""
+msgstr "L'accès à cette page est limité"
 
 #: ../../general/noaccess.php:31 ../../enterprise/meta/general/noaccess.php:29
 #: ../../enterprise/meta/general/metaconsole_no_activated.php:21
@@ -3877,7 +3877,7 @@ msgstr ""
 
 #: ../../mobile/include/user.class.php:154
 msgid "Secret code not found"
-msgstr ""
+msgstr "Code secret introuvable"
 
 #: ../../mobile/include/user.class.php:155
 msgid "Please contact the administrator to reset your double authentication"
@@ -3887,7 +3887,7 @@ msgstr ""
 #: ../../enterprise/meta/index.php:236
 #: ../../include/ajax/double_auth.ajax.php:489
 msgid "Invalid code"
-msgstr ""
+msgstr "Code non valide"
 
 #: ../../mobile/include/user.class.php:179
 msgid "There was an error checking the code"
@@ -5088,7 +5088,7 @@ msgstr "Filtre"
 #: ../../enterprise/meta/advanced/metasetup.translate_string.php:148
 #: ../../enterprise/meta/include/functions_networkmap_meta.php:84
 msgid "Show Options"
-msgstr ""
+msgstr "Afficher les options"
 
 #: ../../godmode/reporting/reporting_builder.list_items.php:270
 #: ../../godmode/agentes/module_manager.php:505
@@ -5504,7 +5504,7 @@ msgstr ""
 
 #: ../../godmode/reporting/reporting_builder.php:78
 msgid "An error has ocurred"
-msgstr ""
+msgstr "Une erreur s'est produite"
 
 #: ../../godmode/reporting/reporting_builder.php:279
 #: ../../godmode/reporting/reporting_builder.php:1568
@@ -5569,7 +5569,7 @@ msgstr "Texte libre pour la recherche: "
 
 #: ../../godmode/reporting/reporting_builder.php:394
 msgid "Show Option"
-msgstr ""
+msgstr "Afficher les options"
 
 #: ../../godmode/reporting/reporting_builder.php:469
 #: ../../operation/reporting/custom_reporting.php:38
@@ -5770,7 +5770,7 @@ msgstr "Non valide"
 #: ../../enterprise/godmode/reporting/reporting_builder.global.php:188
 #: ../../enterprise/godmode/reporting/reporting_builder.template_item.php:1066
 msgid "Last value"
-msgstr ""
+msgstr "Dernière valeur"
 
 #: ../../godmode/reporting/reporting_builder.item_editor.php:596
 #: ../../godmode/reporting/reporting_builder.item_editor.php:2356
@@ -6857,7 +6857,7 @@ msgstr ""
 
 #: ../../godmode/users/configure_profile.php:150
 msgid "Create Profile"
-msgstr ""
+msgstr "Créer le profil"
 
 #: ../../godmode/users/configure_profile.php:159
 #: ../../godmode/users/configure_user.php:613
@@ -7160,7 +7160,7 @@ msgstr ""
 
 #: ../../godmode/users/configure_user.php:425
 msgid "Create User"
-msgstr ""
+msgstr "Créer l'utilisateur"
 
 #: ../../godmode/users/configure_user.php:442
 #: ../../operation/users/user_edit.php:200
@@ -7944,14 +7944,14 @@ msgstr "Tout changement d'état"
 #: ../../godmode/agentes/module_manager_editor_common.php:277
 #: ../../enterprise/godmode/modules/configure_local_component.php:253
 msgid "To normal"
-msgstr ""
+msgstr "À la normale"
 
 #: ../../godmode/massive/massive_edit_modules.php:476
 #: ../../godmode/modules/manage_network_components_form_common.php:140
 #: ../../godmode/agentes/module_manager_editor_common.php:279
 #: ../../enterprise/godmode/modules/configure_local_component.php:255
 msgid "To warning"
-msgstr ""
+msgstr "Pour avertissement"
 
 #: ../../godmode/massive/massive_edit_modules.php:477
 #: ../../godmode/modules/manage_network_components_form_common.php:142
@@ -9465,7 +9465,7 @@ msgstr ""
 
 #: ../../godmode/events/event_edit_filter.php:169
 msgid "Create Filter"
-msgstr ""
+msgstr "Créer le filtre"
 
 #: ../../godmode/events/event_edit_filter.php:179
 #: ../../operation/events/events_list.php:234
@@ -9903,7 +9903,7 @@ msgstr "Exécution"
 #: ../../godmode/agentes/planned_downtime.editor.php:334
 #: ../../godmode/agentes/planned_downtime.list.php:252
 msgid "Once"
-msgstr ""
+msgstr "Une fois"
 
 #: ../../godmode/agentes/planned_downtime.editor.php:335
 #: ../../godmode/agentes/planned_downtime.list.php:252
@@ -10614,7 +10614,7 @@ msgstr ""
 
 #: ../../godmode/agentes/modificar_agente.php:145
 msgid "Everyone"
-msgstr ""
+msgstr "Tout le monde"
 
 #: ../../godmode/agentes/modificar_agente.php:146
 msgid "Only disabled"
@@ -12749,11 +12749,11 @@ msgstr ""
 
 #: ../../godmode/setup/setup_general.php:247
 msgid "On demand"
-msgstr ""
+msgstr "À la demande"
 
 #: ../../godmode/setup/setup_general.php:248
 msgid "Expert"
-msgstr ""
+msgstr "Expert"
 
 #: ../../godmode/setup/setup_general.php:250
 #: ../../include/functions_config.php:186
@@ -13329,7 +13329,7 @@ msgstr ""
 
 #: ../../godmode/setup/news.php:173 ../../godmode/setup/news.php:224
 msgid "Expiration"
-msgstr ""
+msgstr "Expiration"
 
 #: ../../godmode/setup/news.php:215
 msgid "There are no defined news"
@@ -13343,7 +13343,7 @@ msgstr "Auteur"
 
 #: ../../godmode/setup/news.php:242
 msgid "Modal"
-msgstr ""
+msgstr "Modale"
 
 #: ../../godmode/setup/news.php:245
 msgid "Board"
@@ -13429,7 +13429,7 @@ msgstr "Pour obtenir votre <b> Pandora FMS Enterprise License </ b>:"
 #: ../../godmode/setup/license.php:90
 #, php-format
 msgid "Go to %s"
-msgstr ""
+msgstr "Aller à %s"
 
 #: ../../godmode/setup/license.php:93
 msgid "Enter the <b>auth key</b> and the following <b>request key</b>:"
@@ -13924,11 +13924,11 @@ msgstr "Actualiser le groupe"
 
 #: ../../godmode/groups/configure_group.php:105
 msgid "Update Group"
-msgstr ""
+msgstr "Mettre à jour le groupe"
 
 #: ../../godmode/groups/configure_group.php:107
 msgid "Create Group"
-msgstr ""
+msgstr "Créer le groupe"
 
 #: ../../godmode/groups/configure_group.php:140
 msgid "You have not access to the parent."
@@ -14384,7 +14384,7 @@ msgstr "Configurer l'action d'alerte"
 
 #: ../../godmode/alerts/configure_alert_action.php:97
 msgid "Update Action"
-msgstr ""
+msgstr "Mettre à jour l'action"
 
 #: ../../godmode/alerts/configure_alert_action.php:100
 #: ../../godmode/alerts/alert_list.builder.php:126
@@ -15599,7 +15599,7 @@ msgstr "Retourner au mode normal"
 
 #: ../../operation/reporting/reporting_viewer.php:140
 msgid "View Report"
-msgstr ""
+msgstr "Afficher le rapport"
 
 #: ../../operation/reporting/reporting_viewer.php:170
 #: ../../enterprise/include/functions_reporting_pdf.php:3988
@@ -16000,7 +16000,7 @@ msgstr "Detail des alertes"
 
 #: ../../operation/users/user_edit.php:357
 msgid "Show information"
-msgstr ""
+msgstr "Afficher les informations"
 
 #: ../../operation/users/user_edit.php:388
 msgid ""
@@ -16038,7 +16038,7 @@ msgstr ""
 
 #: ../../operation/users/user_edit.php:674
 msgid "Deactivate"
-msgstr ""
+msgstr "Désactiver"
 
 #: ../../operation/users/user_edit.php:706
 msgid "The double autentication was deactivated successfully"
@@ -17367,7 +17367,7 @@ msgstr "Vue de la topologie"
 #: ../../operation/agentes/networkmap.php:219
 #: ../../operation/agentes/networkmap.php:289
 msgid "Dynamic view"
-msgstr ""
+msgstr "Vue dynamique"
 
 #: ../../operation/agentes/networkmap.php:224
 #: ../../operation/agentes/networkmap.php:292
@@ -17642,7 +17642,7 @@ msgstr "Status du moniteur"
 
 #: ../../operation/agentes/status_monitor.php:542
 msgid "Advanced Options"
-msgstr ""
+msgstr "Options avancées"
 
 #: ../../operation/agentes/status_monitor.php:984
 #: ../../operation/search_modules.php:52
@@ -18602,7 +18602,7 @@ msgstr ""
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:310
 msgid "Filter by"
-msgstr ""
+msgstr "Filtrer par"
 
 #: ../../enterprise/godmode/reporting/reporting_builder.template_wizard.php:366
 #: ../../enterprise/godmode/reporting/graph_template_wizard.php:162
@@ -18666,11 +18666,11 @@ msgstr ""
 
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:114
 msgid "Available"
-msgstr ""
+msgstr "Disponibles"
 
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:116
 msgid "Selected"
-msgstr ""
+msgstr "Sélectionnés"
 
 #: ../../enterprise/godmode/reporting/visual_console_builder.wizard_services.php:123
 msgid "Push the selected services into the list"
@@ -21212,7 +21212,7 @@ msgstr "Exporter au format PDF"
 #: ../../enterprise/operation/reporting/custom_reporting.php:47
 #: ../../enterprise/operation/reporting/custom_reporting.php:70
 msgid "Send by email"
-msgstr ""
+msgstr "Envoyer par courriel"
 
 #: ../../enterprise/operation/reporting/custom_reporting.php:55
 msgid "ID Report"
@@ -21390,7 +21390,7 @@ msgstr "Avec succès supprimé"
 #: ../../enterprise/operation/agentes/networkmap_enterprise.php:176
 #: ../../include/functions_reporting.php:8222
 msgid "Nodes"
-msgstr ""
+msgstr "Nœuds"
 
 #: ../../enterprise/operation/agentes/networkmap_enterprise.php:212
 msgid "Pending to generate"
@@ -21571,11 +21571,11 @@ msgstr ""
 
 #: ../../enterprise/load_enterprise.php:666
 msgid "E-mail:"
-msgstr ""
+msgstr "Courriel :"
 
 #: ../../enterprise/load_enterprise.php:670
 msgid "Contact:"
-msgstr ""
+msgstr "Contact :"
 
 #: ../../enterprise/load_enterprise.php:674
 msgid "Auth Key:"
@@ -21588,7 +21588,7 @@ msgstr ""
 
 #: ../../enterprise/load_enterprise.php:690
 msgid "ERROR:"
-msgstr ""
+msgstr "ERREUR :"
 
 #: ../../enterprise/load_enterprise.php:690
 msgid "When connecting to Artica server."
@@ -23268,7 +23268,7 @@ msgstr ""
 #: ../../include/functions_update_manager.php:333
 #: ../../include/functions_update_manager.php:336
 msgid "Server not found."
-msgstr ""
+msgstr "Serveur introuvable."
 
 #: ../../enterprise/include/functions_update_manager.php:146
 #: ../../enterprise/include/functions_update_manager.php:248
@@ -23283,17 +23283,17 @@ msgstr ""
 
 #: ../../enterprise/include/functions_update_manager.php:165
 msgid "Version number:"
-msgstr ""
+msgstr "Numéro de version :"
 
 #: ../../enterprise/include/functions_update_manager.php:166
 #: ../../enterprise/include/functions_networkmap_enterprise.php:596
 msgid "Show details"
-msgstr ""
+msgstr "Afficher les détails"
 
 #: ../../enterprise/include/functions_update_manager.php:173
 #: ../../include/functions_update_manager.php:355
 msgid "Update to the last version"
-msgstr ""
+msgstr "Mettre à jour vers la dernière version"
 
 #: ../../enterprise/include/functions_update_manager.php:188
 #: ../../include/functions_update_manager.php:358
@@ -23323,7 +23323,7 @@ msgstr ""
 #: ../../enterprise/include/functions_update_manager.php:350
 #: ../../include/ajax/update_manager.ajax.php:447
 msgid "progress"
-msgstr ""
+msgstr "progression"
 
 #: ../../enterprise/include/functions_update_manager.php:428
 #: ../../enterprise/include/functions_update_manager.php:432
@@ -23350,19 +23350,19 @@ msgstr ""
 #: ../../include/functions_update_manager.php:175
 #: ../../include/ajax/update_manager.ajax.php:205
 msgid "An error ocurred while reading a file."
-msgstr ""
+msgstr "Une erreur s'est produite lors de la lecture d'un fichier."
 
 #: ../../enterprise/include/functions_update_manager.php:481
 #: ../../include/functions_update_manager.php:182
 #: ../../include/ajax/update_manager.ajax.php:211
 msgid "The package does not exist"
-msgstr ""
+msgstr "Le paquet n'existe pas"
 
 #: ../../enterprise/include/functions_update_manager.php:487
 #: ../../include/functions_update_manager.php:188
 #: ../../include/ajax/update_manager.ajax.php:477
 msgid "The package is installed."
-msgstr ""
+msgstr "Le paquet est installé"
 
 #: ../../enterprise/include/functions_groups.php:47
 msgid "Metaconsole"
@@ -23417,12 +23417,12 @@ msgstr ""
 #: ../../enterprise/include/functions_license.php:35
 #: ../../enterprise/include/functions_license.php:52
 msgid "Client"
-msgstr ""
+msgstr "Client"
 
 #: ../../enterprise/include/functions_license.php:37
 #: ../../enterprise/include/functions_license.php:52
 msgid "Trial"
-msgstr ""
+msgstr "Essai"
 
 #: ../../enterprise/include/functions_policies.php:456
 #: ../../enterprise/include/functions_policies.php:471
@@ -23684,7 +23684,7 @@ msgstr "Hors des limites"
 
 #: ../../enterprise/include/functions_reporting.php:1062
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #: ../../enterprise/include/functions_reporting.php:1063
 #: ../../enterprise/include/functions_reporting.php:1520
@@ -23720,7 +23720,7 @@ msgstr ""
 #: ../../include/functions_reporting.php:3906
 #: ../../include/functions_reporting.php:4016
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #: ../../enterprise/include/functions_reporting.php:1386
 #: ../../enterprise/include/functions_reporting.php:2057
@@ -24212,11 +24212,11 @@ msgstr ""
 #: ../../enterprise/include/functions_networkmap_enterprise.php:602
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1630
 msgid "Add node"
-msgstr ""
+msgstr "Ajouter un nœud"
 
 #: ../../enterprise/include/functions_networkmap_enterprise.php:603
 msgid "Set center"
-msgstr ""
+msgstr "Définir le centre"
 
 #: ../../enterprise/include/functions_networkmap_enterprise.php:605
 msgid "Refresh Holding area"
@@ -24225,7 +24225,7 @@ msgstr ""
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1061
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1541
 msgid "Circle"
-msgstr "Cercl"
+msgstr "Cercle"
 
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1062
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1542
@@ -24312,7 +24312,7 @@ msgstr ""
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1624
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1625
 msgid "Relations"
-msgstr ""
+msgstr "Relations"
 
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1649
 #: ../../enterprise/include/functions_networkmap_enterprise.php:1654
@@ -24788,11 +24788,11 @@ msgstr ""
 #: ../../enterprise/extensions/ipam/ipam_network.php:521
 #: ../../enterprise/extensions/ipam/ipam_excel.php:105
 msgid "Hostname"
-msgstr ""
+msgstr "Nom d'hôte"
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:167
 msgid "Operating system"
-msgstr ""
+msgstr "Système d'exploitation"
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:177
 msgid "This agent has other IPs"
@@ -24828,7 +24828,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:252
 msgid "Ping"
-msgstr ""
+msgstr "Ping"
 
 #: ../../enterprise/extensions/ipam/ipam_ajax.php:269
 #: ../../include/ajax/events.php:157
@@ -24847,7 +24847,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_massive.php:68
 msgid "Addresses"
-msgstr ""
+msgstr "Adresses"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:89
 msgid "No addresses found on this network"
@@ -24855,7 +24855,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:106
 msgid "Subnet"
-msgstr ""
+msgstr "Sous-réseau"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:204
 msgid "Total IPs"
@@ -24890,16 +24890,16 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:259
 msgid "A -> Z"
-msgstr ""
+msgstr "A -> Z"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:260
 msgid "Z -> A"
-msgstr ""
+msgstr "Z -> A"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:261
 #: ../../enterprise/extensions/ipam/ipam_network.php:262
 msgid "Last check"
-msgstr ""
+msgstr "Dernière vérification"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:261
 msgid "Newer -> Older"
@@ -24923,7 +24923,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:275
 msgid "Icons style"
-msgstr ""
+msgstr "Style des icônes"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:282
 msgid "Show not alive hosts"
@@ -24947,7 +24947,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:457
 msgid "Edit address"
-msgstr ""
+msgstr "Modifier l'adresse"
 
 #: ../../enterprise/extensions/ipam/ipam_network.php:462
 msgid "Disabled address"
@@ -24983,7 +24983,7 @@ msgstr ""
 
 #: ../../enterprise/extensions/ipam/ipam_list.php:45
 msgid "No networks found"
-msgstr ""
+msgstr "Aucun réseau trouvé"
 
 #: ../../enterprise/extensions/ipam/ipam_list.php:64
 msgid "IPs"
@@ -31035,9 +31035,6 @@ msgstr "Fichiers d'archive du sytème"
 #~ msgid "Alerts disabled"
 #~ msgstr "Alertes désactivées"
 
-#~ msgid "OID:"
-#~ msgstr "OID"
-
 #~ msgid "Remote modules rate"
 #~ msgstr "Rythme des modules á distance"
 
@@ -31102,9 +31099,6 @@ msgstr "Fichiers d'archive du sytème"
 #~ msgid "Search text"
 #~ msgstr "cherche texte"
 
-#~ msgid "Custom data:"
-#~ msgstr "Données du client"
-
 #~ msgid ""
 #~ "Red cell when the module group and agent have at least one module in "
 #~ "critical state and the others in any state."
@@ -31126,67 +31120,3 @@ msgstr "Fichiers d'archive du sytème"
 
 #~ msgid "Modules warning"
 #~ msgstr "Alerte modules"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "Trier les agents de "
-
-#~ msgid "Type:"
-#~ msgstr "Type :"
-
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Max. Retard (s) / Modules retardés"
-
-#~ msgid "Add module macro"
-#~ msgstr "Ajouter module de macro"
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Gauche en blanc pour les modules d'inventaire de réseau"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Mettez ici votre code de script pour le module d'inventaire"
-
-#~ msgid "Invalid license."
-#~ msgstr "Licence invalide"
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "S'il vous plaît contacter Artica à info@artica.es pour une licence valide."
-
-#~ msgid "Columns"
-#~ msgstr "Colonnes"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Agent de surveillance et d'information"
-
-#~ msgid "No servers"
-#~ msgstr "Pas de serveurs"
-
-#~ msgid "Event information"
-#~ msgstr "les informations de l'événement"
-
-#~ msgid "Without permissions"
-#~ msgstr "Sans autorisation"
-
-#~ msgid "disabled"
-#~ msgstr "désactivé"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "la réplication des événements n'est pas activée"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr ""
-#~ "la réplication des événements n'est pas correctement configuré pour cette "
-#~ "metaconsole"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "Le serveur semble être configuré pour reproduire des événements, mais aucun "
-#~ "événement n'a encore été reçue"
-
-#~ msgid "Unknown error"
-#~ msgstr "Erreur inconnue"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "Il n'y a pas d'agents dans ce agrupation"

pandora_console/include/languages/it.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "X-Poedit-Country: ITALY\n"
 "Language: \n"

pandora_console/include/languages/ja.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:30+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 
 #: ../../general/links_menu.php:20 ../../godmode/menu.php:216
@@ -30271,15 +30271,9 @@ msgstr "システムログファイル"
 #~ msgid "Oper"
 #~ msgstr "演算子"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "S"
 #~ msgstr "状態"
 
-#~ msgid "Custom data:"
-#~ msgstr "カスタムデータ:"
-
 #~ msgid "int"
 #~ msgstr "間隔"
 
@@ -30288,89 +30282,3 @@ msgstr "システムログファイル"
 
 #~ msgid "Search text"
 #~ msgstr "検索文字列"
-
-#~ msgid "Add module macro"
-#~ msgstr "モジュールマクロの追加"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "エージェントの並び替え: "
-
-#~ msgid "Type:"
-#~ msgstr "タイプ:"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "このグループのエージェントはありません。"
-
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "最大遅延(秒)/遅延モジュール"
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "ネットワークインベントリモジュールでは空にしてください"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "インベントリモジュールのスクリプトコードをここに入力してください"
-
-#~ msgid "Invalid license."
-#~ msgstr "不正なライセンスです。"
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr "正しいライセンスについては、Artica (info@artica.es) までお問い合わせください。"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "エージェントおよびモニタ情報"
-
-#~ msgid "Columns"
-#~ msgstr "カラム"
-
-#~ msgid "Event information"
-#~ msgstr "イベント情報"
-
-#~ msgid "No servers"
-#~ msgstr "サーバがありません"
-
-#~ msgid "Without permissions"
-#~ msgstr "パーミッションなし"
-
-#~ msgid "disabled"
-#~ msgstr "無効化"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "イベント複製が有効化されていません"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr "サーバはイベントを複製する設定がされていますが、まだイベントを受信していません"
-
-#~ msgid "Unknown error"
-#~ msgstr "不明なエラー"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr "このメタコンソールでは、イベント複製が設定されていません"
-
-#~ msgid "Custom OID/Data"
-#~ msgstr "カスタム OID/データ"
-
-#~ msgid "Group by OID/IP"
-#~ msgstr "OID/IP ごとのグループ"
-
-#~ msgid "Contact Ártica ST at info@artica.es to get an auth key."
-#~ msgstr "authkey の入手は、Artica ST info@artica.es までお問い合わせください。"
-
-#~ msgid "Report group"
-#~ msgstr "レポートグループ"
-
-#~ msgid "Alerts status"
-#~ msgstr "アラートの状態"
-
-#~ msgid "Modules status"
-#~ msgstr "モジュールの状態"
-
-#~ msgid "Agents status"
-#~ msgstr "エージェントの状態"
-
-#~ msgid "Trap OID"
-#~ msgstr "トラップOID"
-
-#~ msgid "Traps received by OID"
-#~ msgstr "OID ごとの受信トラップ"

pandora_console/include/languages/nl.po

@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:30+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "uProject-Id-Version: pandora-nl\n"
 "Taal: nl\n"
@@ -29935,21 +29935,9 @@ msgstr "Systeem log bestanden"
 #~ msgid "Agent down"
 #~ msgstr "Agent beneden"
 
-#~ msgid "Sort the agents by "
-#~ msgstr "Sorteer de agenten door "
-
 #~ msgid "Search value"
 #~ msgstr "Zoek waarde"
 
-#~ msgid "Custom data:"
-#~ msgstr "Aangepaste gegevens:"
-
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
-#~ msgid "Type:"
-#~ msgstr "Type:"
-
 #~ msgid "Events generated -by module-"
 #~ msgstr "Evenementen gegenereerd -door module-"
 
@@ -30015,9 +30003,6 @@ msgstr "Systeem log bestanden"
 #~ msgid "Agent keepalive monitor"
 #~ msgstr "Agent houdt monitor levend"
 
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "Er zijn geen agenten in deze agrupatie"
-
 #~ msgid "SLA period (seconds)"
 #~ msgstr "SLA-periode (seconden)"
 
@@ -30776,57 +30761,3 @@ msgstr "Systeem log bestanden"
 
 #~ msgid "Configuration detail"
 #~ msgstr "Configuration detail"
-
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Max. Vertraging(sec)/Modules vertraagd"
-
-#~ msgid "Add module macro"
-#~ msgstr "Toevoegen module macro"
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Leeg gelaten voor Netwerk Voorraad Modules"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Plaats hier uw script code voor de voorraad module"
-
-#~ msgid "Invalid license."
-#~ msgstr "Ongeldige licentie."
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "Neem a.u.b. contact op met Artica op info@artica.es voor een geldige "
-#~ "licentie."
-
-#~ msgid "Columns"
-#~ msgstr "Kolommen"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Agent en monitor informatie"
-
-#~ msgid "No servers"
-#~ msgstr "Geen servers"
-
-#~ msgid "Event information"
-#~ msgstr "Gebeurtenis informatie"
-
-#~ msgid "Without permissions"
-#~ msgstr "Zonder machtigingen"
-
-#~ msgid "disabled"
-#~ msgstr "uitgeschakeld"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "Gebeurtenis replicatie is niet ingeschakeld"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr "Gebeurtenis replicatie is niet juist ingesteld voor deze metaconsole"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "De server lijkt te zijn geconfigureerd om gebeurtenissen te repliceren, maar "
-#~ "er zijn nog geen gebeurtenissen ontvangen"
-
-#~ msgid "Unknown error"
-#~ msgstr "Onbekende fout"

pandora_console/include/languages/pl.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: pl\n"
 

pandora_console/include/languages/pt.po

@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: \n"
 
@@ -29560,9 +29560,6 @@ msgstr "Registo de actividade do sistema"
 #~ msgid "Search value"
 #~ msgstr "Valor de procura"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "Read message"
 #~ msgstr "Ler mensagem"
 
@@ -30425,9 +30422,6 @@ msgstr "Registo de actividade do sistema"
 #~ msgid "Profile successfully deleted"
 #~ msgstr "Perfil apagado com sucesso"
 
-#~ msgid "Custom data:"
-#~ msgstr "Dados personalizados"
-
 #~ msgid "Custom graph name"
 #~ msgstr "Nome de grapho personalizado"
 

pandora_console/include/languages/pt_BR.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: \n"
 
@@ -30920,76 +30920,5 @@ msgstr "Logfile do Sistema"
 #~ msgid "Create incident from event"
 #~ msgstr "Criar incidente para o evento"
 
-#~ msgid "Sort the agents by "
-#~ msgstr "Classificar os agentes por "
-
-#~ msgid "Type:"
-#~ msgstr "Tipo:"
-
-#~ msgid "Custom data:"
-#~ msgstr "Dados personalizados:"
-
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Atraso Max.(seg)/Módulos atrasados"
-
-#~ msgid "Add module macro"
-#~ msgstr "Adicionar macro do módulo"
-
 #~ msgid "E/D"
 #~ msgstr "E/D"
-
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Deixado em branco para Módulos de Inventário de Rede"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Coloque aqui código do seu script para o módulo de inventário"
-
-#~ msgid "Invalid license."
-#~ msgstr "Licença inválida."
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "Por favor, entre em contato com Artica através do info@artica.es para obter "
-#~ "uma licença válida."
-
-#~ msgid "Columns"
-#~ msgstr "Colunas"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Informação de monitor e agente"
-
-#~ msgid "Event information"
-#~ msgstr "Informação sobre o evento"
-
-#~ msgid "No servers"
-#~ msgstr "Sem servidores"
-
-#~ msgid "Without permissions"
-#~ msgstr "Sem permissões"
-
-#~ msgid "disabled"
-#~ msgstr "desabilitado"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "A replicação de eventos não está habilitada"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "O servidor parece ter sido configurado para replicar eventos, mas nenhum "
-#~ "evento foi recebido ainda"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr ""
-#~ "A replicação de eventos não está configurada apropriadamente para este "
-#~ "metaconsole"
-
-#~ msgid "Unknown error"
-#~ msgstr "Erro desconhecido"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "Não há agentes neste agrupamento"

pandora_console/include/languages/ru.po

@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: ru\n"
 
@@ -30103,12 +30103,6 @@ msgstr "Система журнал фйлов"
 #~ msgid "Monitors not init"
 #~ msgstr "Мониторы не включены"
 
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "Максимальная Задержка (сек) / Модули отложены"
-
-#~ msgid "Add module macro"
-#~ msgstr "Добавить модуль макроса"
-
 #~ msgid "Checking tagente_estado table"
 #~ msgstr "Проверка таблицы tagente_estado"
 
@@ -30193,66 +30187,6 @@ msgstr "Система журнал фйлов"
 #~ msgid "Field 3"
 #~ msgstr "Поле 3"
 
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "Слева в заготовке для модулей инвентаризации Network"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "Вставьте здесь ваш скрипт-код для инвентаризации модуля"
-
-#~ msgid "Invalid license."
-#~ msgstr "Лицензия недействительна"
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr ""
-#~ "Пожалуйста, свяжитесь с Artica на info@artica.es для действительной лицензии."
-
-#~ msgid "Columns"
-#~ msgstr "Столбцы"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "Агент и Монитор информации"
-
-#~ msgid "Event information"
-#~ msgstr "Информация о событии"
-
-#~ msgid "No servers"
-#~ msgstr "Нет серверов"
-
-#~ msgid "Without permissions"
-#~ msgstr "Без разрешения"
-
-#~ msgid "disabled"
-#~ msgstr "отключено"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "Последние событие репликации"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr ""
-#~ "События репликация не настроены должным образом для этой мета консоли"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr ""
-#~ "Сервер, кажется, сконфигурирован для репликации событий, но никаких событий "
-#~ "не было еще получено"
-
-#~ msgid "Unknown error"
-#~ msgstr "Неизвестная ошибка"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "Сорторовать агенты по "
-
-#~ msgid "Type:"
-#~ msgstr "Тип:"
-
-#~ msgid "Custom data:"
-#~ msgstr "Данные клиента:"
-
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "Search value"
 #~ msgstr "Поисковое значение"
 
@@ -30265,6 +30199,3 @@ msgstr "Система журнал фйлов"
 #~ "FMS (число работующих агентов и модулей). Чтобы отключить ее, просто удалите "
 #~ "расширение или удалите дистанционный адрес сервера из настроек плагина "
 #~ "Манеджера Обновлений."
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "Нет агентов в этом agrupation"

pandora_console/include/languages/sk.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:30+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: sk\n"
 
@@ -30160,9 +30160,6 @@ msgstr "Systémové log-súbory"
 #~ msgid "Search value"
 #~ msgstr "Hľadať hodnotu"
 
-#~ msgid "OID:"
-#~ msgstr "OID:"
-
 #~ msgid "Update server host"
 #~ msgstr "Aktualizovať serverový host"
 

pandora_console/include/languages/tr.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:54+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: tr\n"
 

pandora_console/include/languages/zh_CN.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-24 16:53+0000\n"
+"X-Launchpad-Export-Date: 2015-04-01 07:29+0000\n"
 "X-Generator: Launchpad (build 17413)\n"
 "Language: \n"
 
@@ -29848,12 +29848,6 @@ msgstr "系统日志文件"
 #~ msgid "Monitors unknown"
 #~ msgstr "未知的"
 
-#~ msgid "Max. Delay(sec)/Modules delayed"
-#~ msgstr "最大延迟时间（秒）/最多延迟模块数量"
-
-#~ msgid "Add module macro"
-#~ msgstr "添加模块宏"
-
 #~ msgid "Sanitize my database now"
 #~ msgstr "正在清理我的数据库"
 
@@ -29887,65 +29881,9 @@ msgstr "系统日志文件"
 #~ msgid "Field 3"
 #~ msgstr "域3"
 
-#~ msgid "Left in blank for Network Inventory Modules"
-#~ msgstr "为网络索引模块留白"
-
-#~ msgid "Put here your script code for the inventory module"
-#~ msgstr "在此为索引模块填入脚本代码"
-
-#~ msgid "Invalid license."
-#~ msgstr "无效许可"
-
-#~ msgid "Please contact Artica at info@artica.es for a valid license."
-#~ msgstr "请通过info@artica.es联系Artica索要有效许可。"
-
-#~ msgid "Columns"
-#~ msgstr "栏"
-
-#~ msgid "Agent and monitor information"
-#~ msgstr "代理和监控器信息"
-
-#~ msgid "Event information"
-#~ msgstr "事件信息"
-
-#~ msgid "No servers"
-#~ msgstr "无服务器"
-
-#~ msgid "Without permissions"
-#~ msgstr "未经许可"
-
-#~ msgid "disabled"
-#~ msgstr "已禁用"
-
-#~ msgid "Events replication is not enabled"
-#~ msgstr "未启用事件复制"
-
-#~ msgid "Events replication is not properly configured for this metaconsole"
-#~ msgstr "此meta控制台未适当配置事件复制"
-
-#~ msgid ""
-#~ "The server seems to be configurated to replicate events, but no events has "
-#~ "been received yet"
-#~ msgstr "服务器似乎已配置以复制事件，但仍未收到任何事件"
-
-#~ msgid "Unknown error"
-#~ msgstr "未知错误"
-
-#~ msgid "Sort the agents by "
-#~ msgstr "代理排序按 "
-
-#~ msgid "Type:"
-#~ msgstr "类型："
-
-#~ msgid "OID:"
-#~ msgstr "对象标识："
-
 #~ msgid "Search value"
 #~ msgstr "搜索值"
 
-#~ msgid "Custom data:"
-#~ msgstr "自定义数据："
-
 #~ msgid "There's a new update for Pandora FMS"
 #~ msgstr "Pandora FMS 有新版本"
 
@@ -29957,15 +29895,3 @@ msgstr "系统日志文件"
 
 #~ msgid "E/D"
 #~ msgstr "E/D"
-
-#~ msgid "There aren't agents in this agrupation"
-#~ msgstr "该中断无代理存在"
-
-#~ msgid "Custom OID/Data"
-#~ msgstr "自定义OID／数据"
-
-#~ msgid "Group by OID/IP"
-#~ msgstr "OID/IP分组"
-
-#~ msgid "Contact Ártica ST at info@artica.es to get an auth key."
-#~ msgstr "联系Ártica ST at info@artica.es获得授权密钥。"

pandora_console/install.php

@@ -63,7 +63,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '6.0dev';
-$build = '150327';
+$build = '150413';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/mobile/operation/networkmap.php

@@ -21,16 +21,21 @@ class Networkmap {
 	private $id = 0;
 	private $network_map = null;
 	
-	function __construct() {
+	function __construct($id = false) {
 		$system = System::getInstance();
 		
-		if ($system->checkACL($this->acl)) {
+		if ($id === false)
+			$this->getFilters();
+		else
+			$this->id = $id;
+			
+		$store_group = db_get_value('store_group',
+			'tnetwork_map', 'id_networkmap', $this->id);
+		
+		if ($store_group !== false
+				&& $system->checkACL($this->acl, $store_group))
 			$this->correct_acl = true;
 	}
-		else {
-			$this->correct_acl = false;
-		}
-	}
 	
 	public function ajax($parameter2 = false) {
 		$system = System::getInstance();

pandora_console/mobile/operation/networkmaps.php

@@ -168,10 +168,10 @@ class Networkmaps {
 		$where['order'] = 'type';
 		
 		if ($this->group != '0') {
-			$where['id_group'] = $this->group;
+			$where['store_group'] = $this->group;
 		}
 		else {
-			$where['id_group'] = array_keys(users_get_groups());
+			$where['store_group'] = array_keys(users_get_groups());
 		}
 		
 		if ($this->type != '0')
@@ -184,13 +184,17 @@ class Networkmaps {
 		}
 		$list = array();
 		foreach ($network_maps as $networkmap) {
+			// ACL
+			if (! $system->checkACL("AR", $networkmap['store_group']))
+				continue;
+			
 			// If enterprise not loaded then skip this code
 			if ($networkmap['type'] == 'policies' and (!defined('PANDORA_ENTERPRISE')))
 				continue;
 			$row = array();
 			$row[__('Name')] = '<a class="ui-link" data-ajax="false" href="index.php?page=networkmap&id=' . $networkmap['id_networkmap'] . '">' . io_safe_output($networkmap['name']) . '</a>';
 			$row[__('Type')] = $networkmap['type'];
-			$row[__('Group')] = ui_print_group_icon($networkmap["id_group"], true, "groups_small", "" , false);
+			$row[__('Group')] = ui_print_group_icon($networkmap["store_group"], true, "groups_small", "" , false);
 			$list[] = $row;
 		}
 		

pandora_console/mobile/operation/visualmap.php

@@ -16,12 +16,16 @@ require_once ('../include/functions_visual_map.php');
 
 class Visualmap {
 	private $correct_acl = false;
-	private $acl = "RR";
+	private $acl = "VR";
 	
 	private $id = 0;
-	private $visual_map = null;
+	private $visualmap = null;
 	
 	function __construct() {
+		
+	}
+	
+	private function checkVisualmapACL($groupID = 0) {
 		$system = System::getInstance();
 		
 		if ($system->checkACL($this->acl)) {
@@ -39,17 +43,21 @@ class Visualmap {
 	}
 	
 	public function show() {
-		if (!$this->correct_acl) {
-			$this->show_fail_acl();
-		}
-		else {
 		$this->getFilters();
 		
 		$this->visualmap = db_get_row('tlayout',
 			'id', $this->id);
 		
-			$this->show_visualmap();
+		if (empty($this->visualmap)) {
+			$this->show_fail_acl();
 		}
+		
+		$this->checkVisualmapACL($this->visualmap['id_group']);
+		if (!$this->correct_acl) {
+			$this->show_fail_acl();
+		}
+		
+		$this->show_visualmap();
 	}
 	
 	private function show_fail_acl() {

pandora_console/mobile/operation/visualmaps.php

@@ -18,7 +18,7 @@ ob_get_clean(); //Fixed unused javascript code.
 
 class Visualmaps {
 	private $correct_acl = false;
-	private $acl = "RR";
+	private $acl = "VR";
 	
 	private $default = true;
 	private $default_filters = array();

pandora_console/operation/agentes/networkmap.dinamic.php

@@ -19,7 +19,34 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "AR")) {
+// Networkmap id required
+if (!isset($id_networkmap)) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access node graph builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// Get the group for ACL
+if (!isset($store_group)) {
+	$store_group = db_get_value("store_group", "tnetwork_map", "id_networkmap", $id_networkmap);
+	if ($store_group === false) {
+		db_pandora_audit("ACL Violation",
+			"Trying to accessnode graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+}
+
+// ACL for the networkmap permission
+if (!isset($networkmap_read))
+	$networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+if (!isset($networkmap_write))
+	$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+if (!isset($networkmap_manage))
+	$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+
+if (!$networkmap_read && !$networkmap_write && !$networkmap_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access node graph builder");
 	include ("general/noaccess.php");

pandora_console/operation/agentes/networkmap.groups.php

@@ -19,7 +19,34 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "AR")) {
+// Networkmap id required
+if (!isset($id_networkmap)) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access node graph builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// Get the group for ACL
+if (!isset($store_group)) {
+	$store_group = db_get_value("store_group", "tnetwork_map", "id_networkmap", $id_networkmap);
+	if ($store_group === false) {
+		db_pandora_audit("ACL Violation",
+			"Trying to accessnode graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+}
+
+// ACL for the networkmap permission
+if (!isset($networkmap_read))
+	$networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+if (!isset($networkmap_write))
+	$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+if (!isset($networkmap_manage))
+	$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+
+if (!$networkmap_read && !$networkmap_write && !$networkmap_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access node graph builder");
 	include ("general/noaccess.php");

pandora_console/operation/agentes/networkmap.php

@@ -19,13 +19,6 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "AR")) {
-	db_pandora_audit("ACL Violation",
-		"Trying to access node graph builder");
-	include ("general/noaccess.php");
-	exit;
-}
-
 require_once ('include/functions_networkmap.php');
 require_once ('include/functions_clippy.php');
 
@@ -42,16 +35,54 @@ $update_networkmap = get_parameter ('update_networkmap', 0);
 $recenter_networkmap = get_parameter ('recenter_networkmap', 0);
 $hidden_options = get_parameter ('hidden_options', 1);
 
-if ($delete_networkmap) {
-	$result = networkmap_delete_networkmap($id_networkmap);
-	$message = ui_print_result_message ($result,
-		__('Network map deleted successfully'),
-		__('Could not delete network map'), '', true);
+// ACL checks //
+// New networkmap.
+if ($add_networkmap) {
+	// ACL for the new network map
+	// $networkmap_read = check_acl ($config['id_user'], 0, "MR");
+	$networkmap_write = check_acl ($config['id_user'], 0, "MW");
+	$networkmap_manage = check_acl ($config['id_user'], 0, "MM");
 
+	if (!$networkmap_write && !$networkmap_manage) {
+		db_pandora_audit("ACL Violation",
+			"Trying to accessnode graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+}
+// The networkmap exist. Should have id and store goup.
+else {
+	// Networkmap id required
+	if (empty($id_networkmap)) {
+		db_pandora_audit("ACL Violation",
+			"Trying to access node graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
 	
-	$id_networkmap = 0;
+	// Get the group for ACL
+	$store_group = db_get_value("store_group", "tnetwork_map", "id_networkmap", $id_networkmap);
+	if ($store_group === false) {
+		db_pandora_audit("ACL Violation",
+			"Trying to accessnode graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+	
+	// ACL for the general permission
+	$networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+	$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+	$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+	
+	if (!$networkmap_read && !$networkmap_write && !$networkmap_manage) {
+		db_pandora_audit("ACL Violation",
+			"Trying to access node graph builder");
+		include ("general/noaccess.php");
+		exit;
+	}
 }
 
+// Create
 if ($add_networkmap) {
 	// Load variables
 	$layout = 'radial';
@@ -66,38 +97,82 @@ if ($add_networkmap) {
 	$font_size = 12;
 	$text_filter = '';
 	$dont_show_subgroups = false;
+	$store_group = 0;
 	$group = 0;
 	$module_group = 0;
 	$center = 0;
 	$name = $activeTab;
+	$show_snmp_modules = 0;
+	$l2_network = 0;
 	$check = db_get_value('name', 'tnetwork_map', 'name', $name);
 	$sql = db_get_value_filter('COUNT(name)', 'tnetwork_map',
 		array('name' => "%$name"));
 	
-	if ($check) {
-		$id_networkmap = networkmap_create_networkmap("($sql) ".$name,
-			$activeTab, $layout, $nooverlap, $simple, $regen,
-			$font_size, $group, $module_group, $depth, $modwithalerts,
-			$hidepolicymodules, $zoom, $ranksep, $center, $text_filter,
-			$dont_show_subgroups);
+	$values = array(
+			'name' => ($check ? "($sql) $name" : $name),
+			'type' => $activeTab,
+			'layout' => $layout,
+			'nooverlap' => $nooverlap,
+			'simple' => $simple,
+			'regenerate' => $regen,
+			'font_size' => $font_size,
+			'store_group' => $store_group,
+			'id_group' => $group,
+			'id_module_group' => $module_group,
+			'depth' => $depth,
+			'only_modules_with_alerts' => $modwithalerts,
+			'hide_policy_modules' => $hidepolicymodules,
+			'zoom' => $zoom,
+			'distance_nodes' => $ranksep,
+			'text_filter' => $text_filter,
+			'dont_show_subgroups' => $dont_show_subgroups,
+			'center' => $center,
+			'show_snmp_modules' => $show_snmp_modules,
+			'l2_network' => $l2_network
+		);
+	$id_networkmap = networkmap_create_networkmap($values);
 	
 	$message = ui_print_result_message ($id_networkmap,
 		__('Network map created successfully'),
 		__('Could not create network map'), '', true);
-	}
-	else {
-		$id_networkmap = networkmap_create_networkmap($name, $activeTab,
-			$layout, $nooverlap, $simple, $regen, $font_size, $group,
-			$module_group, $depth, $modwithalerts, $hidepolicymodules,
-			$zoom, $ranksep, $center, $text_filter, $dont_show_subgroups);
 	
-		$message = ui_print_result_message ($id_networkmap,
-			__('Network map created successfully'),
-			__('Could not create network map'), '', true);
+	// Exit when the networkmap was not created
+	if ($id_networkmap === false) {
+		return;
 	}
 }
+// Action in existing networkmap
+else if ($delete_networkmap || $save_networkmap || $update_networkmap) {
 	
-if ($save_networkmap || $update_networkmap) {
+	// ACL for the network map
+	// if (!isset($networkmap_read))
+	// 	$networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+	if (!isset($networkmap_write))
+		$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+	if (!isset($networkmap_manage))
+		$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+
+	if (!$networkmap_write && !$networkmap_manage) {
+		db_pandora_audit("ACL Violation",
+			"Trying to accessnode graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+	
+	// Actions //
+	
+	// Not used now. The new behaviour is delete the map posting to the list.
+	if ($delete_networkmap) {
+		$result = networkmap_delete_networkmap($id_networkmap);
+		$message = ui_print_result_message ($result,
+			__('Network map deleted successfully'),
+			__('Could not delete network map'), '', true);
+		
+		return;
+	}
+	
+	// Save updates the db data, update only updates the view.
+	if ($save_networkmap || $update_networkmap) {
 		// Load variables
 		$layout = (string) get_parameter ('layout', 'radial');
 		$depth = (string) get_parameter ('depth', 'all');
@@ -112,6 +187,7 @@ if ($save_networkmap || $update_networkmap) {
 		$font_size = (int) get_parameter ('font_size', 12);
 		$text_filter = get_parameter ('text_filter', '');
 		$dont_show_subgroups = (bool)get_parameter ('dont_show_subgroups', 0);
+		$store_group = (int) get_parameter ('store_group', 0);
 		$group = (int) get_parameter ('group', 0);
 		$module_group = (int) get_parameter ('module_group', 0);
 		$center = (int) get_parameter ('center', 0);
@@ -119,6 +195,18 @@ if ($save_networkmap || $update_networkmap) {
 		$l2_network = (int) get_parameter ('l2_network', 0);
 		
 		if ($save_networkmap) {
+			// ACL for the new network map
+			$networkmap_read_new = check_acl ($config['id_user'], $store_group, "MR");
+			$networkmap_write_new = check_acl ($config['id_user'], $store_group, "MW");
+			$networkmap_manage_new = check_acl ($config['id_user'], $store_group, "MM");
+
+			if (!$networkmap_write_new && !$networkmap_manage_new) {
+				db_pandora_audit("ACL Violation",
+					"Trying to accessnode graph builder");
+				require ("general/noaccess.php");
+				exit;
+			}
+			
 			$result = networkmap_update_networkmap($id_networkmap,
 				array('name' => $name,
 					'type' => $activeTab,
@@ -127,6 +215,7 @@ if ($save_networkmap || $update_networkmap) {
 					'simple' => $simple,
 					'regenerate' => $regen,
 					'font_size' => $font_size,
+					'store_group' => $store_group,
 					'id_group' => $group,
 					'id_module_group' => $module_group,
 					'depth' => $depth,
@@ -143,27 +232,25 @@ if ($save_networkmap || $update_networkmap) {
 			$message = ui_print_result_message ($result,
 				__('Network map saved successfully'),
 				__('Could not save network map'), '', true);
+			
+			if ($result) {
+				// Save the new ACL permisison
+				$networkmap_read = $networkmap_read_new;
+				$networkmap_write = $networkmap_write_new;
+				$networkmap_manage = $networkmap_manage_new;
+			}
+		}
 	}
 }
 
-$networkmaps = networkmap_get_networkmaps('','', true, $strict_user);
-
-$nomaps = false;
-if ($networkmaps === false) {
-	$nomaps = true;
-}
-
-// If the map id is not defined, we set the first id of the active type
-if (!$nomaps && $id_networkmap == 0) {
-	$networkmaps_of_type = networkmap_get_networkmaps('', $activeTab);
-	if ($networkmaps_of_type !== false) {
-		$id_networkmap = reset(array_keys($networkmaps_of_type));
-	}
-}
-
-if (!$update_networkmap && !$save_networkmap && $id_networkmap != 0) {
+if (!$update_networkmap && !$save_networkmap) {
 	$networkmap_data = networkmap_get_networkmap($id_networkmap);
+	if (empty($networkmap_data)) {
+		ui_print_error_message(__('There was an error loading the network map'));
+		return;
+	}
 	
+	// Load variables
 	$layout = $networkmap_data['layout'];
 	$depth = $networkmap_data['depth'];
 	$nooverlap = (bool)$networkmap_data['nooverlap'];
@@ -177,6 +264,7 @@ if (!$update_networkmap && !$save_networkmap && $id_networkmap != 0) {
 	$font_size = $networkmap_data['font_size'];
 	$text_filter = $networkmap_data['text_filter'];
 	$dont_show_subgroups = $networkmap_data['dont_show_subgroups'];
+	$store_group = $networkmap_data['store_group'];
 	$group = $networkmap_data['id_group'];
 	$module_group = $networkmap_data['id_module_group'];
 	$center = $networkmap_data['center'];
@@ -190,106 +278,128 @@ if ($recenter_networkmap) {
 }
 
 /* Main code */
+
+$qs = http_build_query(array(
+		"sec" => "network",
+		"sec2" => "operation/agentes/networkmap_list"
+	));
+$href = "index.php?$qs";
+
+$buttons['list'] = array('active' => false, 'text' => "<a href=\"$href\">" . 
+	html_print_image("images/list.png", true, array ("title" => __('List'))) ."</a>");
+
 if ($pure == 1) {
-	$buttons['screen'] = array('active' => false,
-		'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;tab='.$activeTab.'">' . 
-			html_print_image("images/normal_screen.png", true, array ('title' => __('Normal screen'))) .'</a>');
+	$qs = http_build_query(array(
+			"sec" => "network",
+			"sec2" => "operation/agentes/networkmap",
+			"id_networkmap" => $id_networkmap,
+			"tab" => $activeTab
+		));
+	$href = "index.php?$qs";
+	
+	$buttons['screen'] = array('active' => false, 'text' => "<a href=\"$href\">" . 
+		html_print_image("images/normal_screen.png", true, array ('title' => __('Normal screen'))) ."</a>");
 }
 else {
-	$buttons['screen'] = array('active' => false,
-		'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;pure=1&amp;tab='.$activeTab.'">' . 
-			html_print_image("images/full_screen.png", true, array ('title' => __('Full screen'))) .'</a>');
-}
-if (($config['enterprise_installed']) && (!$strict_user)) {
-	$buttons['policies'] = array('active' => $activeTab == 'policies',
-		'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;tab=policies&amp;pure='.$pure.'">' . 
-			html_print_image("images/policies_mc.png", true, array ("title" => __('Policies view'))) .'</a>');
+	$qs = http_build_query(array(
+			"sec" => "network",
+			"sec2" => "operation/agentes/networkmap",
+			"id_networkmap" => $id_networkmap,
+			"tab" => $activeTab,
+			"pure" => 1
+		));
+	$href = "index.php?$qs";
+	
+	$buttons['screen'] = array('active' => false, 'text' => "<a href=\"$href\">" . 
+		html_print_image("images/full_screen.png", true, array ('title' => __('Full screen'))) ."</a>");
 }
 
-$buttons['groups'] = array('active' => $activeTab == 'groups',
-	'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;tab=groups&amp;pure='.$pure.'">' . 
-		html_print_image("images/group.png", true, array ("title" => __('Groups view'))) .'</a>');
+if ($networkmap_write || $networkmap_manage) {
 	
-$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>');
+	$qs = http_build_query(array(
+			"sec" => "network",
+			"sec2" => "operation/agentes/networkmap_list",
+			"id_networkmap" => $id_networkmap,
+			"delete_networkmap" => 1
+		));
+	$href = "index.php?$qs";
 	
-$buttons['dinamic'] = array('active' => $activeTab == 'dinamic',
-	'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;tab=dinamic&amp;pure='.$pure.'">' . 
-		html_print_image("images/dynamic_network_icon.png", true, array ("title" => __('Dynamic view'))) .'</a>');
+	$buttons['deletemap'] = array('active' => false, 'text' => "<a href=\"$href\">" . 
+		html_print_image("images/delete_mc.png", true, array ("title" => __('Delete map'))) ."</a>");
 	
-if (!$strict_user) {
-	$buttons['radial_dinamic'] = array('active' => $activeTab == 'radial_dynamic',
-		'text' => '<a href="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;tab=radial_dynamic&amp;pure='.$pure.'">' . 
-			html_print_image("images/radial_dynamic_network_icon.png", true, array ("title" => __('Radial dynamic view'))) .'</a>');
-}
+	$qs = http_build_query(array(
+			"sec" => "network",
+			"sec2" => "operation/agentes/networkmap",
+			"id_networkmap" => $id_networkmap,
+			"save_networkmap" => 1,
+			"tab" => $activeTab,
+			"name" => $name,
+			"store_group" => $store_group,
+			"group" => $group,
+			"layout" => $layout,
+			"nooverlap" => $nooverlap,
+			"simple" => $simple,
+			"regen" => $regen,
+			"zoom" => $zoom,
+			"ranksep" => $$ranksep,
+			"font_size" => $font_size,
+			"depth" => $depth,
+			"modwithalerts" => $modwithalerts,
+			"text_filter" => $text_filter,
+			"dont_show_subgroups" => $dont_show_subgroups,
+			"hidepolicymodules" => $hidepolicymodules,
+			"module_group" => $module_group,
+			"hidden_options" => (int)$hidden_options,
+			"show_snmp_modules" => (int)$show_snmp_modules,
+			"l2_network" => (int)$l2_network,
+			"pure" => $pure
+		));
+	$href = "index.php?$qs";
 	
-$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;');
-
-$combolist .= html_print_input_hidden('hidden_options',$hidden_options, true);
-
-$combolist .= '</form>';
-
-$buttons['combolist'] = $combolist;
-
-if (check_acl ($config['id_user'], 0, "RW") || check_acl ($config['id_user'], 0, "RM")) {
-	$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.'">' . 
-		html_print_image("images/add_mc.png", true, array ("title" => __('Add map'))) .'</a>');
-	
-	if (!$nomaps && $id_networkmap != 0) {
-		$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.'">' . 
-			html_print_image("images/delete_mc.png", true, array ("title" => __('Delete map'))) .'</a>');
-		
-		$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&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;' .
-			'zoom=' . $zoom . '&amp;' .
-			'ranksep=' . $ranksep . '&amp;' .
-			'font_size=' . $font_size . '&amp;' .
-			'depth=' . $depth . '&amp;' .
-			'modwithalerts=' . $modwithalerts . '&amp;' .
-			'text_filter=' . $text_filter . '&amp;' .
-			'dont_show_subgroups=' . $dont_show_subgroups . '&amp;' .
-			'hidepolicymodules=' . $hidepolicymodules . '&amp;' .
-			'module_group=' . $module_group . '&amp;' .
-			'pure=' . $pure . '&amp;' .
-			'hidden_options=' . (int)$hidden_options . '&amp;' .
-			'show_snmp_modules=' . (int)$show_snmp_modules . '&amp;' .
-			'l2_network=' . (int)$l2_network . '">' . 
+	$buttons['savemap'] = array('active' => false, 'text' => "<a href=\"$href\">" . 
 		html_print_image("images/save_mc.png", true, array ("title" => __('Save map'))) .'</a>');
-	}
 }
 
+// Disabled. It's a waste of resources to check the ACL of every networkmap
+// for only provide a shorthand feature.
+// $combolist = '<form name="query_sel" method="post" action="index.php?sec=network&sec2=operation/agentes/networkmap">';
+
+// $networkmaps = networkmap_get_networkmaps('','', true, $strict_user);
+// if (empty($networkmaps))
+// 	$networkmaps = array();
+
+// $combolist .= html_print_select($networkmaps, 'id_networkmap', $id_networkmap,
+// 	'onchange:this.form.submit()', '', 0, true, false, false,
+// 	'', false, 'margin-top:4px; margin-left:3px; width:150px;');
+
+// $combolist .= html_print_input_hidden('hidden_options',$hidden_options, true);
+
+// $combolist .= '</form>';
+
+// $buttons['combolist'] = $combolist;
+
 $title = '';
+$icon = "images/op_network.png";
 switch ($activeTab) {
 	case 'topology':
 		$title = __('Topology view');
+		$icon = "images/op_network.png";
 		break;
 	case 'groups':
 		$title = __('Groups view');
+		$icon = "images/group.png";
 		break;
 	case 'policies':
 		$title = __('Policies view');
+		$icon = "images/policies_mc.png";
 		break;
 	case 'dinamic':
 		$title = __('Dynamic view');
+		$icon = "images/dynamic_network_icon.png";
 		break;
-	case 'radial_dinamic':
+	case 'radial_dynamic':
 		$title = __('Radial dynamic view');
+		$icon = "images/radial_dynamic_network_icon.png";
 		break;
 }
 
@@ -298,7 +408,7 @@ if (!empty($name)) {
 }
 
 ui_print_page_header (__('Network map') . " - " . $title,
-	"images/op_network.png", false, "network_map", false, $buttons);
+	$icon, false, "network_map", false, $buttons);
 
 if ((tags_has_user_acl_tags()) && (!$strict_user)) {
 	ui_print_tags_warning();
@@ -308,12 +418,6 @@ if ($delete_networkmap || $add_networkmap || $save_networkmap) {
 	echo $message;
 }
 
-if ($id_networkmap == 0) {
-	echo "<div class='nf'>" .
-		__('There are no defined maps in this view') . "</div>";
-	return;
-}
-
 // CONFIGURATION FORM
 
 echo "<br>";
@@ -328,84 +432,88 @@ $layout_array = array (
 
 $options_form = '<form action="index.php?sec=network&amp;sec2=operation/agentes/networkmap&amp;id_networkmap='.$id_networkmap.'&amp;tab='.$activeTab.'&amp;pure='.$pure.'&amp;center='.$center.'" method="post">';
 
+// Fill an array with the form inputs
+$form_elems = array();
 
-
-unset($table);
-$table->width = '98%';
-$table->class = 'databox';
-$table->data = array();
-$table->data[0][] = __('Name:') . '&nbsp;' .
+// Name
+$element = __('Name') . '&nbsp;' .
 	html_print_input_text ('name', $name, '', 25, 50, true);
-if ($activeTab == 'groups'){
-	$table->data[0][0] .= clippy_context_help("topology_group");
-}
-$table->data[0][] = __('Group:') . '&nbsp;' .
+if ($activeTab == 'groups')
+	$element .= clippy_context_help("topology_group");
+$form_elems[] = $element;
+
+// Store group
+$form_elems[] = __('Store group') . '&nbsp;' .
+	html_print_select_groups(false, 'AR', false, 'store_group', $store_group, '', 'All', 0, true);
+
+// Group
+$form_elems[] = __('Group') . '&nbsp;' .
 	html_print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true);
+
+// Module group
 if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_dynamic') {
-	$table->data[0][] = __('Module group') . '&nbsp;' .
+	$form_elems[] = __('Module group') . '&nbsp;' .
 		html_print_select_from_sql ('
 			SELECT id_mg, name
 			FROM tmodule_group', 'module_group', $module_group, '', 'All', 0, true);
 }
 
+// Interfaces
 if ($activeTab == 'topology') {
-	$table->data[0][] = __('Show interfaces') . '&nbsp;' .
+	$form_elems[] = __('Show interfaces') . '&nbsp;' .
 		html_print_checkbox ('show_snmp_modules', '1', $show_snmp_modules, true);
 }
 
+// Layout
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
-	$table->data[0][] = __('Layout') . '&nbsp;' .
+	$form_elems[] = __('Layout') . '&nbsp;' .
 		html_print_select ($layout_array, 'layout', $layout, '', '', '', true);
 }
 
+// Depth
 if ($activeTab == 'groups') {
 	$depth_levels = array(
 		'all' => __('All'),
 		'agent' => __('Agents'),
 		'group' => __('Groups'));
-	$table->data[0][] = __('Depth') . '&nbsp;' .
-		html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
-}
-
-if ($activeTab == 'policies') {
-	$depth_levels = array(
-		'all' => __('All'),
-		'agent' => __('Agents'),
-		'policy' => __('Policies'));
-	$table->data[0][] = __('Depth') . '&nbsp;' .
+	$form_elems[] = __('Depth') . '&nbsp;' .
 		html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
 }
 
+// No overlap
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
-	$table->data[1][] = __('No Overlap') . '&nbsp;' .
+	$form_elems[] = __('No Overlap') . '&nbsp;' .
 		html_print_checkbox ('nooverlap', '1', $nooverlap, true);
 }
 
-if (($activeTab == 'groups' || $activeTab == 'policies') &&
-	$depth == 'all') {
-	$table->data[1][] = __('Only modules with alerts') . '&nbsp;' .
+// Modules with alerts
+if (($activeTab == 'groups' || $activeTab == 'policies') && $depth == 'all') {
+	$form_elems[] = __('Only modules with alerts') . '&nbsp;' .
 		html_print_checkbox ('modwithalerts', '1', $modwithalerts, true);
+}
 
-	if ($activeTab == 'groups') {
+// Hide policy modules
+if ($activeTab == 'groups') {
 	if ($config['enterprise_installed']) {
-			$table->data[1][] = __('Hide policy modules') . '&nbsp;' .
+		$form_elems[] = __('Hide policy modules') . '&nbsp;' .
 			html_print_checkbox ('hidepolicymodules', '1', $hidepolicymodules, true);
 	}
-	}
 }
 
+// Simple
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
-	$table->data[1][] = __('Simple') . '&nbsp;' .
+	$form_elems[] = __('Simple') . '&nbsp;' .
 		html_print_checkbox ('simple', '1', $simple, true);
 }
 
+// Regenerate
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
-	$table->data[1][] = __('Regenerate') . '&nbsp;' .
+	$form_elems[] = __('Regenerate') . '&nbsp;' .
 		html_print_checkbox ('regen', '1', $regen, true);
 }
 
+// Zoom
 if ($pure == "1") {
-	// Zoom
 	$zoom_array = array (
 		'1' => 'x1',
 		'1.2' => 'x2',
@@ -415,38 +523,62 @@ if ($pure == "1") {
 		'5' => 'x10',
 	);
 	
-	$table->data[1][] = __('Zoom') . '&nbsp;' .
+	$form_elems[] = __('Zoom') . '&nbsp;' .
 		html_print_select ($zoom_array, 'zoom', $zoom, '', '', '', true, false, false, false);
 	
 }
 
+// Font
 if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
-	$table->data[1][] = __('Font') . '&nbsp;' .
+	$form_elems[] = __('Font') . '&nbsp;' .
 		html_print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, true);
 }
 
+// Free text
 if ($activeTab != 'radial_dynamic') {
-	$table->data[2][] = __('Free text for search (*):') . '&nbsp;' .
+	$form_elems[] = __('Free text for search (*):') . '&nbsp;' .
 		html_print_input_text('text_filter', $text_filter, '', 30, 100, true);
 }
 
+// Don't show subgroups
 if (($activeTab == 'groups') || ($activeTab == 'topology')) {
-	$table->data[2][] = __('Don\'t show subgroups:') .
+	$form_elems[] = __('Don\'t show subgroups:') .
 		ui_print_help_tip(__('Only run with it is filter for any group'), true) .
 		'&nbsp;' .
 		html_print_checkbox ('dont_show_subgroups', '1', $dont_show_subgroups, true);
 }
 
+// L2 network
 if ($activeTab == 'topology') {
-	$table->data[2][] = __('L2 network interfaces') . '&nbsp;' .
+	$form_elems[] = __('L2 network interfaces') . '&nbsp;' .
 		html_print_checkbox ('l2_network', '1', $l2_network, true);
 }
 
+// Distance between nodes
 if ($nooverlap == 1) {
-	$table->data[2][] = __('Distance between nodes') . '&nbsp;' .
+	$form_elems[] = __('Distance between nodes') . '&nbsp;' .
 		html_print_input_text ('ranksep', $ranksep, __('Separation between elements in the map (in Non-overlap mode)'), 3, 4, true);
 }
 
+unset($table);
+$table->width = '98%';
+$table->class = 'databox';
+$table->data = array();
+
+$max_col = 5;
+$col = 0;
+$row = 0;
+
+foreach ($form_elems as $key => $element) {
+	if ($col >= $max_col) {
+		$col = 0;
+		$row++;
+	}
+	
+	$table->data[$row][$col] = $element;
+	$col++;
+}
+
 $options_form .= html_print_input_hidden('update_networkmap',1, true) .
 	html_print_input_hidden('hidden_options',0, true);
 $options_form .= html_print_table ($table, true);
@@ -457,8 +589,7 @@ $options_form .= '</form>';
 
 ui_toggle($options_form, __('Map options'), '', $hidden_options);
 
-if ($id_networkmap != 0) {
-	switch ($activeTab) {
+switch ($activeTab) {
 	case 'groups':
 		require_once('operation/agentes/networkmap.groups.php');
 		break;
@@ -475,6 +606,5 @@ if ($id_networkmap != 0) {
 	case 'topology':
 		require_once('operation/agentes/networkmap.topology.php');
 		break;
-	}
 }
 ?>

pandora_console/operation/agentes/networkmap.topology.php

@@ -19,7 +19,34 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "AR")) {
+// Networkmap id required
+if (!isset($id_networkmap)) {
+	db_pandora_audit("ACL Violation",
+		"Trying to access node graph builder");
+	require ("general/noaccess.php");
+	exit;
+}
+
+// Get the group for ACL
+if (!isset($store_group)) {
+	$store_group = db_get_value("store_group", "tnetwork_map", "id_networkmap", $id_networkmap);
+	if ($store_group === false) {
+		db_pandora_audit("ACL Violation",
+			"Trying to accessnode graph builder");
+		require ("general/noaccess.php");
+		exit;
+	}
+}
+
+// ACL for the networkmap permission
+if (!isset($networkmap_read))
+	$networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+if (!isset($networkmap_write))
+	$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+if (!isset($networkmap_manage))
+	$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+
+if (!$networkmap_read && !$networkmap_write && !$networkmap_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access node graph builder");
 	include ("general/noaccess.php");

pandora_console/operation/agentes/networkmap_list.php

@@ -19,7 +19,12 @@ global $config;
 
 check_login ();
 
-if (! check_acl ($config['id_user'], 0, "AR")) {
+// ACL for the general permission
+$networkmaps_read = check_acl ($config['id_user'], 0, "MR");
+$networkmaps_write = check_acl ($config['id_user'], 0, "MW");
+$networkmaps_manage = check_acl ($config['id_user'], 0, "MM");
+
+if (!$networkmaps_read && !$networkmaps_write && !$networkmaps_manage) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access Networkmap builder");
 	if (is_ajax()) {
@@ -38,36 +43,35 @@ if (is_ajax()) {
 
 	$delete_networkmaps = (bool) get_parameter('delete_networkmaps');
 	if ($delete_networkmaps) {
-		if ( check_acl ($config['id_user'], 0, "RW") ||  check_acl ($config['id_user'], 0, "RM") ) {
-			if (check_acl ($config['id_user'], 0, "RM")) {
-					$result = false;
+		
 		$results = array();
-					$ids_networkmap = (array) get_parameter ('ids_networkmap');
+		$ids_networkmap = (array) get_parameter('ids_networkmap');
+		
 		foreach ($ids_networkmap as $id) {
+			$store_group = (int) db_get_value('store_group', 'tnetwork_map', 'id_networkmap',$id_networkmap);
+			
+			// ACL
+			// $networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+			$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+			$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+			
+			if ($networkmap_manage) {
 				$results[$id] = (bool) networkmap_delete_networkmap($id);
 			}
-					echo json_encode($results);
-					return;
-				}
-			else{
-				if (check_acl ($config['id_user'], 0, "RW")) {
-					$result = false;
-					$results = array();
-					$ids_networkmap = (array) get_parameter ('ids_networkmap');
-					foreach ($ids_networkmap as $id) {
+			else if ($networkmap_write) {
 				$results[$id] = (bool) networkmap_delete_user_networkmap($config['id_user'], $id);
 			}
+		}
+		
+		// None permission
+		if (!empty($ids_networkmap) && empty($results)) {
+			db_pandora_audit("ACL Violation", "Trying to access Networkmap deletion");
+			$results = -1;
+		}
+		
 		echo json_encode($results);
 		return;
 	}
-			}
-		}else{
-		db_pandora_audit("ACL Violation",
-				"Trying to access Networkmap deletion");
-			echo json_encode(-1);
-			return;
-		}
-	}
 	return;
 }
 
@@ -80,12 +84,16 @@ $id_networkmap = get_parameter ('id_networkmap', 0);
 $delete_networkmap = get_parameter ('delete_networkmap', 0);
 
 if ($delete_networkmap) {
-	if (is_user_admin ($config['id_user'])){
+
+	// ACL
+	// $networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+	$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+	$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+	
+	if ($networkmap_manage || is_user_admin ($config['id_user'])) {
 		$result = networkmap_delete_networkmap($id_networkmap);
 	}
-	elseif (check_acl ($config['id_user'], 0, "RM")) {
-		$result = networkmap_delete_networkmap($id_networkmap);
-	}elseif (check_acl ($config['id_user'], 0, "RW")) {
+	else if ($networkmap_write) {
 		$result = networkmap_delete_user_networkmap($config['id_user'], $id_networkmap);
 	}
 	$message = ui_print_result_message ($result,
@@ -144,14 +152,13 @@ $table->style[1] = 'text-align: center;';
 $table->style[2] = 'text-align: center;';
 $table->style[3] = 'text-align: center;';
 $table->style[4] = 'text-align: center;';
-$table->style[5] = 'text-align: center;';
 
 $table->size = array();
 $table->size[0] = '80%';
 $table->size[1] = '60px';
 $table->size[2] = '30px';
 
-if (check_acl ($config['id_user'], 0, "RW") || check_acl ($config['id_user'], 0, "RM")) {
+if ($networkmaps_write || $networkmaps_manage) {
 	$table->size[3] = '30px';
 	$table->size[4] = '30px';
 }
@@ -160,22 +167,21 @@ $table->head = array();
 $table->head[0] = __('Name');
 $table->head[1] = __('Type');
 $table->head[2] = __('Group');
-if (check_acl ($config['id_user'], 0, "RW") || check_acl ($config['id_user'], 0, "RM")) {
-	$table->head[3] = __('Edit');
-	$table->head[4] = __('Delete');
+if ($networkmaps_write || $networkmaps_manage) {
+	$table->head[3] = __('Delete');
 	// Checkbox to select all the another checkboxes
-	$table->head[5] = html_print_checkbox('check_delete_all', 0, false, true);
+	$table->head[4] = html_print_checkbox('check_delete_all', 0, false, true);
 }
 $id_groups = array_keys(users_get_groups());
 
 // Create filter
 $where = array();
-$where['id_group'] = $id_groups;
+$where['store_group'] = $id_groups;
 // Order by type field
 $where['order'] = 'type';
 
 if (!empty($group_search))
-	$where['id_group'] = $group_search;
+	$where['store_group'] = $group_search;
 
 if ($type_search != '0')
 	$where['type'] = $type_search;
@@ -183,11 +189,6 @@ if ($type_search != '0')
 //Check for maps only visible for this user
 $user_info = users_get_user_by_id($config['id_user']);
 
-//If the user is not admin only user map are shown.
-//if (!$user_info['is_admin']) {
-//	$where['id_user'] = $config['id_user'];
-//}
-
 $network_maps = db_get_all_rows_filter('tnetwork_map', $where);
 
 if ($network_maps === false) {
@@ -197,24 +198,33 @@ if ($network_maps === false) {
 else {
 	$table->data = array();
 	foreach ($network_maps as $network_map) {
-		// If enterprise not loaded then skip this code
-		if ($network_map['type'] == 'policies' and (!defined('PANDORA_ENTERPRISE')))
+		// ACL
+		$networkmap_read = check_acl ($config['id_user'], $store_group, "MR");
+		$networkmap_write = check_acl ($config['id_user'], $store_group, "MW");
+		$networkmap_manage = check_acl ($config['id_user'], $store_group, "MM");
+		
+		// ACL
+		if (!$networkmap_read && !$networkmap_write && !$networkmap_manage)
 			continue;
 		
-		if (($network_map['type'] == 'radial_dynamic' || $network_map['type'] == 'policies') && ($strict_user)) {
+		// If enterprise not loaded then skip this code
+		if ($network_map['type'] == 'policies' && !defined('PANDORA_ENTERPRISE'))
+			continue;
+	
+		if (($network_map['type'] == 'radial_dynamic' || $network_map['type'] == 'policies') && $strict_user) {
 			continue;
 		}
 		
 		$data = array();
-		$data[0] = '<b><a href="index.php?sec=network&sec2=operation/agentes/networkmap&tab=view&id_networkmap=' . $network_map['id_networkmap'] . '">' . $network_map['name'] . '</a></b>';
+		$data[0] = '<b><a href="index.php?sec=network&sec2=operation/agentes/networkmap&tab=' . $network_map['type']
+			. '&id_networkmap=' . $network_map['id_networkmap'] . '">' . $network_map['name'] . '</a></b>';
 		$data[1] = $network_map['type'];
+		$data[2] = ui_print_group_icon ($network_map['store_group'], true);
 		
-		$data[2] = ui_print_group_icon ($network_map['id_group'], true);
-		if (check_acl ($config['id_user'], 0, "RW") || check_acl ($config['id_user'], 0, "RM")) {
-			$data[3] = '<a href="index.php?sec=network&sec2=operation/agentes/networkmap&tab=edit&edit_networkmap=1&id_networkmap=' . $network_map['id_networkmap'] . '" alt="' . __('Config') . '">' . html_print_image("images/config.png", true) . '</a>';
-			$data[4] = '<a href="index.php?sec=network&sec2=operation/agentes/networkmap_list&delete_networkmap=1&id_networkmap=' . $network_map['id_networkmap'] . '" alt="' . __('Delete') . '" onclick="javascript: if (!confirm(\'' . __('Are you sure?') . '\')) return false;">' . html_print_image('images/cross.png', true) . '</a>';
+		if ($networkmap_write || $networkmap_manage) {
+			$data[3] = '<a href="index.php?sec=network&sec2=operation/agentes/networkmap_list&delete_networkmap=1&id_networkmap=' . $network_map['id_networkmap'] . '" alt="' . __('Delete') . '" onclick="javascript: if (!confirm(\'' . __('Are you sure?') . '\')) return false;">' . html_print_image('images/cross.png', true) . '</a>';
 			// The value of the checkbox will be the networkmap id to recover it in js to perform the massive deletion
-			$data[5] = html_print_checkbox('check_delete', $network_map['id_networkmap'], false, true);
+			$data[4] = html_print_checkbox('check_delete', $network_map['id_networkmap'], false, true);
 		}
 		
 		$table->data[] = $data;
@@ -224,7 +234,7 @@ else {
 }
 
 // Create networkmap form
-if (check_acl ($config['id_user'], 0, "RW") || check_acl ($config['id_user'], 0, "RM")) {
+if ($networkmaps_write || $networkmaps_manage) {
 	$table_manage = new StdClass();
 	$table_manage->width = "100%";
 	$table_manage->style = array();

pandora_console/operation/agentes/stat_win.php

@@ -55,9 +55,10 @@ if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
 }
 
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css"/>';
-
+$label = str_replace('%3D', '=', get_parameter('label', ''));
+$label = base64_decode($label);
 $id = get_parameter('id');
-$label = base64_decode(get_parameter('label', ''));
+//$label = rawurldecode(urldecode(base64_decode(get_parameter('label', ''))));
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

pandora_console/operation/agentes/ver_agente.php

@@ -246,7 +246,12 @@ if (is_ajax ()) {
 			
 			foreach ($idAgents as $idA) {
 				if (empty($metaconsole_server_name)) {
+					if (strstr($idA, "|@_@|")) {
+							$row = explode ('|@_@|', $idA);
+					}
+					else {
 						$row = explode ('|', $idA);
+					}
 					$server_name = $row[0];
 					$id_agent = $row [1];
 				}
@@ -438,6 +443,7 @@ if (is_ajax ()) {
 		
 		$server = null;
 		if ($metaconsole) {
+			$strict_user = (bool) db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
 			$server = db_get_row('tmetaconsole_setup', 'id', $id_server);
 			
 			if (metaconsole_connect($server) != NOERR) {
@@ -527,7 +533,7 @@ if (is_ajax ()) {
 			$size_bad_modules = sizeof ($bad_modules);
 		
 		// Modules down
-		if ($size_bad_modules > 0) {
+		if ($size_bad_modules > 0 && (!$metaconsole || !$strict_user)) {
 			echo '<strong>'.__('Monitors down').':</strong> '.$size_bad_modules.' / '.$total_modules;
 			echo '<ul>';
 			foreach ($bad_modules as $module) {
@@ -561,7 +567,7 @@ if (is_ajax ()) {
 			$alert_modules = db_get_sql ($sql);
 		}
 		
-		if ($alert_modules > 0) {
+		if ($alert_modules > 0 && (!$metaconsole || !$strict_user)) {
 			$sql = sprintf ('SELECT tagente_modulo.nombre, talert_template_modules.last_fired
 				FROM talert_template_modules, tagente_modulo, tagente
 				WHERE tagente.id_agente = %d

pandora_console/operation/events/events_list.php

@@ -233,6 +233,9 @@ if (check_acl ($config["id_user"], 0, "EW") || check_acl ($config["id_user"], 0,
 	$table->rowid[1] = 'save_filter_row1';
 	$data[0] = __('Filter name') . $jump;
 	$data[0] .= html_print_input_text ('id_name', '', '', 15, 255, true);
+	if(defined('METACONSOLE'))
+		$data[1] = __('Group') . $jump;
+	else
 		$data[1] = __('Filter group') . $jump;
 	# Fix : Only admin users can see group ALL
 	$data[1] .= html_print_select_groups($config['id_user'], "ER", users_can_manage_group_all(), "id_group", $id_group, '', '', 0, true, false, false, 'w130', false, '', false, false, 'id_grupo', $strict_user);
@@ -469,6 +472,10 @@ if (!$meta) {
 }
 else {
 	$data[1] = __('Server') . $jump;
+	if ($strict_user)
+		$data[1] .= html_print_select('','server_id',
+						$server_id, 'script', __('All'), '0', true);
+	else
 		$data[1] .= html_print_select_from_sql(
 						'SELECT id, server_name FROM tmetaconsole_setup',
 						'server_id', $server_id, 'script', __('All'), '0', true);

pandora_console/operation/tree.php

@@ -235,7 +235,8 @@ enterprise_hook('close_meta_frame');
 	
 	$("form#tree_search").submit(function(e) {
 		e.preventDefault();
-	
+		$(".tree-element-detail-content").hide();
+		$(".tree-controller-detail-recipient").hide();
 		processTreeSearch();
 	});
 	

pandora_console/operation/visual_console/render_view.php

@@ -74,7 +74,12 @@ $bheight = $layout["height"];
 
 $pure_url = "&pure=" . $config["pure"];
 
-if (! check_acl ($config["id_user"], $id_group, "RR")) {
+// ACL
+$vconsole_read = check_acl ($config["id_user"], $id_group, "VR");
+$vconsole_write = check_acl ($config["id_user"], $id_group, "VW");
+$vconsole_manage = check_acl ($config["id_user"], $id_group, "VM");
+
+if (! $vconsole_read) {
 	db_pandora_audit("ACL Violation",
 		"Trying to access visual console without group access");
 	require ("general/noaccess.php");
@@ -89,7 +94,7 @@ $options['consoles_list']['text'] =
 	html_print_image ("images/visual_console.png", true,
 		array ("title" => __('Visual consoles list'))) . '</a>';
 
-if (check_acl ($config["id_user"], $id_group, "RW")) {
+if ($vconsole_write || $vconsole_manage) {
 	$url_base = 'index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&action=';
 	
 	$hash = md5($config["dbpass"] . $id_layout . $config["id_user"]);
@@ -123,7 +128,7 @@ if (check_acl ($config["id_user"], $id_group, "RW")) {
 $options['view']['text'] = '<a href="index.php?sec=reporting&sec2=operation/visual_console/render_view&id=' . $id_layout . '&refr=' . $view_refresh . '">' . html_print_image ("images/operation.png", true, array ("title" => __('View'))) .'</a>';
 $options['view']['active'] = true;
 
-if (!defined('METACONSOLE')) {
+if (! defined('METACONSOLE')) {
 	if ($config["pure"] == 0) {
 		$options['pure']['text'] = '<a href="index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;id='.$id_layout.'&amp;refr='.((int)get_parameter('refr', 0)).'&amp;pure=1">' . html_print_image ("images/full_screen.png", true, array ("title" => __('Full screen mode')))
 			. "</a>";
@@ -138,18 +143,15 @@ if (!defined('METACONSOLE')) {
 		$options = array('view' => $options['view'], 'pure' => $options['pure']);
 	}
 	$options['pure']['active'] = false;
-}
 	
-//Set the hidden value for the javascript
-if (defined('METACONSOLE')) {
-	html_print_input_hidden('metaconsole', 1);
-}
-else {
+	//Set the hidden value for the javascript
 	html_print_input_hidden('metaconsole', 0);
 	ui_print_page_header ($layout_name, "images/visual_console.png", false, '', false, $options);
 }
-
-
+else {
+	//Set the hidden value for the javascript
+	html_print_input_hidden('metaconsole', 1);
+}
 
 visual_map_print_visual_map ($id_layout);
 

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.0dev
-%define release     150327
+%define release     150413
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.0dev
-%define release     150327
+%define release     150413
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.data.oracle.sql

@@ -317,11 +317,11 @@ END;;
 --
 BEGIN
 LOCK TABLE tperfil IN EXCLUSIVE MODE;
-INSERT INTO tperfil VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0);
-INSERT INTO tperfil VALUES (2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0);
-INSERT INTO tperfil VALUES (3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1);
-INSERT INTO tperfil VALUES (4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1);
-INSERT INTO tperfil VALUES (5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
+INSERT INTO tperfil VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0);
+INSERT INTO tperfil VALUES (2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0);
+INSERT INTO tperfil VALUES (3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1,1,1,1,1,1,1);
+INSERT INTO tperfil VALUES (4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1);
+INSERT INTO tperfil VALUES (5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
 COMMIT;
 END;;
 

pandora_console/pandoradb.data.postgreSQL.sql

@@ -289,7 +289,7 @@ SELECT setval('tusuario_perfil_id_up_seq', (SELECT (SELECT MAX(id_up) FROM tusua
 --
 -- Dumping data for table "tperfil"
 --
-INSERT INTO "tperfil" VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
+INSERT INTO "tperfil" VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
 SELECT setval('tperfil_id_perfil_seq', (SELECT (SELECT MAX(id_perfil) FROM tperfil)));
 
 --

pandora_console/pandoradb.oracle.sql

@@ -823,23 +823,29 @@ CREATE TABLE torigen (
 CREATE TABLE tperfil (
 	id_perfil NUMBER(10, 0) NOT NULL PRIMARY KEY,
 	name CLOB default '',
-	incident_edit NUMBER(5, 0) default 0 NOT NULL,
-	incident_view NUMBER(5, 0) default 0 NOT NULL,
-	incident_management NUMBER(5, 0) default 0 NOT NULL,
-	agent_view NUMBER(5, 0) default 0 NOT NULL,
-	agent_edit NUMBER(5, 0) default 0 NOT NULL,
-	alert_edit NUMBER(5, 0) default 0 NOT NULL,
-	user_management NUMBER(5, 0) default 0 NOT NULL,
-	db_management NUMBER(5, 0) default 0 NOT NULL,
-	alert_management NUMBER(5, 0) default 0 NOT NULL,
-	pandora_management NUMBER(5, 0) default 0 NOT NULL,
-	report_view NUMBER(5, 0) default 0 NOT NULL,
-	report_edit NUMBER(5, 0) default 0 NOT NULL,
-	report_management NUMBER(5, 0) default 0 NOT NULL,
-	event_view NUMBER(5, 0) default 0 NOT NULL,
-	event_edit NUMBER(5, 0) default 0 NOT NULL,
-	event_management NUMBER(5, 0) default 0 NOT NULL,
-	agent_disable NUMBER(5, 0) default 0 NOT NULL
+	incident_edit NUMBER(1, 0) default 0 NOT NULL,
+	incident_view NUMBER(1, 0) default 0 NOT NULL,
+	incident_management NUMBER(1, 0) default 0 NOT NULL,
+	agent_view NUMBER(1, 0) default 0 NOT NULL,
+	agent_edit NUMBER(1, 0) default 0 NOT NULL,
+	alert_edit NUMBER(1, 0) default 0 NOT NULL,
+	user_management NUMBER(1, 0) default 0 NOT NULL,
+	db_management NUMBER(1, 0) default 0 NOT NULL,
+	alert_management NUMBER(1, 0) default 0 NOT NULL,
+	pandora_management NUMBER(1, 0) default 0 NOT NULL,
+	report_view NUMBER(1, 0) default 0 NOT NULL,
+	report_edit NUMBER(1, 0) default 0 NOT NULL,
+	report_management NUMBER(1, 0) default 0 NOT NULL,
+	event_view NUMBER(1, 0) default 0 NOT NULL,
+	event_edit NUMBER(1, 0) default 0 NOT NULL,
+	event_management NUMBER(1, 0) default 0 NOT NULL,
+	agent_disable NUMBER(1, 0) default 0 NOT NULL,
+	map_view NUMBER(1, 0) default 0 NOT NULL,
+	map_edit NUMBER(1, 0) default 0 NOT NULL,
+	map_management NUMBER(1, 0) default 0 NOT NULL,
+	vconsole_view NUMBER(1, 0) default 0 NOT NULL,
+	vconsole_edit NUMBER(1, 0) default 0 NOT NULL,
+	vconsole_management NUMBER(1, 0) default 0 NOT NULL
 );
 
 CREATE SEQUENCE tperfil_s INCREMENT BY 1 START WITH 1;

pandora_console/pandoradb.postgreSQL.sql

@@ -738,7 +738,13 @@ CREATE TABLE "tperfil" (
 	"event_view" SMALLINT NOT NULL default 0,
 	"event_edit" SMALLINT NOT NULL default 0,
 	"event_management" SMALLINT NOT NULL default 0,
-	"agent_disable" SMALLINT NOT NULL default 0
+	"agent_disable" SMALLINT NOT NULL default 0,
+	"map_view" SMALLINT NOT NULL default 0,
+	"map_edit" SMALLINT NOT NULL default 0,
+	"map_management" SMALLINT NOT NULL default 0,
+	"vconsole_view" SMALLINT NOT NULL default 0,
+	"vconsole_edit" SMALLINT NOT NULL default 0,
+	"vconsole_management" SMALLINT NOT NULL default 0
 );
 
 -- ---------------------------------------------------------------------

pandora_console/pandoradb.sql

@@ -782,23 +782,29 @@ CREATE TABLE IF NOT EXISTS `torigen` (
 CREATE TABLE IF NOT EXISTS `tperfil` (
 	`id_perfil` int(10) unsigned NOT NULL auto_increment,
 	`name` TEXT NOT NULL,
-	`incident_edit` tinyint(3) NOT NULL default '0',
-	`incident_view` tinyint(3) NOT NULL default '0',
-	`incident_management` tinyint(3) NOT NULL default '0',
-	`agent_view` tinyint(3) NOT NULL default '0',
-	`agent_edit` tinyint(3) NOT NULL default '0',
-	`alert_edit` tinyint(3) NOT NULL default '0',
-	`user_management` tinyint(3) NOT NULL default '0',
-	`db_management` tinyint(3) NOT NULL default '0',
-	`alert_management` tinyint(3) NOT NULL default '0',
-	`pandora_management` tinyint(3) NOT NULL default '0',
-	`report_view` tinyint(3) NOT NULL default '0',
-	`report_edit` tinyint(3) NOT NULL default '0',
-	`report_management` tinyint(3) NOT NULL default '0',
-	`event_view` tinyint(3) NOT NULL default '0',
-	`event_edit` tinyint(3) NOT NULL default '0',
-	`event_management` tinyint(3) NOT NULL default '0',
-	`agent_disable` tinyint(3) NOT NULL default '0',
+	`incident_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`incident_view` tinyint(1) NOT NULL DEFAULT 0,
+	`incident_management` tinyint(1) NOT NULL DEFAULT 0,
+	`agent_view` tinyint(1) NOT NULL DEFAULT 0,
+	`agent_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`alert_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`user_management` tinyint(1) NOT NULL DEFAULT 0,
+	`db_management` tinyint(1) NOT NULL DEFAULT 0,
+	`alert_management` tinyint(1) NOT NULL DEFAULT 0,
+	`pandora_management` tinyint(1) NOT NULL DEFAULT 0,
+	`report_view` tinyint(1) NOT NULL DEFAULT 0,
+	`report_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`report_management` tinyint(1) NOT NULL DEFAULT 0,
+	`event_view` tinyint(1) NOT NULL DEFAULT 0,
+	`event_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`event_management` tinyint(1) NOT NULL DEFAULT 0,
+	`agent_disable` tinyint(1) NOT NULL DEFAULT 0,
+	`map_view` tinyint(1) NOT NULL DEFAULT 0,
+	`map_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`map_management` tinyint(1) NOT NULL DEFAULT 0,
+	`vconsole_view` tinyint(1) NOT NULL DEFAULT 0,
+	`vconsole_edit` tinyint(1) NOT NULL DEFAULT 0,
+	`vconsole_management` tinyint(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY  (`id_perfil`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

pandora_console/pandoradb_data.sql

@@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('graph_res','5'),
 ('step_compact','1'),
 ('db_scheme_version','6.0dev'),
-('db_scheme_build','PD150327'),
+('db_scheme_build','PD150413'),
 ('show_unknown','0'),
 ('show_lastalerts','1'),
 ('style','pandora'),
@@ -279,7 +279,7 @@ INSERT INTO `tusuario_perfil` (`id_up`, `id_usuario`, `id_perfil`, `id_grupo`, `
 -- Dumping data for table `tperfil`
 --
 
-INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
+INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
 
 --
 -- Dumping data for table `tnews`

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 6.0dev-150327
+Version: 6.0dev-150413
 Architecture: all
 Priority: optional
 Section: admin