From 614db8b523aae65034fd367ddd18f2235b61bb88 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 11:49:12 +0200
Subject: [PATCH 01/56] [Rebranding] Added product name and copyright notice to
 setup

---
 pandora_console/include/functions.php        | 28 ++++++++++++++++++++
 pandora_console/include/functions_config.php |  6 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 6c4d0a8199..d0d4fd30da 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2811,4 +2811,32 @@ function validate_address($address){
 	}
 	return true;
 }
+
+/**
+ * Get the product name.
+ *
+ * @return string If the installation is open, it will be 'Pandora FMS'.
+ * 		If the product name stored is empty, it returns 'Pandora FMS' too.
+ */
+function get_product_name () {
+	$stored_name = enterprise_hook('enterprise_get_product_name');
+	if (empty($stored_name) || $stored_name == ENTERPRISE_NOT_HOOK) {
+		return "Pandora FMS";
+	}
+	return $stored_name;
+}
+
+/**
+ * Get the copyright notice.
+ *
+ * @return string If the installation is open, it will be 'Artica ST'.
+ * 		If the product name stored is empty, it returns 'Artica ST' too.
+ */
+function get_copyright_notice () {
+	$stored_name = enterprise_hook('enterprise_get_copyright_notice');
+	if (empty($stored_name) || $stored_name == ENTERPRISE_NOT_HOOK) {
+		return "Ártica ST";
+	}
+	return $stored_name;
+}
 ?>
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 87c8e9cb6a..4f78bdf79d 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -249,7 +249,11 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
-						
+						if (!config_update_value ('rb_product_name', (string)get_parameter('rb_product_name')))
+							$error_update[] = __('Product name');
+						if (!config_update_value ('rb_copyright_notice', (string)get_parameter('rb_copyright_notice')))
+							$error_update[] = __('Copyright notice');
+
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
 							$error_update[] = __('Inventory changes blacklist');

From a3ebd008764e17b7f6c3d6cb5c2c957a22976fa7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 13:12:03 +0200
Subject: [PATCH 02/56] [Rebranding] Node setup and footer

---
 pandora_console/general/footer.php            |  4 +--
 pandora_console/general/login_required.php    |  2 +-
 pandora_console/godmode/setup/setup_auth.php  |  2 +-
 .../godmode/setup/setup_general.php           | 27 ++++++-------------
 .../godmode/setup/setup_visuals.php           | 12 ++++-----
 pandora_console/include/functions_config.php  |  6 ++---
 6 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 99cebe8f2d..33c8493e26 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -45,11 +45,11 @@ else{
 	$build_package_version = $current_package;
 }
 
-echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"]));
+echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config["MR"]));
 
 echo '</a><br />';
 echo '<a class="white footer">'. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here
-echo '</a><br /><span style="color:#eff">'.__("&reg; Ártica ST").'</span>';
+echo '</a><br /><span style="color:#eff">&reg; '.get_copyright_notice().'</span>';
 
 if (isset ($config['debug'])) {
 	$cache_info = array();
diff --git a/pandora_console/general/login_required.php b/pandora_console/general/login_required.php
index 5cb52604c5..e6486665ea 100644
--- a/pandora_console/general/login_required.php
+++ b/pandora_console/general/login_required.php
@@ -83,7 +83,7 @@ echo '<div id="login_id_dialog" title="' .
 		$table->size[1] = '60%';
 		$table->border = '5px solid';
 		
-		$table->data[0][0] = __('Language code for Pandora');
+		$table->data[0][0] = __('Language code');
 		$table->data[0][1] = html_print_select_from_sql (
 			'SELECT id_language, name FROM tlanguage',
 			'language', $config['language'] , '', '', '', true);
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 96893aa091..3adf8adf8a 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -185,7 +185,7 @@ $no_autocreate_rows = array();
 $ldap_rows = array();
 
 // Method
-$auth_methods = array ('mysql' => __('Local Pandora FMS'), 'ldap' => __('ldap'));
+$auth_methods = array ('mysql' => __('Local %s', get_product_name()), 'ldap' => __('ldap'));
 if (enterprise_installed()) {
 	add_enterprise_auth_methods($auth_methods);
 }
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index b27cc2a7c5..352f2dda56 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -49,7 +49,7 @@ if ($current_system_lang == "") {
 	$current_system_lang = "en";
 }
 
-$table->data[0][0] = __('Language code for Pandora');
+$table->data[0][0] = __('Language code');
 $table->data[0][1] = html_print_select_from_sql (
 	'SELECT id_language, name FROM tlanguage',
 	'language', $current_system_lang , '', '', '', true);
@@ -72,7 +72,7 @@ $table->data[10][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('a
 $table->data[10][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('autoupdate', 0, '', $config["autoupdate"], true);
 
 $table->data[11][0] = __('Enforce https');
-$table->data[11][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to Pandora FMS Console. Do you want to continue?') . "')) return false", '', true) .'&nbsp;&nbsp;';
+$table->data[11][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended ('https', 1, '', $config["https"], false, "if (! confirm ('" . __('If SSL is not properly configured you will lose access to %s Console. Do you want to continue?', get_product_name()) . "')) return false", '', true) .'&nbsp;&nbsp;';
 $table->data[11][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('https', 0, '', $config["https"], true);
 
 $table->data[12][0] = __('Use cert of SSL');
@@ -99,7 +99,7 @@ $table->data[16][0] = __('API password') .
 	ui_print_help_tip (__("Please be careful if you put a password put https access."), true);
 $table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
 
-$table->data[17][0] = __('Enable GIS features in Pandora Console');
+$table->data[17][0] = __('Enable GIS features');
 $table->data[17][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('activate_gis', 1, '', $config["activate_gis"], true).'&nbsp;&nbsp;';
 $table->data[17][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('activate_gis', 0, '', $config["activate_gis"], true);
 
@@ -141,7 +141,6 @@ $table->data[23][1] .= '<a id="change_timezone">'.html_print_image ('images/penc
 $table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true);
 $table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($timezone_n, 'timezone', $config["timezone"], '', '', '', true);
 
-
 $sounds = get_sounds();
 $table->data[24][0] = __('Sound for Alert fired');
 $table->data[24][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
@@ -159,12 +158,12 @@ $table->data[26][1] .= ' <a href="javascript: toggleButton(\'warning\');">' . ht
 $table->data[26][1] .= '<div id="layer_sound_warning"></div>';
 
 $table->data[28][0] = __('Public URL');
-$table->data[28][0] .= ui_print_help_tip(__('Set this value when your PandoraFMS across inverse proxy or for example with mod_proxy of Apache.') .
-	' '.__('Without the index.php such as http://domain/pandora_url/'), true);
+$table->data[28][0] .= ui_print_help_tip(__('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()) .
+	' '.__('Without the index.php such as http://domain/console_url/'), true);
 $table->data[28][1] = html_print_input_text ('public_url', $config['public_url'], '', 40, 255, true);
 
 $table->data[29][0] = __('Referer security');
-$table->data[29][0] .= ui_print_help_tip(__('When it is set as "yes" in some important sections check if the user have gone from url Pandora.'), true);
+$table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
 $table->data[29][1] = __('Yes') . '&nbsp;&nbsp;&nbsp;' .
 	html_print_radio_button ('referer_security', 1, '', $config["referer_security"], true) .
 	'&nbsp;&nbsp;';
@@ -281,20 +280,10 @@ function show_timezone () {
 }
 
 $(document).ready (function () {
-	
+
 	$("#zone").attr("hidden", true);
 	$("#timezone").attr("hidden", true);
-	
-	$("input[name='acl_enterprise']").click(function() {
-		flag = $(this).is(':checked');
-		if (flag == true) {
-			<?php
-			echo "if (! confirm ('" . __('If Enterprise ACL System is enabled without rules you will lose access to Pandora FMS Console (even admin). Do you want to continue?') . "')) return false;";
-			?>
-		}
-	});
-	
-	
+
 	$("#change_timezone").click(function () {
 		$("#zone").attr("hidden", false);
 		$("#timezone").attr("hidden", false);
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index bbe0e20d27..3e7eda10f1 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -386,7 +386,7 @@ $table_font->data[$row][1] = html_print_select($font_size_array, 'font_size',
 $row++;
 
 $table_font->data[$row][0] = __('Agent size text') .
-	ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+	ui_print_help_tip(__('When the agent name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true);
 $table_font->data[$row][1] = __('Small:') .
 	html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true);
 $table_font->data[$row][1] .= ' ' . __('Normal:') .
@@ -394,19 +394,19 @@ $table_font->data[$row][1] .= ' ' . __('Normal:') .
 $row++;
 
 $table_font->data[$row][0] = __('Module size text') .
-	ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+	ui_print_help_tip(__('When the module name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true);
 $table_font->data[$row][1] = __('Small:') .
 	html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true);
 $table_font->data[$row][1] .= ' ' . __('Normal:') .
 	html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true);
 $row++;
 
-$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('When the description name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('If the description name has a lot of characters, in some places in %s Console it is necessary to truncate it to N characters.', get_product_name()), true);
 $table_font->data[$row][1] = html_print_input_text ('description_size_text', $config["description_size_text"], '', 3, 3, true);
 $row++;
 
 $table_font->data[$row][0] = __('Item title size text') .
-	ui_print_help_tip(__('When the item title name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
+	ui_print_help_tip(__('When the item title name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console.', get_product_name()), true);
 $table_font->data[$row][1] = html_print_input_text('item_title_size_text',
 	$config["item_title_size_text"], '', 3, 3, true);
 $row++;
@@ -488,7 +488,7 @@ if (!enterprise_installed()) {
 	$disabled_graph_precision = true;
 }
 
-$table_chars->data[$row][0] = __('Data precision in PandoraFMS');
+$table_chars->data[$row][0] = __('Data precision');
 $table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true);
 $table_chars->data[$row][1] = html_print_input_text ('graph_precision', $config["graph_precision"], '', 5, 5, true, $disabled_graph_precision, false, "onChange=\"change_precision()\"");
 $row++;
@@ -665,7 +665,7 @@ $table_other->data['custom_report_front-font'][1] = html_print_select ($_fonts,
 $table_other->data['custom_report_front-logo'][0] =  __('Custom report front') . ' - ' .
 	__('Custom logo') .
 	ui_print_help_tip(
-		__("The dir of custom logos is in your www Pandora Console in \"images/custom_logo\". You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
+		__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), true);
 $table_other->data['custom_report_front-logo'][1] = html_print_select(
 	$customLogos,
 	'custom_report_front_logo',
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 4f78bdf79d..776a0e5b03 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -126,7 +126,7 @@ function config_update_config () {
 			switch ($section_setup) {
 				case 'general':
 					if (!config_update_value ('language', (string) get_parameter ('language')))
-						$error_update[] = __('Language code for Pandora');
+						$error_update[] = __('Language settings');
 					if (!config_update_value ('remote_config', (string) get_parameter ('remote_config')))
 						$error_update[] = __('Remote config directory');
 					if (!config_update_value ('loginhash_pwd', io_input_password((string) get_parameter ('loginhash_pwd'))))
@@ -149,9 +149,7 @@ function config_update_config () {
 					if (!config_update_value ('api_password', io_input_password(get_parameter('api_password'))))
 						$error_update[] = __('API password');
 					if (!config_update_value ('activate_gis', (bool) get_parameter ('activate_gis')))
-						$error_update[] = __('Enable GIS features in Pandora Console');
-					if (!config_update_value ('integria_enabled', get_parameter ('integria_enabled')))
-						$error_update[] = __('Enable Integria incidents in Pandora Console');
+						$error_update[] = __('Enable GIS features');
 					if (!config_update_value ('integria_inventory', get_parameter ('integria_inventory')))
 						$error_update[] = __('Integria inventory');
 					if (!config_update_value ('integria_api_password', io_input_password(get_parameter ('integria_api_password'))))

From 34b953964a34fc2aeecbcfde2a5267a14e7b154c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 13:42:20 +0200
Subject: [PATCH 03/56] [Rebranding] Added rebranding to extensions

---
 pandora_console/extensions/api_checker.php     |  2 +-
 pandora_console/extensions/db_status.php       |  8 ++++----
 pandora_console/extensions/net_tools.php       | 10 +++++-----
 pandora_console/extensions/pandora_logs.php    |  2 +-
 pandora_console/extensions/realtime_graphs.php | 12 ++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pandora_console/extensions/api_checker.php b/pandora_console/extensions/api_checker.php
index 6aecf21073..24f7bc31ed 100755
--- a/pandora_console/extensions/api_checker.php
+++ b/pandora_console/extensions/api_checker.php
@@ -101,7 +101,7 @@ function extension_api_checker() {
 	$table->data[] = $row;
 	
 	$row = array();
-	$row[] = __("Pandora Console URL");
+	$row[] = __("%s Console URL", get_product_name());
 	$row[] = html_print_input_text('pandora_url', $pandora_url, '', 50, 255, true);
 	$table->data[] = $row;
 	
diff --git a/pandora_console/extensions/db_status.php b/pandora_console/extensions/db_status.php
index d184850a34..84cf67022d 100755
--- a/pandora_console/extensions/db_status.php
+++ b/pandora_console/extensions/db_status.php
@@ -180,10 +180,10 @@ function extension_db_check_tables_differences($connection_test,
 	$diff_tables = array_diff($tables_test, $tables_system);
 	
 	ui_print_result_message(
-		empty($diff_tables),
-		__('Successful the DB Pandora has all tables'),
-		__('Pandora DB could not retrieve all tables. The missing tables are (%s)',
-			implode(", ", $diff_tables)));
+		!empty($diff_tables),
+		__('Success! %s DB contains all tables', get_product_name()),
+		__('%s DB could not retrieve all tables. The missing tables are (%s)',
+			get_product_name(), implode(", ", $diff_tables)));
 	
 	if (!empty($diff_tables)) {
 		foreach ($diff_tables as $table) {
diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php
index 2f18a569d4..a223f6aa96 100644
--- a/pandora_console/extensions/net_tools.php
+++ b/pandora_console/extensions/net_tools.php
@@ -313,23 +313,23 @@ function godmode_net_tools() {
 	$table->data = array();
 	
 	$table->data[0][0] = __("Traceroute path");
-	$table->data[0][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the traceroute system.'), true);
+	$table->data[0][0] .= ui_print_help_tip(__('If empty, %s will search the traceroute system.', get_product_name()), true);
 	$table->data[0][1] = html_print_input_text('traceroute_path', $traceroute_path, '', 40, 255, true);
 	
 	$table->data[1][0] = __("Ping path");
-	$table->data[1][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the ping system.'), true);
+	$table->data[1][0] .= ui_print_help_tip(__('If empty, %s will search the ping system.', get_product_name()), true);
 	$table->data[1][1] = html_print_input_text('ping_path', $ping_path, '', 40, 255, true);
 	
 	$table->data[2][0] = __("Nmap path");
-	$table->data[2][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the nmap system.'), true);
+	$table->data[2][0] .= ui_print_help_tip(__('If empty, %s will search the nmap system.', get_product_name()), true);
 	$table->data[2][1] = html_print_input_text('nmap_path', $nmap_path, '', 40, 255, true);
 	
 	$table->data[3][0] = __("Dig path");
-	$table->data[3][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the dig system.'), true);
+	$table->data[3][0] .= ui_print_help_tip(__('If empty, %s will search the dig system', get_product_name()), true);
 	$table->data[3][1] = html_print_input_text('dig_path', $dig_path, '', 40, 255, true);
 	
 	$table->data[4][0] = __("Snmpget path");
-	$table->data[4][0] .= ui_print_help_tip(__('If it is empty, Pandora searchs the snmpget system.'), true);
+	$table->data[4][0] .= ui_print_help_tip(__('If empty, %s will search the snmpget system.', get_product_name()), true);
 	$table->data[4][1] = html_print_input_text('snmpget_path', $snmpget_path, '', 40, 255, true);
 	
 	echo '<form id="form_setup" method="post" >';
diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php
index 4241018a16..71cf847fa5 100644
--- a/pandora_console/extensions/pandora_logs.php
+++ b/pandora_console/extensions/pandora_logs.php
@@ -69,7 +69,7 @@ function pandoralogs_extension_main () {
 	
 	ui_print_page_header (__("System logfile viewer"), "images/extensions.png", false, "", true, "" );
 	
-	echo "<p>" . __('Use this tool to view your Pandora FMS logfiles directly on the console') . "</p>";
+	echo "<p>" . __('Use this tool to view your %s logfiles directly on the console', get_product_name()) . "</p>";
 
 	echo "<p>" . __('You can choose the amount of information shown in general setup (Log size limit in system logs viewer extension), ' . $config['max_log_size'] * 1000 . 'B at the moment') . "</p>";
 	
diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php
index 0f0fdf6990..e8cac701bb 100644
--- a/pandora_console/extensions/realtime_graphs.php
+++ b/pandora_console/extensions/realtime_graphs.php
@@ -63,12 +63,12 @@ function pandora_realtime_graphs () {
 	$table->style['snmp_oid'] = 'font-weight: bold;';
 	$table->data = array ();
 	
-	$graph_fields['cpu_load'] = __('Pandora Server CPU');
-	$graph_fields['pending_packets'] = __('Pandora Server Pending packets');
-	$graph_fields['disk_io_wait'] = __('Pandora Server Disk IO Wait');
-	$graph_fields['apache_load'] = __('Pandora Server Apache load');
-	$graph_fields['mysql_load'] = __('Pandora Server MySQL load');
-	$graph_fields['server_load'] = __('Pandora Server load');
+	$graph_fields['cpu_load'] = __('%s Server CPU', get_product_name());
+	$graph_fields['pending_packets'] = __('Pending packages from %s Server', get_product_name());
+	$graph_fields['disk_io_wait'] = __('%s Server Disk IO Wait', get_product_name());
+	$graph_fields['apache_load'] = __('%s Server Apache load', get_product_name());
+	$graph_fields['mysql_load'] = __('%s Server MySQL load', get_product_name());
+	$graph_fields['server_load'] = __('%s Server load', get_product_name());
 	$graph_fields['snmp_interface'] = __('SNMP Interface throughput');
 	
 	$graph = get_parameter('graph', 'cpu_load');

From b9504038fa64078a11dccb4f19944f355c28de71 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 15:16:39 +0200
Subject: [PATCH 04/56] [Rebranding] First tasks

---
 .../general/firts_task/custom_graphs.php           |  7 ++++---
 pandora_console/general/firts_task/map_builder.php | 14 +++++++++-----
 .../general/firts_task/planned_downtime.php        |  9 +++++----
 pandora_console/general/firts_task/tags.php        |  6 +++---
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pandora_console/general/firts_task/custom_graphs.php b/pandora_console/general/firts_task/custom_graphs.php
index 2d63aa4382..a951bb4966 100644
--- a/pandora_console/general/firts_task/custom_graphs.php
+++ b/pandora_console/general/firts_task/custom_graphs.php
@@ -29,9 +29,10 @@ ui_print_info_message ( array('no_close'=>true, 'message'=>  __('There are no cu
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Custom Graph'); ?></h3>
-		<p id="description_task"> <?php echo __("Graphs are designed to show the data collected by Pandora FMS in a temporary scale defined by the user.
-				Pandora FMS Graphs display data in real time. They are generated every time the operator requires any of them and display the up-to-date state.
-				There are two types of graphs: The agent's automated graphs and the graphs the user customizes by using one or more modules to do so."); ?></p>
+		<p id="description_task"> <?php echo __("Graphs are designed to show the data collected by %s in a temporary scale defined by the user.
+				%s Graphs display data in real time. They are generated every time the operator requires any of them and display the up-to-date state.
+				There are two types of graphs: The agent's automated graphs and the graphs the user customizes by using one or more modules to do so.",
+				get_product_name(), get_product_name()); ?></p>
 		<form action="index.php?sec=reporting&sec2=godmode/reporting/graph_builder" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Custom Graph'); ?>" />
 		</form>
diff --git a/pandora_console/general/firts_task/map_builder.php b/pandora_console/general/firts_task/map_builder.php
index 26409ce803..e9f7451236 100755
--- a/pandora_console/general/firts_task/map_builder.php
+++ b/pandora_console/general/firts_task/map_builder.php
@@ -33,11 +33,15 @@ if ($vconsoles_write || $vconsoles_manage) {
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Visual Console'); ?></h3>
-		<p id="description_task"> <?php echo __("Pandora FMS allows you to create visual maps in which each user is able to create his own monitoring map.
-			The new visual console editor is much more practical, although the old visual console editor had its advantages. 
-			Within the new visual console, we've been successful in imitating the sensation and touch of a drawing application like GIMP. 
-			We've also simplified the editor by dividing it into several subject-matter tabs named 'Data', 'Preview', 'Wizard', 'List of Elements' and 'Editor'.
-			The elements the Pandora FMS Visual Map was designed to handle are 'static image', 'percentage bar', 'module graph' and 'simple value'. "); ?></p>
+		<p id="description_task"> <?php echo __(
+			"%s allows users to create visual maps on which each user is able to create his or her " .
+			"own monitoring map. The new visual console editor is much more practical, although the prior " .
+			"visual console editor had its advantages. On the new visual console, we've been successful in " .
+			"imitating the sensation and touch of a drawing application like GIMP. We've also simplified the " .
+			"editor by dividing it into several subject-divided tabs named 'Data', 'Preview', 'Wizard', 'List of " .
+			"Elements' and 'Editor'. The items the %s Visual Map was designed to handle are " .
+			"'static images', 'percentage bars', 'module graphs' and 'simple values'.",
+			get_product_name(), get_product_name()); ?></p>
 		<form action="index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder" method="post">
 			<?php html_print_input_hidden ('edit_layout', 1); ?>
 			<input type="submit" class="button_task" value="<?php echo __('Create Visual Console'); ?>" />
diff --git a/pandora_console/general/firts_task/planned_downtime.php b/pandora_console/general/firts_task/planned_downtime.php
index 052e12df9c..e8f38d35e9 100644
--- a/pandora_console/general/firts_task/planned_downtime.php
+++ b/pandora_console/general/firts_task/planned_downtime.php
@@ -26,10 +26,11 @@ ui_require_css_file ('firts_task');
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Planned Downtime'); ?></h3>
-		<p id="description_task"> <?php echo __("Pandora FMS contains a scheduled downtime management system. 
-						This system was designed to deactivate the alerts in the intervals whenever there is down time by deactivating the agent.
-						If an agent is deactivated, it doesn't collect information. In a down time, the down-time intervals aren't taken into 
-						account for most of the metrics or types of reports, because the agents don't contain any data within those intervals. "); ?></p>
+		<p id="description_task"> <?php echo __("%s contains a scheduled downtime management system.
+						This system was designed to deactivate alerts during specific intervals whenever there is down time by deactivating the agent.
+						If an agent is deactivated, it doesn't gather information. During down time, down-time intervals aren't taken into
+						account for most metrics or report types, because agents don't contain any data within those intervals.",
+						get_product_name()); ?></p>
 		<form action="index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Planned Downtime'); ?>" />
 		</form>
diff --git a/pandora_console/general/firts_task/tags.php b/pandora_console/general/firts_task/tags.php
index 037f7ef2e5..e0069e55c0 100755
--- a/pandora_console/general/firts_task/tags.php
+++ b/pandora_console/general/firts_task/tags.php
@@ -26,9 +26,9 @@ ui_require_css_file ('firts_task');
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Tags'); ?></h3>
-		<p id="description_task"> <?php echo __("From Pandora FMS versions 5 and above, the access to modules can be configured by a tags system.
-								Tags are configured on the system and be assigned to the chosen modules. 
-								The user's access can be limited to modules with certain tags in this way. "); ?></p>
+		<p id="description_task"> <?php echo __("Access to modules can be configured by a tagging system.
+								Tags are configured on the system and are assigned to the chosen modules.
+								A user's access can therefore be restricted to modules with certain tags."); ?></p>
 		<form action="index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=new" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Tags'); ?>" />
 		</form>

From 33abfa7f9d2945fe94c17fa1462f509106ae76a5 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 9 May 2018 18:50:45 +0200
Subject: [PATCH 05/56] [Rebranding] Other general source files. Removed
 unreached code oon general/logon_ok.php

---
 pandora_console/general/alert_enterprise.php  |  26 +--
 pandora_console/general/header.php            |   8 +-
 pandora_console/general/login_help_dialog.php |   5 +-
 .../general/login_identification_wizard.php   |  12 +-
 pandora_console/general/login_page.php        |  29 +--
 pandora_console/general/login_required.php    |   4 +-
 pandora_console/general/logon_ok.php          | 202 +-----------------
 pandora_console/general/noaccess.php          |   9 +-
 pandora_console/general/pandora_help.php      |   4 +-
 pandora_console/include/styles/pandora.css    |   4 +
 10 files changed, 59 insertions(+), 244 deletions(-)

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 66d6e36b09..3b099fe677 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -93,15 +93,17 @@ switch ($tipo) {
 	
 	case "helpmodal":
 	
-	echo __("This is the online help for Pandora FMS console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
-	<a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>");
+	echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
+  <a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
+  get_product_name(), get_product_name(), get_product_name());
 	
 	break;
 	
 	case "noaccess":
 	
-	echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br/> <br/>
-	Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+	echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br> <br>
+    Please know that all attempts to access this page are recorded in security logs of %s System Database.',
+    get_product_name());
 	
 	break;
 	
@@ -111,13 +113,13 @@ switch ($tipo) {
 
   echo 
     '<p>' .
-    	__('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
+    	__('The Update Manager client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) .
     '</p>' .
     '<p>' .
     	__('<b>OpenSource version updates are automated packages generated each week. These updates come WITHOUT ANY warranty or support. If your system is corrupted or a feature stops working properly, you will need to recover a backup by yourself.</b>') .
     '</p>' .
     '<p>' .
-    	__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in Pandora FMS Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>') .
+    	__('The Enterprise version comes with a different update system, with fully tested, professionally-supported packages, and our support team is there to help you in case of problems or queries. Update Manager is another feature present in the Enterprise version and not included in the OpenSource version. There are lots of advanced business-oriented features contained in %s Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>', get_product_name()) .
     '</p>'
     ;
     	
@@ -125,13 +127,13 @@ switch ($tipo) {
     	
     	echo 
       '<p>' .
-    		__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
+    		__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is included on %s. It helps system administrators update their %s automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.', get_product_name(), get_product_name()) .
     	'</p>' .
     	'<p>' .
-    		__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
+    		__('The Update Manager is one of the most advanced features on the %s Enterprise Edition. For more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.', get_product_name()) .
     	'</p>' .
     	'<p>' .
-    		__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.') .
+    		__('Update Manager sends anonymous information about %s usage (number of agents and modules running). To disable it, please remove the remote server address from the Update Manager plugin setup.', get_product_name()) .
     	'</p>'
     ;
     }
@@ -142,13 +144,13 @@ switch ($tipo) {
       <br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'><br><br><span style='font-style:italic;'>* Todos los logotipos pertenecen a marcas registradas</span>");
       break;
     case "massivemodal":
-      echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>");
+      echo __("Do you want to consolidate all your system monitoring? Do you have many systems, making it difficult to manage them in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? %s Enterprise Policies are exactly what you need; you'll save time, effort and annoyances. More information <a href='pandorafms.com'>pandorafms.com</a>", get_product_name());
       break;
     case "eventsmodal":
-      echo __("Pandora FMS Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.");
+      echo __("%s Enterprise also features event correlation. Through correlation you can generate realtime alerts and / or new events based on logical rules. This allows you to automate troubleshooting. If you know the value of working with events, event correlation will take you to a new level.", get_product_name());
       break;
     case "reportingmodal":
-      echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version is for you.");
+      echo __("Report generating on the Enterprise version is also more powerful: it has wizards, you can schedule emails in PDF to be sent according to the schedule you decide, and it has a template system to create personalized reports quickly for each of your customers. It will even allow your customers to generate their own reports from templates created by you. If reports are key to your business, %s Enterprise version is for you.", get_product_name());
       break;
     case "visualmodal":  
       echo __("These options are only effective on the Enterprise version.");
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 2ac1e34df4..d08ab8ae16 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -31,14 +31,14 @@ config_check();
 					$custom_logo = 'images/custom_logo/' . $config['custom_logo'];
 					
 					if (!defined ('PANDORA_ENTERPRISE')) {
-						$logo_title = 'Pandora FMS Opensource';
+						$logo_title = get_product_name() . ' Opensource';
 						$custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
 					}
 					else {
 						if (file_exists(ENTERPRISE_DIR . '/' . $custom_logo)) {
 							$custom_logo = ENTERPRISE_DIR . '/' . $custom_logo;
 						}
-						$logo_title = 'Pandora FMS Enterprise';
+						$logo_title = get_product_name() . ' Enterprise';
 					}
 					
 					echo html_print_image($custom_logo, true,
@@ -166,8 +166,8 @@ config_check();
 								true,
 								array("id" => 'clippy',
 									"class" => 'clippy',
-									"alt" => __('Pandora FMS assistant'),
-									'title' => __('Pandora FMS assistant'))) .
+									"alt" => __('%s assistant', get_product_name()),
+									'title' => __('%s assistant', get_product_name()))) .
 						'</a>';
 				}
 				
diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php
index 631d9d5ce1..c3b05e8553 100644
--- a/pandora_console/general/login_help_dialog.php
+++ b/pandora_console/general/login_help_dialog.php
@@ -36,10 +36,11 @@ if (is_ajax()) {
 
 // Prints help dialog information
 echo '<div id="login_help_dialog" title="' .
-	__('Welcome to Pandora FMS') . '" style="">';
+	__('Welcome to %s', get_product_name()) . '" style="">';
 	
 	echo '<div style="font-size: 10pt; margin: 20px;">';
-	echo __('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!');
+	echo __("If this is your first time using %s, we suggest a few links that'll help you learn more about the software. Monitoring can be overwhelming, but take your time to learn how to harness the power of %s!",
+			get_product_name(), get_product_name());
 	echo '</div>';
 	
 	echo '<div style="">';
diff --git a/pandora_console/general/login_identification_wizard.php b/pandora_console/general/login_identification_wizard.php
index 1f5cabd740..57b5b63ba3 100644
--- a/pandora_console/general/login_identification_wizard.php
+++ b/pandora_console/general/login_identification_wizard.php
@@ -138,17 +138,17 @@ if ($email == 'admin@example.com') $email = '';
 
 // Prints accept register license
 echo '<div id="login_accept_register" title="' .
-	__('The Pandora FMS community wizard') . '" style="">';
+	__('The %s community wizard', get_product_name()) . '" style="">';
 	echo '<div style="margin: 5px 0 10px; float: left; padding-left: 15px;">';
 		echo html_print_image ('images/pandora_circle_big.png', true);
 	echo '</div>';
 	echo '<div style="font-size: 12pt; margin: 5px 20px; float: left; padding-top: 23px;">';
-		echo __('Stay up to date with the Pandora FMS community') . ".";
+		echo __('Stay up to date with the %s community', get_product_name()) . ".";
 	echo '</div>';
 	
 	echo '<div id="license_newsletter">';
-		echo '<p>' . __("When you subscribe to the Pandora FMS Update Manager service, you accept that we register your Pandora instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the Update Manager options") . '.</p>';
-		echo '<p>' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about Pandora FMS and will not be conceded to third parties. You'll be able to unregister from said database at any time from the newsletter subscription options") . '.</p>';
+		echo '<p>' . __("When you subscribe to the %s Update Manager service, you accept that we register your %s instance as an identifier on the database owned by Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the Update Manager options.", get_product_name(), get_product_name(), get_product_name()) . '</p>';
+		echo '<p>' . __("In the same fashion, when subscribed to the newsletter you accept that your email will pass on to a database property of Artica TS. This data will solely be used to provide you with information about %s and will not be conceded to third parties. You can unregister from said database at any time from the newsletter subscription options.", get_product_name()) . '</p>';
 	echo '</div>';
 	
 	echo '<div style="position:absolute; margin: 0 auto; bottom: 0px; padding-top:10px; position:relative; border: 1px solid #FFF;">';
@@ -161,7 +161,7 @@ echo '<div id="login_accept_register" title="' .
 		echo '</div>';
 		echo '<div style="float: left; margin-left: 0px; width: 50%; text-align: left;">';
 			html_print_checkbox('register', 1, false, false, false, 'cursor: \'pointer\'');
-			echo '&nbsp;<span style="font-size: 12px;" id="label-register">' .__("Join the Pandora FMS community") . '!</span><br>';
+			echo '&nbsp;<span style="font-size: 12px;" id="label-register">' .__('Join the %s community!', get_product_name()) . '!</span><br>';
 			html_print_checkbox('newsletter', 1, false, false, false, 'cursor: \'pointer\'');
 			echo '&nbsp;<span style="font-size: 12px;" id="label-newsletter">' .__("Subscribe to our newsletter") . '</span>';
 			echo "<br>";
@@ -176,7 +176,7 @@ echo '</div>';
 
 // Print yes or not dialog
 echo '<div id="login_registration_yesno" title="' .
-	__('Pandora FMS instance identification wizard') . '" style="">';
+	__("%s instance identification wizard", get_product_name()) . '" style="">';
 	echo '<div style="font-size: 12pt; margin: 20px;">';
 		echo __("Do you want to continue without any registration") . "?";
 	echo '</div>';
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 7a99ae494c..f34d11e8d0 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -50,7 +50,7 @@ if (!isset($login_screen)) {
 switch ($login_screen) {
 	case 'login':
 		$logo_link = 'http://www.pandorafms.com';
-		$logo_title = __('Go to Pandora FMS Website');
+		$logo_title = __('Go to %s Website', get_product_name());
 		break;
 	case 'logout':
 	case 'double_auth':
@@ -250,17 +250,17 @@ echo '<div class="login_page">';
 	echo '</form></div>';
 	echo '<div class="login_data">';
 		echo '<div class ="text_banner_login">';
-			echo '<div><span class="span1">';
+			echo '<div><span class="span1 pandora_upper">';
 				if(file_exists (ENTERPRISE_DIR . "/load_enterprise.php")){
 					if($config['custom_title1_login']){
 						echo io_safe_output($config['custom_title1_login']);
 					}
 					else{
-						echo __('WELCOME TO PANDORA FMS');
+						echo __('WELCOME TO %s', get_product_name());
 					}
 				}
 				else{
-					echo __('WELCOME TO PANDORA FMS');
+					echo __('WELCOME TO %s', get_product_name());
 				}
 			echo '</span></div>';
 			echo '<div><span class="span2">';
@@ -380,7 +380,7 @@ if ($login_screen == 'logout'){
 			echo '<div class="content_message_alert">';
 				echo '<div class="text_message_alert">';
 					echo '<h1>'. __('Logged out') .'</h1>';
-					echo '<p>' . __('Your session is over. Please close your browser window to close this Pandora session.') .'</p>';
+					echo '<p>' . __('Your session has ended. Please close your browser window to close this %s session.', get_product_name()) .'</p>';
 				echo '</div>';
 				echo '<div class="button_message_alert">';
 					html_print_submit_button("Ok", 'hide-login-logout', false);  
@@ -393,7 +393,7 @@ if ($login_screen == 'logout'){
 switch ($login_screen) {
 	case 'error_authconfig':
 	case 'error_dbconfig':
-		$title = __('Problem with Pandora FMS database');
+		$title = __('Problem with %s database', get_product_name());
 		$message = __('Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
 		Probably your database, hostname, user or password values are incorrect or
 		the database server is not running.').'<br /><br />';
@@ -404,21 +404,22 @@ switch ($login_screen) {
 		
 		if ($error_code == 'error_authconfig') {
 			$message .= '<br/><br/>';
-			$message .= __('If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>');
+			$message .= __('If you have modified the auth system, the origin of this problem could be that %s cannot override the authorization variables from the config database. Please remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>', get_product_name());
 		}
 		break;
 	case 'error_emptyconfig':
 		$title = __('Empty configuration table');
 		$message = __('Cannot load configuration variables from database. Please check your database setup in the
-		<b>include/config.php</b> file.<i><br><br>
-		Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
-		<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-		permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>').'<br /><br />';
+			<b>include/config.php</b> file.<i><br><br>
+			Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
+			<br><br>%s Console cannot find <i>include/config.php</i> or this file has invalid
+			permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>',
+		get_product_name()).'<br /><br />';
 		break;
 	case 'error_noconfig':
 		$title = __('No configuration file found');
-		$message = __('Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-		permissions and HTTP server cannot read it. Please read documentation to fix this problem.').'<br /><br />';
+		$message = __('%s Console cannot find <i>include/config.php</i> or this file has invalid
+		permissions and HTTP server cannot read it. Please read documentation to fix this problem.', get_product_name()).'<br /><br />';
 		if (file_exists('install.php')) {
 			$link_start = '<a href="install.php">';
 			$link_end = '</a>';
@@ -433,7 +434,7 @@ switch ($login_screen) {
 	case 'error_install':
 		$title = __('Installer active');
 		$message = __('For security reasons, normal operation is not possible until you delete installer file.
-		Please delete the <i>./install.php</i> file before running Pandora FMS Console.');
+		Please delete the <i>./install.php</i> file before running %s Console.', get_product_name());
 		break;
 	case 'error_perms':
 		$title = __('Bad permission for include/config.php');
diff --git a/pandora_console/general/login_required.php b/pandora_console/general/login_required.php
index e6486665ea..1535829991 100644
--- a/pandora_console/general/login_required.php
+++ b/pandora_console/general/login_required.php
@@ -66,10 +66,10 @@ if ($email == 'admin@example.com') $email = '';
 
 // Prints first step pandora registration
 echo '<div id="login_id_dialog" title="' .
-	__('Pandora FMS instance identification wizard') . '" style="display: none;">';
+	__('%s instance identification wizard', get_product_name()) . '" style="display: none;">';
 	
 	echo '<div style="font-size: 10pt; margin: 20px;">';
-	echo __('Please fill the following information in order to configure your Pandora FMS instance successfully') . '.';
+	echo __('Please fill the following information in order to configure your %s instance successfully', get_product_name()) . '.';
 	echo '</div>';
 	
 	echo '<div style="">';
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 3a43795fd5..76c42ff43a 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -29,8 +29,6 @@ require_once ("include/functions_reporting.php");
 require_once ("include/functions_tactical.php");
 require_once ($config["homedir"] . '/include/functions_graph.php');
 
-//ui_print_page_header (__('Welcome to Pandora FMS Web Console'),'',false,"",false);
-
 if (tags_has_user_acl_tags()) {
 	ui_print_tags_warning();
 }
@@ -111,7 +109,7 @@ if (!empty($all_data)) {
 			$table->data = array ();
 			$table->headstyle[0] = 'text-align:center;';
 			$table->width = "100%";
-			$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
+			$table->head[0] = '<span>' . __('%s Overview', get_product_name()) . '</span>';
 			$table->head_colspan[0] = 4;
 			
 			// Indicators
@@ -226,7 +224,7 @@ if (!empty($all_data)) {
 			$table->head[2] = __('Date');
 			$table->head[3] = __('Source IP');
 			$table->head[4] = __('Comments');
-			$table->title = '<span>' . __('This is your last activity in Pandora FMS console') . '</span>';
+			$table->title = '<span>' . __('This is your last activity performed on the %s console', get_product_name()) . '</span>';
 			
 			switch ($config["dbtype"]) {
 				case "mysql":
@@ -294,198 +292,4 @@ if (!empty($all_data)) {
 		</td>
 		
 	</tr>
-</table>
-<?php
-return;
-// ---------------------------------------------------------------------
-// Site news !
-// ---------------------------------------------------------------------
-
-//echo '<div id="left_column_logon_ok" id="leftcolumn">';
-echo '<div style="width:30%; float:left;" id="leftcolumn">';
-
-///////////////
-// Overview Table
-///////////////
-
-$table->class = "databox";
-$table->cellpadding = 4;
-$table->cellspacing = 4;
-$table->head = array ();
-$table->data = array ();
-$table->style[0] = 'text-align:center;';
-$table->width = "100%";
-$table->head[0] = '<span>' . __('Pandora FMS Overview') . '</span>';
-$table->head_colspan[0] = 4;
-
-// Indicators
-$tdata = array();
-$tdata[0] = reporting_get_stats_indicators($data);
-$table->rowclass[] = '';
-
-$table->data[] = $tdata;
-
-// Alerts
-$tdata = array();
-$tdata[0] = reporting_get_stats_alerts($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-// Modules by status
-$tdata = array();
-$tdata[0] = reporting_get_stats_modules_status($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-// Total agents and modules
-$tdata = array();
-$tdata[0] = reporting_get_stats_agents_monitors($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-// Users
-$tdata = array();
-$tdata[0] = reporting_get_stats_users($data);
-$table->rowclass[] = '';
-$table->data[] = $tdata;
-
-html_print_table($table);
-unset($table);
-
-
-
-
-
-echo '</div>';
-
-
-// ---------------------------------------------------------------------------
-// Site stats (global!)
-// ---------------------------------------------------------------------------
-//echo '<div id="right_column_logon_ok" id="rightcolumn">';
-echo '<div style="width: 50%; float:left;" id="rightcolumn">';
-
-$options = array();
-	$options['id_user'] = $config['id_user'];
-	$options['modal'] = false;
-	$options['limit'] = 3;
-	$news = get_news($options);
-	
-	
-	if (!empty($news)) {
-		//////////////////NEWS BOARD/////////////////////////////
-		echo '<div id="news_board">';
-		
-		echo '<table cellpadding="4" cellspacing="4" class="databox">';
-		echo '<tr><th><span>' . __('News board') . '</span></th></tr>';
-		if ($config["prominent_time"] == "timestamp") {
-			$comparation_suffix = "";
-		}
-		else {
-			$comparation_suffix = __('ago');
-		}
-		foreach ($news as $article) {
-			$text = io_safe_output($article["text"]);
-			
-			
-			echo '<tr><th><b>'.$article["subject"].'</b></th></tr>';
-			echo '<tr><td>' . __('by') . ' <b>' .
-				$article["author"] . '</b> <i>' . ui_print_timestamp ($article["timestamp"], true).'</i> ' . $comparation_suffix . '</td></tr>';
-			echo '<tr><td class="datos">';
-			echo nl2br($text);
-			echo '</td></tr>';
-		}
-		echo '</table>';
-		echo '</div>'; // News board
-		
-		
-		
-		echo '<br><br>';
-		
-		//////////////////END OF NEWS BOARD/////////////////////////////
-	}
-	
-	//////////////////LAST ACTIVITY/////////////////////////////
-	
-	// Show last activity from this user
-	echo '<div id="activity">';
-	
-	$table->width = '100%'; //Don't specify px
-	$table->data = array ();
-	$table->size = array ();
-	$table->size[2] = '150px';
-	$table->size[3] = '130px';
-	$table->size[5] = '200px';
-	$table->head = array ();
-	$table->head[0] = __('User');
-	$table->head[1] = '';
-	$table->head[2] = __('Action');
-	$table->head[3] = __('Date');
-	$table->head[4] = __('Source IP');
-	$table->head[5] = __('Comments');
-	$table->title = '<span>' . __('This is your last activity in Pandora FMS console') . '</span>';
-	
-	switch ($config["dbtype"]) {
-		case "mysql":
-			$sql = sprintf ("SELECT id_usuario,accion,fecha,ip_origen,descripcion,utimestamp
-				FROM tsesion
-				WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - " . SECONDS_1WEEK . ") 
-					AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10", $config["id_user"]);
-			break;
-		case "postgresql":
-			$sql = sprintf ("SELECT \"id_usuario\", accion, fecha, \"ip_origen\", descripcion, utimestamp
-				FROM tsesion
-				WHERE (\"utimestamp\" > ceil(date_part('epoch', CURRENT_TIMESTAMP)) - " . SECONDS_1WEEK . ") 
-					AND \"id_usuario\" = '%s' ORDER BY \"utimestamp\" DESC LIMIT 10", $config["id_user"]);
-			break;
-		case "oracle":
-			$sql = sprintf ("SELECT id_usuario, accion, fecha, ip_origen, descripcion, utimestamp
-				FROM tsesion
-				WHERE ((utimestamp > ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (" . SECONDS_1DAY . ")) - " . SECONDS_1WEEK . ") 
-					AND id_usuario = '%s') AND rownum <= 10 ORDER BY utimestamp DESC", $config["id_user"]);
-			break;
-	}
-	
-	$sessions = db_get_all_rows_sql ($sql);
-	
-	if ($sessions === false)
-		$sessions = array ();
-	
-	foreach ($sessions as $session) {
-		$data = array ();
-		
-		switch ($config["dbtype"]) {
-			case "mysql":
-			case "oracle":
-				$session_id_usuario = $session['id_usuario'];
-				$session_ip_origen = $session['ip_origen'];
-				break;
-			case "postgresql":
-				$session_id_usuario = $session['id_usuario'];
-				$session_ip_origen = $session['ip_origen'];
-				break;
-		}
-		
-		
-		$data[0] = '<strong>' . $session_id_usuario . '</strong>';
-		$data[1] = ui_print_session_action_icon ($session['accion'], true);
-		$data[2] = $session['accion'];
-		$data[3] =  ui_print_help_tip($session['fecha'], true) . human_time_comparation($session['utimestamp'], 'tiny');
-		$data[4] = $session_ip_origen;
-		$data[5] = io_safe_output ($session['descripcion']);
-		
-		array_push ($table->data, $data);
-	}
-	echo "<div style='width:100%; overflow-x:auto;'>";
-	html_print_table ($table);
-	unset($table);
-	echo "</div>";
-	echo "</div>"; // activity
-	
-	//////////////////END OF LAST ACTIVIYY/////////////////////////////
-	
-
-
-echo "</div>";
-echo "<div style='clear:both'></div>";
-?>
+</table>
\ No newline at end of file
diff --git a/pandora_console/general/noaccess.php b/pandora_console/general/noaccess.php
index 7a916b81eb..5c58f5c89c 100644
--- a/pandora_console/general/noaccess.php
+++ b/pandora_console/general/noaccess.php
@@ -112,7 +112,7 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
 	
 	<div class='modalheade'>
 	<span class='modalheadertex'>
-	You don't have access to this page
+		<?php echo __("You don't have access to this page");?>
 	</span>
 	<img class='modalclose cerrar' src='<?php echo $config['homeurl'];?>images/icono_cerrar.png'>
 	
@@ -121,8 +121,11 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
 	<div class='modalconten'>
 	<img class='modalcontentim' src='<?php echo $config['homeurl'];?>images/access_denied.png'>
 	<div class='modalcontenttex'>
-		Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br/> <br/>
-		Please know that all attempts to access this page are recorded in security logs of Pandora System Database	
+		<?php
+			echo __("Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.");
+			echo "<br/> <br/>";
+			echo __("Please know that all attempts to access this page are recorded in security logs of %s System Database", get_product_name());
+		?>
 	
 	</div>
 
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index 2fe5a22700..8d04fb6bde 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -21,7 +21,7 @@ require_once ("../include/functions_html.php");
 ?>
 <html style="height:100%; margin-top: 25px; margin-left: 15px; margin-right: 15px; background-color: #333;"><head><title>
 <?php
-	echo __('Pandora FMS help system');
+	echo __('%s help system', get_product_name());
 ?>
 </title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -77,7 +77,7 @@ if (! $id || ! file_exists ($help_file)) {
 	echo "<div style='text-align: center; background-color: #fff'>";
 
 	echo "</div>";
-	echo '<div class="msg" style="padding-left: 30px;padding-right: 30px;padding-bottom: 15px;">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
+	echo '<div class="msg" style="padding-left: 30px;padding-right: 30px;padding-bottom: 15px;">'.__("%s help system has been called with a help reference that currently don't exist. There is no help content to show.", get_product_name()).'</div></div></div>';
 	echo '<br /><br />';
 	echo '<div style="text-align: center; padding: 5px; font-family: verdana, arial; font-size: 11px;">';
 	include ('footer.php');
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b1467fa7d1..293045208f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4649,4 +4649,8 @@ form ul.form_flex li ul li{
 	margin-left: 20px;
 	margin-right: 20px;
 	text-align: center;
+}
+
+.pandora_upper {
+	text-transform: uppercase;
 }
\ No newline at end of file

From d663553e8dc412d54ecc973b079024b28a883d21 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 13:08:34 +0200
Subject: [PATCH 06/56] [Rebranding] Open godmode/agentes

---
 pandora_console/godmode/agentes/agent_manager.php    |  4 ++--
 .../godmode/agentes/configurar_agente.php            |  6 +++---
 pandora_console/godmode/agentes/modificar_agente.php |  2 +-
 .../godmode/agentes/module_manager_editor.php        |  7 +------
 .../godmode/agentes/planned_downtime.editor.php      | 12 ++++++------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 89ac922aed..151b47e03a 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -409,8 +409,8 @@ if($id_agente){
 	}
 
 	$table->data[2][0] = __('Safe operation mode')
-		. ui_print_help_tip(__('This mode allow Pandora FMS to disable all modules 
-		of this agent while the selected module is on CRITICAL status'), true);
+		. ui_print_help_tip(__('This mode allow %s to disable all modules 
+		of this agent while the selected module is on CRITICAL status', get_product_name()), true);
 	$table->data[2][1] = html_print_checkbox('safe_mode', 1, $safe_mode, true);
 	$table->data[2][1] .= "&nbsp;&nbsp;" .  __('Module') . "&nbsp;" . html_print_select ($safe_mode_modules, "safe_mode_module", $safe_mode_module, "", "", 0, true);
 }
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5cf8e8a03d..c21b47733f 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1791,7 +1791,7 @@ if ($updateGIS) {
 			"altitude" => $previusAgentGISData['stored_altitude'],
 			"start_timestamp" => $previusAgentGISData['start_timestamp'],
 			"end_timestamp" => date( 'Y-m-d H:i:s'),
-			"description" => __('Save by Pandora Console'),
+			"description" => __('Save by %s Console', get_product_name()),
 			"manual_placement" => $previusAgentGISData['manual_placement'],
 			"number_of_packages" => $previusAgentGISData['number_of_packages'],
 			"tagente_id_agente" => $previusAgentGISData['tagente_id_agente']
@@ -1806,7 +1806,7 @@ if ($updateGIS) {
 			"stored_altitude" => $lastAltitude,
 			"start_timestamp" => date( 'Y-m-d H:i:s'),
 			"manual_placement" => 1,
-			"description" => __('Update by Pandora Console')),
+			"description" => __('Update by %s Console', get_product_name())),
 			array("tagente_id_agente" => $idAgente));
 	}
 	else {
@@ -1819,7 +1819,7 @@ if ($updateGIS) {
 			"stored_latitude" => $lastLatitude,
 			"stored_altitude" => $lastAltitude,
 			"manual_placement" => 1,
-			"description" => __('Insert by Pandora Console')
+			"description" => __('Insert by %s Console', get_product_name())
 		));
 	}
 }
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 8e66d50d4e..7dfd56cec6 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -60,7 +60,7 @@ $viewtab['active'] = false;
 $onheader = array('view' => $viewtab);
 
 // Header
-ui_print_page_header (__('Agents defined in Pandora'), "images/agent_mc.png", false, "", true, $onheader);
+ui_print_page_header (__('Agents defined in %s', get_product_name()), "images/agent_mc.png", false, "", true, $onheader);
 
 // Perform actions
 $agent_to_delete = (int)get_parameter('borrar_agente');
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 921296545d..4efa2767ba 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -493,12 +493,7 @@ switch ($moduletype) {
 	/* WARNING: type 7 is reserved on enterprise */
 	default:
 		if (enterprise_include ('godmode/agentes/module_manager_editor.php') === ENTERPRISE_NOT_HOOK) {
-			ui_print_error_message(sprintf(__('DEBUG: Invalid module type specified in %s:%s'), __FILE__, __LINE__));
-			echo __('Most likely you have recently upgraded from an earlier version of Pandora and either <br />
-				1) forgot to use the database converter<br />
-				2) used a bad version of the database converter (see Bugreport #2124706 for the solution)<br />
-				3) found a new bug - please report a way to duplicate this error');
-			
+			ui_print_error_message(sprintf(__('Invalid module type')));
 			return;
 		}
 		break;
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index d9646c5a98..12bf4e274c 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -522,9 +522,9 @@ $table->data[5][1] = "
 					"</td>
 				<td>".
 				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) .
+				ui_print_help_tip(__('Date format is YY/MM/DD'), 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) .
+				ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
 				"</td>
 			</tr>
 			<tr>
@@ -533,9 +533,9 @@ $table->data[5][1] = "
 					"</td>
 				<td>".
 				html_print_input_text ('once_date_to', $once_date_to, '', 10, 10, true) .
-				ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
+				ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
 				html_print_input_text ('once_time_to', $once_time_to, '', 9, 9, true) .
-				ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
+				ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
 				"</td>
 			</tr>
 		</table>
@@ -603,7 +603,7 @@ $table->data[5][1] = "
 							html_print_input_text (
 								'periodically_time_from',
 								$periodically_time_from, '', 7, 7, true, $disabled_in_execution) . 
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds.').
 								".<br>".__('The end time must be higher than the start time'), true) .
 							"</td>
 							<td>" . __('To hour:') . "</td>
@@ -611,7 +611,7 @@ $table->data[5][1] = "
 							html_print_input_text (
 								'periodically_time_to',
 								$periodically_time_to, '', 7, 7, true, $disabled_in_execution) .
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds').
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds.').
 								".<br>".__('The end time must be higher than the start time'), true) .
 							"</td>
 						</tr>

From 358847ecef76182ec1f8c04367dc52ecce7c8661 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 15:43:46 +0200
Subject: [PATCH 07/56] [Rebranding] Open godmode/<others>

---
 pandora_console/godmode/admin_access_logs.php                 | 2 +-
 pandora_console/godmode/alerts/configure_alert_template.php   | 4 ++--
 pandora_console/godmode/groups/group_list.php                 | 2 +-
 pandora_console/godmode/groups/modu_group_list.php            | 2 +-
 pandora_console/godmode/reporting/graph_builder.main.php      | 3 ---
 .../godmode/reporting/reporting_builder.item_editor.php       | 4 ++--
 .../godmode/reporting/visual_console_builder.wizard.php       | 2 +-
 pandora_console/godmode/servers/manage_recontask_form.php     | 3 +--
 pandora_console/godmode/servers/modificar_server.php          | 2 +-
 pandora_console/godmode/servers/plugin.php                    | 2 +-
 pandora_console/godmode/servers/recon_script.php              | 2 +-
 11 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index c3a8c9d0b0..8dce0c02a9 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -30,7 +30,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) {
 	exit;
 }
 
-ui_print_page_header (__('Pandora audit')." &raquo; ".__('Review Logs'), "images/gm_log.png", false, "", true );
+ui_print_page_header (__('%s audit', get_product_name())." &raquo; ".__('Review Logs'), "images/gm_log.png", false, "", true );
 
 $offset = get_parameter ("offset", 0);
 $tipo_log = get_parameter ("tipo_log", 'all');
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index cdd9186946..8bf72aa53a 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -538,11 +538,11 @@ if ($step == 2) {
 	$table->data[0][3] = html_print_checkbox ('special_day', 1, $special_day, true);
 	
 	$table->data[1][0] = __('Time from') . ' ' .
-		ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+		ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 	$table->data[1][1] = html_print_input_text ('time_from', $time_from, '', 7, 8,
 		true);
 	$table->data[1][2] = __('Time to') . ' ' .
-		ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+		ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 	$table->data[1][3] = html_print_input_text ('time_to', $time_to, '', 7, 8,
 		true);
 	
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index d47f9e17e4..cda1a32143 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -193,7 +193,7 @@ if (defined('METACONSOLE')) {
 }
 else {
 	
-	ui_print_page_header (__("Groups defined in Pandora"),
+	ui_print_page_header (__("Groups defined in %s", get_product_name()),
 		"images/group.png", false, "", true, "");
 	$sec = 'gagente';
 
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index e9f538f619..508e6d32bd 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.php
@@ -52,7 +52,7 @@ if (is_ajax ()) {
 
 if (!is_metaconsole()) {
 	// Header
-	ui_print_page_header (__("Module groups defined in Pandora"), "images/module_group.png", false, "", true, "");
+	ui_print_page_header (__("Module groups defined in %s", get_product_name()), "images/module_group.png", false, "", true, "");
 }
 $create_group = (bool) get_parameter ('create_group');
 $update_group = (bool) get_parameter ('update_group');
diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php
index 185f87f5ee..fcc654ab12 100644
--- a/pandora_console/godmode/reporting/graph_builder.main.php
+++ b/pandora_console/godmode/reporting/graph_builder.main.php
@@ -59,8 +59,6 @@ if ($edit_graph) {
 	$graphInTgraph = db_get_row_sql("SELECT * FROM tgraph WHERE id_graph = " . $id_graph);
 	$stacked = $graphInTgraph['stacked'];
 	$period = $graphInTgraph['period'];
-	$name = $graphInTgraph['name'];
-	$description = $graphInTgraph['description'];
 	$id_group = $graphInTgraph['id_group'];
 	$width = $graphInTgraph['width'];
 	$height = $graphInTgraph['height'];
@@ -80,7 +78,6 @@ else {
 	$id_agent = 0;
 	$id_module = 0;
 	$id_group = 0;
-	$name = "Pandora FMS combined graph";
 	$width = 550;
 	$height = 210;
 	$period = SECONDS_1DAY;
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 8018d90243..4033e7616f 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -888,7 +888,7 @@ You can of course remove the warnings, that's why we include the source and do n
 						<td>
 							<?php
 							echo __('Time from') .
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 							?>
 						</td>
 						<td colspan="6"><?php html_print_input_text ('time_from', $time_from, '', 7, 8);?></td>
@@ -897,7 +897,7 @@ You can of course remove the warnings, that's why we include the source and do n
 						<td>
 							<?php
 							echo __('Time to') .
-							ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true);
+							ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true);
 							?>
 						</td>
 						<td colspan="6"><?php html_print_input_text ('time_to', $time_to, '', 7, 8);?></td>
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index 42d6d608cd..dea672b5eb 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -328,7 +328,7 @@ $table->data["all_8"][2] = '<span id="parent_column_2_item_in_visual_map">' .
 	__('Item in the map') . '</span>' .
 	'<span id="parent_column_2_relationship">' .
 	ui_print_help_tip(
-		__('The parent relationships in Pandora will be drawn in the map.'), true) .
+		__('The parenting relationships in %s will be drawn on the map.', get_product_name()), true) .
 	'</span>';
 $table->data["all_8"][3] = '<span id="parent_column_3_item_in_visual_map">' .
 	html_print_select($parents, 'item_in_the_map', 0, '',
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index 9725af7ef6..d33e0ee19c 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -186,11 +186,10 @@ if (!$modify){
 	ui_print_page_header (__('Manage recontask'), "", false, "recontask", true);
 }
 
-
 $is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 if ($is_windows) {
 	echo '<div class="notify">';
-	echo __('Warning') . ": " . __("By default, in Windows, Pandora FMS only support Standard network sweep, not custom scripts");
+	echo __('Warning') . ": " . __("By default, in Windows, %s only support Standard network sweep, not custom scripts", get_product_name());
 	echo '</div>';
 }
 
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 2a45ce650e..aab4a3f918 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -82,7 +82,7 @@ elseif (isset($_GET["server_remote"])) {
 }
 else {
 	// Header
-	ui_print_page_header (__('Pandora servers'), "images/gm_servers.png", false, "servers", true);
+	ui_print_page_header (__('%s servers', get_product_name()), "images/gm_servers.png", false, "servers", true);
 
 	// Move SNMP modules back to the enterprise server
 	if (isset($_GET["server_reset_snmp_enterprise"])) {
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index b8d130715f..93ed8841f7 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -561,7 +561,7 @@ else {
 		$sec = 'advanced';
 	}
 	else {
-		ui_print_page_header (__('Plugins registered in Pandora FMS'), "images/gm_servers.png", false, "", true);
+		ui_print_page_header (__('Plug-ins registered on %s', get_product_name()), "images/gm_servers.png", false, "", true);
 
 		$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 		if ($is_windows) {
diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php
index 0d0965c10f..be8af68434 100644
--- a/pandora_console/godmode/servers/recon_script.php
+++ b/pandora_console/godmode/servers/recon_script.php
@@ -225,7 +225,7 @@ if (($create != "") OR ($view != "")) {
 	echo '</form></table>';
 }
 else {
-	ui_print_page_header (__('Recon scripts registered in Pandora FMS'), "images/gm_servers.png", false, "", true);
+	ui_print_page_header (__('Recon scripts registered on %s', get_product_name()), "images/gm_servers.png", false, "", true);
 	
 	// Update reconscript
 	if (isset($_GET["update_reconscript"])) { // if modified any parameter

From d9e35b366802faf1f517cd155b1d963046af17b6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 17:08:30 +0200
Subject: [PATCH 08/56] [Rebranding] Open git status

---
 pandora_console/include/ajax/update_manager.ajax.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/ajax/update_manager.ajax.php b/pandora_console/include/ajax/update_manager.ajax.php
index 80c62539da..839695b841 100644
--- a/pandora_console/include/ajax/update_manager.ajax.php
+++ b/pandora_console/include/ajax/update_manager.ajax.php
@@ -237,7 +237,7 @@ if ($install_package) {
 		}
 
 		update_manager_enterprise_set_version($version);
-		db_pandora_audit("Update Pandora", "Update version: $version of Pandora FMS by ".$config['id_user']);
+		db_pandora_audit("Update " . get_product_name(), "Update version: $version of " . get_product_name() ." by ".$config['id_user']);
 		
 		$return["status"] = "success";
 		echo json_encode($return);
@@ -252,6 +252,7 @@ if ($install_package) {
 }
 
 if ($check_install_package) {
+	
 	// 1 second
 	//sleep(1);
 	// Half second

From c3beafc49961240d606656f15049a88908df1f48 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 17:15:37 +0200
Subject: [PATCH 09/56] [Rebranding] Open godmode/update_manager and
 godmode/users

---
 .../godmode/update_manager/update_manager.offline.php     | 2 +-
 pandora_console/godmode/users/configure_profile.php       | 8 ++++----
 pandora_console/godmode/users/configure_user.php          | 2 +-
 pandora_console/godmode/users/profile_list.php            | 6 +++---
 pandora_console/godmode/users/user_list.php               | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index afad03cc2c..fccdab6b0b 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -37,7 +37,7 @@ $baseurl = ui_get_full_url(false, false, false, false);
 	var drop_the_package_here_or = "<?php echo __('Drop the package here or'); ?>\n";
 	var browse_it = "<?php echo __('browse it'); ?>\n";
 	var the_package_has_been_uploaded_successfully = "<?php echo __('The package has been uploaded successfully.'); ?>\n";
-	var remember_that_this_package_will = "<?php echo __('Remember that this package will override the actual Pandora FMS files and it is recommended to do a backup before continue with the update.'); ?>\n";
+	var remember_that_this_package_will = "<?php echo __("Please keep in mind that this package is going to override your actual %s files and that it's recommended to conduct a backup before continuing the updating process.", get_product_name()); ?>\n";
 	var click_on_the_file_below_to_begin = "<?php echo __('Click on the file below to begin.'); ?>\n";
 	var updating = "<?php echo __('Updating'); ?>\n";
 	var package_updated_successfully = "<?php echo __('Package updated successfully.'); ?>\n";
diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php
index 9e71de2399..7ba51d3791 100644
--- a/pandora_console/godmode/users/configure_profile.php
+++ b/pandora_console/godmode/users/configure_profile.php
@@ -46,7 +46,7 @@ if (!is_metaconsole()) {
 
 	$buttons[$tab]['active'] = true;
 
-	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined in Pandora'), "images/gm_users.png", false, "", true, $buttons);
+	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined on %s', get_product_name()), "images/gm_users.png", false, "", true, $buttons);
 	$sec2 = 'gusuarios';
 }
 else {
@@ -211,8 +211,8 @@ if ($id_profile || $new_profile) {
 				' Visual console edit: ' . $vconsole_edit .
 				' Visual console management: ' . $vconsole_management .
 				
-				' Pandora Management: ' . $pandora_management;
-		
+				' ' . get_product_name() . ' Management: ' . $pandora_management;
+
 		enterprise_hook('audit_pandora_enterprise', array($id_audit, $info));
 		
 		
@@ -361,7 +361,7 @@ if ($id_profile || $new_profile) {
 	
 	// Pandora
 	$row = array();
-	$row['name'] = __('Pandora management');
+	$row['name'] = __('%s management', get_product_name());
 	$row['input'] = html_print_checkbox ('pandora_management', 1, $pandora_management, true);
 	$table->data['PM'] = $row;
 	$table->data[] = '<hr>';
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index b2cb189449..eb89c22389 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -148,7 +148,7 @@ if ($new_user && $config['admin_can_add_user']) {
 
 if ($create_user) {
 	if (! $config['admin_can_add_user']) {
-		ui_print_error_message (__('The current authentication scheme doesn\'t support creating users from Pandora FMS'));
+		ui_print_error_message (__('The current authentication scheme doesn\'t support creating users on %s', get_product_name()));
 		return;
 	}
 	
diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php
index f593be58d0..4fba678f3c 100644
--- a/pandora_console/godmode/users/profile_list.php
+++ b/pandora_console/godmode/users/profile_list.php
@@ -50,7 +50,7 @@ if (!defined('METACONSOLE')) {
 			
 	$buttons[$tab]['active'] = true;
 
-	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined in Pandora'), "images/gm_users.png", false, "profile", true, $buttons);
+	ui_print_page_header (__('User management').' &raquo; '.__('Profiles defined on %s', get_product_name()), "images/gm_users.png", false, "profile", true, $buttons);
 	$sec = 'gusuarios';
 }
 else {
@@ -205,7 +205,7 @@ if ($update_profile) {
 				"Visual console view":"'.$vconsole_view.'",
 				"Visual console edit":"'.$vconsole_edit.'",
 				"Visual console management":"'.$vconsole_management.'",
-				"Pandora Management":"'.$pandora_management.'"}';
+				"'.get_product_name().' Management":"'.$pandora_management.'"}';
 			
 			db_pandora_audit("User management",
 				"Update profile ". $name, false, false, $info);
@@ -252,7 +252,7 @@ if ($create_profile) {
 				"Visual console view":"'.$vconsole_view.'",
 				"Visual console edit":"'.$vconsole_edit.'",
 				"Visual console management":"'.$vconsole_management.'",
-				"Pandora Management":"'.$pandora_management.'"}';
+				"'.get_product_name().' Management":"'.$pandora_management.'"}';
 			
 			db_pandora_audit("User management",
 				"Created profile ". $name, false, false, $info);
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 13cdba54c1..4cd8f86139 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -118,7 +118,7 @@ else {
 	
 	$buttons[$tab]['active'] = true;
 	
-	ui_print_page_header (__('User management').' &raquo; '.__('Users defined in Pandora'), "images/gm_users.png", false, "", true, $buttons);
+	ui_print_page_header (__('User management').' &raquo; '.__('Users defined on %s', get_product_name()), "images/gm_users.png", false, "", true, $buttons);
 	
 	$sec = 'gusuarios';
 	
@@ -486,7 +486,7 @@ if ($config["admin_can_add_user"] !== false) {
 	echo '</form>';
 }
 else {
-	echo '<i>'.__('The current authentication scheme doesn\'t support creating users from Pandora FMS').'</i>';
+	echo '<i>'.__("The current authentication scheme doesn't support creating users on %s", get_product_name()).'</i>';
 }
 echo '</div>';
 

From e796b844d319ed0159dd5236ef722ac13d9765a6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 18:19:47 +0200
Subject: [PATCH 10/56] [Rebranding] Open include/* (not the root files)

---
 pandora_console/include/help/clippy/homepage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/help/clippy/homepage.php b/pandora_console/include/help/clippy/homepage.php
index be52096875..e6219ee19d 100644
--- a/pandora_console/include/help/clippy/homepage.php
+++ b/pandora_console/include/help/clippy/homepage.php
@@ -57,7 +57,7 @@ function clippy_start_page_homepage() {
 		'intro' => 
 			'<div class="clippy_body" style="text-align: left; padding-left: 20px; padding-right: 20px;">'.
 			__('Hi, can I help you?') . '<br/><br/>' .
-			__('Let me introduce my self: I am Pandorin, the annoying assistant of Pandora FMS. You can follow my steps to do basic tasks in Pandora FMS or you can close me and never see me again.') .
+			__('Let me introduce my self: I am Pandorin, the annoying assistant of %s. You can follow my steps to do basic tasks in %s or you can close me and never see me again.', get_product_name(), get_product_name()) .
 			'<br /> ' .
 			'<br /> ' .
 			'<div class="clippy_body" style="font-size: 7pt;">' .
@@ -82,7 +82,7 @@ function clippy_start_page_homepage() {
 			'<ul style="text-align: left; margin-left: 10px; list-style-type: disc;">' .
 				'<li>' .
 					"<a href='javascript: clippy_go_link_show_help(\"index.php?sec=gagente&sec2=godmode/agentes/modificar_agente\", \"monitoring_server_step_1\");'>" . 
-						__('Ping to a Linux or Windows server with a Pandora FMS agent') .
+						__('Ping a Linux or Windows server using a %s agent.', get_product_name()) .
 					'</a>' .
 				'</li>' .
 				'<li>' .
@@ -206,7 +206,7 @@ function clippy_start_page_homepage() {
 	$return_tours['tours']['email_alert_module_step_1']['steps'] = array();
 	$return_tours['tours']['email_alert_module_step_1']['steps'][] = array(
 		'element'=> '#clippy',
-		'intro' => __('The first thing you have to do  is to setup the config email in the Pandora FMS Server.') .
+		'intro' => __('The first thing you have to do is to setup the e-mail config on the %s Server.', get_product_name()) .
 			'<br />' .
 			ui_print_help_icon ('context_pandora_server_email', true, '', 'images/help.png') .
 			'<br />' .

From 8a1f5c87ec1a9bb55fa5a4ec773aaa585a21f6f3 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 10 May 2018 18:56:59 +0200
Subject: [PATCH 11/56] [Rebranding] Open API

---
 pandora_console/include/api.php           |  2 +-
 pandora_console/include/functions_api.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index c4727e1591..591c353d11 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -63,7 +63,7 @@ switch($info) {
 			$config["MR"] = 0;
 		}
 		
-		echo 'Pandora FMS ' . $pandora_version . ' - ' . $build_version . " MR" . $config["MR"];
+		echo get_product_name() . ' ' . $pandora_version . ' - ' . $build_version . " MR" . $config["MR"];
 
 		exit;
 }
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a4a737b280..b65f17dbda 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1358,7 +1358,7 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
 		returnError('id_os_not_exist', 'The OS don`t exist.');
 	}
 	else if (db_get_value_sql($sql1) === false) {
-		returnError('server_not_exist', 'The Pandora Server don`t exist.');
+		returnError('server_not_exist', 'The ' . get_product_name() . ' Server don`t exist.');
 	}
 	else {
 		$idAgente = db_process_sql_insert ('tagente', 
@@ -7721,9 +7721,9 @@ function api_set_gis_agent_only_position($id_agent, $trash1, $other, $return_typ
 		if ($correct) {
 			$correct = agents_update_gis($id_agent, $latitude,
 				$longitude, $altitude, 0, 1, date( 'Y-m-d H:i:s'), null,
-				1, __('Save by Pandora Console'),
-				__('Update by Pandora Console'),
-				__('Insert by Pandora Console'));
+				1, __('Save by %s Console', get_product_name()),
+				__('Update by %s Console', get_product_name()),
+				__('Insert by %s Console', get_product_name()));
 		}
 	}
 	
@@ -9111,7 +9111,7 @@ function api_set_create_event($id, $trash1, $other, $returnType) {
 			$values['source'] = $other['data'][14];
 		}
 		else {
-			$values['source'] = "Pandora";
+			$values['source'] = get_product_name();
 		}
 		
 		if ($other['data'][15] != '') {

From 0d6115726a91b7f6bf4f21650199bdc7f03b578e Mon Sep 17 00:00:00 2001
From: Fermin <mferminhh@gmail.com>
Date: Fri, 11 May 2018 12:49:16 +0200
Subject: [PATCH 12/56] [Rebranding] Open include root files (except
 networkmaps related sources)

---
 pandora_console/include/functions_clippy.php  |  2 +-
 pandora_console/include/functions_config.php  |  6 +-
 pandora_console/include/functions_events.php  |  4 +-
 pandora_console/include/functions_groups.php  |  2 +-
 .../include/functions_reporting_html.php      |  4 +-
 pandora_console/include/functions_servers.php | 14 ++--
 pandora_console/include/functions_ui.php      | 64 ++-----------------
 .../include/functions_update_manager.php      |  3 +-
 8 files changed, 26 insertions(+), 73 deletions(-)

diff --git a/pandora_console/include/functions_clippy.php b/pandora_console/include/functions_clippy.php
index a68a1e65aa..59b07737e5 100644
--- a/pandora_console/include/functions_clippy.php
+++ b/pandora_console/include/functions_clippy.php
@@ -125,7 +125,7 @@ function clippy_write_javascript_helps_steps($tours) {
 	if (!empty($steps)) {
 		foreach ($steps as $iterator => $element) {
 			$steps[$iterator]['intro'] = 
-				"<div id='clippy_head_title'>"  . __("Pandora FMS assistant") . "</div>" .
+				"<div id='clippy_head_title'>"  . __("%s assistant", get_product_name()) . "</div>" .
 				$steps[$iterator]['intro'];
 		}
 		
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 776a0e5b03..7a54b60679 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -2041,7 +2041,7 @@ function config_check () {
 	// ~ about 50 hr
 	if ($last_maintance > 190000) {
 		set_pandora_error_for_header(
-			__('Your database is not well maintained. Seems that it have more than 48hr without a proper maintance. Please review Pandora FMS documentation about how to execute this maintance process (pandora_db.pl) and enable it as soon as possible'),
+			__("Your database is not maintained correctly. It seems that more than 48hrs have passed without proper maintenance. Please review documents of %s on how to perform this maintenance process (DB Tool) and enable it as soon as possible.", get_product_name()),
 			__("Database maintance problem"));
 	}
 	
@@ -2062,7 +2062,7 @@ function config_check () {
 	
 	if ($develop_bypass == 1) {
 		set_pandora_error_for_header(
-			__('Your Pandora FMS has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file'),
+			__('Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file', get_product_name()),
 			__("Developer mode is enabled"));
 	}
 	
@@ -2079,7 +2079,7 @@ function config_check () {
 		if ($_SESSION['new_update'] == 'new') {
 			set_pandora_error_for_header(
 				__('There is a new update available. Please<a style="font-weight:bold;" href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online"> go to Administration:Setup:Update Manager</a> for more details.'),
-				__("New update of Pandora Console"));
+				__("New %s Console update", get_product_name()));
 		}
 	}
 	
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index e9faaba84e..a33862889a 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -703,10 +703,12 @@ function events_create_event ($event, $id_group, $id_agent, $status = 0,
 	$id_user = "", $event_type = "unknown", $priority = 0,
 	$id_agent_module = 0, $id_aam = 0, $critical_instructions = '',
 	$warning_instructions = '', $unknown_instructions = '',
-	$source="Pandora", $tags="", $custom_data="", $server_id = 0, $id_extra ="") {
+	$source=false, $tags="", $custom_data="", $server_id = 0, $id_extra ="") {
 	
 	global $config;
 	
+	if ($source === false) $source = get_product_name();
+
 	$table_events = 'tevento';
 	if (defined ('METACONSOLE')) {
 		$table_events = 'tmetaconsole_event';
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index ada8e71a14..b22bbad3ce 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -2174,7 +2174,7 @@ function groups_get_group_to_list($group, $groups_count, &$symbolBranchs, $has_c
 		else {
 			$data[5] .= '&nbsp;&nbsp;' .
 				ui_print_help_tip(
-					__('You can not delete the last group in Pandora. A common installation must has almost one group.'), true);
+					__('You cannot delete the last group. A common installation must have at least one group.'), true);
 		}
 	}
 	
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 52d124421f..e9d336ec6c 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -880,7 +880,7 @@ function reporting_html_event_report_group($table, $item, $pdf = 0) {
 			if (!empty($event['id_agente']))
 				$data[] = agents_get_alias($event['id_agente']);
 			else
-				$data[] = __('Pandora System');
+				$data[] = __('%s System', get_product_name());
 			$data[] = get_priority_name ($event['criticity']);
 			if (empty($event['id_usuario']) && $event['estado'] == EVENT_VALIDATE) {
 				$data[] = '<i>' . __('System') . '</i>';
@@ -3729,7 +3729,7 @@ function reporting_get_last_activity() {
 	$table->head[3] = __('Date');
 	$table->head[4] = __('Source IP');
 	$table->head[5] = __('Comments');
-	$table->title = '<span>' . __('Last activity in Pandora FMS console') . '</span>';
+	$table->title = '<span>' . __('Last activity in %s console', get_product_name()) . '</span>';
 	
 	switch ($config["dbtype"]) {
 		case "mysql":
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 33ed8e8bfd..101613adf7 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -753,25 +753,25 @@ function servers_show_type ($id) {
 	
 	switch ($id) {
 		case 1:
-			return html_print_image("images/database.png", true, array("title" => "Pandora FMS Data server"));
+			return html_print_image("images/database.png", true, array("title" => get_product_name() . " Data server"));
 			break;
 		case 2:
-			return html_print_image("images/network.png", true, array("title" => "Pandora FMS Network server"));
+			return html_print_image("images/network.png", true, array("title" => get_product_name() . " Network server"));
 			break;
 		case 4:
-			return html_print_image("images/plugin.png", true, array("title" => "Pandora FMS Plugin server"));
+			return html_print_image("images/plugin.png", true, array("title" => get_product_name() . " Plugin server"));
 			break;
 		case 5:
-			return html_print_image("images/chart_bar.png", true, array("title" => "Pandora FMS Prediction server"));
+			return html_print_image("images/chart_bar.png", true, array("title" => get_product_name() . " Prediction server"));
 			break;
 		case 6:
-			return html_print_image("images/wmi.png", true, array("title" => "Pandora FMS WMI server"));
+			return html_print_image("images/wmi.png", true, array("title" => get_product_name() . " WMI server"));
 			break;
 		case 7:
-			return html_print_image("images/server_web.png", true, array("title" => "Pandora FMS WEB server"));
+			return html_print_image("images/server_web.png", true, array("title" => get_product_name() . " WEB server"));
 			break;
 		case 8:
-			return html_print_image("images/module-wux.png", true, array("title" => "Pandora FMS WUX server"));
+			return html_print_image("images/module-wux.png", true, array("title" => get_product_name() . " WUX server"));
 			break;
 		default:
 			return "--";
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index caffcad739..4fc40ba611 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1346,7 +1346,7 @@ function ui_process_page_head ($string, $bitfield) {
 		}
 	}
 	$output .= "\n\t";
-	$output .= '<title>Pandora FMS - '.__('the Flexible Monitoring System').'</title>
+	$output .= '<title>' . get_product_name() . ' - '.__('the Flexible Monitoring System').'</title>
 		<meta http-equiv="expires" content="never" />
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<meta http-equiv="Content-Style-Type" content="text/css" />
@@ -3719,62 +3719,12 @@ function ui_print_agent_autocomplete_input($parameters) {
  * 
  * @param string error code
  */
-function ui_get_error ($error_code) {
-	switch($error_code) {
-		case 'error_authconfig':
-		case 'error_dbconfig':
-			$title = __('Problem with Pandora FMS database');
-			$message = __('Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
-			Probably your database, hostname, user or password values are incorrect or
-			the database server is not running.').'<br /><br />';
-			$message .= '<span class="red">';
-			$message .= '<b>' . __('DB ERROR') . ':</b><br>';
-			$message .= db_get_last_error();
-			$message .= '</span>';
-			
-			if ($error_code == 'error_authconfig') {
-				$message .= '<br/><br/>';
-				$message .= __('If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>');
-			}
-			break;
-		case 'error_emptyconfig':
-			$title = __('Empty configuration table');
-			$message = __('Cannot load configuration variables from database. Please check your database setup in the
-			<b>include/config.php</b> file.<i><br><br>
-			Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
-			<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-			permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>').'<br /><br />';
-			break;
-		case 'error_noconfig':
-			$title = __('No configuration file found');
-			$message = __('Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
-			permissions and HTTP server cannot read it. Please read documentation to fix this problem.').'<br /><br />';
-			if (file_exists('install.php')) {
-				$link_start = '<a href="install.php">';
-				$link_end = '</a>';
-			}
-			else {
-				$link_start = '';
-				$link_end = '';
-			}
-			
-			$message .= sprintf(__('You may try to run the %s<b>installation wizard</b>%s to create one.'), $link_start, $link_end);
-			break;
-		case 'error_install':
-			$title = __('Installer active');
-			$message = __('For security reasons, normal operation is not possible until you delete installer file.
-			Please delete the <i>./install.php</i> file before running Pandora FMS Console.');
-			break;
-		case 'error_perms':
-			$title = __('Bad permission for include/config.php');
-			$message = __('For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users
-			should not read it or write to it. It should be written only for owner
-			(usually www-data or http daemon user), normal operation is not possible until you change
-			permissions for <i>include/config.php</i> file. Please do it, it is for your security.');
-			break;
-	}
-	
-	return array('title' => $title, 'message' => $message);
+function ui_get_error ($error_code = '') {
+	// FIXME: Deprecated. Pandora shouldn't go inside this
+	return array(
+		'title' => __('Unhandled error'),
+		'message' => __('An unhandled error occurs')
+	);
 }
 
 function ui_include_time_picker($echo_tags = false) {
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index ba6508fa19..ae08fb214b 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -183,7 +183,8 @@ function update_manager_install_package_step2() {
 	}
 	
 	update_manager_enterprise_set_version($version);
-	db_pandora_audit("Update Pandora", "Update version: $version of Pandora FMS by ".$config['id_user']);
+	$product_name = get_product_name();
+	db_pandora_audit("Update $product_name", "Update version: $version of $product_name by ".$config['id_user']);
 	
 	$return["status"] = "success";
 	$return["message"]= __("The package is installed.");

From 9cf7fee2c091e3588cee2e748af5ae217e120985 Mon Sep 17 00:00:00 2001
From: Fermin <mferminhh@gmail.com>
Date: Fri, 11 May 2018 14:24:26 +0200
Subject: [PATCH 13/56] [Rebranding] Open mobile console

---
 pandora_console/mobile/include/system.class.php   | 8 ++++++++
 pandora_console/mobile/include/ui.class.php       | 4 ++--
 pandora_console/mobile/include/user.class.php     | 2 +-
 pandora_console/mobile/index.php                  | 2 +-
 pandora_console/mobile/operation/agent.php        | 4 ++--
 pandora_console/mobile/operation/agents.php       | 2 +-
 pandora_console/mobile/operation/alerts.php       | 2 +-
 pandora_console/mobile/operation/events.php       | 4 ++--
 pandora_console/mobile/operation/groups.php       | 2 +-
 pandora_console/mobile/operation/module_graph.php | 6 +++---
 pandora_console/mobile/operation/modules.php      | 2 +-
 pandora_console/mobile/operation/networkmap.php   | 2 +-
 pandora_console/mobile/operation/networkmaps.php  | 2 +-
 pandora_console/mobile/operation/tactical.php     | 2 +-
 pandora_console/mobile/operation/visualmap.php    | 2 +-
 pandora_console/mobile/operation/visualmaps.php   | 2 +-
 16 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/pandora_console/mobile/include/system.class.php b/pandora_console/mobile/include/system.class.php
index 4c98ee9f63..c46522129c 100644
--- a/pandora_console/mobile/include/system.class.php
+++ b/pandora_console/mobile/include/system.class.php
@@ -129,5 +129,13 @@ class System {
 			return false;
 		}
 	}
+
+	public function getDefaultACLFailText() {
+		return 
+			__("Access to this page is restricted to authorized users only, please contact your system administrator if you should need help.") .
+			"<br><br>" .
+			__("Please remember that any attempts to access this page will be recorded on the %s System Database.", get_product_name())
+		;
+	}
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php
index 2ef68dc749..e423e52fd8 100755
--- a/pandora_console/mobile/include/ui.class.php
+++ b/pandora_console/mobile/include/ui.class.php
@@ -165,7 +165,7 @@ class Ui {
 	
 	public function createDefaultHeader($title = false, $left_button = false) {
 		if ($title === false) {
-			$title = __('Pandora FMS mobile');
+			$title = __('%s : Mobile', get_product_name());
 		}
 		
 		if ($left_button === false) {
@@ -254,7 +254,7 @@ class Ui {
 		}
 		
 		return "<div id='footer' style='text-align: center;'>\n"
-			. sprintf(__('Pandora FMS %s - Build %s', $pandora_version, $build_version)) . "<br />\n"
+			. sprintf(__('%s %s - Build %s', get_product_name(), $pandora_version, $build_version)) . "<br />\n"
 			. __('Generated at') . ' '. ui_print_timestamp ($time, true, array ("prominent" => "timestamp")) . "\n"
 			. "</div>";
 	}
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index 2c22a355e7..e596f4c1cd 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -218,7 +218,7 @@ class User {
 			$options['dialog_id'] = 'logout_dialog';
 			$options['type'] = 'onStart';
 			$options['title_text'] = __('Login out');
-			$options['content_text'] = __('Your session is over. Please close your browser window to close this Pandora session.');
+			$options['content_text'] = __('Your session has ended. Please close your browser window to close this %s session.', get_product_name());
 			$ui->addDialog($options);
 			
 		}
diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php
index 8e7bd9c8ad..6623965f1a 100644
--- a/pandora_console/mobile/index.php
+++ b/pandora_console/mobile/index.php
@@ -230,7 +230,7 @@ switch ($action) {
 				if (!$permission) {
 					$error['type'] = 'onStart';
 					$error['title_text'] = __('You don\'t have access to this page');
-					$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+					$error['content_text'] = System::getDefaultACLFailText();
 					if (class_exists("HomeEnterprise"))
 						$home = new HomeEnterprise();
 					else
diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index 927647c672..4e99f657fb 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -85,7 +85,7 @@ class Agent {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
@@ -136,7 +136,7 @@ class Agent {
 						'href' => 'index.php?page=agents' . $agents_filter_q_param)));
 		}
 		else {
-			$ui->createDefaultHeader(__("PandoraFMS: Agents"));
+			$ui->createDefaultHeader(__("Agents"));
 		}
 		$ui->showFooter(false);
 		$ui->beginContent();
diff --git a/pandora_console/mobile/operation/agents.php b/pandora_console/mobile/operation/agents.php
index 5dbe1c9ee8..040fa58ee6 100644
--- a/pandora_console/mobile/operation/agents.php
+++ b/pandora_console/mobile/operation/agents.php
@@ -164,7 +164,7 @@ class Agents {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/alerts.php b/pandora_console/mobile/operation/alerts.php
index b3ebfeded6..8a9e67f47e 100644
--- a/pandora_console/mobile/operation/alerts.php
+++ b/pandora_console/mobile/operation/alerts.php
@@ -139,7 +139,7 @@ class Alerts {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php
index 8dda4384e2..1e91809614 100644
--- a/pandora_console/mobile/operation/events.php
+++ b/pandora_console/mobile/operation/events.php
@@ -428,7 +428,7 @@ class Events {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
@@ -442,7 +442,7 @@ class Events {
 		$options['dialog_id'] = 'detail_event_dialog_error';
 		$options['title_text'] = __('ERROR: Event detail');
 		$options['content_text'] = '<span style="color: #ff0000;">' .
-			__('Error connecting to DB pandora.') . '</span>';
+			__('Error connecting to DB.') . '</span>';
 			
 		return $options;
 	}
diff --git a/pandora_console/mobile/operation/groups.php b/pandora_console/mobile/operation/groups.php
index 38ccdcb465..da797f7425 100644
--- a/pandora_console/mobile/operation/groups.php
+++ b/pandora_console/mobile/operation/groups.php
@@ -51,7 +51,7 @@ class Groups {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php
index 3af94962be..1f152bc34f 100644
--- a/pandora_console/mobile/operation/module_graph.php
+++ b/pandora_console/mobile/operation/module_graph.php
@@ -268,7 +268,7 @@ class ModuleGraph {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
@@ -361,7 +361,7 @@ class ModuleGraph {
 		
 		if ($this->id_agent) {
 			$ui->createDefaultHeader(
-				sprintf(__("PandoraFMS: %s"), $this->module["nombre"]),
+				sprintf(__("%s: %s"), get_product_name(), $this->module["nombre"]),
 				$ui->createHeaderButton(
 						array('icon' => 'back',
 							'pos' => 'left',
@@ -370,7 +370,7 @@ class ModuleGraph {
 		}
 		else {
 			$ui->createDefaultHeader(
-				sprintf(__("PandoraFMS: %s"), $this->module["nombre"]),
+				sprintf(__("%s: %s"), get_product_name(), $this->module["nombre"]),
 				$ui->createHeaderButton(
 						array('icon' => 'back',
 							'pos' => 'left',
diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php
index 01766f60c2..5dd89b9aec 100644
--- a/pandora_console/mobile/operation/modules.php
+++ b/pandora_console/mobile/operation/modules.php
@@ -171,7 +171,7 @@ class Modules {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/networkmap.php b/pandora_console/mobile/operation/networkmap.php
index c5d5e39006..9595efaa87 100755
--- a/pandora_console/mobile/operation/networkmap.php
+++ b/pandora_console/mobile/operation/networkmap.php
@@ -76,7 +76,7 @@ class Networkmap {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/networkmaps.php b/pandora_console/mobile/operation/networkmaps.php
index d19bcab991..f8f533cc84 100755
--- a/pandora_console/mobile/operation/networkmaps.php
+++ b/pandora_console/mobile/operation/networkmaps.php
@@ -97,7 +97,7 @@ class Networkmaps {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/tactical.php b/pandora_console/mobile/operation/tactical.php
index e1e6118ea4..071865b39b 100755
--- a/pandora_console/mobile/operation/tactical.php
+++ b/pandora_console/mobile/operation/tactical.php
@@ -69,7 +69,7 @@ class Tactical {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/visualmap.php b/pandora_console/mobile/operation/visualmap.php
index 2c77d3c347..da9d36bc23 100644
--- a/pandora_console/mobile/operation/visualmap.php
+++ b/pandora_console/mobile/operation/visualmap.php
@@ -63,7 +63,7 @@ class Visualmap {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else
diff --git a/pandora_console/mobile/operation/visualmaps.php b/pandora_console/mobile/operation/visualmaps.php
index 464b51fd89..96212dda80 100644
--- a/pandora_console/mobile/operation/visualmaps.php
+++ b/pandora_console/mobile/operation/visualmaps.php
@@ -81,7 +81,7 @@ class Visualmaps {
 	private function show_fail_acl() {
 		$error['type'] = 'onStart';
 		$error['title_text'] = __('You don\'t have access to this page');
-		$error['content_text'] = __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance. <br><br>Please know that all attempts to access this page are recorded in security logs of Pandora System Database');
+		$error['content_text'] = System::getDefaultACLFailText();
 		if (class_exists("HomeEnterprise"))
 			$home = new HomeEnterprise();
 		else

From 29f56df1fde048bec46d63e2c2ec3e8a152e5976 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Fri, 11 May 2018 15:17:53 +0200
Subject: [PATCH 14/56] [Rebranding] Open operation/agents

---
 pandora_console/operation/agentes/group_view.php       |  2 +-
 .../operation/agentes/interface_traffic_graph_win.php  |  4 ++--
 pandora_console/operation/agentes/realtime_win.php     | 10 +---------
 pandora_console/operation/agentes/snapshot_view.php    |  2 +-
 pandora_console/operation/agentes/stat_win.php         |  6 +++---
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 3397036f42..b177464a59 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -264,7 +264,7 @@ if (!empty($result_groups)) {
 			else {
 				$hint = '';
 				if (enterprise_hook('agents_is_using_secondary_groups')) {
-					$hint = ui_print_help_tip(__("This Pandora installation are using the secondary groups feature. For this reason, an agent can be counted several times."));
+					$hint = ui_print_help_tip(__("This %s installation are using the secondary groups feature. For this reason, an agent can be counted several times.", get_product_name()));
 				}
 				echo $link . $group_name . "</a>" . $hint;
 			}
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index 84f6087663..3b8db2a234 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -80,7 +80,7 @@ $interface_traffic_modules = array(
 		}
 ?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Graph (<?php echo agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
+		<title><?php echo __('%s Interface Graph', get_product_name()) . ' (' .agents_get_alias($agent_id) . ' - ' . $interface_name; ?>)</title>
 		<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
 		<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@@ -228,7 +228,7 @@ $interface_traffic_modules = array(
 		$side_layer_params = array();
 		// TOP TEXT
 
-		$side_layer_params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('/images/config.disabled.png', true, array('width' => '16px'),false,false,false,true) . ' ' . __('Pandora FMS Graph configuration menu') . "</div>";
+		$side_layer_params['top_text'] = "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('/images/config.disabled.png', true, array('width' => '16px'),false,false,false,true) . ' ' . __('Graph configuration menu') . "</div>";
 		$side_layer_params['body_text'] = "<div class='menu_sidebar_outer'>";
 		$side_layer_params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
 		
diff --git a/pandora_console/operation/agentes/realtime_win.php b/pandora_console/operation/agentes/realtime_win.php
index 6106583c80..124292e040 100644
--- a/pandora_console/operation/agentes/realtime_win.php
+++ b/pandora_console/operation/agentes/realtime_win.php
@@ -68,7 +68,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
 		}
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Realtime Module Graph</title>
+		<title><?php echo __("%s Realtime Module Graph", get_product_name());?></title>
 		<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
 		<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@@ -95,11 +95,3 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
 
 	</body>
 </html>
-
-<?php
-// Echo the script tags of the datepicker and the timepicker
-// Modify the user language cause the ui.datepicker language files use - instead _
-$custom_user_language = str_replace('_', '-', $user_language);
-ui_require_jquery_file("ui.datepicker-" . $custom_user_language, "include/javascript/i18n/", true);
-ui_include_time_picker(true);
-?>
diff --git a/pandora_console/operation/agentes/snapshot_view.php b/pandora_console/operation/agentes/snapshot_view.php
index 5d815b563e..fcc1bc900d 100644
--- a/pandora_console/operation/agentes/snapshot_view.php
+++ b/pandora_console/operation/agentes/snapshot_view.php
@@ -63,7 +63,7 @@ if (empty($last_data)) {
 		}
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Snapshot data view for module (<?php echo $label; ?>)</title>
+		<title><?php echo __("%s Snapshot data view for module (%s)", get_product_name(), $label); ?></title>
 		<script type='text/javascript' src='../../include/javascript/jquery-1.7.1.js'></script>
 	</head>
 	<body style='background:#000; color: #ccc;'>
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 6ff4b1483a..0cb77497fe 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -77,7 +77,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		}
 		?>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Pandora FMS Graph (<?php echo $alias . ' - ' . $label; ?>)</title>
+		<title><?php echo __("%s Graph", get_product_name()) . ' (' . $alias . ' - ' . $label; ?>)</title>
 		<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
 		<link rel="stylesheet" href="../../include/styles/jquery-ui-1.10.0.custom.css" type="text/css" />
 		<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
@@ -297,7 +297,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 		$params = array();
 		// TOP TEXT
 		//Use the no_meta parameter because this image is only in the base console
-		$params['top_text'] =  "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Pandora FMS Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png", true) . "</div>";
+		$params['top_text'] =  "<div style='color: white; width: 100%; text-align: center; font-weight: bold; vertical-align: top;'>" . html_print_image('images/wrench_blanco.png', true, array('width' => '16px'), false, false, true) . ' ' . __('Graph configuration menu') . ui_print_help_icon ("graphs",true, $config["homeurl"], "images/help_w.png", true) . "</div>";
 		$params['body_text'] = "<div class='menu_sidebar_outer'>";
 		$params['body_text'] .=__('Please, make your changes and apply with the <i>Reload</i> button');
 		
@@ -385,7 +385,7 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
 			(bool)$draw_events, true, $disabled);
 		if ($disabled) {
 			$data[1] .= ui_print_help_tip(
-				__('Show events is disabled because this Pandora node is set the event replication.'), true);
+				__("'Show events' is disabled because this %s node is set to event replication.", get_product_name()), true);
 		}
 		$table->data[] = $data;
 		$table->rowclass[] = '';

From 80aeded9319e38e9ad9540413d2ae40c554fec53 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 12:58:22 +0200
Subject: [PATCH 15/56] [Rebranding] Central node in network maps

---
 .../include/functions_pandora_networkmap.php    | 13 ++++++++-----
 .../javascript/functions_pandora_networkmap.js  | 17 +++++++++++------
 .../agentes/pandora_networkmap.view.php         |  3 +++
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index 09ffd90419..22df6a582b 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -104,7 +104,7 @@ function networkmap_process_networkmap($id = 0) {
 			// Open Graph
 			$graph = networkmap_open_graph ($layout, $nooverlap, $pure, $zoom,
 				$ranksep, $font_size, null);
-			$graph .= networkmap_create_pandora_node (__('Pandora FMS'), $font_size, $simple);
+			$graph .= networkmap_create_pandora_node (get_product_name(), $font_size, $simple);
 			$graph .= networkmap_close_graph ();
 
 			switch (PHP_OS) {
@@ -211,7 +211,7 @@ function networkmap_process_networkmap($id = 0) {
 		}
 		else {
 			// Generate dot file
-			$graph = networkmap_generate_dot (__('Pandora FMS'),
+			$graph = networkmap_generate_dot (get_product_name(),
 				$id_group,
 				$simple,
 				$font_size,
@@ -1090,8 +1090,9 @@ function networkmap_loadfile($id = 0, $file = '',
 				$data['id_agent'] = 0;
 				$data['id_module'] = 0;
 				$data['type'] = '';
-				if (preg_match('/Pandora FMS/', $line) != 0) {
-					$data['text'] = 'Pandora FMS';
+				$product_name = get_product_name();
+				if (preg_match("/$product_name/", $line) != 0) {
+					$data['text'] = $product_name;
 					$data['id_agent'] = 0;
 				}
 				else {
@@ -1621,7 +1622,9 @@ if (empty($list_networkmaps))
 	$list_networkmaps = array();
 ?>
 
-<div id="open_version_dialog" style="display: none;">In the Open version of PandoraFMS can not be edited nodes or map</div>
+<div id="open_version_dialog" style="display: none;">
+	<?php echo __("In the Open version of %s can not be edited nodes or map", get_product_name()); ?>
+</div>
 
 <div id="dialog_node_edit" style="display: none;" title="<?php echo __('Edit node');?>">
 	<div style="text-align: left; width: 100%;">
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index b5a85ee5c3..8b5d68b711 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -3640,9 +3640,6 @@ function draw_elements_graph() {
 		})
 		.on("contextmenu", function (d) { show_menu("node", d); });
 
-	node_temp.append("title")
-		.text(function (d) { return d.text; });
-
 	var font_size = (node_radius / 1.5);
 
 	node_temp.append("text")
@@ -3657,16 +3654,24 @@ function draw_elements_graph() {
 		})
 		.append("tspan")
 		.attr("style", "font-size: " + font_size + "px !important; font-family:Verdana; text-align:center; text-anchor:middle; fill:#000000")
-		.text(function (d) {
-			return d.text;
-		})
+		.text(function (d) { return get_node_name_ov(d) })
 		.classed('dragable_node', true) //own dragable
 		.on("click", selected_node)
 		.on("contextmenu", function (d) { show_menu("node", d); });
 
+	node_temp.append("title")
+		.text(function (d) { return get_node_name_ov(d) });
+
 	node.exit().remove();
 }
 
+function get_node_name_ov (data) {
+	// Node central name should be the product name
+	return (data.type == 0 && data.id_agent == 0)
+		? $("#hidden-product_name").val()
+		: data.text;
+}
+
 function choose_group_for_show_agents() {
 	if (enterprise_installed) {
 		group = $("#group_for_show_agents option:selected").val();
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index d2a7830f83..521f7bea88 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -700,6 +700,9 @@ else {
 	$id = (int) get_parameter('id_networkmap', 0);
 }
 
+// Print the product name to handle it in js
+html_print_input_hidden ('product_name', get_product_name());
+
 $dash_mode = 0;
 $map_dash_details = array();
 $networkmap = db_get_row('tmap', 'id', $id);

From ed18d586762af42c5ad70014a6ed93a8782a8919 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 15:52:51 +0200
Subject: [PATCH 16/56] [Rebranding] Open operation/*

---
 pandora_console/operation/events/events_marquee.php |  2 +-
 pandora_console/operation/events/events_rss.php     | 10 +++++-----
 pandora_console/operation/netflow/nf_live_view.php  |  4 ++--
 pandora_console/operation/search_helps.php          |  2 +-
 pandora_console/operation/users/user_edit.php       |  7 +++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php
index 9fb662eeed..9ffea8f61d 100644
--- a/pandora_console/operation/events/events_marquee.php
+++ b/pandora_console/operation/events/events_marquee.php
@@ -106,7 +106,7 @@ foreach ($result as $row) {
 
 echo "<html>";
 echo "<head>";
-echo "<title>Pandora FMS - Latest events </title>";
+echo "<title>" . __("%s - Latest events", get_product_name()) . "</title>";
 
 $query = ui_get_full_url();
 echo '<meta http-equiv="refresh" content="' . $MARQUEE_INTERVAL . '; URL=' . $query . '">';
diff --git a/pandora_console/operation/events/events_rss.php b/pandora_console/operation/events/events_rss.php
index bb81462dbe..9fbbbf1585 100644
--- a/pandora_console/operation/events/events_rss.php
+++ b/pandora_console/operation/events/events_rss.php
@@ -60,9 +60,9 @@ function rss_error_handler ($errno, $errstr, $errfile, $errline, $error_human_de
 	$rss_feed .= "\n";
 	$rss_feed .= '<channel>';
 	$rss_feed .= "\n";
-	$rss_feed .= '<title>Pandora RSS Feed</title>';
+	$rss_feed .= '<title>' . get_product_name() . ' RSS Feed</title>';
 	$rss_feed .= "\n";
-	$rss_feed .= '<description>Latest events on Pandora</description>';
+	$rss_feed .= '<description>Latest events on ' . get_product_name() .  '</description>';
 	$rss_feed .= "\n";
 	$rss_feed .= '<lastBuildDate>'.date (DATE_RFC822, 0).'</lastBuildDate>';
 	$rss_feed .= "\n";
@@ -138,7 +138,7 @@ require('events.build_query.php');
 ////////////////////////////////////////////////////////////////////////
 
 $sql = "SELECT *
-	FROM tevento
+	FROM tevento LEFT JOIN tagent_secondary_group on id_grupo = id_group
 	WHERE 1=1 " . $sql_post . "
 	ORDER BY utimestamp DESC";
 
@@ -157,8 +157,8 @@ else {
 $rss_feed = '<?xml version="1.0" encoding="utf-8" ?>' . "\n"; // ' <?php ' -- Fixes highlighters thinking that the closing tag is PHP
 $rss_feed .= '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">' . "\n"; 
 $rss_feed .= '<channel>'. "\n";
-$rss_feed .= '<title>Pandora RSS Feed</title>'. "\n";
-$rss_feed .= '<description>Latest events on Pandora</description>' . "\n";
+$rss_feed .= '<title>' . get_product_name() . ' RSS Feed</title>'. "\n";
+$rss_feed .= '<description>Latest events on ' . get_product_name() . '</description>' . "\n";
 $rss_feed .= '<lastBuildDate>'.date (DATE_RFC822, $lastbuild).'</lastBuildDate>'. "\n"; //Last build date is the last event - that way readers won't mark it as having new posts
 $rss_feed .= '<link>'.$url.'</link>'. "\n"; //Link back to the main Pandora page
 $rss_feed .= '<atom:link href="' . xml_entities(io_safe_input ($selfurl)) . '" rel="self" type="application/rss+xml" />'. "\n";; //Alternative for Atom feeds. It's the same.
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index 6e23dc11b3..13ebfcdd57 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -237,9 +237,9 @@ echo '<form method="post" action="' . $config['homeurl'] .
 		html_print_input_text ('date', $date, false, 13, 10, true) .
 		html_print_image ("images/calendar_view_day.png", true,
 			array("alt" => "calendar")) .
-		ui_print_help_tip(__('Date format in Pandora is year/month/day'), true) .
+		ui_print_help_tip(__('Date format is YY/MM/DD'), true) .
 		html_print_input_text ('time', $time, false, 10, 8, true) .
-		ui_print_help_tip(__('Time format in Pandora is hours(24h):minutes:seconds'), true) .
+		ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true) .
 		"</td>";
 	
 	echo "<td>" . '<b>'.__('Interval').'</b>' . "</td>";
diff --git a/pandora_console/operation/search_helps.php b/pandora_console/operation/search_helps.php
index 84b08e9960..c53f7f5acf 100644
--- a/pandora_console/operation/search_helps.php
+++ b/pandora_console/operation/search_helps.php
@@ -20,7 +20,7 @@ $totalHelps = check_acl($config["id_user"], 0, "IR");
 
 if ($helps === false || !$searchHelps) {
 	echo "<br><div class='nf'>" . __("Zero results found.") .
-		sprintf(__('You can find more help in the <a style="text-decoration: underline;" href="%s">Pandora\'s wiki</a>'),
+		sprintf(__('You can find more help in the <a style="text-decoration: underline;" href="%s">wiki</a>'),
 			"http://wiki.pandorafms.com/index.php?search=" . $config['search_keywords']) .
 		"</div>\n";
 }
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index f5d1057941..ec8df08265 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -228,7 +228,7 @@ if ($view_mode === false) {
 	}
 	else {
 		$data = array();
-		$data[0] = '<i>'.__('You can not change your password from Pandora FMS under the current authentication scheme').'</i>';
+		$data[0] = '<i>'.__('You cannot change your password under the current authentication scheme').'</i>';
 		$table->rowclass[] = '';
 		$table->rowstyle[] = '';
 		$table->colspan[count($table-data)][0] = 2;
@@ -352,7 +352,7 @@ if (check_acl ($config['id_user'], 0, "ER")){
 else if (license_free()) {
 	$data[1] = __('Newsletter Subscribed') . ':';
 	if ($user_info["middlename"]) {
-		$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to Pandora FMS newsletter') . "</span>";
+		$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to %s newsletter', get_product_name()) . "</span>";
 	}
 	else {
 		$data[1] .= $jump . '<span style="font-weight:initial;"><a style="text-decoration:underline;" href="javascript: force_run_newsletter();">' . __('Subscribe to our newsletter') . "</a></span>";
@@ -474,10 +474,9 @@ echo '<form name="user_mod" method="post" action="'.$url.'&amp;modified=1&amp;id
 
 html_print_table($table);
 
-
 echo '<div style="width:' . $table->width . '; text-align:right;">';
 if (!$config["user_can_update_info"]) {
-	echo '<i>'.__('You can not change your user info from Pandora FMS under the current authentication scheme').'</i>';
+	echo '<i>'.__('You can not change your user info under the current authentication scheme').'</i>';
 }
 else {
 	html_print_submit_button (__('Update'), 'uptbutton', $view_mode, 'class="sub upd"');

From cb11f0333ef76a3b9571c622e80a60e5ac6ee4a4 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 16:06:32 +0200
Subject: [PATCH 17/56] [Rebranding] Open general/firts_task/incidents.php

---
 pandora_console/general/firts_task/incidents.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandora_console/general/firts_task/incidents.php b/pandora_console/general/firts_task/incidents.php
index 32924ac626..a694874cb3 100644
--- a/pandora_console/general/firts_task/incidents.php
+++ b/pandora_console/general/firts_task/incidents.php
@@ -33,13 +33,13 @@ if ($incident_w || $incident_m) {
 	</div>
 	<div class="text_task">
 		<h3> <?php echo __('Create Incidents'); ?></h3>
-		<p id="description_task"> <?php echo __("Besides receiving and processing data to monitor systems or applications, 
-			you're also required to monitor possible incidents which might take place on these systems within the system monitoring process.
-			For it, the Pandora FMS team has designed an incident manager within which any user is able to open incidents, 
-			explaining what's happened on the network and to update them with comments and files any time in case there is a need to do so.
-			This system allows the users to work as a team, along with different roles and work-flow systems which allows an incident to be 
-			moved from one group to another, and that members from different groups and different people could work on the same incident, sharing information and files.
-		"); ?></p>
+		<p id="description_task"> <?php echo __("Besides receiving and processing data to monitor systems or applications,
+			you're also required to monitor possible incidents which might take place on these subsystems within the system's monitoring process.
+			For it, the %s team has designed an incident manager from which any user is able to open incidents,
+			that explain what's happened on the network, and update them with comments and files, at any time, in case there is a need to do so.
+			This system allows users to work as a team, along with different roles and work-flow systems which allow an incident to be
+			moved from one group to another, and members from different groups and different people could work on the same incident, sharing information and files.
+		", get_product_name()); ?></p>
 		<form action="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;insert_form=1" method="post">
 			<input type="submit" class="button_task" value="<?php echo __('Create Incidents'); ?>" />
 		</form>

From d8f63e99632d6168b8e2e5f881b9bf2bfbfa0dcf Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 14 May 2018 17:51:10 +0200
Subject: [PATCH 18/56] [Rebranding] Some missing string in extension

---
 pandora_console/extensions/dbmanager.php             |  8 +++++++-
 pandora_console/extensions/resource_exportation.php  |  5 +++--
 pandora_console/extensions/resource_registration.php | 11 ++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index 114c3bf709..4bcaeac702 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -134,7 +134,13 @@ function dbmgr_extension_main () {
 	ui_print_page_header (__('Database interface'), "images/gm_db.png", false, false, true);
 	
 	echo '<div class="notify">';
-	echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that <b>you can damage</b> your Pandora FMS installation if you don't know </b>exactly</b> what are you are doing, this means that you can severily damage your setup using this extension. This extension is intended to be used <b>only by experienced users</b> with a depth knowledge of Pandora FMS internals.";
+	echo __("This is an advanced extension to interface with %s database directly from WEB console
+		using native SQL sentences. Please note that <b>you can damage</b> your %s installation
+		if you don't know </b>exactly</b> what are you are doing,
+		this means that you can severily damage your setup using this extension.
+		This extension is intended to be used <b>only by experienced users</b>
+		with a depth knowledge of %s internals.",
+		get_product_name(), get_product_name(), get_product_name());
 	echo '</div>';
 	
 	echo "<br />";
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 4bdc7d2046..3e6ba7f540 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -338,8 +338,9 @@ function resource_exportation_extension_main() {
 	ui_print_page_header (__('Resource exportation'), "images/extensions.png", false, "", true, "" );
 	
 	echo "<div class=notify>";
-	echo __("This extension makes exportation of resource template more easy. " .
-		"Here you can export as a resource template in Pandora FMS 3.x format (.ptr). ");
+	echo __("This extension makes exportation of resource template more easy.") .
+		" " .
+		__("You can export resource templates in .ptr format.");
 	echo "</div>";
 	
 	echo "<br /><br />";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index a4dff69997..61ae26f55b 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -855,11 +855,12 @@ function resource_registration_extension_main() {
 	}
 	
 	echo "<div class=notify>";
-	printf(__("This extension makes registration of resource template more easy. " .
-		"Here you can upload a resource template in Pandora FMS 3.x format (.ptr). " .
-		"Please refer to documentation on how to obtain and use Pandora FMS resources. " .
-		"<br><br>You can get more resurces in our <a href='%s'>Public Resource Library</a>") ,
-		"http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en");
+	echo __("This extension makes registering resource templates easier.") . " " .
+		__("Here you can upload a resource template in .ptr format.") . " " .
+		__("Please refer to our documentation for more information on how to obtain and use Pandora FMS' resources.") . " " .
+		"<br> <br>" .
+		__("You can get more resurces in our <a href='http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en'>Public Resource Library</a>")
+	;
 	echo "</div>";
 	
 	echo "<br /><br />";

From cc26124289affade59e082c3be7ed930cf9180eb Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 17 May 2018 16:12:44 +0200
Subject: [PATCH 19/56] Rebranding open server

---
 pandora_server/bin/pandora_server             | 12 ++++-----
 pandora_server/lib/PandoraFMS/Config.pm       |  6 +++++
 pandora_server/lib/PandoraFMS/Core.pm         | 27 ++++++++-----------
 pandora_server/lib/PandoraFMS/DataServer.pm   |  4 +--
 .../lib/PandoraFMS/NetworkServer.pm           |  6 ++---
 pandora_server/lib/PandoraFMS/PluginServer.pm |  2 +-
 .../lib/PandoraFMS/PredictionServer.pm        |  2 +-
 pandora_server/lib/PandoraFMS/ReconServer.pm  |  6 ++---
 pandora_server/lib/PandoraFMS/SNMPServer.pm   |  2 +-
 pandora_server/lib/PandoraFMS/Tools.pm        |  2 +-
 pandora_server/lib/PandoraFMS/WMIServer.pm    |  6 ++---
 11 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 693058dde8..49d3c97cba 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -55,7 +55,7 @@ my $MainThread = threads->self;
 sub pandora_shutdown () {
 	my $signal = shift;
 
-	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' Caught SIG' . $signal . ' by thread(' . threads->self()->tid() . ')', 10);
+	logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' Caught SIG' . $signal . ' by thread(' . threads->self()->tid() . ')', 10);
 
 	if (!threads->self->equal($MainThread)) {
 		# deliver signal to the main thread since no other threads than main thread
@@ -63,7 +63,7 @@ sub pandora_shutdown () {
 		$MainThread->kill($signal);
 		return;
 	}
-	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' Shutdown by signal ', 1);
+	logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' Shutdown by signal ', 1);
 	
 	# Stop servers
 	foreach my $server (@Servers) {
@@ -103,7 +103,7 @@ sub pandora_startup () {
 
 	# Update the agent cache.
 	threads->create('enterprise_hook', ('update_agent_cache', [\%Config]))->detach() if ($Config{'node_metaconsole'} == 1);
-	pandora_audit (\%Config, 'Pandora FMS Server Daemon starting', 'SYSTEM', 'System', $DBH);
+	pandora_audit (\%Config, $Config{'rb_product_name'} . ' Server Daemon starting', 'SYSTEM', 'System', $DBH);
 	
 	# Load servers
 	if (!is_metaconsole(\%Config)) {
@@ -197,7 +197,7 @@ sub pandora_crash () {
 		$full_error .= $error_line;
 	}
 	
-	logger (\%Config, 'Pandora FMS Server \'' . $Config{'servername'} . '\' unhandled error.', 1);
+	logger (\%Config, $Config{'rb_product_name'} . ' Server \'' . $Config{'servername'} . '\' unhandled error.', 1);
 	
 	# It's interesting show by console problems, not only in logs. This helps
 	# to solve stupid problems like Database credential problems for example
@@ -634,7 +634,7 @@ sub main() {
 				$server->restartEvent ($@);
 			}
 			
-			logger (\%Config, 'Pandora FMS Server restarting (' . $@ . ') in ' . $Config{'restart_delay'} . ' seconds.', 1);
+			logger (\%Config, $Config{'rb_product_name'} . ' Server restarting (' . $@ . ') in ' . $Config{'restart_delay'} . ' seconds.', 1);
 			pandora_restart ();
 		}
 		elsif (($Config{'auto_restart'} > 0) && (time () - $time_ref > $Config{'auto_restart'})) {
@@ -660,7 +660,7 @@ sub main() {
 					$server->restartEvent ($@);
 				}
 				
-				logger (\%Config, 'Pandora FMS Server restarting (' . $@ . ') in 5 seconds.', 1);
+				logger (\%Config, $Config{'rb_product_name'} . ' Server restarting (' . $@ . ') in 5 seconds.', 1);
 				pandora_load_config (\%Config);
 				pandora_restart (5);
 			}
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index cf59c3e7e0..386739c316 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -178,6 +178,12 @@ sub pandora_get_sharedconfig ($$) {
 		$pa_config->{'include_agents'} = 0;
 	}
 
+	# PandoraFMS product name
+	$pa_config->{'rb_product_name'} = enterprise_hook(
+		'pandora_get_product_name',
+		[$dbh]
+	);
+	$pa_config->{'rb_product_name'} = 'Pandora FMS' unless (defined ($pa_config->{'rb_product_name'}) && $pa_config->{'rb_product_name'} ne '');
 }
 
 ##########################################################################
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 0537628dc2..c3e0bba259 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -605,13 +605,13 @@ sub pandora_process_alert ($$$$$$$$;$) {
 			pandora_event ($pa_config, "Alert ceased (" .
 				safe_output($alert->{'name'}) . ")", 0, 0, $alert->{'priority'}, $id,
 				(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), 
-				"alert_ceased", 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+				"alert_ceased", 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 		}  else {
 			pandora_event ($pa_config, "Alert ceased (" .
 					safe_output($alert->{'name'}) . ")", $agent->{'id_grupo'},
 					$agent->{'id_agente'}, $alert->{'priority'}, $id,
 					(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0),
-					"alert_ceased", 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+					"alert_ceased", 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 		}
 		return;
 	}
@@ -844,7 +844,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 
 		pandora_event ($pa_config, "Alert $text (" . safe_output($alert->{'name'}) . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""),
  			(defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $severity, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0),
-			(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, 'Pandora', '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
+			(defined ($alert->{'id_agent_module'}) ? $alert->{'id_agent_module'} : 0), $event, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $critical_instructions, $warning_instructions, $unknown_instructions);
 	}
 }
 
@@ -1395,7 +1395,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		# Field 5 (Ticket name)
 		my $ticket_name = $field5;
 		if ($ticket_name eq "") {
-			$ticket_name = "Pandora FMS alert action created by API";
+			$ticket_name = $pa_config->{'rb_product_name'} . " alert action created by API";
 		}
 		
 		# Field 6 (Ticket group ID)
@@ -1715,8 +1715,6 @@ sub pandora_planned_downtime_disabled_once_start($$) {
 		db_do($dbh, 'UPDATE tplanned_downtime
 			SET executed = 1
 			WHERE id = ?', $downtime->{'id'});
-		
-		print"pandora_planned_downtime_disabled_once_start\n";
 		pandora_event ($pa_config,
 			"(Created by " . $downtime->{'id_user'} . ") Server ".$pa_config->{'servername'}." started planned downtime: ".safe_output($downtime->{'name'}), 0, 0, 1, 0, 0, 'system', 0, $dbh);
 		
@@ -2191,7 +2189,6 @@ sub pandora_planned_downtime_weekly_start($$) {
 			db_do($dbh, 'UPDATE tplanned_downtime
 				SET executed = 1
 				WHERE id = ?', $downtime->{'id'});
-			print"pandora_planned_downtime_weekly_start\n";
 			pandora_event ($pa_config,
 				"Server ".$pa_config->{'servername'}." started planned downtime: ".safe_output($downtime->{'name'}), 0, 0, 1, 0, 0, 'system', 0, $dbh);
 				
@@ -2306,8 +2303,6 @@ sub pandora_planned_downtime_weekly_stop($$) {
 			db_do($dbh, 'UPDATE tplanned_downtime
 				SET executed = 0
 				WHERE id = ?', $downtime->{'id'});
-
-			print"pandora_planned_downtime_weekly_stop\n";
 			pandora_event ($pa_config,
 				"Server ".$pa_config->{'servername'}." stopped planned downtime: ".safe_output($downtime->{'name'}), 0, 0, 1, 0, 0, 'system', 0, $dbh);
 			
@@ -3151,7 +3146,7 @@ sub pandora_event ($$$$$$$$$$;$$$$$$$$$) {
 	
 	
 	# Set default values for optional parameters
-	$source = 'Pandora' unless defined ($source);
+	$source = $pa_config->{'rb_product_name'} unless defined ($source);
 	$comment = '' unless defined ($comment);
 	$id_extra = '' unless defined ($id_extra);
 	$user_name = '' unless defined ($user_name);
@@ -4165,11 +4160,11 @@ sub generate_status_event ($$$$$$$$) {
 	# Generate the event
 	if ($status != 0){
 		pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 	} else { 
 		# Self validate this event if has "normal" status
 		pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 1, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+			$severity, 0, $module->{'id_agente_modulo'}, $event_type, 1, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 	}
 
 }
@@ -4692,7 +4687,7 @@ sub pandora_self_monitoring ($$) {
 
 	my $xml_output = "";
 	
-	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='Pandora FMS Server version " . $pa_config->{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
+	$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
 	$xml_output .=" <module>";
 	$xml_output .=" <name>Status</name>";
 	$xml_output .=" <type>generic_proc</type>";
@@ -4924,7 +4919,7 @@ sub pandora_module_unknown ($$) {
 			# Are unknown events enabled?
 			if ($pa_config->{'unknown_events'} == 1) {
 				pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 			}
 		}
 		# Regular module
@@ -4990,7 +4985,7 @@ sub pandora_module_unknown ($$) {
 		        $description = subst_alert_macros ($description, \%macros, $pa_config, $dbh, $agent, $module);
 		        
 				pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'},
-					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
+					$severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, $pa_config->{'rb_product_name'}, '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'});
 			}
 		}
 	}
@@ -5444,7 +5439,7 @@ sub pandora_create_integria_ticket ($$$$$$$$$$$) {
 		$integria_user = "admin";
 	}
 	if ($ticket_name eq "") {
-		$ticket_name = "Ticket created by Pandora FMS";
+		$ticket_name = "Ticket created by " . $pa_config->{'rb_product_name'};
 	}
 	if ($group_id eq "") {
 		$group_id = 1;
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 189b8952d8..ef62bab200 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -88,7 +88,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS Data Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Data Server.", 1);
 	$self->setNumThreads ($pa_config->{'dataserver_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
@@ -346,7 +346,7 @@ sub process_xml_data ($$$$$) {
 					return;
 				}
 			} else {
-					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': autocreate_group $group_id does not exist. Edit the pandora_server.conf file and change it.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
+					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': autocreate_group $group_id does not exist. Edit the server configuration file and change it.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
 					logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token).", 3);
 					return;
 			}
diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index f52b6e8a72..ff755ab2de 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -55,8 +55,8 @@ sub new ($$$) {
 	return undef unless $config->{'networkserver'} == 1;
 
 	if (! -e $config->{'snmpget'}) {
-		logger ($config, ' [E] ' . $config->{'snmpget'} . " needed by Pandora FMS Network Server not found.", 1);
-		print_message ($config, ' [E] ' . $config->{'snmpget'} . " needed by Pandora FMS Network Server not found.", 1);
+		logger ($config, ' [E] ' . $config->{'snmpget'} . " needed by " . $config->{'rb_product_name'} . " Network Server not found.", 1);
+		print_message ($config, ' [E] ' . $config->{'snmpget'} . " needed by " . $config->{'rb_product_name'} . " Network Server not found.", 1);
 		return undef;
 	}
 
@@ -80,7 +80,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS Network Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Network Server.", 1);
 	$self->setNumThreads ($pa_config->{'network_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm
index a3d280f9b2..b94de25598 100644
--- a/pandora_server/lib/PandoraFMS/PluginServer.pm
+++ b/pandora_server/lib/PandoraFMS/PluginServer.pm
@@ -81,7 +81,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS Plugin Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Plugin Server.", 1);
 	$self->setNumThreads ($pa_config->{'plugin_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm
index 1862930267..ec7fa7e586 100644
--- a/pandora_server/lib/PandoraFMS/PredictionServer.pm
+++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm
@@ -77,7 +77,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 	
-	print_message ($pa_config, " [*] Starting Pandora FMS Prediction Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Prediction Server.", 1);
 	$self->setNumThreads ($pa_config->{'prediction_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm
index 3261729569..0d00e3c9ca 100644
--- a/pandora_server/lib/PandoraFMS/ReconServer.pm
+++ b/pandora_server/lib/PandoraFMS/ReconServer.pm
@@ -65,8 +65,8 @@ sub new ($$$$$$) {
 	return undef unless $config->{'reconserver'} == 1;
 	
 	if (! -e $config->{'nmap'}) {
-		logger ($config, ' [E] ' . $config->{'nmap'} . " needed by Pandora FMS Recon Server not found.", 1);
-		print_message ($config, ' [E] ' . $config->{'nmap'} . " needed by Pandora FMS Recon Server not found.", 1);
+		logger ($config, ' [E] ' . $config->{'nmap'} . " needed by " . $config->{'rb_product_name'} . " Recon Server not found.", 1);
+		print_message ($config, ' [E] ' . $config->{'nmap'} . " needed by " . $config->{'rb_product_name'} . " Recon Server not found.", 1);
 		return undef;
 	}
 
@@ -98,7 +98,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 	
-	print_message ($pa_config, " [*] Starting Pandora FMS Recon Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " Recon Server.", 1);
 	$self->setNumThreads ($pa_config->{'recon_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }
diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm
index 9cd44427d6..b5dd550581 100644
--- a/pandora_server/lib/PandoraFMS/SNMPServer.pm
+++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm
@@ -115,7 +115,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS SNMP Console.", 2);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " SNMP Console.", 2);
 	
 	# Set the initial date for storm protection.
 	$pa_config->{"__storm_ref__"} = time();
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 3ca50a64ae..a81aa6bfb5 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -445,7 +445,7 @@ sub pandora_sendmail {
 	my %mail = ( To	=> $to_address,
 		Message		=> $message,
 		Subject		=> encode('MIME-Header', $subject),
-		'X-Mailer'	=> "Pandora FMS",
+		'X-Mailer'	=> $pa_config->{"rb_product_name"},
 		Smtp		=> $pa_config->{"mta_address"},
 		Port		=> $pa_config->{"mta_port"},
 		From		=> $pa_config->{"mta_from"},
diff --git a/pandora_server/lib/PandoraFMS/WMIServer.pm b/pandora_server/lib/PandoraFMS/WMIServer.pm
index 74cb4e6ae8..b667de6a91 100644
--- a/pandora_server/lib/PandoraFMS/WMIServer.pm
+++ b/pandora_server/lib/PandoraFMS/WMIServer.pm
@@ -54,8 +54,8 @@ sub new ($$;$) {
 
 	# Check for a WMI client
 	if (system ($config->{'wmi_client'} . " >$DEVNULL 2>&1") >> 8 != 1) {
-		logger ($config, ' [E] ' . $config->{'wmi_client'} . " not found. Pandora FMS WMI Server needs a DCOM/WMI client.", 1);
-		print_message ($config, ' [E] ' . $config->{'wmi_client'} . " not found. Pandora FMS WMI Server needs a DCOM/WMI client.", 1);
+		logger ($config, ' [E] ' . $config->{'wmi_client'} . " not found. " . $config->{'rb_product_name'} . " WMI Server needs a DCOM/WMI client.", 1);
+		print_message ($config, ' [E] ' . $config->{'wmi_client'} . " not found. " . $config->{'rb_product_name'} . " WMI Server needs a DCOM/WMI client.", 1);
 		return undef;
 	}
 
@@ -79,7 +79,7 @@ sub run ($) {
 	my $self = shift;
 	my $pa_config = $self->getConfig ();
 
-	print_message ($pa_config, " [*] Starting Pandora FMS WMI Server.", 1);
+	print_message ($pa_config, " [*] Starting " . $pa_config->{'rb_product_name'} . " WMI Server.", 1);
 	$self->setNumThreads ($pa_config->{'wmi_threads'});
 	$self->SUPER::run (\@TaskQueue, \%PendingTasks, $Sem, $TaskSem);
 }

From 477fc9d22a5d848884b591221b678e9d90e93074 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 17 May 2018 18:38:26 +0200
Subject: [PATCH 20/56] [Rebranding] pandora_db

---
 pandora_server/util/pandora_db.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index cbbaccb753..a79bf16c11 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -555,7 +555,7 @@ sub pandora_compactdb ($$) {
 sub pandora_init ($) {
 	my $conf = shift;
 	
-	log_message ('', "\nPandora FMS DB Tool $version Copyright (c) 2004-2015 Artica ST\n");
+	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 Artica ST\n");
 	log_message ('', "This program is Free Software, licensed under the terms of GPL License v2\n");
 	log_message ('', "You can download latest versions and documentation at http://www.pandorafms.org\n\n");
 	
@@ -677,7 +677,7 @@ sub pandora_load_config ($) {
    	
 	db_disconnect ($dbh);
 
-	log_message ('', "Pandora DB now initialized and running (PURGE=" . $conf->{'_days_purge'} . " days, COMPACT=$conf->{'_days_compact'} days, STEP=" . $conf->{'_step_compact'} . ") . \n\n");
+	log_message ('', "DB Tool now initialized and running (PURGE=" . $conf->{'_days_purge'} . " days, COMPACT=$conf->{'_days_compact'} days, STEP=" . $conf->{'_step_compact'} . ") . \n\n");
 }
 
 
@@ -1045,7 +1045,7 @@ my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ($conf{'dbe
 # Get a lock
 my $lock = db_get_lock ($dbh, 'pandora_db');
 if ($lock == 0 && $conf{'_force'} == 0) { 
-	log_message ('', " [*] Another instance of pandora_db seems to be running.\n\n");
+	log_message ('', " [*] Another instance of DB Tool seems to be running.\n\n");
 	exit 1;
 }
 

From ce946c1093f5276ac59ee3b75aa3597a883d7c95 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 12:54:00 +0200
Subject: [PATCH 21/56] [Rebranding] en help

---
 .../include/help/en/help_alert_command.php    |  2 +-
 .../include/help/en/help_alert_config.php     |  6 ++--
 .../include/help/en/help_alert_macros.php     |  4 +--
 .../include/help/en/help_alert_recovery.php   |  2 +-
 .../include/help/en/help_alert_type.php       |  8 +++---
 .../include/help/en/help_alerts.php           |  2 +-
 .../include/help/en/help_alerts_config.php    | 28 +++++++++----------
 .../help/en/help_cascade_protection.php       |  4 +--
 .../include/help/en/help_categories.php       |  2 +-
 .../help/en/help_configure_gis_map.php        |  4 +--
 .../help/en/help_context_module_unknow.php    |  8 +++---
 .../en/help_context_pandora_server_email.php  |  8 +++---
 .../include/help/en/help_create_agent.php     |  2 +-
 pandora_console/include/help/en/help_cron.php |  2 +-
 .../include/help/en/help_custom_logo.php      |  2 +-
 .../help/en/help_dynamic_threshold.php        |  2 +-
 .../include/help/en/help_event_alert.php      |  4 +--
 .../include/help/en/help_events_history.php   |  2 +-
 .../include/help/en/help_export_server.php    |  4 +--
 .../include/help/en/help_ff_threshold.php     |  4 +--
 .../include/help/en/help_gis_map_builder.php  |  2 +-
 .../help/en/help_gis_setup_map_connection.php |  4 +--
 .../include/help/en/help_graphs.php           | 10 +++----
 .../include/help/en/help_history_database.php |  6 ++--
 pandora_console/include/help/en/help_ipam.php |  6 ++--
 .../include/help/en/help_local_component.php  |  2 +-
 .../include/help/en/help_main_help.php        |  4 +--
 .../help/en/help_manage_alert_list.php        |  2 +-
 .../include/help/en/help_manage_alerts.php    |  2 +-
 .../include/help/en/help_module_tokens.php    |  6 ++--
 .../help/en/help_network_map_enterprise.php   |  8 +++---
 .../include/help/en/help_performance.php      |  2 +-
 .../include/help/en/help_planned_downtime.php |  2 +-
 .../help/en/help_planned_downtime_time.php    |  2 +-
 .../help/en/help_plugin_definition.php        |  8 +++---
 .../include/help/en/help_plugin_macros.php    |  2 +-
 .../include/help/en/help_plugin_policy.php    |  2 +-
 .../include/help/en/help_profile.php          |  2 +-
 .../include/help/en/help_recontask.php        |  4 +--
 .../help/en/help_reporting_wizard_sla_tab.php |  2 +-
 .../include/help/en/help_response_macros.php  |  2 +-
 .../include/help/en/help_servers.php          |  6 ++--
 .../include/help/en/help_snmp_alert.php       |  2 +-
 .../include/help/en/help_snmpoid.php          |  2 +-
 .../include/help/en/help_snmpwalk.php         |  4 +--
 .../include/help/en/help_tags_config.php      |  2 +-
 .../include/help/en/help_tcp_send.php         |  2 +-
 .../include/help/en/help_timesource.php       |  4 +--
 .../help_visual_console_editor_editor_tab.php |  2 +-
 ...help_visual_console_editor_preview_tab.php |  2 +-
 .../include/help/en/help_web_checks.php       |  4 +--
 .../include/help/en/help_wux_console.php      | 12 ++++----
 52 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/pandora_console/include/help/en/help_alert_command.php b/pandora_console/include/help/en/help_alert_command.php
index ce60378f6c..b464b427bb 100644
--- a/pandora_console/include/help/en/help_alert_command.php
+++ b/pandora_console/include/help/en/help_alert_command.php
@@ -6,4 +6,4 @@
 
 <h1>Alert commands</h1>
 
-<p>Pandora FMS's reaction to a value stating &#34;out of range&#34; can be diverse: it can be recorder on the syslog, an email or SMS alert can be sent, or the execution of any script found on the Pandora FMS device and that can be properly processed.</p>
+<p><?php echo get_product_name();?>'s reaction to a value stating &#34;out of range&#34; can be diverse: it can be recorder on the syslog, an email or SMS alert can be sent, or the execution of any script found on the <?php echo get_product_name();?> device and that can be properly processed.</p>
diff --git a/pandora_console/include/help/en/help_alert_config.php b/pandora_console/include/help/en/help_alert_config.php
index 79c5f47255..b8d02b6282 100644
--- a/pandora_console/include/help/en/help_alert_config.php
+++ b/pandora_console/include/help/en/help_alert_config.php
@@ -8,7 +8,7 @@
 
     <b>Name:</b> Name assigned to the action.<br>
     <b>Group:</b> Group the action belongs to. <br>
-    <b>Command:</b> In this field the command that will be used in case the alert is triggered can be defined. Users can choose from the different commands that are defined on Pandora. Depending on the command chosen a variable group of fields will be shown (specific to each command) <br>
+    <b>Command:</b> In this field the command that will be used in case the alert is triggered can be defined. Users can choose from the different commands that are defined on <?php echo get_product_name();?>. Depending on the command chosen a variable group of fields will be shown (specific to each command) <br>
     <b>Threshold:</b> The action’s execution threshold. <br>
     <b>Command Preview:</b>  In this field, which can’t be edited, the command that will be run on the system will appear automatically. <br>
     <b>Field X:</b> In these fields:<br><br>
@@ -48,7 +48,7 @@ Apart from the defined module macros, the following macros are also available:
   <li>_data_: Module data that caused the alert to fire.</li>
   <li>_email_tag_: Emails associated to the module’s tags.</li>
   <li>_event_cfX_: (Only event alerts) Key of the event custom field that fired the alert. For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-  <li>_event_description_: (Only event alerts) The textual description of the Pandora FMS event.</li>
+  <li>_event_description_: (Only event alerts) The textual description of the <?php echo get_product_name();?> event.</li>
   <li>_event_extra_id_ : (Only event alerts) Extra id.</li>
   <li>_event_id_: (Only event alerts) ID of the event that triggered the alert.</li>
   <li>_event_text_severity_: (Only event alerts) Event text severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -71,7 +71,7 @@ Apart from the defined module macros, the following macros are also available:
   <li>_groupcustomid_: Group custom ID.</li>
   <li>_groupother_: Other information about the group. Configured when the group is created.</li>
   <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
-  <li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a Pandora FMS console webpage.</li>
+  <li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a <?php echo get_product_name();?> console webpage.</li>
   <li>_id_alert_: Alert’s numeric ID (unique), used to correlate the alert with third party software.</li>
   <li>_id_group_ : Agent group ID.</li>
   <li>_id_module_: Module ID.</li>
diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php
index cda2daf380..d2afc89053 100644
--- a/pandora_console/include/help/en/help_alert_macros.php
+++ b/pandora_console/include/help/en/help_alert_macros.php
@@ -33,7 +33,7 @@ Besides the defined module macros, the following macros are available:
 <li>_data_: Module data that caused the alert to fire.</li>
 <li>_email_tag_: Emails associated to the module’s tags.</li>
 <li>_event_cfX_: (Only event alerts) Key of the event custom field that fired the alert. For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-<li>_event_description_: (Only event alerts) The textual description of the Pandora FMS event.</li>
+<li>_event_description_: (Only event alerts) The textual description of the <?php echo get_product_name();?> event.</li>
 <li>_event_extra_id_: (Only event alerts) Extra id.</li>
 <li>_event_id_: (Only event alerts) ID of the event that triggered the alert.</li>
 <li>_event_text_severity_: (Only event alerts) Event text severity (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -56,7 +56,7 @@ Besides the defined module macros, the following macros are available:
 <li>_groupcustomid_: Group custom ID.</li>
 <li>_groupother_: Other information about the group. Configured when the group is created.</li>
 <li>_homeurl_ : It is a link of the public URL this must be configured in the general options of the setup.</li>
-<li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a Pandora FMS console webpage.</li>
+<li>_id_agent_: Agent’s ID, useful for building a direct URL that redirects to a <?php echo get_product_name();?> console webpage.</li>
 <li>_id_alert_: Alert’s numeric ID (unique), used to correlate the alert with third party software.</li>
 <li>_id_group_ : Agent group ID.</li>
 <li>_id_module_: Module ID.</li>
diff --git a/pandora_console/include/help/en/help_alert_recovery.php b/pandora_console/include/help/en/help_alert_recovery.php
index 4dae2c624a..3bf4747308 100644
--- a/pandora_console/include/help/en/help_alert_recovery.php
+++ b/pandora_console/include/help/en/help_alert_recovery.php
@@ -5,4 +5,4 @@
 ?>
 <h1>Alert recovery</h1>
 
-It defines whether Pandora FMS launches another alert when the alert’s condition is recovered. It has the same “field1”, but adds "[RECOVER]" to “field2” and “field3”. It is disabled by default. 
+It defines whether <?php echo get_product_name();?> launches another alert when the alert’s condition is recovered. It has the same “field1”, but adds "[RECOVER]" to “field2” and “field3”. It is disabled by default. 
diff --git a/pandora_console/include/help/en/help_alert_type.php b/pandora_console/include/help/en/help_alert_type.php
index 2832ab62e6..93325ecb6c 100644
--- a/pandora_console/include/help/en/help_alert_type.php
+++ b/pandora_console/include/help/en/help_alert_type.php
@@ -7,9 +7,9 @@
 
 There are some preset alerts, on which it’s very likely you will have to make adjustments, in case your system does not provide the internal commands needed to execute those alerts. The development team has tested these alerts with Red Hat Enterprise Linux (RHEL), CentOS, Debian and Ubuntu Server.
 <ul>
-	<li><b>eMail</b>: Sends an e-mail from Pandora FMS’ Server. It uses your local sendmail. If you have installed another kind of local mailer or do not have one, you should install and configure sendmail or any equivalent (and check the syntax) to be able to use this service. Pandora FMS relies on system tools to execute almost every alert, it will be necessary to check that those commands work properly on your system.</li>
-	<li><b>Internal audit</b>: This is the only "internal" alert, it writes the incident in Pandora FMS’ internal auditing system. This is stored on Pandora FMS’ Database and can be reviewed from the web console with the Pandora FMS audit viewer.</li>
-	<li><b>Pandora FMS’ Alertlog</b>: Saves information about alerts inside a text file (.log). Use this type of alert to generate log files using the format you need. To do so, you will need to modify the command so that it will use the format and file you want. Note that Pandora FMS does not handle file rotation, and that Pandora FMS’ Server process that executes the alert will need access to the log file in order to write on it.</li>
-	<li><b>Pandora FMS Events</b>: This alert creates an special event on the Pandora FMS event manager.</li> 
+	<li><b>eMail</b>: Sends an e-mail from <?php echo get_product_name();?> Server. It uses your local sendmail. If you have installed another kind of local mailer or do not have one, you should install and configure sendmail or any equivalent (and check the syntax) to be able to use this service. <?php echo get_product_name();?> relies on system tools to execute almost every alert, it will be necessary to check that those commands work properly on your system.</li>
+	<li><b>Internal audit</b>: This is the only "internal" alert, it writes the incident in <?php echo get_product_name();?>'s' internal auditing system. This is stored on <?php echo get_product_name();?>'s Database and can be reviewed from the web console with the <?php echo get_product_name();?> audit viewer.</li>
+	<li><b><?php echo get_product_name();?> Alertlog</b>: Saves information about alerts inside a text file (.log). Use this type of alert to generate log files using the format you need. To do so, you will need to modify the command so that it will use the format and file you want. Note that <?php echo get_product_name();?> does not handle file rotation, and that <?php echo get_product_name();?>'s' Server process that executes the alert will need access to the log file in order to write on it.</li>
+	<li><b><?php echo get_product_name();?> Events</b>: This alert creates an special event on the <?php echo get_product_name();?> event manager.</li> 
 </ul>
 These alerts are predefined and cannot be deleted, however the user can define new ones that can use custom commands, and add them using Alert management.
diff --git a/pandora_console/include/help/en/help_alerts.php b/pandora_console/include/help/en/help_alerts.php
index 34f9d31ce0..85a4c9fcd8 100644
--- a/pandora_console/include/help/en/help_alerts.php
+++ b/pandora_console/include/help/en/help_alerts.php
@@ -14,7 +14,7 @@
 
 	<li><b>Alert type:</b> This can be selected from the previously generated alert list.</li>
 	<li><b>Max. Value:</b> Defines the maximum value for a module. Any value above that threshold will trigger the alert.</li>
-	<li><b>Min. Value:</b> Defines the minimum value for a module. Any value below that will trigger the alert. The ”max." &amp; "min." couple are key values when defining an alert, since they define the range for normal values. Outside that range Pandora FMS will trigger the alert.</li>
+	<li><b>Min. Value:</b> Defines the minimum value for a module. Any value below that will trigger the alert. The ”max." &amp; "min." couple are key values when defining an alert, since they define the range for normal values. Outside that range <?php echo get_product_name();?> will trigger the alert.</li>
 	<li><b>Alert text:</b> In the case of string modules you can define a regular expression or a substring to match the contents of a data module in order to trigger the alert.</li>
 	<li><b>Time from / Time to:</b> This defines a “valid” timespan to trigger alert.</li>
 	<li><b>Description:</b> Describes the function of the alert, and it is useful to identify the alert among the others in the general view of alerts.</li>
diff --git a/pandora_console/include/help/en/help_alerts_config.php b/pandora_console/include/help/en/help_alerts_config.php
index 0348588629..7f772f1c39 100644
--- a/pandora_console/include/help/en/help_alerts_config.php
+++ b/pandora_console/include/help/en/help_alerts_config.php
@@ -3,22 +3,22 @@
  * @package Include/help/es 
  */
 ?> 
-<h1>Pandora FMS’ Quick Guide to Alert Configuration </h1>
+<h1><?php echo get_product_name();?>'s Quick Guide to Alert Configuration </h1>
 <br>
 <b>Introduction to the Current Alert System</b><br>
 <br>
 People usually complain about the complexity of defining alerts on
-Pandora FMS. Before, until version 2.0, alerts were easier to
+<?php echo get_product_name();?>. Before, until version 2.0, alerts were easier to
 configure. For each alert the condition and what it did when the action was not completed was defined for each case. It was a more "intuitive"
 thing (but it also had fields such as the "threshold" alert that caused
 many headaches to more than one person!). It was very simple, but, was
 it worth it ?<br>
 <br>
-One of our “star” users (we mention this because he had A LOT of agents installed, and also knew the inner workings of Pandora FMS quite well) mentioned that creating an alert for 2000 modules was tremendously complicated, especially when it was necessary to modify something for all of them. Due to this, and other issues, we decided to modify the alert system so that it could be modular, so that the alert’s definition and its triggering condition (template) could be separated from the action that has to be executed when the alert is triggered (alert action) and from the command that is run within the action (Alert command). The combination of an alert template with a module triggers the alert itself.<br><br>
+One of our “star” users (we mention this because he had A LOT of agents installed, and also knew the inner workings of <?php echo get_product_name();?> quite well) mentioned that creating an alert for 2000 modules was tremendously complicated, especially when it was necessary to modify something for all of them. Due to this, and other issues, we decided to modify the alert system so that it could be modular, so that the alert’s definition and its triggering condition (template) could be separated from the action that has to be executed when the alert is triggered (alert action) and from the command that is run within the action (Alert command). The combination of an alert template with a module triggers the alert itself.<br><br>
 
 This way, if I have 1000 devices with a module named “Host Alive” and all of them have a related alert template named “Host Down” that when triggered executes an action named “Warn the Operator”, and I wish to change the minimum number of alerts that must be fired before the Operator is warned, I only have to change the definition on the template instead of going one by one over the 1000 alerts to modify that specific condition.<br><br>
 
-Many users only manage a few dozen devices, but there are many users with hundreds—even thousands—of systems monitored with Pandora FMS, and we have to try and make it so that with Pandora FMS all types of environments can be managed.<br>
+Many users only manage a few dozen devices, but there are many users with hundreds—even thousands—of systems monitored with <?php echo get_product_name();?>, and we have to try and make it so that with <?php echo get_product_name();?> all types of environments can be managed.<br>
 <br>
 <br>
 <br>
@@ -118,9 +118,9 @@ html_print_image("images/help/alert07.png", false,
 	array('width' => '550px'));
 ?>
 <br>
-We’ve now made it so that the system can discriminate when something is right (OK status, marked in GREEN) and when something is wrong (CRITICAL status, marked in RED). Now what we have to do is make the system send us an email when the module reaches that status. For this we’ll use Pandora FMS’ alert system.<br>
+We’ve now made it so that the system can discriminate when something is right (OK status, marked in GREEN) and when something is wrong (CRITICAL status, marked in RED). Now what we have to do is make the system send us an email when the module reaches that status. For this we’ll use <?php echo get_product_name();?>'s alert system.<br>
 <br>
-For this we need to make sure there is a command available that can do what we need it to (in this case, send an email). This example is easy because there is a predefined command on Pandora FMS that is meant to automate email sending, meaning this is already done.<br>
+For this we need to make sure there is a command available that can do what we need it to (in this case, send an email). This example is easy because there is a predefined command on <?php echo get_product_name();?> that is meant to automate email sending, meaning this is already done.<br>
 <br>
 <b>Configuring the Alert</b><br>
 <br>
@@ -133,7 +133,7 @@ html_print_image("images/help/alert08.png", false,
 	array('width' => '550px'));
 ?>
 <br>
-This action uses the “send email” command, and is really simple, since only one field from the form needs to be filled out (Field1) leaving the other two empty. This is one of the most confusing parts of the alert system on Pandora FMS: what are field1, field2 and field3?<br>
+This action uses the “send email” command, and is really simple, since only one field from the form needs to be filled out (Field1) leaving the other two empty. This is one of the most confusing parts of the alert system on <?php echo get_product_name();?>: what are field1, field2 and field3?<br>
 <br>
 These fields are the ones used to “pass” the information on from the alert template to the command, and at the same time from that command to the next. This way both the template and the command can provide different information to the command. In this case, the command only establishes field1 and leaves field2 and field3 to be filled by the template, like what is shown next.<br>
 <br>
@@ -163,19 +163,19 @@ The most critical parameters here are the following:<br>
 <br>
 <i>Time threshold:</i> Set to one day by default. If a module is constantly down during, for example, one day and and we have set a value of 5 minutes here, it means that alerts would be sent every 5 minutes.  If we leave it at one day (24hrs.), it’ll only send the alert once, when it goes down. If the module recovers, and drops again, it’ll send another alert, but if it remains down from the second drop, it won’t send more alerts until 24hrs have gone by.<br>
 <br>
-<i>Min. Number of alerts:</i> The minimum number of times that a condition will have to be met (in this case, that the module is in CRITICAL status) before Pandora FMS runs the actions linked to the alert template. It’s a way to avoid false positives “flooding” you with alerts, or so that an erratic behaviour doesn’t lead to multiply alerts going off. If we place a ‘1’ here it means that until this doesn’t happen at least once, it won’t be taken into account. If i set a value of ‘0’ the first time the module returns an error, the alert will go off.<br>
+<i>Min. Number of alerts:</i> The minimum number of times that a condition will have to be met (in this case, that the module is in CRITICAL status) before <?php echo get_product_name();?> runs the actions linked to the alert template. It’s a way to avoid false positives “flooding” you with alerts, or so that an erratic behaviour doesn’t lead to multiply alerts going off. If we place a ‘1’ here it means that until this doesn’t happen at least once, it won’t be taken into account. If i set a value of ‘0’ the first time the module returns an error, the alert will go off.<br>
 <br>
 <i>Max. Number of alerts:</i> A value of 1 means that it’ll only execute the action once. If we have ’10’ set here, it’ll run the action 10 times. This is a way to limit the number of times an alert can go off.<br>
 <br>
 Again, we can see the fields “field1, field2, field3”. Now we can see that field1 is blank, which is precisely the one we’ve defined when configuring the action. Field2 and Field3 are used for the “send mail” action to define the subject and the message’s body, whilst Field1 is used to define the recipient(s) of said message (addresses must be separated by commas). Therefore the template, combined with the use of some macros, is defining the subject and alert message in a way that, in our case, we would receive a message like the following (supposing the agent where the module is placed is named “Farscape”):<br>
 <br>
 <i>To: sancho.lerena@notexist.ocm<br>
-Subject: [PANDORA] Farscape cpu_sys is in CRITICAL status with a value
+Subject: [MONITORING] Farscape cpu_sys is in CRITICAL status with a value
 of 20<br>
 Message body:<br>
 <br>
-This is an automated alert generated by Pandora FMS<br>
-Please contact your Pandora FMS operator for more information. *DO NOT* reply to
+This is an automated alert generated by <?php echo get_product_name();?><br>
+Please contact your <?php echo get_product_name();?> operator for more information. *DO NOT* reply to
 this email.<br>
 </i><br>
 Given that the default action is the one we have defined previously, all
@@ -229,7 +229,7 @@ Alerts in standby are useful because they can be viewed without interfering with
 <br>
 <b>Using Alert Commands other than the “send email” command</b><br>
 <br>
-The email, as a command is internal to Pandora FMS and can’t be configured, this means Field1, Field2 and Field3 are fields that are preset to be used as the recipient, subject and body for the email alert. But, what happens when we want to execute a different, more customised alert?<br>
+The email, as a command is internal to <?php echo get_product_name();?> and can’t be configured, this means Field1, Field2 and Field3 are fields that are preset to be used as the recipient, subject and body for the email alert. But, what happens when we want to execute a different, more customised alert?<br>
 <br>
 We’ll define a new, totally customised command. Imagine that we want to generate a log file with each alert we find. The format for that log file has to be something like:<br>
 <br>
@@ -262,9 +262,9 @@ We can see that the alert was fired at 18:17:10 because of the " farscape"
 agent, in the "cpu_sys" module, with a data value of "23.00" and with the
 description that we chose when we defined the action.<br>
 <br>
-Since the command’s execution, the field order and other affairs can make it so we don’t really understand how it’s executed at the end of the command, the easiest thing to do is to activate the Pandora server debug traces (verbose 10) in the configuration file for the Pandora server ‘/etc/pandora/pandora_server.conf’, and then reset the server
+Since the command’s execution, the field order and other affairs can make it so we don’t really understand how it’s executed at the end of the command, the easiest thing to do is to activate the <?php echo get_product_name();?> server debug traces (verbose 10) in the configuration file for the <?php echo get_product_name();?> server ‘/etc/pandora/pandora_server.conf’, and then reset the server
 (/etc/init.d/pandora_server restart). After, we take a look at the file
 /var/log/pandora/pandora_server.log and look for the exact line with the
-alert command execution that we've defined, to see how the Pandora FMS
+alert command execution that we've defined, to see how the <?php echo get_product_name();?>
 server is launching and executing the command.<br>
 <br>
diff --git a/pandora_console/include/help/en/help_cascade_protection.php b/pandora_console/include/help/en/help_cascade_protection.php
index e534776177..913b4bd7d4 100644
--- a/pandora_console/include/help/en/help_cascade_protection.php
+++ b/pandora_console/include/help/en/help_cascade_protection.php
@@ -8,7 +8,7 @@
 </div>
 <br>
 <p>
-This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for Pandora FMS to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
+This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for <?php echo get_product_name();?> to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
 <br><br>
 When you enable <i>cascade protection</i> for an agent, this means that if any of its parents has a CRITICAL alert fired, then the agent’s alerts <strong>WILL NOT BE</strong> fired. If the agent's parent has a module in CRITICAL or several alerts with less criticality than CRITICAL, alerts from the agent will be fired as normal if needed. Cascade protection checks parent alerts with CRITICAL priority, including the correlated alerts assigned to the parent.
 <br><br>
@@ -23,7 +23,7 @@ If you want to use an advanced cascade protection system, just use correlation a
 <br>
 </div>
 <p>
-This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for Pandora FMS to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
+This option should be assigned to avoid an “alert storm” that can come in because a group of agents are unreachable. This type of behaviour occurs when an intermediary device, like for example a router, is down and all devices behind it, therefore, cannot be reached. Probably these devices aren’t down and chances indicate that they’re working with another router in HA mode. But, if nothing is done, it’s likely for <?php echo get_product_name();?> to think that they’re down since they can’t be tested using a Remote ICMP Proc test (a Ping check).
 <br><br>
 When you enable <i>cascade protection</i> for an module, this means that if this parent agent module has a CRITICAL alert fired, then agent alerts <strong>WILL NOT BE</strong> fired.
 <br><br>
diff --git a/pandora_console/include/help/en/help_categories.php b/pandora_console/include/help/en/help_categories.php
index 57de2bbda0..ee0bf3e83d 100644
--- a/pandora_console/include/help/en/help_categories.php
+++ b/pandora_console/include/help/en/help_categories.php
@@ -3,6 +3,6 @@
  * @package Include/help/en
  */
 ?>
-<h1>Categories in Pandora FMS</h1>
+<h1>Categories in <?php echo get_product_name();?></h1>
 On the system some categories can be created and configured to later be assigned to any module desired. <br>
 The only user that has the permits to create and configure these categories is the administrator and they can be used to apply a “fee” to modules depending on the category the are sorted into.
diff --git a/pandora_console/include/help/en/help_configure_gis_map.php b/pandora_console/include/help/en/help_configure_gis_map.php
index 3aeefe5e1d..87ec1222fb 100644
--- a/pandora_console/include/help/en/help_configure_gis_map.php
+++ b/pandora_console/include/help/en/help_configure_gis_map.php
@@ -10,14 +10,14 @@ This page is the place to configure a GIS Map.
 </p>
 <h2>Map Name</h2>
 <p>
-Each map has a desciptive name used to recognice the map within Pandora FMS.
+Each map has a desciptive name used to recognice the map within <?php echo get_product_name();?>.
 </p>
 <h2>Select Connections</h2>
 <p>
 The first step is to select the main <strong>connection</strong> used in this GIS Map. At least one connection must be selected to configure the GIS Map, but it's possible to add more by pressing the <?php html_print_image("images/add.png", false, array("alt" => "Add")); ?> (Add) icon.
 </p>
 <p>
-When the firs connection is set, Pandora FMS asks if you want to use the default values of the connection for the map, to avoid to write again all the information. Also if the default connection for the map is changed (using the radio button), Pandora FMS will ask again if you want to use the values of the new default connection.
+When the firs connection is set, <?php echo get_product_name();?> asks if you want to use the default values of the connection for the map, to avoid to write again all the information. Also if the default connection for the map is changed (using the radio button), <?php echo get_product_name();?> will ask again if you want to use the values of the new default connection.
 </p>
 <h2>Map Paramteres</h2>
 <p>
diff --git a/pandora_console/include/help/en/help_context_module_unknow.php b/pandora_console/include/help/en/help_context_module_unknow.php
index 891306a655..aa2fda8b4f 100644
--- a/pandora_console/include/help/en/help_context_module_unknow.php
+++ b/pandora_console/include/help/en/help_context_module_unknow.php
@@ -3,7 +3,7 @@
  * @package Include/help/en
  */
 ?>
-<h1>Unknown modules in Pandora</h1>
+<h1>Unknown modules in <?php echo get_product_name();?></h1>
 <p>
 You may have unknown modules for many reasons. Unknown module is a special status for a module/monitor which means “I dont have recent data for this monitor and I should have data”. A monitor goes to unknown status when doesnt receive nothing in at least its interval (for example, 300 seconds) multiplied by two, in this case, if you doesn't receive nothing in ten minutes, monitor goes to unknown.
 </p>
@@ -11,10 +11,10 @@ You may have unknown modules for many reasons. Unknown module is a special statu
 These are a few cases where you can get unknown modules:
 </p>
 <ul style="list-style-type: disc; margin-left: 30px;">
-	<li>Your pandora server is down. Restart it, dont forget to check /var/log/pandora/pandora_server.log to see why was down.</li>
-	<li>Your tentacle server is down, and cannot get data from your Pandora FMS agents installed in your remote servers.</li>
+	<li>Your <?php echo get_product_name();?> server is down. Restart it, dont forget to check /var/log/pandora/pandora_server.log to see why was down.</li>
+	<li>Your tentacle server is down, and cannot get data from your <?php echo get_product_name();?> agents installed in your remote servers.</li>
 	<li>You have a network problem between your agents and your server.</li>
-	<li>Your pandora fms agent is stopped and is not sending information to your server.</li>
+	<li>Your <?php echo get_product_name();?> agent is stopped and is not sending information to your server.</li>
 	<li>Your network is down, or the remote device you are trying to ask is down or changed it's IP address (for example for numerical SNMP remote queries).</li>
 	<li>Your agent is reporting a badly synchronized date. Means reports a timedate in the past and that messup everything.</li>
 	<li>The script / module before works now doesn't, that can be because something is happing in the agent, check it out.</li>
diff --git a/pandora_console/include/help/en/help_context_pandora_server_email.php b/pandora_console/include/help/en/help_context_pandora_server_email.php
index f210cc07d9..73720132c5 100755
--- a/pandora_console/include/help/en/help_context_pandora_server_email.php
+++ b/pandora_console/include/help/en/help_context_pandora_server_email.php
@@ -3,14 +3,14 @@
  * @package Include/help/en
  */
 ?>
-<h1>Config the Pandora Server for email alerts</h1>
-<p>You must to edit the <i>"Pandora Server conf file"</i>, normaly it is in:
+<h1>Config the <?php echo get_product_name();?> for email alerts</h1>
+<p>You must to edit the <i>"<?php echo get_product_name();?> conf file"</i>, normaly it is in:
 <pre>
 	/etc/pandora_server/pandora_server.conf
 </pre>
 And you must set these values:
 <pre>
-# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+# mta_address: External Mailer (MTA) IP Address to be used by <?php echo get_product_name();?> internal email capabilities
 
 mta_address localhost
 
@@ -33,6 +33,6 @@ mta_auth LOGIN
 # mta_from Email address that sends the mail, by default is pandora@localhost 
 #           probably you need to change it to avoid problems with your antispam
 
-mta_from Pandora FMS <pandora@mydomain.com>
+mta_from <?php echo get_product_name();?> &lt;monitoring@mydomain.com&gt;
 </pre>
 </p>
\ No newline at end of file
diff --git a/pandora_console/include/help/en/help_create_agent.php b/pandora_console/include/help/en/help_create_agent.php
index d65d9b98ef..e851bcf99c 100644
--- a/pandora_console/include/help/en/help_create_agent.php
+++ b/pandora_console/include/help/en/help_create_agent.php
@@ -12,5 +12,5 @@ To create an Agent, you must fill this form. Please fill all the fields you need
 "Interval" refers to the agent's execution interval. The interval is how often the agent sends data to the server.
 </p>
 <p>
-"Server" refers to the Pandora Server that will read data send by the agent. 
+"Server" refers to the <?php echo get_product_name();?> Server that will read data send by the agent. 
 </p>
diff --git a/pandora_console/include/help/en/help_cron.php b/pandora_console/include/help/en/help_cron.php
index a1e235d06e..07095a6325 100644
--- a/pandora_console/include/help/en/help_cron.php
+++ b/pandora_console/include/help/en/help_cron.php
@@ -9,7 +9,7 @@ Using the configuration parameter sets <b>Cron from</b> and <b>Cron to</b> makes
 it possible for a module to run only for certain periods of time. 
 The way in which it is configured is similar to the syntax of 
 <a style="font-size:14px;" href="https://en.wikipedia.org/wiki/Cron">cron</a>. 
-Just as they appear in the Pandora console, each one of the parameters  
+Just as they appear in the <?php echo get_product_name();?> console, each one of the parameters  
 has three options.
 
 <h4>Cron from: any</h4>
diff --git a/pandora_console/include/help/en/help_custom_logo.php b/pandora_console/include/help/en/help_custom_logo.php
index 96a3feac52..d42383982e 100644
--- a/pandora_console/include/help/en/help_custom_logo.php
+++ b/pandora_console/include/help/en/help_custom_logo.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Custom logo (Branding)</h1>
 
-This option is used to display your own logo in the Pandora FMS header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels. 
+This option is used to display your own logo in the <?php echo get_product_name();?> header. You can use any kind of graphic in PNG format. There is a fixed width/height for any image displayed here of 206x47 pixels. 
 <br><br>
 Upload your custom branding logo, using the file manager to /images/custom_logo directory.
 
diff --git a/pandora_console/include/help/en/help_dynamic_threshold.php b/pandora_console/include/help/en/help_dynamic_threshold.php
index fb1c3c5c24..85551ebf94 100644
--- a/pandora_console/include/help/en/help_dynamic_threshold.php
+++ b/pandora_console/include/help/en/help_dynamic_threshold.php
@@ -8,7 +8,7 @@
 <h2>Dynamic threshold Interval</h2>
 
 <p>
-	Introduce a time period in the Dynamic Threshold Interval field and the module will return the data obtained during the interval. This allows Pandora to establish minimum thresholds of critical and warning status according to the server configuration.
+	Introduce a time period in the Dynamic Threshold Interval field and the module will return the data obtained during the interval. This allows <?php echo get_product_name();?> to establish minimum thresholds of critical and warning status according to the server configuration.
 	<br><br>
 	The default setting will <b>only</b> give minimums, so if maximum = 0 it will read from the configured minimum to infinite.
 	<br><br>
diff --git a/pandora_console/include/help/en/help_event_alert.php b/pandora_console/include/help/en/help_event_alert.php
index eafc8aefc9..f084fae04c 100644
--- a/pandora_console/include/help/en/help_event_alert.php
+++ b/pandora_console/include/help/en/help_event_alert.php
@@ -6,7 +6,7 @@
 
 <h1>Event Alerts</h1>
 
-From Pandora FMS 4.0 version, it is possible to define alerts on events, that allows to work from a completely new approach much more flexible. This is an Enterprise feature.<br>
+It is possible to define alerts on events, that allows to work from a completely new approach much more flexible. This is an Enterprise feature.<br>
 
 To create the new event alerts, click on the Create button in the Event alerts menu from the Administration menu. <br><br>
 
@@ -61,6 +61,6 @@ For example, we could configure a rule that matches with the events generated by
 <?php html_print_image ("images/help/event04.png", false, array('width' => '550px')); ?>
 
 <br>
-<p>Given the high number of events that the Pandora FMS database could store, the server works on an event window that is defined in the pandora_server.conf configuration file through the parameter event_window. The events that have been generated out of this time window won't be processed by the server, so it doesn't make sense to specify in a rule a time window higher to the one configured in the server </p>
+<p>Given the high number of events that the <?php echo get_product_name();?> database could store, the server works on an event window that is defined in the pandora_server.conf configuration file through the parameter event_window. The events that have been generated out of this time window won't be processed by the server, so it doesn't make sense to specify in a rule a time window higher to the one configured in the server </p>
 
 
diff --git a/pandora_console/include/help/en/help_events_history.php b/pandora_console/include/help/en/help_events_history.php
index 125ca1a8a0..605bebede5 100644
--- a/pandora_console/include/help/en/help_events_history.php
+++ b/pandora_console/include/help/en/help_events_history.php
@@ -3,7 +3,7 @@
 */
 ?>
 
-<p> When the history events are enabled, the purging script (pandora_db.pl) will copy the not validated or in process events (only new ones) to the history table before delete it.
+<p> When the history events are enabled, the purging script (DB Tool) will copy the not validated or in process events (only new ones) to the history table before delete it.
 <br><br>These events can be consulted in the history events view. This view can be accessed in a new tab in the events section.
 </p>
 
diff --git a/pandora_console/include/help/en/help_export_server.php b/pandora_console/include/help/en/help_export_server.php
index eb08c436a6..448a56c708 100644
--- a/pandora_console/include/help/en/help_export_server.php
+++ b/pandora_console/include/help/en/help_export_server.php
@@ -5,10 +5,10 @@
 ?>
 <h1>Export server</h1>
 
-<p>Pandora FMS Enterprise Version implements, through the export server, a data scaling device that allows you to do a virtually distributed implementation able to monitor an unlimited number of information, as long as you design it properly and break it up into different information profiles.</p>
+<p><?php echo get_product_name();?> Enterprise Version implements, through the export server, a data scaling device that allows you to do a virtually distributed implementation able to monitor an unlimited number of information, as long as you design it properly and break it up into different information profiles.</p>
 
 <ul>
-<li type="circle">Name: Pandora FMS server name.</li>
+<li type="circle">Name: <?php echo get_product_name();?> server name.</li>
 <li type="circle">Export server: Combo to choose the server petition of export server that will be used to export the data.</li>
 <li type="circle">Prefix: Prefix that is used to add to the agent name that send the data. For example, when the data of an agent named "Farscape" is resent, and its prefix in the export server is "EU01",the resent agent data will be seen in the destination server with the agent name EUO1-Farscape.</li>
 <li type="circle">Interval: Define the time interval, and how often (in seconds) you want to send the data that is unresolved.</li>
diff --git a/pandora_console/include/help/en/help_ff_threshold.php b/pandora_console/include/help/en/help_ff_threshold.php
index fda1216fba..3641e5edad 100644
--- a/pandora_console/include/help/en/help_ff_threshold.php
+++ b/pandora_console/include/help/en/help_ff_threshold.php
@@ -8,7 +8,7 @@
 <br>
 <br>
 
-The Threshold parameter FF (FF = FlipFlop) is used to "filter" the continuous changes of state in the generation of events / states, so that you can tell Pandora FMS until an element is not at least X times in the same state after changing from an original state, not considered to have changed. 
+The Threshold parameter FF (FF = FlipFlop) is used to "filter" the continuous changes of state in the generation of events / states, so that you can tell <?php echo get_product_name();?> until an element is not at least X times in the same state after changing from an original state, not considered to have changed. 
 <br><br>
 Take a classic example: A ping to a host where there is packet loss. In an environment like this, might give results as:
 <br>
@@ -24,7 +24,7 @@ Take a classic example: A ping to a host where there is packet loss. In an envir
  1 
 </pre>
 <br>
-However, the host is alive in all cases. What we really want is to tell Pandora that until the host does not say you are at least three times down, not marked as such, so that in the previous case and would never be dropped, and only in this case it would be:
+However, the host is alive in all cases. What we really want is to tell <?php echo get_product_name();?> that until the host does not say you are at least three times down, not marked as such, so that in the previous case and would never be dropped, and only in this case it would be:
 <pre>
  1  
  1  
diff --git a/pandora_console/include/help/en/help_gis_map_builder.php b/pandora_console/include/help/en/help_gis_map_builder.php
index a24d349775..363d51fda4 100644
--- a/pandora_console/include/help/en/help_gis_map_builder.php
+++ b/pandora_console/include/help/en/help_gis_map_builder.php
@@ -6,7 +6,7 @@
 <h1>GIS Map builder</h1>
 
 <p>
-This page shows a list of the defined maps, and let you edit, delete or view any of them. Also from this page is where the <strong>default Map</strong> of Pandora FMS is set.
+This page shows a list of the defined maps, and let you edit, delete or view any of them. Also from this page is where the <strong>default Map</strong> of <?php echo get_product_name();?> is set.
 </p>
 To create a map a connection to a map server is needed, the connections are created by the Adminstrator in the <strong>Setup</strong> menu.
 <p>
diff --git a/pandora_console/include/help/en/help_gis_setup_map_connection.php b/pandora_console/include/help/en/help_gis_setup_map_connection.php
index c813b78100..0afe61a8e1 100644
--- a/pandora_console/include/help/en/help_gis_setup_map_connection.php
+++ b/pandora_console/include/help/en/help_gis_setup_map_connection.php
@@ -11,7 +11,7 @@ This page is the place where the admin can configure <strong>a connection to a G
 
 <h2>Connection types</h2>
 <p>
-Currently Pandora FMS support 3 differet kinds of connections: OpenStreetMap, Google Maps and Static Image.
+Currently <?php echo get_product_name();?> support 3 differet kinds of connections: OpenStreetMap, Google Maps and Static Image.
 </p>
 <h3>Open Street Maps</h3>
 <p>
@@ -33,5 +33,5 @@ ABQIAAAAZuJY-VSG4gOH73b6mcUw1hTfSvFQRXGUGjHx8f036YCF-UKjgxT9lUhqOJx7KDHSnFnt46qn
 </pre>
 <h3>Static Image</h3>
 <p>
-It's also possible to use a static image (a PNG for example) as the only source of the map. To use it, the<strong>url</strong>, the <strong>positional information</strong> of the image and the <strong>height</strong> and <strong>width</strong> must be filled.
+It's also possible to use a static image (a PNG for example) as the only source of the map. To use it, the <strong>url</strong>, the <strong>positional information</strong> of the image and the <strong>height</strong> and <strong>width</strong> must be filled.
 </p>
diff --git a/pandora_console/include/help/en/help_graphs.php b/pandora_console/include/help/en/help_graphs.php
index 65d1e9984f..b1f51e0cb0 100644
--- a/pandora_console/include/help/en/help_graphs.php
+++ b/pandora_console/include/help/en/help_graphs.php
@@ -48,11 +48,11 @@ div.img_title {
 </style>
 
 <body class="hlp_graphs">
-<h1>INTERPRETING GRAPHS IN PANDORA FMS</h1>
+<h1>INTERPRETING GRAPHS IN <?php echo get_product_name();?></h1>
 
 
-<p>In Pandora FMS, graphs represent the values a module has had during a given period.</p>
-<p>Due to the large amount of data that Pandora FMS stores, two different types of functionality are offered</p>
+<p>In <?php echo get_product_name();?>, graphs represent the values a module has had during a given period.</p>
+<p>Due to the large amount of data that <?php echo get_product_name();?> stores, two different types of functionality are offered</p>
 
 
 <h2>NORMAL GRAPHS</h2>
@@ -98,7 +98,7 @@ div.img_title {
 <dd>Shows indicator points with triggered alert information at the top.</dd>
 
 <dt>Show percentile</dt>
-<dd>Adds a graph that indicates the percentile line (configurable in general visual options of Pandora).</dd>
+<dd>Adds a graph that indicates the percentile line (configurable in general visual options of <?php echo get_product_name();?>).</dd>
 
 <dt>Time comparison (superimposed)</dt>
 <dd>Displays the same graphic overlay, but in the period before the selected one. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown superimposed.</dd>
@@ -107,7 +107,7 @@ div.img_title {
 <dd>Displays the same graph, but in the period before the selected one, in a separate area. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown.</dd>
 
 <dt>Display unknown graphic</dt>
-<dd>It shows boxes in grey shading covering the periods in which Pandora FMS cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
+<dd>It shows boxes in grey shading covering the periods in which <?php echo get_product_name();?> cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
 
 <dt>Show Full Scale Graph (TIP)</dt>
 <dd>Switches the creation mode from "normal" to "TIP". In this mode, the graphs will show real data rather than approximations, so the time it will take to generate them will be longer. More detailed information on this type of graphs can be found in the following section.</dd>
diff --git a/pandora_console/include/help/en/help_history_database.php b/pandora_console/include/help/en/help_history_database.php
index bc49d89e48..0859f49f3e 100644
--- a/pandora_console/include/help/en/help_history_database.php
+++ b/pandora_console/include/help/en/help_history_database.php
@@ -5,7 +5,7 @@
 ?>
 <h1>History database</h1>
 
-A history database is a database where old module data is moved to make the main Pandora FMS database more responsive for everyday operations. That data will still be available seamlessly to the Pandora FMS console when viewing reports, module charts etc. 
+A history database is a database where old module data is moved to make the main <?php echo get_product_name();?>  database more responsive for everyday operations. That data will still be available seamlessly to the <?php echo get_product_name();?>  console when viewing reports, module charts etc. 
 <br><br>
 <b>SETTING UP A HISTORY DATABASE</b>
 <br><br>
@@ -14,7 +14,7 @@ To configure a history database follow these simple steps:
 <ol>
 <li>Create the new history database. 
 <br><br>
-<li>Create the necessary tables in the new database. You can use the pandoradb.sql script provided with the Pandora FMS console: 
+<li>Create the necessary tables in the new database. You can use the DB Tool script provided with the <?php echo get_product_name();?>  console: 
 <br><br>
 <i>cat pandoradb.sql | mysql -u user -p -D history_db</i>
 <br><br>
@@ -22,7 +22,7 @@ To configure a history database follow these simple steps:
 <br><br>
 <i>Mysql Example: GRANT ALL PRIVILEGES ON pandora.* TO 'pandora'@'IP' IDENTIFIED BY 'password'</i>
 <br><br>
-<li>In your Pandora FMS console navigate to Setup->History database and enter the host, port, database name, user and password of the new database.
+<li>In your <?php echo get_product_name();?>  console navigate to Setup->History database and enter the host, port, database name, user and password of the new database.
 </ol>
 <br><br>
 <?php html_print_image ("images/help/historyddbb.png", false, array('width' => '550px')); ?>
diff --git a/pandora_console/include/help/en/help_ipam.php b/pandora_console/include/help/en/help_ipam.php
index fafb0e5a0b..f26de991d8 100755
--- a/pandora_console/include/help/en/help_ipam.php
+++ b/pandora_console/include/help/en/help_ipam.php
@@ -5,9 +5,9 @@
 ?>
 <h1>IP Address Management (IPAM)</h1>
 <br>
-Using IPAM extension, we can manage, discover and get event on changes on hosts in a given network. We can know if a given IP address (IPv4 or IPv6) change it's availability (answer to a ping) or hostname (using dns resolution). We also can detect its OS and link a IP address to a current Pandora FMS agent, adding the IP address to their currently assigned addresses. IPAM extension uses the recon server and a recon script on the low level, but you don't need to configure nothing, IPAM extension do everything for you.
+Using IPAM extension, we can manage, discover and get event on changes on hosts in a given network. We can know if a given IP address (IPv4 or IPv6) change it's availability (answer to a ping) or hostname (using dns resolution). We also can detect its OS and link a IP address to a current <?php echo get_product_name();?>  agent, adding the IP address to their currently assigned addresses. IPAM extension uses the recon server and a recon script on the low level, but you don't need to configure nothing, IPAM extension do everything for you.
 <br><br>
-IP Management works in parallel to the monitoring you currently manage with Pandora FMS agents, you can associate a IP address managed with IPAM extension or not, it depends on you. Managed IP addresses can optionally generate event on change.
+IP Management works in parallel to the monitoring you currently manage with <?php echo get_product_name();?>  agents, you can associate a IP address managed with IPAM extension or not, it depends on you. Managed IP addresses can optionally generate event on change.
 
 <h2>IPs Detection</h2>
 We can setup a network (using a bit mask or a prefix), and this network will be automatically sweeped or setup to have a on-request manual execution. This will execute a recon script task, searching for active IP (using nmap for IPv4 and ping for IPv6). You see the progress on network sweep in the status view and also in the recon server view.
@@ -76,7 +76,7 @@ When you click on the main icon, a modal window will be opened showing all the I
 <h3>Edition view</h3>
 If you have enought permission, you will have access to setup view, where IP address are shown as a list. You can filter to show only the IP's you are interested into, make changes and update all at once.<br><br>
 
-Some fields, are automatically filled by the recon script, like hostname, if it have a Pandora FMS agent and the operating system. You can mark that fields as "manual" and edit them.<br><br>
+Some fields, are automatically filled by the recon script, like hostname, if it have a <?php echo get_product_name();?>  agent and the operating system. You can mark that fields as "manual" and edit them.<br><br>
 
 <table width=100%>
 <tr>
diff --git a/pandora_console/include/help/en/help_local_component.php b/pandora_console/include/help/en/help_local_component.php
index 1a2bdbc6aa..30eb475973 100644
--- a/pandora_console/include/help/en/help_local_component.php
+++ b/pandora_console/include/help/en/help_local_component.php
@@ -6,4 +6,4 @@
 
 <h1>Local Component</h1>
 
-<p>Local Components are elements that can be applied to agents like templates. With Pandora FMS Enterprise, this can be applied authomatically and remotely with policies or one by one.</p>
+<p>Local Components are elements that can be applied to agents like templates. With <?php echo get_product_name();?> Enterprise, this can be applied authomatically and remotely with policies or one by one.</p>
diff --git a/pandora_console/include/help/en/help_main_help.php b/pandora_console/include/help/en/help_main_help.php
index 4c63f0e356..31f88c0098 100644
--- a/pandora_console/include/help/en/help_main_help.php
+++ b/pandora_console/include/help/en/help_main_help.php
@@ -3,10 +3,10 @@
  * @package Include/help/en
  */
 ?>
-<h1>Pandora FMS - Help index</h1>
+<h1><?php echo get_product_name();?> - Help index</h1>
 <h3>Introduction</h3>
 <p>
-This is the online help for Pandora FMS console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use Pandora FMS. Official documentation of Pandora FMS is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
+This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
 
 <br><br>
 <a href="http://pandorafms.com/pandora/doc/"><b>Download the official documentation</b></a>
diff --git a/pandora_console/include/help/en/help_manage_alert_list.php b/pandora_console/include/help/en/help_manage_alert_list.php
index 63f5b0431f..d46ac3abbf 100644
--- a/pandora_console/include/help/en/help_manage_alert_list.php
+++ b/pandora_console/include/help/en/help_manage_alert_list.php
@@ -6,7 +6,7 @@
 <h1>Alerts</h1>
 
 <p>
-Alerts in Pandora FMS react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into Pandora FMS log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where Pandora FMS Servers run.
+Alerts in <?php echo get_product_name();?> react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into <?php echo get_product_name();?> log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where <?php echo get_product_name();?> Servers run.
 </p>
 
 <p>
diff --git a/pandora_console/include/help/en/help_manage_alerts.php b/pandora_console/include/help/en/help_manage_alerts.php
index 8c03bd786f..a2f379583c 100644
--- a/pandora_console/include/help/en/help_manage_alerts.php
+++ b/pandora_console/include/help/en/help_manage_alerts.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Alerts</h1>
 
-Alerts in Pandora FMS react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into Pandora FMS log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where Pandora FMS Servers run.
+Alerts in <?php echo get_product_name();?> react to an "out of range" module value. The alert can consist of sending an e-mail or an SMS to the administrator, sending a SNMP trap, write the incident into the system log or into <?php echo get_product_name();?> log file, etc. Basically, an alert can be anything that can be triggered by a script configured in the Operating System where <?php echo get_product_name();?> Servers run.
 <br /><br />
 The values "_field1_", "_field2_" and "_field3_" of the customized alerts are used to build the command line that will be executed.
 <br /><br />
diff --git a/pandora_console/include/help/en/help_module_tokens.php b/pandora_console/include/help/en/help_module_tokens.php
index 0926562e18..8078c41e8d 100644
--- a/pandora_console/include/help/en/help_module_tokens.php
+++ b/pandora_console/include/help/en/help_module_tokens.php
@@ -96,7 +96,7 @@ The total of seconds, agent will wait for the execution of the module, so if it
 <br><br>
 <b>module_postprocess 'factor'</b>
 <br><br>
-Same as in the definition of post processing of a module that is done from the console, here could be defined a numeric value of floating comma that will send this value to Pandora FMS in order the server will use it to multiply the received (raw) by the agent.
+Same as in the definition of post processing of a module that is done from the console, here could be defined a numeric value of floating comma that will send this value to <?php echo get_product_name();?> in order the server will use it to multiply the received (raw) by the agent.
 <br><br>
 <b>module_save 'variable name'</b>
 <br><br>
@@ -245,7 +245,7 @@ module_end<br>
 <br>
 <b>Processes Watchdog</b>
 <br><br>
-A Watchdog is a system that allows to act immediately when an agent is down, usually picking up the process that is down . The Pandora FMS Windows agent could act as Watchdog when a process is down. This is called watchdog mode for the process: 
+A Watchdog is a system that allows to act immediately when an agent is down, usually picking up the process that is down . The <?php echo get_product_name();?> Windows agent could act as Watchdog when a process is down. This is called watchdog mode for the process: 
 <br><br>
 Executing a process could need some parameters, so there are some additional configuration options for these kind of modules. It is important to say that the watchdog mode only works when the module type is asynchronous. Let's see an example of configuration of a module_proc with watchdog.
 <br><br>
@@ -268,7 +268,7 @@ This is the definition of the additional parameters for module_proc with watchdo
 <br><br>
     <i>module_startdelay:</i> Number of milliseconds the module will wait before starting the process by first time. If the process takes lot of time at starting , then it will be a great idea to order the agent through this parameter that it "wait" until start checking again if the process has got up. In this example wait 3 seconds.
 <br><br>
-    <i>module_retrydelay:</i> Similar to the previous one but for subsequent falls/reattempts, after having detect a fall. When Pandora detects a fall, relaunch the process, wait the nº of milliseconds pointed out in this parameter and check again if the process is already up.  
+    <i>module_retrydelay:</i> Similar to the previous one but for subsequent falls/reattempts, after having detect a fall. When <?php echo get_product_name();?> detects a fall, relaunch the process, wait the nº of milliseconds pointed out in this parameter and check again if the process is already up.  
 <br><br>
 <b>module_cpuproc 'process'</b>
 <br><br>
diff --git a/pandora_console/include/help/en/help_network_map_enterprise.php b/pandora_console/include/help/en/help_network_map_enterprise.php
index 860168630e..2209e03af0 100644
--- a/pandora_console/include/help/en/help_network_map_enterprise.php
+++ b/pandora_console/include/help/en/help_network_map_enterprise.php
@@ -6,7 +6,7 @@
 
 <h1>Networkmap console</h1>
 
-<p>With Pandora FMS Enterprise we have the possibility of create editable network maps that are more interactive comparing with the Open version that is currently on the "See agents" submenu.</p>
+<p>With <?php echo get_product_name();?> Enterprise we have the possibility of create editable network maps that are more interactive comparing with the Open version that is currently on the "See agents" submenu.</p>
 
 <p>On the contrary to the Open version, the Networkmap Enterprise provide us with more features, such as: </p>
 
@@ -38,7 +38,7 @@
 
 <h2>Minimap</h2>
 
-<p>This minimap gives us a global view that shows all the map extension, but in a smaller view, and besides, in contrast with the map view, all the nodes are shown, but without status and without relationships. Except the Pandora fictitious point, that is shown in green. And a red box is also shown of the part of the map that is being shown. </p>
+<p>This minimap gives us a global view that shows all the map extension, but in a smaller view, and besides, in contrast with the map view, all the nodes are shown, but without status and without relationships. Except the <?php echo get_product_name();?> fictitious point, that is shown in green. And a red box is also shown of the part of the map that is being shown. </p>
 
 <p>It's on the upper left corner, and could be hidden pressing on the arrow icon. 
 </p>
@@ -72,7 +72,7 @@
 
 
     <p>It shows a box which rim will be of the same color that the agent status. <br>
-    The agent name is a link to the Pandora agent page. <br>
+    The agent name is a link to the <?php echo get_product_name();?> agent page. <br>
     Inside the box are all the modules that are not in unknown status, which, depending if the module status is green or red. <br>
         It's possible to click on these modules and they shown a tooltip with the module main data.  <br>
     In the box rim are the modules kind SNMP Proc,that use to be for network interfaces when an agent related with network systems is monitored.  <br></p>
@@ -107,7 +107,7 @@
     <li><b>Creating the network map from:</b> option only available in the creation. It's the way to create the network map if we do it from the agents that are in the previously selected group, or on the contrary we want an empty network map. </li>
     <li><b>Size of the network map:</b> where it's possible to define the size of the network map, by default it's of 3000 width and 3000 high. </li>
     <li><b>Method for creating of the network map:</b> the method of distribution of the nodes that will make up the network map, by default it's radial, but there are the following ones: </li>
-        <p>- <i>Radial:</i> In which all the nodes will be placed around the fictitious node that the Pandora represents. <br>
+        <p>- <i>Radial:</i> In which all the nodes will be placed around the fictitious node that the <?php echo get_product_name();?> represents. <br>
         - <i>Circular:</i> In which the nodes will be placed in concentric circles en el cual se dispondrá los nodos en círculos concentricos. <br>
         - <i>Flat:</i> In which the nodes with tree shape will be placed. <br>
         - <i>spring1, spring2:</i> are variations of the Flat.  <br>
diff --git a/pandora_console/include/help/en/help_performance.php b/pandora_console/include/help/en/help_performance.php
index c3e212010c..d2c0a23bca 100644
--- a/pandora_console/include/help/en/help_performance.php
+++ b/pandora_console/include/help/en/help_performance.php
@@ -62,5 +62,5 @@ Agent access graph, renders the number of agent contacts per hour in a graph wit
 <br><br>
 Maximum number of days before delete unknown modules. 
 <br><br>
-<i>**All these parameters are made when running the pandora_db.pl tool</i>
+<i>**All these parameters are made when running the DB Tool</i>
 
diff --git a/pandora_console/include/help/en/help_planned_downtime.php b/pandora_console/include/help/en/help_planned_downtime.php
index 0dd0fa4dac..d1d5bb844f 100644
--- a/pandora_console/include/help/en/help_planned_downtime.php
+++ b/pandora_console/include/help/en/help_planned_downtime.php
@@ -12,5 +12,5 @@ This tool is used to plan non-monitoring periods of time. This is useful if you
 It's very easy to setup, you specify start date/time of a scheduled downtime and an end date/time. After setting the first fields you must save the Scheduled downtime and edit it, to set the agents which are going to be disconnected. You can also edit the rest of the fields once editing the Scheduled downtime entry.
 </p>
 <p>
-When scheduled downtime starts, Pandora FMS automatically disable all agents assigned to this downtime and no alerts or data are processed. When downtime ends, Pandora FMS will be enable all agents assigned to this downtime. You cannot delete or modify a downtime instance when it's fired, you need to wait for ending before doing anything in this downtime instance. Of course you can manually, enable an agent using the agent configuration dialog.
+When scheduled downtime starts, <?php echo get_product_name();?> automatically disable all agents assigned to this downtime and no alerts or data are processed. When downtime ends, <?php echo get_product_name();?> will be enable all agents assigned to this downtime. You cannot delete or modify a downtime instance when it's fired, you need to wait for ending before doing anything in this downtime instance. Of course you can manually, enable an agent using the agent configuration dialog.
 </p>
diff --git a/pandora_console/include/help/en/help_planned_downtime_time.php b/pandora_console/include/help/en/help_planned_downtime_time.php
index 7c151cd8fb..aea7a0afa0 100644
--- a/pandora_console/include/help/en/help_planned_downtime_time.php
+++ b/pandora_console/include/help/en/help_planned_downtime_time.php
@@ -9,7 +9,7 @@
 
 <p>
 	The date format must be year/month/day and the time format must be hour:minute:second.
-	It's possible to create a scheduled downtime with a past date, if that option aren't disabled by the admin of Pandora FMS.
+	It's possible to create a scheduled downtime with a past date, if that option aren't disabled by the admin of <?php echo get_product_name();?>.
 </p>
 
 <h2>Periodically execution</h2>
diff --git a/pandora_console/include/help/en/help_plugin_definition.php b/pandora_console/include/help/en/help_plugin_definition.php
index 7b3b4f4e01..f6aeb4cd29 100644
--- a/pandora_console/include/help/en/help_plugin_definition.php
+++ b/pandora_console/include/help/en/help_plugin_definition.php
@@ -5,9 +5,9 @@
 ?>
 <h1>Plugin registration</h1>
 
-Unlike with the rest of components, in a default way Pandora FMS does not include any pre-configured complement, so first you should create and configure a complement to could after add it to the module of an agent. But Pandora FMS includes plugins in the installation directories, but as have already been said, they are not configured in the database. 
+Unlike with the rest of components, in a default way <?php echo get_product_name();?> does not include any pre-configured complement, so first you should create and configure a complement to could after add it to the module of an agent. But <?php echo get_product_name();?> includes plugins in the installation directories, but as have already been said, they are not configured in the database. 
 <br><br>
-To add a plugin that already exists to Pandora FMS, go to the console administration section, and in it, click on Manage servers. After doing this, click on Manage plugins: 
+To add a plugin that already exists to <?php echo get_product_name();?>, go to the console administration section, and in it, click on Manage servers. After doing this, click on Manage plugins: 
 <br><br>
 Once you are in the screen of the plugin management, click on Create a new plugin, so there will be no one. 
 <br><br>
@@ -18,7 +18,7 @@ Fill in the plugin creation form with the following data:
 Name of the plugin, in this case Nmap.
 <br><br>
 <b>Plugin type </b><br>
-There are two kinds of plugins, the standard ones and the kind Nagios. The standard plugins are scripts that execute actions and accept parameters. The Nagios plugins are, as their name shows, Nagios plugins that could be being used in Pandora FMS.The difference is mainly on that the Nagios plugins return an error level to show if the test has been successful or not.
+There are two kinds of plugins, the standard ones and the kind Nagios. The standard plugins are scripts that execute actions and accept parameters. The Nagios plugins are, as their name shows, Nagios plugins that could be being used in <?php echo get_product_name();?>.The difference is mainly on that the Nagios plugins return an error level to show if the test has been successful or not.
 <br><br>
 If you want to use a plugin kind Nagios and you want to get a data, not an state (good/Bad), then you can use a plugin kind Nagios is the "Standard" mode.
 <br><br>
@@ -38,7 +38,7 @@ Plugin description. Write a short description, as for example:Test # UDP open po
 
 It is the path where the plugin command is. In a default way, if the installation has been an standard one, there will be in the directory /usr/share/pandora_server/util/plugin/. Though it could be any path of the system. For this case, writte /usr/share/pandora_server/util/plugin/udp_nmap_plugin.shin the field.
 <br><br>
-Pandora server will execute this script, so this should have permissions of access and execution on it.
+<?php echo get_product_name();?> server will execute this script, so this should have permissions of access and execution on it.
 <br><br>
 <b>Plug-in parameters</b><br>
 
diff --git a/pandora_console/include/help/en/help_plugin_macros.php b/pandora_console/include/help/en/help_plugin_macros.php
index 3cf8e47b1c..1660c45e13 100644
--- a/pandora_console/include/help/en/help_plugin_macros.php
+++ b/pandora_console/include/help/en/help_plugin_macros.php
@@ -17,7 +17,7 @@ The following macros are available:
 <li>_modulegroup_ : Module group name.</li>
 <li>_moduledescription_ : Description of the module.</li>
 <li>_modulestatus_ : Status of the module.</li>
-<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a <?php echo get_product_name();?> console webpage.</li>
 <li>_id_group_ : Id of agent group.</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
diff --git a/pandora_console/include/help/en/help_plugin_policy.php b/pandora_console/include/help/en/help_plugin_policy.php
index 5f17196272..61afa6336d 100644
--- a/pandora_console/include/help/en/help_plugin_policy.php
+++ b/pandora_console/include/help/en/help_plugin_policy.php
@@ -6,7 +6,7 @@
 
 <h1>Agent Plugins</h1>
 
-<p>Since Pandora FMS 5.0, with the plugins editor in policies is possible propagate the agents plugins easily.
+<p>With the plugins editor in policies is possible propagate the agents plugins easily.
 <br><br>
 Is possible to add agent plugins in a policy to be created in each local agent when be applied. 
 <br><br>
diff --git a/pandora_console/include/help/en/help_profile.php b/pandora_console/include/help/en/help_profile.php
index 1222af8668..3e41970fbd 100644
--- a/pandora_console/include/help/en/help_profile.php
+++ b/pandora_console/include/help/en/help_profile.php
@@ -6,7 +6,7 @@
 
 <h1>Profile</h1>
 
-<p>Pandora FMS is a Web management tool that allows multiple users to work with different permissions in multiple defined agent groups. The permissions an user can have are defined in profiles.</p>
+<p><?php echo get_product_name();?> is a Web management tool that allows multiple users to work with different permissions in multiple defined agent groups. The permissions an user can have are defined in profiles.</p>
 
 <p>The following list defines what ACL control allows in each feature at the console:</p>
 
diff --git a/pandora_console/include/help/en/help_recontask.php b/pandora_console/include/help/en/help_recontask.php
index 345badb83e..53424b850d 100644
--- a/pandora_console/include/help/en/help_recontask.php
+++ b/pandora_console/include/help/en/help_recontask.php
@@ -25,7 +25,7 @@ Network where you want to do the recognition. Use the network format/ bits mask.
 
 <b>Interval</b>
 <br>
-Repetition interval of systems search. Do not use intervals very shorts so Recon explores a network sending one Ping to each address. If you use recon networks very larges (for example a class A) combined with very short intervals (6 hours) you will be doing that Pandora FMS will be always bomb the network with pings, overloading it and also Pandora FMS unnecessarily.<br><br>
+Repetition interval of systems search. Do not use intervals very shorts so Recon explores a network sending one Ping to each address. If you use recon networks very larges (for example a class A) combined with very short intervals (6 hours) you will be doing that <?php echo get_product_name();?> will be always bomb the network with pings, overloading it and also <?php echo get_product_name();?> unnecessarily.<br><br>
 
 <b>Module template</b><br>
 
@@ -33,7 +33,7 @@ Plugins template to add to the discovered systems. When it detects a system that
 
 <b>OS</b><br>
 
-Operative system to recognize. If you select one instead of any (Any) it will only be added the systems with this operative system.Consider that in some circumstances Pandora FMS can make a mistake when detecting systems, so this kind of "guess" is done with statistic patterns, that depending on some other factors could fail (networks with filters, security software, modified versions of the systems).To could use this method with security, you should have installed Xprobe2 in your system. <br><br>
+Operative system to recognize. If you select one instead of any (Any) it will only be added the systems with this operative system.Consider that in some circumstances <?php echo get_product_name();?> can make a mistake when detecting systems, so this kind of "guess" is done with statistic patterns, that depending on some other factors could fail (networks with filters, security software, modified versions of the systems).To could use this method with security, you should have installed Xprobe2 in your system. <br><br>
 
 <b>Ports</b><br>
 
diff --git a/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php b/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php
index 9264792823..bed414ce01 100644
--- a/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php
+++ b/pandora_console/include/help/en/help_reporting_wizard_sla_tab.php
@@ -6,4 +6,4 @@
 
 <h1>SLA Wizard</h1>
 
-<p>Allows to measure the service level (Service Level Agreement) of any monitor of Pandora FMS. In this wizard you can create a SLA report of several agents.</p>
+<p>Allows to measure the service level (Service Level Agreement) of any monitor of <?php echo get_product_name();?>. In this wizard you can create a SLA report of several agents.</p>
diff --git a/pandora_console/include/help/en/help_response_macros.php b/pandora_console/include/help/en/help_response_macros.php
index 78098d8c0b..c5fe087ec7 100644
--- a/pandora_console/include/help/en/help_response_macros.php
+++ b/pandora_console/include/help/en/help_response_macros.php
@@ -18,7 +18,7 @@ The accepted macros are:
 <li><b>Event ID:</b> _event_id_</li>
 <li><b>Event instructions:</b> _event_instruction_</li>
 <li><b>Event severity ID:</b> _event_severity_id_</li>
-<li><b>Event severity (translated by Pandora console):</b> _event_severity_text_</li>
+<li><b>Event severity (translated by <?php echo get_product_name();?> console):</b> _event_severity_text_</li>
 <li><b>Event source:</b> _event_source_</li>
 <li><b>Event status (new, validated or event in process):</b> _event_status_</li>
 <li><b>Event tags separated by commas:</b> _event_tags_</li>
diff --git a/pandora_console/include/help/en/help_servers.php b/pandora_console/include/help/en/help_servers.php
index 057489227a..f65b535f67 100644
--- a/pandora_console/include/help/en/help_servers.php
+++ b/pandora_console/include/help/en/help_servers.php
@@ -6,11 +6,11 @@
 
 <h1>Server management</h1>
 
-<p>The Pandora FMS servers are the elements in charge of performing the existing checks. They verify them and change their status depending on the results. They are also in charge of triggering the alerts established to control the status of data.</p>
+<p>The <?php echo get_product_name();?> servers are the elements in charge of performing the existing checks. They verify them and change their status depending on the results. They are also in charge of triggering the alerts established to control the status of data.</p>
 
-<p>Pandora FMS's data server can work in high availability and/or load balancing modes. In a very large architecture, various Pandora FMS servers can be used at the same time, in order to handle large volumes of functionally or geographically distributed information.</p>
+<p><?php echo get_product_name();?>'s data server can work in high availability and/or load balancing modes. In a very large architecture, various <?php echo get_product_name();?> servers can be used at the same time, in order to handle large volumes of functionally or geographically distributed information.</p>
 
-<p>Pandora FMS servers are always on and permanently verify if any element has any problem. If there is any alert linked to the problem, then it'll run the pre-set action such as sending an SMS, an email, or activating a script execution.</p>
+<p><?php echo get_product_name();?> servers are always on and permanently verify if any element has any problem. If there is any alert linked to the problem, then it'll run the pre-set action such as sending an SMS, an email, or activating a script execution.</p>
 
 <ul>
 <li type="circle">Data Server</li>
diff --git a/pandora_console/include/help/en/help_snmp_alert.php b/pandora_console/include/help/en/help_snmp_alert.php
index f315f5697c..d4d40d4ba3 100644
--- a/pandora_console/include/help/en/help_snmp_alert.php
+++ b/pandora_console/include/help/en/help_snmp_alert.php
@@ -6,4 +6,4 @@
 
 <h1>SNMP alert</h1>
 
-<p>It's possible to associate an alert to a trap, so Pandora FMS warns us on arrival of a specific trap. SNMP traps have got nothing to do with the rest of the system alerts, even if both reuse the actions' system.</p>
+<p>It's possible to associate an alert to a trap, so <?php echo get_product_name();?> warns us on arrival of a specific trap. SNMP traps have got nothing to do with the rest of the system alerts, even if both reuse the actions' system.</p>
diff --git a/pandora_console/include/help/en/help_snmpoid.php b/pandora_console/include/help/en/help_snmpoid.php
index e638854d21..10fe9898fd 100644
--- a/pandora_console/include/help/en/help_snmpoid.php
+++ b/pandora_console/include/help/en/help_snmpoid.php
@@ -5,4 +5,4 @@
 ?>
 <h1>SNMP OID</h1>
 
-Module's SNMP OID. If there is a MIB able to resolve the name in Pandora FMS Network Server, then you can use alphanumeric OIDs (i.e. SNMPv2-MIB::sysDescr.0). Numeric OID can always be used (i.e. 3.1.3.1.3.5.12.4.0.1), even if there is no specific MIB. 
+Module's SNMP OID. If there is a MIB able to resolve the name in <?php echo get_product_name();?> Network Server, then you can use alphanumeric OIDs (i.e. SNMPv2-MIB::sysDescr.0). Numeric OID can always be used (i.e. 3.1.3.1.3.5.12.4.0.1), even if there is no specific MIB. 
diff --git a/pandora_console/include/help/en/help_snmpwalk.php b/pandora_console/include/help/en/help_snmpwalk.php
index 8963a448f4..92a7c93556 100644
--- a/pandora_console/include/help/en/help_snmpwalk.php
+++ b/pandora_console/include/help/en/help_snmpwalk.php
@@ -5,6 +5,6 @@
 ?>
 <h1>SNMP walk</h1>
 
-Pandora FMS has also a simple SNMP browser that allows to walk the MIB of a remote device by a SNMP Walk. 
+<?php echo get_product_name();?> has also a simple SNMP browser that allows to walk the MIB of a remote device by a SNMP Walk. 
 <br /><br />
-Walking ("SNMP Walk") over a device will make all MIB variables available, so you can choose one. You can also enter a MIB using numerical OID or human understandable format, if you have the correct MIB installed in your Pandora FMS Network Server. 
+Walking ("SNMP Walk") over a device will make all MIB variables available, so you can choose one. You can also enter a MIB using numerical OID or human understandable format, if you have the correct MIB installed in your <?php echo get_product_name();?> Network Server. 
diff --git a/pandora_console/include/help/en/help_tags_config.php b/pandora_console/include/help/en/help_tags_config.php
index b4c3aecfad..cf2fbe240d 100644
--- a/pandora_console/include/help/en/help_tags_config.php
+++ b/pandora_console/include/help/en/help_tags_config.php
@@ -3,7 +3,7 @@
  * @package Include/help/en
  */
 ?>
-<h1>Tags in Pandora FMS</h1>
+<h1>Tags in <?php echo get_product_name();?></h1>
 
 The access to the modules can be configurated with a Tags system. A tags are configurated on the system, and be assigned to the choosed modules. In this way the access of the user can be limited to the modules with certain tags.
 <br><br>
diff --git a/pandora_console/include/help/en/help_tcp_send.php b/pandora_console/include/help/en/help_tcp_send.php
index ea44e5e276..302deb2f13 100644
--- a/pandora_console/include/help/en/help_tcp_send.php
+++ b/pandora_console/include/help/en/help_tcp_send.php
@@ -38,7 +38,7 @@ If you type something, like "none" and press enter, they reply you the following
 <br /><br />
 Protocol mismatch
 <br /><br />
-So to "code" this conversation in a Pandora FMS TCP module, you need to put in TCP Send:
+So to "code" this conversation in a <?php echo get_product_name();?> TCP module, you need to put in TCP Send:
 <br /><br />
 |none^M
 <br /><br />
diff --git a/pandora_console/include/help/en/help_timesource.php b/pandora_console/include/help/en/help_timesource.php
index cb37708dc5..9acceb5743 100644
--- a/pandora_console/include/help/en/help_timesource.php
+++ b/pandora_console/include/help/en/help_timesource.php
@@ -9,9 +9,9 @@
 What source to use for the time. This can be (for now) either the local system (System) or database (Database).<br />
 </p>
 <p>
-This is useful when your database is not on the same system as your webserver or your Pandora FMS servers. 
+This is useful when your database is not on the same system as your webserver or your <?php echo get_product_name();?> servers. 
 In that case any time difference will miscalculate the time differences and timestamps.
-You should use NTP to sync all your pandora servers and your MySQL server. 
+You should use NTP to sync all your <?php echo get_product_name();?> servers and your MySQL server. 
 By using these preferences you don't have to sync your webserver but it's still recommended.
 </p>
 <p>
diff --git a/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php b/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php
index fcdb43a897..3cc211da66 100644
--- a/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php
+++ b/pandora_console/include/help/en/help_visual_console_editor_editor_tab.php
@@ -17,7 +17,7 @@ defined:
 	<li>the work area (where you will "draw" the visual console)</li>
 	<li>the option palette ( that is not visible in this screen shot)</li>
 </ul>
-In the version Pandora 5.0.1 you can set the label with a rich text.
+You can set the label with a rich text.
 And the item "Simple value" you can use the macros to set inner the text
 with (_VALUE_).
 </p>
diff --git a/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php b/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php
index 790bc1824a..cfe2355c5d 100644
--- a/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php
+++ b/pandora_console/include/help/en/help_visual_console_editor_preview_tab.php
@@ -6,4 +6,4 @@
 
 <h1>Preview</h1>
 
-<p>This tab is useful to see the result of your work in a quick way, avoiding surfing between the Pandora Console menus. The visual console view is an static view, so, if the state of the elements contained there, they will not be drawing again as it happens with the visual console view that hangs on the Visual Console menu.</p>
+<p>This tab is useful to see the result of your work in a quick way, avoiding surfing between the <?php echo get_product_name();?> Console menus. The visual console view is an static view, so, if the state of the elements contained there, they will not be drawing again as it happens with the visual console view that hangs on the Visual Console menu.</p>
diff --git a/pandora_console/include/help/en/help_web_checks.php b/pandora_console/include/help/en/help_web_checks.php
index 3148293e92..fd4b5981c8 100644
--- a/pandora_console/include/help/en/help_web_checks.php
+++ b/pandora_console/include/help/en/help_web_checks.php
@@ -6,7 +6,7 @@
 <h1>WEB Monitoring</h1>
 
 <p>
-Advanced WEB Monitoring is a feature done by the Goliat/WEB Server in Pandora FMS Enterprise version.
+Advanced WEB Monitoring is a feature done by the Goliat/WEB Server in <?php echo get_product_name();?> Enterprise version.
 <br /><br />
 This is a sample of GOLIAT Webcheck module:
 <br />
@@ -43,7 +43,7 @@ The following macros are available:
 <li>_moduledescription_ : Description of the module who fired the alert.</li>
 <li>_modulestatus_ : Status of the module.</li>
 <li>_moduletags_ : Tags associated to the module.</li>
-<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.</li>
+<li>_id_agent_ : Id of agent, useful to build direct URL to redirect to a <?php echo get_product_name();?> console webpage.</li>
 <li>_policy_ : Name of the policy the module belongs to (if applies).</li>
 <li>_interval_ : Execution interval of the module. </li>
 <li>_target_ip_ : IP address of the target of the module.</li>
diff --git a/pandora_console/include/help/en/help_wux_console.php b/pandora_console/include/help/en/help_wux_console.php
index f6f092d1e4..39ad49d70a 100644
--- a/pandora_console/include/help/en/help_wux_console.php
+++ b/pandora_console/include/help/en/help_wux_console.php
@@ -2,11 +2,11 @@
 <h2>Introducci&oacute;n</h2>
 
 <p>
-    Pandora WUX es un componente interno de Pandora FMS que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en Pandora FMS un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
+	<?php echo get_product_name();?> WUX es un componente interno de <?php echo get_product_name();?> que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en <?php echo get_product_name();?> un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
 </p>
 
 <p>
-    Pandora WUX utiliza el robot de navegaci&oacute;n de Pandora (PWR - Pandora Web Robot) para automatizar las sesiones de navegaci&oacute;n
+	<?php echo get_product_name();?> WUX utiliza el robot de navegaci&oacute;n de <?php echo get_product_name();?> (PWR - <?php echo get_product_name();?> Web Robot) para automatizar las sesiones de navegaci&oacute;n
 </p>
 
 <h2>Grabar una sesi&oacute;n de navegaci&oacute;n web</h2>
@@ -114,13 +114,13 @@
 </p>
 
 <p>
-	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con Pandora WUX. El fichero resultante ser&aacute; un documento HTML que Pandora WUX interpretar&aacute;.
+	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con <?php echo get_product_name();?> WUX. El fichero resultante ser&aacute; un documento HTML que <?php echo get_product_name();?> WUX interpretar&aacute;.
 </p>
 
-<h4>Grabar una sesi&oacute;n transaccional con Pandora WUX PWR</h4>
+<h4>Grabar una sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR</h4>
 
 <p>
-	Pandora WUX en modo PWR (Pandora Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
+	<?php echo get_product_name();?> WUX en modo PWR (<?php echo get_product_name();?> Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
 </p>
 
 <p>
@@ -186,7 +186,7 @@
     En esta vista podemos encontrar toda la infomaci&oacute;n que el sistema WUX ha obtenido de la sesi&oacute;n de navegaci&oacute;n configurada: 
 </p>
 <p>
-    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con Pandora WUX PWR)</i>.
+    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR)</i>.
 </p>
 
 <p style="text-align: center">

From 929733598cdafdea0cda1fff99028b03cef631e8 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 14:06:00 +0200
Subject: [PATCH 22/56] [Rebranding] help es

---
 .../include/help/es/help_alert_command.php    |  2 +-
 .../include/help/es/help_alert_compound.php   |  4 +--
 .../include/help/es/help_alert_config.php     |  6 ++--
 .../help/es/help_alert_fields_description.php |  6 ++--
 .../include/help/es/help_alert_macros.php     |  4 +--
 .../include/help/es/help_alert_recovery.php   |  2 +-
 .../include/help/es/help_alert_type.php       |  8 +++---
 .../include/help/es/help_alert_validation.php |  2 +-
 .../include/help/es/help_alerts.php           |  2 +-
 .../include/help/es/help_alerts_config.php    | 28 +++++++++----------
 .../help/es/help_cascade_protection.php       |  4 +--
 .../include/help/es/help_categories.php       |  4 +--
 .../include/help/es/help_collection_tab.php   |  2 +-
 .../include/help/es/help_collections.php      |  6 ++--
 .../include/help/es/help_component_groups.php |  2 +-
 .../help/es/help_configure_gis_map.php        |  4 +--
 .../include/help/es/help_create_agent.php     |  2 +-
 pandora_console/include/help/es/help_cron.php |  2 +-
 .../include/help/es/help_custom_logo.php      |  2 +-
 .../include/help/es/help_event_alert.php      |  4 +--
 .../include/help/es/help_events_history.php   |  2 +-
 .../include/help/es/help_export_server.php    | 10 +++----
 .../include/help/es/help_ff_threshold.php     |  4 +--
 .../include/help/es/help_gis_map_builder.php  |  4 +--
 .../help/es/help_gis_setup_map_connection.php |  2 +-
 .../include/help/es/help_graph_builder.php    |  4 +--
 .../include/help/es/help_graph_editor.php     |  2 +-
 .../include/help/es/help_graph_view.php       |  2 +-
 .../include/help/es/help_graphs.php           | 10 +++----
 .../include/help/es/help_history_database.php |  8 +++---
 pandora_console/include/help/es/help_ipam.php |  4 +--
 .../include/help/es/help_main_help.php        |  4 +--
 .../help/es/help_manage_alert_list.php        |  2 +-
 .../include/help/es/help_manage_alerts.php    |  2 +-
 .../include/help/es/help_module_tokens.php    |  4 +--
 .../help/es/help_network_map_enterprise.php   |  4 +--
 .../include/help/es/help_performance.php      |  2 +-
 .../include/help/es/help_planned_downtime.php |  2 +-
 .../help/es/help_planned_downtime_time.php    |  2 +-
 .../help/es/help_plugin_definition.php        |  8 +++---
 .../include/help/es/help_plugin_macros.php    |  2 +-
 .../include/help/es/help_plugin_policy.php    |  2 +-
 .../include/help/es/help_profile.php          |  2 +-
 .../include/help/es/help_recontask.php        |  4 +--
 .../help/es/help_reporting_wizard_sla_tab.php |  2 +-
 .../help/es/help_reporting_wizard_tab.php     |  2 +-
 .../include/help/es/help_response_macros.php  |  2 +-
 .../include/help/es/help_servers.php          |  6 ++--
 .../es/help_service_elements_management.php   |  4 +--
 .../help/es/help_services_management.php      |  2 +-
 .../include/help/es/help_snmp_alert.php       |  2 +-
 .../include/help/es/help_snmp_explorer.php    |  2 +-
 .../include/help/es/help_snmpcommunity.php    |  2 +-
 .../include/help/es/help_snmpoid.php          |  2 +-
 .../include/help/es/help_snmpwalk.php         |  4 +--
 .../include/help/es/help_tags_config.php      |  2 +-
 .../include/help/es/help_template_tab.php     |  2 +-
 .../include/help/es/help_timesource.php       |  4 +--
 .../include/help/es/help_web_checks.php       |  2 +-
 .../include/help/es/help_wux_console.php      | 12 ++++----
 60 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/pandora_console/include/help/es/help_alert_command.php b/pandora_console/include/help/es/help_alert_command.php
index 57b1aad847..a2f19dc197 100644
--- a/pandora_console/include/help/es/help_alert_command.php
+++ b/pandora_console/include/help/es/help_alert_command.php
@@ -6,4 +6,4 @@
 
 <h1>Comando de alerta</h1>
 
-<p>La reaccion de Pandora FMS para un valor &#34;fuera de rango&#34; puede ser de diversos tipos: escribir en un syslog, envio de una mail o SMS, o bien la ejecucion de cualquier script que este alojado en la maquina de Pandora FMS y pueda ser procesado.</p>
+<p>La reacci&oacute;n de <?php echo get_product_name();?> para un valor &#34;fuera de rango&#34; puede ser de diversos tipos: escribir en un syslog, env&iacute;o de una mail o SMS, o bien la ejecucion de cualquier script que este alojado en la maquina de <?php echo get_product_name();?> y pueda ser procesado.</p>
diff --git a/pandora_console/include/help/es/help_alert_compound.php b/pandora_console/include/help/es/help_alert_compound.php
index 1f46531855..f1fc0ddc06 100644
--- a/pandora_console/include/help/es/help_alert_compound.php
+++ b/pandora_console/include/help/es/help_alert_compound.php
@@ -4,7 +4,7 @@
 */
 ?>
 
-<h1>Alerta correlacion</h1>
+<h1>Alerta correlaci&oacute;n</h1>
 
-<p>Permite usar mas de un modulo para generar una reaccion en Pandora FMS. Dichos modulos pueden pertenecer a un mismo agente o a varios.</p>
+<p>Permite usar m&aacute;s de un m&oacute;dulo para generar una reacci&oacute;n en <?php echo get_product_name();?>. Dichos m&oacute;dulos pueden pertenecer a un mismo agente o a varios.</p>
 
diff --git a/pandora_console/include/help/es/help_alert_config.php b/pandora_console/include/help/es/help_alert_config.php
index 9e060dc967..312862a10e 100644
--- a/pandora_console/include/help/es/help_alert_config.php
+++ b/pandora_console/include/help/es/help_alert_config.php
@@ -9,7 +9,7 @@ A continuación se detallan los campos que hay que rellenar:<br><br>
 
     <b>Name:</b> El nombre de la acción.<br>
     <b>Group:</b> El grupo de la acción.<br>
-    <b>Command:</b> En este campo se define el comando que se usará en el caso de que se ejecute la alerta. Se puede elegir entre los diferntes Comandos que hay definidos en Pandora. Dependiendo del comando elegido nos aparecerán unos campos a rellenar u otros.<br>
+    <b>Command:</b> En este campo se define el comando que se usará en el caso de que se ejecute la alerta. Se puede elegir entre los diferntes Comandos que hay definidos en  <?php echo get_product_name();?>. Dependiendo del comando elegido nos aparecerán unos campos a rellenar u otros.<br>
     <b>Threshold:</b> El umbral de ejecución de la acción.<br>
     <b>Command Preview:</b> En este campo, no editable, aparecerá automáticamente el comando que se va a ejecutar en el sistema.<br>
     <b>Field X:</b> En estos campos se define el valor de las macros _field1_ a _field10_, que se usarán en el comando, en caso de ser necesario. Estos campos pueden ser un campo de texto o un combo de selección si se configura. Dependiendo del comando seleccionado apareceran un numero de campos a rellenar según sea necesario o no. Por ejemplo:<br><br>
@@ -50,7 +50,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_data_: Dato que hizo que la alerta se disparase.</li>
   <li>_email_tag_: Emails asociados a los tags de módulos.</li>
   <li>_event_cfX_: (Solo alertas de evento) Clave del campo personalizado del evento que disparó la alerta. Por ejemplo, si hay un campo personalizado cuya clave es IPAM, se puede obtener su valor usando la macro _event_cfIPAM_.</li>
-  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de Pandora FMS.</li>
+  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de  <?php echo get_product_name();?>.</li>
   <li>_event_extra_id_ : (Solo alertas de evento) Id extra.</li>
   <li>_event_id_: (Solo alertas de evento) Id del evento que disparó la alerta.</li>
   <li>_event_text_severity_: (Solo alertas de evento) Prioridad en texto de el evento que dispara la alerta (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -73,7 +73,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_groupcustomid_: ID personalizado del grupo.</li>
   <li>_groupother_: Otra información sobre el grupo. Se configura al crear el grupo.</li>
   <li>_homeurl_: Es un enlace de la URL pública que debe configurarse en las opciones generales de la configuración.</li>
-  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
+  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de  <?php echo get_product_name();?>.</li>
   <li>_id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.</li>
   <li>_id_group_ : ID del grupo de agente.</li>
   <li>_id_module_: ID del módulo.</li>
diff --git a/pandora_console/include/help/es/help_alert_fields_description.php b/pandora_console/include/help/es/help_alert_fields_description.php
index f8614bbfe8..4665b33541 100644
--- a/pandora_console/include/help/es/help_alert_fields_description.php
+++ b/pandora_console/include/help/es/help_alert_fields_description.php
@@ -3,8 +3,8 @@
  * @package Include/help/es
  */
 ?>
-<h1>Descripcion de campos</h1>
+<h1>Descripción de campos</h1>
 
-Es posible configurar una descripcion personalizada a cada campo en la configuracion del comando.
+Es posible configurar una descripcion personalizada a cada campo en la configuración del comando.
 <br><br>
-Esta descripcion aparecera en el formulario de configuracion de la accion junto a la caja de texto del campo cuando se seleccione el comando.
+Esta descripción aparecerá en el formulario de configuración de la acción junto a la caja de texto del campo cuando se seleccione el comando.
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php
index 07d6a20b8a..fec55d7175 100644
--- a/pandora_console/include/help/es/help_alert_macros.php
+++ b/pandora_console/include/help/es/help_alert_macros.php
@@ -33,7 +33,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_data_: Dato que hizo que la alerta se disparase.</li>
   <li>_email_tag_: Emails asociados a los tags de módulos.</li>
   <li>_event_cfX_: (Solo alertas de evento) Clave del campo personalizado del evento que disparó la alerta. Por ejemplo, si hay un campo personalizado cuya clave es IPAM, se puede obtener su valor usando la macro _event_cfIPAM_</li>
-  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de Pandora FMS.</li>
+  <li>_event_description_ : (Solo alertas de evento) Descripción textual del evento de <?php echo get_product_name();?>.</li>
   <li>_event_extra_id_ : (Solo alertas de evento) Id extra.</li>
   <li>_event_id_: (Solo alertas de evento) Id del evento que disparó la alerta.</li>
   <li>_event_text_severity_:(Solo alertas de evento) Prioridad en texto de el evento que dispara la alerta (Maintenance, Informational, Normal Minor, Warning, Major, Critical).</li>
@@ -56,7 +56,7 @@ Además de las macros de módulo definidas, las siguientes macros están disponi
   <li>_groupcustomid_: ID personalizado del grupo.</li>
   <li>_groupother_: Otra información sobre el grupo. Se configura al crear el grupo.</li>
   <li>_homeurl_: Es un enlace de la URL pública que debe configurarse en las opciones generales de la configuración.</li>
-  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
+  <li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de <?php echo get_product_name();?>.</li>
   <li>_id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.</li>
   <li>_id_group_ : ID del grupo de agente.</li>
   <li>_id_module_: ID del módulo.</li>
diff --git a/pandora_console/include/help/es/help_alert_recovery.php b/pandora_console/include/help/es/help_alert_recovery.php
index 3666c30eb0..9c0addc685 100644
--- a/pandora_console/include/help/es/help_alert_recovery.php
+++ b/pandora_console/include/help/es/help_alert_recovery.php
@@ -5,4 +5,4 @@
 ?>
 <h1>Recuperación de alerta</h1>
 
-Define si Pandora FMS lanza otra alerta cuando la condición de la alerta se recupera. Tiene el mismo «campo1» pero añade «[RECOVER]]» al «campo2» y al «campo3». De forma predeterminada está desactivada.
+Define si <?php echo get_product_name();?> lanza otra alerta cuando la condición de la alerta se recupera. Tiene el mismo «campo1» pero añade «[RECOVER]]» al «campo2» y al «campo3». De forma predeterminada está desactivada.
diff --git a/pandora_console/include/help/es/help_alert_type.php b/pandora_console/include/help/es/help_alert_type.php
index aa98d7f2a3..234531dd44 100644
--- a/pandora_console/include/help/es/help_alert_type.php
+++ b/pandora_console/include/help/es/help_alert_type.php
@@ -7,9 +7,9 @@
 
 Existen algunas alertas predefinidas, las cuales es muy probable que tenga que configurar en caso de que su sistema no proporcione los comandos necesarios para ejecutarlas. El equipo de desarrollo ha probado estas alertas con Red Hat Enterprise Linux (RHEL), CentOS, Debian y Ubuntu Server.
 <ul>
-	<li><b>eMail</b>: Envía un correo-e desde el servidor de Pandora FMS. Usa el sendmail local. Si instaló otro tipo de servidor de correo o no tiene uno, debería instalar y configurar sendmail o cualquiera equivalente (y comprobar la sintaxis) para poder usar este servicio. Pandora FMS depende de las herramientas del sistema para ejecutar prácticamente cada alerta, será necesario comprobar que esos comandos funcionan correctamente en su sistema.</li>
-	<li><b>Internal audit</b>: Es la única alerta &laquo;interna&raquo;, escribe un incidente en el sistema de auditoría interno de Pandora FMS. Ésto se almacena en la base de datos de Pandora FMS y se puede revisar con el visor de auditoría de Pandora FMS desde la consola Web.</li>
-	<li><b>Pandora FMS Alertlog</b>: Guarda información acerca de la alerta en un fichero de texto (.log). Use este tipo de alerta para generar ficheros log usando el formato que necesite. Para ello, deberá modificar el comando para que use el formato y fichero que usted quierd.a Note que Pandora FMS no gestiona rotación de ficheros, y que el proceso del servidor de Pandora FMS que ejecuta la alerta deberá poder acceder al fichero log para escribir en él.</li>
-	<li><b>Pandora FMS Event</b>: Esta alerta crea un evento especial en el gestor de eventos de Pandora FMS.</li> 
+	<li><b>eMail</b>: Envía un correo-e desde el servidor de <?php echo get_product_name();?>. Usa el sendmail local. Si instaló otro tipo de servidor de correo o no tiene uno, debería instalar y configurar sendmail o cualquiera equivalente (y comprobar la sintaxis) para poder usar este servicio. <?php echo get_product_name();?> depende de las herramientas del sistema para ejecutar prácticamente cada alerta, será necesario comprobar que esos comandos funcionan correctamente en su sistema.</li>
+	<li><b>Internal audit</b>: Es la única alerta &laquo;interna&raquo;, escribe un incidente en el sistema de auditoría interno de <?php echo get_product_name();?>. Esto se almacena en la base de datos de <?php echo get_product_name();?> y se puede revisar con el visor de auditoría de <?php echo get_product_name();?> desde la consola Web.</li>
+	<li><b><?php echo get_product_name();?> Alertlog</b>: Guarda información acerca de la alerta en un fichero de texto (.log). Use este tipo de alerta para generar ficheros log usando el formato que necesite. Para ello, deberá modificar el comando para que use el formato y fichero que usted quierd.a Note que <?php echo get_product_name();?> no gestiona rotación de ficheros, y que el proceso del servidor de <?php echo get_product_name();?> que ejecuta la alerta deberá poder acceder al fichero log para escribir en él.</li>
+	<li><b><?php echo get_product_name();?> Event</b>: Esta alerta crea un evento especial en el gestor de eventos de <?php echo get_product_name();?>.</li> 
 </ul>
 Estas alertas son predefinidas y no se pueden borrar, no obstante el usuario puede definir alertas nuevas que usen comandos personalizados y añadirlas al Gestor de alertas.
\ No newline at end of file
diff --git a/pandora_console/include/help/es/help_alert_validation.php b/pandora_console/include/help/es/help_alert_validation.php
index 7e3a349bf1..3aaa0b2c0c 100644
--- a/pandora_console/include/help/es/help_alert_validation.php
+++ b/pandora_console/include/help/es/help_alert_validation.php
@@ -5,5 +5,5 @@
 ?>
 <h1>Validación de alerta</h1>
 <p>
-Validar una alerta sólo cambia su bit de estado y limpia el estado &laquo;disparado&raquo;, de tal forma que si la alerta se dispara de nuevo el proceso continua. Está orientado a alertas con grandes umbrales, por ejemplo, 1 día. Si obtiene una alarma y la revisa y la marca como vista, probablemente quiera establecer su estado a verde y no quiere esperar 1 día a que se vuelva a poner verde.
+Validar una alerta solo cambia su bit de estado y limpia el estado &laquo;disparado&raquo;, de tal forma que si la alerta se dispara de nuevo el proceso continua. Está orientado a alertas con grandes umbrales, por ejemplo, 1 día. Si obtiene una alarma y la revisa y la marca como vista, probablemente quiera establecer su estado a verde y no quiere esperar 1 día a que se vuelva a poner verde.
 </p>
diff --git a/pandora_console/include/help/es/help_alerts.php b/pandora_console/include/help/es/help_alerts.php
index 19ff104483..606d2b89d6 100644
--- a/pandora_console/include/help/es/help_alerts.php
+++ b/pandora_console/include/help/es/help_alerts.php
@@ -14,7 +14,7 @@
 
 	<li><b>Tipo de alerta:</b> Éste puede seleccionarse de la lista de alertas que hayan sido previamente generadas.</li>
 	<li><b>Valor máximo:</b> Define el valor máximo para un módulo. Cualquier valor por encima de este umbral lanzará la alerta.</li>
-	<li><b>Valor mínimo:</b> Define el valor mínimo para un módulo. Cualquier valor por debajo de este umbral disparará la alerta. La pareja de &laquo;maximo&raquo; y &laquo;minimo&raquo; son los valores clave en la definición de una alerta, ya que definen en qué rango de valores se ha de disparar una alerta. Los valores de máximo y mínimo definen «lo aceptable», valores que Pandora FMS considera «válidos», fuera de estos valores, Pandora FMS lo considerará como alerta candidata a ser disparada.</li>
+	<li><b>Valor mínimo:</b> Define el valor mínimo para un módulo. Cualquier valor por debajo de este umbral disparará la alerta. La pareja de &laquo;maximo&raquo; y &laquo;minimo&raquo; son los valores clave en la definición de una alerta, ya que definen en qué rango de valores se ha de disparar una alerta. Los valores de máximo y mínimo definen «lo aceptable», valores que <?php echo get_product_name();?> considera «válidos», fuera de estos valores, <?php echo get_product_name();?> lo considerará como alerta candidata a ser disparada.</li>
 	<li><b>Texto de la alerta:</b> En caso de módulos string, se puede definir una expresión regular o una subcadena para hacer disparar una alerta.</li>
 	<li><b>Hora desde / Hora hasta:</b> Esto define un rango de tiempo &laquo;válido&raquo; para lanzar alertas.</li>
 	<li><b>Descripción:</b> Describe la función de la alerta, y resulta útil para identificar la alerta entre otras en la vista general de alertas.</li>
diff --git a/pandora_console/include/help/es/help_alerts_config.php b/pandora_console/include/help/es/help_alerts_config.php
index d61ea0ae5d..7a98cb2863 100644
--- a/pandora_console/include/help/es/help_alerts_config.php
+++ b/pandora_console/include/help/es/help_alerts_config.php
@@ -3,18 +3,18 @@
  * @package Include/help/es 
  */
 ?> 
- <h1>Guía rápida de configuración de alertas para Pandora FMS</h1>
+ <h1>Guía rápida de configuración de alertas para <?php echo get_product_name();?></h1>
 <br>
 
 <b>Introducción al sistema de alertas actual</b><br><br>
 
-Uno de los problemas más frecuentes y que ocasiona mayor número de quejas por parte de los usuarios es la complejidad de definir alertas en Pandora FMS. Antes, hasta la version 2.0, las alertas eran bastante más sencillas de configurar.Para cada alerta, se definía la condición y lo que hacía cuando la acción no se cumplía, para cada caso. Era más intuitivo (aun así habia campos como el alert "threshold" que daban dolores de cabeza a más de uno). Era sencillo, pero ¿merecía la pena?.<br><br>
+Uno de los problemas más frecuentes y que ocasiona mayor número de quejas por parte de los usuarios es la complejidad de definir alertas en <?php echo get_product_name();?>. Antes, hasta la version 2.0, las alertas eran bastante más sencillas de configurar.Para cada alerta, se definía la condición y lo que hacía cuando la acción no se cumplía, para cada caso. Era más intuitivo (aun así habia campos como el alert "threshold" que daban dolores de cabeza a más de uno). Era sencillo, pero ¿merecía la pena?.<br><br>
 
-Uno de nuestros mejores usuarios (cuando digo mejor, es porque tenía muchísimos agentes instalados, y además conocía muy bien el funcionamiento de Pandora FMS), nos comentó que crear una alerta en 2000 modulos, era enormemente complicado, especialmente cuando habia que modificar algo en todas ellas. Debido principalmente a este y otros problemas, modificamos el sistema de alertas para que fuera modular, para que se pudiera separar la definición de la condición de disparo de la alerta (Alert template), de la acción a ejecutar cuando esta se dispara (Alert action) y del comando que se ejecuta dentro de la acción (Alert comnmand). La combinación de una plantilla de alerta (Alert template) con un módulo desencadena la alerta en sí.<br><br>
+Uno de nuestros mejores usuarios (cuando digo mejor, es porque tenía muchísimos agentes instalados, y además conocía muy bien el funcionamiento de <?php echo get_product_name();?>), nos comentó que crear una alerta en 2000 modulos, era enormemente complicado, especialmente cuando habia que modificar algo en todas ellas. Debido principalmente a este y otros problemas, modificamos el sistema de alertas para que fuera modular, para que se pudiera separar la definición de la condición de disparo de la alerta (Alert template), de la acción a ejecutar cuando esta se dispara (Alert action) y del comando que se ejecuta dentro de la acción (Alert comnmand). La combinación de una plantilla de alerta (Alert template) con un módulo desencadena la alerta en sí.<br><br>
 
 De esta forma, si yo tengo 1000 máquinas con un modulo llamado "Host alive" y todos ellas tienen asociada una plantilla de alerta llamada "Host down" que ejecuta por defecto una acción llamada "Avisar al operador", y quiero cambiar el número mínimo de alertas que se deben disparar antes de avisar al operador, sólo tengo que hacer un cambio en la definicion de la plantilla, no ir una por una, en las 1000 alertas para modificar esa condición.<br><br>
 
-Muchos usuarios sólo gestionan algunas decenas de máquinas, pero existen usuarios con cientos, incluso miles de sistemas monitorizados con Pandora FMS, y tenemos que intentar hacer posible que con Pandora FMS se puedan gestionar todo tipo de entornos.<br><br><br><br>
+Muchos usuarios sólo gestionan algunas decenas de máquinas, pero existen usuarios con cientos, incluso miles de sistemas monitorizados con <?php echo get_product_name();?>, y tenemos que intentar hacer posible que con <?php echo get_product_name();?> se puedan gestionar todo tipo de entornos.<br><br><br><br>
 <b>Estructura de una alerta</b><br><br>
 
 <?php html_print_image ("images/help/alert01.png", false, array('width' => '550px')); ?>
@@ -85,16 +85,16 @@ Aceptamos y grabamos la modificación. Ahora cuando el valor del módulo CPU sea
 
 <?php html_print_image ("images/help/alert07.png", false, array('width' => '550px')); ?>
 <br>
-Ya hemos hecho que el sistema sepa discriminar cuando algo está bien (OK, color VERDE) y cuando está mal (CRITICAL, color rojo). Ahora lo que debemos hacer es que nos envíe un email cuando el modulo se ponga en este estado. Para ello utilizaremos el sistema de alertas de Pandora FMS.<br><br>
+Ya hemos hecho que el sistema sepa discriminar cuando algo está bien (OK, color VERDE) y cuando está mal (CRITICAL, color rojo). Ahora lo que debemos hacer es que nos envíe un email cuando el modulo se ponga en este estado. Para ello utilizaremos el sistema de alertas de <?php echo get_product_name();?>.<br><br>
 
-Para esto, lo primero que debemos hacer es asegurarnos de que existe un comando que hace lo que necesitamos (enviar un email). Este ejemplo es fácil porque existe un comando predefinido en Pandora FMS para enviar mails. Asi que ya lo tenemos.<br><br>
+Para esto, lo primero que debemos hacer es asegurarnos de que existe un comando que hace lo que necesitamos (enviar un email). Este ejemplo es fácil porque existe un comando predefinido en <?php echo get_product_name();?> para enviar mails. Asi que ya lo tenemos.<br><br>
 <b>Configurando la acción</b><br><br>
 
 Ahora tenemos que crear una acción que sea "Enviar un email al operador". Vamos a ello: Vamos al menu de administracion -> Alertas -> Acciones y le damos al botón para crear una nueva acción:<br><br>
 
 <?php html_print_image ("images/help/alert08.png", false, array('width' => '550px')); ?>
 <br>
-Esta acción utiliza el comando "Enviar email", y es realmente sencillo, ya que sólo relleno un campo (Field 1) dejando los otros dos vacíos. Esta es una de las partes más confusas del sistema de alertas de Pandora FMS: ¿Qué son los campos field1, field2, y field3?.<br><br>
+Esta acción utiliza el comando "Enviar email", y es realmente sencillo, ya que sólo relleno un campo (Field 1) dejando los otros dos vacíos. Esta es una de las partes más confusas del sistema de alertas de <?php echo get_product_name();?>: ¿Qué son los campos field1, field2, y field3?.<br><br>
 
 Esos campos son los que se usan para "pasar" la información de la plantilla de alerta al comando, y a su vez, de éste al comando. De forma que tanto Plantilla como Comando, puedan aportar diferente información al comando. En este caso el comando sólo establece el campo 1, y dejaremos el campo 2 y el campo 3 a la plantilla, como veremos a continuación.<br><br>
 
@@ -120,18 +120,18 @@ Los parámetros más críticos aquí son los siguientes:<br><br>
 
     <i>Time threshold:</i> Por defecto es un día. Si un módulo permanece todo el rato caído, durante, por ejemplo un día, y tenemos aquí un valor de 5 minutos, significa que nos estaría mandando alertas cada 5 minutos. Si lo dejamos en un día (24 horas), sólo nos enviará la alerta una vez, cuando se caiga. Si el modulo se recupera, y luego se vuelve a caer, nos enviará una alerta de nuevo, pero si sigue caída desde la 2º caida, no enviará mas alertas hasta dentro de 24 horas. <br><br>
 
-    <i>Min. Número de alertas:</i> El nº mínimo de veces que se tendrá que dar la condición (en este caso, que el modulo esté en estado CRITICAL) antes de que Pandora FMS me ejecute las acciones asociadas a la plantilla de alerta. Es una forma de evitar que falsos positivos me "inunden" a alertas, o que un comportamiento errático (ahora bien, ahora mal) haga que se disparen muchas alertas. Si ponemos aquí 1, significa que hasta que no ocurra al menos una vez, no lo tendré en cuenta. Si pongo 0, la primera vez que el modulo esté mal, disparará la alerta. <br><br>
+    <i>Min. Número de alertas:</i> El nº mínimo de veces que se tendrá que dar la condición (en este caso, que el modulo esté en estado CRITICAL) antes de que <?php echo get_product_name();?> me ejecute las acciones asociadas a la plantilla de alerta. Es una forma de evitar que falsos positivos me "inunden" a alertas, o que un comportamiento errático (ahora bien, ahora mal) haga que se disparen muchas alertas. Si ponemos aquí 1, significa que hasta que no ocurra al menos una vez, no lo tendré en cuenta. Si pongo 0, la primera vez que el modulo esté mal, disparará la alerta. <br><br>
 
     <i>Max. Numero de alertas:</i> 1 significa que sólo ejecutará la acción una vez. Si tenemos aquí 10, ejecutará 10 veces la acción. Es una forma de limitar el número de veces que una alerta se puede ejecutar. <br><br>
 
 De nuevo volvemos a ver los campos: "campo1, campo2 y campo3". Ahora podemos ver que el campo1 está en blanco, que es justamente el que hemos definido al configurar la acción. El campo2 y el campo3 se usan en la acción de enviar un mail para definir el subject y el texto del mensaje, mientras que el campo1 se usa para definir el o los destinatarios (separados por comas). Asi que la plantilla, usando algunas macros, está definiendo el subject y el mensaje de alerta de forma que en nuestro caso nos llegaría un mensaje como el que sigue (suponiendo que el agente donde está el modulo se llama "Farscape":<br><br>
 
 <i>To: sancho.lerena@notexist.ocm<br>
-Subject: [PANDORA] Farscape cpu_sys is in CRITICAL status with value 20<br>
+Subject: [MONITORING] Farscape cpu_sys is in CRITICAL status with value 20<br>
 Texto email:<br><br>
 
-This is an automated alert generated by Pandora FMS<br>
-Please contact your Pandora FMS for more information. *DO NOT* reply this email.<br></i><br>
+This is an automated alert generated by <?php echo get_product_name();?><br>
+Please contact your <?php echo get_product_name();?> for more information. *DO NOT* reply this email.<br></i><br>
 
 Dado que la acción por defecto es la que he definido previamente, todas las alertas que usen esta plantilla, usarán esa acción predeterminada por defecto, a no ser que la modifique.<br><br>
 
@@ -169,7 +169,7 @@ Las alertas pueden estar activadas, desactivadas o en standby. La diferencia ent
 Las alertas en standby son útiles para poder visualizarlas sin que molesten en otros aspectos.<br><br>
 <b>Utilizando comandos de alertas distintos del email</b><br><br>
 
-El email, como comando es interno a Pandora FMS y no se puede configurar, es decir, field1, field2 y field3 son campos que están definidos que se usan como destinatario, subject y texto del mensaje. Pero, ¿que ocurre si yo quiero ejecutar una acción diferente, definida por mi?.<br><br>
+El email, como comando es interno a <?php echo get_product_name();?> y no se puede configurar, es decir, field1, field2 y field3 son campos que están definidos que se usan como destinatario, subject y texto del mensaje. Pero, ¿que ocurre si yo quiero ejecutar una acción diferente, definida por mi?.<br><br>
 
 Vamos a definir un nuevo comando, algo totalmente definido por nosotros. Imaginemos que queremos generar un fichero log con cada alerta que encontremos. El formato de ese fichero log tiene que ser algo como:<br><br>
 
@@ -189,8 +189,8 @@ Si vemos el fichero de log que hemos creado:<br><br>
 
 <i>2010-05-25 18:17:10 - farscape - cpu_sys - 23.00 - Custom alert for LOG#1</i><br><br>
 
-La alerta se disparó a las 18:17:10 en el agente "farscape", en el modulo "cpu_sys" con un dato de "23.00" y con la descripcion que pusimos al definir la acción.<br><br>
+La alerta se disparó a las 18:17:10 en el agente "farscape", en el modulo "cpu_sys" con un dato de "23.00" y con la descripción que pusimos al definir la acción.<br><br>
 
-Dado que la ejecución del comando, el orden de los campos y otros asuntos pueden hacer que no entendamos bien cómo se ejecuta al final el comando, lo más sencillo es activar las trazas de debug del servidor de pandora (verbose 10) en el fichero de configuracion de pandora server en /etc/pandora/pandora_server.conf, reiniciemos el servidor (/etc/init.d/pandora_server restart) y que miremos el fichero /var/log/pandora/pandora_server.log buscando la línea exacta con la ejecución del comando de la alerta que hemos definido, para ver como el servidor de Pandora FMS está lanzando el comando. <br><br>
+Dado que la ejecución del comando, el orden de los campos y otros asuntos pueden hacer que no entendamos bien cómo se ejecuta al final el comando, lo más sencillo es activar las trazas de debug del servidor de <?php echo get_product_name();?> (verbose 10) en el fichero de configuración de <?php echo get_product_name();?> server en /etc/pandora/pandora_server.conf, reiniciemos el servidor (/etc/init.d/pandora_server restart) y que miremos el fichero /var/log/pandora/pandora_server.log buscando la línea exacta con la ejecución del comando de la alerta que hemos definido, para ver como el servidor de <?php echo get_product_name();?> está lanzando el comando. <br><br>
 
 
diff --git a/pandora_console/include/help/es/help_cascade_protection.php b/pandora_console/include/help/es/help_cascade_protection.php
index fd28217a69..56b4b06955 100644
--- a/pandora_console/include/help/es/help_cascade_protection.php
+++ b/pandora_console/include/help/es/help_cascade_protection.php
@@ -8,7 +8,7 @@
 </div>
 <br>
 <p>
-Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente Pandora FMS piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
+Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente <?php echo get_product_name();?> piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
 <br><br>
 Cuando habilite  <i>cascade protection</i> en un agente, esto significa que si cualquiera de sus padres tiene una alerta CRÍTICA disparada, entonces las alertas del agente <strong>NO SERÁN</strong> disparadas. Si el padre del agente tiene un módulo en CRITICAL o varias alertas con menor criticidad que CRITICAL, las alertas del agente serán disparadas si deben hacerlo. La protección en cascada comprueba las alertas padre con criticidad CRITICAL, incluyendo las alertas de correlación asignadas al padre.
 <br><br>
@@ -23,7 +23,7 @@ Si quiere usar un sistema avanzado de protección en cascada, sólo tiene que us
 </div>
 <br>
 <p>
-Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente Pandora FMS piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
+Esta opción se designa para evitar una "tormenta" de alertas que entren porque un grupo de agentes son inalcanzables. Este tipo de comportamiento ocurre cuando un dispositivo intermedio, como por ejemplo un router, está caido, y todos los dispositivos que están tras él no se pueden alcanzar. Probablemente estos dispositivos no estén caídos e incluso estos dispositivos estén trabajando junto con otro router, en modo HA. Pero si no hace nada, probablemente <?php echo get_product_name();?> piense que estén caídos porque no los pueden testar con un Remote ICMP Proc Test (un ping).
 <br><br>
 Cuando habilite  <i>cascade protection</i> en un módulo de un agente, esto significa que si este módulo del agente padre tiene una alerta CRÍTICA disparada, entonces las alertas del agente <strong>NO SERÁN</strong> disparadas.
 <br><br>
diff --git a/pandora_console/include/help/es/help_categories.php b/pandora_console/include/help/es/help_categories.php
index 9a79bac481..1fbccc8961 100644
--- a/pandora_console/include/help/es/help_categories.php
+++ b/pandora_console/include/help/es/help_categories.php
@@ -3,8 +3,8 @@
  * @package Include/help/es
  */
 ?>
-<h1>Categorias en Pandora FMS</h1>
+<h1>Categorías en <?php echo get_product_name();?></h1>
 
 Se pueden configurar unas categorias en el sistema, se asignan a los módulos que se quiera. <br>
-El único usuario que tiene permisos para realizar la creación y configuración de categorias es el administrador y se pueden utilizar para la tarificación de modulos dependiendo de la categoria a la que pertenezcan.
+El único usuario que tiene permisos para realizar la creación y configuración de categorias es el administrador y se pueden utilizar para la tarificación de modulos dependiendo de la categoría a la que pertenezcan.
 
diff --git a/pandora_console/include/help/es/help_collection_tab.php b/pandora_console/include/help/es/help_collection_tab.php
index 13a777fd0a..927840f8f9 100644
--- a/pandora_console/include/help/es/help_collection_tab.php
+++ b/pandora_console/include/help/es/help_collection_tab.php
@@ -5,5 +5,5 @@
 
 <h1>Colecciones del agente</h1>
 
-<p>Una coleccion es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio especifico. Con esto se puede transferir remotamente software a la maquina del agente de una manera sencilla.</p>
+<p>Una colección es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio específico. Con esto se puede transferir remotamente software a la máquina del agente de una manera sencilla.</p>
 
diff --git a/pandora_console/include/help/es/help_collections.php b/pandora_console/include/help/es/help_collections.php
index 3e92887370..1972edecc3 100644
--- a/pandora_console/include/help/es/help_collections.php
+++ b/pandora_console/include/help/es/help_collections.php
@@ -3,9 +3,7 @@
 */
 ?>
 
-<h3>Collections</h3>
+<h1>Colecciones del agente</h1>
 
-<p>
-A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way.
-</p>
+<p>Una colección es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio específico. Con esto se puede transferir remotamente software a la máquina del agente de una manera sencilla.</p>
 
diff --git a/pandora_console/include/help/es/help_component_groups.php b/pandora_console/include/help/es/help_component_groups.php
index a2df1528f7..ea513907a4 100644
--- a/pandora_console/include/help/es/help_component_groups.php
+++ b/pandora_console/include/help/es/help_component_groups.php
@@ -6,5 +6,5 @@
 
 <h1>Grupos de componentes</h1>
 
-<p>Un componente es un modulo generico que puede aplicarse a agentes de forma repetida como si fuera una plantilla. Con esta vista puedes crear grupos para estos componentes.</p>
+<p>Un componente es un módulo genérico que puede aplicarse a agentes de forma repetida como si fuera una plantilla. Con esta vista puedes crear grupos para estos componentes.</p>
 
diff --git a/pandora_console/include/help/es/help_configure_gis_map.php b/pandora_console/include/help/es/help_configure_gis_map.php
index 0cb1e2558a..3b7bca232d 100644
--- a/pandora_console/include/help/es/help_configure_gis_map.php
+++ b/pandora_console/include/help/es/help_configure_gis_map.php
@@ -10,7 +10,7 @@ Esta página es el lugar para configurar un Mapa GIS.
 </p>
 <h2>Nombre del Mapa</h2>
 <p>
-Cada mapa tiene un nombre descriptivo que se utiliza para reconocer el mapa dentro de Pandora FMS.
+Cada mapa tiene un nombre descriptivo que se utiliza para reconocer el mapa dentro de <?php echo get_product_name();?>.
 
 </p>
 <h2>Seleccionar Conexiones</h2>
@@ -19,7 +19,7 @@ El primer paso es seleccionar la principal <strong>conexión </strong> empleada
 
 </p>
 <p>
-Cuando se configura la primera conexión, Pandora FMS te pregunta si quiere utilizar los valores por defecto de la conexión para el mapa, para evitar tener que escribir de nuevo toda la información. También, si la conexión por defecto del mapa se ha cambiado (utilizando el radio button), Pandora FMS te preguntará de nuevo si quiere usar los valores de la nueva conexión por defecto.
+Cuando se configura la primera conexión, <?php echo get_product_name();?> te pregunta si quiere utilizar los valores por defecto de la conexión para el mapa, para evitar tener que escribir de nuevo toda la información. También, si la conexión por defecto del mapa se ha cambiado (utilizando el radio button), <?php echo get_product_name();?> te preguntará de nuevo si quiere usar los valores de la nueva conexión por defecto.
 
 </p>
 <h2>Parámetros del Mapa</h2>
diff --git a/pandora_console/include/help/es/help_create_agent.php b/pandora_console/include/help/es/help_create_agent.php
index ec61c2f816..affd3d884a 100644
--- a/pandora_console/include/help/es/help_create_agent.php
+++ b/pandora_console/include/help/es/help_create_agent.php
@@ -12,5 +12,5 @@ Para crear un Agente, debes rellenar este formulario. Por favor rellena todos lo
 "Interval" se refiere al intervalo de ejecución del agente. El intervalo es cada cuanto el agente envía datos al servidor.
 </p>
 <p>
-"Server" se refiere al Servidor de Pandora que leerá los datos enviados por el agente.
+"Server" se refiere al Servidor de <?php echo get_product_name();?> que leerá los datos enviados por el agente.
 </p>
diff --git a/pandora_console/include/help/es/help_cron.php b/pandora_console/include/help/es/help_cron.php
index 2902c81928..5f911a8348 100644
--- a/pandora_console/include/help/es/help_cron.php
+++ b/pandora_console/include/help/es/help_cron.php
@@ -9,7 +9,7 @@ Mediante los grupos de parámetros de configuración <b>Cron desde</b> y <b>Cron
 puede hacer que un módulo solo se ejecute durante ciertos periodos de tiempo. El 
 modo en el que se configura es parecido a la sintaxis de 
 <a style="font-size:14px;" href="https://es.wikipedia.org/wiki/Cron_(Unix)">cron</a>. 
-Tal y como aparecen en la consola de Pandora, cada uno de los parámetros 
+Tal y como aparecen en la consola de <?php echo get_product_name();?>, cada uno de los parámetros 
 tiene tres opciones.
 
 <h4>Cron desde: cualquiera</h4>
diff --git a/pandora_console/include/help/es/help_custom_logo.php b/pandora_console/include/help/es/help_custom_logo.php
index 02edf9c72f..a1b26d4eed 100644
--- a/pandora_console/include/help/es/help_custom_logo.php
+++ b/pandora_console/include/help/es/help_custom_logo.php
@@ -5,7 +5,7 @@
 ?>
 <h1> Logo de Cliente (Marca comunitaria de empresa)</h1>
 
-Esta opción se utiliza para poder desplegar su propio logo en la cabecera de Pandora FMS. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.
+Esta opción se utiliza para poder desplegar su propio logo en la cabecera de <?php echo get_product_name();?>. Puede utilizar cualquier tipo de gráfica en formato PNG. Hay una ancho/alto para cualquier imagen desplegada aquí de 206x47 píxeles.
 
 <br><br>
 
diff --git a/pandora_console/include/help/es/help_event_alert.php b/pandora_console/include/help/es/help_event_alert.php
index ba15a109bb..537deb47c7 100644
--- a/pandora_console/include/help/es/help_event_alert.php
+++ b/pandora_console/include/help/es/help_event_alert.php
@@ -6,7 +6,7 @@
 
 <h1>Alerta de evento</h1>
 
-Desde la versión 4.0 de Pandora FMS se pueden definir alertas sobre los eventos, lo que permite trabajar desde una perspectiva completamente nueva y mucho más flexible. Esta es una característica Enterprise.<br><br>
+Desde la versión 4.0 de <?php echo get_product_name();?> se pueden definir alertas sobre los eventos, lo que permite trabajar desde una perspectiva completamente nueva y mucho más flexible. Esta es una característica Enterprise.<br><br>
 
 Las Alertas de evento nuevas se crean pinchando en el botón Create en el menú Event alerts en el menú de Administración.
 <br><br>
@@ -59,6 +59,6 @@ Por ejemplo, podríamos configurar una regla que case con los eventos generados
 <?php html_print_image ("images/help/event04.png", false, array('width' => '550px')); ?>
 
 <br>
-<p>Dado el elevado número de eventos que puede llegar a albergar la base de datos de Pandora FMS, el servidor trabaja sobre una ventana de eventos que se define en el fichero de configuración pandora_server.conf mediante el parámetro event_window. Los eventos que se hayan generado fuera de esta ventana de tiempo no serán procesados por el servidor, de modo que no tiene sentido especificar en una regla una ventana de tiempo superior a la configurada en el servidor </p>
+<p>Dado el elevado número de eventos que puede llegar a albergar la base de datos de <?php echo get_product_name();?>, el servidor trabaja sobre una ventana de eventos que se define en el fichero de configuración pandora_server.conf mediante el parámetro event_window. Los eventos que se hayan generado fuera de esta ventana de tiempo no serán procesados por el servidor, de modo que no tiene sentido especificar en una regla una ventana de tiempo superior a la configurada en el servidor </p>
 
 
diff --git a/pandora_console/include/help/es/help_events_history.php b/pandora_console/include/help/es/help_events_history.php
index 4fcf418698..261e4c1622 100644
--- a/pandora_console/include/help/es/help_events_history.php
+++ b/pandora_console/include/help/es/help_events_history.php
@@ -3,7 +3,7 @@
 */
 ?>
 
-<p> Cuando el histórico de eventos está activado, el script de purgado (pandora_db.pl) copiará los eventos no validados o en proceso (solo los nuevos) a la tabla de histórico antes de eliminarlos.
+<p> Cuando el histórico de eventos está activado, el script de purgado (DB Tool) copiará los eventos no validados o en proceso (solo los nuevos) a la tabla de histórico antes de eliminarlos.
 <br><br>Estos eventos pueden ser consultados en la vista de eventos históricos. Esta vista es accesible desde una nueva pestaña en la sección de eventos.
 </p>
 
diff --git a/pandora_console/include/help/es/help_export_server.php b/pandora_console/include/help/es/help_export_server.php
index 48307a77ef..041d8d926c 100644
--- a/pandora_console/include/help/es/help_export_server.php
+++ b/pandora_console/include/help/es/help_export_server.php
@@ -3,17 +3,17 @@
  * @package Include/help/es
  */
 ?>
-<h1>Servidor de exportacion</h1>
+<h1>Servidor de exportación</h1>
 
-<p>La version Enterprise de Pandora FMS implementa, mediante el export server, un mecanismo de escalado de datos que permite virtualmente una implantacion distribuida capaz de monitorizar un numero ilimitado de informacion, siempre que se diseñe adecuadamente y se disgregue en diferentes perfiles de informacion.</p>
+<p>La versión Enterprise de <?php echo get_product_name();?> implementa, mediante el export server, un mecanismo de escalado de datos que permite virtualmente una implantación distribuida capaz de monitorizar un número ilimitado de información, siempre que se diseñe adecuadamente y se disgregue en diferentes perfiles de información.</p>
 
 <ul>
-<li type="circle">Nombre: El nombre del servidor de Pandora FMS.</li>
+<li type="circle">Nombre: El nombre del servidor de <?php echo get_product_name();?>.</li>
 <li type="circle">Servidor de exportacion: Combo donde se elige la instancia del servidor de export server que se usara para exporta los datos.</li>
-<li type="circle">Prefijo: Prefijo que se usa para a&ntilde;adir al nombre del agente que envia los datos. Cuando se reenvian datos de un agente llamado &#34;Farscape&#34;, por ejemplo y su prefijo en el servidor de exportacion es &#34;EU01&#34;, los datos del agente reenviado seran vistos en el servidor de destino con el nombre de agente EU01-Farscape.</li>
+<li type="circle">Prefijo: Prefijo que se usa para a&ntilde;adir al nombre del agente que envía los datos. Cuando se reenvían datos de un agente llamado &#34;Farscape&#34;, por ejemplo y su prefijo en el servidor de exportación es &#34;EU01&#34;, los datos del agente reenviado seran vistos en el servidor de destino con el nombre de agente EU01-Farscape.</li>
 <li type="circle">Interval: Se define el intervalo de tiempo cada cuantos segundos se quieren enviar los datos que haya pendientes.</li> 
 <li type="circle">Directorio destino: Sera el directorio de destino (usado para SSH o FTP unicamente) donde dejara los datos remotamente.</li>
-<li type="circle">Direccion: Dirección del servidor de datos que va a recibir los datos.</li>
+<li type="circle">Dirección: Dirección del servidor de datos que va a recibir los datos.</li>
 <li type="circle">Modo de transferencia: Modo de transferencia. Puedes elegir entre: Local, SSH, FTP y Tentacle.</li>
 <li type="circle">Usuario: Usuario de FTP.</li>
 <li type="circle">Password: Password  de usuario FTP.</li>
diff --git a/pandora_console/include/help/es/help_ff_threshold.php b/pandora_console/include/help/es/help_ff_threshold.php
index 7bea60ade0..abf00b7e28 100644
--- a/pandora_console/include/help/es/help_ff_threshold.php
+++ b/pandora_console/include/help/es/help_ff_threshold.php
@@ -8,7 +8,7 @@
 <br> 
 <br>
 
-El umbral del parámetro FF (FF=FlipFLoP) se utiliza para "filtrar" los continuos cambios de estado en la creación de eventos/estados, para que pueda indicar a Pandora FMS que hasta que un elemento no esté al menos x veces en el mismo estado después de cambiar desde su estado original, no considere que haya cambiado.
+El umbral del parámetro FF (FF=FlipFLoP) se utiliza para "filtrar" los continuos cambios de estado en la creación de eventos/estados, para que pueda indicar a <?php echo get_product_name();?> que hasta que un elemento no esté al menos x veces en el mismo estado después de cambiar desde su estado original, no considere que haya cambiado.
 
 <br><br>
 
@@ -27,7 +27,7 @@ Tomemos como ejemplo clásico: un ping para un host donde hay pérdida de paquet
 </pre>
 <br>
 
-Sin embargo, el host está vivo en todos los casos. Lo que queremos realmente es decirle a Pandora que hasta que es host no lo diga usted está al menos tres veces caído, no lo marque así, con lo que en el caso anterior no estaría caído, y sólo en este caso sería:
+Sin embargo, el host está vivo en todos los casos. Lo que queremos realmente es decirle a <?php echo get_product_name();?> que hasta que es host no lo diga usted está al menos tres veces caído, no lo marque así, con lo que en el caso anterior no estaría caído, y sólo en este caso sería:
 
 <pre>
  1  
diff --git a/pandora_console/include/help/es/help_gis_map_builder.php b/pandora_console/include/help/es/help_gis_map_builder.php
index 7b9156109c..3e303be97a 100644
--- a/pandora_console/include/help/es/help_gis_map_builder.php
+++ b/pandora_console/include/help/es/help_gis_map_builder.php
@@ -7,11 +7,11 @@
 
 <p>
 
-Esta página muestra una lista de los mapas definidos, y le permite editar, borrar o ver cualquiera de ellos. También está instalado en está página el <strong>mapa por defecto</strong> de Pandora FMS.
+Esta página muestra una lista de los mapas definidos, y le permite editar, borrar o ver cualquiera de ellos. También está instalado en está página el <strong>mapa por defecto</strong> de <?php echo get_product_name();?>.
 
 </p>
 
-Para crear una conexión de mapa se necesita una conexión a un servidor de mapas. Las conexiones las crea el Administrador en el menú<strong>Setup</strong>
+Para crear una conexión de mapa se necesita una conexión a un servidor de mapas. Las conexiones las crea el Administrador en el menú <strong>Setup</strong>
 
 <p>
 </p>
diff --git a/pandora_console/include/help/es/help_gis_setup_map_connection.php b/pandora_console/include/help/es/help_gis_setup_map_connection.php
index 1fb89be501..b7813269d9 100644
--- a/pandora_console/include/help/es/help_gis_setup_map_connection.php
+++ b/pandora_console/include/help/es/help_gis_setup_map_connection.php
@@ -11,7 +11,7 @@ En esta sección, es donde el administrador puede configurar <strong>una conexi
 
 <h2>Tipos de conexión</h2>
 <p>
-Ahora mismo, Pandora FMS soporta tres tipos de conexiones:
+Ahora mismo, <?php echo get_product_name();?> soporta tres tipos de conexiones:
 OpenStreetMap, Google Maps e imágenes estáticas.
 </p>
 <h3>Open Street Maps</h3>
diff --git a/pandora_console/include/help/es/help_graph_builder.php b/pandora_console/include/help/es/help_graph_builder.php
index 02c0b31154..659e564ff5 100644
--- a/pandora_console/include/help/es/help_graph_builder.php
+++ b/pandora_console/include/help/es/help_graph_builder.php
@@ -4,7 +4,7 @@
 */
 ?>
 
-<h1>Editor graficos</h1>
+<h1>Editor gráficos</h1>
 
-<p>Permite crear nuevas graficas y editar los antiguos. En esta vista se pueden configurar los parametros generales de las graficas.</p>
+<p>Permite crear nuevas gráficas y editar los antiguos. En esta vista se pueden configurar los parametros generales de las gráficas.</p>
 
diff --git a/pandora_console/include/help/es/help_graph_editor.php b/pandora_console/include/help/es/help_graph_editor.php
index 73c4595504..68773cd925 100644
--- a/pandora_console/include/help/es/help_graph_editor.php
+++ b/pandora_console/include/help/es/help_graph_editor.php
@@ -6,5 +6,5 @@
 
 <h1>Editor de items</h1>
 
-<p>Esta vista permite a&ntile;ade modulos a graficos. Puedes a&ntilde;adir mas de un modulo para crear graficos combinados. Los graficos combinados permiten definir el peso de las variables, tendran valores de diferentes modulos que seran de uno a mas agentes. De esta forma se puede comparar visualmente informacion que venga de diferentes fuentes.</p>
+<p>Esta vista permite a&ntile;ade módulos a gráficos. Puedes a&ntilde;adir más de un módulo para crear gráficos combinados. Los gráficos combinados permiten definir el peso de las variables, tendrán valores de diferentes módulos que serán de uno a mas agentes. De esta forma se puede comparar visualmente información que venga de diferentes fuentes.</p>
 
diff --git a/pandora_console/include/help/es/help_graph_view.php b/pandora_console/include/help/es/help_graph_view.php
index 731ef82f5c..abfe0b705d 100644
--- a/pandora_console/include/help/es/help_graph_view.php
+++ b/pandora_console/include/help/es/help_graph_view.php
@@ -6,4 +6,4 @@
 
 <h1>Vista de graficas</h1>
 
-<p>En esta vista se muestra la visualizacion de graficas. Se puede filtrar por fecha, periodo y el factor de zoom.</p>
+<p>En esta vista se muestra la visualizacion de gráficas. Se puede filtrar por fecha, periodo y el factor de zoom.</p>
diff --git a/pandora_console/include/help/es/help_graphs.php b/pandora_console/include/help/es/help_graphs.php
index 2f98d43ccf..af3f7ed9e9 100644
--- a/pandora_console/include/help/es/help_graphs.php
+++ b/pandora_console/include/help/es/help_graphs.php
@@ -48,11 +48,11 @@ div.img_title {
 </style>
 
 <body class="hlp_graphs">
-<h1>Interpretar las gr&aacute;ficas en Pandora FMS</h1>
+<h1>Interpretar las gr&aacute;ficas en <?php echo get_product_name();?></h1>
 
 
-<p>Las gr&aacute;ficas en Pandora representan los valores que un m&oacute;dulo ha tenido a lo largo de un período.</p>
-<p>Debido a la gran cantidad de datos que Pandora FMS almacena, se ofrecen dos tipos diferentes de funcionalidad:</p>
+<p>Las gr&aacute;ficas en <?php echo get_product_name();?> representan los valores que un m&oacute;dulo ha tenido a lo largo de un período.</p>
+<p>Debido a la gran cantidad de datos que <?php echo get_product_name();?> almacena, se ofrecen dos tipos diferentes de funcionalidad:</p>
 
 
 <h2>Gr&aacute;ficas Normales</h2>
@@ -98,7 +98,7 @@ div.img_title {
 <dd>Muestra puntos indicadores con la informaci&oacute;n de alertas disparadas en la parte superior.</dd>
 
 <dt>Mostrar percentil</dt>
-<dd>Agrega una gr&aacute;fica que indica la l&iacute;nea del percentil (configurable en opciones visuales generales de Pandora).</dd>
+<dd>Agrega una gr&aacute;fica que indica la l&iacute;nea del percentil (configurable en opciones visuales generales de <?php echo get_product_name();?>).</dd>
 
 <dt>Comparaci&oacute;n de tiempo (superpuesto)</dt>
 <dd>Muestra superpuesta la misma gr&aacute;fica, pero en el per&iacute;odo anterior al seleccionado. Por ejemplo, si solicitamos un per&iacute;odo de una semana y activamos esta opci&oacute;n, la semana anterior a la elegida tambi&eacute;n se mostrar&aacute; superpuesta.</dd>
@@ -107,7 +107,7 @@ div.img_title {
 <dd>Muestra la misma gr&aacute;fica, pero en el per&iacute;odo anterior al seleccionado, en un area independiente. Por ejemplo, si solicitamos un per&iacute;odo de una semana y activamos esta opci&oacute;n, la semana anterior a la elegida tambi&eacute;n se mostrar&aacute;.</dd>
 
 <dt>Mostrar gr&aacute;fica de desconocidos</dt>
-<dd>Muestra cajas en sombreado gris cubriendo los per&iacute;odos en que Pandora FMS no puede garantizar el estado del m&oacute;dulo, ya sea por p&eacute;rdida de datos, desconexi&oacute;n de un agente software, etc.</dd>
+<dd>Muestra cajas en sombreado gris cubriendo los per&iacute;odos en que <?php echo get_product_name();?> no puede garantizar el estado del m&oacute;dulo, ya sea por p&eacute;rdida de datos, desconexi&oacute;n de un agente software, etc.</dd>
 
 <dt>Mostrar gr&aacute;fica de escala completa (TIP)</dt>
 <dd>Cambia el modo de pintado de "normal" a "TIP". En este modo, las gr&aacute;ficas mostrar&aacute;n datos reales en vez de aproximaciones, por lo que el tiempo que emplear&aacute;n para su generaci&oacute;n ser&aacute; mayor. Podr&aacute; encontrar informaci&oacute;n m&aacute;s detallada de este tipo de gr&aacute;ficas en el siguiente apartado.</dd>
diff --git a/pandora_console/include/help/es/help_history_database.php b/pandora_console/include/help/es/help_history_database.php
index 4a4448282c..6741a9e3a1 100644
--- a/pandora_console/include/help/es/help_history_database.php
+++ b/pandora_console/include/help/es/help_history_database.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Base de datos de histórico</h1>
 
-Una base de datos de histórico es una base de datos a la que se mueven datos antiguos de módulos para mejorar la respuesta de la base de datos principal de Pandora FMS. Estos datos seguirán estando disponibles para la consola de Pandora FMS de forma transparente al ver informes, gráficas de módulos etc. 
+Una base de datos de histórico es una base de datos a la que se mueven datos antiguos de módulos para mejorar la respuesta de la base de datos principal de <?php echo get_product_name();?>. Estos datos seguirán estando disponibles para la consola de <?php echo get_product_name();?> de forma transparente al ver informes, gráficas de módulos etc. 
 <br><br>
 <b>CONFIGURANDO UNA BASE DE DATOS DE HISTÓRICO</b>
 <br><br>
@@ -14,15 +14,15 @@ Para configurar una base de datos de histórico siga los siguientes pasos:
 <ol>
 <li>Cree la nueva base de datos de histórico.  
 <br><br>
-<li>Cree las tablas necesarias en la nueva base de datos. Puede utilizar el script pandoradb.sql incluido en la consola de Pandora FMS:  
+<li>Cree las tablas necesarias en la nueva base de datos. Puede utilizar el script DB Tool incluido en la consola de <?php echo get_product_name();?>:  
 <br><br>
 <i>cat pandoradb.sql | mysql -u user -p -D history_db</i>
 <br><br>
-<li>Dar los permisos necesarios para que el usuario de pandora tenga acceso a la base de datos de histórico
+<li>Dar los permisos necesarios para que el usuario de <?php echo get_product_name();?> tenga acceso a la base de datos de histórico
 <br><br>
 <i>Mysql Example: GRANT ALL PRIVILEGES ON pandora.* TO 'pandora'@'IP' IDENTIFIED BY 'password'</i>
 <br><br>
-<li>En la consola de Pandora FMS vaya a Setup->History database y configure el host, port, database name, user y password de la nueva base de datos.
+<li>En la consola de <?php echo get_product_name();?> vaya a Setup->History database y configure el host, port, database name, user y password de la nueva base de datos.
 </ol>
 <br><br>
 <?php html_print_image ("images/help/historyddbb.png", false, array('width' => '550px')); ?>
diff --git a/pandora_console/include/help/es/help_ipam.php b/pandora_console/include/help/es/help_ipam.php
index 2cfca4a2c1..afe1647d39 100755
--- a/pandora_console/include/help/es/help_ipam.php
+++ b/pandora_console/include/help/es/help_ipam.php
@@ -73,13 +73,13 @@ Cada dirección tendrá un icono grande que nos aportará información:<br><br>
 Cada dirección tendrá en la parte inferior derecha un enlace para editarla, si disponemos de privilegios suficientes. Así mismo, en la parte inferior izquierda, tendrá un pequeño icono indicando el sistema operativo asociado. 
 En el caso de las direcciones desactivadas, el icono del sistema operativo se verá sustituido por el siguiente icono:<br><br><img src="../images/delete.png" style="width:18px;"><br><br>
 Si hacemos click en el icono principal, se abrirá una ventana modal con toda la información de la IP, incluyendo agente y sistema operativo asociados, configuración y el seguimiento de cuando se creó, editó por el usuario o fue chequeado por el servidor por última vez. En esta vista también se podrá hacer un ping a dicha dirección*.<br><br>
-<b>* El ping se realiza desde la máquina donde esté instalada la consola de Pandora FMS.</b>
+<b>* El ping se realiza desde la máquina donde esté instalada la consola de <?php echo get_product_name();?>.</b>
 
 <h3>Vista de edición</h3>
 Si se tienen los permisos suficientes se podrá acceder a la vista de edición, donde las IPs aparecerán mostradas en forma de lista. Se podrá filtrar para mostrar las direcciones deseadas, hacer cambios 
 en ellas y actualizar todas a la vez.<br><br>
 
-Algunos campos, se rellenan automáticamente por el script de reconocimiento, como el nombre de host, el agente de Pandora FMS asociado y el sistema operativo. Podemos definir estos campos como manuales* y editarlos.<br><br>
+Algunos campos, se rellenan automáticamente por el script de reconocimiento, como el nombre de host, el agente de <?php echo get_product_name();?> asociado y el sistema operativo. Podemos definir estos campos como manuales* y editarlos.<br><br>
 
 <table width=100%>
 <tr>
diff --git a/pandora_console/include/help/es/help_main_help.php b/pandora_console/include/help/es/help_main_help.php
index 29b3fffe65..dfb00e176c 100644
--- a/pandora_console/include/help/es/help_main_help.php
+++ b/pandora_console/include/help/es/help_main_help.php
@@ -3,10 +3,10 @@
  * @package Include/help/en
  */
 ?>
-<h1>Pandora FMS - Índice de la ayuda</h1>
+<h1><?php echo get_product_name();?> - Índice de la ayuda</h1>
 <h3>Introdución</h3>
 <p>
-Esta es la ayuda online para la consola de Pandora FMS. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar Pandora FMS. La documentación oficial de Pandora FMS son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
+Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
 
 <br><br>
 <a href="http://pandorafms.com/pandora/doc/"><b>Descargue la documentación oficial</b></a>
diff --git a/pandora_console/include/help/es/help_manage_alert_list.php b/pandora_console/include/help/es/help_manage_alert_list.php
index f3b307f3e3..a3071d9408 100644
--- a/pandora_console/include/help/es/help_manage_alert_list.php
+++ b/pandora_console/include/help/es/help_manage_alert_list.php
@@ -6,7 +6,7 @@
 <h1>Alerts</h1>
 
 <p>
-Las Alertas en Pandora FMS reacionan a un valor "fuera de rango" de un módulo. La alerta consiste en enviar un e-mail o un SMS al administrador, enviando un trap SNMP, escribir el indcidenete en el log del sistema en el fichero de log de Pandora FMS, etc. Basicamente, una alerta puede ser cualquier cosa que pueda ser disparada por un script configurado en el Sistema Operativo donde los servidores de Pandora FMS se ejecutan.
+Las Alertas en <?php echo get_product_name();?> reacionan a un valor "fuera de rango" de un módulo. La alerta consiste en enviar un e-mail o un SMS al administrador, enviando un trap SNMP, escribir el indcidenete en el log del sistema en el fichero de log de <?php echo get_product_name();?>, etc. Basicamente, una alerta puede ser cualquier cosa que pueda ser disparada por un script configurado en el Sistema Operativo donde los servidores de <?php echo get_product_name();?> se ejecutan.
 </p>
 
 <p>
diff --git a/pandora_console/include/help/es/help_manage_alerts.php b/pandora_console/include/help/es/help_manage_alerts.php
index f0334cede1..58cebfeff4 100644
--- a/pandora_console/include/help/es/help_manage_alerts.php
+++ b/pandora_console/include/help/es/help_manage_alerts.php
@@ -5,7 +5,7 @@
 ?>
 <h1>Alertas</h1>
 
-Las alertas en Pandora FMS reaccionan ante un valor &laquo;fuera de rango&raquo;. La alerta puede consistir del envío de un correo-e o un SMS al administrador, enviar un trap SNMP, escribir un incidente en el fichero <i>log</i> del sistema o en el <i>log</i> de Pandora FMS, etc. Básicamente, una alerta puede ser cualquier cosa que se pueda dispoarar desde un <i>script</i> configurado en el Sistema Operativo donde Pandora FMS se ejecuta.
+Las alertas en <?php echo get_product_name();?> reaccionan ante un valor &laquo;fuera de rango&raquo;. La alerta puede consistir del envío de un correo-e o un SMS al administrador, enviar un trap SNMP, escribir un incidente en el fichero <i>log</i> del sistema o en el <i>log</i> de <?php echo get_product_name();?>, etc. Básicamente, una alerta puede ser cualquier cosa que se pueda dispoarar desde un <i>script</i> configurado en el Sistema Operativo donde <?php echo get_product_name();?> se ejecuta.
 <br /><br />
 Los valores &laquo;_field1_&raquo;, &laquo;_field2_&raquo; y &laquo;_field3_&raquo; de las alertas personalizadsa se usan para construir el comando de línea que se ejecutará.
 <br /><br />
diff --git a/pandora_console/include/help/es/help_module_tokens.php b/pandora_console/include/help/es/help_module_tokens.php
index 160e48a4c2..e48292734c 100644
--- a/pandora_console/include/help/es/help_module_tokens.php
+++ b/pandora_console/include/help/es/help_module_tokens.php
@@ -241,7 +241,7 @@ module_end<br>
 <br>
 <b>Watchdog de procesos</b>
 <br><br>
-Un Watchdog es un sistema que permite actuar inmediatamente ante la caída de un proceso, generalmente, levantando el proceso que se ha caído. El agente de Windows de Pandora FMS, puede actuar como Watchdog ante la caída de un proceso, a esto le llamamos modo watchdog para procesos:
+Un Watchdog es un sistema que permite actuar inmediatamente ante la caída de un proceso, generalmente, levantando el proceso que se ha caído. El agente de Windows de <?php echo get_product_name();?>, puede actuar como Watchdog ante la caída de un proceso, a esto le llamamos modo watchdog para procesos:
 <br><br>
 Dado que ejecutar un proceso puede requerir algunos parámetros, hay algunas opciones adicionales de configuración para este tipo de módulos. Es importante destacar que el modo watchdog solo funciona cuando el tipo de módulo es asíncrono. Veamos un ejemplo de configuración de un module_proc con watchdog:
 <br><br>
@@ -264,7 +264,7 @@ Esta es la definición de los parámetros adicionales para module_proc con watch
 <br><br>
     <i>module_startdelay:</i> Número de milisegundos que el módulo esperará antes de lanzar el proceso por primera vez. Si el proceso tarda mucho en arrancar, es bueno decirle al agente por medio de este parámetro que "espere" antes de empezar a comprobar de nuevo si el proceso se ha levantado. En este ejemplo espera 3 segundos. 
 <br><br>
-    <i>module_retrydelay:</i> Similar al anterior pero para caídas/reintentos posteriores, después de detectar una caída. Cuando Pandora detecta una caída, relanza el proceso, espera el nº de milisegundos indicados en este parámetro y vuelve a comprobar si el proceso ya esta levantado. 
+    <i>module_retrydelay:</i> Similar al anterior pero para caídas/reintentos posteriores, después de detectar una caída. Cuando <?php echo get_product_name();?> detecta una caída, relanza el proceso, espera el nº de milisegundos indicados en este parámetro y vuelve a comprobar si el proceso ya esta levantado. 
 <br><br>
 <b>module_cpuproc 'process'</b>
 <br><br>
diff --git a/pandora_console/include/help/es/help_network_map_enterprise.php b/pandora_console/include/help/es/help_network_map_enterprise.php
index 70d19af16f..06142c36b2 100644
--- a/pandora_console/include/help/es/help_network_map_enterprise.php
+++ b/pandora_console/include/help/es/help_network_map_enterprise.php
@@ -35,7 +35,7 @@
 
 <h2>Minimapa</h2>
 
-<p>El minimapa nos provee de una vista global que muestra toda la extensión del mapa, pero en una vista mucho mas pequeña, además que frente a la vista del mapa se muestra completamente todos los nodos pero sin estado y sin las relaciones. Excepto el punto ficticio de Pandora que se muestra en verde. Y además se muestra un recuadro rojo de la parte del mapa que se esta mostrando.</p>
+<p>El minimapa nos provee de una vista global que muestra toda la extensión del mapa, pero en una vista mucho mas pequeña, además que frente a la vista del mapa se muestra completamente todos los nodos pero sin estado y sin las relaciones. Excepto el punto ficticio de <?php echo get_product_name();?> que se muestra en verde. Y además se muestra un recuadro rojo de la parte del mapa que se esta mostrando.</p>
 
 <p>Se encuentra en la esquina superior izquierda, y se puede ocultar pulsando en el icono de la flecha.
 </p>
@@ -98,7 +98,7 @@
     <li><b>Tarea de reconocimiento de origen:</b> Nos permite seleccionar la tarea de reconocimiento para generar el mapa.</li>
     <li><b>IP:</b> Nos permite seleccionar la IP generar el mapa (solo generación por máscara ip).</li>
     <li><b>Método de generación del mapa de red:</b> el método de distribución de los nodos que formarán el mapa de red, por defecto es spring2, pero existen los siguientes:</li>
-        <p>- <i>Radial:</i> en el cual todos los nodos se dispondrán alrededor del nodo ficticio que simboliza el Pandora.<br>
+        <p>- <i>Radial:</i> en el cual todos los nodos se dispondrán alrededor del nodo ficticio que simboliza el <?php echo get_product_name();?>.<br>
         - <i>Circular:</i> en el cual se dispondrá los nodos en círculos concentricos.<br>
         - <i>Flat:</i> en el cual se dispondrá los nodos de forma arborescente.<br>
         - <i>spring1, spring2:</i> son variaciones del Flat. <br>
diff --git a/pandora_console/include/help/es/help_performance.php b/pandora_console/include/help/es/help_performance.php
index 7dd0c3977c..c442ed60f5 100644
--- a/pandora_console/include/help/es/help_performance.php
+++ b/pandora_console/include/help/es/help_performance.php
@@ -62,5 +62,5 @@ El gráfico de accesos del agente, renderiza el número de contactos por hora en
 <br><br>
 Campo donde se define el número máximo de días antes de borrar los módulos desconocidos. 
 <br><br>
-<i>**Con todos estos parámetros trabaja la herramienta pandora_db.pl. </i>
+<i>**Con todos estos parámetros trabaja la herramienta DB Tool. </i>
 
diff --git a/pandora_console/include/help/es/help_planned_downtime.php b/pandora_console/include/help/es/help_planned_downtime.php
index 6ab7308ede..dd1d65a5d8 100644
--- a/pandora_console/include/help/es/help_planned_downtime.php
+++ b/pandora_console/include/help/es/help_planned_downtime.php
@@ -12,5 +12,5 @@ Esta herramienta se usa para planear periodos de desconexión de la monitorizaci
 Es muy fácil de configurar, especifique la fecha y hora de inicio de la desconexión programada y la fecha hora del final. Después de rellenar los primeros campos, debe guardar la Desconexión programada y editarla, para establecer los agentes que se van a desconectar. También pued eeditar el resto de campos al editar la Desconexión programada.
 </p>
 <p>
-Cuando una desconexión programada se inicia, Pandora FMS automáticamente desactiva todos los agentes asignados a esa desconexión y no se procesa ningún dato ni alerta. Cuando la desconexión finaliza, Pandora FMS activará todos los agentes asignados a la desconexión.No puede borrar o modificar una instancia de desconexión cuando está activada, debe esperar a que finalice anes de hacer cualquier otra cosa en esa instancia. Por supuesto puede activar manualmente cualquier agente usando el diálogo de configuración del agente.
+Cuando una desconexión programada se inicia, <?php echo get_product_name();?> automáticamente desactiva todos los agentes asignados a esa desconexión y no se procesa ningún dato ni alerta. Cuando la desconexión finaliza, <?php echo get_product_name();?> activará todos los agentes asignados a la desconexión.No puede borrar o modificar una instancia de desconexión cuando está activada, debe esperar a que finalice anes de hacer cualquier otra cosa en esa instancia. Por supuesto puede activar manualmente cualquier agente usando el diálogo de configuración del agente.
 </p>
diff --git a/pandora_console/include/help/es/help_planned_downtime_time.php b/pandora_console/include/help/es/help_planned_downtime_time.php
index cb4af40bfc..c44a49c7ce 100644
--- a/pandora_console/include/help/es/help_planned_downtime_time.php
+++ b/pandora_console/include/help/es/help_planned_downtime_time.php
@@ -9,7 +9,7 @@
 
 <p>
 	El formato de la fecha debe ser año/mes/día y el del tiempo hora:minuto:segundo.
-	Se pueden crear paradas planificadas en fechas pasadas, siempre que el administrador de Pandora FMS no haya deshabilitado esa opción.
+	Se pueden crear paradas planificadas en fechas pasadas, siempre que el administrador de <?php echo get_product_name();?> no haya deshabilitado esa opción.
 </p>
 
 <h2>Ejecución periódica</h2>
diff --git a/pandora_console/include/help/es/help_plugin_definition.php b/pandora_console/include/help/es/help_plugin_definition.php
index 83dde32601..78203ab89b 100644
--- a/pandora_console/include/help/es/help_plugin_definition.php
+++ b/pandora_console/include/help/es/help_plugin_definition.php
@@ -5,9 +5,9 @@
 ?>
 <h1>Registro de complementos</h1>
 
-A diferencia del resto de componentes, de forma predeterminada Pandora FMS no incluye ningún complemento pre-configurado, por lo tanto primero se deberá crear y configurar un complemento, para después añadírselo al módulo de un agente. No obstante Pandora FMS sí incluye complementos en los directorios de instalación, pero como ya se ha dicho no están configurados en la base de datos. 
+A diferencia del resto de componentes, de forma predeterminada <?php echo get_product_name();?> no incluye ningún complemento pre-configurado, por lo tanto primero se deberá crear y configurar un complemento, para después añadírselo al módulo de un agente. No obstante <?php echo get_product_name();?> sí incluye complementos en los directorios de instalación, pero como ya se ha dicho no están configurados en la base de datos. 
 <br><br>
-Para añadir un complemento existente a Pandora FMS, ir a la sección de administración de la consola, y en ella, pulsar sobre Manage servers; después pulsar Manage plugins: 
+Para añadir un complemento existente a <?php echo get_product_name();?>, ir a la sección de administración de la consola, y en ella, pulsar sobre Manage servers; después pulsar Manage plugins: 
 <br><br>
 Una vez en la pantalla de gestión de los complementos, pulsar el botón Create para crear un nuevo complemento, ya que no habrá ninguno.  
 <br><br>
@@ -19,7 +19,7 @@ Rellenar el formulario de creación de complementos con los siguientes datos:
 Nombre del plugin, en este caso Nmap.
 <br><br>
 <b>Plugin type </b><br>
-Hay dos tipos de complementos, los estándar (standard) y los de tipo Nagios. Los complementos estándar son scripts que ejecutan acciones y admiten parámetros. Los complementos de Nagios son, como su nombre indica, complementos de Nagios que se pueden usar en Pandora FMS. La diferencia estriba principalmente en que los plugins de nagios devuelven un error level para indicar si la prueba ha tenido éxito o no.
+Hay dos tipos de complementos, los estándar (standard) y los de tipo Nagios. Los complementos estándar son scripts que ejecutan acciones y admiten parámetros. Los complementos de Nagios son, como su nombre indica, complementos de Nagios que se pueden usar en <?php echo get_product_name();?>. La diferencia estriba principalmente en que los plugins de nagios devuelven un error level para indicar si la prueba ha tenido éxito o no.
 <br><br>
 Si quiere usar un plugin de tipo nagios y quiere obtener un dato, no un estado (Bien/Mal), puede utilizar un plugin de tipo nagios en el modo "Standard". 
 <br><br>
@@ -39,7 +39,7 @@ Descripción del complemento. Escribir una breve descripción, como por ejemplo:
 
 Es la ruta a donde está el comando del complemento. De forma predeterminada, si la instalación ha sido estándar, estarán en el directorio /usr/share/pandora_server/util/plugin/. Aunque puede ser cualquier ruta del sistema. Para este caso, escribir /usr/share/pandora_server/util/plugin/udp_nmap_plugin.sh en el campo.
 <br><br>
-El servidor de pandora ejecutará ese script, por lo que éste debe tener permisos de acceso y de ejecución sobre él. 
+El servidor de <?php echo get_product_name();?> ejecutará ese script, por lo que éste debe tener permisos de acceso y de ejecución sobre él. 
 <br><br>
 <b>Plug-in parameters</b><br>
 
diff --git a/pandora_console/include/help/es/help_plugin_macros.php b/pandora_console/include/help/es/help_plugin_macros.php
index ca6d462d32..701d15f35e 100644
--- a/pandora_console/include/help/es/help_plugin_macros.php
+++ b/pandora_console/include/help/es/help_plugin_macros.php
@@ -17,7 +17,7 @@ Las siguientes macros están disponibles:
 <li>_modulegroup_ : Nombre del grupo del módulo.</li>
 <li>_moduledescription_: Descripcion del modulo.</li>
 <li>_modulestatus_ : Estado del módulo.</li>
-<li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.</li>
+<li>_id_agent_: ID del agente, util para construir URL de acceso a la consola de <?php echo get_product_name();?>.</li>
 <li>_policy_: Nombre de la política a la que pertenece el módulo (si aplica).</li>
 <li>_interval_ : Intervalo de la ejecución del módulo. </li>
 
diff --git a/pandora_console/include/help/es/help_plugin_policy.php b/pandora_console/include/help/es/help_plugin_policy.php
index c68cbcdc88..a4e190f7fe 100644
--- a/pandora_console/include/help/es/help_plugin_policy.php
+++ b/pandora_console/include/help/es/help_plugin_policy.php
@@ -6,7 +6,7 @@
 
 <h1>Plugins de agente</h1>
 
-<p>A partir de Pandora FMS 5.0, con el editor de plugins en políticas se pueden propagar los plugins de agentes con facilidad.
+<p>Con el editor de plugins en políticas se pueden propagar los plugins de agentes con facilidad.
 <br><br>
 Se pueden añadir plugins de agente en una política para que se creen en cada agente local al ser aplicada. 
 <br><br>
diff --git a/pandora_console/include/help/es/help_profile.php b/pandora_console/include/help/es/help_profile.php
index 88d035914c..015d1b1157 100644
--- a/pandora_console/include/help/es/help_profile.php
+++ b/pandora_console/include/help/es/help_profile.php
@@ -6,7 +6,7 @@
 
 <h1>Perfil</h1>
 
-<p>Pandora FMS es una herramienta de gestión Web que permite que trabajen múltiples usuarios con diferentes permisos en múltiples grupos de agentes que hay definidos. En los perfiles se definen los permisos que puede tener un usuario.</p>
+<p><?php echo get_product_name();?> es una herramienta de gestión Web que permite que trabajen múltiples usuarios con diferentes permisos en múltiples grupos de agentes que hay definidos. En los perfiles se definen los permisos que puede tener un usuario.</p>
 
 
 <p>Esta lista define qué habilita cada perfil:</p>
diff --git a/pandora_console/include/help/es/help_recontask.php b/pandora_console/include/help/es/help_recontask.php
index 9c93de1a55..d0dc85d823 100644
--- a/pandora_console/include/help/es/help_recontask.php
+++ b/pandora_console/include/help/es/help_recontask.php
@@ -25,7 +25,7 @@ Red sobre la que realizar la exploración. Utiliza el formato de red / mascara d
 
 <b>Intervalo</b>
 <br>
-Intervalo de repetición de la búsqueda de equipos. No utilice intervalos muy cortos ya que recon explora una red enviando un Ping a cada dirección, si utiliza redes de exploracion muy amplias (por ejemplo una clase A) combinado con intervalos muy cortos (6 horas) estará provocando que Pandora FMS esté constantemente bombardeando la red con pings, cargandola e innecesariamente sobre cargando Pandora FMS.<br><br>
+Intervalo de repetición de la búsqueda de equipos. No utilice intervalos muy cortos ya que recon explora una red enviando un Ping a cada dirección, si utiliza redes de exploracion muy amplias (por ejemplo una clase A) combinado con intervalos muy cortos (6 horas) estará provocando que <?php echo get_product_name();?> esté constantemente bombardeando la red con pings, cargandola e innecesariamente sobre cargando <?php echo get_product_name();?>.<br><br>
 
 <b>Plantilla de módulos</b><br>
 
@@ -33,7 +33,7 @@ Plantilla de componentes que añadir a los equipos descubiertos. Cuando detecte
 
 <b>SO</b><br>
 
-Sistema operativo para reconocer. Si se selecciona uno en lugar de cualquiera (Any) sólo se añadirán los equipos con ese sistema operativo. Piense que en determiandas situaciones Pandora FMS puede equivocarse a la hora de detectar sistemas, ya que este tipo de "adivinación" se realiza con patrones estadísticos que en función de algunos factores ajenos pueden fallar (redes con filtrados, software de seguridad, versiones modificadas de los sistemas). Para poder utilizar con seguridad este método debe tener instalado Xprobe2 en su sistema.<br><br>
+Sistema operativo para reconocer. Si se selecciona uno en lugar de cualquiera (Any) sólo se añadirán los equipos con ese sistema operativo. Piense que en determiandas situaciones <?php echo get_product_name();?> puede equivocarse a la hora de detectar sistemas, ya que este tipo de "adivinación" se realiza con patrones estadísticos que en función de algunos factores ajenos pueden fallar (redes con filtrados, software de seguridad, versiones modificadas de los sistemas). Para poder utilizar con seguridad este método debe tener instalado Xprobe2 en su sistema.<br><br>
 
 <b>Puertos</b><br>
 
diff --git a/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php b/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php
index 96a0c586da..9e80d42a3e 100644
--- a/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php
+++ b/pandora_console/include/help/es/help_reporting_wizard_sla_tab.php
@@ -6,5 +6,5 @@
 
 <h1>Wizard SLA</h1>
 
-<p>Permite medir el nivel del servicio (Service Level Agreement) de todos los moduloes de Pandora FMS. En es este wizard puedes crear un informe SLA de muchas agentes.</p>
+<p>Permite medir el nivel del servicio (Service Level Agreement) de todos los moduloes de <?php echo get_product_name();?>. En es este wizard puedes crear un informe SLA de muchas agentes.</p>
 
diff --git a/pandora_console/include/help/es/help_reporting_wizard_tab.php b/pandora_console/include/help/es/help_reporting_wizard_tab.php
index b5a07a02e9..e49bc84b27 100644
--- a/pandora_console/include/help/es/help_reporting_wizard_tab.php
+++ b/pandora_console/include/help/es/help_reporting_wizard_tab.php
@@ -6,4 +6,4 @@
 
 <h1>Wizard</h1>
 
-<p>Esta pestaña pertenece a la versión Enterprise de Pandora, esta pestaña nos permite realizar de una forma automática con unos pocos click, y de una vez multitud de items para un informe, con configuraciones comunes pero aplicadas a multitud de agentes y o módulos.</p>
+<p>Esta pestaña pertenece a la versión Enterprise de <?php echo get_product_name();?>. Esta pestaña nos permite realizar de una forma automática con unos pocos click, y de una vez multitud de items para un informe, con configuraciones comunes pero aplicadas a multitud de agentes y o módulos.</p>
diff --git a/pandora_console/include/help/es/help_response_macros.php b/pandora_console/include/help/es/help_response_macros.php
index a32f99c8e1..8f88dca7f7 100644
--- a/pandora_console/include/help/es/help_response_macros.php
+++ b/pandora_console/include/help/es/help_response_macros.php
@@ -19,7 +19,7 @@ Las macros aceptadas son las siguientes:
 <li><b>Id del evento:</b> _event_id_</li>
 <li><b>Instrucciones del evento:</b> _event_instruction_</li>
 <li><b>Id de la criticidad del evento:</b> _event_severity_id_</li>
-<li><b>Gravedad del evento (traducido por la consola de Pandora):</b> _event_severity_text_</li>
+<li><b>Gravedad del evento (traducido por la consola de <?php echo get_product_name();?>):</b> _event_severity_text_</li>
 <li><b>Procedencia del evento:</b> _event_source_</li>
 <li><b>Estado del evento (Nuevo, validado o evento en proceso):</b> _event_status_</li>
 <li><b>Etiquetas del evento separadas por comas:</b> _event_tags_</li>
diff --git a/pandora_console/include/help/es/help_servers.php b/pandora_console/include/help/es/help_servers.php
index 6e262f13b3..c5ce08c1a3 100644
--- a/pandora_console/include/help/es/help_servers.php
+++ b/pandora_console/include/help/es/help_servers.php
@@ -6,11 +6,11 @@
 
 <h1>Gestion de servidores</h1>
 
-<p>Los servidores de Pandora FMS son los elementos encargados de realizar las comprobaciones existentes. Ellos las verifican y cambian el estado de las mismas en funcion de los resultados obtenidos. Tambien son los encargados de disparar las alertas que se establezcan para controlar el estado de los datos.</p>
+<p>Los servidores de <?php echo get_product_name();?> son los elementos encargados de realizar las comprobaciones existentes. Ellos las verifican y cambian el estado de las mismas en funcion de los resultados obtenidos. Tambien son los encargados de disparar las alertas que se establezcan para controlar el estado de los datos.</p>
 
-<p>El servidor de datos de Pandora FMS puede trabajar con alta disponibilidad y/o balanceo de carga. En una arquitectura muy grande, se pueden usar varios servidores de Pandora FMS a la vez, para poder manejar grandes volumenes de informacion distribuida por zonas geograficas o funcionales.</p>
+<p>El servidor de datos de <?php echo get_product_name();?> puede trabajar con alta disponibilidad y/o balanceo de carga. En una arquitectura muy grande, se pueden usar varios servidores de <?php echo get_product_name();?> a la vez, para poder manejar grandes volumenes de informacion distribuida por zonas geograficas o funcionales.</p>
 
-<p>Los servidores de Pandora FMS están siempre en funcionamiento y verifican permanentemente si algún elemento tiene algún problema. Si existe alguna alerta asociada al problema, esta ejecuta la acción definida, como por ejemplo enviar un SMS, un correo electrónico, o activar la ejecución de un script.</p>
+<p>Los servidores de <?php echo get_product_name();?> están siempre en funcionamiento y verifican permanentemente si algún elemento tiene algún problema. Si existe alguna alerta asociada al problema, esta ejecuta la acción definida, como por ejemplo enviar un SMS, un correo electrónico, o activar la ejecución de un script.</p>
 <ul>
 <li type="circle">Servidor datos</li>
 <li type="circle">Servidor de red</li>
diff --git a/pandora_console/include/help/es/help_service_elements_management.php b/pandora_console/include/help/es/help_service_elements_management.php
index 9f3d6c1f33..7602e1a145 100644
--- a/pandora_console/include/help/es/help_service_elements_management.php
+++ b/pandora_console/include/help/es/help_service_elements_management.php
@@ -3,7 +3,7 @@
  * @package Include/help/es
  */
 ?>
-<h1>Gestion de elementos de servicio</h1>
+<h1>Gestión de elementos de servicio</h1>
 
-<p>Esta vista muestra los modulos dentro del servicio actual.</p>
+<p>Esta vista muestra los módulos dentro del servicio actual.</p>
 
diff --git a/pandora_console/include/help/es/help_services_management.php b/pandora_console/include/help/es/help_services_management.php
index d0edb2ffc7..74947bf0d6 100644
--- a/pandora_console/include/help/es/help_services_management.php
+++ b/pandora_console/include/help/es/help_services_management.php
@@ -5,5 +5,5 @@
 ?>
 <h1>Gestion de servicios</h1>
 
-<p>Esta vista muestra todos los servicios disponibles para ser administrados. Tambien muestra los valores de estado critico, aviso, grupo, etc. de los servicios.</p>
+<p>Esta vista muestra todos los servicios disponibles para ser administrados. También muestra los valores de estado critico, aviso, grupo, etc. de los servicios.</p>
 
diff --git a/pandora_console/include/help/es/help_snmp_alert.php b/pandora_console/include/help/es/help_snmp_alert.php
index b545f0ad3d..9276a12896 100644
--- a/pandora_console/include/help/es/help_snmp_alert.php
+++ b/pandora_console/include/help/es/help_snmp_alert.php
@@ -6,5 +6,5 @@
 
 <h1>Alertas SNMP</h1>
 
-<p>Es posible asociar una alerta a un trap, asi Pandora FMS puede avisarnos de la llegada de un trap expecifico. Los traps SNMP no tienen relacion con el resto de sistema de alertas, aunque reulticen el sistema de alertas.</p>
+<p>Es posible asociar una alerta a un trap, asi P<?php echo get_product_name();?> puede avisarnos de la llegada de un trap expecifico. Los traps SNMP no tienen relacion con el resto de sistema de alertas, aunque reulticen el sistema de alertas.</p>
 
diff --git a/pandora_console/include/help/es/help_snmp_explorer.php b/pandora_console/include/help/es/help_snmp_explorer.php
index 14682b63a4..2f51f58a57 100644
--- a/pandora_console/include/help/es/help_snmp_explorer.php
+++ b/pandora_console/include/help/es/help_snmp_explorer.php
@@ -6,7 +6,7 @@
 <h1>SNMP Explorer</h1>
 
 <p>
-SNMP explorer es una extension que permite de una forma facil usar el comando SNMP Walk a los usuarios. SNMP Walk realiza una serie de comandos <i>getnexts</i> para poder recuperar informacion de la maquina objetivo de manera automatica.
+SNMP explorer es una extensión que permite de una forma fácil usar el comando SNMP Walk a los usuarios. SNMP Walk realiza una serie de comandos <i>getnexts</i> para poder recuperar información de la máquina objetivo de manera automatica.
 </p>
 
 
diff --git a/pandora_console/include/help/es/help_snmpcommunity.php b/pandora_console/include/help/es/help_snmpcommunity.php
index def2ff985e..79657daaa5 100644
--- a/pandora_console/include/help/es/help_snmpcommunity.php
+++ b/pandora_console/include/help/es/help_snmpcommunity.php
@@ -5,4 +5,4 @@
 ?>
 <h1>Comunidad SNMP</h1>
 
-Comunidad necesaria parra monitorizar un OID SNMP. 
+Comunidad necesaria para monitorizar un OID SNMP.
diff --git a/pandora_console/include/help/es/help_snmpoid.php b/pandora_console/include/help/es/help_snmpoid.php
index afd43da1b2..fb095bb10d 100644
--- a/pandora_console/include/help/es/help_snmpoid.php
+++ b/pandora_console/include/help/es/help_snmpoid.php
@@ -5,4 +5,4 @@
 ?>
 <h1>OID SNMP</h1>
 
-La OID SNMP del módulo. Si existe una MIB capaz de resolver el nombre en el servidor de red de Pandora FMS, entonces puede usar OID alfanumércias (ej. SNMPv2-MIB::sysDescr.0). Siempre se pueden usar OID numéricas (ej. 3.1.3.1.3.5.12.4.0.1), incluso si no hay una MIB específica.
\ No newline at end of file
+La OID SNMP del módulo. Si existe una MIB capaz de resolver el nombre en el servidor de red de <?php echo get_product_name();?>, entonces puede usar OID alfanumércias (ej. SNMPv2-MIB::sysDescr.0). Siempre se pueden usar OID numéricas (ej. 3.1.3.1.3.5.12.4.0.1), incluso si no hay una MIB específica.
\ No newline at end of file
diff --git a/pandora_console/include/help/es/help_snmpwalk.php b/pandora_console/include/help/es/help_snmpwalk.php
index de07ceef69..6e77a6807f 100644
--- a/pandora_console/include/help/es/help_snmpwalk.php
+++ b/pandora_console/include/help/es/help_snmpwalk.php
@@ -5,6 +5,6 @@
 ?>
 <h1>SNMP walk</h1>
 
-Pandora FMS también tiene un examinador SNMP simple que permite hacer un &laquo;walk&raquo; de un dispositivo remoto a través de un <i>SNMP walk</i>.
+<?php echo get_product_name();?> también tiene un examinador SNMP simple que permite hacer un &laquo;walk&raquo; de un dispositivo remoto a través de un <i>SNMP walk</i>.
 <br /><br />
-Hacer un &laquo;walk&raquo; (&laquo;SNMP Walk&raquo;) sobre un dispositivo hará que todas sus variables MIB estén disponibles, para que pueda elegir una. También puede introducir una MIB usando un OID numérico o un formato comprensible por humanos, si tiene la MIB correcta instalada en su servidor de red de Pandora FMS.
+Hacer un &laquo;walk&raquo; (&laquo;SNMP Walk&raquo;) sobre un dispositivo hará que todas sus variables MIB estén disponibles, para que pueda elegir una. También puede introducir una MIB usando un OID numérico o un formato comprensible por humanos, si tiene la MIB correcta instalada en su servidor de red de <?php echo get_product_name();?>.
diff --git a/pandora_console/include/help/es/help_tags_config.php b/pandora_console/include/help/es/help_tags_config.php
index 46a12a47db..72006b2743 100644
--- a/pandora_console/include/help/es/help_tags_config.php
+++ b/pandora_console/include/help/es/help_tags_config.php
@@ -3,7 +3,7 @@
  * @package Include/help/es
  */
 ?>
-<h1>Tags en Pandora FMS</h1>
+<h1>Tags en <?php echo get_product_name();?></h1>
 
 El acceso a los módulos se puede configurar con un sistema de Etiquetas o Tags. Se configuran unos tags en el sistema, se asignan a los módulos que se quiera. De esta forma se puede limitar el acceso a un usuario a los módulos con determinados tags.
 <br><br>
diff --git a/pandora_console/include/help/es/help_template_tab.php b/pandora_console/include/help/es/help_template_tab.php
index 0c3da0830b..957e5d02bd 100644
--- a/pandora_console/include/help/es/help_template_tab.php
+++ b/pandora_console/include/help/es/help_template_tab.php
@@ -4,5 +4,5 @@
 ?>
 
 <p>
-Las plantillas de modulos son agrupaciones de modulos de comprobaciones de red. Las plantillas pueden aplicarse directamente a los agentes, evitando tener que añrlos  uno a uno.
+Las plantillas de módulos son agrupaciones de módulos de comprobaciones de red. Las plantillas pueden aplicarse directamente a los agentes, evitando tener que añadirlos uno a uno.
 </p>
diff --git a/pandora_console/include/help/es/help_timesource.php b/pandora_console/include/help/es/help_timesource.php
index d75997227d..db2ea3a8e5 100644
--- a/pandora_console/include/help/es/help_timesource.php
+++ b/pandora_console/include/help/es/help_timesource.php
@@ -9,9 +9,9 @@
 Qué origen de tiempo usar. Esto puede ser (por el momento) el sistema local (&laquo;Sistema&raquo;) o la base de datos (&laquo;Base de datos&raquo;).
 </p>
 <p>
-Esto es útil cuando su base de datos no está en el mismo sistema que su servidor Web o los servidores de su Pandora FMS.
+Esto es útil cuando su base de datos no está en el mismo sistema que su servidor Web o los servidores de su <?php echo get_product_name();?>.
 En ese caso cualquier diferencia de tiempo calculará de forma errónea las diferencias de tiempo y marcas de tiempo.
-Debería usar NTP para sincronizar todos sus servidores de Pandora FMS y su servidor de MySQL.
+Debería usar NTP para sincronizar todos sus servidores de <?php echo get_product_name();?> y su servidor de MySQL.
 Usando estas preferencias no tendrá que sincronizar su servidor web, aún así se recomienda.
 </p>
 <p>
diff --git a/pandora_console/include/help/es/help_web_checks.php b/pandora_console/include/help/es/help_web_checks.php
index 051a16166f..ddb113ae63 100644
--- a/pandora_console/include/help/es/help_web_checks.php
+++ b/pandora_console/include/help/es/help_web_checks.php
@@ -6,7 +6,7 @@
 <h1>Monitorización WEB </h1>
 
 <p>
-La monitorización WEB avanzada es una funcionalidad que realiza el Servidor WEB de Goliat en la versión Enterprise de Pandora FMS.
+La monitorización WEB avanzada es una funcionalidad que realiza el Servidor WEB de Goliat en la versión Enterprise de <?php echo get_product_name();?>.
 
 <br><br>
 Este es un ejemplo del modulo Webcheck de GOLIAT:
diff --git a/pandora_console/include/help/es/help_wux_console.php b/pandora_console/include/help/es/help_wux_console.php
index f6f092d1e4..39ad49d70a 100644
--- a/pandora_console/include/help/es/help_wux_console.php
+++ b/pandora_console/include/help/es/help_wux_console.php
@@ -2,11 +2,11 @@
 <h2>Introducci&oacute;n</h2>
 
 <p>
-    Pandora WUX es un componente interno de Pandora FMS que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en Pandora FMS un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
+	<?php echo get_product_name();?> WUX es un componente interno de <?php echo get_product_name();?> que permite a los usuarios automatizar sus sesiones de navegaci&oacute;n web. Genera en <?php echo get_product_name();?> un informe con los resultados de las ejecuciones, tiempos empleados, y capturas con los posibles errores encontrados. Es capaz de dividir las sesiones de navegaci&oacute;n en fases para simplificar la vista y depurar posibles cuellos de botella.
 </p>
 
 <p>
-    Pandora WUX utiliza el robot de navegaci&oacute;n de Pandora (PWR - Pandora Web Robot) para automatizar las sesiones de navegaci&oacute;n
+	<?php echo get_product_name();?> WUX utiliza el robot de navegaci&oacute;n de <?php echo get_product_name();?> (PWR - <?php echo get_product_name();?> Web Robot) para automatizar las sesiones de navegaci&oacute;n
 </p>
 
 <h2>Grabar una sesi&oacute;n de navegaci&oacute;n web</h2>
@@ -114,13 +114,13 @@
 </p>
 
 <p>
-	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con Pandora WUX. El fichero resultante ser&aacute; un documento HTML que Pandora WUX interpretar&aacute;.
+	Una vez verificada la validez de la secuencia de navegaci&oacute;n, la guardaremos (Archivo -&gt; Save Test Case) para ejecutarla posteriormente con <?php echo get_product_name();?> WUX. El fichero resultante ser&aacute; un documento HTML que <?php echo get_product_name();?> WUX interpretar&aacute;.
 </p>
 
-<h4>Grabar una sesi&oacute;n transaccional con Pandora WUX PWR</h4>
+<h4>Grabar una sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR</h4>
 
 <p>
-	Pandora WUX en modo PWR (Pandora Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
+	<?php echo get_product_name();?> WUX en modo PWR (<?php echo get_product_name();?> Web Robot) permite dividir la monitorizaci&oacute;n de la navegaci&oacute;n de un sitio web en m&uacute;ltiples m&oacute;dulos, que representar&aacute;n cada uno de los pasos realizados.
 </p>
 
 <p>
@@ -186,7 +186,7 @@
     En esta vista podemos encontrar toda la infomaci&oacute;n que el sistema WUX ha obtenido de la sesi&oacute;n de navegaci&oacute;n configurada: 
 </p>
 <p>
-    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con Pandora WUX PWR)</i>.
+    <b><u>Nota</u>:</b> Si hemos definido fases en nuestra sesi&oacute;n de navegaci&oacute;n, se mostrar&aacute;n en esta vista de una forma sencilla y clara (ver apartado de grabaci&oacute;n <i>sesi&oacute;n transaccional con <?php echo get_product_name();?> WUX PWR)</i>.
 </p>
 
 <p style="text-align: center">

From 4a8972a5d5eb0a1cbbc770d5fb1a7a88215b8cfe Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 14:30:51 +0200
Subject: [PATCH 23/56] [Rebranding] help ja

---
 .../include/help/ja/help_alert_command.php    |  2 +-
 .../include/help/ja/help_alert_compound.php   |  2 +-
 .../include/help/ja/help_alert_config.php     |  4 +--
 .../include/help/ja/help_alert_macros.php     |  2 +-
 .../include/help/ja/help_alert_recovery.php   |  2 +-
 .../include/help/ja/help_alerts_config.php    | 26 +++++++++----------
 .../help/ja/help_cascade_protection.php       |  4 +--
 .../include/help/ja/help_categories.php       |  2 +-
 .../help/ja/help_configure_gis_map.php        |  6 ++---
 .../ja/help_context_pandora_server_email.php  |  8 +++---
 .../include/help/ja/help_create_agent.php     |  2 +-
 pandora_console/include/help/ja/help_cron.php |  2 +-
 .../include/help/ja/help_custom_logo.php      |  2 +-
 .../include/help/ja/help_event_alert.php      |  4 +--
 .../include/help/ja/help_events_history.php   |  2 +-
 .../include/help/ja/help_export_server.php    |  4 +--
 .../include/help/ja/help_ff_threshold.php     |  2 +-
 .../include/help/ja/help_gis_map_builder.php  |  2 +-
 .../help/ja/help_gis_setup_map_connection.php |  2 +-
 .../include/help/ja/help_graphs.php           | 10 +++----
 .../include/help/ja/help_history_database.php |  6 ++---
 pandora_console/include/help/ja/help_ipam.php |  6 ++---
 .../include/help/ja/help_local_component.php  |  2 +-
 .../include/help/ja/help_main_help.php        |  4 +--
 .../help/ja/help_manage_alert_list.php        |  4 +--
 .../include/help/ja/help_manage_alerts.php    |  2 +-
 .../help/ja/help_network_map_enterprise.php   |  4 +--
 .../include/help/ja/help_performance.php      |  2 +-
 .../include/help/ja/help_planned_downtime.php |  2 +-
 .../help/ja/help_plugin_definition.php        |  8 +++---
 .../include/help/ja/help_plugin_policy.php    |  2 +-
 .../include/help/ja/help_recontask.php        |  4 +--
 .../help/ja/help_reporting_wizard_sla_tab.php |  2 +-
 .../include/help/ja/help_response_macros.php  |  2 +-
 .../include/help/ja/help_servers.php          |  6 ++---
 .../include/help/ja/help_snmp_alert.php       |  2 +-
 .../include/help/ja/help_snmpoid.php          |  2 +-
 .../include/help/ja/help_snmpwalk.php         |  4 +--
 .../include/help/ja/help_tags_config.php      |  2 +-
 .../include/help/ja/help_timesource.php       |  4 +--
 .../help_visual_console_editor_editor_tab.php |  2 +-
 ...help_visual_console_editor_preview_tab.php |  2 +-
 .../include/help/ja/help_web_checks.php       |  2 +-
 43 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/pandora_console/include/help/ja/help_alert_command.php b/pandora_console/include/help/ja/help_alert_command.php
index 3790ba9ccd..b8eeeedee5 100644
--- a/pandora_console/include/help/ja/help_alert_command.php
+++ b/pandora_console/include/help/ja/help_alert_command.php
@@ -6,4 +6,4 @@
 
 <h1>アラートコマンド</h1>
 
-<p>&#34;しきい値を越えた場合&#34;の Pandora FMS の動作には、syslog への記録、e-mail、SMS 送信や、Pandora FMS が動作するマシンでの任意のスクリプトの実行など、さまざまな種類があります。</p>
+<p>&#34;しきい値を越えた場合&#34;の <?php echo get_product_name();?> の動作には、syslog への記録、e-mail、SMS 送信や、<?php echo get_product_name();?> が動作するマシンでの任意のスクリプトの実行など、さまざまな種類があります。</p>
diff --git a/pandora_console/include/help/ja/help_alert_compound.php b/pandora_console/include/help/ja/help_alert_compound.php
index c2115d1134..691a5853ca 100644
--- a/pandora_console/include/help/ja/help_alert_compound.php
+++ b/pandora_console/include/help/ja/help_alert_compound.php
@@ -6,4 +6,4 @@
 
 <h1>関連付けアラート</h1>
 
-<p>一つ以上のモジュールを使って Pandora FMS の動作をさせることができます。これらのモジュールは、同一エージェントや異なるエージェントからのどちらでも可能です。</p>
+<p>一つ以上のモジュールを使って <?php echo get_product_name();?> の動作をさせることができます。これらのモジュールは、同一エージェントや異なるエージェントからのどちらでも可能です。</p>
diff --git a/pandora_console/include/help/ja/help_alert_config.php b/pandora_console/include/help/ja/help_alert_config.php
index a59f445b4b..870591f83a 100644
--- a/pandora_console/include/help/ja/help_alert_config.php
+++ b/pandora_console/include/help/ja/help_alert_config.php
@@ -9,7 +9,7 @@
 
     <b>名前(Name):</b> アクションの名前。<br>
     <b>グループ(Group):</b> アクションのグループ。<br>
-    <br>コマンド(Command):</b> アラートが実行された時に利用されるコマンドの定義です。Pandora で定義されたコマンドを選択することができます。選択するコマンドによって、入力が必要なフィールドが異なります。<br>
+    <br>コマンド(Command):</b> アラートが実行された時に利用されるコマンドの定義です。<?php echo get_product_name();?> で定義されたコマンドを選択することができます。選択するコマンドによって、入力が必要なフィールドが異なります。<br>
     <b>閾値(Threshold):</b> アクション実行の閾値。<br>
     <b>コマンドプレビュー(Command Preview):</b> このフィールドには、システムが実行するコマンドが表示されます。編集はできません。<br>
     <b>フィールドX(Field X):</b> このフィールドでは、マクロ _field1_ から _field10_ までのマクロの値を定義します。これらは、必要に応じてコマンドで利用されます。これらのフィールドは、設定によりテキスト入力または選択となります。選択したコマンドに応じて、表示されるフィールドの数が変化します。以下に例を示します。<br><br>
@@ -49,7 +49,7 @@ email アクションを設定するには、_field1_ (送信先アドレス)、
     <li>_data_ : アラート発生時のモジュールのデータ(値)</li>
     <li>_email_tag_ : モジュールタグに関連付けられた Email。</li>
     <li>_event_cfX_ : (イベントアラートのみ) アラートを発報したイベントのカスタムフィールドのキー。 For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-    <li>_event_description_ :  (イベントアラートのみ) Pandora FMS イベントの説明 です</li>
+    <li>_event_description_ :  (イベントアラートのみ) <?php echo get_product_name();?> イベントの説明 です</li>
     <li>_event_extra_id_: (Only event alerts) Extra id.</li>
     <li>_event_id_ : (イベントアラートのみ) アラート発生元のイベントID</li>
     <li>_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li>
diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php
index 0c4b296ad7..85b1de7c46 100644
--- a/pandora_console/include/help/ja/help_alert_macros.php
+++ b/pandora_console/include/help/ja/help_alert_macros.php
@@ -33,7 +33,7 @@
     <li>_data_ : アラート発生時のモジュールのデータ(値)</li>
     <li>_email_tag_ : モジュールタグに関連付けられた Email。</li>
     <li>_event_cfX_ : (イベントアラートのみ) アラートを発報したイベントのカスタムフィールドのキー。 For example, if there is a custom field whose key is IPAM, its value can be obtained using the _event_cfIPAM_ macro.</li>
-    <li>_event_description_ :  (イベントアラートのみ) Pandora FMS イベントの説明 です</li>
+    <li>_event_description_ :  (イベントアラートのみ) <?php echo get_product_name();?> イベントの説明 です</li>
     <li>_event_extra_id_: (Only event alerts) Extra id.</li>
     <li>_event_id_ : (イベントアラートのみ) アラート発生元のイベントID</li>
     <li>_event_text_severity_ : (イベントアラートのみ) イベント(アラートの発生元)のテキストでの重要度 (Maintenance, Informational, Normal Minor, Warning, Major, Critical)</li>
diff --git a/pandora_console/include/help/ja/help_alert_recovery.php b/pandora_console/include/help/ja/help_alert_recovery.php
index d4cf9b5d41..b603045937 100644
--- a/pandora_console/include/help/ja/help_alert_recovery.php
+++ b/pandora_console/include/help/ja/help_alert_recovery.php
@@ -5,5 +5,5 @@
 ?>
 <h1>アラートリカバリ</h1>
 
-アラート状態がリカバーした時に、Pandora FMS が別のアラートを上げるかどうかを定義します。フィールド 1 は同じで、フィールド 2 とフィールド 3 に "[RECOVER]" が追加されます。
+アラート状態がリカバーした時に、<?php echo get_product_name();?> が別のアラートを上げるかどうかを定義します。フィールド 1 は同じで、フィールド 2 とフィールド 3 に "[RECOVER]" が追加されます。
 デフォルトでは無効に設定されています。
diff --git a/pandora_console/include/help/ja/help_alerts_config.php b/pandora_console/include/help/ja/help_alerts_config.php
index 93e008ff6e..36f2e51ff4 100644
--- a/pandora_console/include/help/ja/help_alerts_config.php
+++ b/pandora_console/include/help/ja/help_alerts_config.php
@@ -3,18 +3,18 @@
  * @package Include/help/ja
  */
 ?> 
- <h1>Pandora FMS アラート設定クイックガイド</h1>
+ <h1><?php echo get_product_name();?> アラート設定クイックガイド</h1>
 <br>
 
 <b>アラートシステムの概要</b><br><br>
 
-Pandora FMS のアラート定義は複雑だと良く言われます。バージョン 2.0 以前は、アラートの設定は簡単でした。個々のアラートで状態を定義し、それぞれの場合においてアクションが実施されなかった時に何をするかを定義していました。これは "直感的" です (しかし、それぞれが閾値の設定を持っており、多くの人の頭痛の種になっていました)。シンプルではありますが、良くは無いのではないでしょうか。<br><br>
+<?php echo get_product_name();?> のアラート定義は複雑だと良く言われます。バージョン 2.0 以前は、アラートの設定は簡単でした。個々のアラートで状態を定義し、それぞれの場合においてアクションが実施されなかった時に何をするかを定義していました。これは "直感的" です (しかし、それぞれが閾値の設定を持っており、多くの人の頭痛の種になっていました)。シンプルではありますが、良くは無いのではないでしょうか。<br><br>
 
-一人のユーザ (たくさんのエージェントをインストールし、Pandora FMS を良く利用していました) が、2000 のモジュール全てに対して、アラートを 設定 しなくてはいけないという点でとても大変であるということを言及しました。この点とその他問題のために、我々はアラートシステムをモジュール化し、アラートが発生したときに実行するアクション (アラートアクション) および、アクションによって実行されるコマンド (アラートコマンド) から、アラートを発生させる定義 (アラートテンプレート) を分割するよう改変を行いました。モジュールとアラートテンプレートの組み合わせにより、アラートが発生します。<br><br>
+一人のユーザ (たくさんのエージェントをインストールし、<?php echo get_product_name();?> を良く利用していました) が、2000 のモジュール全てに対して、アラートを 設定 しなくてはいけないという点でとても大変であるということを言及しました。この点とその他問題のために、我々はアラートシステムをモジュール化し、アラートが発生したときに実行するアクション (アラートアクション) および、アクションによって実行されるコマンド (アラートコマンド) から、アラートを発生させる定義 (アラートテンプレート) を分割するよう改変を行いました。モジュールとアラートテンプレートの組み合わせにより、アラートが発生します。<br><br>
 
 この方法で、"Host alive" というモジュールを持ち、"Host down" というアラートテンプレートが関連付けられた 1000 のシステムがあったとします。このとき、"Call to the operator" というアラートがデフォルトで実行されます。そして、オペレータへ通知する前に何回のアラート検知までを許容するか(何回目まではオペレータへ通知しないか)を変更したいと考えたとき、テンプレートの定義を変更するだけで実現できます。1000個のアラート設定を一つ一つ設定変更する必要はありません。<br><br>
 
-Pandora FMS で、何人かのユーザは、数十のマシンのみを管理していますが、数百を管理しているユーザもいます。また、数千ものシステムをモニタしているユーザもいます。我々は、Pandora FMS で、すべての種類の環境の管理を可能にしなければいけません。<br><br><br><br>
+<?php echo get_product_name();?> で、何人かのユーザは、数十のマシンのみを管理していますが、数百を管理しているユーザもいます。また、数千ものシステムをモニタしているユーザもいます。我々は、<?php echo get_product_name();?> で、すべての種類の環境の管理を可能にしなければいけません。<br><br><br><br>
 <b>アラートの仕組み</b><br><br>
 
 <?php html_print_image ("images/help/alert01.png", false, array('width' => '550px')); ?>
@@ -84,9 +84,9 @@ Pandora FMS で、何人かのユーザは、数十のマシンのみを管理
 
 <?php html_print_image ("images/help/alert07.png", false, array('width' => '550px')); ?>
 
-以上で、どのような時が正常 (正常で緑表示) で、どのような時が異常 (障害で赤表示) かをシステムが認識するようになりました。次のすべきは、モジュールが障害状態になったときにメール通知する設定です。そのためには、Pandora FMS アラートシステムを利用します。<br><br>
+以上で、どのような時が正常 (正常で緑表示) で、どのような時が異常 (障害で赤表示) かをシステムが認識するようになりました。次のすべきは、モジュールが障害状態になったときにメール通知する設定です。そのためには、<?php echo get_product_name();?> アラートシステムを利用します。<br><br>
 
-この設定をするには、まずは、必要なコマンド (メールを送る) が一つあるということを認識する必要があります。この例では、Pandora FMS にあらかじめ定義されているメール送信コマンドを利用するので簡単です。 <br><br>
+この設定をするには、まずは、必要なコマンド (メールを送る) が一つあるということを認識する必要があります。この例では、<?php echo get_product_name();?> にあらかじめ定義されているメール送信コマンドを利用するので簡単です。 <br><br>
 
 <b>アラートの設定</b><br><br>
 
@@ -94,7 +94,7 @@ Pandora FMS で、何人かのユーザは、数十のマシンのみを管理
 
 <?php html_print_image ("images/help/alert08.png", false, array('width' => '550px')); ?>
 
-このアクションでは、eMail というメールを送信するコマンドを使います。これはとても簡単で、一つのフィールド (フィールド 1) だけ設定すれば良く、他の 2つの設定は不要です。フィールド1、2、3 は何かというのは、Pandora FMS のアラートシステムの中で最もわかりにくい部分の一つです。<br><br>
+このアクションでは、eMail というメールを送信するコマンドを使います。これはとても簡単で、一つのフィールド (フィールド 1) だけ設定すれば良く、他の 2つの設定は不要です。フィールド1、2、3 は何かというのは、<?php echo get_product_name();?> のアラートシステムの中で最もわかりにくい部分の一つです。<br><br>
 
 これらのフィールドは、アラートテンプレートの情報をコマンド設定へ "渡す" ために利用されます。また、そこから、実際に実行されるコマンドに渡されます。つまり、テンプレートとコマンド設定の両方から、異なる情報を実行されるコマンドに与えることができます。この場合、コマンドに対してフィールド 1のみを指定し、フィールド 2 と 3 は設定していません。<br><br>
 
@@ -121,18 +121,18 @@ Pandora FMS で、何人かのユーザは、数十のマシンのみを管理
 
     <i>再通知間隔(Time threshhold):</i> デフォルトでは 1日です。例では 1日ですが、5分に設定すると、モジュールが常にダウン状態の場合、5分間隔でアラート通知されます。もし、1日 (24時間) に設定すると、ダウンしたときに、まず一度アラート通知します。モジュールが復旧し、再びダウンすると、再びアラート通知します。しかし、二度目のダウンからダウン状態が続いても、24時間以内であればアラートを通知しません。<br><br>
 
-    <i>最小アラート数(Min. Number of alerts):</i> Pandora FMS がアラートテンプレートで定義したアクションを実行する状態変化 (この例では、モジュールの障害状態) の回数です。この設定により、正常状態と障害状態を繰り返す大量のアラートが発生を避けることができます。ここに 1を設定すると、モジュールの一度の障害状態は無視します。0 を設定すると、モジュールの初回の障害状態でアラート通知がされます。<br><br>
+    <i>最小アラート数(Min. Number of alerts):</i> <?php echo get_product_name();?> がアラートテンプレートで定義したアクションを実行する状態変化 (この例では、モジュールの障害状態) の回数です。この設定により、正常状態と障害状態を繰り返す大量のアラートが発生を避けることができます。ここに 1を設定すると、モジュールの一度の障害状態は無視します。0 を設定すると、モジュールの初回の障害状態でアラート通知がされます。<br><br>
 
     <i>最大アラート数(Max. Number of alerts):</i> 1 は、アクションを一度だけ実行することを意味します。もし、ここに 10 を設定すると、アクションを 10回実行します。この設定により、アラートの実行回数を制限することができます。<br><br>
 
 再び、"フィールド1(field1)"、"フィールド2(field2)"、"フィールド3(field3)" があります。フィールド1(field1)には何も書かれていませんが、これによりアクションを設定したときに定義したものが使われます。フィールド2(field2)およびフィールド3(field3)は、メール送信のアクションで件名と本文として使われます。ここで、フィールド1(field1)は、受信アドレス (カンマ区切りで複数書けます) の定義をすることもできます。テンプレートは、マクロを使って件名と本文を定義します。この例では、次のようなメールが送信されます。("Farscape" というエージェントのモジュールを想定)<br><br>
 
 <i>To: sancho.lerena@notexist.ocm<br>
-Subject: [PANDORA] Farscape cpu_sys is in CRITICAL status with value 20<br>
+Subject: [MONITORING] Farscape cpu_sys is in CRITICAL status with value 20<br>
 Texto email:<br><br>
 
-This is an automated alert generated by Pandora FMS<br>
-Please contact your Pandora FMS for more information. *DO NOT* reply this email.<br></i><br>
+This is an automated alert generated by <?php echo get_product_name();?><br>
+Please contact your <?php echo get_product_name();?> for more information. *DO NOT* reply this email.<br></i><br>
 
 下に、前もって定義したデフォルトのアクションが表示されます。このテンプレートを利用する全てのアラートは、設定を変更しなければデフォルトでこの定義済アクションを利用します。<br><br>
 
@@ -173,7 +173,7 @@ Please contact your Pandora FMS for more information. *DO NOT* reply this email.
 
 <b>メール送信以外のアラートコマンドの利用</b><br><br>
 
-メール送信は、Pandora FMS の内部コマンドであり、フィールド1、フィールド2、フィールド3 はそれぞれメール送信先、件名、本文として使うように定義されており変更することはできません。では、別のアクションを自分で定義したい時はどうすれば良いでしょうか。<br><br>
+メール送信は、<?php echo get_product_name();?> の内部コマンドであり、フィールド1、フィールド2、フィールド3 はそれぞれメール送信先、件名、本文として使うように定義されており変更することはできません。では、別のアクションを自分で定義したい時はどうすれば良いでしょうか。<br><br>
 
 この場合は、新たなコマンドの定義画面へ行き、自分で定義を行います。検知したアラートそれぞれのログファイルを作成したいとします。ログファイルのフォーマットは次のようなものを想定します。<br><br>
 
@@ -196,4 +196,4 @@ Please contact your Pandora FMS for more information. *DO NOT* reply this email.
 
 アラートは、"farscape" エージェントの "cpu_sys" モジュールで、18:17:10 に発生したこと、また、現在のデータは "23.00" であり、アクションで設定した説明が含まれていることがわかります。<br><br>
 
-コマンド実行時に、フィールドやその他がどのように引き渡されて実行されたかは簡単にはわかりません。それを確認する簡単な方法は、pandora サーバの設定ファイル /etc/pandora/pandora_server.conf にて、デバッグトレースを有効にする (verbose 10) ことです。 そして、Pandora FMS サーバがどのようにコマンドを実行しているか確認するには、サーバを再起動し (/etc/init.d/pandora_server restart)、/var/log/pandora/pandora_server.log に出力されている定義されたアラートの実行ログを探します。<br><br>
+コマンド実行時に、フィールドやその他がどのように引き渡されて実行されたかは簡単にはわかりません。それを確認する簡単な方法は、pandora サーバの設定ファイル /etc/pandora/pandora_server.conf にて、デバッグトレースを有効にする (verbose 10) ことです。 そして、<?php echo get_product_name();?> サーバがどのようにコマンドを実行しているか確認するには、サーバを再起動し (/etc/init.d/pandora_server restart)、/var/log/pandora/pandora_server.log に出力されている定義されたアラートの実行ログを探します。<br><br>
diff --git a/pandora_console/include/help/ja/help_cascade_protection.php b/pandora_console/include/help/ja/help_cascade_protection.php
index 3dfcb88c9d..f8d28a6fc6 100644
--- a/pandora_console/include/help/ja/help_cascade_protection.php
+++ b/pandora_console/include/help/ja/help_cascade_protection.php
@@ -10,7 +10,7 @@
 <p>
 このオプションは、あるエージェントの障害により他のエージェントの状態が確認できなくなった時に、大量のアラートが上がるのを避けるために利用します。
 たとえば、途中のルータがダウンしたことにより、その先の機器が実際には正常稼働していたとしても疎通が取れなくなったような場合です。
-何も設定を行わないと、Pandora FMS は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
+何も設定を行わないと、<?php echo get_product_name();?> は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
 <br><br>
 エージェントで<i>関連障害検知抑制</i>を有効にすると、いずれかの親のエージェントで「障害」アラートが上がった場合は、その配下のエージェントではアラートは上がらなくなります。
 親エージェントが「障害」状態よりレベルの低いアラート状態の場合は、配下のエージェントのアラートも上がります。
@@ -29,7 +29,7 @@
 <p>
 このオプションは、あるエージェントの障害により他のエージェントの状態が確認できなくなった時に、大量のアラートが上がるのを避けるために利用します。
 たとえば、途中のルータがダウンしたことにより、その先の機器が実際には正常稼働していたとしても疎通が取れなくなったような場合です。
-何も設定を行わないと、Pandora FMS は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
+何も設定を行わないと、<?php echo get_product_name();?> は ICMP(ping)疎通確認を実施し、疎通が取れなくなった全てのエージェントをダウン状態と認識します。
 <br><br>
 モジュールで<i>関連障害検知抑制</i>を有効にすると、いずれかの親のエージェントのモジュールで「障害」アラートが上がった場合は、その配下のエージェントではアラートは上がらなくなります。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_categories.php b/pandora_console/include/help/ja/help_categories.php
index 22d9fdd54d..678f9f72a1 100644
--- a/pandora_console/include/help/ja/help_categories.php
+++ b/pandora_console/include/help/ja/help_categories.php
@@ -3,7 +3,7 @@
  * @package Include/help/ja
  */
 ?>
-<h1>Pandora FMS におけるカテゴリ</h1>
+<h1><?php echo get_product_name();?> におけるカテゴリ</h1>
 
 カテゴリはシステム上で設定され、選択されたモジュールに割り当てられます。<br>
 管理者のみが、カテゴリを作成したり編集したりできます。属するカテゴリに応じてモジュールを操作するのに利用できます。
diff --git a/pandora_console/include/help/ja/help_configure_gis_map.php b/pandora_console/include/help/ja/help_configure_gis_map.php
index 9f132e4e3a..93d5ec1e43 100644
--- a/pandora_console/include/help/ja/help_configure_gis_map.php
+++ b/pandora_console/include/help/ja/help_configure_gis_map.php
@@ -10,7 +10,7 @@
 </p>
 <h2>マップ名</h2>
 <p>
-それぞれのマップには Pandora FMS 内で区別するための名前を定義します。
+それぞれのマップには <?php echo get_product_name();?> 内で区別するための名前を定義します。
 </p>
 <h2>利用マップの選択</h2>
 <p>
@@ -19,8 +19,8 @@ GIS マップを設定するためには、少なくとも一つ選択されて
 <?php html_print_image("images/add.png", false, array("alt" => "Add")); ?>(追加)アイコンをクリックして、追加することも可能です。
 </p>
 <p>
-意図しない設定情報の再入力を防ぐために、利用マップが設定されると、それを Pandora FMS はデフォルトのマップとして利用するかどうか尋ねます。
-(ラジオボタンによって)デフォルトの利用マップが変更された場合は、それで良いか Pandora FMS は再度尋ねます。
+意図しない設定情報の再入力を防ぐために、利用マップが設定されると、それを <?php echo get_product_name();?> はデフォルトのマップとして利用するかどうか尋ねます。
+(ラジオボタンによって)デフォルトの利用マップが変更された場合は、それで良いか <?php echo get_product_name();?> は再度尋ねます。
 </p>
 <h2>マップパラメータ</h2>
 <p>
diff --git a/pandora_console/include/help/ja/help_context_pandora_server_email.php b/pandora_console/include/help/ja/help_context_pandora_server_email.php
index c811ea88b0..4acd60e574 100755
--- a/pandora_console/include/help/ja/help_context_pandora_server_email.php
+++ b/pandora_console/include/help/ja/help_context_pandora_server_email.php
@@ -3,14 +3,14 @@
  * @package Include/help/ja
  */
 ?>
-<h1>email アラートのための Pandora サーバ設定</h1>
-<p><i>"Pandora サーバ設定ファイル"</i>を編集する必要があります。通常は以下にあります。
+<h1>email アラートのための <?php echo get_product_name();?> サーバ設定</h1>
+<p><i>"<?php echo get_product_name();?> サーバ設定ファイル"</i>を編集する必要があります。通常は以下にあります。
 <pre>
 	/etc/pandora_server/pandora_server.conf
 </pre>
 次の値を設定します。
 <pre>
-# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+# mta_address: External Mailer (MTA) IP Address to be used by <?php echo get_product_name();?> internal email capabilities
 
 mta_address localhost
 
@@ -33,6 +33,6 @@ mta_auth LOGIN
 # mta_from Email address that sends the mail, by default is pandora@localhost 
 #           probably you need to change it to avoid problems with your antispam
 
-mta_from Pandora FMS <pandora@mydomain.com>
+mta_from <?php echo get_product_name();?> &lt;monitoring@mydomain.com&gt;
 </pre>
 </p>
diff --git a/pandora_console/include/help/ja/help_create_agent.php b/pandora_console/include/help/ja/help_create_agent.php
index 0d432d00f0..0d8ac45555 100644
--- a/pandora_console/include/help/ja/help_create_agent.php
+++ b/pandora_console/include/help/ja/help_create_agent.php
@@ -12,5 +12,5 @@
 "間隔" は、エージェントの実行間隔です。どの程度の頻度でエージェントがサーバにデータを送るかです。
 </p>
 <p>
-"サーバ" は、Pandora サーバで、エージェントから送られるデータを受け取ります。
+"サーバ" は、<?php echo get_product_name();?> サーバで、エージェントから送られるデータを受け取ります。
 </p>
diff --git a/pandora_console/include/help/ja/help_cron.php b/pandora_console/include/help/ja/help_cron.php
index 6608ae60cf..b5208694c0 100644
--- a/pandora_console/include/help/ja/help_cron.php
+++ b/pandora_console/include/help/ja/help_cron.php
@@ -9,7 +9,7 @@ Using the configuration parameter sets <b>Cron from</b> and <b>Cron to</b> makes
 it possible for a module to run only for certain periods of time. 
 The way in which it is configured is similar to the syntax of 
 <a style="font-size:14px;" href="https://en.wikipedia.org/wiki/Cron">cron</a>. 
-Just as they appear in the Pandora console, each one of the parameters  
+Just as they appear in the <?php echo get_product_name();?> console, each one of the parameters  
 has three options.
 
 <h4>Cron from: any</h4>
diff --git a/pandora_console/include/help/ja/help_custom_logo.php b/pandora_console/include/help/ja/help_custom_logo.php
index daa5704532..1fca279a7a 100644
--- a/pandora_console/include/help/ja/help_custom_logo.php
+++ b/pandora_console/include/help/ja/help_custom_logo.php
@@ -5,7 +5,7 @@
 ?>
 <h1>カスタムロゴ</h1>
 
-ここに指定した画像ファイルを、オリジナルロゴとして Pandora FMS のヘッダーに表示することができます。
+ここに指定した画像ファイルを、オリジナルロゴとして <?php echo get_product_name();?> のヘッダーに表示することができます。
 表示可能な画像ファイルは PNG 形式です。
 画像サイズは、206x47ピクセルに修正されます。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_event_alert.php b/pandora_console/include/help/ja/help_event_alert.php
index 62171b90d5..ea34c43d5c 100644
--- a/pandora_console/include/help/ja/help_event_alert.php
+++ b/pandora_console/include/help/ja/help_event_alert.php
@@ -6,7 +6,7 @@
 
 <h1>イベントアラート、イベント相関</h1>
 
-Pandora FMS バージョン 4.0 から、イベントにアラートを定義できるようになりました。より柔軟な完全に新たなアプローチです。これはエンタープライズ版の機能です。
+<?php echo get_product_name();?> バージョン 4.0 から、イベントにアラートを定義できるようになりました。より柔軟な完全に新たなアプローチです。これはエンタープライズ版の機能です。
 
 新たなイベントアラートを作成するには、システム管理メニューのイベントアラートメニューで作成ボタンをクリックします。 <br><br>
 
@@ -61,6 +61,6 @@ Pandora FMS バージョン 4.0 から、イベントにアラートを定義で
 <?php html_print_image ("images/help/event04.png", false, array('width' => '550px')); ?>
 
 
-<p>* Pandora FMS データベースに保存できるイベント数に関しては、pandora_server.conf ファイルの event_window パラメータにて定義します。この時間範囲を越えるイベントが発生した場合は、サーバは処理を行いません。そのため、サーバの設定よりも大きな時間間隔を設定しても意味がありません。 </p>
+<p>* <?php echo get_product_name();?> データベースに保存できるイベント数に関しては、pandora_server.conf ファイルの event_window パラメータにて定義します。この時間範囲を越えるイベントが発生した場合は、サーバは処理を行いません。そのため、サーバの設定よりも大きな時間間隔を設定しても意味がありません。 </p>
 
 
diff --git a/pandora_console/include/help/ja/help_events_history.php b/pandora_console/include/help/ja/help_events_history.php
index 68d7f1d29e..eed3001724 100644
--- a/pandora_console/include/help/ja/help_events_history.php
+++ b/pandora_console/include/help/ja/help_events_history.php
@@ -3,7 +3,7 @@
 */
 ?>
 
-<p> ヒストリイベントが有効の場合、削除スクリプト(pandora_db.pl)は、未承諾もしくは処理中(新しいもののみ)のイベントを削除する前にヒストリテーブルへコピーします。
+<p> ヒストリイベントが有効の場合、削除スクリプト(DB Tool)は、未承諾もしくは処理中(新しいもののみ)のイベントを削除する前にヒストリテーブルへコピーします。
 <br><br>これらのイベントは、ヒストリイベントビューで扱うことができます。このビューは、イベント画面の新しいタブからアクセスできます。
 </p>
 
diff --git a/pandora_console/include/help/ja/help_export_server.php b/pandora_console/include/help/ja/help_export_server.php
index d6f130c18c..1f98e92ec5 100644
--- a/pandora_console/include/help/ja/help_export_server.php
+++ b/pandora_console/include/help/ja/help_export_server.php
@@ -5,10 +5,10 @@
 ?>
 <h1>エクスポートサーバ</h1>
 
-<p>Pandora FMS エンタープライズ版の実装では、さまざまな情報をプロファイルに分割するように設計すれば、データスケーリング機能のエクスポートサーバで仮想的に無限のモニタリング情報を配布することができます。</p>
+<p><?php echo get_product_name();?> エンタープライズ版の実装では、さまざまな情報をプロファイルに分割するように設計すれば、データスケーリング機能のエクスポートサーバで仮想的に無限のモニタリング情報を配布することができます。</p>
 
 <ul>
-<li type="circle">名前: Pandora FMS サーバ名。</li>
+<li type="circle">名前: <?php echo get_product_name();?> サーバ名。</li>
 <li type="circle">エクスポートサーバ: データをエクスポートするのに使うエクスポートサーバを選択します。</li>
 <li type="circle">プレフィックス: 送信するデータのエージェント名に追加するプレフィックスです。例えば、"Farscape" という名前のエージェントがあり、エクスポートサーバのプレフィックスが "EU04" であれば、送信先のサーバでのエージェント名は、EU01-Farscape となります。</li>
 <li type="circle">間隔: 時間間隔および未解決のデータを送信する頻度(秒)を定義します。</li>
diff --git a/pandora_console/include/help/ja/help_ff_threshold.php b/pandora_console/include/help/ja/help_ff_threshold.php
index 3e25b90c37..ab8c881fe6 100644
--- a/pandora_console/include/help/ja/help_ff_threshold.php
+++ b/pandora_console/include/help/ja/help_ff_threshold.php
@@ -9,7 +9,7 @@
 <br>
 
 連続抑制回数は、状態変化を繰り返すようなデータを扱う場合に利用します。
-これを設定することにより、Pandora FMS にオリジナルの状態から連続何回データが変化した状態にあるかの判断をさせることができます。
+これを設定することにより、<?php echo get_product_name();?> にオリジナルの状態から連続何回データが変化した状態にあるかの判断をさせることができます。
 <br><br>
 例えば、あるホストへの ping でパケットロスがあったとします。
 このような場合、つぎのようなモニタ結果となります。
diff --git a/pandora_console/include/help/ja/help_gis_map_builder.php b/pandora_console/include/help/ja/help_gis_map_builder.php
index b96bf062f8..9274d12f15 100644
--- a/pandora_console/include/help/ja/help_gis_map_builder.php
+++ b/pandora_console/include/help/ja/help_gis_map_builder.php
@@ -8,7 +8,7 @@
 <p>
 このページでは定義済のマップ一覧を表示しています。
 それらの編集や削除、参照ができます。
-また、このページで、Pandora FMS の<strong>デフォルトマップ</strong>が定義されています。
+また、このページで、<?php echo get_product_name();?> の<strong>デフォルトマップ</strong>が定義されています。
 </p>
 マップを作成するためには、利用マップの設定が必要です。
 利用マップの設定は、<strong>設定</strong>メニューで管理者権限にて実施してください。
diff --git a/pandora_console/include/help/ja/help_gis_setup_map_connection.php b/pandora_console/include/help/ja/help_gis_setup_map_connection.php
index 05854f7c5e..eb42b7a2a8 100644
--- a/pandora_console/include/help/ja/help_gis_setup_map_connection.php
+++ b/pandora_console/include/help/ja/help_gis_setup_map_connection.php
@@ -11,7 +11,7 @@
 
 <h2>マップの種類</h2>
 <p>
-現在、Pandora FMS は、OpenStreetマップ、Google マップ、静的画像の 3種類のマップをサポートしています。
+現在、<?php echo get_product_name();?> は、OpenStreetマップ、Google マップ、静的画像の 3種類のマップをサポートしています。
 </p>
 <h3>Open Street マップ</h3>
 <p>
diff --git a/pandora_console/include/help/ja/help_graphs.php b/pandora_console/include/help/ja/help_graphs.php
index 0fc35349a9..7e5136af91 100644
--- a/pandora_console/include/help/ja/help_graphs.php
+++ b/pandora_console/include/help/ja/help_graphs.php
@@ -48,11 +48,11 @@ div.img_title {
 </style>
 
 <body class="hlp_graphs">
-<h1>INTERPRETING GHRAPHS IN PANDORA FMS</h1>
+<h1>INTERPRETING GHRAPHS IN <?php echo get_product_name();?></h1>
 
 
-<p>In Pandora FMS, graphs represent the values a module has had during a given period.</p>
-<p>Due to the large amount of data that Pandora FMS stores, two different types of functionality are offered</p>
+<p>In <?php echo get_product_name();?>, graphs represent the values a module has had during a given period.</p>
+<p>Due to the large amount of data that <?php echo get_product_name();?> stores, two different types of functionality are offered</p>
 
 
 <h2>NORMAL GRAPHS</h2>
@@ -98,7 +98,7 @@ div.img_title {
 <dd>Shows indicator points with triggered alert information at the top.</dd>
 
 <dt>Show percentile</dt>
-<dd>Adds a graph that indicates the percentile line (configurable in general visual options of Pandora).</dd>
+<dd>Adds a graph that indicates the percentile line (configurable in general visual options of <?php echo get_product_name();?>).</dd>
 
 <dt>Time comparison (superimposed)</dt>
 <dd>Displays the same graphic overlay, but in the period before the selected one. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown superimposed.</dd>
@@ -107,7 +107,7 @@ div.img_title {
 <dd>Displays the same graph, but in the period before the selected one, in a separate area. For example, if we request a period of one week and activate this option, the week before the chosen one will also be shown.</dd>
 
 <dt>Display unknown graphic</dt>
-<dd>It shows boxes in grey shading covering the periods in which Pandora FMS cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
+<dd>It shows boxes in grey shading covering the periods in which <?php echo get_product_name();?> cannot guarantee the module's status, either due to data loss, disconnection of a software agent, etc.</dd>
 
 <dt>Show Full Scale Graph (TIP)</dt>
 <dd>Switches the creation mode from "normal" to "TIP". In this mode, the graphs will show real data rather than approximations, so the time it will take to generate them will be longer. More detailed information on this type of graphs can be found in the following section.</dd>
diff --git a/pandora_console/include/help/ja/help_history_database.php b/pandora_console/include/help/ja/help_history_database.php
index e2c2bad982..9ece6b5070 100644
--- a/pandora_console/include/help/ja/help_history_database.php
+++ b/pandora_console/include/help/ja/help_history_database.php
@@ -5,7 +5,7 @@
 ?>
 <h1>ヒストリデータベース</h1>
 
-ヒストリデータベースは、メインの Pandora FMS データベースの応答速度を確保するために、古いモジュールデータを毎日移動させるためのデータベースです。データは、Pandora FMS コンソールでレポートやグラフを表示するときにシームレスに参照できます。
+ヒストリデータベースは、メインの <?php echo get_product_name();?> データベースの応答速度を確保するために、古いモジュールデータを毎日移動させるためのデータベースです。データは、<?php echo get_product_name();?> コンソールでレポートやグラフを表示するときにシームレスに参照できます。
 <br><br>
 <b>ヒストリデータベースの設定</b>
 <br><br>
@@ -14,7 +14,7 @@
 <ol>
 <li>新たなヒストリデータベースの作成
 <br><br>
-<li>新たなデータベースに必要なテーブルを作成します。Pandora FMS コンソールと共に提供されている pandoradb.sql スクリプトが利用できます。
+<li>新たなデータベースに必要なテーブルを作成します。<?php echo get_product_name();?> コンソールと共に提供されている DB Tool スクリプトが利用できます。
 <br><br>
 <i>cat pandoradb.sql | mysql -u user -p -D history_db</i>
 <br><br>
@@ -22,7 +22,7 @@
 <br><br>
 <i>Mysql Example: GRANT ALL PRIVILEGES ON pandora.* TO 'pandora'@'IP' IDENTIFIED BY 'password'</i>
 <br><br>
-<li>Pandora FMS コンソールの 設定(Setup) -> ヒストリデータベース(History database) のメニューへ行き、ホスト名、ポート番号、データベース名および、新たなデータベースのユーザ名とパスワードを入力します。
+<li><?php echo get_product_name();?> コンソールの 設定(Setup) -> ヒストリデータベース(History database) のメニューへ行き、ホスト名、ポート番号、データベース名および、新たなデータベースのユーザ名とパスワードを入力します。
 </ol>
 <br><br>
 <?php html_print_image ("images/help/historyddbb.png", false, array('width' => '550px')); ?>
diff --git a/pandora_console/include/help/ja/help_ipam.php b/pandora_console/include/help/ja/help_ipam.php
index 18198e410b..e06a6654ae 100644
--- a/pandora_console/include/help/ja/help_ipam.php
+++ b/pandora_console/include/help/ja/help_ipam.php
@@ -5,9 +5,9 @@
 ?>
 <h1>IP アドレス管理 (IPAM)</h1>
 <br>
-IPAM 拡張を利用して、指定したネットワークのホストの管理、検出、変更イベントの検出をすることができます。IP アドレス(IPv4 または IPv6)が変更された場合、ホスト(ping応答)やホスト名(DNS名前解決の利用)が存在するかどうかを知ることができます。また、OS の検出および、現在割り当てられている IP アドレスを追加することにより、現在の Pandora FMS エージェントに IP アドレスをリンクすることができます。IPAM 拡張は、ベースに自動検出サーバおよび自動検出スクリプトを利用します。ただし、何の設定も要りません。IPAM 拡張は全てを自動実行します。
+IPAM 拡張を利用して、指定したネットワークのホストの管理、検出、変更イベントの検出をすることができます。IP アドレス(IPv4 または IPv6)が変更された場合、ホスト(ping応答)やホスト名(DNS名前解決の利用)が存在するかどうかを知ることができます。また、OS の検出および、現在割り当てられている IP アドレスを追加することにより、現在の <?php echo get_product_name();?> エージェントに IP アドレスをリンクすることができます。IPAM 拡張は、ベースに自動検出サーバおよび自動検出スクリプトを利用します。ただし、何の設定も要りません。IPAM 拡張は全てを自動実行します。
 <br><br>
-IP 管理は、Pandora FMS エージェントで設定している監視と並行して動作します。IP アドレス管理を IPAM 拡張と関連づけることも、そうしないことも、好きにできます。管理された IP アドレスは、変化時にオプションでイベントを生成することができます。
+IP 管理は、<?php echo get_product_name();?> エージェントで設定している監視と並行して動作します。IP アドレス管理を IPAM 拡張と関連づけることも、そうしないことも、好きにできます。管理された IP アドレスは、変化時にオプションでイベントを生成することができます。
 
 <h2>IP 検出</h2>
 ネットワークを設定する(ネットマスクまたはプレフィックスを利用)ことができ、ネットワークは、自動的に検出するかまたは、手動実行する設定ができます。これは、自動検出タスクを実行し、(IPv4 では nmap、IPv6 では ping を利用し)応答のある IP を検索します。ネットワーク検出の進捗、はステータス画面および自動検出サーバ画面でも見ることができます。
@@ -77,7 +77,7 @@ IP 管理は、Pandora FMS エージェントで設定している監視と並
 <h3>編集画面</h3>
 権限があれば、編集画面にアクセスできます。ここでは、IP アドレスが一覧で表示されます。必要な IP のみを表示するようにフィルタすることができます。すべて一度に変更および更新ができます。<br><br>
 
-Pandora FMS エージェントおよび OS がある場合、ホスト名などいくつかのフィールドは、自動検出スクリプトによって自動的に入力されています。これらのフィールドは "手動" に設定して編集することができます。<br><br>
+<?php echo get_product_name();?> エージェントおよび OS がある場合、ホスト名などいくつかのフィールドは、自動検出スクリプトによって自動的に入力されています。これらのフィールドは "手動" に設定して編集することができます。<br><br>
 
 <table width=100%>
 <tr>
diff --git a/pandora_console/include/help/ja/help_local_component.php b/pandora_console/include/help/ja/help_local_component.php
index 146d68015a..0b4621c626 100644
--- a/pandora_console/include/help/ja/help_local_component.php
+++ b/pandora_console/include/help/ja/help_local_component.php
@@ -6,4 +6,4 @@
 
 <h1>ローカルコンポーネント</h1>
 
-<p>ローカルコンポーネントは、テンプレートのようにエージェントに適用できる要素です。Pandora FMS エンタープライズ版では、これはポリシーを使ってリモートから自動的に適用できます。</p>
+<p>ローカルコンポーネントは、テンプレートのようにエージェントに適用できる要素です。<?php echo get_product_name();?> エンタープライズ版では、これはポリシーを使ってリモートから自動的に適用できます。</p>
diff --git a/pandora_console/include/help/ja/help_main_help.php b/pandora_console/include/help/ja/help_main_help.php
index 5f9edf46fa..54e64a3d81 100644
--- a/pandora_console/include/help/ja/help_main_help.php
+++ b/pandora_console/include/help/ja/help_main_help.php
@@ -3,10 +3,10 @@
  * @package Include/help/ja
  */
 ?>
-<h1>Pandora FMS - ヘルプ</h1>
+<h1><?php echo get_product_name();?> - ヘルプ</h1>
 <h3>概要</h3>
 <p>
-これは、Pandora FMS コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、Pandora FMS の使い方を教えることを意図しているわけではありません。Pandora FMS の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
+これは、<?php echo get_product_name();?> コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、<?php echo get_product_name();?> の使い方を教えることを意図しているわけではありません。<?php echo get_product_name();?> の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
 
 <br><br>
 <a href="http://pandorafms.com/pandora/doc/"><b>公式ドキュメントのダウンロード</b></a>
diff --git a/pandora_console/include/help/ja/help_manage_alert_list.php b/pandora_console/include/help/ja/help_manage_alert_list.php
index cef03ca9e1..254094f552 100644
--- a/pandora_console/include/help/ja/help_manage_alert_list.php
+++ b/pandora_console/include/help/ja/help_manage_alert_list.php
@@ -6,9 +6,9 @@
 <h1>アラート</h1>
 
 <p>
-Pandora FMS のアラートは、モジュールの値がしきい値を超えると動作します。アラート
+<?php echo get_product_name();?> のアラートは、モジュールの値がしきい値を超えると動作します。アラート
 では、管理者への e-mail や SMS 送信、SNMP トラップ送信、インシデント登録や Pando
-ra FMS ログファイルへの記録等ができます。基本的に、Pandora FMS サーバを実行して
+ra FMS ログファイルへの記録等ができます。基本的に、<?php echo get_product_name();?> サーバを実行して
 いる OS 上で実行できるスクリプトは何でも実行することができます。
 </p>
 
diff --git a/pandora_console/include/help/ja/help_manage_alerts.php b/pandora_console/include/help/ja/help_manage_alerts.php
index 72971a935d..c667e2bd2d 100644
--- a/pandora_console/include/help/ja/help_manage_alerts.php
+++ b/pandora_console/include/help/ja/help_manage_alerts.php
@@ -5,7 +5,7 @@
 ?>
 <h1>アラート</h1>
 
-Pandora FMS のアラートは、モジュールの値がしきい値を超えると動作します。アラートでは、管理者への e-mail や SMS 送信、SNMP トラップ送信、インシデント登録や Pandora FMS ログファイルへの記録等ができます。基本的に、Pandora FMS サーバを実行している OS 上で実行できるスクリプトは何でも実行することができます。
+<?php echo get_product_name();?> のアラートは、モジュールの値がしきい値を超えると動作します。アラートでは、管理者への e-mail や SMS 送信、SNMP トラップ送信、インシデント登録や <?php echo get_product_name();?> ログファイルへの記録等ができます。基本的に、<?php echo get_product_name();?> サーバを実行している OS 上で実行できるスクリプトは何でも実行することができます。
 <br /><br />
 実行するコマンドを作成する場合、"_field1_", "_field2_", "_field3_" という値を利用できます。
 <br /><br />
diff --git a/pandora_console/include/help/ja/help_network_map_enterprise.php b/pandora_console/include/help/ja/help_network_map_enterprise.php
index 4424172578..e035bb8bc8 100644
--- a/pandora_console/include/help/ja/help_network_map_enterprise.php
+++ b/pandora_console/include/help/ja/help_network_map_enterprise.php
@@ -6,7 +6,7 @@
 
 <h1>ネットワークマップコンソール</h1>
 
-<p>Pandora FMS Enterprise では、編集可能なネットワークマップを作成することができます。ネットワーク参照メニューにあるオープンソース版のものと比べるとより対話形式になっています。</p>
+<p><?php echo get_product_name();?> Enterprise では、編集可能なネットワークマップを作成することができます。ネットワーク参照メニューにあるオープンソース版のものと比べるとより対話形式になっています。</p>
 
 <p>オープンソース版に対して Enterprise 版のネットワークマップでは、次のような機能があります。</p>
 
@@ -71,7 +71,7 @@
 
 
     <p>エージェントの状態と同じ色の枠で表示されます。<br>
-    エージェント名は、Pandora のエージェントのページへのリンクになっています。<br>
+    エージェント名は、<?php echo get_product_name();?> のエージェントのページへのリンクになっています。<br>
     ウインドウ内には、不明状態ではないすべてのモジュールが、緑や赤といったモジュールの状態に応じて表示されます。<br>
         モジュールをクリックすると、モジュールのメインデータと共に簡単な説明が表示されます。<br>
     枠の中には、SNMP Proc のモジュールがあります。ネットワーク機器関連のエージェントで、ネットワークインタフェースの監視に使われます。<br></p>
diff --git a/pandora_console/include/help/ja/help_performance.php b/pandora_console/include/help/ja/help_performance.php
index 2bd7e4299f..c043c808cc 100644
--- a/pandora_console/include/help/ja/help_performance.php
+++ b/pandora_console/include/help/ja/help_performance.php
@@ -62,4 +62,4 @@ GIS データを削除せずに保持する日数。
 <br><br>
 不明モジュールを削除せずに保持する日数。
 <br><br>
-<i>**これらの全てのパラメータは、pandora_db.pl というツールを実行したときに利用されます。</i>
+<i>**これらの全てのパラメータは、DB Tool というツールを実行したときに利用されます。</i>
diff --git a/pandora_console/include/help/ja/help_planned_downtime.php b/pandora_console/include/help/ja/help_planned_downtime.php
index 7399a5977f..22eb78b6d9 100644
--- a/pandora_console/include/help/ja/help_planned_downtime.php
+++ b/pandora_console/include/help/ja/help_planned_downtime.php
@@ -14,7 +14,7 @@
 説明には任意の文章を入力できます。
 </p>
 <p>
-計画停止時間が来ると、Pandora FMS は自動的に該当するすべてのエージェントのアラートやデータ収集を停止します。
+計画停止時間が来ると、<?php echo get_product_name();?> は自動的に該当するすべてのエージェントのアラートやデータ収集を停止します。
 その時間が終了すると、該当する全てのエージェントを有効に戻します。
 計画停止時間になると、該当する設定は削除や編集ができなくなります。
 削除・編集には、計画停止時間の終了を待つ必要があります。
diff --git a/pandora_console/include/help/ja/help_plugin_definition.php b/pandora_console/include/help/ja/help_plugin_definition.php
index f1dbeeee09..6e536c32c8 100644
--- a/pandora_console/include/help/ja/help_plugin_definition.php
+++ b/pandora_console/include/help/ja/help_plugin_definition.php
@@ -5,9 +5,9 @@
 ?>
 <h1>プラグイン登録</h1>
 
-他のコンポーネントとは異なり、デフォルトでは Pandora FMS にあらかじめ設定されたコンポーネントが存在しません。そのため、エージェントのモジュールに追加できるよ、作成する必要があります。Pandora FMS のインストールディレクトリにはいくつかのプラグインが含まれていますが、前述の通りデータベースに設定はされていません。
+他のコンポーネントとは異なり、デフォルトでは <?php echo get_product_name();?> にあらかじめ設定されたコンポーネントが存在しません。そのため、エージェントのモジュールに追加できるよ、作成する必要があります。<?php echo get_product_name();?> のインストールディレクトリにはいくつかのプラグインが含まれていますが、前述の通りデータベースに設定はされていません。
 <br><br>
-Pandora FMS にすでに存在するプラグインを追加するには、コンソールの管理メニューで、サーバ管理をクリックします。その後、プラグイン管理をクリックします。
+<?php echo get_product_name();?> にすでに存在するプラグインを追加するには、コンソールの管理メニューで、サーバ管理をクリックします。その後、プラグイン管理をクリックします。
 <br><br>
 プラグイン管理画面に行ったら、追加ボタンをクリックします。それ以外のメニューはありません。
 <br><br>
@@ -18,7 +18,7 @@ Pandora FMS にすでに存在するプラグインを追加するには、コ
 プラグイン名です。ここでは、Nmap です。
 <br><br>
 <b>プラグインタイプ(Plugin type)</b><br>
-プラグインは、標準と Nagios の 2種類があります。標準プラグインは、処理を実行し値を取得するものです。Nagios プラグインは、その名の通り Pandora FMS で Nagios プラグインを利用できるようにするものです。Nagios プラグインの主な違いは、実行結果の成功・失敗を戻値で返すことです。
+プラグインは、標準と Nagios の 2種類があります。標準プラグインは、処理を実行し値を取得するものです。Nagios プラグインは、その名の通り <?php echo get_product_name();?> で Nagios プラグインを利用できるようにするものです。Nagios プラグインの主な違いは、実行結果の成功・失敗を戻値で返すことです。
 <br><br>
 Nagios プラグインを利用して正常・異常の状態ではなくデータを取得したい場合は、Nagios プラグインを "標準" モードで利用します。
 <br><br>
@@ -38,7 +38,7 @@ Nagios プラグインを利用して正常・異常の状態ではなくデー
 
 プラグインコマンドのパスを設定します。デフォルトのディレクトリは、標準のインストールをした場合、/usr/share/pandora_server/util/plugin/ です。システム上の任意のパスを指定することができます。この例では、/usr/share/pandora_server/util/plugin/udp_nmap_plugin.shin を設定しています。
 <br><br>
-Pandora サーバは、このスクリプトを実行します。このファイルは、アクセスし実行できるパーミッションになっている必要があります。
+<?php echo get_product_name();?> サーバは、このスクリプトを実行します。このファイルは、アクセスし実行できるパーミッションになっている必要があります。
 <br><br>
 <b>プラグインパラメータ(Plug-in parameters)</b><br>
 
diff --git a/pandora_console/include/help/ja/help_plugin_policy.php b/pandora_console/include/help/ja/help_plugin_policy.php
index 9468447249..0fb9333395 100644
--- a/pandora_console/include/help/ja/help_plugin_policy.php
+++ b/pandora_console/include/help/ja/help_plugin_policy.php
@@ -6,7 +6,7 @@
 
 <h1>エージェントプラグイン</h1>
 
-<p>Pandora FMS 5.0 から、ポリシーのプラグインエディタで、エージェントのプラグインを簡単に展開することができます。
+<p>ポリシーのプラグインエディタで、エージェントのプラグインを簡単に展開することができます。
 <br><br>
 ポリシーを適用したときに、ローカルエージェントにエージェントプラグイン作成するようポリシーに追加することができます。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_recontask.php b/pandora_console/include/help/ja/help_recontask.php
index d64a5bb200..f70113674a 100644
--- a/pandora_console/include/help/ja/help_recontask.php
+++ b/pandora_console/include/help/ja/help_recontask.php
@@ -26,7 +26,7 @@
 
 <b>間隔(Interval)</b>
 <br>
-検出処理の間隔です。自動検出処理では、ネットワーク上にそれぞれの IP アドレスに対して ping を送信するため、短い間隔は設定しないでください。自動検出対象ネットワークが非常に大きく(例えばクラスAのネットワーク)、間隔が短い(6時間)と、Pandora FMS はネットワークに大量の ping を投げ続け、ネットワークおよび Pandora FMS が高負荷になります。<br><br>
+検出処理の間隔です。自動検出処理では、ネットワーク上にそれぞれの IP アドレスに対して ping を送信するため、短い間隔は設定しないでください。自動検出対象ネットワークが非常に大きく(例えばクラスAのネットワーク)、間隔が短い(6時間)と、<?php echo get_product_name();?> はネットワークに大量の ping を投げ続け、ネットワークおよび <?php echo get_product_name();?> が高負荷になります。<br><br>
 
 <b>モジュールテンプレート(Module template)</b><br>
 
@@ -34,7 +34,7 @@
 
 <b>OS</b><br>
 
-認識するオペレーティングシステムです。任意(Any)の OS ではなく特定の OS を選択した場合、該当の OS のシステムのみ追加されます。静的なパラメータを元に実施されるため、(ネットワークがフィルタリングされている、セキュリティソフトウエアが導入されている、システムのバージョンが編集されているなど)特定の条件下では、システム検出時に Pandora FMS が誤認識する可能性があることに注意してください。この機能を利用するには、Xprobe2 がインストールされている必要があります。<br><br>
+認識するオペレーティングシステムです。任意(Any)の OS ではなく特定の OS を選択した場合、該当の OS のシステムのみ追加されます。静的なパラメータを元に実施されるため、(ネットワークがフィルタリングされている、セキュリティソフトウエアが導入されている、システムのバージョンが編集されているなど)特定の条件下では、システム検出時に <?php echo get_product_name();?> が誤認識する可能性があることに注意してください。この機能を利用するには、Xprobe2 がインストールされている必要があります。<br><br>
 
 <b>ポート(Ports)</b><br>
 
diff --git a/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php b/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php
index 7c16f20626..f3c11069d0 100644
--- a/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php
+++ b/pandora_console/include/help/ja/help_reporting_wizard_sla_tab.php
@@ -6,4 +6,4 @@
 
 <h1>SLA ウィザード</h1>
 
-<p>Pandora FMS でモニタリングしているサービスレベル (Service Level Agreement) を計測できます。このウィザードでは、複数のエージェントの SLA レポートを作成することができます。</p>
+<p><?php echo get_product_name();?> でモニタリングしているサービスレベル (Service Level Agreement) を計測できます。このウィザードでは、複数のエージェントの SLA レポートを作成することができます。</p>
diff --git a/pandora_console/include/help/ja/help_response_macros.php b/pandora_console/include/help/ja/help_response_macros.php
index 68603876e9..f5ae7ee4e1 100644
--- a/pandora_console/include/help/ja/help_response_macros.php
+++ b/pandora_console/include/help/ja/help_response_macros.php
@@ -18,7 +18,7 @@
 <li><b>イベントID:</b> _event_id_</li>
 <li><b>Event instructions:</b> _event_instruction_</li>
 <li><b>Event severity ID:</b> _event_severity_id_</li>
-<li><b>Event severity (translated by Pandora console):</b> _event_severity_text_</li>
+<li><b>Event severity (translated by <?php echo get_product_name();?> console):</b> _event_severity_text_</li>
 <li><b>Event source:</b> _event_source_</li>
 <li><b>Event status (new, validated or event in process):</b> _event_status_</li>
 <li><b>Event tags separated by commas:</b> _event_tags_</li>
diff --git a/pandora_console/include/help/ja/help_servers.php b/pandora_console/include/help/ja/help_servers.php
index 30a8dfa9e6..6bd01880a1 100644
--- a/pandora_console/include/help/ja/help_servers.php
+++ b/pandora_console/include/help/ja/help_servers.php
@@ -6,11 +6,11 @@
 
 <h1>サーバ管理</h1>
 
-<p>Pandora FMS サーバは、定義された監視を実行する要素です。監視をし結果に応じて状態を変更します。また、データの状態に応じてアラートを生成します。</p>
+<p><?php echo get_product_name();?> サーバは、定義された監視を実行する要素です。監視をし結果に応じて状態を変更します。また、データの状態に応じてアラートを生成します。</p>
 
-<p>Pandora FMS のデータサーバは、冗長化および負荷分散が可能です。大きなシステムでは、大量の機能を扱ったり物理的に分散した情報を扱うために、さまざまな Pandora FMS サーバを同時に利用可能です。</p>
+<p><?php echo get_product_name();?> のデータサーバは、冗長化および負荷分散が可能です。大きなシステムでは、大量の機能を扱ったり物理的に分散した情報を扱うために、さまざまな Pandora FMS サーバを同時に利用可能です。</p>
 
-<p>Pandora FMS サーバは、各要素に問題が無いか、また、アラートが定義されているかを常に確認します。何かあると、アラームに定義された SMS 送信、e-mail 送信、スクリプトの実行など、アクションを実行します。l</p>
+<p><?php echo get_product_name();?> サーバは、各要素に問題が無いか、また、アラートが定義されているかを常に確認します。何かあると、アラームに定義された SMS 送信、e-mail 送信、スクリプトの実行など、アクションを実行します。l</p>
 
 <ul>
 <li type="circle">データサーバ(Data Server)</li>
diff --git a/pandora_console/include/help/ja/help_snmp_alert.php b/pandora_console/include/help/ja/help_snmp_alert.php
index 9133117128..0d93311d22 100644
--- a/pandora_console/include/help/ja/help_snmp_alert.php
+++ b/pandora_console/include/help/ja/help_snmp_alert.php
@@ -6,4 +6,4 @@
 
 <h1>SNMPアラート</h1>
 
-<p>アラートとトラップを関連付けることができます。それにより、Pandora FMS は、特定のトラップ受信で警告を上げることができます。SNMPトラップは、アクションで再利用したとしても、システムアラートとは関係がありません。</p>
+<p>アラートとトラップを関連付けることができます。それにより、<?php echo get_product_name();?> は、特定のトラップ受信で警告を上げることができます。SNMPトラップは、アクションで再利用したとしても、システムアラートとは関係がありません。</p>
diff --git a/pandora_console/include/help/ja/help_snmpoid.php b/pandora_console/include/help/ja/help_snmpoid.php
index e05be3b733..f09c620a8c 100644
--- a/pandora_console/include/help/ja/help_snmpoid.php
+++ b/pandora_console/include/help/ja/help_snmpoid.php
@@ -5,5 +5,5 @@
 ?>
 <h1>SNMP OID</h1>
 
-Pandora FMS ネットワークサーバにて MIB の名前解決が可能の場合は、その名前で表示されます。(例: SNMPv2-MIB::sysDescr.0)
+<?php echo get_product_name();?> ネットワークサーバにて MIB の名前解決が可能の場合は、その名前で表示されます。(例: SNMPv2-MIB::sysDescr.0)
 MIB が無ければ、数字で表示されます。(例:3.1.3.1.3.5.12.4.0.1)
diff --git a/pandora_console/include/help/ja/help_snmpwalk.php b/pandora_console/include/help/ja/help_snmpwalk.php
index c0641b5e7c..fe9c6344f5 100644
--- a/pandora_console/include/help/ja/help_snmpwalk.php
+++ b/pandora_console/include/help/ja/help_snmpwalk.php
@@ -5,7 +5,7 @@
 ?>
 <h1>snmpwalk</h1>
 
-Pandora FMS は、簡易 SNMP ブラウザがあり、リモートノードに対して snmpwalk を実行することができます。
+<?php echo get_product_name();?> は、簡易 SNMP ブラウザがあり、リモートノードに対して snmpwalk を実行することができます。
 <br /><br />
 snmpwalk は全 MIB データを取得しますが、その中から一つを選択できます。
-また、OID を数値で入力したり、Pandora FMS ネットワークサーバに MIB がインストールされていれば、名称で入力することも可能です。
+また、OID を数値で入力したり、<?php echo get_product_name();?> ネットワークサーバに MIB がインストールされていれば、名称で入力することも可能です。
diff --git a/pandora_console/include/help/ja/help_tags_config.php b/pandora_console/include/help/ja/help_tags_config.php
index 6cc3a50134..f7845c394b 100644
--- a/pandora_console/include/help/ja/help_tags_config.php
+++ b/pandora_console/include/help/ja/help_tags_config.php
@@ -3,7 +3,7 @@
  * @package Include/help/ja
  */
 ?>
-<h1>Pandora FMS におけるタグ</h1>
+<h1><?php echo get_product_name();?> におけるタグ</h1>
 
 モジュールへのアクセス権をタグシステムにより設定することができます。タグはシステムで設定し、選択したモジュールに割り当てられます。これにより、ユーザのアクセスを特定のタグがついたモジュールに限定することができます。
 <br><br>
diff --git a/pandora_console/include/help/ja/help_timesource.php b/pandora_console/include/help/ja/help_timesource.php
index e5967f1625..90c858d781 100644
--- a/pandora_console/include/help/ja/help_timesource.php
+++ b/pandora_console/include/help/ja/help_timesource.php
@@ -9,8 +9,8 @@
 日時データソースに、システムの日時データかデータベースに記録されているデータかどちらをを利用するかを定義します。<br /><br />
 </p>
 <p>
-これは、データベースがウェブサーバや Pandora FMS サーバと異なるサーバで動作している場合で、時刻にずれが生じている場合に便利です。
-すべての Pandora サーバと MySQL サーバの時刻は NTP により同期すべきですが、この設定を利用することにより、必ずしもそうする必要がなくなります。
+これは、データベースがウェブサーバや <?php echo get_product_name();?> サーバと異なるサーバで動作している場合で、時刻にずれが生じている場合に便利です。
+すべての <?php echo get_product_name();?> サーバと MySQL サーバの時刻は NTP により同期すべきですが、この設定を利用することにより、必ずしもそうする必要がなくなります。
 </p>
 <p>
 注: データベースではクエリがキャッシュされますが、内部関数が呼ばれるかどうかに関わらずその時点のシステムタイムが返されますので、日時データは若干異なる場合があります。
diff --git a/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php b/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php
index 28526dca2c..9397ddaf48 100644
--- a/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php
+++ b/pandora_console/include/help/ja/help_visual_console_editor_editor_tab.php
@@ -12,5 +12,5 @@
         <li>ワークエリア (ここで、ビジュアルコンソールを作成します)</li>
         <li>オプションパレット (画面ショットでは表示されていません)</li>
 </ul>
-Pandora FMS バージョン 5.0.1 では、テキストのラベルを設定できます。また、テキスト内に (_VALUE_) マクロを使って値を定義することができます。
+<?php echo get_product_name();?> バージョン 5.0.1 では、テキストのラベルを設定できます。また、テキスト内に (_VALUE_) マクロを使って値を定義することができます。
 </p>
diff --git a/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php b/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php
index fcd9844c3c..46983fcd4d 100644
--- a/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php
+++ b/pandora_console/include/help/ja/help_visual_console_editor_preview_tab.php
@@ -6,4 +6,4 @@
 
 <h1>プレビュー</h1>
 
-<p>このタブは、Pandora コンソールのメニューをたどらずに作業結果を確認するのに便利です。ビジュアルコンソールビューは静的な表示です。そのため、要素に状態を含んでいたとしても、ビジュアルコンソールメニューから表示されるのと違い、それらは表示されません。</p>
+<p>このタブは、<?php echo get_product_name();?> コンソールのメニューをたどらずに作業結果を確認するのに便利です。ビジュアルコンソールビューは静的な表示です。そのため、要素に状態を含んでいたとしても、ビジュアルコンソールメニューから表示されるのと違い、それらは表示されません。</p>
diff --git a/pandora_console/include/help/ja/help_web_checks.php b/pandora_console/include/help/ja/help_web_checks.php
index 9c297a382b..ade3608367 100644
--- a/pandora_console/include/help/ja/help_web_checks.php
+++ b/pandora_console/include/help/ja/help_web_checks.php
@@ -6,7 +6,7 @@
 <h1>ウェブモニタリング</h1>
 
 <p>
-拡張ウェブモニタリングは、Pandora FMS エンタープライズ版の Goliat で動作する機能です。
+拡張ウェブモニタリングは、<?php echo get_product_name();?> エンタープライズ版の Goliat で動作する機能です。
 <br><br>
 以下に、GOLIAT ウェブチェックモジュールのサンプルを示します。
 <br>

From 52ec66d939de0364aa526c8f2804e267b812d7de Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 18 May 2018 14:47:15 +0200
Subject: [PATCH 24/56] [Rebranding] help ja dynamic_threshold

---
 pandora_console/include/help/ja/help_dynamic_threshold.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/help/ja/help_dynamic_threshold.php b/pandora_console/include/help/ja/help_dynamic_threshold.php
index f1a7ab5b87..2d6638b3bd 100644
--- a/pandora_console/include/help/ja/help_dynamic_threshold.php
+++ b/pandora_console/include/help/ja/help_dynamic_threshold.php
@@ -8,7 +8,7 @@
 <h2>動的しきい値の間隔</h2>
 
 <p>
-	動的しきい値の間隔フィールドには時間間隔を設定します。モジュールは、その期間中に取得したデータを返します。これにより、Pandora はサーバの設定に従って障害および警告状態しきい値の最小値を設定します。
+	動的しきい値の間隔フィールドには時間間隔を設定します。モジュールは、その期間中に取得したデータを返します。これにより、<?php echo get_product_name();?> はサーバの設定に従って障害および警告状態しきい値の最小値を設定します。
 	<br><br>
         デフォルトの設定では最小値<b>のみ</b>を設定します。最大値が 0 の場合は、設定された最小値から無限大の範囲を意味します。
 	<br><br>

From 2fa1fb5ea3b45dcc6188f2c4a157d15e08c15bed Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 09:49:44 +0200
Subject: [PATCH 25/56] [Rebranding] Fixed double safe input in product name
 and copyright notice

---
 pandora_console/include/functions_config.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 7a54b60679..fd27a72723 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -247,9 +247,9 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
-						if (!config_update_value ('rb_product_name', (string)get_parameter('rb_product_name')))
+						if (!config_update_value ('rb_product_name', get_parameter('rb_product_name')))
 							$error_update[] = __('Product name');
-						if (!config_update_value ('rb_copyright_notice', (string)get_parameter('rb_copyright_notice')))
+						if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice')))
 							$error_update[] = __('Copyright notice');
 
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
@@ -1051,6 +1051,14 @@ function config_process_config () {
 		config_update_value ('log_collector', 0);
 	}
 
+	if (!isset ($config['rb_product_name'])) {
+		config_update_value('rb_product_name', get_product_name());
+	}
+
+	if (!isset ($config['rb_copyright_notice'])) {
+		config_update_value('rb_copyright_notice', get_copyright_notice());
+	}
+
 	if (!isset ($config["reset_pass_option"])) {
 		config_update_value ('reset_pass_option', 0);
 	}

From ef07eff769c6a765cd7d3f5c130e8f8afcb95732 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 11:07:39 +0200
Subject: [PATCH 26/56] [Rebranding] Added enable update manager option

---
 pandora_console/godmode/menu.php             | 2 +-
 pandora_console/include/functions_config.php | 6 ++++++
 pandora_console/include/functions_db.php     | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 11f510349a..2735619b16 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -435,7 +435,7 @@ foreach ($rows as $row) {
 $menu_godmode["links"]["sub"] = $sub;
 
 // Update Manager
-if (check_acl ($config['id_user'], 0, "PM")) {
+if (check_acl ($config['id_user'], 0, "PM") && $config['enable_update_manager']) {
 	$menu_godmode["messages"]["text"] = __('Update manager');
 	$menu_godmode["messages"]["sec2"] = "";
 	$menu_godmode["messages"]["id"] = "god-um_messages";
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index fd27a72723..317e41e087 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -251,6 +251,8 @@ function config_update_config () {
 							$error_update[] = __('Product name');
 						if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice')))
 							$error_update[] = __('Copyright notice');
+						if (!config_update_value ('enable_update_manager', get_parameter('enable_update_manager')))
+							$error_update[] = __('Enable Update Manager');
 
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
@@ -1059,6 +1061,10 @@ function config_process_config () {
 		config_update_value('rb_copyright_notice', get_copyright_notice());
 	}
 
+	if (!isset ($config["enable_update_manager"])) {
+		config_update_value ('enable_update_manager', 1);
+	}
+
 	if (!isset ($config["reset_pass_option"])) {
 		config_update_value ('reset_pass_option', 0);
 	}
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 9acd28b98e..b069b4d993 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -1744,6 +1744,8 @@ function db_process_file ($path, $handle_error = true) {
  */
 function db_check_minor_relase_available () {
 	global $config;
+
+	if (!$config['enable_update_manager']) return false;
 	
 	$dir = $config["homedir"]."/extras/mr";
 	
@@ -1788,6 +1790,8 @@ function db_check_minor_relase_available () {
 function db_check_minor_relase_available_to_um ($package, $ent, $offline) {
 	global $config;
 	
+	if (!$config['enable_update_manager']) return false;
+
 	if (!$ent) {
 		$dir = $config['attachment_store'] . "/downloads/pandora_console/extras/mr";
 	}

From 3497132517de5d287d20dd641aea763b1bae9c55 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 11:56:16 +0200
Subject: [PATCH 27/56] [Rebranding] Moved rebranding to visual styles section

---
 .../godmode/setup/setup_visuals.php           | 14 +++++++++-
 pandora_console/include/functions_config.php  | 28 +++++++++----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 3e7eda10f1..d647bc89b1 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -258,7 +258,19 @@ if(enterprise_installed()) {
 	$table_styles->data[$row][0] = __('Support URL (login)');
 	$table_styles->data[$row][1] = html_print_input_text ('custom_support_url', $config["custom_support_url"], '', 50, 50, true);
 	$row++;
-}	
+}
+
+if(enterprise_installed()) {
+	$table_styles->data[$row][0] = __('Product name');
+	$table_styles->data[$row][1] = html_print_input_text('rb_product_name', get_product_name(), '', 30, 255, true);
+	$row++;
+}
+
+if(enterprise_installed()) {
+	$table_styles->data[$row][0] = __('Copyright notice');
+	$table_styles->data[$row][1] = html_print_input_text('rb_copyright_notice', get_copyright_notice(), '', 30, 255, true);
+	$row++;
+}
 
 $table_styles->data[$row][0] = __('Disable logo in graphs');
 $table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 317e41e087..b2460b39d3 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -247,10 +247,6 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
-						if (!config_update_value ('rb_product_name', get_parameter('rb_product_name')))
-							$error_update[] = __('Product name');
-						if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice')))
-							$error_update[] = __('Copyright notice');
 						if (!config_update_value ('enable_update_manager', get_parameter('enable_update_manager')))
 							$error_update[] = __('Enable Update Manager');
 
@@ -521,8 +517,12 @@ function config_update_config () {
 						$error_update[] = __('Custom Docs url');
 					if (!config_update_value ('custom_support_url', (string) get_parameter ('custom_support_url')))
 						$error_update[] = __('Custom support url');
-
-					if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
+					if (!config_update_value ('rb_product_name', (string) get_parameter ('rb_product_name')))
+						$error_update[] = __('Product name');
+					if (!config_update_value ('rb_copyright_notice', (string) get_parameter ('rb_copyright_notice')))
+						$error_update[] = __('Copyright notice');
+					
+						if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
 						$error_update[] = __('Custom logo metaconsole');
 					if (!config_update_value ('meta_custom_logo_login', (string) get_parameter ('meta_custom_logo_login')))
 						$error_update[] = __('Custom logo login metaconsole');
@@ -1053,14 +1053,6 @@ function config_process_config () {
 		config_update_value ('log_collector', 0);
 	}
 
-	if (!isset ($config['rb_product_name'])) {
-		config_update_value('rb_product_name', get_product_name());
-	}
-
-	if (!isset ($config['rb_copyright_notice'])) {
-		config_update_value('rb_copyright_notice', get_copyright_notice());
-	}
-
 	if (!isset ($config["enable_update_manager"])) {
 		config_update_value ('enable_update_manager', 1);
 	}
@@ -1219,6 +1211,14 @@ function config_process_config () {
 	if (!isset ($config["custom_support_url"])) {
 		config_update_value ('custom_support_url', 'https://support.artica.es');
 	}
+
+	if (!isset ($config['rb_product_name'])) {
+		config_update_value('rb_product_name', get_product_name());
+	}
+
+	if (!isset ($config['rb_copyright_notice'])) {
+		config_update_value('rb_copyright_notice', get_copyright_notice());
+	}
 	
 	if (!isset ($config["meta_custom_docs_url"])) {
 		config_update_value ('meta_custom_docs_url', 'http://wiki.pandorafms.com/index.php?title=Main_Page');

From 8f2302630c9ed9ff3163697beca92c74865fdda3 Mon Sep 17 00:00:00 2001
From: Fermin <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 14:29:11 +0200
Subject: [PATCH 28/56] [Rebranding] Docs and Support login icons are
 configurables

---
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   2 +
 pandora_console/general/login_page.php        |  24 ++--
 .../godmode/setup/setup_visuals.php           | 128 ++++++++++++++++++
 pandora_console/include/functions_config.php  |  12 ++
 pandora_console/include/functions_ui.php      |  37 +++++
 pandora_console/include/styles/pandora.css    |   8 ++
 pandora_console/pandoradb_data.sql            |   5 +-
 7 files changed, 206 insertions(+), 10 deletions(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index e3572edb04..b8f41cedf4 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1160,6 +1160,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index f34d11e8d0..8387d62366 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -86,6 +86,9 @@ if (!empty($config['login_background'])) {
 	$background_url = "images/backgrounds/" . $config['login_background'];
 	$login_body_style = "style=\"background-image: url('$background_url');\"";
 }
+// Get the custom icons
+$docs_logo = ui_get_docs_logo();
+$support_logo = ui_get_support_logo();
 echo '<div id="login_body" ' . $login_body_style . '>';
 echo '<div id="header_login">';
 	echo '<div id="icon_custom_pandora">';
@@ -102,15 +105,20 @@ echo '<div id="header_login">';
 			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
 		}
 	echo '</div>';
-		echo '<div id="list_icon_docs_support"><ul>';
-			echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
-			echo '<li>' . __('Docs') . '</li>';
-			if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
-				echo '<li id="li_margin_left"><a href="'.$config['custom_support_url'].'" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
-			} else {
-				echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
+		echo '<div id="list_icon_docs_support"><ul style="line-height: 36px;">';
+			if ($docs_logo !== false) {
+				echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="' . $docs_logo . '" alt="docs"></a></li>';
+			}
+			echo '<li><a style="color: white; font-size:inherit;" href="'.$config['custom_docs_url'].'" target="_blank">' . __('Docs') . '</li>';
+			if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+				if ($support_logo !== false) {
+					echo '<li id="li_margin_left"><a href="'.$config['custom_support_url'].'" target="_blank"><img src="' . $support_logo .'" alt="support"></a></li>';
+				}
+				echo '<li><a style="color: white; font-size:inherit;" href="'.$config['custom_support_url'].'" target="_blank">' . __('Support') . '</li>';
+			} else {
+				echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="' . $support_logo .'" alt="support"></a></li>';
+				echo '<li>' . __('Support') . '</li>';
 			}
-			echo '<li>' . __('Support') . '</li>';
 		echo '</ul></div>';
 	
 		
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index d647bc89b1..72efbbf138 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -234,6 +234,52 @@ if(enterprise_installed()) {
 	$row++;
 }
 
+if(enterprise_installed()){
+	// Custom docs icon
+	$table_styles->data[$row][0] = __('Custom documentation logo');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	
+	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_docs_logo',
+		$config["custom_docs_logo"],
+		'',
+		__('None'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$row++;
+
+	// Custom support icon
+	$table_styles->data[$row][0] = __('Custom support logo');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	
+	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_support_logo',
+		$config["custom_support_logo"],
+		'',
+		__('None'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$row++;
+}
+
 //login title1
 if(enterprise_installed()) {
 	$table_styles->data[$row][0] = __('Title 1 (login)');
@@ -1190,6 +1236,88 @@ $("#button-custom_splash_login_preview").click (function (e) {
 	}
 });
 
+$("#button-custom_docs_logo_preview").click (function (e) {
+	var icon_name = $("select#custom_docs_logo option:selected").val();
+	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+
+	if (icon_name == "")
+		return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image
+		.css('max-width', '500px')
+		.css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: "<?php echo __('Logo preview'); ?>",
+				resizable: true,
+				draggable: true,
+				modal: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				dialogClass: 'dialog-grayed',
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+});
+
+
+$("#button-custom_support_logo_preview").click (function (e) {
+	var icon_name = $("select#custom_support_logo option:selected").val();
+	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+
+	if (icon_name == "")
+		return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image
+		.css('max-width', '500px')
+		.css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: "<?php echo __('Logo preview'); ?>",
+				resizable: true,
+				draggable: true,
+				modal: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				dialogClass: 'dialog-grayed',
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+});
 
 $("#button-login_background_preview").click (function (e) {
 	var icon_name = $("select#login_background option:selected").val();
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index b2460b39d3..f572ebd148 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -506,6 +506,10 @@ function config_update_config () {
 						$error_update[] = __('Custom logo login');
 					if (!config_update_value ('custom_splash_login', (string) get_parameter ('custom_splash_login')))
 						$error_update[] = __('Custom splash login');
+					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
+						$error_update[] = __('Custom documentation logo');
+					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
+						$error_update[] = __('Custom support logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
 					if (!config_update_value ('custom_title2_login', (string) get_parameter ('custom_title2_login')))
@@ -1195,6 +1199,14 @@ function config_process_config () {
 	if (!isset ($config["custom_splash_login"])) {
 		config_update_value ('custom_splash_login', 'splash_image_default.png');
 	}
+
+	if (!isset ($config["custom_docs_logo"])) {
+		config_update_value ('custom_docs_logo', '');
+	}
+
+	if (!isset ($config["custom_support_logo"])) {
+		config_update_value ('custom_support_logo', '');
+	}
 	
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 4fc40ba611..bfcd3ed44f 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3919,4 +3919,41 @@ function ui_get_snapshot_link($params, $only_params = false) {
 	// Return the function call to inline js execution
 	return "winopeng_var('" . implode("', '", $link_parts) . "')";
 }
+
+/**
+ * Get the custom docs logo
+ *
+ * @return string with the path to logo. False if it should not be displayed
+ *
+ */
+function ui_get_docs_logo () {
+	global $config;
+
+	// Default logo to open version (enterprise_installed function only works in login status)
+	if (!file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+		return "images/icono_docs.png";
+	}
+
+	if (empty($config['custom_docs_logo'])) return false;
+	return 'enterprise/images/custom_general_logos/' . $config['custom_docs_logo'];
+}
+
+/**
+ * Get the custom support logo
+ *
+ * @return string with the path to logo. False if it should not be displayed
+ *
+ */
+function ui_get_support_logo () {
+	global $config;
+
+	// Default logo to open version (enterprise_installed function only works in login status)
+	if (!file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
+		return "images/icono_support.png";
+	}
+
+	if (empty($config['custom_support_logo'])) return false;
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
+
 ?>
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 293045208f..c06cdbfed6 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4653,4 +4653,12 @@ form ul.form_flex li ul li{
 
 .pandora_upper {
 	text-transform: uppercase;
+}
+
+.dialog-grayed {
+	background: #373737 !important;
+}
+
+.dialog-grayed .ui-dialog-buttonpane {
+	background: #373737 !important;
 }
\ No newline at end of file
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 85b0c84439..fb1de26061 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -113,8 +113,9 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
 ('current_package_enterprise', '722'),
-('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}');
-
+('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
+('custom_docs_logo', 'default_docs.png'),
+('custom_support_logo', 'default_support.png');
 UNLOCK TABLES;
 
 --

From 0e3db1eb80e96e03f0babe0672a25fcd09f523d7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Mon, 21 May 2018 18:26:28 +0200
Subject: [PATCH 29/56] [Rebranding] Added custom logo to network maps central
 node

---
 .../godmode/setup/setup_visuals.php           | 69 +++++++++++++++++--
 pandora_console/include/functions_config.php  |  8 ++-
 .../include/functions_networkmap.php          | 28 +++++++-
 .../functions_pandora_networkmap.js           | 10 ++-
 .../agentes/pandora_networkmap.view.php       |  3 +-
 5 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 72efbbf138..1a57c376b8 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -235,11 +235,13 @@ if(enterprise_installed()) {
 }
 
 if(enterprise_installed()){
+	// Get all the custom logos
+	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+
 	// Custom docs icon
 	$table_styles->data[$row][0] = __('Custom documentation logo');
 	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
-	
-	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
+
 	$table_styles->data[$row][1] = html_print_select(
 		$files,
 		'custom_docs_logo',
@@ -260,8 +262,6 @@ if(enterprise_installed()){
 	// Custom support icon
 	$table_styles->data[$row][0] = __('Custom support logo');
 	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
-	
-	$files = list_files('enterprise/images/custom_general_logos', "png", 1, 0);
 	$table_styles->data[$row][1] = html_print_select(
 		$files,
 		'custom_support_logo',
@@ -278,6 +278,26 @@ if(enterprise_installed()){
 	);
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
 	$row++;
+
+	// Custom center networkmap icon
+	$table_styles->data[$row][0] = __('Custom networkmap center logo');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_network_center_logo',
+		$config["custom_network_center_logo"],
+		'',
+		__('Default'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$row++;
 }
 
 //login title1
@@ -1277,7 +1297,6 @@ $("#button-custom_docs_logo_preview").click (function (e) {
 	}
 });
 
-
 $("#button-custom_support_logo_preview").click (function (e) {
 	var icon_name = $("select#custom_support_logo option:selected").val();
 	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
@@ -1319,6 +1338,46 @@ $("#button-custom_support_logo_preview").click (function (e) {
 	}
 });
 
+$("#button-custom_network_center_logo_preview").click (function (e) {
+	var icon_name = $("select#custom_network_center_logo option:selected").val();
+	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+
+	if (icon_name == "")
+		return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image
+		.css('max-width', '500px')
+		.css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: "<?php echo __('Logo preview'); ?>",
+				resizable: true,
+				draggable: true,
+				modal: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+});
+
 $("#button-login_background_preview").click (function (e) {
 	var icon_name = $("select#login_background option:selected").val();
 	var icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index f572ebd148..472744c66c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -509,6 +509,8 @@ function config_update_config () {
 					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
 						$error_update[] = __('Custom documentation logo');
 					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
+						$error_update[] = __('Custom networkmap center logo');
+					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
 						$error_update[] = __('Custom support logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
@@ -1207,7 +1209,11 @@ function config_process_config () {
 	if (!isset ($config["custom_support_logo"])) {
 		config_update_value ('custom_support_logo', '');
 	}
-	
+
+	if (!isset ($config["custom_network_center_logo"])) {
+		config_update_value ('custom_network_center_logo', '');
+	}
+
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
 	}
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 8c9860caae..7578f4bbfd 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -29,6 +29,11 @@ require_once($config['homedir'] . "/include/functions_modules.php");
 require_once($config['homedir'] . "/include/functions_groups.php");
 ui_require_css_file ('cluetip');
 
+/**
+ * Definitions
+ */
+define('DEFAULT_NETWORKMAP_CENTER_LOGO', 'images/networkmap/bola_pandora_network_maps.png');
+
 // Check if a node descends from a given node
 function networkmap_is_descendant ($node, $ascendant, $parents) {
 	if (! isset ($parents[$node])) {
@@ -1327,7 +1332,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	}
 	$stats_json = base64_encode(json_encode($summary));
 	
-	$img_src = "images/networkmap/bola_pandora_network_maps.png";
+	$img_src = networkmap_get_center_logo();
 	if (defined('METACONSOLE')) {
 		
 		$url_tooltip = '../../ajax.php?' .
@@ -1346,11 +1351,11 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	
 	if ($hack_networkmap_mobile) {
 		$img = '<TR><TD>' .
-			"<img src='" . $config['homedir'] . '/' . "images/networkmap/bola_pandora_network_maps.png' />" .
+			"<img src='" . $config['homedir'] . '/' . networkmap_get_center_logo() . "' />" .
 			'</TD></TR>';
 	}
 	else {
-		$image = html_print_image("images/networkmap/bola_pandora_network_maps.png", true, false, false, true);
+		$image = html_print_image(networkmap_get_center_logo(), true, false, false, true);
 		//$image = str_replace('"',"'",$image);
 		$img = '<TR><TD>' . $image . '</TD></TR>';
 	}
@@ -1866,6 +1871,23 @@ function modules_get_all_interfaces($id_agent) {
 	return $return;
 }
 
+/**
+ * Get the central networkmap logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function networkmap_get_center_logo () {
+	global $config;
+
+	html_debug("hola", true);
+	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
+		return DEFAULT_NETWORKMAP_CENTER_LOGO;
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
+
 ?>
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 8b5d68b711..2e0fa2f3d9 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -3445,7 +3445,9 @@ function draw_elements_graph() {
 	node_temp.append("image")
 		.attr("class", "node_image")
 		.attr("xlink:href", function (d) {
-			return d.image_url;
+			return is_central_node(d)
+				? $("#hidden-center_logo").val()
+				: d.image_url;
 		})
 		.attr("x", function (d) {
 			return d.x - (d.image_width / 2);
@@ -3665,9 +3667,13 @@ function draw_elements_graph() {
 	node.exit().remove();
 }
 
+function is_central_node (data) {
+	return (data.type == 0 && data.id_agent == 0);
+}
+
 function get_node_name_ov (data) {
 	// Node central name should be the product name
-	return (data.type == 0 && data.id_agent == 0)
+	return (is_central_node(data))
 		? $("#hidden-product_name").val()
 		: data.text;
 }
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index 521f7bea88..341464523b 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -700,8 +700,9 @@ else {
 	$id = (int) get_parameter('id_networkmap', 0);
 }
 
-// Print the product name to handle it in js
+// Print some params to handle it in js
 html_print_input_hidden ('product_name', get_product_name());
+html_print_input_hidden ('center_logo', ui_get_full_url(networkmap_get_center_logo()));
 
 $dash_mode = 0;
 $map_dash_details = array();

From 2e8e3c27b65681148892f1a0728df5ec5df719f4 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 13:40:23 +0200
Subject: [PATCH 30/56] [Rebranding] Modified tinylogo by custom_logo in node

---
 pandora_console/general/login_page.php   |  6 +++---
 pandora_console/general/pandora_help.php | 14 +++++---------
 pandora_console/include/functions_ui.php | 17 +++++++++++++++++
 pandora_console/index.php                |  4 ++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 8387d62366..737148751d 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -95,14 +95,14 @@ echo '<div id="header_login">';
 	
 		if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
 			if(isset ($config['custom_logo'])){
-				echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
+				echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="monitoring_console">';
 			}
 			else{
-				echo '<img src="images/custom_logo/pandora_logo_head_4.png" alt="pandora_console">';
+				echo '<img src="images/custom_logo/pandora_logo_head_4.png" alt="monitoring_console">';
 			}
 		}
 		else{
-			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
+			echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="monitoring_console">';	
 		}
 	echo '</div>';
 		echo '<div id="list_icon_docs_support"><ul style="line-height: 36px;">';
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index 8d04fb6bde..fa1696370c 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -61,11 +61,12 @@ foreach ($files as $file) {
 	}
 }
 
+$logo = ui_get_custom_header_logo();
 
 if (! $id || ! file_exists ($help_file)) {
 	echo '<div id="main_help" style="background-color: #fff;text-align:center; padding-top: 15px; padding-bottom: 15px; ">';
 		if (!is_metaconsole()) {
-			echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
+			echo html_print_image($logo, true, array("border" => '0'));
 		}
 	echo '</div>';
 	echo '<div style="font-family: verdana, arial; font-size: 11px; text-align:left; background-color: #fff;">';
@@ -86,16 +87,11 @@ if (! $id || ! file_exists ($help_file)) {
 
 /* Show help */
 echo '<div id="main_help_new" style="background-color: #fff">';
-	if (empty($config['enterprise_installed'])) {
-		echo html_print_image('images/pandora_tinylogo_open.png', true, array("border" => '0'));
+	if (!empty($config['enterprise_installed']) && is_metaconsole()) {
+		echo '<img src="' . $config["homeurl"] . $logo . '">';
 	}
 	else {
-		if (is_metaconsole()) {
-			echo '<img src="'.$config["homeurl"].'images/pandora_tinylogo.png">';
-		}
-		else{
-			echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
-		}
+		echo html_print_image($logo, true, array("border" => '0'));
 	}
 echo '</div>';
 echo '<div id="main_help_new_content" style="height: auto ! important;overfloat: auto;">';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index bfcd3ed44f..35765882b9 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3956,4 +3956,21 @@ function ui_get_support_logo () {
 	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
 }
 
+/**
+ * Get the custom header logo
+ *
+ * @return string with the path to logo. If it is not set, return the default value
+ *
+ */
+function ui_get_custom_header_logo () {
+	global $config;
+
+	if (empty($config['enterprise_installed'])) {
+		return 'images/pandora_tinylogo_open.png';
+	}
+
+	if (empty($config['custom_logo'])) return 'images/pandora_tinylogo.png';
+	return 'enterprise/images/custom_logo/' . $config['custom_logo'];
+}
+
 ?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index db2ce4b2ca..d7d7baba3e 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -702,7 +702,7 @@ if (! isset ($config['id_user'])) {
 							
 							$cod_hash = $user_reset_pass . "::::" . md5(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
 
-							$subject = '[Pandora] '.__('Reset password');
+							$subject = '[' . get_product_name() . '] '.__('Reset password');
 							$body = __('This is an automatically sent message for user ');
 							$body .= ' "<strong>' . $user_reset_pass . '"</strong>';
 							$body .= '<p />';
@@ -710,7 +710,7 @@ if (! isset ($config['id_user'])) {
 							$body .= '<p />';
 							$body .= '<a href="' . $config['homeurl'] . 'index.php?reset_hash=' . $cod_hash . '">' . __('Reset your password') . '</a>';
 							$body .= '<p />';
-							$body .= 'Pandora FMS';
+							$body .= get_product_name();
 							$body .= '<p />';
 							$body .= '<em>'.__('Please do not reply to this email.').'</em>';
 							

From 946e897db6d558ad8c854ff3d8f0f76f65e7afb6 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 15:26:11 +0200
Subject: [PATCH 31/56] [Rebranding] Get the correct header logo in the
 metaconsole

---
 pandora_console/include/functions_ui.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 35765882b9..bc09f5eceb 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3969,8 +3969,9 @@ function ui_get_custom_header_logo () {
 		return 'images/pandora_tinylogo_open.png';
 	}
 
-	if (empty($config['custom_logo'])) return 'images/pandora_tinylogo.png';
-	return 'enterprise/images/custom_logo/' . $config['custom_logo'];
+	$stored_logo = is_metaconsole() ? $config['meta_custom_logo'] : $config['custom_logo'];
+	if (empty($stored_logo)) return 'images/pandora_tinylogo.png';
+	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
 
 ?>

From 9935b7f8a327bbae9d67dc8cec3e3d635928826a Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 16:49:49 +0200
Subject: [PATCH 32/56] [Rebranding] Added custom logo to node request new
 license

---
 pandora_console/godmode/setup/license.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index e06a617ed1..ecff0c27ce 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -103,9 +103,9 @@ if (enterprise_installed()) {
 echo '</form>';
 echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="' . __('Request new license') . '">';
 echo '<div id="logo">';
-html_print_image('images/pandora_tinylogo.png');
+html_print_image(ui_get_custom_header_logo());
 echo '</div>';
-echo '' . __('To get your <b>Pandora FMS Enterprise License</b>:') . '<br />';
+echo '' . __('To get your <b>%s Enterprise License</b>:', get_product_name()) . '<br />';
 echo '<ul>';
 echo '<li>';
 echo '' . sprintf(__('Go to %s'), "<a target=\"_blank\" href=\"https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client\">https://licensing.artica.es/pandoraupdate7/index.php?section=generate_key_client</a>");

From 2c97232f90258ec4887296d22afb1a5da26c91c5 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 22 May 2018 19:22:37 +0200
Subject: [PATCH 33/56] [Rebranding] Miscelaneous rebranding

---
 pandora_console/godmode/db/db_main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php
index 7246a62ed7..6b0138e908 100644
--- a/pandora_console/godmode/db/db_main.php
+++ b/pandora_console/godmode/db/db_main.php
@@ -197,7 +197,7 @@ echo "</td></tr>";
 
 echo '<tr><td colspan=2>';
 echo '<div align="justify"><br><hr width=100%>';
-echo '(*) '.__('Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\'s very important to keep up-to-date database to get the best performance and results in Pandora');
+echo '(*) '.__("Please make sure your %s Server settings are correct and that the database maintenance daemon is running. It's very important to keep your database up to date in order to get the best performance and results from %s.", get_product_name(), get_product_name());
 echo '</div>';
 echo '</td></tr></table>';
 ?>

From 4a58b8cb7dd8f149f1b63919423163595451097e Mon Sep 17 00:00:00 2001
From: nknsh <nknsh@rworks.jp>
Date: Wed, 23 May 2018 13:49:14 +0900
Subject: [PATCH 34/56] I fixed the bug about async_recovery. When the async
 module recovers automatically, known_status and last_known_status are updated
 to 0.

---
 pandora_server/lib/PandoraFMS/Core.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 0537628dc2..1ae5385db8 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4886,7 +4886,7 @@ sub pandora_module_unknown ($$) {
 			
 			# Set the module state to normal
 			logger ($pa_config, "Module " . $module->{'nombre'} . " is going to NORMAL", 10);
-			db_do ($dbh, 'UPDATE tagente_estado SET last_status = 0, estado = 0 WHERE id_agente_estado = ?', $module->{'id_agente_estado'});
+			db_do ($dbh, 'UPDATE tagente_estado SET last_status = 0, estado = 0, known_status = 0, last_known_status = 0 WHERE id_agente_estado = ?', $module->{'id_agente_estado'});
 			
 			# Get agent information
 			my $agent = get_db_single_row ($dbh, 'SELECT *

From b68948307bab984ebe3c02769b12e5222e23f177 Mon Sep 17 00:00:00 2001
From: "manuel.montes" <manuel.montes@support.artica.es>
Date: Wed, 23 May 2018 17:55:07 +0200
Subject: [PATCH 35/56] Fixed white-space / pre-wrap

---
 pandora_console/include/styles/pandora.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b1467fa7d1..ebe2617ad7 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -893,6 +893,9 @@ div#cont {
 table, img {
 	border: 0px;
 }
+table pre{
+	white-space: pre-wrap;
+}
 
 tr:first-child>th {
 	background-color: #373737;

From 43447bbee4cded8a985a689f4d6260d086065e40 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 23 May 2018 18:19:24 +0200
Subject: [PATCH 36/56] [Rebranding] Minor ended fixed

---
 .../extensions/plugin_registration.php        |  8 +++----
 .../extensions/resource_registration.php      |  4 ++--
 pandora_console/general/alert_enterprise.php  |  4 ++--
 pandora_console/general/login_help_dialog.php |  4 ++--
 .../godmode/agentes/agent_manager.php         |  2 +-
 .../godmode/agentes/module_manager.php        |  2 +-
 .../godmode/massive/massive_edit_agents.php   |  2 +-
 pandora_console/include/auth/dev.php          |  5 ++--
 pandora_console/include/auth/ldap.php         |  5 ++--
 pandora_console/include/auth/mysql.php        |  5 ++--
 .../include/functions_networkmap.php          | 23 +++----------------
 pandora_console/include/functions_ui.php      | 20 +++++++++++++---
 .../include/help/en/help_main_help.php        |  4 ++--
 .../include/help/es/help_main_help.php        |  4 ++--
 .../include/help/ja/help_main_help.php        |  2 +-
 .../agentes/pandora_networkmap.view.php       |  2 +-
 16 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php
index 8807fbe153..63c2d56920 100644
--- a/pandora_console/extensions/plugin_registration.php
+++ b/pandora_console/extensions/plugin_registration.php
@@ -31,10 +31,10 @@ function pluginreg_extension_main () {
 			echo '</div>';
 				echo '<div class="text_task">';
 					echo '<h3>' . __("Plugin registration") . '</h3>';
-					echo '<p id="description_task">' . 
-					__("This extension makes registration of server plugins more easy. 
-						Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). 
-						Please refer to documentation on how to obtain and use Pandora FMS Server Plugins.
+					echo '<p id="description_task">' .
+					__("This extension makes registering server plugins an easier task.
+						Here you can upload a server plugin in .pspz zipped format.
+						Please refer to the official documentation on how to obtain and use Server Plugins.
 						<br><br>You can get more plugins in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a> ") . '</p>';
 						// Upload form
 					echo "<form name='submit_plugin' method='post' enctype='multipart/form-data'>";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 61ae26f55b..9158876901 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -857,9 +857,9 @@ function resource_registration_extension_main() {
 	echo "<div class=notify>";
 	echo __("This extension makes registering resource templates easier.") . " " .
 		__("Here you can upload a resource template in .ptr format.") . " " .
-		__("Please refer to our documentation for more information on how to obtain and use Pandora FMS' resources.") . " " .
+		__("Please refer to our documentation for more information on how to obtain and use %s resources.", get_product_name()) . " " .
 		"<br> <br>" .
-		__("You can get more resurces in our <a href='http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en'>Public Resource Library</a>")
+		__("You can get more resurces in our <a href='http://pandorafms.com/Library/Library/'>Public Resource Library</a>")
 	;
 	echo "</div>";
 	
diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 3b099fe677..ea5d1d97e5 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -94,8 +94,8 @@ switch ($tipo) {
 	case "helpmodal":
 	
 	echo __("This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
-  <a href='https://pandorafms.org/en/docs/monitoring-documentation/' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
-  get_product_name(), get_product_name(), get_product_name());
+  <a href='%s' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
+  get_product_name(), get_product_name(), get_product_name(), $config['custom_docs_url']);
 	
 	break;
 	
diff --git a/pandora_console/general/login_help_dialog.php b/pandora_console/general/login_help_dialog.php
index c3b05e8553..6e38d4ece0 100644
--- a/pandora_console/general/login_help_dialog.php
+++ b/pandora_console/general/login_help_dialog.php
@@ -71,11 +71,11 @@ echo '<div id="login_help_dialog" title="' .
 			echo '</td>';
 			
 			echo '<td style="border:1px solid #FFF; text-align:center;">';
-				echo '<a href="http://pandorafms.com/pandora/doc/en" target="_blank" style="text-decoration:none;">' .
+				echo '<a href="' . $config['custom_docs_url'] . '" target="_blank" style="text-decoration:none;">' .
 					html_print_image('images/documentation.png', true,
 						array("alt" => __('Documentation'), "border" => 0)) . '</a>';
 				echo '<br style="margin-bottom: 40px;" />';
-				echo '<a style="font-size: 9pt;" href="http://pandorafms.com/pandora/doc/en" target="_blank">' . __('Documentation') . '</span></a>';
+				echo '<a style="font-size: 9pt;" href="' . $config['custom_docs_url'] . '" target="_blank">' . __('Documentation') . '</span></a>';
 			echo '</td>';
 		echo '</tr>';
 		echo '</table>';
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 151b47e03a..d4a725a42c 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -542,7 +542,7 @@ foreach ($fields as $field) {
 		. '.<br />'
 		. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
 		. '.<br /><br />'
-		. __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]')
+		. __('e.g.: [url=google.com]Google web search[/url]')
 		, true);
 	
 	$custom_value = db_get_value_filter('description',
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 85f2fd8f5f..145f7312d5 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -154,7 +154,7 @@ echo "</table>";
 
 echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
 echo "<strong>";
-echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
+echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
 echo "</strong>";
 echo '</div>';
 
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 3918ada3be..849101f169 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -507,7 +507,7 @@ foreach ($fields as $field) {
 		. '.<br />'
 		. __('The format is: [url=\'url to navigate\']\'text to show\'[/url]')
 		. '.<br /><br />'
-		. __('e.g.: [url=pandorafms.org]Pandora FMS Community[/url]')
+		. __('e.g.: [url=google.com]Google web search[/url]')
 		, true);
 	
 	$custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente));
diff --git a/pandora_console/include/auth/dev.php b/pandora_console/include/auth/dev.php
index 82a3f7d524..8c5774daaa 100644
--- a/pandora_console/include/auth/dev.php
+++ b/pandora_console/include/auth/dev.php
@@ -27,9 +27,8 @@ if (!isset ($config)) {
 <meta http-equiv="content-type" content="text/html; charset=utf8">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
-<meta name="author" content="Sancho Lerena">
-<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-<meta name="keywords" content="pandora, monitoring, system, GPL, software">
+<meta name="author" content="Artica ST">
+<meta name="copyright" content="(c) Artica ST">
 <meta name="robots" content="index, follow">
 <link rel="icon" href="../../images/pandora.ico" type="image/ico">
 <link rel="stylesheet" href="../styles/pandora.css" type="text/css">
diff --git a/pandora_console/include/auth/ldap.php b/pandora_console/include/auth/ldap.php
index a157b1ddd7..30edd77644 100644
--- a/pandora_console/include/auth/ldap.php
+++ b/pandora_console/include/auth/ldap.php
@@ -28,9 +28,8 @@ if (!isset ($config)) {
 		<meta http-equiv="content-type" content="text/html; charset=utf8">
 		<meta name="resource-type" content="document">
 		<meta name="distribution" content="global">
-		<meta name="author" content="Sancho Lerena">
-		<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software">
+		<meta name="author" content="Artica ST">
+		<meta name="copyright" content="(c) Artica ST">
 		<meta name="robots" content="index, follow">
 		<link rel="icon" href="../../images/pandora.ico" type="image/ico">
 		<link rel="stylesheet" href="../styles/pandora.css" type="text/css">
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index ddc3828c59..705c600943 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -28,9 +28,8 @@ if (!isset ($config)) {
 		<meta http-equiv="content-type" content="text/html; charset=utf8">
 		<meta name="resource-type" content="document">
 		<meta name="distribution" content="global">
-		<meta name="author" content="Sancho Lerena">
-		<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software">
+		<meta name="author" content="Artica ST">
+		<meta name="copyright" content="(c) Artica ST">
 		<meta name="robots" content="index, follow">
 		<link rel="icon" href="../../images/pandora.ico" type="image/ico">
 		<link rel="stylesheet" href="../styles/pandora.css" type="text/css">
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 7578f4bbfd..4e4ad37cee 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1332,7 +1332,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	}
 	$stats_json = base64_encode(json_encode($summary));
 	
-	$img_src = networkmap_get_center_logo();
+	$img_src = ui_get_logo_to_center_networkmap();
 	if (defined('METACONSOLE')) {
 		
 		$url_tooltip = '../../ajax.php?' .
@@ -1351,11 +1351,11 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
 	
 	if ($hack_networkmap_mobile) {
 		$img = '<TR><TD>' .
-			"<img src='" . $config['homedir'] . '/' . networkmap_get_center_logo() . "' />" .
+			"<img src='" . $config['homedir'] . '/' . ui_get_logo_to_center_networkmap() . "' />" .
 			'</TD></TR>';
 	}
 	else {
-		$image = html_print_image(networkmap_get_center_logo(), true, false, false, true);
+		$image = html_print_image(ui_get_logo_to_center_networkmap(), true, false, false, true);
 		//$image = str_replace('"',"'",$image);
 		$img = '<TR><TD>' . $image . '</TD></TR>';
 	}
@@ -1871,23 +1871,6 @@ function modules_get_all_interfaces($id_agent) {
 	return $return;
 }
 
-/**
- * Get the central networkmap logo
- *
- * @return string with the path to logo. If it is not set, return the default.
- *
- */
-function networkmap_get_center_logo () {
-	global $config;
-
-	html_debug("hola", true);
-	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
-		return DEFAULT_NETWORKMAP_CENTER_LOGO;
-	}
-
-	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
-}
-
 ?>
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index f2f8c81f61..5343fd7e23 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1352,9 +1352,8 @@ function ui_process_page_head ($string, $bitfield) {
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta name="resource-type" content="document" />
 		<meta name="distribution" content="global" />
-		<meta name="author" content="Pandora FMS Developer team" />
-		<meta name="copyright" content="(c) Artica Soluciones Tecnologicas" />
-		<meta name="keywords" content="pandora, monitoring, system, GPL, software" />
+		<meta name="author" content="' . get_copyright_notice() . '" />
+		<meta name="copyright" content="(c) ' . get_copyright_notice() . '" />
 		<meta name="robots" content="index, follow" />';
 		if(defined ('METACONSOLE')){
 		$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
@@ -3973,4 +3972,19 @@ function ui_get_custom_header_logo () {
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
 
+/**
+ * Get the central networkmap logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_logo_to_center_networkmap () {
+	global $config;
+
+	if ((!enterprise_installed()) || empty($config['custom_network_center_logo'])) {
+		return DEFAULT_NETWORKMAP_CENTER_LOGO;
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
+}
 ?>
diff --git a/pandora_console/include/help/en/help_main_help.php b/pandora_console/include/help/en/help_main_help.php
index 31f88c0098..bfd5897efc 100644
--- a/pandora_console/include/help/en/help_main_help.php
+++ b/pandora_console/include/help/en/help_main_help.php
@@ -6,9 +6,9 @@
 <h1><?php echo get_product_name();?> - Help index</h1>
 <h3>Introduction</h3>
 <p>
-This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
+This is the online help for <?php echo get_product_name();?> console. This help is -in best cases- just a "brief" contextual help, not intented to teach you how to use <?php echo get_product_name();?>. Official documentation of <?php echo get_product_name();?> is large, and you probably don't need to read it entirely, but sure, you should download it and take a look.
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>Download the official documentation</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>Download the official documentation</b></a>
  
 </p>
diff --git a/pandora_console/include/help/es/help_main_help.php b/pandora_console/include/help/es/help_main_help.php
index dfb00e176c..b5b0e1da1d 100644
--- a/pandora_console/include/help/es/help_main_help.php
+++ b/pandora_console/include/help/es/help_main_help.php
@@ -6,9 +6,9 @@
 <h1><?php echo get_product_name();?> - Índice de la ayuda</h1>
 <h3>Introdución</h3>
 <p>
-Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> son 1000 páginas, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
+Esta es la ayuda online para la consola de <?php echo get_product_name();?>. Esta ayuda es -en el mejor de los casos-, simplemente una ayuda contextual breve, no pretende enseñar en detalle como usar <?php echo get_product_name();?>. La documentación oficial de <?php echo get_product_name();?> es larga, y probablemente no es necesario leerla entera, pero en cualquier caso, es importante echarle un buen vistazo.
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>Descargue la documentación oficial</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>Descargue la documentación oficial</b></a>
  
 </p>
diff --git a/pandora_console/include/help/ja/help_main_help.php b/pandora_console/include/help/ja/help_main_help.php
index 54e64a3d81..18f40f3afc 100644
--- a/pandora_console/include/help/ja/help_main_help.php
+++ b/pandora_console/include/help/ja/help_main_help.php
@@ -9,6 +9,6 @@
 これは、<?php echo get_product_name();?> コンソールのオンラインヘルプです。このヘルプは簡単に説明することを目的としたもので、<?php echo get_product_name();?> の使い方を教えることを意図しているわけではありません。<?php echo get_product_name();?> の公式ドキュメントは約 900ページにも及びます。全体を読む必要はありませんが、参照できるようにダウンロードしておくことをお勧めします。
 
 <br><br>
-<a href="http://pandorafms.com/pandora/doc/"><b>公式ドキュメントのダウンロード</b></a>
+<a href="<?php echo $config['custom_docs_url']; ?>"><b>公式ドキュメントのダウンロード</b></a>
  
 </p>
diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php
index 341464523b..32225b9ad1 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.view.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.view.php
@@ -702,7 +702,7 @@ else {
 
 // Print some params to handle it in js
 html_print_input_hidden ('product_name', get_product_name());
-html_print_input_hidden ('center_logo', ui_get_full_url(networkmap_get_center_logo()));
+html_print_input_hidden ('center_logo', ui_get_full_url(ui_get_logo_to_center_networkmap()));
 
 $dash_mode = 0;
 $map_dash_details = array();

From 5e9cf384746361c2c67c7e041b3b7e2f478a78ca Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 23 May 2018 18:21:42 +0200
Subject: [PATCH 37/56] [Rebranding] Modified some strings to new installations

---
 pandora_console/pandoradb_data.sql | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index fb1de26061..069d82186b 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -12,15 +12,15 @@
 -- Dumping data for table `talert_commands`
 --
 
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (1,'eMail','Internal&#x20;type','This&#x20;alert&#x20;send&#x20;an&#x20;email&#x20;using&#x20;internal&#x20;Pandora&#x20;FMS&#x20;Server&#x20;SMTP&#x20;capabilities&#x20;&#40;defined&#x20;in&#x20;each&#x20;server,&#x20;using:&#x0d;&#x0a;_field1_&#x20;as&#x20;destination&#x20;email&#x20;address,&#x20;and&#x0d;&#x0a;_field2_&#x20;as&#x20;subject&#x20;for&#x20;message.&#x20;&#x0d;&#x0a;_field3_&#x20;as&#x20;text&#x20;of&#x20;message.&#x20;&#x0d;&#x0a;_field4_&#x20;as&#x20;content&#x20;type&#x20;&#40;plain/text&#x20;or&#x20;html/text&#41;.',1,'[\"Destination&#x20;address\",\"Subject\",\"Text\",\"Content&#x20;Type\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (2,'Internal&#x20;Audit','Internal&#x20;type','This&#x20;alert&#x20;save&#x20;alert&#x20;in&#x20;Pandora&#x20;internal&#x20;audit&#x20;system.&#x20;Fields&#x20;are&#x20;static&#x20;and&#x20;only&#x20;_field1_&#x20;is&#x20;used.',1,'[\"Description\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (3,'Pandora&#x20;FMS&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;an&#x20;special&#x20;event&#x20;into&#x20;Pandora&#x20;FMS&#x20;event&#x20;manager.',1,'[\"Event&#x20;text\",\"Event&#x20;type\",\"Source\",\"Agent&#x20;name&#x20;or&#x20;_agent_\",\"Event&#x20;criticity\",\"ID&#x20;extra\",\"Tags&#x20;separated&#x20;by&#x20;commas\",\"Comments\",\"\",\"\"]','[\"\",\"alert_ceased,Alert&#x20;ceased;alert_fired,Alert&#x20;fired;alert_manual_validation,Alert&#x20;manual&#x20;validation;alert_recovered,Alert&#x20;recovered;configuration_change,Configuration&#x20;change&#x20;;error,Error;critical,Monitor&#x20;Critical;normal,Monitor&#x20;Normal;going_unknown,Monitor\",\"\",\"\",\"4,Critical;1,Informational;0,Maintenance;6,Major;5,Minor;2,Normal;3,Warning\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (4,'Pandora&#x20;FMS&#x20;Alertlog','echo&#x20;_timestamp_&#x20;pandora&#x20;_agent_&#x20;_data_&#x20;_field1_&#x20;_field2_&#x20;&gt;&gt;&#x20;/var/log/pandora/pandora_alert.log','This&#x20;is&#x20;a&#x20;default&#x20;alert&#x20;to&#x20;write&#x20;alerts&#x20;in&#x20;a&#x20;standard&#x20;ASCII&#x20;&#x20;plaintext&#x20;log&#x20;file&#x20;in&#x20;/var/log/pandora/pandora_alert.log&#x0d;&#x0a;',0,'[\"Log&#x20;Info&#x20;1\",\"Log&#x20;Info&#x20;2\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (1,'eMail','Internal&#x20;type','This&#x20;alert&#x20;send&#x20;an&#x20;email&#x20;using&#x20;internal&#x20;Server&#x20;SMTP&#x20;capabilities&#x20;&#40;defined&#x20;in&#x20;each&#x20;server,&#x20;using:&#x0d;&#x0a;_field1_&#x20;as&#x20;destination&#x20;email&#x20;address,&#x20;and&#x0d;&#x0a;_field2_&#x20;as&#x20;subject&#x20;for&#x20;message.&#x20;&#x0d;&#x0a;_field3_&#x20;as&#x20;text&#x20;of&#x20;message.&#x20;&#x0d;&#x0a;_field4_&#x20;as&#x20;content&#x20;type&#x20;&#40;plain/text&#x20;or&#x20;html/text&#41;.',1,'[\"Destination&#x20;address\",\"Subject\",\"Text\",\"Content&#x20;Type\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (2,'Internal&#x20;Audit','Internal&#x20;type','This&#x20;alert&#x20;save&#x20;alert&#x20;in&#x20;internal&#x20;audit&#x20;system.&#x20;Fields&#x20;are&#x20;static&#x20;and&#x20;only&#x20;_field1_&#x20;is&#x20;used.',1,'[\"Description\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (3,'Monitoring&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;an&#x20;special&#x20;event&#x20;into&#x20;event&#x20;manager.',1,'[\"Event&#x20;text\",\"Event&#x20;type\",\"Source\",\"Agent&#x20;name&#x20;or&#x20;_agent_\",\"Event&#x20;criticity\",\"ID&#x20;extra\",\"Tags&#x20;separated&#x20;by&#x20;commas\",\"Comments\",\"\",\"\"]','[\"\",\"alert_ceased,Alert&#x20;ceased;alert_fired,Alert&#x20;fired;alert_manual_validation,Alert&#x20;manual&#x20;validation;alert_recovered,Alert&#x20;recovered;configuration_change,Configuration&#x20;change&#x20;;error,Error;critical,Monitor&#x20;Critical;normal,Monitor&#x20;Normal;going_unknown,Monitor\",\"\",\"\",\"4,Critical;1,Informational;0,Maintenance;6,Major;5,Minor;2,Normal;3,Warning\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (4,'Alertlog','echo&#x20;_timestamp_&#x20;pandora&#x20;_agent_&#x20;_data_&#x20;_field1_&#x20;_field2_&#x20;&gt;&gt;&#x20;/var/log/pandora/pandora_alert.log','This&#x20;is&#x20;a&#x20;default&#x20;alert&#x20;to&#x20;write&#x20;alerts&#x20;in&#x20;a&#x20;standard&#x20;ASCII&#x20;&#x20;plaintext&#x20;log&#x20;file&#x20;in&#x20;/var/log/pandora/pandora_alert.log&#x0d;&#x0a;',0,'[\"Log&#x20;Info&#x20;1\",\"Log&#x20;Info&#x20;2\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (5,'SNMP&#x20;Trap','/usr/bin/snmptrap&#x20;-v&#x20;1&#x20;-c&#x20;_field1_&#x20;_field2_&#x20;_field3_&#x20;_field4_','Send&#x20;a&#x20;SNMPTRAP&#x20;to&#x20;192.168.0.4.&#x20;Please&#x20;review&#x20;config&#x20;and&#x20;adapt&#x20;to&#x20;your&#x20;needs,&#x20;this&#x20;is&#x20;only&#x20;a&#x20;sample,&#x20;not&#x20;functional&#x20;itself.',0,'[\"Community\",\"Destination&#x20;address\",\"OID\",\"Source&#x20;address\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (6,'Syslog','logger&#x20;-p&#x20;daemon.alert&#x20;Pandora&#x20;Alert&#x20;_agent_&#x20;_data_&#x20;_field1_&#x20;_field2_','Uses&#x20;field1&#x20;and&#x20;field2&#x20;to&#x20;generate&#x20;Syslog&#x20;alert&#x20;in&#x20;facility&#x20;daemon&#x20;with&#x20;&quot;alert&quot;&#x20;level.',0,'[\"Log&#x20;Info&#x20;1\",\"Log&#x20;Info&#x20;2\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (7,'Sound Alert','/usr/bin/play /usr/share/sounds/alarm.wav','',0,NULL,NULL);
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (8,'Jabber&#x20;Alert','echo&#x20;_field3_&#x20;|&#x20;sendxmpp&#x20;-r&#x20;_field1_&#x20;--chatroom&#x20;_field2_','Send&#x20;jabber&#x20;alert&#x20;to&#x20;chat&#x20;room&#x20;in&#x20;a&#x20;predefined&#x20;server&#x20;&#40;configure&#x20;first&#x20;.sendxmpprc&#x20;file&#41;.&#x20;Uses&#x20;field3&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;useralias&#x20;for&#x20;source&#x20;message,&#x20;and&#x20;field2&#x20;for&#x20;chatroom&#x20;name',0,'[\"User&#x20;alias\",\"Chatroom&#x20;name\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (9,'SMS','sendsms&#x20;_field1_&#x20;_field2_','Send&#x20;SMS&#x20;using&#x20;the&#x20;Pandora&#x20;FMS&#x20;standard&#x20;SMS&#x20;device,&#x20;using&#x20;smstools.&#x20;&#x20;Uses&#x20;field2&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;destination&#x20;phone&#x20;&#40;include&#x20;international&#x20;prefix!&#41;',0,'[\"Destination&#x20;number\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (9,'SMS','sendsms&#x20;_field1_&#x20;_field2_','Send&#x20;SMS&#x20;using&#x20;the&#x20;standard&#x20;SMS&#x20;device,&#x20;using&#x20;smstools.&#x20;&#x20;Uses&#x20;field2&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;destination&#x20;phone&#x20;&#40;include&#x20;international&#x20;prefix!&#41;',0,'[\"Destination&#x20;number\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (10,'Validate&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;validate&#x20;the&#x20;events&#x20;matched&#x20;with&#x20;a&#x20;module&#x20;given&#x20;the&#x20;agent&#x20;name&#x20;&#40;_field1_&#41;&#x20;and&#x20;module&#x20;name&#x20;&#40;_field2_&#41;',1,'[\"Agent&#x20;name\",\"Module&#x20;name\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (11,'Integria&#x20;IMS&#x20;Ticket','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;a&#x20;ticket&#x20;into&#x20;your&#x20;Integria&#x20;IMS.',1,'[\"Integria&#x20;IMS&#x20;API&#x20;path\",\"Integria&#x20;IMS&#x20;API&#x20;pass\",\"Integria&#x20;IMS&#x20;user\",\"Integria&#x20;IMS&#x20;user&#x20;pass\",\"Ticket&#x20;title\",\"Ticket&#x20;group&#x20;ID\",\"Ticket&#x20;priority\",\"Email&#x20;copy\",\"Ticket&#x20;owner\",\"Ticket&#x20;description\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"10,Maintenance;0,Informative;1,Low;2,Medium;3,Serious;4,Very&#x20;Serious\",\"\",\"\",\"\"]');
 
@@ -133,10 +133,10 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES
 (8,'MacOS','MAC OS','so_mac.png'),
 (9,'Windows','Microsoft Windows OS','so_win.png'),
 (10,'Other','Other SO','so_other.png'),
-(11,'Network','Pandora FMS Network Agent','network.png'),
+(11,'Network','Network Agent','network.png'),
 (12,'Web Server','Web Server/Application','network.png'),
-(13,'Sensor',' Pandora FMS Hardware Agent (Sensor)','network.png'),
-(14,'Embedded','Embedded device running a Pandora FMS agent','embedded.png'),
+(13,'Sensor','Hardware Agent (Sensor)','network.png'),
+(14,'Embedded','Embedded device running an agent','embedded.png'),
 (15,'Android','Android agent','android.png'),
 (16, 'VMware', 'VMware Architecture', 'so_vmware.png'),
 (17, 'Router', 'Generic router', 'so_router.png'),
@@ -236,7 +236,7 @@ INSERT INTO `torigen` VALUES
 ('Application data'),
 ('Logfiles'),
 ('Other data source'),
-('Pandora FMS Event'),
+('Monitoring Event'),
 ('User report'),
 ('Unknown source');
 
@@ -1102,7 +1102,7 @@ INSERT INTO `tgis_map_layer` VALUES (1,'Group All',1,0,1,0);
 
 -- example alert template
 
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (12,'Remote&#x20;agent&#x20;control','/usr/share/pandora_server/util/udp_client.pl&#x20;_address_&#x20;41122&#x20;&quot;_field1_&quot;','This&#x20;command&#x20;is&#x20;used&#x20;to&#x20;send&#x20;commands&#x20;to&#x20;the&#x20;Pandora&#x20;FMS&#x20;agents&#x20;with&#x20;the&#x20;UDP&#x20;server&#x20;enabled.&#x20;The&#x20;UDP&#x20;server&#x20;is&#x20;used&#x20;to&#x20;order&#x20;agents&#x20;&#40;Windows&#x20;and&#x20;UNIX&#41;&#x20;to&#x20;&quot;refresh&quot;&#x20;the&#x20;agent&#x20;execution:&#x20;that&#x20;means,&#x20;to&#x20;force&#x20;the&#x20;agent&#x20;to&#x20;execute&#x20;and&#x20;send&#x20;data',0,'[\"Command\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
+INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (12,'Remote&#x20;agent&#x20;control','/usr/share/pandora_server/util/udp_client.pl&#x20;_address_&#x20;41122&#x20;&quot;_field1_&quot;','This&#x20;command&#x20;is&#x20;used&#x20;to&#x20;send&#x20;commands&#x20;to&#x20;the&#x20;agents&#x20;with&#x20;the&#x20;UDP&#x20;server&#x20;enabled.&#x20;The&#x20;UDP&#x20;server&#x20;is&#x20;used&#x20;to&#x20;order&#x20;agents&#x20;&#40;Windows&#x20;and&#x20;UNIX&#41;&#x20;to&#x20;&quot;refresh&quot;&#x20;the&#x20;agent&#x20;execution:&#x20;that&#x20;means,&#x20;to&#x20;force&#x20;the&#x20;agent&#x20;to&#x20;execute&#x20;and&#x20;send&#x20;data',0,'[\"Command\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 
 -- alert actions (default)
 
@@ -1111,7 +1111,7 @@ INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
 (2,'Restart&#x20;agent',12,'REFRESH AGENT *','','','','','','','','','',0,0,'','','','','','','','','','');
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
-(3,'Pandora&#x20;FMS&#x20;Event',3,'_agent_&#x20;_module_&#x20;generated&#x20;an&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_fired','pandora','','4','','','','','',0,0,'RECOVERED:&#x20;_agent_&#x20;_module_&#x20;generated&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_ceased','pandora','','4','','','','','');
+(3,'Monitoring&#x20;Event',3,'_agent_&#x20;_module_&#x20;generated&#x20;an&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_fired','pandora','','4','','','','','',0,0,'RECOVERED:&#x20;_agent_&#x20;_module_&#x20;generated&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_ceased','pandora','','4','','','','','');
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
 (4,'Create&#x20;a&#x20;ticket&#x20;in&#x20;Integria&#x20;IMS',11,'http://localhost/integria/include/api.php','1234','admin','integria','_agent_:&#x20;_alert_name_','1','3','copy@dom.com','admin','_alert_description_',0,0,'','','','','','','','','','');
 

From bd48fe4fe6961649116616eee0bc79cfa42f9079 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 24 May 2018 00:01:24 +0200
Subject: [PATCH 38/56] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 1949c24f0c..516394dd2d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180523
+Version: 7.0NG.722-180524
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 70747174ed..f53ecd37c0 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180523"
+pandora_version="7.0NG.722-180524"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 218a50fc32..a83c4e1e53 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180523';
+use constant AGENT_BUILD => '180524';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 27a0919bbd..4c3c0368fa 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180523
+%define release     180524
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index eb75470502..e8c3cabcfe 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180523
+%define release     180524
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 313b8a9695..0a27708b5e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180523"
+PI_BUILD="180524"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1acc9af3b7..552b6b0c11 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180523}
+{180524}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ca79433773..5ba937ff6b 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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 ("7.0NG.722(Build 180523)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180524)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 596622603d..ae24c614ce 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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", "(7.0NG.722(Build 180523))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180524))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c1489b58f9..c07ea3b16a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180523
+Version: 7.0NG.722-180524
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 762e1fe921..54e6b71b8c 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180523"
+pandora_version="7.0NG.722-180524"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a814960f00..d6a0b69cc0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180523';
+$build_version = 'PC180524';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0e06bbb36c..c6083a61d0 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180523';
+$build = '180524';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index b407786905..78ef5db7e9 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180523
+%define release     180524
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e0c8f224d4..d72159345d 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180523
+%define release     180524
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 171a5f7dd9..5c6f58d4ba 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180523
+Version: 7.0NG.722-180524
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 96667b90c4..80bc27953e 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180523"
+pandora_version="7.0NG.722-180524"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 970bc47b28..f1df3cbe65 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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 = "7.0NG.722";
-my $pandora_build = "180523";
+my $pandora_build = "180524";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index eeaf287a0d..54b51f52d1 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180523";
+my $pandora_build = "180524";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 72ef3130fd..926db945ef 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180523
+%define release     180524
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2ff23e0686..f7508b4d88 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180523
+%define release     180524
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index fb51e346a4..8931bac041 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180523"
+PI_BUILD="180524"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 6fc4b5760c..d00df6e0e9 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180523";
+my $version = "7.0NG.722 PS180524";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 58e94208e2..9be4d45402 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.722 PS180523";
+my $version = "7.0NG.722 PS180524";
 
 # save program name for logging
 my $progname = basename($0);

From 653248698d5dc77fce7b3179ab82251fa1566a1c Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 10:31:51 +0200
Subject: [PATCH 39/56] [Rebranding] Remove a obsolete link

---
 .../include/help/en/help_network_map_enterprise.php          | 5 +----
 .../include/help/es/help_network_map_enterprise.php          | 2 --
 .../include/help/ja/help_network_map_enterprise.php          | 5 +----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/help/en/help_network_map_enterprise.php b/pandora_console/include/help/en/help_network_map_enterprise.php
index 2209e03af0..4bf47e5790 100644
--- a/pandora_console/include/help/en/help_network_map_enterprise.php
+++ b/pandora_console/include/help/en/help_network_map_enterprise.php
@@ -113,7 +113,4 @@
         - <i>spring1, spring2:</i> are variations of the Flat.  <br>
     <li><b>Networkmap Refresh:</b> the refresh velocity of the status of the nodes contained in the networkmap, by default is any 5 minutes.  </p>
 
-The rest of the fields disabled, as for example "resizing map" is because there are only actives in the edition of one map already created. <br><br>
-
-
-For more information about editing maps see http://www.openideas.info/wiki/index.php?title=Pandora:Documentation_en:Data_Presentation#Network_Enteprise_Console
+The rest of the fields disabled, as for example "resizing map" is because there are only actives in the edition of one map already created.
diff --git a/pandora_console/include/help/es/help_network_map_enterprise.php b/pandora_console/include/help/es/help_network_map_enterprise.php
index 06142c36b2..6465ff8e28 100644
--- a/pandora_console/include/help/es/help_network_map_enterprise.php
+++ b/pandora_console/include/help/es/help_network_map_enterprise.php
@@ -107,5 +107,3 @@
     <li><b>Distancia minima entre nodos (solo circular):</b> Establece la distancia minima entre los nodos del mapa.</li>
     <li><b>separación entre flechas (solo flat y radial):</b> Separación entre las flechas del mapa.</li>
     <li><b>Separación por defecto para nodos (solo spring2):</b> Establece la distancia minima entre los nodos del mapa.</li><br><br>
-
-Para más información sobre la edición de mapas consulte http://openideas.info/wiki/index.php?title=Pandora:Documentation_es:Presentacion_datos#Consola_Network_Enteprise
diff --git a/pandora_console/include/help/ja/help_network_map_enterprise.php b/pandora_console/include/help/ja/help_network_map_enterprise.php
index e035bb8bc8..94a887cdb4 100644
--- a/pandora_console/include/help/ja/help_network_map_enterprise.php
+++ b/pandora_console/include/help/ja/help_network_map_enterprise.php
@@ -112,7 +112,4 @@
         - <i>スプリング 1、スプリング 2(spring1, spring2):</i> フラットの異なるパターンです。<br>
     <li><b>ネットワークマップ更新(Networkmap Refresh):</b> ネットワークマップに含まれるノードの状態の更新間隔です。デフォルトは 5分です。</p>
 
-残りのフィールドは無効になっています。例えば、"マップのリサイズ(resizing map)"は、マップが作成された後にのみ有効になります。<br><br>
-
-
-マップ編集の詳細については、<a href="http://www.openideas.info/wiki/index.php?title=Pandora:Documentation_ja:Data_Presentation#.E3.82.A8.E3.83.B3.E3.82.BF.E3.83.BC.E3.83.97.E3.83.A9.E3.82.A4.E3.82.BA.E7.89.88.E3.81.AE.E3.83.8D.E3.83.83.E3.83.88.E3.83.AF.E3.83.BC.E3.82.AF.E3.83.9E.E3.83.83.E3.83.97.E3.82.B3.E3.83.B3.E3.82.BD.E3.83.BC.E3.83.AB">公式ドキュメント(エンタープライズ版のネットワークマップコンソール)</a> を参照してください。
+残りのフィールドは無効になっています。例えば、"マップのリサイズ(resizing map)"は、マップが作成された後にのみ有効になります。<br><br>
\ No newline at end of file

From bcb3af09ca0a805b61c43fb99bb0df7847a47844 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 10:56:24 +0200
Subject: [PATCH 40/56] [Rebranding] Minor fix 2

---
 pandora_console/include/help/en/help_web_checks.php | 4 ++--
 pandora_console/include/help/es/help_web_checks.php | 4 ++--
 pandora_console/include/help/ja/help_web_checks.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/help/en/help_web_checks.php b/pandora_console/include/help/en/help_web_checks.php
index fd4b5981c8..5aad76468a 100644
--- a/pandora_console/include/help/en/help_web_checks.php
+++ b/pandora_console/include/help/en/help_web_checks.php
@@ -13,7 +13,7 @@ This is a sample of GOLIAT Webcheck module:
 </p>
 <pre>
 task_begin
-post http://galaga.artica.es/pandora/index.php?login=1
+post http://galaga.artica.es/monitoring/index.php?login=1
 variable_name nick
 variable_value demo
 variable_name pass
@@ -23,7 +23,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&amp;sec2=operation/messages/message
+get http://galaga.artica.es/monitoring/index.php?sec=messages&amp;sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
diff --git a/pandora_console/include/help/es/help_web_checks.php b/pandora_console/include/help/es/help_web_checks.php
index ddb113ae63..48c277c076 100644
--- a/pandora_console/include/help/es/help_web_checks.php
+++ b/pandora_console/include/help/es/help_web_checks.php
@@ -14,7 +14,7 @@ Este es un ejemplo del modulo Webcheck de GOLIAT:
 </p>
 <pre>
 task_begin
-post http://galaga.artica.es/pandora/index.php?login=1
+post http://galaga.artica.es/monitoring/index.php?login=1
 variable_name nick
 variable_value demo
 variable_name pass
@@ -24,7 +24,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&amp;sec2=operation/messages/message
+get http://galaga.artica.es/monitoring/index.php?sec=messages&amp;sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
diff --git a/pandora_console/include/help/ja/help_web_checks.php b/pandora_console/include/help/ja/help_web_checks.php
index ade3608367..f63831c01f 100644
--- a/pandora_console/include/help/ja/help_web_checks.php
+++ b/pandora_console/include/help/ja/help_web_checks.php
@@ -13,7 +13,7 @@
 </p>
 <pre>
 task_begin
-post http://galaga.artica.es/pandora/index.php?login=1
+post http://galaga.artica.es/monitoring/index.php?login=1
 variable_name nick
 variable_value demo
 variable_name pass
@@ -23,7 +23,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&amp;sec2=operation/messages/message
+get http://galaga.artica.es/monitoring/index.php?sec=messages&amp;sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages

From 66dfd9b171b501d084e068494f0fb208057481b0 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 11:16:30 +0200
Subject: [PATCH 41/56] [Rebranding] Change alert action Pandora FMS Event to
 Monitoring Event

---
 pandora_console/extras/mr/16.sql                          | 8 ++++++++
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql         | 1 +
 pandora_server/lib/PandoraFMS/Core.pm                     | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 pandora_console/extras/mr/16.sql

diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql
new file mode 100644
index 0000000000..354d3377f2
--- /dev/null
+++ b/pandora_console/extras/mr/16.sql
@@ -0,0 +1,8 @@
+START TRANSACTION;
+
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+
+UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index b8f41cedf4..551225e14d 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1123,6 +1123,7 @@ UPDATE talert_actions SET   `field4` = 'integria',
 							`field9` = 'admin',
 							`field10` = '_alert_description_'
 WHERE `id` = 4 AND `id_alert_command` = 11;
+UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
 ALTER TABLE talert_actions ADD COLUMN `field11` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_actions ADD COLUMN `field12` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_actions ADD COLUMN `field13` TEXT NOT NULL DEFAULT "";
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index c3e0bba259..f5e1c1ff30 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -822,7 +822,7 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 		if (time () >= ($action->{'last_execution'} + $threshold)) {
 			
 			# Does the action generate an event?
-			if (safe_output($action->{'name'}) eq "Pandora FMS Event") {
+			if (safe_output($action->{'name'}) eq "Monitoring Event") {
 				$event_generated = 1;
 			}
 			
@@ -1290,7 +1290,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 		}
 	
 	# Pandora FMS Event
-	} elsif ($clean_name eq "Pandora FMS Event") {
+	} elsif ($clean_name eq "Monitoring Event") {
 		$field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module);
 		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
 		$field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module);

From acad8d537b99a8e3cc16544714754ec0b3eb805e Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 11:37:26 +0200
Subject: [PATCH 42/56] [Rebranding] Added tooltip to avoid Monitoring Event
 name will be changed

---
 pandora_console/godmode/alerts/configure_alert_action.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 0156603d4d..d1fe842469 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -111,6 +111,13 @@ $table->size[0] = '20%';
 $table->data = array ();
 $table->data[0][0] = __('Name');
 $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 255, true);
+if (io_safe_output($name) == "Monitoring Event") {
+	$table->data[0][1] .= '&nbsp;&nbsp;' . ui_print_help_tip(
+		__("This action may stop working, if you change its name."),
+		true,
+		"images/header_yellow.png"
+	);
+}
 $table->colspan[0][1] = 2;
 
 $table->data[1][0] = __('Group');

From 063865e1792972de3791c759744899d58e45a172 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 12:50:24 +0200
Subject: [PATCH 43/56] [Rebranding] Refactorized logos preview in nodo

---
 .../godmode/setup/setup_visuals.php           | 342 +++---------------
 pandora_console/include/javascript/pandora.js |  51 +++
 2 files changed, 106 insertions(+), 287 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 1a57c376b8..c885b1f2cc 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -163,7 +163,7 @@ $iconsets["color_text"] = __('Colors and text');
 $table_styles->data[$row][1] = html_print_select($iconsets,
 	'status_images_set', $config["status_images_set"], '', '', '', true);
 $table_styles->data[$row][1] .= "&nbsp;" .
-	html_print_button(__("View"), 'status_set_preview', false, '', '', true);
+	html_print_button(__("View"), 'status_set_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
 $table_styles->data[$row][0] = __('Login background') .
@@ -183,7 +183,7 @@ $table_styles->data[$row][1] = html_print_select ($backgrounds_list,
 	'login_background', $config["login_background"], '', __('Default'),
 	'', true,false,true,'',false,'width:240px');
 $table_styles->data[$row][1] .= "&nbsp;" .
-	html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
+	html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (header)') . ui_print_help_icon("custom_logo", true);
@@ -202,7 +202,7 @@ else{
 	$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
 }
 	
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
@@ -218,7 +218,7 @@ else {
                 $config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
 }
 
-$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 //Splash login
@@ -229,7 +229,7 @@ if(enterprise_installed()) {
 		list_files('enterprise/images/custom_splash_login', "png", 1, 0), 'custom_splash_login',
 		$config["custom_splash_login"], '', '', '',true,false,true,'',$open,'width:240px');
 
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	
 	$row++;
 }
@@ -256,7 +256,7 @@ if(enterprise_installed()){
 		false,
 		'width:240px'
 	);
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_docs_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
 
 	// Custom support icon
@@ -276,7 +276,7 @@ if(enterprise_installed()){
 		false,
 		'width:240px'
 	);
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_support_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
 
 	// Custom center networkmap icon
@@ -296,7 +296,7 @@ if(enterprise_installed()){
 		false,
 		'width:240px'
 	);
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
 }
 
@@ -414,7 +414,7 @@ $table_gis->data[$row][1] = html_print_select($arraySelectIcon,
 	"gis_default_icon", $config["gis_default_icon"], "", __('Agent icon group'),
 		'', true);
 $table_gis->data[$row][1] .= "&nbsp;" .
-	html_print_button(__("View"), 'gis_icon_preview', false, '', '', true);
+html_print_button(__("View"), 'gis_icon_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
 echo "<fieldset>";
@@ -952,6 +952,7 @@ function load_fonts() {
 }
 
 ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
+ui_require_javascript_file('pandora');
 
 ?>
 <script language="javascript" type="text/javascript">
@@ -1135,287 +1136,54 @@ $(document).ready (function () {
 });
 
 // Dialog loaders for the images previews
+$(".logo_preview").click (function(e) {
+	// Init the vars
+	var icon_name = '';
+	var icon_path = '';
+	var options = {
+		title: "<?php echo __('Logo preview!'); ?>"
+	};
 
-$("#button-custom_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<div style='background-color:grey'><img src=\"" + icon_path + "\"></div>");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
+	// Fill it seing the target has been clicked
+	switch (e.target.id) {
+		case 'button-custom_logo_preview':
+			icon_name = $("select#custom_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_logo_login_preview':
+			icon_name = $("select#custom_logo_login option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_splash_login_preview':
+			icon_name = $("select#custom_splash_login option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
+			options.title = "<?php echo __('Splash Preview'); ?>";
+			break;
+		case 'button-custom_docs_logo_preview':
+			icon_name = $("select#custom_docs_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_support_logo_preview':
+			icon_name = $("select#custom_support_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.grayed = true;
+			break;
+		case 'button-custom_network_center_logo_preview':
+			icon_name = $("select#custom_network_center_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			break;
+		case 'button-login_background_preview':
+			icon_name = $("select#login_background option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
+			options.title = "<?php echo __('Background preview'); ?>";
+			break;
 	}
-	catch (err) {
-		// console.log(err);
-	}
-});
 
-$("#button-custom_logo_login_preview").click (function (e) {
-	var icon_name = $("select#custom_logo_login option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<div style='background-color:grey'><img src=\"" + icon_path + "\"></div>");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_splash_login_preview").click (function (e) {
-	var icon_name = $("select#custom_splash_login option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_splash_login/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Splash Preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_docs_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_docs_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				dialogClass: 'dialog-grayed',
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_support_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_support_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				dialogClass: 'dialog-grayed',
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-custom_network_center_logo_preview").click (function (e) {
-	var icon_name = $("select#custom_network_center_logo option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Logo preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
-});
-
-$("#button-login_background_preview").click (function (e) {
-	var icon_name = $("select#login_background option:selected").val();
-	var icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
-
-	if (icon_name == "")
-		return;
-
-	$dialog = $("<div></div>");
-	$image = $("<img src=\"" + icon_path + "\">");
-	$image
-		.css('max-width', '500px')
-		.css('max-height', '500px');
-
-	try {
-		$dialog
-			.hide()
-			.html($image)
-			.dialog({
-				title: "<?php echo __('Background preview'); ?>",
-				resizable: true,
-				draggable: true,
-				modal: true,
-				overlay: {
-					opacity: 0.5,
-					background: "black"
-				},
-				minHeight: 1,
-				width: $image.width,
-				close: function () {
-					$dialog
-						.empty()
-						.remove();
-				}
-			}).show();
-	}
-	catch (err) {
-		// console.log(err);
-	}
+	// Display the preview
+	logo_preview (icon_name, icon_path, options);
 });
 
 $("#button-gis_icon_preview").click (function (e) {
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 4aaf466876..57bcfa82b9 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1634,3 +1634,54 @@ function ellipsize (str, max, ellipse) {
 
 	return str.trim().length > max ? str.substr(0, max).trim() + ellipse : str;
 }
+
+/**
+ * Display a dialog with an image
+ *
+ * @param {string} icon_name The name of the icon you will display
+ * @param {string} icon_path The path to the icon
+ * @param {Object} incoming_options All options 
+ * 		grayed: {bool} True to display the background black
+ * 		title {string} 'Logo preview' by default
+ */
+function logo_preview (icon_name, icon_path, incoming_options) {
+	// Get the options
+	options = {
+		grayed: false,
+		title: "Logo preview"
+	}
+	$.extend(options, incoming_options);
+
+	if (icon_name == "") return;
+
+	$dialog = $("<div></div>");
+	$image = $("<img src=\"" + icon_path + "\">");
+	$image.css('max-width', '500px').css('max-height', '500px');
+
+	try {
+		$dialog
+			.hide()
+			.html($image)
+			.dialog({
+				title: options.title,
+				resizable: true,
+				draggable: true,
+				modal: true,
+				dialogClass: options.grayed ? 'dialog-grayed' : '',
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				},
+				minHeight: 1,
+				width: $image.width,
+				close: function () {
+					$dialog
+						.empty()
+						.remove();
+				}
+			}).show();
+	}
+	catch (err) {
+		// console.log(err);
+	}
+}

From 8a6755d224f7396628eb29e5d8c97ca7d48f47e0 Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Thu, 24 May 2018 16:28:51 +0200
Subject: [PATCH 44/56] fixed conditional in ajax.php

---
 pandora_console/ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php
index b3e9fff95f..b8b7481786 100644
--- a/pandora_console/ajax.php
+++ b/pandora_console/ajax.php
@@ -49,7 +49,7 @@ if (isset ($_GET["loginhash"])) {
 $public_hash = get_parameter('hash', false);
 
 // Check user
-if ($public_hash === false) {
+if ($public_hash == false) {
 	check_login();
 } else {
 	enterprise_include_once('include/functions_dashboard.php');

From 750ed29ac953cc6feaedd4f60cb1e106e52e9ad7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 16:59:50 +0200
Subject: [PATCH 45/56] [Rebranding] Added a header to white backgrounds and
 make the favicon and the mobile console configurable

---
 pandora_console/extras/mr/16.sql              |   1 +
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   1 +
 pandora_console/general/pandora_help.php      |   2 +-
 pandora_console/godmode/setup/license.php     |   2 +-
 .../godmode/setup/setup_visuals.php           |  86 +++++++++++++++++-
 .../images/custom_favicon/favicon_meta.ico    | Bin 0 -> 1150 bytes
 .../images/custom_favicon/pandora.ico         | Bin 0 -> 1150 bytes
 .../pandora_logo_head_white_bg.png            | Bin 0 -> 4341 bytes
 .../pandora_logo_head_white_bg_2.png          | Bin 0 -> 4198 bytes
 pandora_console/include/functions_config.php  |  24 ++++-
 pandora_console/include/functions_ui.php      |  52 +++++++++--
 pandora_console/mobile/include/user.class.php |   8 +-
 .../operation/events/events_marquee.php       |   2 +-
 .../operation/events/sound_events.php         |   2 +-
 pandora_console/pandoradb_data.sql            |   3 +-
 15 files changed, 158 insertions(+), 25 deletions(-)
 create mode 100644 pandora_console/images/custom_favicon/favicon_meta.ico
 create mode 100644 pandora_console/images/custom_favicon/pandora.ico
 create mode 100755 pandora_console/images/custom_logo/pandora_logo_head_white_bg.png
 create mode 100644 pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png

diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql
index 354d3377f2..65bbe43c7d 100644
--- a/pandora_console/extras/mr/16.sql
+++ b/pandora_console/extras/mr/16.sql
@@ -2,6 +2,7 @@ START TRANSACTION;
 
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 
 UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
 
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 551225e14d..436081f2b1 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1163,6 +1163,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '3
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index fa1696370c..72ed4ec827 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -61,7 +61,7 @@ foreach ($files as $file) {
 	}
 }
 
-$logo = ui_get_custom_header_logo();
+$logo = ui_get_custom_header_logo(true);
 
 if (! $id || ! file_exists ($help_file)) {
 	echo '<div id="main_help" style="background-color: #fff;text-align:center; padding-top: 15px; padding-bottom: 15px; ">';
diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index ecff0c27ce..a772c0e015 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -103,7 +103,7 @@ if (enterprise_installed()) {
 echo '</form>';
 echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="' . __('Request new license') . '">';
 echo '<div id="logo">';
-html_print_image(ui_get_custom_header_logo());
+html_print_image(ui_get_custom_header_logo(true));
 echo '</div>';
 echo '' . __('To get your <b>%s Enterprise License</b>:', get_product_name()) . '<br />';
 echo '<ul>';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index c885b1f2cc..dfa3758309 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -179,6 +179,32 @@ if(!enterprise_installed()){
 	$open=true; 
 }
 
+// Custom favicon
+$files = list_files('images/custom_favicon', "ico", 1, 0);
+$table_styles->data[$row][0] = __('Custom favicon');
+$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your favicon into the folder images/custom_favicon/. This file should be in .ico format with a size of 16x16.'), true);
+$table_styles->data[$row][1] = html_print_select(
+	$files,
+	'custom_favicon',
+	$config["custom_favicon"],
+	'setup_visuals_change_favicon();',
+	__('Default'),
+	'',
+	true,
+	false,
+	true,
+	'',
+	false,
+	'width:240px'
+);
+$table_styles->data[$row][1] .= "&nbsp;&nbsp;&nbsp;" . html_print_image(
+	ui_get_favicon(),
+	true,
+	array('id' => 'favicon_preview')
+);
+$row++;
+
+$table_styles->data[$row][0] = __('Custom background logo');
 $table_styles->data[$row][1] = html_print_select ($backgrounds_list,
 	'login_background', $config["login_background"], '', __('Default'),
 	'', true,false,true,'',false,'width:240px');
@@ -187,7 +213,6 @@ $table_styles->data[$row][1] .= "&nbsp;" .
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (header)') . ui_print_help_icon("custom_logo", true);
-
 if(enterprise_installed()){
 	$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
 	$open_files = list_files('images/custom_logo', "png", 1, 0);
@@ -201,8 +226,24 @@ else{
 	list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
 	$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
 }
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+$row++;
+
+$table_styles->data[$row][0] = __('Custom logo (header white background)');
+if(enterprise_installed()){
+	$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
+	$open_files = list_files('images/custom_logo', "png", 1, 0);
 	
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] = html_print_select(
+	array_merge($open_files, $ent_files), 'custom_logo_white_bg',
+	$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
+}
+else{
+	$table_styles->data[$row][1] = html_print_select(
+	list_files('images/custom_logo', "png", 1, 0), 'custom_logo_white_bg',
+	$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
+}
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_white_bg_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
@@ -230,7 +271,6 @@ if(enterprise_installed()) {
 		$config["custom_splash_login"], '', '', '',true,false,true,'',$open,'width:240px');
 
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
-	
 	$row++;
 }
 
@@ -298,6 +338,26 @@ if(enterprise_installed()){
 	);
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
+
+	// Custom center mobile console icon
+	$table_styles->data[$row][0] = __('Custom mobile console icon');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_mobile_console_logo',
+		$config["custom_mobile_console_logo"],
+		'',
+		__('Default'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_mobile_console_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+	$row++;
 }
 
 //login title1
@@ -1135,13 +1195,22 @@ $(document).ready (function () {
 	});
 });
 
+// Change the favicon preview when is changed
+function setup_visuals_change_favicon(meta) {
+	var icon_name = $("select#custom_favicon option:selected").val();
+	var icon_path = (icon_name == "")
+		? "images/pandora.ico"
+		: "images/custom_favicon/" + icon_name;
+	$("#favicon_preview").attr("src", "<?php echo $config['homeurl'];?>" + icon_path);
+}
+
 // Dialog loaders for the images previews
 $(".logo_preview").click (function(e) {
 	// Init the vars
 	var icon_name = '';
 	var icon_path = '';
 	var options = {
-		title: "<?php echo __('Logo preview!'); ?>"
+		title: "<?php echo __('Logo preview'); ?>"
 	};
 
 	// Fill it seing the target has been clicked
@@ -1151,6 +1220,10 @@ $(".logo_preview").click (function(e) {
 			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
 			options.grayed = true;
 			break;
+		case 'button-custom_logo_white_bg_preview':
+			icon_name = $("select#custom_logo_white_bg option:selected").val();
+			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
+			break;
 		case 'button-custom_logo_login_preview':
 			icon_name = $("select#custom_logo_login option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
@@ -1175,6 +1248,11 @@ $(".logo_preview").click (function(e) {
 			icon_name = $("select#custom_network_center_logo option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
 			break;
+		case 'button-custom_mobile_console_logo_preview':
+			icon_name = $("select#custom_mobile_console_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.title = "<?php echo __('Mobile console logo preview'); ?>";
+			break;
 		case 'button-login_background_preview':
 			icon_name = $("select#login_background option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
diff --git a/pandora_console/images/custom_favicon/favicon_meta.ico b/pandora_console/images/custom_favicon/favicon_meta.ico
new file mode 100644
index 0000000000000000000000000000000000000000..71713c757fd482eb950f3021672f4cf5ebd544bc
GIT binary patch
literal 1150
zcmb_aJxc>Y5S^f4=~dR2R(gI!ji#{BLJ$cGHYqI91hi1ZLIgQd+6b052X>a0R`DO?
zCnWzMmUioVo110a<P^a>-tFw}yf<(5R-}SANd(_{X-|vHiO2$gC9I6rF^FLAw`aRv
zPk;>Q1I}QGI0w=)4ekNVv%E?1MXd1$uIhc$0Kd1jyW<G0zu7!=Yn_%`e!BD{=ek#n
zz8Ay|&a1blZvE`UYjCU`?}vQqR<D|F^}Zd}z{%MMNAlB`8(+(M;JO7hs9mfL3x1dL
z#kY>f1fQDkxW|4})ACmy&pn?$$~<hej!OCDq|eu0BkD8M<37(Rs{f$#SVMi(4)(lu
z<gH)$=e-G<<giDc2lMHfXU2bN{|Pu5`Fs!u52{6u_OtYQ=QWLY-qU2n_I%#^o^tI-
zKRkC+n_Pc)lwWwD#+VPQg_t$QxRDOegF0P<9C5?u{YU&UBQls0d9MHv%zgm(naBLk
JSrO+%z5pN8UXuU-

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_favicon/pandora.ico b/pandora_console/images/custom_favicon/pandora.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f72d6cee90fb3d863a4917eadec20c668e665d7d
GIT binary patch
literal 1150
zcmb_au}T9$5S^f4=~dR2R$}iDSf=p@tnBmyEDk$u1RJqB1RKkgDKu&!LW&b?t`Krf
zKpRg|Xux89Z?kiZ8!sZbVY0I`^WMDKTagxiNh0`PmhE|wB@tPHA%w^zj!gu)-_~k(
zKY^vN0n8bz;AgP4CJyFcth2bE{N0%24_M{<#sPf3etGC<+JCEm=FZD|*MBYj&a>vi
z?q`AD=K195#_c_JJO_7MPu_!~>pH^+%aL&oU^C)}@0IUmH85_C9OMqMD&TuO>#}_<
zmOgWwN8=WM^-_2W>S)rilV3FAi77_Uo+FyG?#DduDe8Zu=a@rvY}_7u?nv7p=;yns
zIf>znT&$;N-Wk8;=G|#s2TV#l7yMd-auK8Rj6Od+r_s)LnoQ6h&v&0I*6!59dpEs_
z^>0V<K?6CabXYF<>@kIncz7S==^4x5w{6{j_-_j$<($ZM3kJe;hB41N){hrOoD=y1
DEgc48

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_logo/pandora_logo_head_white_bg.png b/pandora_console/images/custom_logo/pandora_logo_head_white_bg.png
new file mode 100755
index 0000000000000000000000000000000000000000..56d101e463aed0fa44b057267438e4c4c9658571
GIT binary patch
literal 4341
zcmV<R5DM>!P)<h;3K|Lk000e1NJLTq008O$001fo1^@s7%6s>00000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU?mq|oHRCwBAU>HcyuuDw=i2uL;_T)bZ
zz{E{WO&vfOoekqd>HWxj7#nCF7^B$(=QBa+`}M9j873ZaV%T`K0;B+DImpm>pg|yh
zJctivGn_ts`T)oRAngbh1If*Yv0)fw7MgirzzB88e-0Kth97@EAzbHni;<S0%mlN9
zR7-(A3&11Sz%W<=KmZMBiUvnM2p}Z_2DH>H0LADj8<dz7kkz86UKkrl3&7*nKq`<y
zf>)EFakn}{zRf<kW1uPaK9C90v>wR+086EyR13mDu|!aAKuW0&$SD`<2~esArG@wK
zlnnAA$U+bRWhF)+pm{2WS%}U?3PJ(o!ht~QZonfqf56fZKmakKB`5<Rbsmd4L0}&K
zFzj;9hAZXZ-1Gd?wg30uorLEk<lF>}qW@4j0hXA7xB!}~;0YW}EiPIBSv@|r=<a~J
zEdhw%!{m_Y^~kxG1z95~(|}53^mGgo$CkFCIeGz*S^&+t6OfA!AfFM)e~&GY(9(Q9
zjx-NSWrjq=6)10902Mq)fdDcWR6-mC;sY2l3yVb%0LAcuyOVLo>`(-Z*pf4b7>z4>
zdI5j{8Zn5GP>c?jSY^THNdZo2cyr>!qlF9%yW0LEdlp*R8o-(w=xrUO2J-=^I7qDk
za`OZ#UI3*0fjAJ<L_sUmU}_YA6bOItZvDuBWX=bmn=W9qkKAq@KxU(O6jWRzm$tCh
z1c-g{*?L6R#O>AtsImg6V;Z0(FC#JyO(~!%2c$j`)^>u*J3!Td>go+hy$7%!sG9Xq
zPxFJ?UqCTKcy)sm;P7e%A_i-p9RTtj;Z+e-Jrhz<jp9idoo=xKX6}7F%^;AY9$;xI
zDPXCZV4*AkZB#N~sfq$Xfd~!IjmYL=sR<rH8=ZzwPdj3(Ets&yBr=$JA^>mN2gLw1
zCKREL!;nMv1X64^LiyPAAoClL%>~5}O02rwQUtZmVaXWOkbu^&jTnUy$oC+RK6rnM
zVd0rr6p#38cYr&yL%mRf6-I)<m;|?GKz$o`^(uygcPBH%n=EGN+;2K8N?usU9Nvh3
z@%cJ9Rza}~O2*I*`v*eZ7GlM)sM$}Zz64UbSLpTVexzO|3`_t9MB!+YV~7BN0PI<z
zQUfs%J<$)iGuRe~1OA|$;R8TnsYX>H%Ngt;K(`jvT2w(J7$kzB27ziF67r7S&UTw@
z0>cayUDN5^UM`oHWZ!#<t~*i$eIupo5Fc)aa?L>{vh*7}WM49~O{}ppmHdeV#pnLz
zsxC@38*@cTQ0~Im^h2w@AbOv(lc?fOu;V2zMMPAx>X2p7C66RCa)uzN#{DG@7s^A9
zWnI)fPuyp=LZo)2^4gMT#`I;w0u**IxF82J3Jy>x&?!ZhbJxzJdzobbm6FKPz|3fp
z%|d{wnA3Be9}ND0q}9Ynuqo$+q!)*5zrwIUXOe05nF4YOy%dsbL`*Fgw<XEJr0iLi
zZNqmFhec<dhsFQf=ZkMKu7bq?1iNw&_afiWcOT!^0FWD)MOG5$7bM~*nyyBkgF&z`
z6X<-x%%|KL4Ronp&{$trjs}G}Kmj%ODztW?7TB0}z)R8QfF@w+uAfIim4Jq<UKu#1
z)Z23;N-bsOWKc7|9Rd!63u-O~b?#YtEAM1e1G@qP%+F)87?Y?z?2r>Ou-dZ-h)eH;
zk>fxb5=h&g9PBQY%c*op(t!H(3=EXk@$PlDvvp7ditYE^)lJ_@Wkm}E21-_(%5F5!
zf2(n2%1m#bP8W6qycGr%-Y7suEyXVY1yK^Jz1}J;Kr!2C+cZ@)A8Mv3Z6jxtkW(eR
ztD-aNR;)jN;UpyXshwO?30N-+o`1Y8479*DQY1_ybf%e5`(kynDb4dh8%F@b{Z5T`
zFnEVVKw|wK8~3@+P7}r;PsoY&35z51eSebaM|-(%b@gQN-o$#umjLWsy>1gh5Z**V
zqC$2_gB<bzIU1mg{RZ|EVE05(p1}4K*af}A3*gWr*_2d-E)`q~Qc#cx3L=37_nl|#
z@nruJ2V>wyoRr}8?%vMs{Cx9mihutbOh_Ciq!}(>aumo%3t1(l0zin!H>U}4rrcJs
zoGYx<Ycg|U1EoTityHQlTca~Tf{*V#xr`*t0E#KoAT|tlMX$Q8Kz6G7dx}m{vRIf@
zN5Ir>Al~&k<H9#JSB)gafDz>K5?i}Dny;r14L&rDr8-mH+BG}(pUyke)1i5H`Xc}N
z;>Xu1un$B;P+d$2ZQ<@fQ=v9iv(NMwGsA&Fe`&~msSWbPwj;$^^Npd}#LU&YUYXRO
zSdYc4nRz@LxqZW8C36VS(@)oiDCs=)(gXn+0t;pV-pe2a0DpiE3{;SO2nApk06d|e
zD@H+up2e*Pu-lr(Z9zLgrN`Le$hVaH4SBQp=Bm~U44#x|4f=FityiWfos)(nWeh<m
zADh>$RFKK^hZ4`7Q{EYPAjdg82!#V-(oCN#2o|1i88GcP6j7%Xk)Orn+JxKw6yxx?
zvJDg3>M_WTK$pe=a3dIGW>1sMZcna>YF8oG2vWkKuks^d!o4Vkk}y1&k5+zYT(&;|
zb(MJXbgJs&6m~q2TgpmV!p)tLcpw}MvI0^uS6k{=WuhNFBjsN?YXGF#bok&kLbI@5
zL(!L&$grVcu!(lXRT_v^s1A~_0T4u?L?`+hdz7h7s%A^HBTgR|%-a#0htaTeGppoO
zV@@Rb>FHGzVeWYYHUq=s-S$22s@K1-{XHl}>~od*#n>&MQuB^boq^AcQK%Gv`>~?S
zRkWzQNC%P{8>m%o8aFj}q{?c!Sts8o{pd?G;S{stTbB7AWo>gaiSKZrWbwH+pL!lB
zz44d>I+gqSG-Kmt|JNo{eUd%fzRuQ_Z!?cX$^w>yyyWPUi|=0+HFG?0Hzp^h1x<Yx
zL7D5a@O@>mk=sI{U76O1Q*FdXON2i?^vy3;EW|zi{l2gYZDA!gy(vw$6Yyd^oK)0P
zRsQJ}m|s;-b*43i{C-&%yCvTZ$DdwJw#v7U)0D<1_#8o#y0%;>^bg90<=B^CcDZhf
z6Nr=r5$@~v&rJIHjk$g6j@iE3$o;S7;=;IC))hIa(ndo`d{X)MoZXQ5&7G~?-0z;y
zJq4Yg24KPg-M0-U+o=98@?x<}1e#Cc`Mg3;Z_&jTbE-y+*SQMZ>QpMx4xNDtXf048
z9tUUXK_KdFQA&{9!~*%~CA^6ux(cNvO$1okvn<XPkJpLWATcM^5SDmwjmfk^?0iy0
z-S}xCya7UsI5q)V2t}-W5s|Uaa`fph0`x+bCFT~B7&A0p2vixnHnp#wTJhw7TK=uS
z2l1Cn40Al8#5l2>lt!V<LJC=e{1TwOtJiU)2*PucgG&&0Ot5280=yCuWNV8DSn~j|
z_5&c+PjKD@LcF>Mu+0<fg-9UJi3kaVF9RgF5djIw@CNvstKO|C_uq7nISINXYtQH1
zc6U#IU0+pKRd<#`OiuhuLiE_8OQ3gADCI8Mvq_Si7^sws{8{D~m+V6Z=N^9VBuNrb
zJ-|85nxR^!kUeqgq-~QVX#-SSZn}@)^c<f5Hy^*%IDLmB84l#1|N5rkXl7dWJQ=}B
zlK6R(b{3oSNC3o(w?C~zN81X{agi4*L>t%Y5{gM`bE>jAycW7}QwoklTQi?_RD^_~
zRt4H0%J1PZP)b;cEXM!Da~v=qZY)9PzHL?1&Px1!+sqB)yi$8pn%mr?ErcSeVs;@J
zBz5H=L$X3eOs>#i;H9B|3sJ6NN^|Qvtb!7{ZIdn9bAa@v&jdnaUcU2%HSP@O=->ab
zt-%N|<GlTB@P78V_eS>hub=BQsuILoodx7x^)1v|7fc8c;$TF^ysb3=t+I!JK$+o@
zd-MxsCME(*ZOjQi2H6LUX-si-JeFMt(0akJv5d&?kW-sq(!tcklGm*}rM+bRQS&+%
z87(<&OnuAPM&k3nWmDOEY&@l<ojUS1dk9@q7+71LX`lTb{&s44Mrv)Smnz@kbq?0E
zfb=KVqLUStq#*F6`0eTad(dAM6vGAokLae`?>;oeEh2XPMP$CZsTNE|mjkG=Vo}{v
zK<Kpq=}MmPS}Hub1i`DTz+?A?4mg^u9(>1u#wI~J&}ccdxzdbjXJTK5IbCY{BG=MR
z0A{F3U-M;idt0oHCwo9&`gN`Phm5AFCyUa7f2&)sEC&PgQTm#8Jp)K*HuY@-D1f&8
z;S-+z)}Xd3Oi{L@DsdswZU3jXnhJKHP1iOn(b`<2X)>|6s}5pW0EB0ZlH)=J6m1@M
zF&1bnP3(^DITp4GDZFx+$Nc$FP-vHxFiUc=iIx#VA88`r8#=>bK24a}F|9A0col@b
z78E`=Z5&iUn`>2F!K;#9&k4vyEcLxIQQWKdzG|d2HntE^v(WkU4uHgq=e+{B$aCd@
zW`YO241AbJCG#wrw<5~dpj`p>nGOWdSa*!}<<#z?qfN)8EnbHdlrnm>=>|R<n>HIe
zG^W|adu6xYu#I_rcz?y_4VrK6*bFjFp3|5%$}{?@VhqM)(q&{9--QD8XwWLRxP=qQ
z|7jlRF+9Mk5Glfm4M07WV3*q}8b=HM+S3N=XDuULNqY<gwTlgJo@U3n;v40BIeg9m
z3mbNAxSFA_q4I@gERQVoTithY&ib)**xQl~_-ryoB=yZGQU8KHkFn6WE~hIupXz!x
zq%jK(TV0DW1_QO^)I?`jDzQ-2R)Ual1=JJCjVmmg@9-L%aAN>SsEw*JYp(-9x^qy|
ziX1?Ea~V=UN6Z%YvA;GtKs)HSVhm~xq28*Re`!vfTQ;9oCk`D5G?6SDzVJNLFPJ?$
z;}-xq6oi-GrRVXb^;xG5sBNjPO}NMS7qd2PQ<Q(@cyE(ivL)4G+B@vIiLQ_I*_`jR
z1}ePKXyuYSY!1KUvS&)0okupQDkY;R7_`-e==<OF(`3h<Gc8wHzH3O|GZo{Rw0NF;
z?qr>#2?Oya0FWcu2lzh@02|QS?~{}2PV{G{TT^r@G3RxX3=Fj(D&5K^H&r=noaxDu
z>kvhCVO!$gmg5yKkgD6apjlbHh{i(XWoD8j`9Fy*C#peHpix1AYZsb0c0n~e&{lx;
z`R`8;_T{(E@(=+32WMCJP9*&8_Q#KHfKS)lBuPN^0jmmZuwBUrhZCGZK1FvFusv+t
zNoc@6*<m@^T4m@&F(*hxZB>!&WJE8EfHpv-_NouALi3Kc`i#yMHk#j}otXI<%krTS
zV;eKtS%kLJ)%YmLV<zl>uQl28@Prl0S%R}s*S)Fg$fYBxZJm&_Q}TkAA{u7d!l9(I
zy_O7Y(d|SC7GF-cJS;OuNjVS4*|W$+tmbvq!CcF+#Efk$t|klWlWu&0l80^>J=ZUg
zCVRxLo%**V_R7wZjQXzV@&y63>fnJz3%hu5m-$_jVrpm60k|rDH4JH=(7=?+=X$mP
z2J<d2@%uXa)H(Gv&|!d81_N{@c+ekpX^Rrw$YV5yY9}&!hSRb81rS0tWnW_ZrpiWz
z(%!DyVe?c*j_VZjRE4&osr>IfzNiWh6nXI^i#zLrX1GcDr%95W2&fJKXW2t!NlC9N
jd2W*=Ns=VVe^UMdlRAXivDS8%00000NkvXXu0mjfpg0Qx

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png b/pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9591e2fab119835e744b707d564d5617e1213e2d
GIT binary patch
literal 4198
zcmV-s5Sj0ZP)<h;3K|Lk000e1NJLTq008O$001fo1^@s7%6s>00000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU?2uVaiRCwBAU>Imnw@u?e48z2Xjg1?C
z*a6CRfU#k6Q2IYi9$5}(jsr4=+5uO?1hcf!^Ey}nL?c;V55)0M!~21FKg^=DXU{f3
zX-23RNKOEV&qMX?2V#&#51@Pos2CV9!YsB>h+{bMU=ch7n!Ii>(lUgZV3r_T3IrFR
zL3STq15j)~8ts5f4oUnxp?Ka;uQUY^Km&r{@rx`7i(6321SKG7P=bP90EiQi6BbZz
zK9E`n6*~Y@3!<T^_XE(Z3$T<7WFJ7W6qJhVw`($ZYF08>D#kM+#TzKt4?qodgr#N}
zKuXOZumFe^yqmu^BBk6yXinGw!~yWc`X2~j`4$9d9lYRF4DuleNbqUE*-)SMqou}v
zJgNFVE=z!N2G~+JD2NS!xPcxC2_S$Nv1FY9AhjMz=m9Vu6o*Z&fqD`YWd-0A=dg!C
zfK!^`!}q5Q{RdpImXx4G3r)PBob(=)Lx4CCsTg-aPT&M+cmRX=Xy(IdV8(C+nGJM@
zBXVvBxeF=hgX9E&VjDnW$Zlpr@^}F#$AU1(gP^nw^C+xd0%}%34=tcWK0qBP04f@=
z<mC5g>G?mFJOJ|O1T1O(Kg{#E0L-IEo&vdXJ$kW+9<%V`$v`@g;lfi$N>&guWBBps
z6T^#7H)vi5(xr5Qg%HrAg5V1FDI&{0cy|iq(GTbz1;q%q(uxqkQvVuYQIkN9xj?Ld
z&n|!f<e0xp!%z^%OQGN*G?S}iM{#g9LHFY5R(HYKE{T)>KzH37;~!8+W(OO(IM&fE
zfi8kW&G&H!-yW|&GDeS<=3SH0d+*-&KKK63%csOP&x3kJtF{N)-4P_Lto<`jx+F^E
z<O_+?L+h9Ki2NxFl@dRvG<N~p=-yuQcr8#4Qk58jBzEGNfO7%36{%&;qz|%?KM7wf
zVE2i8<+%sLTbcaEjMN%%7%RI0^c40m7UUW!pNSgd`-%ZY+Z-3jLGRE72tk4he=R?_
z%-GfLQ}1=WK>&QEDW~hglPN2y(P}AAwCw@Ko^0un$$GUb>TbNhd~?u{&d1LA{j=;m
zPS1E{*-%S!sd)>0f{<-Z<sOb!5>#BsIP*Nyr*Wj+mIh*~!1I>vcW3*H?D}*P4vsF?
z09XxR-1d5^{c7~`e(O>etICGdMUW<)+O4`sS){6x5w|<_WCS~kf5}SgYsf`Gv!=yf
z?pZX1k&=DgO-CJ|qK3yH*mpzYyRrM)BTf<TN%Gkfk*kJ_SnPAcmHf5Sk6!`UwR)Wd
zf*^bt9)NoTDQpdAV__jzTTxmmrHO_21|}xfSI~1j0la_#ODpLu;0=z(-kr<L<zw6*
zpaQ}shTPtAx9qnw^L^jCRdV4n)I#Ip)D8?(2P<^7!T{YrE$N<u>H?F9Vs`sced-2u
zBRAk?o?_tIC_R&NCt%p<Hq#Czm@&1JX>&25B}6`1UJL_cT+bk07=wbgJtw_;`;Cwr
z+I$kMTc$79YcDm=6I@n(*$e?n03vN7B1{1GuSYezpguIDNGq9_C7#VR!=lLxIOa`O
zIsp5(xct4;^%69pc<eX7W2o<2#zf%4iBcI#`Qgn+*K_ln1lUVg|5kDNJcXZZn|y=J
zxZ({^_y#o<pkvK>>o*%tEDEQRK3@-!*0K<-oxtR}mPm;CFd`Ju0$9wEG7WKZ24JTq
z5)<Ylv{<r9Cp6c9yO}5%8e^t1{VlyQxUY0E*fYJ@RUW*2UjvlDLO@-qH@$d{Y)*%z
zO<2z29|7~o>8<WJ*KHS-HTMf8XXiTdAPcl5GWoNR``Q5UL_GnFS|(R>72A3Vb6IWx
zYy(Qy3O6ZVFV#78$sDE;tf_K3Lur-Lt3)Jf8(Sl({&X{5lktacgCCpOTh#@My6MlL
z?kDf%{%TMQSTvVN!K=D@6bA9Jv0owuiydo3BT(NKoRTt|4a#F)*~Q58DW0}$LiZ!~
zpDk{N9&^sjcNLiTr~E^L$L8sVP6|D>|Al{h-?Kg?r}q(+psmdZiQK@j9-YyiVq`zs
zp8)J!v2GJV5ItG6NH!H67m0?>G_;)m!2Sa0DI9-+lZrB?K$Nlh0ml_(LV-jVcQi;o
zz5qi_f!}4ujK{OHYXXW1H%gSm9`DZG%+Aiddz<>}e?ydvRa=NOTf>C^s#6ov?-~uM
zWzU_ua^@i+9jQ`Ryn9~#o)QqStGJFO1SmIv2n`zKO0OVhMU&AgS@o`7M*ucS2k&>)
z8~`aw!<IgcHz(lXEHHnj=Ty}*3&tujjsw1I&~!1kyl3L|N>3n25~TyXv)rXm)%4J{
zpm!}EzSw$QLWo{V<H2bH>%Ghjn31S1xZraU3_Uq6>4dfm3B<c#y)#Be$W-Z#13Mx(
zZbw{)1n#FYAPM+iSOJzfwB0+#Yg-PLzyk|7{qH`#v{v~d#t~LPdu6ofIory~p_|ji
z$_@3E2AJQZ)!EceRys1EIs*IUfI=4QP<AkbE7rH`Rg9HLtF>!fO0LJDfXPGmR|EQ6
zO*P;@z<?|uynxsO{xeRAK;C@lG1(>aCJV@fntuS}Oq+;N97fcne@(35dlallx3j<;
z$7F{D|6vpV&h<qp|7M5&rd&`)0BMfFk%6jZFkeoN1kms*2Jq;WI`kYWv0ePm=~&~w
zD6+hYSnWeR=Q#WIbfUk~={t6R%jg70BHNf(^R7>8^w`H5O^UIJLq}+ov?&AN{Sh4=
zVEqGPNS;ug^L+I;@3}2&&PK=>q}z}~S%3}mUaHdbFmkib#dozWt2A1O?@$Wo6>^y1
zoKuk%LN-3L_C8AEXHrL{XxCOIJsRXk7G{fd13@vRaawAOX6j14%Afb1RQo6kQ|>H5
zk%aS9Qa`pLEL>FFDC+@wNU(P=Qj0Qih^#vLBJkWb_lgdc4Rrv~csbcQ)O&7%ty#e7
zW9l|S+YX%F6*^HdS1Lbt<AO*%f!UIeU*4w9=k>8|6}i@DmhvZ6p<^9q#^(nrkXmB@
zFUX;#(0Q-+PZ@}pR$CRaF>)W~@~6Vjm%`Si@%dI#OT+nJKOm0@@2&Oo)cuf#_a<7F
z04aY%;LwZDuXS}=%bqy3TK?>yD)s*OUbQbF0VxgXSw2wr*o3v*08Gd!7><<ZZ~0tq
zwb2OXgC?YTrFJbh=hPFgO#o%|{@q7G-ckf6MD_WUiVTm5uq5v7QG{iXQ-Kp2i>q6-
zOoNC{zS22}*xh70sACgkw$dAgbR2u9R0I`{Ekzb#b2JR647|z>sn#K)_5M(>mHG^*
z(VpOfCZP*6P^*}v026=vDb$4QxYj(4z-nt{DW{7z<#7U~rA)bT^q&Tf67*Bw_fV%}
z3Jk9fsIoyUfP~HiM{S-ET=VM$R_rWIoBA^M#@&{G@^NeTRL8;0a^q;5)s&X~l%E2$
zclEe!98q`*_GVJVO#rPryCWOJsYD{~t-XLLp1{%xM4o_hk(!||5V^NOx-#Gt-c&K*
zA~KLBO~fN)zttP+@o|24*OINw2N4n=?Pzyq-tT<xZTd<`xJ%kMKs&?y;t&HKx34}5
z{>zFqc%lm@Bz!4BCBd92KX*SkGF4Y((<HbF2~7pH0e3V8h?j<mM4XTiDX6|AzYCzb
z?0^5L;ycN+Su|Bc9{I!H=case;prRUL?pGOvgn%3Eyn4pYtokwoGuD)Lz2><eD)=+
z)$q3)N{@$wEU{9S5>e_#i|5D!mE~3`B^@>#M$T#OD94PspQ^b^V1{!C#GkfZTdj#S
z3`F*u+s3QuU1EL4E+W1Ood5yFCdJ8A5VI1eazAAw^?2`@u`7=Rj%U$i7ast}vaAnn
zkB)YSEo39t%A6zDd^2noH1?GI?uptZ9TxQYtgiC*T!4M^RQ2B|$IVSjAwn4Cm^v?j
z&GG@yp%nrt8o7q}{R>ho1##&{Od0oR9L@oh&-N?L0mnU>4?U+C0~If0Hm4a0OxLhJ
zni@6|0^GIS12+63VC`LNqnqsHV&BgL<U<O->3;Z}V1527uZyZF?09Y>Q-KWvKoHej
zeWPkEt>yC5FV%Ng)_y6N8Ch9aRn7Ug0NnMluXB*kLO714xwlXiW}x7nA4Thp$u}Ic
zgmppzD1|fIvAqk9=ip%p-+aenlkWUqvU>QO2n#-NG+<a*%EcC9^Gb{Po4B8SL+RQ<
zpryt6;G}`_*7tEJ$`9s3G4~uoZt?`B5<a0qn*mdDty$Ei&w7p@z1*VkOW}k7a>6jK
zd3gUxWkI#Yg;hn(1_X8f{+W$nJTD(~73(qtVqnnHO6{JiH)YaIY0<UIa7^xBzoq9`
z2&G|jQ(t+;c^l})Em@I~%Z1K`yUREIR0?VA+IdO~U6!k$xzOu8E5|ygXXkU5+YA;w
zz4Dqq33g9izq7&S3E^3%vH6#d!<ru3G@4I94a~v~G>ueKNg=T4tOj5_P)!|;xT^BO
zx(gZ@vz}4O#gRdaUIuJTpEX1?&F`2iiaEY)K?#@?jxAj9S*m*xNx!wh{ni*7EUr|3
zr?R}IWvo51D+<vLm|!l&{8aIzMey_(g;ciWjb^kaduqGR3dL>b<#l;uK~=k*wXbI0
zQbevTDDOWRw9=(e>)I;qI-`Wg&^%44W=BD`7*+r7mFO=uGgw0t_F`RMN+iib_29M|
zvb{SA$*Dn5#!R5L6du)Sp9Ln(Z1Z*^>cYC@@@CB9PFX#gRQ@X#lS+&NU0+{w){sO~
zUJA}7Q=FT`pfB7qv_u)wdpa)EHDACK%SP?xPN;TvwQa6eKA;_?3#it?*gC0%gcL8}
zU=uT_nOG_UnZcWOAi_PHIE1E7jH+LjcNCJehzLp6biZf9iudU{{amwvGVOw_;yOYB
z?bH0tn8kcb)c4bnSUWOCZ40@W*L9%9gCIZW%E@JY*&0QKJFezQTSo%C{kC*vXK#P@
z7OsYXyTKy+%e7ysi);bRDtCp8c+oIsO!xxmgeDX&{{7u}2Fk19n&Kg~6~MSAAyx6^
z9|?Brw@S0{?Z8z$z7@Z~4dqr7Kci(5$PDNpz+2|WqH?PTudA_;`E>~YG%Z=e{}H}A
zw*mLtag3sy1Bkw6m9U|E609yP;>Um9s6We(DQ?BzKKS8@>i>ASvC;u&snZ7MWeEv)
zS5QsD3L%4VK@eSlb%ZMmfixwcAdnE^cNZ@!A@v{$X~J#C^F?S<?N$Vpgtbe;+PmTV
z!^8}A^Wqv4JfV1O(!xSLr<nbOv6cpP$G+|BZR4<a*1d?0W958n>LRCPMvS!-?F)~}
zZ==x6y=$z9>-70{K{QL8wRTOfi3ynF(>nJM5~FSa76p;x`|9T2S3RainO{o+=?~g)
z=R{7QsXGX=8tb;ksw1QhrF~--jrhp;e=Am007G@~)ml`Gm4()9n^6J{o~QD*goKs^
wRS0cHt|455EaFn|Di^6(JRu<=A>o_He;p_1Mn~AWH~;_u07*qoM6N<$f;tiBYXATM

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 472744c66c..395d83731c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -500,8 +500,12 @@ function config_update_config () {
 					if (!config_update_value ('flash_charts', (bool) get_parameter ('flash_charts')))
 						$error_update[] = __('Interactive charts');
 					
+					if (!config_update_value ('custom_favicon', (string) get_parameter ('custom_favicon')))
+						$error_update[] = __('Custom favicon');
 					if (!config_update_value ('custom_logo', (string) get_parameter ('custom_logo')))
 						$error_update[] = __('Custom logo');
+					if (!config_update_value ('custom_logo_white_bg', (string) get_parameter ('custom_logo_white_bg')))
+						$error_update[] = __('Custom logo white background');
 					if (!config_update_value ('custom_logo_login', (string) get_parameter ('custom_logo_login')))
 						$error_update[] = __('Custom logo login');
 					if (!config_update_value ('custom_splash_login', (string) get_parameter ('custom_splash_login')))
@@ -509,9 +513,11 @@ function config_update_config () {
 					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
 						$error_update[] = __('Custom documentation logo');
 					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
-						$error_update[] = __('Custom networkmap center logo');
-					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
 						$error_update[] = __('Custom support logo');
+					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
+						$error_update[] = __('Custom networkmap center logo');
+					if (!config_update_value ('custom_mobile_console_logo', (string) get_parameter ('custom_mobile_console_logo')))
+						$error_update[] = __('Custom networkmap center logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
 					if (!config_update_value ('custom_title2_login', (string) get_parameter ('custom_title2_login')))
@@ -1189,11 +1195,19 @@ function config_process_config () {
 	if (!isset ($config["fixed_menu"])) {
 		config_update_value ('fixed_menu', false);
 	}
-	
+
+	if (!isset ($config["custom_favicon"])) {
+		config_update_value ('custom_favicon', '');
+	}
+
 	if (!isset ($config["custom_logo"])) {
 		config_update_value ('custom_logo', 'pandora_logo_head_4.png');
 	}
 
+	if (!isset ($config["custom_logo_white_bg"])) {
+		config_update_value ('custom_logo_white_bg', 'pandora_logo_head_white_bg.png');
+	}
+
 	if (!isset ($config["custom_logo_login"])) {
 		config_update_value ('custom_logo_login', 'login_logo_v7.png');
 	}
@@ -1214,6 +1228,10 @@ function config_process_config () {
 		config_update_value ('custom_network_center_logo', '');
 	}
 
+	if (!isset ($config["custom_mobile_console_logo"])) {
+		config_update_value ('custom_mobile_console_logo', '');
+	}
+
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
 	}
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5343fd7e23..42d839b81e 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1355,14 +1355,9 @@ function ui_process_page_head ($string, $bitfield) {
 		<meta name="author" content="' . get_copyright_notice() . '" />
 		<meta name="copyright" content="(c) ' . get_copyright_notice() . '" />
 		<meta name="robots" content="index, follow" />';
-		if(defined ('METACONSOLE')){
-		$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
-		}
-		else{
-		$output .='<link rel="icon" href="images/pandora.ico" type="image/ico" />';	
-		}
+		$output .='<link rel="icon" href="' . ui_get_favicon() . '" type="image/ico" />';
 		$output .='	
-		<link rel="shortcut icon" href="images/pandora.ico" type="image/x-icon" />
+		<link rel="shortcut icon" href="' . ui_get_favicon() . '" type="image/x-icon" />
 		<link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />';
 	
 	if ($config["language"] != "en") {
@@ -3960,14 +3955,16 @@ function ui_get_support_logo () {
  * @return string with the path to logo. If it is not set, return the default value
  *
  */
-function ui_get_custom_header_logo () {
+function ui_get_custom_header_logo ($white_bg = false) {
 	global $config;
 
 	if (empty($config['enterprise_installed'])) {
 		return 'images/pandora_tinylogo_open.png';
 	}
 
-	$stored_logo = is_metaconsole() ? $config['meta_custom_logo'] : $config['custom_logo'];
+	$stored_logo = is_metaconsole()
+		? $config['meta_custom_logo']
+		: $white_bg ? $config['custom_logo_white_bg'] : $config['custom_logo'];
 	if (empty($stored_logo)) return 'images/pandora_tinylogo.png';
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
@@ -3987,4 +3984,41 @@ function ui_get_logo_to_center_networkmap () {
 
 	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
 }
+
+/**
+ * Get the mobile console login logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_mobile_login_icon () {
+	global $config;
+
+	if ((!enterprise_installed()) || empty($config['custom_mobile_console_logo'])) {
+		return is_metaconsole()
+			? "mobile/images/metaconsole_mobile.png"
+			: "mobile/images/pandora_mobile_console.png";
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_mobile_console_logo'];
+}
+
+/**
+ * Get the favicon
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_favicon () {
+	global $config;
+
+	if (empty($config['custom_favicon'])) {
+		return !is_metaconsole()
+			? "images/pandora.ico"
+			: "enterprise/meta/images/favicon_meta.ico";
+	}
+
+	return 'images/custom_favicon/' . $config['custom_favicon'];
+}
+
 ?>
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index ba16b537cf..82f10fd38e 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -226,11 +226,11 @@ class User {
 		$ui->showFooter(false);
 		$ui->beginContent();
 		
-		if (!$system->getConfig('metaconsole'))
-			$logo_image = html_print_image ("mobile/images/pandora_mobile_console.png",
+		if ($system->getConfig('metaconsole'))
+			$logo_image = html_print_image (ui_get_mobile_login_icon(),
 						true, array ("alt" => "logo", "border" => 0));
 		else
-			$logo_image = html_print_image ("mobile/images/metaconsole_mobile.png",
+			$logo_image = html_print_image (ui_get_mobile_login_icon(),
 						true, array ("alt" => "logo", "border" => 0),false, false, false, true);
 		
 		$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
@@ -289,7 +289,7 @@ class User {
 		$ui->showFooter(false);
 		$ui->beginContent();
 			$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
-				html_print_image ("mobile/images/pandora_mobile_console.png",
+				html_print_image (ui_get_mobile_login_icon(),
 					true, array ("alt" => "logo", "border" => 0)) .
 					'</div>');
 			$ui->contentAddHtml('<div id="login_container">');
diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php
index 9ffea8f61d..e3b04e39da 100644
--- a/pandora_console/operation/events/events_marquee.php
+++ b/pandora_console/operation/events/events_marquee.php
@@ -110,7 +110,7 @@ echo "<title>" . __("%s - Latest events", get_product_name()) . "</title>";
 
 $query = ui_get_full_url();
 echo '<meta http-equiv="refresh" content="' . $MARQUEE_INTERVAL . '; URL=' . $query . '">';
-echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico">';
+echo '<link rel="icon" href="../../' . ui_get_favicon() . '" type="image/ico">';
 echo "</head>";
 
 echo "<body bgcolor='#000000' >";
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index f9a89364a1..d8e3ce8cd3 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -61,7 +61,7 @@ echo "<title>" . __("Sound Events") . "</title>";
 	}
 </style>
 <?php
-echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico" />';
+echo '<link rel="icon" href="../../' . ui_get_favicon() . '" type="image/ico" />';
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';
 echo "</head>";
 echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 069d82186b..c8ed8f61cd 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -115,7 +115,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('current_package_enterprise', '722'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
-('custom_support_logo', 'default_support.png');
+('custom_support_logo', 'default_support.png'),
+('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UNLOCK TABLES;
 
 --

From 3f1a1a816bf4d8f0cdbcea4a6dbdcabba533a38c Mon Sep 17 00:00:00 2001
From: danielmaya <daniel.maya@artica.es>
Date: Thu, 24 May 2018 17:24:53 +0200
Subject: [PATCH 46/56] Fixed id_agente lost in insert_data

---
 pandora_console/extensions/insert_data.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 8357c96113..7495c54600 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -167,6 +167,7 @@ function mainInsertData() {
 	$params['use_hidden_input_idagent'] = true;
 	$params['print_hidden_input_idagent'] = true;
 	$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
+	$params['hidden_input_idagent_value'] = $id_agente;
 	
 	$table->data[0][1] = ui_print_agent_autocomplete_input($params);
 	

From 8eb44762b2067c72c3bb11179a17087d8742bb73 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 18:33:45 +0200
Subject: [PATCH 47/56] [Rebranding] Added custom favicon and white background
 to meta

---
 pandora_console/include/functions_config.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 395d83731c..c60bf4f345 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -534,8 +534,10 @@ function config_update_config () {
 					if (!config_update_value ('rb_copyright_notice', (string) get_parameter ('rb_copyright_notice')))
 						$error_update[] = __('Copyright notice');
 					
-						if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
+					if (!config_update_value ('meta_custom_logo', (string) get_parameter ('meta_custom_logo')))
 						$error_update[] = __('Custom logo metaconsole');
+					if (!config_update_value ('meta_custom_logo_white_bg', (string) get_parameter ('meta_custom_logo_white_bg')))
+						$error_update[] = __('Custom logo metaconsole (white background)');
 					if (!config_update_value ('meta_custom_logo_login', (string) get_parameter ('meta_custom_logo_login')))
 						$error_update[] = __('Custom logo login metaconsole');
 					if (!config_update_value ('meta_custom_splash_login', (string) get_parameter ('meta_custom_splash_login')))
@@ -1268,6 +1270,10 @@ function config_process_config () {
 		config_update_value ('meta_custom_logo', 'logo_pandora_metaconsola.png');
 	}
 
+	if (!isset ($config["meta_custom_logo_white_bg"])) {
+		config_update_value ('pandora_logo_head_white_bg', 'pandora_logo_head_white_bg.png');
+	}
+
 	if (!isset ($config["meta_custom_logo_login"])) {
 		config_update_value ('meta_custom_logo_login', 'pandora_logo.png');
 	}

From 6675597b62d1a38bbb596ff83f54c4363da1f370 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 18:34:53 +0200
Subject: [PATCH 48/56] [Rebranding] Minor fix

---
 pandora_console/godmode/setup/setup_visuals.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index dfa3758309..9131a03b6b 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1196,7 +1196,7 @@ $(document).ready (function () {
 });
 
 // Change the favicon preview when is changed
-function setup_visuals_change_favicon(meta) {
+function setup_visuals_change_favicon() {
 	var icon_name = $("select#custom_favicon option:selected").val();
 	var icon_path = (icon_name == "")
 		? "images/pandora.ico"

From 643a07a16318a5b2b7f8043115372e360ebfee0e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 25 May 2018 00:01:22 +0200
Subject: [PATCH 49/56] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 516394dd2d..6e1d203560 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180524
+Version: 7.0NG.722-180525
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index f53ecd37c0..6c59a89e3e 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180524"
+pandora_version="7.0NG.722-180525"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index a83c4e1e53..9f1b6c2540 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180524';
+use constant AGENT_BUILD => '180525';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 4c3c0368fa..50a0a52560 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180524
+%define release     180525
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index e8c3cabcfe..b4e8f97bb8 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180524
+%define release     180525
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 0a27708b5e..13e9362cb5 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180524"
+PI_BUILD="180525"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 552b6b0c11..b7f336ac56 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180524}
+{180525}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 5ba937ff6b..2a55d2cd45 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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 ("7.0NG.722(Build 180524)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180525)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index ae24c614ce..a20910a17b 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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", "(7.0NG.722(Build 180524))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180525))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c07ea3b16a..eaa05cfaf6 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180524
+Version: 7.0NG.722-180525
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 54e6b71b8c..7a18ec2e3f 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180524"
+pandora_version="7.0NG.722-180525"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d6a0b69cc0..fffe56beb0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180524';
+$build_version = 'PC180525';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c6083a61d0..372650e08a 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180524';
+$build = '180525';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 78ef5db7e9..e34eb8d21f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180524
+%define release     180525
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index d72159345d..e9d43b0b37 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180524
+%define release     180525
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 5c6f58d4ba..0b7199e070 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180524
+Version: 7.0NG.722-180525
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 80bc27953e..b3deccfa48 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180524"
+pandora_version="7.0NG.722-180525"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f1df3cbe65..c7d2e79df7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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 = "7.0NG.722";
-my $pandora_build = "180524";
+my $pandora_build = "180525";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 54b51f52d1..81ea5293d8 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180524";
+my $pandora_build = "180525";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 926db945ef..ed813a39c9 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180524
+%define release     180525
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index f7508b4d88..1e487c1ec9 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180524
+%define release     180525
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 8931bac041..819670cc40 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180524"
+PI_BUILD="180525"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d00df6e0e9..d0df17d11c 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180524";
+my $version = "7.0NG.722 PS180525";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 9be4d45402..6fa3e218a7 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.722 PS180524";
+my $version = "7.0NG.722 PS180525";
 
 # save program name for logging
 my $progname = basename($0);

From a54c074b11340d3f228566fe6e32cf33fe048cd9 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 25 May 2018 10:29:40 +0200
Subject: [PATCH 50/56] [Rebranding] Added hide help on node

---
 pandora_console/general/header.php               | 16 ++++++++++------
 .../godmode/agentes/module_manager.php           | 13 +++++++------
 pandora_console/godmode/setup/setup_visuals.php  |  7 +++++++
 pandora_console/include/functions_config.php     | 10 ++++++++--
 pandora_console/include/functions_ui.php         |  3 +++
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index acefd20a2b..ac18da48d1 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -158,7 +158,7 @@ config_check();
 				</script>
 				<?php
 				
-				if ($config['tutorial_mode'] !== 'expert') {
+				if ($config['tutorial_mode'] !== 'expert' && !$config['disable_help']) {
 					$table->data[0]['clippy'] = 
 						'<a href="javascript: show_clippy();">' .
 							html_print_image(
@@ -307,11 +307,15 @@ config_check();
 				$table->data[0][3] = $maintenance_img;
 				
 				// Main help icon
-				$table->data[0][4] = '<a href="#" class="modalpopup" id="helpmodal">'.html_print_image("images/header_help.png",
-					true, array(
-						"title" => __('Main help'),
-						"id" => "helpmodal",
-						"class" => "modalpopup")).'</a>';
+				if (!$config['disable_help']) {
+					$table->data[0][4] =
+						'<a href="#" class="modalpopup" id="helpmodal">' .
+						html_print_image("images/header_help.png", true, array(
+							"title" => __('Main help'),
+							"id" => "helpmodal",
+							"class" => "modalpopup")) .
+						'</a>';
+				}
 				
 				// Logout
 				$table->data[0][5] = '<a class="white" href="' . ui_get_full_url('index.php?bye=bye') . '">';
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 145f7312d5..335bd287fa 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -151,12 +151,13 @@ if (($policy_page) || (isset($agent))) {
 
 echo "</table>";
 
-
-echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
-echo "<strong>";
-echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
-echo "</strong>";
-echo '</div>';
+if (!$config['disable_help']) {
+	echo '<div style="text-align: right; width: 100%;padding-top:10px;padding-bottom:10px">';
+	echo "<strong>";
+	echo "<a style='color: #373737;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules on Monitoring Library")."</a>";
+	echo "</strong>";
+	echo '</div>';
+}
 
 if (! isset ($id_agente))
 	return;
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 9131a03b6b..c9ae4d9a0c 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -411,6 +411,13 @@ $table_styles->data[$row][1] .= __('No') . '&nbsp;' .
 	html_print_radio_button_extended ('fixed_graph', 0, '', $config["fixed_graph"], $open, '','',true, $open,'visualmodal');
 $row++;
 
+$table_styles->data[$row][0] = __('Disable helps');
+$table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
+	html_print_radio_button ('disable_help', 1, '', $config["disable_help"], true) .
+	'&nbsp;&nbsp;';
+$table_styles->data[$row][1] .= __('No') . '&nbsp;' .
+	html_print_radio_button ('disable_help', 0, '', $config["disable_help"], true);
+$row++;
 
 $table_styles->data[$row][0] = __('Fixed header');
 $table_styles->data[$row][1] = __('Yes') . '&nbsp;' .
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index c60bf4f345..11ab9f3c94 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -585,8 +585,10 @@ function config_update_config () {
 						$error_update[] = __('Autohidden menu');
 					if (!config_update_value ('visual_animation', get_parameter('visual_animation')))
 						$error_update[] = __('visual_animation');
+					if (!config_update_value ('disable_help', get_parameter('disable_help')))
+						$error_update[] = __('Disable help');
 					if (!config_update_value ('fixed_graph', get_parameter('fixed_graph')))
-							$error_update[] = __('Fixed graph');
+						$error_update[] = __('Fixed graph');
 					if (!config_update_value ('fixed_header', get_parameter('fixed_header')))
 						$error_update[] = __('Fixed header');
 					if (!config_update_value ('fixed_menu', get_parameter('fixed_menu')))
@@ -1185,7 +1187,11 @@ function config_process_config () {
 	if (!isset ($config["graphviz_bin_dir"])) {
 		config_update_value ('graphviz_bin_dir', "");
 	}
-	
+
+	if (!isset ($config["disable_help"])) {
+		config_update_value ('disable_help', false);
+	}
+
 	if (!isset ($config["fixed_header"])) {
 		config_update_value ('fixed_header', false);
 	}
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 42d839b81e..f7142ed889 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1104,6 +1104,9 @@ function ui_print_alert_template_example ($id_alert_template, $return = false, $
 function ui_print_help_icon ($help_id, $return = false, $home_url = '', $image = "images/help.png", $is_relative = false) {
 	global $config;
 
+	// Do not display the help icon if help is disabled
+	if ($config['disable_help']) return '';
+
 	if (empty($home_url))
 		$home_url = "";
 	

From 7afc617e626b22ed6cb44b4dc6154f7e9e51b333 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Fri, 25 May 2018 12:39:30 +0200
Subject: [PATCH 51/56] [Rebranding] Implemented server rebranding through
 environment vars

---
 pandora_server/bin/pandora_server       |  8 +++---
 pandora_server/lib/PandoraFMS/Config.pm | 38 +++++++++++++++++++------
 pandora_server/lib/PandoraFMS/Tools.pm  | 13 +++++----
 pandora_server/util/pandora_db.pl       | 10 +++----
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 49d3c97cba..7e60690ae1 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -519,7 +519,7 @@ sub main() {
 
 	# Daemonize and put in background
 	if ($Config{'daemon'} == 1) {
-		print_message (\%Config, " [*] Backgrounding Pandora FMS Server process.\n", 1);
+		print_message (\%Config, " [*] Backgrounding " . pandora_get_initial_product_name() . " Server process.\n", 1);
 		pandora_daemonize (\%Config);
 	}
 	
@@ -528,8 +528,8 @@ sub main() {
 		print_message (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
 		logger (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
 	} else {
-		print_message (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
-		logger (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
+		print_message (\%Config, " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.", 1);
+		logger (\%Config, " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.", 1);
 	
 		if($Config{'policy_manager'} == 1) {
 			# Start thread to patrol policy queue
@@ -687,7 +687,7 @@ $SIG{__DIE__} = 'pandora_crash';
 $SIG{'ALRM'} = 'IGNORE';
 	
 # Initialize
-pandora_init(\%Config, 'Pandora FMS Server');
+pandora_init(\%Config, pandora_get_initial_product_name() . ' Server');
 pandora_load_config (\%Config);
 	
 # Parse command line options.
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6941a7d9f3..179fa75c72 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -39,6 +39,8 @@ our @EXPORT = qw(
 	pandora_start_log
 	pandora_get_sharedconfig
 	pandora_get_tconfig_token
+	pandora_get_initial_product_name
+	pandora_get_initial_copyright_notice
 	);
 
 # version: Defines actual version of Pandora Server for this module only
@@ -56,7 +58,7 @@ my %pa_config;
 ##########################################################################
 
 sub help_screen {
-	print "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file (pandora_server.conf) > \n\n";
+	print "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file > \n\n";
 	print "Following options are optional : \n";
 	print "	-v        :  Verbose mode activated. Writes more information in the logfile \n";
 	print "	-d        :  Debug mode activated. Writes extensive information in the logfile \n";
@@ -77,13 +79,13 @@ sub help_screen {
 sub pandora_init {
 	my $pa_config = $_[0];
 	my $init_string = $_[1];
-	print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2015 ArticaST\n";
+	print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n";
 	print "This program is OpenSource, licensed under the terms of GPL License version 2.\n";
-	print "You can download latest versions and documentation at http://www.pandorafms.org \n\n";
+	print "You can download latest versions and documentation at official web page.\n\n";
 
 	# Load config file from command line
 	if ($#ARGV == -1 ){
-		print "I need at least one parameter: Complete path to Pandora FMS Server configuration file \n";
+		print "I need at least one parameter: Complete path to " . pandora_get_initial_product_name() . " Server configuration file \n";
 		help_screen;
 		exit;
 	}
@@ -124,7 +126,7 @@ sub pandora_init {
 		}
 	}
 	if ($pa_config->{"pandora_path"} eq ""){
-		print " [ERROR] I need at least one parameter: Complete path to Pandora FMS configuration file. \n";
+		print " [ERROR] I need at least one parameter: Complete path to " . pandora_get_initial_product_name() . " configuration file. \n";
 		print "		For example: ./pandora_server /etc/pandora/pandora_server.conf \n\n";
 		exit;
 	}
@@ -496,7 +498,7 @@ sub pandora_load_config {
 	# Check for file
 	if ( ! -f $archivo_cfg ) {
 		printf "\n [ERROR] Cannot open configuration file at $archivo_cfg. \n";
-		printf "	Please specify a valid Pandora FMS configuration file in command line. \n";
+		printf "	Please specify a valid " . pandora_get_initial_product_name() ." configuration file in command line. \n";
 		print "	Standard configuration file is at /etc/pandora/pandora_server.conf \n";
 		exit 1;
 	}
@@ -1165,10 +1167,10 @@ sub pandora_start_log ($){
 	my $pa_config = shift;
 
 	# Dump all errors to errorlog
-	open (STDERR, ">> " . $pa_config->{'errorlog_file'}) or die " [ERROR] Pandora FMS can't write to Errorlog. Aborting : \n $! \n";
+	open (STDERR, ">> " . $pa_config->{'errorlog_file'}) or die " [ERROR] " . pandora_get_initial_product_name() . " can't write to Errorlog. Aborting : \n $! \n";
 	my $mode = 0664;
 	chmod $mode, $pa_config->{'errorlog_file'};
-	print STDERR strftime ("%Y-%m-%d %H:%M:%S", localtime()) . ' - ' . $pa_config->{'servername'} . " Starting Pandora FMS Server. Error logging activated.\n";
+	print STDERR strftime ("%Y-%m-%d %H:%M:%S", localtime()) . ' - ' . $pa_config->{'servername'} . " Starting " . pandora_get_initial_product_name() . " Server. Error logging activated.\n";
 }
 
 ##########################################################################
@@ -1185,6 +1187,26 @@ sub pandora_get_tconfig_token ($$$) {
 	return $default_value;
 }
 
+##########################################################################
+# Get the product name in previous tasks to read from database.
+##########################################################################
+sub pandora_get_initial_product_name {
+	# PandoraFMS product name
+	my $product_name = $ENV{'PANDORA_RB_PRODUCT_NAME'};
+	return 'Pandora FMS' unless (defined ($product_name) && $product_name ne '');
+	return $product_name;
+}
+
+##########################################################################
+# Get the copyright notice.
+##########################################################################
+sub pandora_get_initial_copyright_notice {
+	# PandoraFMS product name
+	my $name = $ENV{'PANDORA_RB_COPYRIGHT_NOTICE'};
+	return 'Artica ST' unless (defined ($name) && $name ne '');
+	return $name;
+}
+
 # End of function declaration
 # End of defined Code
 
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index a81aa6bfb5..c257e2de57 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -399,7 +399,7 @@ sub pandora_daemonize {
 			
 			# check if pandora_server is running
 			if (kill (0, $pid)) {
-				die "[FATAL] pandora_server already running, pid: $pid.";
+				die "[FATAL] " . pandora_get_initial_product_name() . " Server already running, pid: $pid.";
 			}
 			logger ($pa_config, '[W] Stale PID file, overwriting.', 1);
 		}
@@ -673,12 +673,15 @@ sub enterprise_load ($) {
 	else {
 		eval 'require PandoraFMS::Enterprise;';
 	}
-	
-	
-	
+
 	# Ops
 	if ($@) {
-		
+		# Remove the rebranding if open version
+		if ($^O ne 'MSWin32') {
+			`unset PANDORA_RB_PRODUCT_NAME`;
+			`unset PANDORA_RB_COPYRIGHT_NOTICE`;
+		}
+
 		# Enterprise.pm not found.
 		return 0 if ($@ =~ m/PandoraFMS\/Enterprise\.pm.*\@INC/);
 
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1f79725fb0..6dcbdda778 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -555,9 +555,9 @@ sub pandora_compactdb ($$) {
 sub pandora_init ($) {
 	my $conf = shift;
 	
-	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 Artica ST\n");
+	log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n");
 	log_message ('', "This program is Free Software, licensed under the terms of GPL License v2\n");
-	log_message ('', "You can download latest versions and documentation at http://www.pandorafms.org\n\n");
+	log_message ('', "You can download latest versions and documentation at official web\n\n");
 	
 	# Load config file from command line
 	help_screen () if ($#ARGV < 0);
@@ -897,7 +897,7 @@ sub pandora_checkdb_consistency {
 # Print a help screen and exit.
 ##############################################################################
 sub help_screen{
-	log_message ('', "Usage: $0 <path to pandora_server.conf> [options]\n\n");
+	log_message ('', "Usage: $0 <path to configuration file> [options]\n\n");
 	log_message ('', "\t\t-p   Only purge and consistency check, skip compact.\n");
 	log_message ('', "\t\t-f   Force execution event if another instance of $0 is running.\n\n");
 	exit -1;
@@ -1031,10 +1031,10 @@ pandora_load_config (\%conf);
 
 # Load enterprise module
 if (enterprise_load (\%conf) == 0) {
-	log_message ('', " [*] Pandora FMS Enterprise module not available.\n\n");
+	log_message ('', " [*] " . pandora_get_initial_product_name() . " Enterprise module not available.\n\n");
 }
 else {
-	log_message ('', " [*] Pandora FMS Enterprise module loaded.\n\n");
+	log_message ('', " [*] " . pandora_get_initial_product_name() . " Enterprise module loaded.\n\n");
 }
 
 # Connect to the DB

From edd38ac9c89130a01163cadbf833002b64d3e0b6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 26 May 2018 00:01:24 +0200
Subject: [PATCH 52/56] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 6e1d203560..3418a15cdc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180525
+Version: 7.0NG.722-180526
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 6c59a89e3e..799bf367ad 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180525"
+pandora_version="7.0NG.722-180526"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 9f1b6c2540..d70442b274 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180525';
+use constant AGENT_BUILD => '180526';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 50a0a52560..456841ba4a 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180525
+%define release     180526
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index b4e8f97bb8..6e49280280 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180525
+%define release     180526
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 13e9362cb5..5a07b10822 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180525"
+PI_BUILD="180526"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b7f336ac56..2f7175fe5e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180525}
+{180526}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 2a55d2cd45..53abe3dba8 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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 ("7.0NG.722(Build 180525)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180526)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a20910a17b..06a2be7611 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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", "(7.0NG.722(Build 180525))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180526))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index eaa05cfaf6..5cdcfaa44c 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180525
+Version: 7.0NG.722-180526
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 7a18ec2e3f..7bea08926b 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180525"
+pandora_version="7.0NG.722-180526"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fffe56beb0..ea4f58aea0 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180525';
+$build_version = 'PC180526';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 372650e08a..34cf61df80 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180525';
+$build = '180526';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index e34eb8d21f..cd68e8212b 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180525
+%define release     180526
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e9d43b0b37..b303622098 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180525
+%define release     180526
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 0b7199e070..a82292e4c9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180525
+Version: 7.0NG.722-180526
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index b3deccfa48..3f4ed0a58c 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180525"
+pandora_version="7.0NG.722-180526"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c7d2e79df7..2a522225a9 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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 = "7.0NG.722";
-my $pandora_build = "180525";
+my $pandora_build = "180526";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 81ea5293d8..2de55aec56 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180525";
+my $pandora_build = "180526";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index ed813a39c9..b98ed750e4 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180525
+%define release     180526
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1e487c1ec9..191314c3a3 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180525
+%define release     180526
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 819670cc40..24955f3aaf 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180525"
+PI_BUILD="180526"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d0df17d11c..e6577477cf 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180525";
+my $version = "7.0NG.722 PS180526";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6fa3e218a7..234b162acb 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.722 PS180525";
+my $version = "7.0NG.722 PS180526";
 
 # save program name for logging
 my $progname = basename($0);

From 9ff98af9a5e844737b2bb9e588fd78264c829124 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 27 May 2018 00:01:26 +0200
Subject: [PATCH 53/56] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 3418a15cdc..6782e34362 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180526
+Version: 7.0NG.722-180527
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 799bf367ad..36940ee1ad 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180526"
+pandora_version="7.0NG.722-180527"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index d70442b274..5cec0e0865 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180526';
+use constant AGENT_BUILD => '180527';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 456841ba4a..8f0e959d27 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180526
+%define release     180527
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 6e49280280..726b3089b6 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180526
+%define release     180527
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 5a07b10822..5f55b149b0 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180526"
+PI_BUILD="180527"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 2f7175fe5e..1a5363044e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180526}
+{180527}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 53abe3dba8..8d867be68d 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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 ("7.0NG.722(Build 180526)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180527)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 06a2be7611..6f675daf25 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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", "(7.0NG.722(Build 180526))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180527))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5cdcfaa44c..0a381360be 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180526
+Version: 7.0NG.722-180527
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 7bea08926b..350a20955f 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180526"
+pandora_version="7.0NG.722-180527"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ea4f58aea0..71e48a1876 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180526';
+$build_version = 'PC180527';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 34cf61df80..c9a02f5e05 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180526';
+$build = '180527';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index cd68e8212b..475676885f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180526
+%define release     180527
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index b303622098..ec2368aead 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180526
+%define release     180527
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index a82292e4c9..a690549cd6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180526
+Version: 7.0NG.722-180527
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 3f4ed0a58c..25ea0fbdee 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180526"
+pandora_version="7.0NG.722-180527"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2a522225a9..170ee03597 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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 = "7.0NG.722";
-my $pandora_build = "180526";
+my $pandora_build = "180527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 2de55aec56..4410ff60eb 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180526";
+my $pandora_build = "180527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index b98ed750e4..1283c6e9ba 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180526
+%define release     180527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 191314c3a3..0628e37af8 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180526
+%define release     180527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 24955f3aaf..e0e8ac0a2b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180526"
+PI_BUILD="180527"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e6577477cf..2bed6fcd87 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180526";
+my $version = "7.0NG.722 PS180527";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 234b162acb..7e7bc2c826 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.722 PS180526";
+my $version = "7.0NG.722 PS180527";
 
 # save program name for logging
 my $progname = basename($0);

From 2e4b320861e3be2284215b8808358c07f4bf3b63 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 28 May 2018 00:01:21 +0200
Subject: [PATCH 54/56] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 6782e34362..da154ad674 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180527
+Version: 7.0NG.722-180528
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 36940ee1ad..a8e47c0413 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180527"
+pandora_version="7.0NG.722-180528"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 5cec0e0865..96c3ee38d5 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.722';
-use constant AGENT_BUILD => '180527';
+use constant AGENT_BUILD => '180528';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 8f0e959d27..fae183ef4f 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180527
+%define release     180528
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 726b3089b6..e6cbdbe1f4 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.722
-%define release     180527
+%define release     180528
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 5f55b149b0..cdba332136 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180527"
+PI_BUILD="180528"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1a5363044e..7b1b0f4c9e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180527}
+{180528}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8d867be68d..03c0805baf 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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 ("7.0NG.722(Build 180527)")
+#define PANDORA_VERSION ("7.0NG.722(Build 180528)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 6f675daf25..63a2b23f30 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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", "(7.0NG.722(Build 180527))"
+      VALUE "ProductVersion", "(7.0NG.722(Build 180528))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0a381360be..b0585b9842 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180527
+Version: 7.0NG.722-180528
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 350a20955f..553e2bbe86 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180527"
+pandora_version="7.0NG.722-180528"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 71e48a1876..b8ba89e59b 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180527';
+$build_version = 'PC180528';
 $pandora_version = 'v7.0NG.722';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c9a02f5e05..0caa210815 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.722';
-$build = '180527';
+$build = '180528';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 475676885f..84e67fd1eb 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180527
+%define release     180528
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index ec2368aead..c1b964afca 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.722
-%define release     180527
+%define release     180528
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index a690549cd6..9a39269185 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180527
+Version: 7.0NG.722-180528
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 25ea0fbdee..19f3dbd0f3 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180527"
+pandora_version="7.0NG.722-180528"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 170ee03597..c25a8b81f7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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 = "7.0NG.722";
-my $pandora_build = "180527";
+my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4410ff60eb..fbd72cd135 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.722";
-my $pandora_build = "180527";
+my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 1283c6e9ba..909eb974c1 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180527
+%define release     180528
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0628e37af8..93c66ebccf 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.722
-%define release     180527
+%define release     180528
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e0e8ac0a2b..3fd7c16427 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.722"
-PI_BUILD="180527"
+PI_BUILD="180528"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2bed6fcd87..eef8764910 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180527";
+my $version = "7.0NG.722 PS180528";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7e7bc2c826..1f1e31a88c 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.722 PS180527";
+my $version = "7.0NG.722 PS180528";
 
 # save program name for logging
 my $progname = basename($0);

From 2f8cdb5ea529426c56f9de8f0bd29a276c6db4b6 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 28 May 2018 11:31:09 +0200
Subject: [PATCH 55/56] Added check_login to plugin registration

---
 pandora_console/extensions/plugin_registration.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php
index 8807fbe153..5f95cdb73e 100644
--- a/pandora_console/extensions/plugin_registration.php
+++ b/pandora_console/extensions/plugin_registration.php
@@ -16,6 +16,8 @@
 
 function pluginreg_extension_main () {
 	global $config;
+
+	check_login();
 	
 	if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 		db_pandora_audit("ACL Violation", "Trying to access Setup Management");

From 01cce1595518da13ff225021b5259da3fe781873 Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Mon, 28 May 2018 13:20:38 +0200
Subject: [PATCH 56/56] Updated version and build strings.

---
 pandora_agents/pc/AIX/pandora_agent.conf               | 2 +-
 pandora_agents/pc/FreeBSD/pandora_agent.conf           | 2 +-
 pandora_agents/pc/HP-UX/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Linux/pandora_agent.conf             | 2 +-
 pandora_agents/pc/NT4/pandora_agent.conf               | 2 +-
 pandora_agents/pc/SunOS/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Win32/pandora_agent.conf             | 2 +-
 pandora_agents/shellscript/aix/pandora_agent.conf      | 2 +-
 pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +-
 pandora_agents/shellscript/hp-ux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/linux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/mac_osx/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/openWRT/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/solaris/pandora_agent.conf  | 2 +-
 pandora_agents/unix/AIX/pandora_agent.conf             | 2 +-
 pandora_agents/unix/DEBIAN/control                     | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_agents/unix/Darwin/pandora_agent.conf          | 2 +-
 pandora_agents/unix/FreeBSD/pandora_agent.conf         | 2 +-
 pandora_agents/unix/HP-UX/pandora_agent.conf           | 2 +-
 pandora_agents/unix/Linux/pandora_agent.conf           | 2 +-
 pandora_agents/unix/NT4/pandora_agent.conf             | 2 +-
 pandora_agents/unix/NetBSD/pandora_agent.conf          | 2 +-
 pandora_agents/unix/SunOS/pandora_agent.conf           | 2 +-
 pandora_agents/unix/pandora_agent                      | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec          | 4 ++--
 pandora_agents/unix/pandora_agent.spec                 | 4 ++--
 pandora_agents/unix/pandora_agent_installer            | 2 +-
 pandora_agents/win32/bin/pandora_agent.conf            | 2 +-
 pandora_agents/win32/installer/pandora.mpi             | 4 ++--
 pandora_agents/win32/pandora.cc                        | 2 +-
 pandora_agents/win32/versioninfo.rc                    | 2 +-
 pandora_console/DEBIAN/control                         | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh             | 2 +-
 pandora_console/include/config_process.php             | 2 +-
 pandora_console/install.php                            | 2 +-
 pandora_console/pandora_console.redhat.spec            | 4 ++--
 pandora_console/pandora_console.spec                   | 4 ++--
 pandora_console/pandora_console_install                | 2 +-
 pandora_console/pandoradb_data.sql                     | 2 +-
 pandora_server/DEBIAN/control                          | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh              | 2 +-
 pandora_server/conf/pandora_server.conf.new            | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm                | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm           | 2 +-
 pandora_server/pandora_server.redhat.spec              | 4 ++--
 pandora_server/pandora_server.spec                     | 4 ++--
 pandora_server/pandora_server_installer                | 2 +-
 pandora_server/util/pandora_db.pl                      | 2 +-
 pandora_server/util/pandora_manage.pl                  | 2 +-
 50 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index 3022070bbd..eb20b095f1 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, AIX version
+# Version 7.0NG.723, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index f02ed5d074..93b3cdb927 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, FreeBSD Version
+# Version 7.0NG.723, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index f84bce9f77..41d482d6d3 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, HP-UX Version
+# Version 7.0NG.723, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index 79d8bb8e28..534718ad29 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index 372477a38b..e4d585a062 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index a0515edf7e..ddce174eed 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, Solaris Version
+# Version 7.0NG.723, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index 049e95ba35..1b3ea967ac 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.722
+# Version 7.0NG.723
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index edf8253d42..0d6558aa12 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722, AIX version
+# Version 7.0NG.723, AIX version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index 147de81c02..7478d64f27 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index c46db65c34..4f3694a530 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722, HPUX Version
+# Version 7.0NG.723, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index fcc0ac412f..374a998426 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 2b4a90b2f3..3de4952d24 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index e1476e40cc..8cfc4f51aa 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index a87e711a5b..d962b005e4 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.722, Solaris version
+# Version 7.0NG.723, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 30ba7e3649..6fb838938d 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, AIX version
+# Version 7.0NG.723, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index da154ad674..12cd910618 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.722-180528
+Version: 7.0NG.723
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index a8e47c0413..48b07403e0 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180528"
+pandora_version="7.0NG.723"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 558a657412..2a03683bd8 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index 5300a3c81c..c1eb8072e6 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, FreeBSD Version
+# Version 7.0NG.723, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 2522f3f853..3cf05b23eb 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, HP-UX Version
+# Version 7.0NG.723, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 141ab9963f..607bdc9d3c 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index aff62ba017..846ced852c 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, GNU/Linux
+# Version 7.0NG.723, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index ed4185441d..d67e9bd6c3 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, NetBSD Version
+# Version 7.0NG.723, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index ddcbe9710e..b6197225dd 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.722, Solaris Version
+# Version 7.0NG.723, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 96c3ee38d5..f7102647a6 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.722';
+use constant AGENT_VERSION => '7.0NG.723';
 use constant AGENT_BUILD => '180528';
 
 # Agent log default file size maximum and instances
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index fae183ef4f..6d96a816cb 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index e6cbdbe1f4..d9e10622e3 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index cdba332136..e88cea3849 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,7 +9,7 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.722"
+PI_VERSION="7.0NG.723"
 PI_BUILD="180528"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 185002e369..70e1ae25f6 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.722
+# Version 7.0NG.723
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 7b1b0f4c9e..e0364cec84 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.722}
+{Pandora FMS Windows Agent v7.0NG.723}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 03c0805baf..db590470c2 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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 ("7.0NG.722(Build 180528)")
+#define PANDORA_VERSION ("7.0NG.723(Build 180528)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 63a2b23f30..bdafd13a3d 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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", "(7.0NG.722(Build 180528))"
+      VALUE "ProductVersion", "(7.0NG.723(Build 180528))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b0585b9842..15bb19a021 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.722-180528
+Version: 7.0NG.723
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 553e2bbe86..d0130bab1c 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180528"
+pandora_version="7.0NG.723"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b8ba89e59b..08b312010d 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -23,7 +23,7 @@
  * Pandora build version and version 
  */
 $build_version = 'PC180528';
-$pandora_version = 'v7.0NG.722';
+$pandora_version = 'v7.0NG.723';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 0caa210815..3a8826f0ae 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,7 +70,7 @@
 	<body>
 		<div style='height: 10px'>
 			<?php
-$version = '7.0NG.722';
+$version = '7.0NG.723';
 $build = '180528';
 			$banner = "v$version Build $build";
 			
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 84e67fd1eb..6abb38707f 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index c1b964afca..7cd90352f6 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index 406cf4c335..4f4b3e1052 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.722"
+PI_VERSION="7.0NG.723"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index c8ed8f61cd..9465b014ad 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 14),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '722'),
+('current_package_enterprise', '723'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
 ('custom_support_logo', 'default_support.png'),
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 9a39269185..cc2e4dd39f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.722-180528
+Version: 7.0NG.723
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 19f3dbd0f3..01324ef3bd 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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="7.0NG.722-180528"
+pandora_version="7.0NG.723"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index ee131a0343..20d6eebbd9 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.722
+# Version 7.0NG.723
 # Licensed under GPL license v2,
 # (c) 2003-2017 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 55ff95529b..5e25f53d6b 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -44,7 +44,7 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.722";
+my $pandora_version = "7.0NG.723";
 my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index fbd72cd135..9eeaa5e29d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -30,7 +30,7 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.722";
+my $pandora_version = "7.0NG.723";
 my $pandora_build = "180528";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 909eb974c1..1ca51790b2 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 93c66ebccf..a8ec3a31ff 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.722
-%define release     180528
+%define version     7.0NG.723
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3fd7c16427..f3d7b65269 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,7 +8,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.722"
+PI_VERSION="7.0NG.723"
 PI_BUILD="180528"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2c40a2aeec..9f510feff3 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.722 PS180528";
+my $version = "7.0NG.723 PS180528";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 1f1e31a88c..3db9954daf 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.722 PS180528";
+my $version = "7.0NG.723 PS180528";
 
 # save program name for logging
 my $progname = basename($0);