From b8a33faa07211681745a83a5b120429da50c5057 Mon Sep 17 00:00:00 2001
From: Daniel Vogel <daniel.vogel@mni.thm.de>
Date: Wed, 14 Jan 2015 10:48:21 +0100
Subject: [PATCH] Pp Session logos from url are now converted to base64
---
.../java/de/thm/arsnova/services/SessionService.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 445abe208..c36735d40 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Service;
+import de.thm.arsnova.ImageUtils;
import de.thm.arsnova.connector.client.ConnectorClient;
import de.thm.arsnova.connector.model.Course;
import de.thm.arsnova.dao.IDatabaseDao;
@@ -40,6 +41,7 @@ import de.thm.arsnova.entities.SessionInfo;
import de.thm.arsnova.entities.User;
import de.thm.arsnova.exceptions.ForbiddenException;
import de.thm.arsnova.exceptions.NotFoundException;
+import de.thm.arsnova.exceptions.BadRequestException;
import de.thm.arsnova.socket.ARSnovaSocketIOServer;
@Service
@@ -191,6 +193,14 @@ public class SessionService implements ISessionService {
throw new ForbiddenException();
}
}
+
+ if (session.getPpLogo() != null && session.getPpLogo().startsWith("http")) {
+ final String base64ImageString = ImageUtils.encodeImageToString(session.getPpLogo());
+ if (base64ImageString == null) {
+ throw new BadRequestException();
+ }
+ session.setPpLogo(base64ImageString);
+ }
return databaseDao.saveSession(userService.getCurrentUser(), session);
}
--
GitLab