From 10c94d51d9c72551cde4bb5b590cf4f15e905db0 Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alex@artica.es>
Date: Fri, 10 Apr 2015 12:34:42 +0200
Subject: [PATCH] Error fixes

---
 .../godmode/reporting/map_builder.php         |  2 +-
 .../reporting/visual_console_builder.php      | 35 +++++++++----------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 8b7fdb26d6..c1b8d5eaa0 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -260,7 +260,7 @@ 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"');
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 449ba31136..f3ab691db0 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -26,8 +26,21 @@ enterprise_include_once('include/functions_visual_map.php');
 set_unless_defined ($idVisualConsole, 0); // Set default
 $idVisualConsole = get_parameter('id_visual_console', $idVisualConsole);
 
+if (!defined('METACONSOLE')) {
+	$action_name_parameter = 'action';
+}
+else {
+	$action_name_parameter = 'action2';
+}
+
+$action = get_parameterBetweenListValues($action_name_parameter,
+	array('new', 'save', 'edit', 'update', 'delete', 'multiple_delete'),
+	'new');
+
+$activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'wizard_services', 'editor'), 'data');
+
 // Visual console creation tab and actions
-if ($activeTab == "data" && ($action == "new" || $action == "save")) {
+if (empty($idVisualConsole)) {
 	$visualConsole = null;
 	
 	// General ACL
@@ -35,8 +48,8 @@ if ($activeTab == "data" && ($action == "new" || $action == "save")) {
 	$vconsole_write = check_acl ($config['id_user'], 0, "VW");
 	$vconsole_manage = check_acl ($config['id_user'], 0, "VM");
 }
-// Retrieving the visual console data
-else if (!empty($idVisualConsole)) {
+// 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));
@@ -57,8 +70,6 @@ else if (!empty($idVisualConsole)) {
 	$vconsole_write = check_acl ($config['id_user'], $visualConsole['id_group'], "VW");
 	$vconsole_manage = check_acl ($config['id_user'], $visualConsole['id_group'], "VM");
 }
-// The visual console should exist.
-// The only exception is the visual console creation.
 else {
 	db_pandora_audit("ACL Violation",
 		"Trying to access report builder");
@@ -74,25 +85,11 @@ if (!$vconsole_write && !$vconsole_manage) {
 	exit;
 }
 
-
 $pure = (int) get_parameter ('pure', 0);
 $refr = (int) get_parameter ('refr', $config['vc_refr']);
 
 $id_layout = 0;
 
-if (!defined('METACONSOLE')) {
-	$action_name_parameter = 'action';
-}
-else {
-	$action_name_parameter = 'action2';
-}
-
-$action = get_parameterBetweenListValues($action_name_parameter,
-	array('new', 'save', 'edit', 'update', 'delete', 'multiple_delete'),
-	'new');
-
-$activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements', 'wizard', 'wizard_services', 'editor'), 'data');
-
 
 //Save/Update data in DB
 global $statusProcessInDB;