From ed357a615128d51943e3e6655e4a46f2864767f4 Mon Sep 17 00:00:00 2001
From: enriquecd <enrique.camargo@artica.com>
Date: Mon, 3 Oct 2016 13:36:04 +0200
Subject: [PATCH] fix login page and alert messages

(cherry picked from commit 8484531080bf6b24c04ac1fcb692b79bc2267516)
---
 pandora_console/general/alert_enterprise.php     |   2 +-
 pandora_console/general/login_page.php           |   6 +++---
 .../images/custom_logo_login/logo_login.png      | Bin 3253 -> 0 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 pandora_console/images/custom_logo_login/logo_login.png

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 79edd50361..668f1acdc8 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -84,7 +84,7 @@ switch ($tipo) {
 
   echo 
     '<p>' .
-    	__('The Uppdate 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 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.') .
     '</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>') .
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 686564513a..a1de85d1d5 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -89,7 +89,7 @@ echo '<div id="login_in">';
 	
 			echo '<a href="' . $logo_link . '">';
 			if (defined ('METACONSOLE')) {
-				if (!isset ($config["custom_logo"])){
+				if (!isset ($config["custom_logo_login"])){
 					html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
 				}
 				else{
@@ -97,7 +97,7 @@ echo '<div id="login_in">';
 				}
 		}
 			else if (defined ('PANDORA_ENTERPRISE')) {
-				if (!isset ($config["custom_logo"])){
+				if (!isset ($config["custom_logo_login"])){
 					html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
 				}
 				else{
@@ -105,7 +105,7 @@ echo '<div id="login_in">';
 				}
 			}
 			else {
-				if (!isset ($config["custom_logo"])){
+				if (!isset ($config["custom_logo_login"])){
 					html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
 				}
 				else{
diff --git a/pandora_console/images/custom_logo_login/logo_login.png b/pandora_console/images/custom_logo_login/logo_login.png
deleted file mode 100644
index 0545d22bded7a969ea8b60fff2e239e643f19a82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3253
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