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

1 files changed, 43 insertions, 21 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index e1c426bf..597ac36b 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -113,12 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	 */
 	public FTPEditUploader_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -139,16 +134,34 @@ public class FTPEditUploader_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) {
 							e1.printStackTrace();
 						}
 						task.cancel(true);
+						try {
+							client.setSessionInvalid(SessionData.session.getAuthToken());
+						} catch (TException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 						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
+					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
@@ -361,7 +374,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 				isAborted = true; // set flag
 				try {
-					client.DeleteFtpUser(user.userName);
+					client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 					LOGGER.info("FTP user deleted.");
 				} catch (TException e1) {
 					e1.printStackTrace();
@@ -427,7 +440,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 						if (taskrun == true) {
 							try {
-								client.DeleteFtpUser(user.userName);
+								client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 
 							} catch (TException e1) {
 								e1.printStackTrace();
@@ -457,7 +470,7 @@ public class FTPEditUploader_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) {
 									e1.printStackTrace();
 								}
@@ -465,7 +478,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 								// not loading files, go back one page
 								
 								try {
-									if( (client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true) || person.verantwortlicher.getRole().equals("Admin") ){
+
+									if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true || person.verantwortlicher.getRole().equals("Admin")){
+
 										//user is admin and may change permissions
 										PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
 										ei.setVisible(true);
@@ -493,7 +508,10 @@ public class FTPEditUploader_GUI extends JFrame implements
 											JOptionPane.YES_NO_OPTION);
 							if (selectedOption == JOptionPane.YES_OPTION) {
 								try {
-									if(client.userIsImageAdmin(person.verantwortlicher.getUserID(), Image.image.getImageId()) == true){
+									System.out.println("userID in editimageuploader is : "+person.verantwortlicher.getUserID());
+									
+									if(client.userIsImageAdmin(Image.image.getImageId(), SessionData.session.getAuthToken(),person.verantwortlicher.getUserID()) == true)
+									{
 										//user is admin and may change permissions
 										PermissionEditImage_GUI ei = new PermissionEditImage_GUI(c);
 										ei.setVisible(true);
@@ -597,7 +615,7 @@ public class FTPEditUploader_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);
@@ -714,9 +732,11 @@ public class FTPEditUploader_GUI extends JFrame implements
 						Image.image.isVorlage(),
 						Image.image.getFilesize(),
 						Image.image.getShareMode(),
-						Image.image.getOS());
+						Image.image.getOS(),
+						SessionData.session.getAuthToken()
+						);
 				if (fileupload == true) {
-					client.startFileCopy(Image.image.getNewName());
+					client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
 				}
 
 			} else { //no new file uploaded and old file name stays
@@ -737,10 +757,12 @@ public class FTPEditUploader_GUI extends JFrame implements
 						Image.image.isVorlage(), 
 						Image.image.getFilesize(),
 						Image.image.getShareMode(), 
-						Image.image.getOS());
+						Image.image.getOS(),
+						SessionData.session.getAuthToken()
+						);
 
 				if (fileupload == true) {
-					client.startFileCopy(Image.image.getNewName());
+					client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
 					// client.startFileCopy(Image.image.getImagename());
 				}
 			}
@@ -748,9 +770,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 			// remove all additional user permissions on first stage
 
-			client.deleteAllAdditionalImagePermissions(
-					Image.image.getImageId(),
-					person.verantwortlicher.getUserID());
+			client.deleteAllAdditionalImagePermissions(Image.image.getImageId(),SessionData.session.getAuthToken(),person.verantwortlicher.getUserID());
 
 			// then, add user permissions as they have been set new
 			for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) 
@@ -768,7 +788,9 @@ public class FTPEditUploader_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()
+						);
 
 			}// end for