From 01d3464725c583cac22dd33bbb6ee46980c29b75 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 13 Aug 2020 20:35:46 +0200
Subject: Move custom logo to the bottom left

With the property 'slx-logo-primary: true' in the guacamole.properties file the custom logo will be displayed as the primary logo in the center. (In this case the bwlehrpool logo will displayed in the bottom left instead)
---
 .../java/de/bwlehrpool/bwlp_guac/SlxConfig.java    | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java')

diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java b/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java
index f93c965..1fadac0 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java
@@ -27,6 +27,13 @@ public class SlxConfig {
 		}
 	};
 
+	private static final StringGuacamoleProperty LOGO_PRIMARY = new StringGuacamoleProperty() {
+		@Override
+		public String getName() {
+			return "slx-logo-primary";
+		}
+	};
+
 	static {
 		Environment e;
 		try {
@@ -49,10 +56,20 @@ public class SlxConfig {
 
 	public static String logoUrl() {
 		try {
-			return ENVIRONMENT.getProperty(LOGO_URL);
+			String url = ENVIRONMENT.getProperty(LOGO_URL);
+			if (url == null) return "";
+			return url;
 		} catch (GuacamoleException e) {
-			LOGGER.warn("Cannot get logo url from properties", e);
-			return null;
+			return "";
+		}
+	}
+
+	public static boolean logoPrimary() {
+		try {
+			String primary = ENVIRONMENT.getProperty(LOGO_PRIMARY);
+			return primary != null && primary.equals("true");
+		} catch (GuacamoleException e) {
+			return false;
 		}
 	}
 
-- 
cgit v1.2.3-55-g7522