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] [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>';