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

Conflicts:
	Dozentenmodulserver/bin/server/ServerHandler.class

8 files changed, 29 insertions, 12 deletions

diff --git a/Dozentenmodul/bin/ftp/UploadTask.class b/Dozentenmodul/bin/ftp/UploadTask.class
index 2b62ba67..101ff93b 100644
--- a/Dozentenmodul/bin/ftp/UploadTask.class
+++ b/Dozentenmodul/bin/ftp/UploadTask.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 6c4219ce..704bd616 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 683a9b1a..aff3176d 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java
index 2dbeff8d..06d76dc8 100644
--- a/Dozentenmodul/src/ftp/UploadTask.java
+++ b/Dozentenmodul/src/ftp/UploadTask.java
@@ -49,6 +49,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
             FileInputStream inputStream = new FileInputStream(uploadFile);
             byte[] buffer = new byte[BUFFER_SIZE];
             int bytesRead = -1;
+            int i=0;
             long totalBytesRead = 0;
             int percentCompleted = 0;
             long fileSize = uploadFile.length();
@@ -57,7 +58,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
             final double NANOS_PER_SECOND = 1000000000.0;
             final double BYTES_PER_MIB = 1024*1024;
             while ((bytesRead = inputStream.read(buffer)) != -1 && isCancelled()==false) {
-                util.writeFileBytes(buffer, 0, bytesRead);
+            	util.writeFileBytes(buffer, 0, bytesRead);
                 totalBytesRead += bytesRead;
                 percentCompleted = (int) (totalBytesRead * 100 / fileSize);
                 double speed = NANOS_PER_SECOND / BYTES_PER_MIB * totalBytesRead / (System.nanoTime() - start + 1);
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 6d3872a0..8c14fa01 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -405,6 +405,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
+			System.out.println("Test");
 			user = client.getFtpUser();
 			System.out.println("FTP name" + user.userName);
 			System.out.println("FTP path" + user.path);
@@ -427,6 +428,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
 		System.out.println("Uploading to host: "+host);
+		
 		task = new UploadTask(host, port, user.userName, user.password,
 				user.path+"temp/", uploadFile);
 
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index ead2bd11..b30a33a7 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -232,8 +232,7 @@ public class Login_GUI extends JFrame {
 							.getAuthToken());
 
 					String hochschule = user.eMail.substring(
-							user.eMail.indexOf("@") + 1,
-							user.eMail.indexOf(".", user.eMail.indexOf("@")));
+							user.eMail.indexOf("@") + 1);
 
 					person.verantwortlicher.setUsername(lblusername.getText()
 							.substring(0, lblusername.getText().indexOf("@")));
diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 2b5a1bb9..cf70402f 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
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");