Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodulserver/bin/server/ServerHandler.class

1 files changed, 24 insertions, 9 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index cf70002a..5744003a 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -33,28 +33,43 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public User getFtpUser() throws TException {
-		log.info(new Date() + " - returing FTPUser...");
+		log.info(new Date() + " - returning FTPUser...");
 		User user = new User();
 		user.setUserName(UUID.randomUUID().toString().substring(0, 8));
 		user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString()
 				.substring(0, 8)));
-		user.setPath(Configuration.config.getAbsolute_path());
+		if(Configuration.config.getAbsolute_path().endsWith("/"))
+		{
+			user.setPath(Configuration.config.getAbsolute_path());
+		}
+		else{
+			user.setPath(Configuration.config.getAbsolute_path()+"/");
+		}
 		SQL sql = new SQL();
 		Connection con = sql.getConnection();
 		// check if folder temp exists
-		//if (folderTempExists() == true) {
+		if (folderTempExists() == true) {
 			sql.writeFTPUser(con, user.getUserName(), user.getPassword());
 			return user;
-		//} else {
-		//	log.info(new Date() + " - returning null user");
-		//	return null;
-		//}
+		} else {
+			log.info(new Date() + " - returning null user");
+			return null;
+		}
 	}
 
 	public boolean folderTempExists() {
 		// check if folder temp exists, otherwise create it
-		Path path = Paths
-				.get(Configuration.config.getAbsolute_path() + "/temp");
+		Path path=null;
+		if(Configuration.config.getAbsolute_path().endsWith("/"))
+		{
+			path = Paths
+					.get(Configuration.config.getAbsolute_path() + "temp");
+		}
+		else{
+			path = Paths
+					.get(Configuration.config.getAbsolute_path() + "/temp");
+		}
+
 		if (Files.exists(path) == true) {
 			log.info(new Date() + " - folder '" + path
 					+ "' exists, no further action");