1 files changed, 34 insertions, 27 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 80c88c98..324ae01a 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -121,8 +121,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		
 		try 
 		{
-			client.setTokenForSession(SessionData.session.getAuthToken());
-			uuid = client.createRandomUUID(); 
+	
+			uuid = client.createRandomUUID(SessionData.session.getAuthToken()); 
 		} catch (TException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
@@ -146,18 +146,31 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					// 0=beenden, 1=abbrechen
 					if (choice == 0) {
 						try {
-							client.DeleteFtpUser(user.userName);
+							client.DeleteFtpUser(user.userName, SessionData.session.getAuthToken());
 						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
 						}
 						task.cancel(true);
 						con.closeThriftConnection();
+						try {
+							client.setSessionInvalid(SessionData.session.getAuthToken());
+						} catch (TException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 						System.exit(0);
 					}// end if choice
 				} else {
 					// no upload running, close window
-					System.exit(0);
+					
+					try {
+						client.setSessionInvalid(SessionData.session.getAuthToken());
+					} catch (TException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+						System.exit(0);
+					}
 				}// end if taskrun
 			}// end window closing
 		});
@@ -386,7 +399,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 				isAborted = true; // set flag
 				try {
-					client.DeleteFtpUser(user.userName);
+					client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 					LOGGER.info("Deleted FTP user.");
 				} catch (TException e1) {
 					// TODO Auto-generated catch block
@@ -445,7 +458,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						
 						if (taskrun == true) {
 							try {
-								client.DeleteFtpUser(user.userName);
+								client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
@@ -478,7 +491,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 							// 0=beenden, 1=abbrechen
 							if (choice == 0) {
 								try {
-									client.DeleteFtpUser(user.userName);
+									client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 								} catch (TException e1) {
 									// TODO Auto-generated catch block
 									e1.printStackTrace();
@@ -581,7 +594,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
-		
+		//System.out.println("userID is: "+person.verantwortlicher.getUserID());
 		c = this;
 	}
 
@@ -594,7 +607,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 			LOGGER.info("Getting FTP User...");
-			user = client.getFtpUser();
+			user = client.getFtpUser(SessionData.session.getAuthToken());
 			LOGGER.info("Received FTP user.");
 			//LOGGER.debug("FTP name: " + user.userName);
 			//LOGGER.debug("FTP path: " + user.path);
@@ -689,13 +702,9 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 			
-			client.writeVLdata(Image.image.getImagename(),
+			client.writeVLdata(
+					Image.image.getImagename(),
 					Image.image.getDesc(),
-					person.verantwortlicher.getUsername(),
-					person.verantwortlicher.getVorname(),
-					person.verantwortlicher.getName(),
-					person.verantwortlicher.getHochschule(),
-					person.verantwortlicher.getEMail(),
 					person.verantwortlicher.getTel(),
 					person.verantwortlicher.getFakultaet(),
 					Image.image.isLicensed(), 
@@ -707,19 +716,16 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					Image.image.getFilesize(),
 					Image.image.getShareMode(), 
 					Image.image.getOS(),
-					uuid);
-
-			client.startFileCopy(Image.image.getNewName());
-
-			client.writeImageRights(uuid,
-					person.verantwortlicher.getUsername(),
-					person.verantwortlicher.getName(),
-					person.verantwortlicher.getVorname(),
-					person.verantwortlicher.getEMail(),
-					person.verantwortlicher.getHochschule(),
-					person.verantwortlicher.getRole()
+					uuid,
+					SessionData.session.getAuthToken(),
+					person.verantwortlicher.getUserID()
 					);
 			
+			System.out.println("userID is: "+person.verantwortlicher.getUserID());
+			client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
+
+			client.writeImageRights(uuid,SessionData.session.getAuthToken(),person.verantwortlicher.getRole(),person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID());
+			
 			for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++)
 			{
 				//System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
@@ -729,7 +735,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(),
+						SessionData.session.getAuthToken()
 						);
 				/*
 				LOGGER.info(