Merge branch 'develop' into feature/NewView

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 6.0dev-150406
+Version: 6.0dev-150408
 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-150406"
+pandora_version="6.0dev-150408"
 
 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 => '150406';
+use constant AGENT_BUILD => '150408';
 
 # 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     150406
+%define release     150408
 
 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     150406
+%define release     150408
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{150406}
+{150408}
 
 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 150406)")
+#define PANDORA_VERSION ("6.0dev(Build 150408)")
 
 string pandora_path;
 string pandora_dir;

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 150406))"
+      VALUE "ProductVersion", "(6.0dev(Build 150408))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 6.0dev-150406
+Version: 6.0dev-150408
 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-150406"
+pandora_version="6.0dev-150408"
 
 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/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;
+		// Events
-		$report_management = 0;
 		$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"];
+		// Events
-		$report_management = (bool) $profile["report_management"];
 		$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 .
+		$info = 'Name: ' . $name .
-			' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit .
+				
-			' Alert edit: ' . $alert_edit . ' User management: ' . $user_management .
+				' Incident view: ' . $incident_view .
-			' DB management: ' . $db_management . ' Alert management: ' . $alert_management .
+				' Incident edit: ' . $incident_edit .
-			' Report view: ' . $report_view . ' Report edit: ' . $report_edit .
+				' Incident management: ' . $incident_management .
-			' Report management: ' . $report_management . ' Event view: ' . $event_view .
+				
-			' Event edit: ' . $event_edit . ' Event management: ' . $event_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');
+	// Name
-	$table->data[0][1] = html_print_input_text ('name', $name, '', 30, 60, true);
+	$row = array();
-	$table->data[1][0] = __('View incidents');
+	$row['name'] = __('Profile name');
-	$table->data[1][1] = html_print_checkbox ('incident_view', 1, $incident_view, true);
+	$row['input'] = html_print_input_text ('name', $name, '', 30, 60, true);
-	$table->data[2][0] = __('Edit incidents');
+	$table->data['name'] = $row;
-	$table->data[2][1] = html_print_checkbox ('incident_edit', 1, $incident_edit, true);
+	
-	$table->data[3][0] = __('Manage incidents');
+	// Incidents
-	$table->data[3][1] = html_print_checkbox ('incident_management', 1, $incident_management, true);
+	$row = array();
-	$table->data[4][0] = __('View agents');
+	$row['name'] = __('View incidents');
-	$table->data[4][1] = html_print_checkbox ('agent_view', 1, $agent_view, true);
+	$row['input'] = html_print_checkbox ('incident_view', 1, $incident_view, true);
-	$table->data[5][0] = __('Edit agents');
+	$table->data['IR'] = $row;
-	$table->data[5][1] = html_print_checkbox ('agent_edit', 1, $agent_edit, true);
+	$row = array();
-	$table->data[6][0] = __('Disable agents');
+	$row['name'] = __('Edit incidents');
-	$table->data[6][1] = html_print_checkbox ('agent_disable', 1, $agent_disable, true);
+	$row['input'] = html_print_checkbox ('incident_edit', 1, $incident_edit, true);
-	$table->data[7][0] = __('Edit alerts');
+	$table->data['IW'] = $row;
-	$table->data[7][1] = html_print_checkbox ('alert_edit', 1, $alert_edit, true);
+	$row = array();
-	$table->data[8][0] = __('Manage users');
+	$row['name'] = __('Manage incidents');
-	$table->data[8][1] = html_print_checkbox ('user_management', 1, $user_management, true);
+	$row['input'] = html_print_checkbox ('incident_management', 1, $incident_management, true);
-	$table->data[9][0] = __('Manage Database');
+	$table->data['IM'] = $row;
-	$table->data[9][1] = html_print_checkbox ('db_management', 1, $db_management, true);
+	
-	$table->data[10][0] = __('Manage alerts');
+	// Agents
-	$table->data[10][1] = html_print_checkbox ('alert_management', 1, $alert_management, true);
+	$row = array();
-	$table->data[11][0] = __('View reports');
+	$row['name'] = __('View agents');
-	$table->data[11][1] = html_print_checkbox ('report_view', 1, $report_view, true);
+	$row['input'] = html_print_checkbox ('agent_view', 1, $agent_view, true);
-	$table->data[12][0] = __('Edit reports');
+	$table->data['AR'] = $row;
-	$table->data[12][1] = html_print_checkbox ('report_edit', 1, $report_edit, true);
+	$row = array();
-	$table->data[13][0] = __('Manage reports');
+	$row['name'] = __('Edit agents');
-	$table->data[13][1] = html_print_checkbox ('report_management', 1, $report_management, true);
+	$row['input'] = html_print_checkbox ('agent_edit', 1, $agent_edit, true);
-	$table->data[14][0] = __('View events');
+	$table->data['AW'] = $row;
-	$table->data[14][1] = html_print_checkbox ('event_view', 1, $event_view, true);
+	$row = array();
-	$table->data[15][0] = __('Edit events');
+	$row['name'] = __('Disable agents');
-	$table->data[15][1] = html_print_checkbox ('event_edit', 1, $event_edit, true);
+	$row['input'] = html_print_checkbox ('agent_disable', 1, $agent_disable, true);
-	$table->data[16][0] = __('Manage events');
+	$table->data['AD'] = $row;
-	$table->data[16][1] = html_print_checkbox ('event_management', 1, $event_management, true);
+	
-	$table->data[17][0] = __('Pandora management');
+	// Alerts
-	$table->data[17][1] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
+	$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");
+	// Events
-	$report_management = (bool) get_parameter ("report_management");
 	$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 .
+			$info = 'Name: ' . $name .
-				' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management .
+					
-				' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit .
+					' Incident view: ' . $incident_view .
-				' Alert edit: ' . $alert_edit . ' User management: ' . $user_management .
+					' Incident edit: ' . $incident_edit .
-				' DB management: ' . $db_management . ' Alert management: ' . $alert_management .
+					' Incident management: ' . $incident_management .
-				' Report view: ' . $report_view . ' Report edit: ' . $report_edit .
+					
-				' Report management: ' . $report_management . ' Event view: ' . $event_view .
+					' Agent view: ' . $agent_view .
-				' Event edit: ' . $event_edit . ' Event management: ' . $event_management .
+					' 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 .
+			$info = 'Name: ' . $name .
-				' Incident edit: ' . $incident_edit . ' Incident management: ' . $incident_management .
+					
-				' Agent view: ' . $agent_view . ' Agent edit: ' . $agent_edit .
+					' Incident view: ' . $incident_view .
-				' Alert edit: ' . $alert_edit . ' User management: ' . $user_management .
+					' Incident edit: ' . $incident_edit .
-				' DB management: ' . $db_management . ' Alert management: ' . $alert_management .
+					' Incident management: ' . $incident_management .
-				' Report view: ' . $report_view . ' Report edit: ' . $report_edit .
+					
-				' Report management: ' . $report_management . ' Event view: ' . $event_view .
+					' Agent view: ' . $agent_view .
-				' Event edit: ' . $event_edit . ' Event management: ' . $event_management .
+					' 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['IR'] = "IR" . ui_print_help_tip (__('System incidents reading'), true);
-$table->head[2] = "IW" . ui_print_help_tip (__('System incidents writing'), true);
+$table->head['IW'] = "IW" . ui_print_help_tip (__('System incidents writing'), true);
-$table->head[3] = "IM" . ui_print_help_tip (__('System incidents management'), true);
+$table->head['IM'] = "IM" . ui_print_help_tip (__('System incidents management'), true);
-$table->head[4] = "AR" . ui_print_help_tip (__('Agents reading'), true);
+$table->head['AR'] = "AR" . ui_print_help_tip (__('Agents reading'), true);
-$table->head[5] = "AW" . ui_print_help_tip (__('Agents management'), true);
+$table->head['AW'] = "AW" . ui_print_help_tip (__('Agents management'), true);
-$table->head[6] = "AD" . ui_print_help_tip (__('Agents disable'), true);
+$table->head['AD'] = "AD" . ui_print_help_tip (__('Agents disable'), true);
-$table->head[7] = "LW" . ui_print_help_tip (__('Alerts editing'), true);
+$table->head['LW'] = "LW" . ui_print_help_tip (__('Alerts editing'), true);
-$table->head[8] = "UM" . ui_print_help_tip (__('Users management'), true);
+$table->head['LM'] = "LM" . ui_print_help_tip (__('Alerts management'), true);
-$table->head[9] = "DM" . ui_print_help_tip (__('Database management'), true);
+$table->head['UM'] = "UM" . ui_print_help_tip (__('Users management'), true);
-$table->head[10] = "LM" . ui_print_help_tip (__('Alerts management'), true);
+$table->head['DM'] = "DM" . ui_print_help_tip (__('Database management'), true);
-$table->head[11] = "RR" . ui_print_help_tip (__('Reports reading'), true);
+$table->head['ER'] = "ER" . ui_print_help_tip (__('Events reading'), true);
-$table->head[12] = "RW" . ui_print_help_tip (__('Reports writing'), true);
+$table->head['EW'] = "EW" . ui_print_help_tip (__('Events writing'), true);
-$table->head[13] = "RM" . ui_print_help_tip (__('Reports management'), true);
+$table->head['EM'] = "EM" . ui_print_help_tip (__('Events management'), true);
-$table->head[14] = "ER" . ui_print_help_tip (__('Events reading'), true);
+$table->head['RR'] = "RR" . ui_print_help_tip (__('Reports reading'), true);
-$table->head[15] = "EW" . ui_print_help_tip (__('Events writing'), true);
+$table->head['RW'] = "RW" . ui_print_help_tip (__('Reports writing'), true);
-$table->head[16] = "EM" . ui_print_help_tip (__('Events management'), true);
+$table->head['RM'] = "RM" . ui_print_help_tip (__('Reports management'), true);
-$table->head[17] = "PM" . ui_print_help_tip (__('Systems management'), true);
+$table->head['MR'] = "MR" . ui_print_help_tip (__('Network maps reading'), true);
-$table->head[18] = '<span title="Operations">' . __('Op.') . '</span>';
+$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['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[1] = ($profile["incident_view"] ? $img : '');
+	$data['IR'] = ($profile["incident_view"] ? $img : '');
-	$data[2] = ($profile["incident_edit"] ? $img : '');
+	$data['IW'] = ($profile["incident_edit"] ? $img : '');
-	$data[3] = ($profile["incident_management"] ? $img : '');
+	$data['IM'] = ($profile["incident_management"] ? $img : '');
-	$data[4] = ($profile["agent_view"] ? $img : '');
+	$data['AR'] = ($profile["agent_view"] ? $img : '');
-	$data[5] = ($profile["agent_edit"] ? $img : '');
+	$data['AW'] = ($profile["agent_edit"] ? $img : '');
-	$data[6] = ($profile["agent_disable"] ? $img : '');
+	$data['AD'] = ($profile["agent_disable"] ? $img : '');
-	$data[7] = ($profile["alert_edit"] ? $img : '');
+	$data['LW'] = ($profile["alert_edit"] ? $img : '');
-	$data[8] = ($profile["user_management"] ? $img : '');
+	$data['LM'] = ($profile["alert_management"] ? $img : '');
-	$data[9] = ($profile["db_management"] ? $img : '');
+	$data['UM'] = ($profile["user_management"] ? $img : '');
-	$data[10] = ($profile["alert_management"] ? $img : '');
+	$data['DM'] = ($profile["db_management"] ? $img : '');
-	$data[11] = ($profile["report_view"] ? $img : '');
+	$data['ER'] = ($profile["event_view"] ? $img : '');
-	$data[12] = ($profile["report_edit"] ? $img : '');
+	$data['EW'] = ($profile["event_edit"] ? $img : '');
-	$data[13] = ($profile["report_management"] ? $img : '');
+	$data['EM'] = ($profile["event_management"] ? $img : '');
-	$data[14] = ($profile["event_view"] ? $img : '');
+	$data['RR'] = ($profile["report_view"] ? $img : '');
-	$data[15] = ($profile["event_edit"] ? $img : '');
+	$data['RW'] = ($profile["report_edit"] ? $img : '');
-	$data[16] = ($profile["event_management"] ? $img : '');
+	$data['RM'] = ($profile["report_management"] ? $img : '');
-	$data[17] = ($profile["pandora_management"] ? $img : '');
+	$data['MR'] = ($profile["map_view"] ? $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['MW'] = ($profile["map_edit"] ? $img : '');
-	$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['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/config_process.php

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

pandora_console/include/functions.php

@@ -1874,6 +1874,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;

pandora_console/install.php

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

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];
 				}

pandora_console/operation/events/events_list.php

@@ -472,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/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.0dev
-%define release     150406
+%define release     150408
 
 # 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     150406
+%define release     150408
 %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 (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);
+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);
+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);
+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);
+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_edit NUMBER(1, 0) default 0 NOT NULL,
-	incident_view NUMBER(5, 0) default 0 NOT NULL,
+	incident_view NUMBER(1, 0) default 0 NOT NULL,
-	incident_management NUMBER(5, 0) default 0 NOT NULL,
+	incident_management NUMBER(1, 0) default 0 NOT NULL,
-	agent_view NUMBER(5, 0) default 0 NOT NULL,
+	agent_view NUMBER(1, 0) default 0 NOT NULL,
-	agent_edit NUMBER(5, 0) default 0 NOT NULL,
+	agent_edit NUMBER(1, 0) default 0 NOT NULL,
-	alert_edit NUMBER(5, 0) default 0 NOT NULL,
+	alert_edit NUMBER(1, 0) default 0 NOT NULL,
-	user_management NUMBER(5, 0) default 0 NOT NULL,
+	user_management NUMBER(1, 0) default 0 NOT NULL,
-	db_management NUMBER(5, 0) default 0 NOT NULL,
+	db_management NUMBER(1, 0) default 0 NOT NULL,
-	alert_management NUMBER(5, 0) default 0 NOT NULL,
+	alert_management NUMBER(1, 0) default 0 NOT NULL,
-	pandora_management NUMBER(5, 0) default 0 NOT NULL,
+	pandora_management NUMBER(1, 0) default 0 NOT NULL,
-	report_view NUMBER(5, 0) default 0 NOT NULL,
+	report_view NUMBER(1, 0) default 0 NOT NULL,
-	report_edit NUMBER(5, 0) default 0 NOT NULL,
+	report_edit NUMBER(1, 0) default 0 NOT NULL,
-	report_management NUMBER(5, 0) default 0 NOT NULL,
+	report_management NUMBER(1, 0) default 0 NOT NULL,
-	event_view NUMBER(5, 0) default 0 NOT NULL,
+	event_view NUMBER(1, 0) default 0 NOT NULL,
-	event_edit NUMBER(5, 0) default 0 NOT NULL,
+	event_edit NUMBER(1, 0) default 0 NOT NULL,
-	event_management NUMBER(5, 0) default 0 NOT NULL,
+	event_management NUMBER(1, 0) default 0 NOT NULL,
-	agent_disable NUMBER(5, 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_edit` tinyint(1) NOT NULL DEFAULT 0,
-	`incident_view` tinyint(3) NOT NULL default '0',
+	`incident_view` tinyint(1) NOT NULL DEFAULT 0,
-	`incident_management` tinyint(3) NOT NULL default '0',
+	`incident_management` tinyint(1) NOT NULL DEFAULT 0,
-	`agent_view` tinyint(3) NOT NULL default '0',
+	`agent_view` tinyint(1) NOT NULL DEFAULT 0,
-	`agent_edit` tinyint(3) NOT NULL default '0',
+	`agent_edit` tinyint(1) NOT NULL DEFAULT 0,
-	`alert_edit` tinyint(3) NOT NULL default '0',
+	`alert_edit` tinyint(1) NOT NULL DEFAULT 0,
-	`user_management` tinyint(3) NOT NULL default '0',
+	`user_management` tinyint(1) NOT NULL DEFAULT 0,
-	`db_management` tinyint(3) NOT NULL default '0',
+	`db_management` tinyint(1) NOT NULL DEFAULT 0,
-	`alert_management` tinyint(3) NOT NULL default '0',
+	`alert_management` tinyint(1) NOT NULL DEFAULT 0,
-	`pandora_management` tinyint(3) NOT NULL default '0',
+	`pandora_management` tinyint(1) NOT NULL DEFAULT 0,
-	`report_view` tinyint(3) NOT NULL default '0',
+	`report_view` tinyint(1) NOT NULL DEFAULT 0,
-	`report_edit` tinyint(3) NOT NULL default '0',
+	`report_edit` tinyint(1) NOT NULL DEFAULT 0,
-	`report_management` tinyint(3) NOT NULL default '0',
+	`report_management` tinyint(1) NOT NULL DEFAULT 0,
-	`event_view` tinyint(3) NOT NULL default '0',
+	`event_view` tinyint(1) NOT NULL DEFAULT 0,
-	`event_edit` tinyint(3) NOT NULL default '0',
+	`event_edit` tinyint(1) NOT NULL DEFAULT 0,
-	`event_management` tinyint(3) NOT NULL default '0',
+	`event_management` tinyint(1) NOT NULL DEFAULT 0,
-	`agent_disable` tinyint(3) 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','PD150406'),
+('db_scheme_build','PD150408'),
 ('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-150406
+Version: 6.0dev-150408
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/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-150406"
+pandora_version="6.0dev-150408"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "6.0dev";
-my $pandora_build = "150406";
+my $pandora_build = "150408";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     6.0dev
-%define release     150406
+%define release     150408
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     6.0dev
-%define release     150406
+%define release     150408
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/util/pandora_db.pl

@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "6.0dev PS150406";
+my $version = "6.0dev PS150408";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "6.0dev PS150406";
+my $version = "6.0dev PS150408";
 
 # save program name for logging
 my $progname = basename($0);