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

28 files changed, 599 insertions, 461 deletions

diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java
index eee607be..ae607c8a 100644
--- a/dozentenmodul/src/main/java/ftp/DownloadTask.java
+++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java
@@ -11,6 +11,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
 import models.Image;
+import models.SessionData;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
@@ -152,7 +153,7 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 		LOGGER.debug("Image's ID: " + Image.image.getImageId());
 		Map<String, String> imageData = null;
 		try {
-			imageData = models.Client.clientcon.getClient().getImageData(Image.image.getImageId(), Image.image.getVersion());
+			imageData = models.Client.clientcon.getClient().getImageData(Image.image.getImageId(), Image.image.getVersion(), SessionData.session.getAuthToken());
 		} catch (TException e) {
 			LOGGER.error("Thrift exception during transfer, see trace: ", e);
 			return false;
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index 853fa582..325fe62f 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -36,13 +36,16 @@ import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Links;
+import models.SessionData;
 import models.person;
+import server.generated.Server.Client;
 import util.GuiOrganizer;
 import util.OpenLinks;
 
 import javax.swing.JScrollPane;
 
 import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
 
 @SuppressWarnings("serial")
 public class CreateImageAllgemein_GUI extends JFrame {
@@ -70,6 +73,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 			"Um das Image richtig zuordnen zu können, werden hier einige grundlegende Informationen benötigt.<br />" +
 			"Geben Sie daher bitte einen allgemeinen Namen, sowie eine genauere Beschreibung ihres Images (Labors) an.<br />" +
 			"</div></html>";
+	Client client = models.Client.clientcon.getClient();
 
 	/**
 	 * Create the dialog.
@@ -78,6 +82,12 @@ public class CreateImageAllgemein_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				// Beendet das Fenster auf X
 				System.exit(0);
 			}
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 0fb31a66..e80c3a68 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -43,7 +43,11 @@ import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Links;
+
+import models.SessionData;
+
 import models.person;
+
 import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
@@ -61,7 +65,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	 * Logger instance for this class.
 	 */
 	private final static Logger LOGGER = Logger.getLogger(CreateImageTechnisch_GUI.class);
-	
+
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	JSpinner spinnerCPU;
@@ -90,6 +94,12 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -202,7 +212,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 		});
 		List<String> os = null;
 		try {
-			os = client.getAllOS();
+			os = client.getAllOS(SessionData.session.getAuthToken());
 			for(int i=0; i<os.size();i++){
 				comboBox.addItem(os.get(i).toString());
 			}
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 2a394205..525b7a11 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -71,7 +71,7 @@ import javax.swing.JTextArea;
 
 @SuppressWarnings("serial")
 public class DeleteImage_GUI extends JFrame {
-	
+
 	private final static Logger LOGGER = Logger
 			.getLogger(FTPCreateUploader_GUI.class);
 
@@ -99,85 +99,78 @@ public class DeleteImage_GUI extends JFrame {
 	boolean activeSearch = false;
 	Component c = null;
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" }; // Angezeigt
-																					// werden
-																					// aber
-																					// nur
-																					// Name
-																					// (0),
-																					// OS
-																					// (2),
-																					// Verantwortlicher
-																					// (4),
-																					// Letztes
-																					// Update
-																					// (5)
-	private static final String HELP_MESSAGE =	"<html><div align = \"center\">" +
-		   	"Löschen Sie hier die Images, die nicht mehr benötigt werden.<br />" +
-		   	"Ein gelöschtes Image wird auch tatsächlich physisch gelöscht und kann nicht wiederhergestellt werden.<br />" +
-		   	"Wird das Image nach dem Löschen nochmal benötigt, muss es erneut hochgeladen werden." +
-		   	"</div></html>";
-	
-	
+			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template",
+			"Beschreibung" }; // Angezeigt
+	// werden
+	// aber
+	// nur
+	// Name
+	// (0),
+	// OS
+	// (2),
+	// Verantwortlicher
+	// (4),
+	// Letztes
+	// Update
+	// (5)
+	private static final String HELP_MESSAGE = "<html><div align = \"center\">"
+			+ "Löschen Sie hier die Images, die nicht mehr benötigt werden.<br />"
+			+ "Ein gelöschtes Image wird auch tatsächlich physisch gelöscht und kann nicht wiederhergestellt werden.<br />"
+			+ "Wird das Image nach dem Löschen nochmal benötigt, muss es erneut hochgeladen werden."
+			+ "</div></html>";
+
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	
+
 	/*
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	*/
+	 * final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
+	 * public boolean isCellEditable(int rowIndex, int mColIndex) { return
+	 * false; } };
+	 */
 	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			return false;
 		}
 	};
 	/*
-	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
-			0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};*/
+	 * final DefaultTableModel modelPublicVorlagen = new
+	 * DefaultTableModel(titles, 0) { public boolean isCellEditable(int
+	 * rowIndex, int mColIndex) { return false; } };
+	 */
 	/*
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelAll);
-			*/
+	 * final TableRowSorter<TableModel> rowSorterAll = new
+	 * TableRowSorter<TableModel>( modelAll);
+	 */
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
 			modelMyImages);
 	/*
-	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
-			modelPublicVorlagen);
-	*/
+	 * final TableRowSorter<TableModel> rowSorterPublicVorlagen = new
+	 * TableRowSorter<TableModel>( modelPublicVorlagen);
+	 */
 
 	RowFilter rf = null;
-	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
-	
+	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
+			2);
+
 	/**
 	 * Create the dialog.
 	 */
 	public DeleteImage_GUI(Component formerGUI) {
-		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
-		
+
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
 
-		
-		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
 				con.closeThriftConnection();
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 
@@ -212,7 +205,7 @@ public class DeleteImage_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
 
 				tablemyImages.getTableHeader().setReorderingAllowed(false);
-				
+
 				// bis hier
 				textFieldName.requestFocusInWindow();
 			}
@@ -225,11 +218,12 @@ public class DeleteImage_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			 
+
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Image löschen - "+person.verantwortlicher.getUserID());
+		setTitle("bwLehrpool Suite - Image löschen - "
+				+ person.verantwortlicher.getUserID());
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
@@ -282,37 +276,37 @@ public class DeleteImage_GUI extends JFrame {
 
 		textFieldName = new JTextField();
 		// Key Listener der Tastatureingabe registriert
-		
-		
+
 		textFieldName.addKeyListener(new KeyAdapter() {
 			@Override
-			public void keyReleased(KeyEvent e) 
-			{
+			public void keyReleased(KeyEvent e) {
 				// Textfield eingabe auslesen
 				String stext = textFieldName.getText().trim();
 
 				// Wenn Textfield nicht leer
-				if (stext != "") 
-				{
+				if (stext != "") {
 					activeSearch = true;
 					// Filtere nach der Eingabe
-				 	filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive
-					filters.add(RowFilter.regexFilter("(?i)"+stext, 9)); //case insensitive
+					filters.clear();
+					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case
+																			// insensitive
+					filters.add(RowFilter.regexFilter("(?i)" + stext, 9)); // case
+																			// insensitive
 					rf = RowFilter.orFilter(filters);
 					rowSorterMyImages.setRowFilter(rf);
-				} 
-				else 
-				{
+				} else {
 					activeSearch = false;
-					
+
 					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
+					filters.add(RowFilter.regexFilter(".", 0)); // case
+																// insensitive,
+																// filter for
+																// anything
 					rf = RowFilter.orFilter(filters);
 					rowSorterMyImages.setRowFilter(rf);
 				}
 				tablemyImages.clearSelection();
-				
+
 				resetImageInfo();
 			}
 		});
@@ -325,7 +319,8 @@ public class DeleteImage_GUI extends JFrame {
 		try {
 			// Holt sich eine Liste aller verfügbaren Betriebssysteme vom
 			// Server
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session
+					.getAuthToken());
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
@@ -333,7 +328,7 @@ public class DeleteImage_GUI extends JFrame {
 				comboBox.addItem(list.get(i));
 			}
 		} catch (TException e2) {
-			 
+
 			e2.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",
@@ -345,23 +340,28 @@ public class DeleteImage_GUI extends JFrame {
 				// Prueft das die Auswahl nicht leer ist
 				if (comboBox.getSelectedItem().toString() != "") {
 					activeSearch = true;
-					
-					/*rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
-							.getSelectedItem().toString(), 2));*/
+
+					/*
+					 * rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
+					 * .getSelectedItem().toString(), 2));
+					 */
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							comboBox.getSelectedItem().toString(), 2));
-					/*rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							comboBox.getSelectedItem().toString(), 2));*/
+					/*
+					 * rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter
+					 * ( comboBox.getSelectedItem().toString(), 2));
+					 */
 				} else {
 					activeSearch = false;
 					/*
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					*/
+					 * String username = person.verantwortlicher.getName() + " "
+					 * + person.verantwortlicher.getVorname();
+					 */
 					rowSorterMyImages.setRowFilter(null);
-					/*rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-							"true", 8));
-					rowSorterAll.setRowFilter(null);*/
+					/*
+					 * rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter
+					 * ( "true", 8)); rowSorterAll.setRowFilter(null);
+					 */
 				}
 			}
 
@@ -412,8 +412,7 @@ public class DeleteImage_GUI extends JFrame {
 				String imageid = "";
 				String imageversion = "";
 				int eingabe;
-				String username = person.verantwortlicher.getName() + " "
-						+ person.verantwortlicher.getVorname();
+
 				if (tablemyImages.getSelectedRowCount() != 0) {
 
 					// frage, soll das selektierte Daten geloescht werden?
@@ -441,30 +440,58 @@ public class DeleteImage_GUI extends JFrame {
 
 						try {
 							if (!client.connectedToLecture(imageid,
-									imageversion)) {
+									imageversion,
+									SessionData.session.getAuthToken())) {
 								try {
-									client.deleteImageServer(imageid,
-											imageversion);
-									if (client.deleteImageData(imageid,imageversion)) {
-										
-										LOGGER.info("Image '"+imageid+"' erfolgreich gelöscht.");
-
-										DeleteImage_GUI di = new DeleteImage_GUI(c);
-										di.setVisible(true);
-										dispose();
 
+									//  try to delete file from file system
+									if (client.deleteImageServer(imageid,
+											imageversion,
+											SessionData.session.getAuthToken()) == true) {
+										// successful, now delete file from DB
+										if (client.deleteImageData(imageid,
+												imageversion,
+												SessionData.session
+														.getAuthToken())) {
+
+											LOGGER.info("Image '" + imageid
+													+ "' erfolgreich gelöscht.");
+
+											DeleteImage_GUI di = new DeleteImage_GUI(
+													c);
+											di.setVisible(true);
+											dispose();
+
+										} else {
+											//could not delete file from DB
+											LOGGER.info("Image '"
+													+ imageid
+													+ "' konnte nicht gelöscht werden.");
+
+											JOptionPane
+													.showConfirmDialog(
+															c,
+															"Image konnte nicht gelöscht werden.",
+															"Fehler",
+															JOptionPane.INFORMATION_MESSAGE);
+										}
 									} else {
-										LOGGER.info("Image '"+imageid+"' konnte nicht gelöscht werden.");
+										// could not delete file from file
+										// system
+										LOGGER.info("Image '"
+												+ imageid
+												+ "' konnte nicht von Server gelöscht werden.");
 
 										JOptionPane
 												.showConfirmDialog(
 														c,
-														"Image konnte nicht gelöscht werden.",
+														"Image konnte nicht vom Server gelöscht werden.",
 														"Fehler",
 														JOptionPane.INFORMATION_MESSAGE);
 									}
+
 								} catch (HeadlessException e) {
-									 
+
 									e.printStackTrace();
 									JOptionPane.showMessageDialog(
 											c,
@@ -473,7 +500,7 @@ public class DeleteImage_GUI extends JFrame {
 											"Debug-Message",
 											JOptionPane.ERROR_MESSAGE);
 								} catch (TException e) {
-									 
+
 									e.printStackTrace();
 									JOptionPane.showMessageDialog(
 											c,
@@ -484,7 +511,9 @@ public class DeleteImage_GUI extends JFrame {
 								}
 
 							} else {
-								LOGGER.info("Image '"+imageid+"' konnte nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.");
+								LOGGER.info("Image '"
+										+ imageid
+										+ "' konnte nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.");
 
 								JOptionPane
 										.showMessageDialog(
@@ -494,7 +523,7 @@ public class DeleteImage_GUI extends JFrame {
 												JOptionPane.INFORMATION_MESSAGE);
 							}
 						} catch (TException e) {
-							 
+
 							e.printStackTrace();
 							JOptionPane.showMessageDialog(c, e.getCause()
 									+ "\n" + e.getStackTrace(),
@@ -516,23 +545,24 @@ public class DeleteImage_GUI extends JFrame {
 		tablemyImages.getSelectionModel().addListSelectionListener(
 				new ListSelectionListener() {
 					public void valueChanged(ListSelectionEvent e) {
-						
-						if(tablemyImages.getSelectedRow() != -1)
-						{
-						String imageid = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 6)
-								.toString();
-						String version = modelMyImages.getValueAt(
-								tablemyImages
-										.convertRowIndexToModel(tablemyImages
-												.getSelectedRow()), 7)
-								.toString();
-						writeImageData(imageid, version);
+
+						if (tablemyImages.getSelectedRow() != -1) {
+							String imageid = modelMyImages
+									.getValueAt(
+											tablemyImages
+													.convertRowIndexToModel(tablemyImages
+															.getSelectedRow()),
+											6).toString();
+							String version = modelMyImages
+									.getValueAt(
+											tablemyImages
+													.convertRowIndexToModel(tablemyImages
+															.getSelectedRow()),
+											7).toString();
+							writeImageData(imageid, version);
 						}
 					}
-					
+
 				});
 		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		tablemyImages.setModel(modelMyImages);
@@ -544,7 +574,6 @@ public class DeleteImage_GUI extends JFrame {
 		tablemyImages.setRowSorter(rowSorterMyImages);
 
 		scrollPaneMyImage.setViewportView(tablemyImages);
-		
 
 		lblTotalResults.setBounds(10, 512, 131, 20);
 		contentPanel.add(lblTotalResults);
@@ -728,7 +757,7 @@ public class DeleteImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					 
+
 					e.printStackTrace();
 				}
 			}
@@ -749,7 +778,7 @@ public class DeleteImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					 
+
 					e.printStackTrace();
 				}
 
@@ -765,12 +794,14 @@ public class DeleteImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(menuItem);
-		
+
 		JMenu mnNewMenu_Info = new JMenu("Info");
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+				JOptionPane.showMessageDialog(c, HELP_MESSAGE,
+						"Hilfe zu dieser Oberfläche",
+						JOptionPane.INFORMATION_MESSAGE);
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
@@ -780,28 +811,30 @@ public class DeleteImage_GUI extends JFrame {
 
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		
-		
+
 		List<server.generated.Image> images;
 		try {
-			
+
 			// Hole eine Liste der Images
-			if(person.verantwortlicher.getRole()=="Admin"){
-				//get complete list
-				images = client.getImageList(person.verantwortlicher.getUserID());
+			if (person.verantwortlicher.getRole() == "Admin") {
+				// get complete list
+				images = client.getImageList(person.verantwortlicher
+						.getUserID(),SessionData.session.getAuthToken());
 			} else {
-				//get permitted list
-				images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID());
+				// get permitted list
+				images = client.getImageListPermissionAdmin(
+						person.verantwortlicher.getUserID(),
+						SessionData.session.getAuthToken());
 			}
 
 			Iterator<server.generated.Image> i = images.iterator();
 
-			System.out.println("Size of image list="+images.size());
-			
+			System.out.println("Size of image list=" + images.size());
+
 			int x = 0;
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			
+
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
 				Object[] obj = { images.get(x).getImageName(),
@@ -812,25 +845,24 @@ public class DeleteImage_GUI extends JFrame {
 						out.format(in.parse(images.get(x).updateTime)),
 						images.get(x).id, images.get(x).getVersion(),
 						images.get(x).getIsTemplate(),
-						images.get(x).getDescription()};
+						images.get(x).getDescription() };
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
 				i.next();
-				
-				
 
 			}
-			if(x==0){
+			if (x == 0) {
 				System.out.println("Damn... nothing to do here..");
 			}
-			
-			//show number if rows in GUI
-			lblTotalResults.setText(lblTotalResults.getText()+" "+model.getRowCount());
+
+			// show number if rows in GUI
+			lblTotalResults.setText(lblTotalResults.getText() + " "
+					+ model.getRowCount());
 
 			return model;
 		} catch (TException | ParseException e1) {
-			 
+
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
@@ -838,9 +870,10 @@ public class DeleteImage_GUI extends JFrame {
 		}
 		return model;
 	}
-	
+
 	private void resetImageInfo() {
-		//reset the detailed information on the right hand side when changing search string
+		// reset the detailed information on the right hand side when changing
+		// search string
 		labelID.setText("");
 		labelVersion.setText("");
 		labelName.setText("");
@@ -854,14 +887,15 @@ public class DeleteImage_GUI extends JFrame {
 		labelInternet.setText("");
 		labelRam.setText("");
 		labelCPU.setText("");
-		
+
 	}
 
 	public void writeImageData(String id, String version) {
 		try {
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			Map<String, String> res = client.getImageData(id, version);
+			Map<String, String> res = client.getImageData(id, version,
+					SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
@@ -888,7 +922,7 @@ public class DeleteImage_GUI extends JFrame {
 			labelVersion.setText(res.get("version"));
 			textAreadesc.setText(res.get("desc"));
 		} catch (TException | ParseException e1) {
-			 
+
 			e1.printStackTrace();
 		}
 	}
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 3bac78e8..686fcccb 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -39,6 +39,7 @@ import javax.swing.border.TitledBorder;
 import models.Image;
 import models.ItemOwner;
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
@@ -95,6 +96,12 @@ public class EditImageAllgemein_GUI extends JFrame {
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung bei einem Klick auf das X
 				con.closeThriftConnection();
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -439,8 +446,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 	public void initData() {
 		try {
 
-			Map<String, String> map = client.getImageData(
-					Image.image.getImageId(), Image.image.getVersion());
+			Map<String, String> map = client.getImageData(Image.image.getImageId(), Image.image.getVersion(),SessionData.session.getAuthToken());
+			
 			if (map.get("internet").equals("0")) {
 				Image.image.setInternet(false);
 			} else {
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 98367420..10be7d2b 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -41,6 +41,7 @@ import thrift.ThriftConnection;
 import util.OpenLinks;
 import models.Image;
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import javax.swing.JComboBox;
@@ -88,7 +89,12 @@ public class EditImageTechnisch_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung bei Klick auf das X
-
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 
@@ -201,7 +207,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		
 		List<String> os = null;
 		try {
-			os=client.getAllOS();
+			os=client.getAllOS(SessionData.session.getAuthToken());
 			for(int i=0;i<os.size();i++) {
 				comboBox.addItem(os.get(i).toString());
 			}
@@ -219,7 +225,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 		panel_1.add(comboBox);
 		
 		try {
-			comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS()));
+			comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS(),SessionData.session.getAuthToken()));
 		} catch (TException e1) 
 		{
 			// TODO Auto-generated catch block
@@ -382,7 +388,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 						
 						try {
 							//check if user may change permissions and choose window
-							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 has permission, go to permission GUI
 								PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c);
 								ea.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 3f1d7ab9..d5ab0330 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -116,10 +116,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public FTPCreateUploader_GUI(Component formerGUI) {
 
 		final Object[] options = { "Beenden", "Abbrechen" };
+		
+		try 
+		{
+	
+			uuid = client.createRandomUUID(SessionData.session.getAuthToken()); 
 
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-			uuid = client.createRandomUUID();
 		} catch (TException e1) {
 
 			e1.printStackTrace();
@@ -143,18 +145,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) {
 
 							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
 		});
@@ -382,7 +397,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) {
 
@@ -450,7 +465,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) {
 
@@ -505,7 +520,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) {
 
 									e1.printStackTrace();
@@ -623,7 +638,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);
@@ -718,63 +733,43 @@ 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(), Image.image.isInternet(),
-					Image.image.getRam(), Image.image.getCpu(), "temp/"
-							+ Image.image.getNewName(),
-					Image.image.isVorlage(), 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());
-
-			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());
-				client.writeAdditionalImageRights(uuid,
-						RightsManagement.rightsManagement
-								.getPermittedUserList().get(i).getUserID(),
-						RightsManagement.rightsManagement
-								.getPermittedUserList().get(i).isImageRead(),
-						RightsManagement.rightsManagement
-								.getPermittedUserList().get(i).isImageWrite(),
-						RightsManagement.rightsManagement
-								.getPermittedUserList().get(i)
-								.isImageLinkAllowed(),
-						RightsManagement.rightsManagement
-								.getPermittedUserList().get(i).isImageAdmin());
-				/*
-				 * LOGGER.info( "Name: "+Image.image.getImagename()
-				 * +"\tUserID: "
-				 * +RightsManagement.rightsManagement.getPermittedUserList
-				 * ().get(i).getUserID()
-				 * +"\tisImageRead: "+RightsManagement.rightsManagement
-				 * .getPermittedUserList().get(i).isImageRead()
-				 * +"\tisImageWrite: "
-				 * +RightsManagement.rightsManagement.getPermittedUserList
-				 * ().get(i).isImageWrite()
-				 * +"\tisImageLInkAllowed: "+RightsManagement
-				 * .rightsManagement.getPermittedUserList
-				 * ().get(i).isImageLinkAllowed()
-				 * +"\tisImageAdmin: "+RightsManagement
-				 * .rightsManagement.getPermittedUserList
-				 * ().get(i).isImageAdmin() );
-				 */
+					Image.image.isLicensed(), 
+					Image.image.isInternet(),
+					Image.image.getRam(), 
+					Image.image.getCpu(), 
+					"temp/"+ Image.image.getNewName(),
+					Image.image.isVorlage(), 
+					Image.image.getFilesize(),
+					Image.image.getShareMode(), 
+					Image.image.getOS(),
+					uuid,
+					SessionData.session.getAuthToken(),
+					person.verantwortlicher.getUserID()
+					);
+			
+			//System.out.println("userID is: "+person.verantwortlicher.getUserID());
+			System.out.println("starting file copy...");
+			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());
+				client.writeAdditionalImageRights(
+						uuid,
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(),
+						SessionData.session.getAuthToken()
+						);
 
 			}// end for
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 1dd873b7..437f6c77 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -50,8 +50,9 @@ import org.ini4j.Wini;
 import server.generated.Server.Client;
 import server.generated.User;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
+
+
 import ftp.DownloadTask;
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
@@ -66,7 +67,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	 */
 	private final static Logger LOGGER = Logger
 			.getLogger(FTPEditDownloader_GUI.class);
-
+ 
 	@SuppressWarnings("unused")
 	private JPanel contentPane;
 	private final JPanel contentPanel = new JPanel();
@@ -109,12 +110,6 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	 */
 	public FTPEditDownloader_GUI(Component formerGUI) {
 
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			
-			e1.printStackTrace();
-		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -134,8 +129,14 @@ public class FTPEditDownloader_GUI extends JFrame implements
 					// 0=beenden, 1=abbrechen
 					if (choice == 0) {
 						try {
-							client.DeleteFtpUser(user.userName);
+							client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 							con.closeThriftConnection();
+							try {
+								client.setSessionInvalid(SessionData.session.getAuthToken());
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+							}
 						} catch (TException e1) {
 							
 							e1.printStackTrace();
@@ -145,6 +146,12 @@ public class FTPEditDownloader_GUI extends JFrame implements
 					}// end if coice
 				} else {
 					// no download running, close window
+					try {
+						client.setSessionInvalid(SessionData.session.getAuthToken());
+					} catch (TException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
 					System.exit(0);
 				}// end if taskrun
 			}// end window closing
@@ -429,7 +436,7 @@ public class FTPEditDownloader_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) {
 					
@@ -468,7 +475,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 							if (choice == 0) {
 								task.cancel(true);
 								try {
-									client.DeleteFtpUser(user.userName);
+									client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 								} catch (TException e1) {
 									
 									e1.printStackTrace();
@@ -530,12 +537,12 @@ public class FTPEditDownloader_GUI extends JFrame implements
 												// Klick
 		btnDownloadStarten.setText("Bitte warten");
 		try {
-			user = client.getFtpUser();
+			user = client.getFtpUser(SessionData.session.getAuthToken());
 
 			downloadFile = user.path
 					+ "/"
 					+ client.getPathOfImage(Image.image.getImageId(),
-							Image.image.getVersion());
+							Image.image.getVersion(),SessionData.session.getAuthToken());
 
 		} catch (TException e) {
 			
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
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index ba45fc79..f7238b03 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -106,12 +106,6 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 	 */
 	public FTPSearchDownloader_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -132,8 +126,20 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 					if (choice == 0) {
 
 						try {
-							client.DeleteFtpUser(user.userName);
+							client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+							try {
+								client.setSessionInvalid(SessionData.session.getAuthToken());
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+							}
 							con.closeThriftConnection();
+							try {
+								client.setSessionInvalid(SessionData.session.getAuthToken());
+							} catch (TException e1) {
+								// TODO Auto-generated catch block
+								e1.printStackTrace();
+							}
 						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
@@ -144,6 +150,12 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 					}// end if choice
 				} else {
 					// no download running, close window
+					try {
+						client.setSessionInvalid(SessionData.session.getAuthToken());
+					} catch (TException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
 					System.exit(0);
 				}// end if taskrun
 			}// end window closing
@@ -430,7 +442,7 @@ public class FTPSearchDownloader_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
@@ -470,7 +482,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 							if (choice == 0) {
 								task.cancel(true);
 								try {
-									client.DeleteFtpUser(user.userName);
+									client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
 								} catch (TException e1) {
 									// TODO Auto-generated catch block
 									e1.printStackTrace();
@@ -532,12 +544,12 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 												// Klick
 		btnDownloadStarten.setText("Bitte warten");
 		try {
-			user = client.getFtpUser();
+			user = client.getFtpUser(SessionData.session.getAuthToken());
 
 			downloadFile = user.path
 					+ "/"
 					+ client.getPathOfImage(Image.image.getImageId(),
-							Image.image.getVersion());
+							Image.image.getVersion(),SessionData.session.getAuthToken());
 
 		} catch (TException e) {
 			// TODO Auto-generated catch block
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index b51cdead..53c30efc 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -1,7 +1,6 @@
 package gui.image;
 
 import gui.intro.About_GUI;
-import gui.intro.ListAllOtherUsers_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -64,6 +63,7 @@ import org.apache.thrift.TException;
 import server.generated.Person;
 import server.generated.Server.Client;
 import util.CheckIntegrity;
+import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -121,17 +121,17 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 	public PermissionCreateImage_GUI(Component formerGUI) {
 		
-		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 4dd6cf8f..6853f6d7 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -1,7 +1,6 @@
 package gui.image;
 
 import gui.intro.About_GUI;
-import gui.intro.ListAllOtherUsers_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -59,6 +58,7 @@ import org.apache.thrift.TException;
 import server.generated.Person;
 import server.generated.Server.Client;
 import util.CheckIntegrity;
+import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -108,18 +108,17 @@ public class PermissionEditImage_GUI extends JFrame {
 			+ "</div></html>";
 
 	public PermissionEditImage_GUI(Component formerGUI) {
-		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
+
 		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -203,7 +202,7 @@ public class PermissionEditImage_GUI extends JFrame {
 			//System.out.println("Loading data from db");
 			try {
 								
-				map = client.getPermissionForUserAndImage(person.verantwortlicher.getUserID(), Image.image.getImageId());
+				map = client.getPermissionForUserAndImage(SessionData.session.getAuthToken(),Image.image.getImageId(),person.verantwortlicher.getUserID());
 				Iterator<server.generated.Person> i = map.iterator();
 
 				int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 290bd1e0..5e1607a8 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -148,13 +148,6 @@ public class SearchEditImage_GUI extends JFrame {
 	 */
 	public SearchEditImage_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -164,7 +157,14 @@ public class SearchEditImage_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
+				
 				System.exit(0);
 			}
 
@@ -322,7 +322,7 @@ public class SearchEditImage_GUI extends JFrame {
 		try {
 			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
 			// Server
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
@@ -765,10 +765,10 @@ public class SearchEditImage_GUI extends JFrame {
 			// Hole eine Liste der passenden Images,
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				images = client.getImageList(person.verantwortlicher.getUserID()); 
+				images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken()); 
 			} else {
 				//only get permitted list
-				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
+				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
 			Iterator<server.generated.Image> i = images.iterator();
@@ -836,7 +836,7 @@ public class SearchEditImage_GUI extends JFrame {
 		try {
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			Map<String, String> res = client.getImageData(id, version);
+			Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
@@ -865,7 +865,7 @@ public class SearchEditImage_GUI extends JFrame {
 			textAreadesc.setText(res.get("desc"));
 			res.clear();
 			
-			List<String> contacts = client.getAdditionalImageContacts(id);
+			List<String> contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken());
 			labelWeitereVerantwortliche.setText("");
 			for (int i = 0; i < contacts.size(); i++) 
 			{
@@ -885,7 +885,7 @@ public class SearchEditImage_GUI extends JFrame {
 		
 		try {
 			//get values from server and set them in model
-			map=client.getItemOwner(imageid);
+			map=client.getItemOwner(imageid,SessionData.session.getAuthToken());
 			
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index fd6a6647..9aff1648 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -165,21 +165,18 @@ public class SearchImage_GUI extends JFrame {
 	/**

 	 * Create the dialog.

 	 */

-	public SearchImage_GUI(Component formerGUI) {

-		

-

-		

-		try {

-			client.setTokenForSession(SessionData.session.getAuthToken());

-		} catch (TException e1) {

-			e1.printStackTrace();

-		}

-		

+	public SearchImage_GUI(Component formerGUI) {
 		

 		addWindowListener(new WindowAdapter() {

 			@Override

 			public void windowClosing(WindowEvent arg0) {

 				// Beendet die Anwendung nach klick auf X

+				try {

+					client.setSessionInvalid(SessionData.session.getAuthToken());

+				} catch (TException e) {

+					// TODO Auto-generated catch block

+					e.printStackTrace();

+				}

 				con.closeThriftConnection();

 				System.exit(0);

 			}

@@ -429,7 +426,7 @@ public class SearchImage_GUI extends JFrame {
 		try {

 			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom

 			// Server

-			List<String> list = client.getAllOS();

+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());

 			// Leeres Item hinzufuegen

 			comboBox.addItem("");

 			for (int i = 0; i < list.size(); i++) {

@@ -1000,9 +997,9 @@ public class SearchImage_GUI extends JFrame {
 			// Hole eine Liste der Images

 			if(person.verantwortlicher.getRole()=="Admin"){

 				//get complete list

-				images = client.getImageList(person.verantwortlicher.getUserID());

+				images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 			} else {

-				images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());

+				images = client.getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 			}

 

 			Iterator<server.generated.Image> i = images.iterator();

@@ -1050,7 +1047,7 @@ public class SearchImage_GUI extends JFrame {
 		List<server.generated.Image> images;

 		try {

 			// Hole eine Liste der Images

-			images = client.getImageList(person.verantwortlicher.getUserID());

+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 

 			Iterator<server.generated.Image> i = images.iterator();

 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@@ -1100,7 +1097,7 @@ public class SearchImage_GUI extends JFrame {
 			List<server.generated.Image> images;

 			try {

 				// Hole eine Liste der Images

-				images = client.getImageListAllTemplates();

+				images = client.getImageListAllTemplates(SessionData.session.getAuthToken());

 

 				Iterator<server.generated.Image> i = images.iterator();

 				SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@@ -1168,7 +1165,7 @@ public class SearchImage_GUI extends JFrame {
 		try {

 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

-			Map<String, String> res = client.getImageData(id, version);

+			Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());

 			labelName.setText(res.get("name"));

 			labelOS.setText(res.get("os"));

 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));

@@ -1195,7 +1192,7 @@ public class SearchImage_GUI extends JFrame {
 			labelVersion.setText(res.get("version"));

 			textAreadesc.setText(res.get("desc"));

 			

-			List<String> contacts = client.getAdditionalImageContacts(id);

+			List<String> contacts = client.getAdditionalImageContacts(id,SessionData.session.getAuthToken());

 			labelWeitereVerantwortliche.setText("");

 			for (int i = 0; i < contacts.size(); i++) 

 			{

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 1ac62333..f11d6c6f 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -104,6 +104,7 @@ public class Login_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent e) {
+
 				System.exit(0);
 			}
 		});
@@ -285,6 +286,7 @@ public class Login_GUI extends JFrame {
 		
 		GuiOrganizer.centerGUI(this);
 		c = this;
+
 		
 	}// end LoginGUI()
 
@@ -293,8 +295,10 @@ public class Login_GUI extends JFrame {
 		LOGGER.info("Trying login of type: " + loginType);
 
 		
-		if (loginType == LOGIN_TYPE_BWLEHRPOOL) {
-			
+
+		if (loginType == LOGIN_TYPE_BWLEHRPOOL) 
+		{				
+
 			// start the authentication process against the masterserver
 			org.openslx.imagemaster.thrift.iface.SessionData result = null;
 			// Connect to Master
@@ -307,7 +311,7 @@ public class Login_GUI extends JFrame {
 				LOGGER.info("Thrift client could not be initialized, is the masterserver up and running?");
 				return;
 			}
-
+			
 			String passText = new String(lblpass.getPassword());
 			UserInfo user = null;
 			// Log user in
@@ -328,6 +332,7 @@ public class Login_GUI extends JFrame {
 				LOGGER.info("Authentifizierung von '" + lblusername.getText() + "' erfolgreich.");
 				user = client.getUserFromToken(result.authToken);
 				authToken = result.authToken;
+			
 
 			} catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) {
 				setStatus(
@@ -466,23 +471,28 @@ public class Login_GUI extends JFrame {
 		server.generated.Server.Client client_2 = models.Client.clientcon.getClient();
 		try 
 		{
-			client_2.setTokenForSession(authToken);
+			boolean authenticated = client_2.authenticated(authToken);
+			
+			if(!authenticated)
+			{
+				//TODO message for user and deactivation of menu points, actually just system exit
+				System.exit(0);
+			}
 		
 		} catch (TException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
 		try {
-			String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule());
+			String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule(),SessionData.session.getAuthToken());
 			//LOGGER.info("Institution of user is: "+pk_institution);
-			client_2.setPerson(person.verantwortlicher.getUserID(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), pk_institution);
+			client_2.setPerson(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken(),pk_institution);
 			//LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		
-		
 		// Pruefe ob Bills Of Rights schon akzeptiert wurden,
 		// wenn nicht zeige diese an
 		if (!Config.getBillOfRights()) {
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index eff62ba1..a171cd57 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -58,6 +58,7 @@ import models.person;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
+import server.generated.Server.Client;
 import util.GuiOrganizer;
 import util.News;
 import util.OpenLinks;
@@ -84,6 +85,8 @@ public class MainMenue_GUI extends JFrame {
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	private JMenuItem mntmAbout;
 	Component c = null;
+	
+	Client client = models.Client.clientcon.getClient();
 
 	
 	
@@ -94,7 +97,7 @@ public class MainMenue_GUI extends JFrame {
 	// for testing
 	ImageRights imageRights = new ImageRights();
 	
-	
+	boolean tokenDeleted;
 
 	
 	public MainMenue_GUI(Component formerGUI) {
@@ -102,7 +105,18 @@ public class MainMenue_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
+				try {
+					tokenDeleted = client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if(tokenDeleted)
+				{
+					System.out.println("test");
+					System.exit(0);
+				}
+				
 			}
 		});
 		try {
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index 5d6efe40..9dc90eb3 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -39,10 +39,14 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
+import org.apache.thrift.TException;
+
 import models.Image;
 import models.Lecture;
 import models.Links;
+import models.SessionData;
 import models.person;
+import server.generated.Server.Client;
 import util.GuiOrganizer;
 import util.OpenLinks;
 
@@ -68,6 +72,7 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 	Date startDate = new Date();
 	Date endDate;
 	Component c = null;
+	Client client = models.Client.clientcon.getClient();
 	private boolean descriptionLengthOK = false; // description may not be
 													// longer than
 													// MAX_DESCRIPTION_LENGTH
@@ -90,6 +95,12 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index a8634e3d..ea1c7b88 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -137,13 +137,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public CreateLectureLink_GUI(Component formerGUI) {
-		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+
 		
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -151,6 +145,12 @@ public class CreateLectureLink_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -304,7 +304,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -469,26 +469,22 @@ public class CreateLectureLink_GUI extends JFrame {
 										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(),
 										imageID,
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										uuid);
+										uuid,
+										person.verantwortlicher.getHochschule());
 								System.out.println("imageID" + " " + imageID);
 								System.out.println("lectureID" + " " + uuid);
 								//set rights for this user
 								
 								client.writeLectureRights(
 										uuid,
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getEMail(),
+										person.verantwortlicher.getRole(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getRole());
+										person.verantwortlicher.getUserID()
+										);
 								
 								//set rights for additional users
 								for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
@@ -498,7 +494,8 @@ public class CreateLectureLink_GUI extends JFrame {
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin()
+											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin(),
+											SessionData.session.getAuthToken()
 											);
 								
 								}//end for
@@ -750,7 +747,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		
 		try 
 		{
-			uuid = client.createRandomUUID();
+			uuid = client.createRandomUUID(SessionData.session.getAuthToken());
 		} 
 		catch (TException e1) 
 		{
@@ -770,9 +767,9 @@ public class CreateLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {		
-			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
+			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		}
 
 		Iterator<server.generated.Image> i = images.iterator();
@@ -826,7 +823,7 @@ public class CreateLectureLink_GUI extends JFrame {
 
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = client.getImageData(id, version);
+		Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelOS.setText(res.get("os"));
 		labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 9449dcd7..3e010696 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -115,20 +115,13 @@ public class DeleteLecture_GUI extends JFrame {
 			+ "</div></html>";
 
 	RowFilter rf = null;
-	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
-			2);
+	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
 
 	/**
 	 * Create the dialog.
 	 */
 	public DeleteLecture_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -137,6 +130,12 @@ public class DeleteLecture_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -159,6 +158,7 @@ public class DeleteLecture_GUI extends JFrame {
 				// 6=Image
 				// 7=Schlagwort
 				// 8=ID
+
 				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);
 				tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);
 				tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -183,10 +183,12 @@ public class DeleteLecture_GUI extends JFrame {
 				tablemyLectures.addMouseListener(new MouseAdapter() {
 
 					@Override
-					public void mouseReleased(MouseEvent e) {
+					public void mouseReleased(MouseEvent e) 
+					{
 
 						tablemyLectures.clearSelection(); //just one row is selectablemyLectures
 						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); 
+						System.out.println(tablemyLectures.getSelectedRow());
 					}
 				});
 
@@ -208,7 +210,7 @@ public class DeleteLecture_GUI extends JFrame {
 		// Zentriert das Fenster in die Bildmitte
 		setBounds(0, 0, 842, 722);
 		setLocationRelativeTo(formerGUI);
-
+		
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -217,8 +219,7 @@ public class DeleteLecture_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel(
-						"Zu löschende Veranstaltung wählen");
+				JLabel lblNewLabel = new JLabel("Zu löschende Veranstaltung wählen");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -245,7 +246,7 @@ public class DeleteLecture_GUI extends JFrame {
 		panel_1.setBounds(10, 49, 557, 64);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-
+		
 		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
 		lblNewLabel_2.setBounds(30, 30, 80, 20);
 		panel_1.add(lblNewLabel_2);
@@ -390,14 +391,22 @@ public class DeleteLecture_GUI extends JFrame {
 						lectureID = modelMyLectures
 								.getValueAt(
 										tablemyLectures
-												.convertColumnIndexToModel(tablemyLectures
-														.getSelectedRow()), 8)
-								.toString();
+												.convertRowIndexToModel(tablemyLectures
+														.getSelectedRow()),
+										8).toString();
+						
+						//int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow());
+						
+						
 						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
 						try {
-							if (client.deleteLecture(lectureID,
-									person.verantwortlicher.getHochschule(),
-									person.verantwortlicher.getUsername())) {
+							if (client.deleteLecture(
+									lectureID,
+									SessionData.session.getAuthToken(),
+									person.verantwortlicher.getHochschule()
+									)
+									)
+							{
 								
 								// delete successful
 								LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht.");
@@ -626,15 +635,17 @@ public class DeleteLecture_GUI extends JFrame {
 			throws ParseException {
 		List<server.generated.Lecture> lectures;
 		try {
-			
 		
 			// Hole eine Liste der erlaubten Images für die diese Person
-			if(person.verantwortlicher.getRole()=="Admin"){
+			if(person.verantwortlicher.getRole()=="Admin")
+			{
 				//get complete list
-				lectures = client.getLectureList();
-			} else {
+				lectures = client.getLectureList(SessionData.session.getAuthToken());
+			} 
+			else 
+			{
 				//get permitted list
-				lectures = client.getLectureListPermissionAdmin(person.verantwortlicher.getUserID());
+				lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken());
 			}
 			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
@@ -668,6 +679,7 @@ public class DeleteLecture_GUI extends JFrame {
 
 			e1.printStackTrace();
 		}
+		
 		return model;
 	}
 
@@ -691,7 +703,7 @@ public class DeleteLecture_GUI extends JFrame {
 
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = client.getLectureData(id);
+		Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 636dc416..f9fdd8fb 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -47,6 +47,7 @@ import models.Image;
 import models.ItemOwner;
 import models.Lecture;
 import models.Links;
+import models.SessionData;
 //import models.person;
 import models.person;
 
@@ -99,6 +100,12 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -498,7 +505,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 
 							//check which GUI to open
 							try {
-								if( (client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid()) ==true)   || (person.verantwortlicher.getRole().equals("Admin")) ){
+
+								if((client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin")))){
 									//user is admin of the lecture
 									PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 									ev.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 1633cb15..001f1b44 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -150,16 +150,16 @@ public class EditLectureLink_GUI extends JFrame {
 	 */
 	public EditLectureLink_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -415,7 +415,7 @@ public class EditLectureLink_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			List<String> list = client.getAllOS();
+			List<String> list = client.getAllOS(SessionData.session.getAuthToken());
 			comboBox.addItem("");
 			for (int i = 0; i < list.size(); i++) {
 				comboBox.addItem(list.get(i));
@@ -629,7 +629,9 @@ public class EditLectureLink_GUI extends JFrame {
 						
 						//check which GUI to open
 						try {
-							if( (client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid())==true)   || (person.verantwortlicher.getRole().equals("Admin")) ){
+
+							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){
+
 								//user is admin of the lecture
 								PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 								ev.setVisible(true);
@@ -691,19 +693,17 @@ public class EditLectureLink_GUI extends JFrame {
 																.convertRowIndexToModel(tablemyImages
 																		.getSelectedRow()),
 														7).toString(),
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										Lecture.lecture.getid());
+										Lecture.lecture.getid(),
+										person.verantwortlicher.getHochschule());
 
 								// remove all additional user permissions on
 								// first stage
 								client.deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -740,7 +740,8 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).isLecture_write(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isLecture_admin()// admin
+													.get(i).isLecture_admin(),// admin
+											SessionData.session.getAuthToken()
 									);
 
 								}// end for
@@ -809,19 +810,17 @@ public class EditLectureLink_GUI extends JFrame {
 																.convertRowIndexToModel(tablePublicVorlagen
 																		.getSelectedRow()),
 														7).toString(),
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										Lecture.lecture.getid());
+										Lecture.lecture.getid(),
+										person.verantwortlicher.getHochschule());
 
 								// remove all additional user permissions on
 								// first stage
 								client.deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -852,7 +851,8 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).isImageWrite(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageAdmin()// admin
+													.get(i).isImageAdmin(),// admin
+											SessionData.session.getAuthToken()		
 									);
 								}
 
@@ -917,19 +917,17 @@ public class EditLectureLink_GUI extends JFrame {
 														.convertRowIndexToModel(tableAllImages
 																.getSelectedRow()),
 												7).toString(),
-										person.verantwortlicher.getUsername(),
-										person.verantwortlicher.getVorname(),
-										person.verantwortlicher.getName(),
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getEMail(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultaet(),
-										Lecture.lecture.getid());
+										Lecture.lecture.getid(),
+										person.verantwortlicher.getHochschule());
 
 								// remove all additional user permissions on
 								// first stage
 								client.deleteAllAdditionalLecturePermissions(
 										Lecture.lecture.getid(),
+										SessionData.session.getAuthToken(),
 										person.verantwortlicher.getUserID());
 
 								// then, add user permissions as they have been
@@ -960,7 +958,8 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).isImageWrite(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageAdmin()// admin
+													.get(i).isImageAdmin(),// admin
+											SessionData.session.getAuthToken()
 									);
 								}
 
@@ -1220,11 +1219,11 @@ public class EditLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {
 			//get permitted list
 			images = client.getImageListPermissionLink(person.verantwortlicher
-				.getUserID());
+				.getUserID(),SessionData.session.getAuthToken());
 		}
 
 		Iterator<server.generated.Image> i = images.iterator();
@@ -1263,11 +1262,11 @@ public class EditLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {
 			//get permitted list
 			images = client.getImageListPermissionLink(person.verantwortlicher
-				.getUserID());
+				.getUserID(),SessionData.session.getAuthToken());
 		}
 
 		Iterator<server.generated.Image> i = images.iterator();
@@ -1306,7 +1305,7 @@ public class EditLectureLink_GUI extends JFrame {
 
 			// Hole eine Liste der Images
 			//images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
-			images = client.getImageListAllTemplates();
+			images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
 
 			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1360,7 +1359,7 @@ public class EditLectureLink_GUI extends JFrame {
 		try {
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			Map<String, String> res = client.getImageData(id, version);
+			Map<String, String> res = client.getImageData(id, version,SessionData.session.getAuthToken());
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 1b7ca406..064ad5af 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -115,12 +115,6 @@ public class EditLectureSearch_GUI extends JFrame {
 	 */
 	public EditLectureSearch_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 
 		filters.add(RowFilter.regexFilter(".", 0));
 		rf = RowFilter.orFilter(filters);
@@ -129,6 +123,12 @@ public class EditLectureSearch_GUI extends JFrame {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
 				// Beendet die Anwendung nach klick auf X
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				con.closeThriftConnection();
 				System.exit(0);
 			}
@@ -671,10 +671,10 @@ public class EditLectureSearch_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person
 			if(person.verantwortlicher.getRole()=="Admin"){
 				//get complete list
-				lectures = client.getLectureList();
+				lectures = client.getLectureList(SessionData.session.getAuthToken());
 			} else {
 				//get permitted list
-				lectures = client.getLectureListPermissionWrite(person.verantwortlicher.getUserID());
+				lectures = client.getLectureListPermissionWrite(SessionData.session.getAuthToken());
 			}
 			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
@@ -733,7 +733,7 @@ public class EditLectureSearch_GUI extends JFrame {
 
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = client.getLectureData(id);
+		Map<String, String> res = client.getLectureData(id,SessionData.session.getAuthToken());
 		labelName.setText(res.get("name"));
 		labelAktiv.setText(res.get("isActive"));
 		labeldesc.setText(res.get("desc"));
@@ -751,7 +751,7 @@ public class EditLectureSearch_GUI extends JFrame {
 
 		try {
 			// get values from server and set them in model
-			map = client.getItemOwner(lectureid);
+			map = client.getItemOwner(lectureid,SessionData.session.getAuthToken());
 
 			ItemOwner.itemOwner.setUserID(map.get("userID"));
 			ItemOwner.itemOwner.setUsername(map.get("loginName"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 58afb5b6..b9886c73 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -1,7 +1,6 @@
 package gui.lecture;
 
 import gui.intro.About_GUI;
-import gui.intro.ListAllOtherUsers_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -64,6 +63,7 @@ import org.apache.thrift.TException;
 import server.generated.Person;
 import server.generated.Server.Client;
 import util.CheckIntegrity;
+import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -123,16 +123,16 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 	public PermissionCreateLecture_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index 22b5ebee..40956d88 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -2,7 +2,6 @@ package gui.lecture;
 
 import gui.image.PermissionCreateImage_GUI;
 import gui.intro.About_GUI;
-import gui.intro.ListAllOtherUsers_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -59,6 +58,7 @@ import models.person;
 import server.generated.Person;
 import server.generated.Server.Client;
 import util.CheckIntegrity;
+import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
 import javax.swing.JCheckBox;
 
@@ -106,16 +106,16 @@ public class PermissionEditLecture_GUI extends JFrame {
 
 	public PermissionEditLecture_GUI(Component formerGUI) {
 		
-		try {
-			client.setTokenForSession(SessionData.session.getAuthToken());
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		
+
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				try {
+					client.setSessionInvalid(SessionData.session.getAuthToken());
+				} catch (TException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 				System.exit(0);
 			}
 		});
@@ -239,8 +239,8 @@ public class PermissionEditLecture_GUI extends JFrame {
 			try {
 
 				map = client.getPermissionForUserAndLecture(
-						person.verantwortlicher.getUserID(),
-						Lecture.lecture.getid());
+						SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID()
+						);
 				Iterator<server.generated.Person> i = map.iterator();
 
 				int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 7180650e..cb783a59 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -119,13 +119,7 @@ public class SearchLecture_GUI extends JFrame {
 	 * Create the dialog.

 	 */

 	public SearchLecture_GUI(Component formerGUI) {

-		

-		try {

-			client.setTokenForSession(SessionData.session.getAuthToken());

-		} catch (TException e1) {

-			// TODO Auto-generated catch block

-			e1.printStackTrace();

-		}

+

 		

 		filters.add(RowFilter.regexFilter(".", 0));

 		rf = RowFilter.orFilter(filters);

@@ -136,6 +130,12 @@ public class SearchLecture_GUI extends JFrame {
 			public void windowClosing(WindowEvent arg0) {

 				// Beendet die Anwendung nach klick auf X

 				con.closeThriftConnection();

+				try {

+					client.setSessionInvalid(SessionData.session.getAuthToken());

+				} catch (TException e) {

+					// TODO Auto-generated catch block

+					e.printStackTrace();

+				}

 				System.exit(0);

 			}

 			@Override

@@ -633,10 +633,10 @@ public class SearchLecture_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person

 			if(person.verantwortlicher.getRole()=="Admin"){

 				//get complete list

-				lectures = client.getLectureList();

+				lectures = client.getLectureList(SessionData.session.getAuthToken());

 			} else {

 				//get permitted list			

-				lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());

+				lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());

 			}

 			

 			Iterator<server.generated.Lecture> i = lectures.iterator();

@@ -677,7 +677,7 @@ public class SearchLecture_GUI extends JFrame {
 		try {

 			// Hole eine Liste der erlaubten Images für die diese Person

 			//lectures = client.getLectureList();

-			lectures = client.getLectureList();

+			lectures = client.getLectureList(SessionData.session.getAuthToken());

 			Iterator<server.generated.Lecture> i = lectures.iterator();

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

@@ -730,7 +730,7 @@ public class SearchLecture_GUI extends JFrame {
  

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

-			Map<String,String> res=client.getLectureData(id);

+			Map<String,String> res=client.getLectureData(id,SessionData.session.getAuthToken());

 			labelName.setText(res.get("name"));

 			labelAktiv.setText(res.get("isActive"));

 			labeldesc.setText(res.get("desc"));

diff --git a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
index 7c1259f9..a5df03c2 100644
--- a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
@@ -35,7 +35,7 @@ public class MasterThriftConnection {
 
 		return client;
 	}
-
+ 
 	public void closeMasterThriftConnection() {
 		transport.close();
 	}
diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
index 50315ae5..8b0221e8 100644
--- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
@@ -49,6 +49,7 @@ public class ThriftConnection {
 
 	public void closeThriftConnection()
 	{
+		//System.out.println("Ich funktioniere auch, wenn ich nicht geschlossen, sondern im TaskManager gekillt werde"); //works
 		LOGGER.info("Verbindung wird geplant getrennt.");
 		transport.close();
 	}
diff --git a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
index 4c24e035..ae097426 100644
--- a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
+++ b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
@@ -1,29 +1,22 @@
-package gui.intro;
+package util;
 
 import gui.intro.About_GUI;
-import gui.intro.MainMenue_GUI;
 
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JButton;
@@ -34,25 +27,20 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTable;
-import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
-import javax.swing.RowFilter;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
 import models.Links;
+import models.SessionData;
 import models.person;
 
 import org.apache.log4j.Logger;
@@ -61,8 +49,6 @@ import org.apache.thrift.TException;
 import server.generated.Person;
 import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.OpenLinks;
-import javax.swing.ListSelectionModel;
 
 @SuppressWarnings("serial")
 public class ListAllOtherUsers_GUI extends JFrame {
@@ -376,7 +362,7 @@ public class ListAllOtherUsers_GUI extends JFrame {
 			}			
 			
 			//get the info
-			map = client.getAllOtherSatelliteUsers(user);
+			map = client.getAllOtherSatelliteUsers(user,SessionData.session.getAuthToken());
 			Iterator<server.generated.Person> i = map.iterator();
 
 			int x = 0;